Skip to content

Commit

Permalink
bing bong
Browse files Browse the repository at this point in the history
  • Loading branch information
itsdevbear committed Oct 23, 2023
1 parent 5cab98e commit 56b3b6f
Show file tree
Hide file tree
Showing 42 changed files with 95 additions and 95 deletions.
6 changes: 2 additions & 4 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ run:
# Default: 1m
timeout: 3m


# This file contains only configs which differ from defaults.
# All possible options can be found here https://github.com/golangci/golangci-lint/blob/master/.golangci.reference.yml
linters-settings:
Expand Down Expand Up @@ -96,7 +95,6 @@ linters-settings:
# Default: 40
statements: 50


gci:
sections:
- standard # Standard section: captures all standard packages.
Expand All @@ -106,7 +104,7 @@ linters-settings:
- Prefix(github.com/cosmos/cosmos-sdk
- Prefix(github.com/ethereum/go-ethereum
- Prefix(pkg.berachain.dev
- Prefix(pkg.berachain.dev/polaris
- Prefix(github.com/itsdevbear/bolaris
- blank
- dot
skip-generated: true
Expand Down Expand Up @@ -179,7 +177,7 @@ linters-settings:
nolintlint:
# Exclude following linters from requiring an explanation.
# Default: []
allow-no-explanation: [ funlen, gocognit, lll ]
allow-no-explanation: [funlen, gocognit, lll]
# Enable to require an explanation of nonzero length after each nolint directive.
# Default: false
require-explanation: true
Expand Down
4 changes: 2 additions & 2 deletions .mockery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ mockname: "{{.InterfaceNameCamel}}"
filename: "{{.InterfaceNameSnake}}.go"
outpkg: "mocks"
packages:
pkg.berachain.dev/polaris/cosmos/config:
github.com/itsdevbear/bolaris/cosmos/config:
config:
recursive: True
with-expecter: true
all: True
all: True
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<a href="https://codecov.io/gh/berachain/polaris" target="_blank">
<img src="https://codecov.io/gh/berachain/polaris/branch/main/graph/badge.svg?token=5SYYGUS8GW"/>
</a>
<a href="https://pkg.go.dev/pkg.berachain.dev/polaris" target="_blank">
<img src="https://pkg.go.dev/badge/pkg.berachain.dev/polaris.svg" alt="Go Reference">
<a href="https://pkg.go.dev/github.com/itsdevbear/bolaris" target="_blank">
<img src="https://pkg.go.dev/badge/github.com/itsdevbear/bolaris.svg" alt="Go Reference">
</a>
<a href="https://t.me/polaris_devs" target="_blank">
<img alt="Telegram Chat" src="https://img.shields.io/endpoint?color=neon&logo=telegram&label=chat&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fpolaris_devs">
Expand Down
4 changes: 2 additions & 2 deletions beacon/eth/execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import (
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/rpc"

"pkg.berachain.dev/polaris/beacon/log"
"pkg.berachain.dev/polaris/beacon/prysm"
"github.com/itsdevbear/bolaris/beacon/log"
"github.com/itsdevbear/bolaris/beacon/prysm"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion beacon/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module pkg.berachain.dev/polaris/beacon
module github.com/itsdevbear/bolaris/beacon

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion build/scripts/proto_generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ for dir in $proto_dirs; do
done

# move proto files to the right places
cp -r pkg.berachain.dev/polaris/* ../
cp -r github.com/itsdevbear/bolaris/* ../
rm -rf pkg.berachain.dev

cd ../
Expand Down
2 changes: 1 addition & 1 deletion build/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module pkg.berachain.dev/polaris/build/tools
module github.com/itsdevbear/bolaris/build/tools

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion contracts/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module pkg.berachain.dev/polaris/contracts
module github.com/itsdevbear/bolaris/contracts

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion cosmos/abci/proposal/proposals.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

"pkg.berachain.dev/polaris/cosmos/abci/ve"
"github.com/itsdevbear/bolaris/cosmos/abci/ve"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cosmos/abci/ve/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

"pkg.berachain.dev/polaris/cosmos/runtime/miner"
"github.com/itsdevbear/bolaris/cosmos/runtime/miner"
)

// VoteExtensionHandler is a handler that extends a vote with the oracle's
Expand Down
4 changes: 2 additions & 2 deletions cosmos/abci/ve/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

"pkg.berachain.dev/polaris/beacon/prysm"
"pkg.berachain.dev/polaris/cosmos/runtime/miner"
"github.com/itsdevbear/bolaris/beacon/prysm"
"github.com/itsdevbear/bolaris/cosmos/runtime/miner"
)

type Processor struct {
Expand Down
2 changes: 1 addition & 1 deletion cosmos/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
servertypes "github.com/cosmos/cosmos-sdk/server/types"
sdk "github.com/cosmos/cosmos-sdk/types"

"pkg.berachain.dev/polaris/cosmos/config/flags"
"github.com/itsdevbear/bolaris/cosmos/config/flags"
)

// Config is the main configuration struct for the Polaris chain.
Expand Down
2 changes: 1 addition & 1 deletion cosmos/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/cosmos/cosmos-sdk/crypto/hd"
sdk "github.com/cosmos/cosmos-sdk/types"

sgconfig "pkg.berachain.dev/polaris/cosmos/config"
sgconfig "github.com/itsdevbear/bolaris/cosmos/config"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion cosmos/config/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"

"pkg.berachain.dev/polaris/cosmos/config/mocks"
"github.com/itsdevbear/bolaris/cosmos/config/mocks"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion cosmos/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module pkg.berachain.dev/polaris/cosmos
module github.com/itsdevbear/bolaris/cosmos

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion cosmos/lib/address_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"github.com/ethereum/go-ethereum/common"

cosmlib "pkg.berachain.dev/polaris/cosmos/lib"
cosmlib "github.com/itsdevbear/bolaris/cosmos/lib"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions cosmos/runtime/miner/miner.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ import (

"github.com/ethereum/go-ethereum/common"

"pkg.berachain.dev/polaris/beacon/eth"
"pkg.berachain.dev/polaris/beacon/prysm"
"github.com/itsdevbear/bolaris/beacon/eth"
"github.com/itsdevbear/bolaris/beacon/prysm"
)

// emptyHash is a common.Hash initialized to all zeros.
Expand Down
16 changes: 8 additions & 8 deletions cosmos/runtime/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/mempool"

"pkg.berachain.dev/polaris/beacon/eth"
proposal "pkg.berachain.dev/polaris/cosmos/abci/proposal"
"pkg.berachain.dev/polaris/cosmos/abci/ve"
"pkg.berachain.dev/polaris/cosmos/config"
antelib "pkg.berachain.dev/polaris/cosmos/lib/ante"
libtx "pkg.berachain.dev/polaris/cosmos/lib/tx"
"pkg.berachain.dev/polaris/cosmos/runtime/miner"
evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types"
"github.com/itsdevbear/bolaris/beacon/eth"
proposal "github.com/itsdevbear/bolaris/cosmos/abci/proposal"
"github.com/itsdevbear/bolaris/cosmos/abci/ve"
"github.com/itsdevbear/bolaris/cosmos/config"
antelib "github.com/itsdevbear/bolaris/cosmos/lib/ante"
libtx "github.com/itsdevbear/bolaris/cosmos/lib/tx"
"github.com/itsdevbear/bolaris/cosmos/runtime/miner"
evmtypes "github.com/itsdevbear/bolaris/cosmos/x/evm/types"
)

// EVMKeeper is an interface that defines the methods needed for the EVM setup.
Expand Down
2 changes: 1 addition & 1 deletion cosmos/testutil/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import (

"github.com/ethereum/go-ethereum/common"

evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types"
evmtypes "github.com/itsdevbear/bolaris/cosmos/x/evm/types"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cosmos/x/evm/depinject.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"cosmossdk.io/depinject"
store "cosmossdk.io/store/types"

"pkg.berachain.dev/polaris/beacon/prysm"
modulev1alpha1 "pkg.berachain.dev/polaris/cosmos/api/polaris/evm/module/v1alpha1"
"pkg.berachain.dev/polaris/cosmos/x/evm/keeper"
"github.com/itsdevbear/bolaris/beacon/prysm"
modulev1alpha1 "github.com/itsdevbear/bolaris/cosmos/api/polaris/evm/module/v1alpha1"
"github.com/itsdevbear/bolaris/cosmos/x/evm/keeper"
)

//nolint:gochecknoinits // GRRRR fix later.
Expand Down
4 changes: 2 additions & 2 deletions cosmos/x/evm/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

"pkg.berachain.dev/polaris/beacon/prysm"
"pkg.berachain.dev/polaris/cosmos/x/evm/types"
"github.com/itsdevbear/bolaris/beacon/prysm"
"github.com/itsdevbear/bolaris/cosmos/x/evm/types"
)

type (
Expand Down
4 changes: 2 additions & 2 deletions cosmos/x/evm/keeper/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"context"
"fmt"

"pkg.berachain.dev/polaris/beacon/prysm"
evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types"
"github.com/itsdevbear/bolaris/beacon/prysm"
evmtypes "github.com/itsdevbear/bolaris/cosmos/x/evm/types"
)

func (k *Keeper) ProcessPayloadEnvelope(
Expand Down
4 changes: 2 additions & 2 deletions cosmos/x/evm/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"

"pkg.berachain.dev/polaris/cosmos/x/evm/keeper"
"pkg.berachain.dev/polaris/cosmos/x/evm/types"
"github.com/itsdevbear/bolaris/cosmos/x/evm/keeper"
"github.com/itsdevbear/bolaris/cosmos/x/evm/types"
)

// ConsensusVersion defines the current x/evm module consensus version.
Expand Down
6 changes: 3 additions & 3 deletions e2e/localnet/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module pkg.berachain.dev/polaris/e2e/localnet
module github.com/itsdevbear/bolaris/e2e/localnet

go 1.21

Expand All @@ -8,8 +8,8 @@ require (
github.com/onsi/ginkgo/v2 v2.13.0
github.com/onsi/gomega v1.27.10
github.com/ory/dockertest v3.3.5+incompatible
pkg.berachain.dev/polaris/contracts v0.0.0-20231011003341-63d98bc34da2
pkg.berachain.dev/polaris/eth v0.0.0-20231011003341-63d98bc34da2
github.com/itsdevbear/bolaris/contracts v0.0.0-20231011003341-63d98bc34da2
github.com/itsdevbear/bolaris/eth v0.0.0-20231011003341-63d98bc34da2
)

require (
Expand Down
8 changes: 4 additions & 4 deletions e2e/localnet/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
pkg.berachain.dev/polaris/contracts v0.0.0-20231011003341-63d98bc34da2 h1:Vd82baPNQh+6wUaj+qARezJ9dOHHdupJQncgj1UO1FQ=
pkg.berachain.dev/polaris/contracts v0.0.0-20231011003341-63d98bc34da2/go.mod h1:LwuVx7lVFkIa/EXGNz2536i+YTK/mEU4A1vQJFZ8y4Q=
pkg.berachain.dev/polaris/eth v0.0.0-20231011003341-63d98bc34da2 h1:f3q5VqypSV1a2UijGbRbzFyqYmz37lISmjWXPwD3wEE=
pkg.berachain.dev/polaris/eth v0.0.0-20231011003341-63d98bc34da2/go.mod h1:HuT/i4PZCz3ItXAvDWHA31z4OZ10we6RH6xz+Fq0Nlw=
github.com/itsdevbear/bolaris/contracts v0.0.0-20231011003341-63d98bc34da2 h1:Vd82baPNQh+6wUaj+qARezJ9dOHHdupJQncgj1UO1FQ=
github.com/itsdevbear/bolaris/contracts v0.0.0-20231011003341-63d98bc34da2/go.mod h1:LwuVx7lVFkIa/EXGNz2536i+YTK/mEU4A1vQJFZ8y4Q=
github.com/itsdevbear/bolaris/eth v0.0.0-20231011003341-63d98bc34da2 h1:f3q5VqypSV1a2UijGbRbzFyqYmz37lISmjWXPwD3wEE=
github.com/itsdevbear/bolaris/eth v0.0.0-20231011003341-63d98bc34da2/go.mod h1:HuT/i4PZCz3ItXAvDWHA31z4OZ10we6RH6xz+Fq0Nlw=
rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU=
rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA=
2 changes: 1 addition & 1 deletion e2e/localnet/network/fixture.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"

"pkg.berachain.dev/polaris/eth/crypto"
"github.com/itsdevbear/bolaris/eth/crypto"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions e2e/localnet/network/fixture_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ import (
"github.com/ethereum/go-ethereum/ethclient"
gethrpc "github.com/ethereum/go-ethereum/rpc"

tbindings "pkg.berachain.dev/polaris/contracts/bindings/testing"
localnet "pkg.berachain.dev/polaris/e2e/localnet/network"
tbindings "github.com/itsdevbear/bolaris/contracts/bindings/testing"
localnet "github.com/itsdevbear/bolaris/e2e/localnet/network"

. "github.com/itsdevbear/bolaris/e2e/localnet/utils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "pkg.berachain.dev/polaris/e2e/localnet/utils"
)

var _ = Describe("JSON RPC tests", func() {
Expand Down
2 changes: 1 addition & 1 deletion e2e/localnet/network/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/ethereum/go-ethereum/ethclient"
gethrpc "github.com/ethereum/go-ethereum/rpc"

"pkg.berachain.dev/polaris/e2e/localnet/container"
"github.com/itsdevbear/bolaris/e2e/localnet/container"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion e2e/localnet/network/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (

coretypes "github.com/ethereum/go-ethereum/core/types"

localnet "pkg.berachain.dev/polaris/e2e/localnet/network"
localnet "github.com/itsdevbear/bolaris/e2e/localnet/network"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion e2e/localnet/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
coretypes "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethclient"

bindings "pkg.berachain.dev/polaris/contracts/bindings/testing"
bindings "github.com/itsdevbear/bolaris/contracts/bindings/testing"

. "github.com/onsi/gomega" //nolint:stylecheck,revive,gostaticcheck // Gomega makes sense in tests.
)
Expand Down
8 changes: 4 additions & 4 deletions e2e/testapp/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ import (
slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"

evmv1alpha1 "pkg.berachain.dev/polaris/cosmos/api/polaris/evm/v1alpha1"
signinglib "pkg.berachain.dev/polaris/cosmos/lib/signing"
polarruntime "pkg.berachain.dev/polaris/cosmos/runtime"
evmkeeper "pkg.berachain.dev/polaris/cosmos/x/evm/keeper"
evmv1alpha1 "github.com/itsdevbear/bolaris/cosmos/api/polaris/evm/v1alpha1"
signinglib "github.com/itsdevbear/bolaris/cosmos/lib/signing"
polarruntime "github.com/itsdevbear/bolaris/cosmos/runtime"
evmkeeper "github.com/itsdevbear/bolaris/cosmos/x/evm/keeper"
)

//nolint:gochecknoinits // from sdk.
Expand Down
6 changes: 3 additions & 3 deletions e2e/testapp/app_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ import (
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

evmmodulev1alpha1 "pkg.berachain.dev/polaris/cosmos/api/polaris/evm/module/v1alpha1"
evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types"
evmmodulev1alpha1 "github.com/itsdevbear/bolaris/cosmos/api/polaris/evm/module/v1alpha1"
evmtypes "github.com/itsdevbear/bolaris/cosmos/x/evm/types"

_ "cosmossdk.io/x/evidence" // import for side-effects
_ "cosmossdk.io/x/upgrade" // import for side-effects
Expand All @@ -73,7 +73,7 @@ import (
_ "github.com/cosmos/cosmos-sdk/x/mint" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/staking" // import for side-effects
_ "pkg.berachain.dev/polaris/cosmos/x/evm" // import for side-effects
_ "github.com/itsdevbear/bolaris/cosmos/x/evm" // import for side-effects
)

var (
Expand Down
Loading

0 comments on commit 56b3b6f

Please sign in to comment.