chore(deps): pkg.berachain.dev => github.com/berachain (backport #…

…1294) (#1295) This is an automatic backport of pull request #1294 done by [Mergify](https://mergify.com). --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details> Co-authored-by: Devon Bear <[email protected]>
berachain · Nov 7, 2023 · 3789795 · 3789795
1 parent 7f92743
commit 3789795
Show file tree

Hide file tree

Showing 226 changed files with 830 additions and 1,619 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -105,8 +105,8 @@ linters-settings:
       - Prefix(cosmossdk.io)
       - Prefix(github.com/cosmos/cosmos-sdk
       - Prefix(github.com/ethereum/go-ethereum
-      - Prefix(pkg.berachain.dev
-      - Prefix(pkg.berachain.dev/polaris
+      - Prefix(github.com/berachain
+      - Prefix(github.com/berachain/polaris
       - blank
       - dot
     skip-generated: true

diff --git a/.mockery.yaml b/.mockery.yaml
@@ -3,17 +3,17 @@ mockname: "{{.InterfaceNameCamel}}"
 filename: "{{.InterfaceNameSnake}}.go"
 outpkg: "mocks"
 packages:
-  pkg.berachain.dev/polaris/cosmos/config:
+  github.com/berachain/polaris/cosmos/config:
     config:
       recursive: True
       with-expecter: true
       all: True
-  pkg.berachain.dev/polaris/cosmos/runtime/txpool:
+  github.com/berachain/polaris/cosmos/runtime/txpool:
     config:
       recursive: True
       with-expecter: true
       all: True
-  pkg.berachain.dev/polaris/eth/core/state:
+  github.com/berachain/polaris/eth/core/state:
     config:
       recursive: True
       with-expecter: true

diff --git a/README.md b/README.md
@@ -6,10 +6,10 @@
 
 <div>
   <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"/> 
+    <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/berachain/polaris" target="_blank">
+    <img src="https://pkg.go.dev/badge/github.com/berachain/polaris.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">
@@ -21,8 +21,6 @@
   </a>
 </div>
 
-
-
 ## What is Polaris?
 
 Introducing Polaris, the revolutionary framework designed to simplify the integration of an Ethereum Virtual Machine (EVM) into your application. Polaris is built with a clean, easy-to-integrate API that eliminates the need for developers to spend time hacking together their own EVM integration solutions. Our framework is highly modular, allowing you to choose the components that best fit your needs and integrate an EVM environment into virtually any application.
@@ -55,7 +53,6 @@ If you want to help contribute to the framework, check out the [Framework Specs]
 ├── <a href="./tools">tools</a>: Package for holding tooling deps.
 </pre>
 
-
 ## Build & Test
 
 [Golang 1.20+](https://go.dev/doc/install) and [Foundry](https://book.getfoundry.sh/getting-started/installation) are required for Polaris.

diff --git a/build/scripts/proto_generate.sh b/build/scripts/proto_generate.sh
@@ -44,8 +44,8 @@ for dir in $proto_dirs; do
 done
 
 # move proto files to the right places
-cp -r pkg.berachain.dev/polaris/* ../
-rm -rf pkg.berachain.dev
+cp -r github.com/berachain/polaris/* ../
+rm -rf github.com/berachain
 
 cd ../
 

diff --git a/build/tools/go.mod b/build/tools/go.mod
@@ -1,4 +1,4 @@
-module pkg.berachain.dev/polaris/build/tools
+module github.com/berachain/polaris/build/tools
 
 go 1.21
 

diff --git a/contracts/bindings/testing/swapper.abigen.go b/contracts/bindings/testing/swapper.abigen.go
diff --git a/contracts/go.mod b/contracts/go.mod
@@ -1,4 +1,4 @@
-module pkg.berachain.dev/polaris/contracts
+module github.com/berachain/polaris/contracts
 
 go 1.21
 

diff --git a/cosmos/api/polaris/evm/module/v1alpha1/module.pulsar.go b/cosmos/api/polaris/evm/module/v1alpha1/module.pulsar.go
diff --git a/cosmos/config/config.go b/cosmos/config/config.go
@@ -23,15 +23,15 @@ package config
 import (
 	"math/big"
 
+	"github.com/berachain/polaris/cosmos/config/flags"
+	"github.com/berachain/polaris/eth"
+	"github.com/berachain/polaris/eth/accounts"
+	"github.com/berachain/polaris/eth/node"
+	"github.com/berachain/polaris/eth/polar"
+
 	sdkflags "github.com/cosmos/cosmos-sdk/client/flags"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-
-	"pkg.berachain.dev/polaris/cosmos/config/flags"
-	"pkg.berachain.dev/polaris/eth"
-	"pkg.berachain.dev/polaris/eth/accounts"
-	"pkg.berachain.dev/polaris/eth/node"
-	"pkg.berachain.dev/polaris/eth/polar"
 )
 
 type Config = eth.Config

diff --git a/cosmos/config/config_test.go b/cosmos/config/config_test.go
@@ -21,12 +21,12 @@
 package config_test
 
 import (
+	sgconfig "github.com/berachain/polaris/cosmos/config"
+	"github.com/berachain/polaris/eth/accounts"
+
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	sgconfig "pkg.berachain.dev/polaris/cosmos/config"
-	"pkg.berachain.dev/polaris/eth/accounts"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

diff --git a/cosmos/config/mocks/app_options.go b/cosmos/config/mocks/app_options.go
diff --git a/cosmos/config/parser.go b/cosmos/config/parser.go
@@ -26,10 +26,10 @@ import (
 
 	"github.com/spf13/cast"
 
-	servertypes "github.com/cosmos/cosmos-sdk/server/types"
+	"github.com/berachain/polaris/eth/common"
+	"github.com/berachain/polaris/eth/common/hexutil"
 
-	"pkg.berachain.dev/polaris/eth/common"
-	"pkg.berachain.dev/polaris/eth/common/hexutil"
+	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 )
 
 // baseTen is for the big.Int string conversation.

diff --git a/cosmos/config/parser_test.go b/cosmos/config/parser_test.go
@@ -24,9 +24,9 @@ import (
 	"testing"
 	"time"
 
-	"pkg.berachain.dev/polaris/cosmos/config/mocks"
-	"pkg.berachain.dev/polaris/eth/common"
-	"pkg.berachain.dev/polaris/eth/common/hexutil"
+	"github.com/berachain/polaris/cosmos/config/mocks"
+	"github.com/berachain/polaris/eth/common"
+	"github.com/berachain/polaris/eth/common/hexutil"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

diff --git a/cosmos/crypto/codec/codec.go b/cosmos/crypto/codec/codec.go
@@ -21,10 +21,10 @@
 package codec
 
 import (
+	"github.com/berachain/polaris/cosmos/crypto/keys/ethsecp256k1"
+
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-
-	"pkg.berachain.dev/polaris/cosmos/crypto/keys/ethsecp256k1"
 )
 
 // RegisterInterfaces registers the ethsecp256k1 key types.

diff --git a/cosmos/crypto/hd/algo.go b/cosmos/crypto/hd/algo.go
@@ -21,11 +21,11 @@
 package hd
 
 import (
+	"github.com/berachain/polaris/cosmos/crypto/keys/ethsecp256k1"
+
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-
-	"pkg.berachain.dev/polaris/cosmos/crypto/keys/ethsecp256k1"
 )
 
 const (

diff --git a/cosmos/crypto/hd/algo_test.go b/cosmos/crypto/hd/algo_test.go
@@ -23,13 +23,13 @@ package hd
 import (
 	"strings"
 
-	"github.com/cosmos/cosmos-sdk/crypto/keyring"
+	ethsecp256k1 "github.com/berachain/polaris/cosmos/crypto/keys/ethsecp256k1"
+	"github.com/berachain/polaris/eth/accounts"
+	"github.com/berachain/polaris/eth/common"
+	crypto "github.com/berachain/polaris/eth/crypto"
+	"github.com/berachain/polaris/lib/utils"
 
-	ethsecp256k1 "pkg.berachain.dev/polaris/cosmos/crypto/keys/ethsecp256k1"
-	"pkg.berachain.dev/polaris/eth/accounts"
-	"pkg.berachain.dev/polaris/eth/common"
-	crypto "pkg.berachain.dev/polaris/eth/crypto"
-	"pkg.berachain.dev/polaris/lib/utils"
+	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

diff --git a/cosmos/crypto/keyring/option.go b/cosmos/crypto/keyring/option.go
@@ -21,9 +21,9 @@
 package keyring
 
 import (
-	"github.com/cosmos/cosmos-sdk/crypto/keyring"
+	"github.com/berachain/polaris/cosmos/crypto/hd"
 
-	"pkg.berachain.dev/polaris/cosmos/crypto/hd"
+	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 )
 
 // OnlyEthSecp256k1Option defines a function keys options for the ethereum Secp256k1 curve.

diff --git a/cosmos/crypto/keyring/option_test.go b/cosmos/crypto/keyring/option_test.go
@@ -25,17 +25,17 @@ import (
 	"strings"
 	"testing"
 
+	cryptocodec "github.com/berachain/polaris/cosmos/crypto/codec"
+	"github.com/berachain/polaris/cosmos/crypto/hd"
+	accounts "github.com/berachain/polaris/eth/accounts"
+	"github.com/berachain/polaris/eth/common"
+
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/std"
 
-	cryptocodec "pkg.berachain.dev/polaris/cosmos/crypto/codec"
-	"pkg.berachain.dev/polaris/cosmos/crypto/hd"
-	accounts "pkg.berachain.dev/polaris/eth/accounts"
-	"pkg.berachain.dev/polaris/eth/common"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

diff --git a/cosmos/crypto/keys/ethsecp256k1/keys.go b/cosmos/crypto/keys/ethsecp256k1/keys.go
@@ -25,11 +25,11 @@ import (
 	"crypto/ecdsa"
 	"crypto/subtle"
 
+	"github.com/berachain/polaris/eth/crypto"
+
 	cmcrypto "github.com/cometbft/cometbft/crypto"
 
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-
-	"pkg.berachain.dev/polaris/eth/crypto"
 )
 
 const (

diff --git a/cosmos/crypto/keys/ethsecp256k1/keys.pb.go b/cosmos/crypto/keys/ethsecp256k1/keys.pb.go
diff --git a/cosmos/crypto/keys/ethsecp256k1/keys_test.go b/cosmos/crypto/keys/ethsecp256k1/keys_test.go
@@ -23,9 +23,9 @@ package ethsecp256k1
 import (
 	"testing"
 
-	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
+	ethcrypto "github.com/berachain/polaris/eth/crypto"
 
-	ethcrypto "pkg.berachain.dev/polaris/eth/crypto"
+	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

diff --git a/cosmos/crypto/keys/ethsecp256k1/signature_cgo.go b/cosmos/crypto/keys/ethsecp256k1/signature_cgo.go
@@ -21,7 +21,7 @@
 package ethsecp256k1
 
 import (
-	"pkg.berachain.dev/polaris/eth/crypto"
+	"github.com/berachain/polaris/eth/crypto"
 )
 
 // Sign signs the provided message using the ECDSA private key. It returns an error if the

diff --git a/cosmos/crypto/keys/ethsecp256k1/signature_cgo_test.go b/cosmos/crypto/keys/ethsecp256k1/signature_cgo_test.go
@@ -23,7 +23,7 @@ package ethsecp256k1
 import (
 	"crypto/ecdsa"
 
-	"pkg.berachain.dev/polaris/eth/crypto"
+	"github.com/berachain/polaris/eth/crypto"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

diff --git a/cosmos/go.mod b/cosmos/go.mod
@@ -1,4 +1,4 @@
-module pkg.berachain.dev/polaris/cosmos
+module github.com/berachain/polaris/cosmos
 
 go 1.21
 
@@ -19,6 +19,9 @@ require (
 	cosmossdk.io/store v1.0.0
 	cosmossdk.io/x/evidence v0.0.0-20230818115413-c402c51a1508
 	cosmossdk.io/x/tx v0.12.0
+	github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6
+	github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6
+	github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6
 	github.com/btcsuite/btcd v0.23.2
 	github.com/btcsuite/btcd/btcutil v1.1.3
 	github.com/cometbft/cometbft v0.38.0
@@ -38,9 +41,6 @@ require (
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
 	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
-	pkg.berachain.dev/polaris/contracts v0.0.0-20231031220135-f3bf0d0ee45f
-	pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d
-	pkg.berachain.dev/polaris/lib v0.0.0-20231104204753-faadca38b64d
 )
 
 require (
@@ -65,7 +65,6 @@ require (
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.0 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
-	github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 // indirect
 	github.com/cockroachdb/errors v1.11.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
 	github.com/cockroachdb/pebble v0.0.0-20231101195458-481da04154d6 // indirect