use zeta-chain/go-ethereum

zeta-chain · Oct 17, 2024 · 5f0ac07 · 5f0ac07
1 parent 94fb32c
commit 5f0ac07
Show file tree

Hide file tree

Showing 173 changed files with 406 additions and 418 deletions.
diff --git a/app/ante/ante_test.go b/app/ante/ante_test.go
@@ -24,8 +24,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/ethereum/go-ethereum/core/types"
-	ethparams "github.com/ethereum/go-ethereum/params"
+	"github.com/zeta-chain/go-ethereum/core/types"
+	ethparams "github.com/zeta-chain/go-ethereum/params"
 	"github.com/zeta-chain/ethermint/app/ante"
 	"github.com/zeta-chain/ethermint/crypto/ethsecp256k1"
 	"github.com/zeta-chain/ethermint/tests"

diff --git a/app/ante/eip712.go b/app/ante/eip712.go
@@ -30,9 +30,9 @@ import (
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
 
-	ethcrypto "github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/crypto/secp256k1"
-	"github.com/ethereum/go-ethereum/signer/core/apitypes"
+	ethcrypto "github.com/zeta-chain/go-ethereum/crypto"
+	"github.com/zeta-chain/go-ethereum/crypto/secp256k1"
+	"github.com/zeta-chain/go-ethereum/signer/core/apitypes"
 	"github.com/zeta-chain/ethermint/crypto/ethsecp256k1"
 	"github.com/zeta-chain/ethermint/ethereum/eip712"
 	ethermint "github.com/zeta-chain/ethermint/types"

diff --git a/app/ante/eth.go b/app/ante/eth.go
@@ -32,7 +32,7 @@ import (
 	"github.com/zeta-chain/ethermint/x/evm/statedb"
 	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/zeta-chain/go-ethereum/common"
 )
 
 // EthAccountVerificationDecorator validates an account balance checks

diff --git a/app/ante/eth_test.go b/app/ante/eth_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/zeta-chain/ethermint/x/evm/statedb"
 	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
 
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
+	ethtypes "github.com/zeta-chain/go-ethereum/core/types"
 )
 
 func (suite AnteTestSuite) TestNewEthAccountVerificationDecorator() {

diff --git a/app/ante/fee_checker_test.go b/app/ante/fee_checker_test.go
@@ -12,7 +12,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/zeta-chain/go-ethereum/params"
 	"github.com/zeta-chain/ethermint/encoding"
 	ethermint "github.com/zeta-chain/ethermint/types"
 	"github.com/zeta-chain/ethermint/x/evm/types"

diff --git a/app/ante/fee_market_test.go b/app/ante/fee_market_test.go
@@ -6,7 +6,7 @@ import (
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
+	ethtypes "github.com/zeta-chain/go-ethereum/core/types"
 	"github.com/zeta-chain/ethermint/app/ante"
 	"github.com/zeta-chain/ethermint/tests"
 	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"

diff --git a/app/ante/fees.go b/app/ante/fees.go
@@ -22,7 +22,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
+	ethtypes "github.com/zeta-chain/go-ethereum/core/types"
 	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
 )
 

diff --git a/app/ante/fees_test.go b/app/ante/fees_test.go
@@ -6,7 +6,7 @@ import (
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
+	ethtypes "github.com/zeta-chain/go-ethereum/core/types"
 	"github.com/zeta-chain/ethermint/app/ante"
 	"github.com/zeta-chain/ethermint/tests"
 	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"

diff --git a/app/ante/interfaces.go b/app/ante/interfaces.go
@@ -21,10 +21,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	tx "github.com/cosmos/cosmos-sdk/types/tx"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/zeta-chain/go-ethereum/common"
+	"github.com/zeta-chain/go-ethereum/core"
+	"github.com/zeta-chain/go-ethereum/core/vm"
+	"github.com/zeta-chain/go-ethereum/params"
 	"github.com/zeta-chain/ethermint/x/evm/statedb"
 	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
 	feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"

diff --git a/app/ante/setup.go b/app/ante/setup.go
@@ -25,7 +25,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 	authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
+	ethtypes "github.com/zeta-chain/go-ethereum/core/types"
 	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
 )
 

diff --git a/app/ante/signverify_test.go b/app/ante/signverify_test.go
@@ -4,7 +4,7 @@ import (
 	"math/big"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
+	ethtypes "github.com/zeta-chain/go-ethereum/core/types"
 	"github.com/zeta-chain/ethermint/app/ante"
 	"github.com/zeta-chain/ethermint/tests"
 	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"

diff --git a/app/ante/utils_test.go b/app/ante/utils_test.go
@@ -18,8 +18,8 @@ import (
 	"github.com/zeta-chain/ethermint/testutil"
 	utiltx "github.com/zeta-chain/ethermint/testutil/tx"
 
-	"github.com/ethereum/go-ethereum/common"
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
+	"github.com/zeta-chain/go-ethereum/common"
+	ethtypes "github.com/zeta-chain/go-ethereum/core/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"

diff --git a/app/app.go b/app/app.go
@@ -143,8 +143,8 @@ import (
 	consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 
 	// Force-load the tracer engines to trigger registration due to Go-Ethereum v1.10.15 changes
-	_ "github.com/ethereum/go-ethereum/eth/tracers/js"
-	_ "github.com/ethereum/go-ethereum/eth/tracers/native"
+	_ "github.com/zeta-chain/go-ethereum/eth/tracers/js"
+	_ "github.com/zeta-chain/go-ethereum/eth/tracers/native"
 )
 
 func init() {

diff --git a/client/debug/debug.go b/client/debug/debug.go
@@ -24,7 +24,7 @@ import (
 	"github.com/cometbft/cometbft/libs/bytes"
 	"github.com/spf13/cobra"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/zeta-chain/go-ethereum/common"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"

diff --git a/client/export.go b/client/export.go
@@ -23,8 +23,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/input"
 	"github.com/cosmos/cosmos-sdk/crypto"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	ethcrypto "github.com/ethereum/go-ethereum/crypto"
+	"github.com/zeta-chain/go-ethereum/common/hexutil"
+	ethcrypto "github.com/zeta-chain/go-ethereum/crypto"
 	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"

diff --git a/client/import.go b/client/import.go
@@ -23,7 +23,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/input"
 	"github.com/cosmos/cosmos-sdk/crypto"
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/zeta-chain/go-ethereum/common"
 	"github.com/zeta-chain/ethermint/crypto/ethsecp256k1"
 
 	"github.com/zeta-chain/ethermint/crypto/hd"

diff --git a/client/testnet.go b/client/testnet.go
@@ -25,7 +25,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/zeta-chain/go-ethereum/common"
 
 	tmconfig "github.com/cometbft/cometbft/config"
 	tmrand "github.com/cometbft/cometbft/libs/rand"

diff --git a/cmd/ethermintd/genaccounts.go b/cmd/ethermintd/genaccounts.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/zeta-chain/go-ethereum/common"
 	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client"

diff --git a/crypto/ethsecp256k1/ethsecp256k1.go b/crypto/ethsecp256k1/ethsecp256k1.go
@@ -26,7 +26,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/zeta-chain/go-ethereum/crypto"
 	"github.com/zeta-chain/ethermint/ethereum/eip712"
 )
 

diff --git a/crypto/ethsecp256k1/ethsecp256k1_test.go b/crypto/ethsecp256k1/ethsecp256k1_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/codec"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/crypto/secp256k1"
+	"github.com/zeta-chain/go-ethereum/crypto"
+	"github.com/zeta-chain/go-ethereum/crypto/secp256k1"
 
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 )

diff --git a/crypto/hd/algorithm.go b/crypto/hd/algorithm.go
@@ -20,8 +20,8 @@ import (
 	"github.com/btcsuite/btcd/chaincfg"
 	bip39 "github.com/tyler-smith/go-bip39"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/zeta-chain/go-ethereum/accounts"
+	"github.com/zeta-chain/go-ethereum/crypto"
 
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"

diff --git a/crypto/hd/algorithm_test.go b/crypto/hd/algorithm_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/zeta-chain/go-ethereum/common"
 
 	amino "github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"

diff --git a/crypto/hd/utils_test.go b/crypto/hd/utils_test.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/zeta-chain/go-ethereum/accounts"
+	"github.com/zeta-chain/go-ethereum/common"
+	"github.com/zeta-chain/go-ethereum/crypto"
 
 	"github.com/btcsuite/btcd/btcutil/hdkeychain"
 	"github.com/btcsuite/btcd/chaincfg"

diff --git a/encoding/config_test.go b/encoding/config_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
+	ethtypes "github.com/zeta-chain/go-ethereum/core/types"
 
 	"github.com/zeta-chain/ethermint/app"
 	"github.com/zeta-chain/ethermint/encoding"

diff --git a/ethereum/eip712/domain.go b/ethereum/eip712/domain.go
@@ -16,8 +16,8 @@
 package eip712
 
 import (
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/signer/core/apitypes"
+	"github.com/zeta-chain/go-ethereum/common/math"
+	"github.com/zeta-chain/go-ethereum/signer/core/apitypes"
 )
 
 // createEIP712Domain creates the typed data domain for the given chainID.

diff --git a/ethereum/eip712/eip712.go b/ethereum/eip712/eip712.go
@@ -16,7 +16,7 @@
 package eip712
 
 import (
-	"github.com/ethereum/go-ethereum/signer/core/apitypes"
+	"github.com/zeta-chain/go-ethereum/signer/core/apitypes"
 )
 
 // WrapTxToTypedData wraps an Amino-encoded Cosmos Tx JSON SignDoc

diff --git a/ethereum/eip712/eip712_legacy.go b/ethereum/eip712/eip712_legacy.go
@@ -30,9 +30,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/signer/core/apitypes"
+	"github.com/zeta-chain/go-ethereum/common"
+	"github.com/zeta-chain/go-ethereum/common/math"
+	"github.com/zeta-chain/go-ethereum/signer/core/apitypes"
 )
 
 type FeeDelegationOptions struct {

diff --git a/ethereum/eip712/eip712_test.go b/ethereum/eip712/eip712_test.go
@@ -8,8 +8,8 @@ import (
 	"cosmossdk.io/math"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/signer/core/apitypes"
+	"github.com/zeta-chain/go-ethereum/crypto"
+	"github.com/zeta-chain/go-ethereum/signer/core/apitypes"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 	"github.com/zeta-chain/ethermint/ethereum/eip712"

diff --git a/ethereum/eip712/encoding.go b/ethereum/eip712/encoding.go
@@ -24,7 +24,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	txTypes "github.com/cosmos/cosmos-sdk/types/tx"
 
-	apitypes "github.com/ethereum/go-ethereum/signer/core/apitypes"
+	apitypes "github.com/zeta-chain/go-ethereum/signer/core/apitypes"
 	"github.com/zeta-chain/ethermint/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"

diff --git a/ethereum/eip712/encoding_legacy.go b/ethereum/eip712/encoding_legacy.go
@@ -25,7 +25,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	txTypes "github.com/cosmos/cosmos-sdk/types/tx"
 
-	apitypes "github.com/ethereum/go-ethereum/signer/core/apitypes"
+	apitypes "github.com/zeta-chain/go-ethereum/signer/core/apitypes"
 	"github.com/zeta-chain/ethermint/types"
 )
 

diff --git a/ethereum/eip712/types.go b/ethereum/eip712/types.go
@@ -27,7 +27,7 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"github.com/ethereum/go-ethereum/signer/core/apitypes"
+	"github.com/zeta-chain/go-ethereum/signer/core/apitypes"
 	"github.com/tidwall/gjson"
 )
 

diff --git a/go.mod b/go.mod
@@ -18,11 +18,11 @@ require (
 	github.com/cosmos/gogoproto v1.7.0
 	github.com/cosmos/ibc-go/v7 v7.2.0
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
-	github.com/ethereum/go-ethereum v1.12.2
 	github.com/golang/protobuf v1.5.4
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
+	github.com/holiman/uint256 v1.2.4
 	github.com/improbable-eng/grpc-web v0.15.0
 	github.com/onsi/ginkgo/v2 v2.7.0
 	github.com/onsi/gomega v1.26.0
@@ -38,6 +38,8 @@ require (
 	github.com/tidwall/gjson v1.14.4
 	github.com/tidwall/sjson v1.2.5
 	github.com/tyler-smith/go-bip39 v1.1.0
+	github.com/zeta-chain/go-ethereum v1.13.16-0.20241017183300-40bd3394b00f
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
 	golang.org/x/net v0.23.0
 	golang.org/x/text v0.14.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80
@@ -58,7 +60,6 @@ require (
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.1 // indirect
 	github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
-	github.com/DataDog/zstd v1.5.2 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
@@ -77,9 +78,7 @@ require (
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
 	github.com/cockroachdb/errors v1.10.0 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
-	github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect
 	github.com/cockroachdb/redact v1.1.5 // indirect
-	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
 	github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
 	github.com/confio/ics23/go v0.9.0 // indirect
 	github.com/consensys/bavard v0.1.13 // indirect
@@ -147,7 +146,6 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hdevalence/ed25519consensus v0.1.0 // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
-	github.com/holiman/uint256 v1.2.4 // indirect
 	github.com/huandu/skiplist v1.2.0 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -214,7 +212,6 @@ require (
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/oauth2 v0.16.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
@@ -242,6 +239,3 @@ replace (
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 )
-
-// ZetaChain maintained replacements
-replace github.com/ethereum/go-ethereum => ../../ethereum/go-ethereum