From 4f2e13965ac9319c06192a804b0ca4eb180ebc4f Mon Sep 17 00:00:00 2001 From: skosito Date: Sun, 5 Jan 2025 17:59:57 +0100 Subject: [PATCH] fix imports --- app/ante/ante_test.go | 10 ++++----- app/ante/eth_test.go | 12 +++++------ app/ante/utils_test.go | 18 ++++++++-------- app/signer.go | 2 +- app/utils.go | 4 ++-- cmd/ethermintd/root.go | 20 ++++++++--------- encoding/config.go | 4 ++-- indexer/kv_indexer_test.go | 5 ----- rpc/backend/backend_suite_test.go | 16 +++++++------- rpc/backend/chain_info_test.go | 6 +++--- store/cachekv/benchmark_test.go | 1 - store/cachekv/store.go | 2 +- store/cachekv/store_bench_test.go | 2 +- store/cachemulti/store.go | 2 +- tests/importer/importer_test.go | 2 +- testutil/network/network.go | 8 +++---- x/evm/handler_test.go | 6 +++--- x/evm/keeper/abci_test.go | 2 +- x/evm/keeper/grpc_query_test.go | 16 +++++++------- x/evm/keeper/integration_test.go | 10 ++++----- x/evm/keeper/keeper_test.go | 4 ++-- x/evm/keeper/params.go | 2 +- x/evm/keeper/state_transition.go | 9 ++++---- x/evm/keeper/statedb_test.go | 14 ++++++------ x/evm/statedb/mock_test.go | 2 +- x/evm/statedb/statedb_test.go | 5 ----- x/evm/types/msg_test.go | 8 +++---- x/evm/types/utils_test.go | 4 ++-- x/feemarket/handler.go | 26 ----------------------- x/feemarket/keeper/abci.go | 2 +- x/feemarket/keeper/integration_test.go | 8 +++---- x/feemarket/keeper/keeper_test.go | 2 +- x/feemarket/keeper/params.go | 2 +- x/feemarket/migrations/v4/migrate_test.go | 3 --- 34 files changed, 101 insertions(+), 138 deletions(-) delete mode 100644 x/feemarket/handler.go diff --git a/app/ante/ante_test.go b/app/ante/ante_test.go index f1029ec9..7054335f 100644 --- a/app/ante/ante_test.go +++ b/app/ante/ante_test.go @@ -27,11 +27,11 @@ import ( "github.com/ethereum/go-ethereum/core/types" ethparams "github.com/ethereum/go-ethereum/params" - "github.com/evmos/ethermint/app" - "github.com/evmos/ethermint/app/ante" - "github.com/evmos/ethermint/crypto/ethsecp256k1" - "github.com/evmos/ethermint/tests" - evmtypes "github.com/evmos/ethermint/x/evm/types" + "github.com/zeta-chain/ethermint/app" + "github.com/zeta-chain/ethermint/app/ante" + "github.com/zeta-chain/ethermint/crypto/ethsecp256k1" + "github.com/zeta-chain/ethermint/tests" + evmtypes "github.com/zeta-chain/ethermint/x/evm/types" amino "github.com/cosmos/cosmos-sdk/codec" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" diff --git a/app/ante/eth_test.go b/app/ante/eth_test.go index 64bfd0b5..736078d7 100644 --- a/app/ante/eth_test.go +++ b/app/ante/eth_test.go @@ -9,12 +9,12 @@ import ( storetypes "cosmossdk.io/store/types" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/evmos/ethermint/app/ante" - "github.com/evmos/ethermint/server/config" - "github.com/evmos/ethermint/tests" - ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/ethermint/x/evm/statedb" - evmtypes "github.com/evmos/ethermint/x/evm/types" + "github.com/zeta-chain/ethermint/app/ante" + "github.com/zeta-chain/ethermint/server/config" + "github.com/zeta-chain/ethermint/tests" + ethermint "github.com/zeta-chain/ethermint/types" + "github.com/zeta-chain/ethermint/x/evm/statedb" + evmtypes "github.com/zeta-chain/ethermint/x/evm/types" ) func (suite AnteTestSuite) TestNewEthAccountVerificationDecorator() { diff --git a/app/ante/utils_test.go b/app/ante/utils_test.go index e1a89655..7a13b276 100644 --- a/app/ante/utils_test.go +++ b/app/ante/utils_test.go @@ -15,10 +15,10 @@ import ( signingv1beta1 "cosmossdk.io/api/cosmos/tx/signing/v1beta1" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/evmos/ethermint/app" - "github.com/evmos/ethermint/ethereum/eip712" - "github.com/evmos/ethermint/testutil" - utiltx "github.com/evmos/ethermint/testutil/tx" + "github.com/zeta-chain/ethermint/app" + "github.com/zeta-chain/ethermint/ethereum/eip712" + "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" @@ -48,11 +48,11 @@ import ( vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - ante "github.com/evmos/ethermint/app/ante" - "github.com/evmos/ethermint/tests" - "github.com/evmos/ethermint/x/evm/statedb" - evmtypes "github.com/evmos/ethermint/x/evm/types" - feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" + ante "github.com/zeta-chain/ethermint/app/ante" + "github.com/zeta-chain/ethermint/tests" + "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" ) type AnteTestSuite struct { diff --git a/app/signer.go b/app/signer.go index 854e3b38..d80f3f6d 100644 --- a/app/signer.go +++ b/app/signer.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" mempool "github.com/cosmos/cosmos-sdk/types/mempool" authante "github.com/cosmos/cosmos-sdk/x/auth/ante" - evmtypes "github.com/evmos/ethermint/x/evm/types" + evmtypes "github.com/zeta-chain/ethermint/x/evm/types" ) var _ mempool.SignerExtractionAdapter = EthSignerExtractionAdapter{} diff --git a/app/utils.go b/app/utils.go index 0255cb9d..d6a53765 100644 --- a/app/utils.go +++ b/app/utils.go @@ -36,8 +36,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/evmos/ethermint/encoding" - ethermint "github.com/evmos/ethermint/types" + "github.com/zeta-chain/ethermint/encoding" + ethermint "github.com/zeta-chain/ethermint/types" ) type GenesisState map[string]json.RawMessage diff --git a/cmd/ethermintd/root.go b/cmd/ethermintd/root.go index 063adf87..54ff3255 100644 --- a/cmd/ethermintd/root.go +++ b/cmd/ethermintd/root.go @@ -33,6 +33,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/tx" txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config" + "cosmossdk.io/store" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" clientcfg "github.com/cosmos/cosmos-sdk/client/config" @@ -44,7 +45,6 @@ import ( servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/cosmos/cosmos-sdk/snapshots" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" - "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/tx/signing" @@ -55,15 +55,15 @@ import ( genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" rosettaCmd "github.com/cosmos/rosetta/cmd" - "github.com/evmos/ethermint/app" - ethermintclient "github.com/evmos/ethermint/client" - "github.com/evmos/ethermint/client/debug" - "github.com/evmos/ethermint/crypto/hd" - "github.com/evmos/ethermint/ethereum/eip712" - "github.com/evmos/ethermint/server" - servercfg "github.com/evmos/ethermint/server/config" - srvflags "github.com/evmos/ethermint/server/flags" - ethermint "github.com/evmos/ethermint/types" + "github.com/zeta-chain/ethermint/app" + ethermintclient "github.com/zeta-chain/ethermint/client" + "github.com/zeta-chain/ethermint/client/debug" + "github.com/zeta-chain/ethermint/crypto/hd" + "github.com/zeta-chain/ethermint/ethereum/eip712" + "github.com/zeta-chain/ethermint/server" + servercfg "github.com/zeta-chain/ethermint/server/config" + srvflags "github.com/zeta-chain/ethermint/server/flags" + ethermint "github.com/zeta-chain/ethermint/types" ) const EnvPrefix = "ETHERMINT" diff --git a/encoding/config.go b/encoding/config.go index d730e6df..c67689c0 100644 --- a/encoding/config.go +++ b/encoding/config.go @@ -25,8 +25,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/tx" gogoproto "github.com/cosmos/gogoproto/proto" "github.com/ethereum/go-ethereum/common" - enccodec "github.com/evmos/ethermint/encoding/codec" - ethermint "github.com/evmos/ethermint/types" + enccodec "github.com/zeta-chain/ethermint/encoding/codec" + ethermint "github.com/zeta-chain/ethermint/types" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" ) diff --git a/indexer/kv_indexer_test.go b/indexer/kv_indexer_test.go index 538847c3..eb215871 100644 --- a/indexer/kv_indexer_test.go +++ b/indexer/kv_indexer_test.go @@ -11,11 +11,6 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/evmos/ethermint/app" - "github.com/evmos/ethermint/crypto/ethsecp256k1" - "github.com/evmos/ethermint/indexer" - "github.com/evmos/ethermint/tests" - "github.com/evmos/ethermint/x/evm/types" "github.com/stretchr/testify/require" "github.com/zeta-chain/ethermint/app" "github.com/zeta-chain/ethermint/crypto/ethsecp256k1" diff --git a/rpc/backend/backend_suite_test.go b/rpc/backend/backend_suite_test.go index e0b5c344..f84fd034 100644 --- a/rpc/backend/backend_suite_test.go +++ b/rpc/backend/backend_suite_test.go @@ -18,14 +18,14 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/suite" - "github.com/evmos/ethermint/app" - "github.com/evmos/ethermint/crypto/ethsecp256k1" - "github.com/evmos/ethermint/crypto/hd" - "github.com/evmos/ethermint/indexer" - "github.com/evmos/ethermint/rpc/backend/mocks" - rpctypes "github.com/evmos/ethermint/rpc/types" - "github.com/evmos/ethermint/tests" - evmtypes "github.com/evmos/ethermint/x/evm/types" + "github.com/zeta-chain/ethermint/app" + "github.com/zeta-chain/ethermint/crypto/ethsecp256k1" + "github.com/zeta-chain/ethermint/crypto/hd" + "github.com/zeta-chain/ethermint/indexer" + "github.com/zeta-chain/ethermint/rpc/backend/mocks" + rpctypes "github.com/zeta-chain/ethermint/rpc/types" + "github.com/zeta-chain/ethermint/tests" + evmtypes "github.com/zeta-chain/ethermint/x/evm/types" ) type BackendTestSuite struct { diff --git a/rpc/backend/chain_info_test.go b/rpc/backend/chain_info_test.go index a0f2e16d..72214ec1 100644 --- a/rpc/backend/chain_info_test.go +++ b/rpc/backend/chain_info_test.go @@ -16,9 +16,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkmath "cosmossdk.io/math" - "github.com/evmos/ethermint/rpc/backend/mocks" - evmtypes "github.com/evmos/ethermint/x/evm/types" - feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" + "github.com/zeta-chain/ethermint/rpc/backend/mocks" + evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" ) func (suite *BackendTestSuite) TestBaseFee() { diff --git a/store/cachekv/benchmark_test.go b/store/cachekv/benchmark_test.go index 0bad322e..d8788e3d 100644 --- a/store/cachekv/benchmark_test.go +++ b/store/cachekv/benchmark_test.go @@ -6,7 +6,6 @@ import ( "cosmossdk.io/store/dbadapter" dbm "github.com/cosmos/cosmos-db" - "github.com/evmos/ethermint/store/cachekv" "github.com/stretchr/testify/require" "github.com/zeta-chain/ethermint/store/cachekv" ) diff --git a/store/cachekv/store.go b/store/cachekv/store.go index 9e809d49..56285d14 100644 --- a/store/cachekv/store.go +++ b/store/cachekv/store.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/store/tracekv" "cosmossdk.io/store/types" - "github.com/evmos/ethermint/store/cachekv/internal" + "github.com/zeta-chain/ethermint/store/cachekv/internal" ) // Store wraps an in-memory cache around an underlying types.KVStore. diff --git a/store/cachekv/store_bench_test.go b/store/cachekv/store_bench_test.go index 9e7ece49..7d15d045 100644 --- a/store/cachekv/store_bench_test.go +++ b/store/cachekv/store_bench_test.go @@ -6,7 +6,7 @@ import ( dbm "github.com/cosmos/cosmos-db" "cosmossdk.io/store/dbadapter" - "github.com/evmos/ethermint/store/cachekv" + "github.com/zeta-chain/ethermint/store/cachekv" ) var sink interface{} diff --git a/store/cachemulti/store.go b/store/cachemulti/store.go index 2a78c8ad..640e0182 100644 --- a/store/cachemulti/store.go +++ b/store/cachemulti/store.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/store/tracekv" "cosmossdk.io/store/types" - "github.com/evmos/ethermint/store/cachekv" + "github.com/zeta-chain/ethermint/store/cachekv" ) // storeNameCtxKey is the TraceContext metadata key that identifies diff --git a/tests/importer/importer_test.go b/tests/importer/importer_test.go index b0dc26c8..0e501f23 100644 --- a/tests/importer/importer_test.go +++ b/tests/importer/importer_test.go @@ -9,7 +9,7 @@ import ( "time" sdkmath "cosmossdk.io/math" - "github.com/evmos/ethermint/app" + "github.com/zeta-chain/ethermint/app" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/testutil/network/network.go b/testutil/network/network.go index 02920eb9..8ebe5d9a 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -63,10 +63,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/evmos/ethermint/crypto/hd" - "github.com/evmos/ethermint/server/config" - ethermint "github.com/evmos/ethermint/types" - evmtypes "github.com/evmos/ethermint/x/evm/types" + "github.com/zeta-chain/ethermint/crypto/hd" + "github.com/zeta-chain/ethermint/server/config" + ethermint "github.com/zeta-chain/ethermint/types" + evmtypes "github.com/zeta-chain/ethermint/x/evm/types" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" "github.com/zeta-chain/ethermint/app" diff --git a/x/evm/handler_test.go b/x/evm/handler_test.go index c985873f..002da3c5 100644 --- a/x/evm/handler_test.go +++ b/x/evm/handler_test.go @@ -32,9 +32,9 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/ethermint/app" - ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/ethermint/x/evm/types" + "github.com/zeta-chain/ethermint/app" + ethermint "github.com/zeta-chain/ethermint/types" + "github.com/zeta-chain/ethermint/x/evm/types" ) type HandlerTestSuite struct { diff --git a/x/evm/keeper/abci_test.go b/x/evm/keeper/abci_test.go index 482c362a..c4167f68 100644 --- a/x/evm/keeper/abci_test.go +++ b/x/evm/keeper/abci_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - evmtypes "github.com/evmos/ethermint/x/evm/types" + evmtypes "github.com/zeta-chain/ethermint/x/evm/types" ) func (suite *KeeperTestSuite) TestEndBlock() { diff --git a/x/evm/keeper/grpc_query_test.go b/x/evm/keeper/grpc_query_test.go index 92ab2067..b9d69a67 100644 --- a/x/evm/keeper/grpc_query_test.go +++ b/x/evm/keeper/grpc_query_test.go @@ -16,16 +16,16 @@ import ( "github.com/ethereum/go-ethereum/crypto" ethlogger "github.com/ethereum/go-ethereum/eth/tracers/logger" ethparams "github.com/ethereum/go-ethereum/params" - "github.com/evmos/ethermint/app" - "github.com/evmos/ethermint/server/config" - "github.com/evmos/ethermint/tests" - "github.com/evmos/ethermint/testutil" - ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/ethermint/x/evm/statedb" - "github.com/evmos/ethermint/x/evm/types" - feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + "github.com/zeta-chain/ethermint/app" + "github.com/zeta-chain/ethermint/server/config" + "github.com/zeta-chain/ethermint/tests" + "github.com/zeta-chain/ethermint/testutil" + ethermint "github.com/zeta-chain/ethermint/types" + "github.com/zeta-chain/ethermint/x/evm/statedb" + "github.com/zeta-chain/ethermint/x/evm/types" + feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" ) // Not valid Ethereum address diff --git a/x/evm/keeper/integration_test.go b/x/evm/keeper/integration_test.go index fd0e9a86..5f69d781 100644 --- a/x/evm/keeper/integration_test.go +++ b/x/evm/keeper/integration_test.go @@ -14,12 +14,12 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/evmos/ethermint/app" - "github.com/evmos/ethermint/tests" - "github.com/evmos/ethermint/testutil" + "github.com/zeta-chain/ethermint/app" + "github.com/zeta-chain/ethermint/tests" + "github.com/zeta-chain/ethermint/testutil" - evmtypes "github.com/evmos/ethermint/x/evm/types" - feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" + evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" ) var _ = Describe("Feemarket", func() { diff --git a/x/evm/keeper/keeper_test.go b/x/evm/keeper/keeper_test.go index 10c9e905..6dc89b85 100644 --- a/x/evm/keeper/keeper_test.go +++ b/x/evm/keeper/keeper_test.go @@ -21,8 +21,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/ethermint/testutil" - feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" + "github.com/zeta-chain/ethermint/testutil" + feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" "github.com/zeta-chain/ethermint/app" "github.com/zeta-chain/ethermint/crypto/ethsecp256k1" diff --git a/x/evm/keeper/params.go b/x/evm/keeper/params.go index 99005b64..7e304a0b 100644 --- a/x/evm/keeper/params.go +++ b/x/evm/keeper/params.go @@ -17,7 +17,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/ethermint/x/evm/types" + "github.com/zeta-chain/ethermint/x/evm/types" ) // GetParams returns the total set of evm parameters. diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go index 75cd5002..66ca2989 100644 --- a/x/evm/keeper/state_transition.go +++ b/x/evm/keeper/state_transition.go @@ -21,13 +21,14 @@ import ( "math/big" cmttypes "github.com/cometbft/cometbft/types" + "github.com/holiman/uint256" errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/ethermint/x/evm/statedb" - "github.com/evmos/ethermint/x/evm/types" + ethermint "github.com/zeta-chain/ethermint/types" + "github.com/zeta-chain/ethermint/x/evm/statedb" + "github.com/zeta-chain/ethermint/x/evm/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" @@ -441,7 +442,7 @@ func (k *Keeper) ApplyMessageWithConfig(ctx sdk.Context, // calculate a minimum amount of gas to be charged to sender if GasLimit // is considerably higher than GasUsed to stay more aligned with Tendermint gas mechanics - // for more info https://github.com/evmos/ethermint/issues/1085 + // for more info https://github.com/zeta-chain/ethermint/issues/1085 gasLimit := sdkmath.LegacyNewDec(int64(msg.GasLimit)) minGasMultiplier := cfg.FeeMarketParams.MinGasMultiplier if minGasMultiplier.IsNil() { diff --git a/x/evm/keeper/statedb_test.go b/x/evm/keeper/statedb_test.go index 3898e3de..458996f2 100644 --- a/x/evm/keeper/statedb_test.go +++ b/x/evm/keeper/statedb_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "fmt" "math/big" + "testing" "cosmossdk.io/store/prefix" "github.com/cosmos/cosmos-sdk/client" @@ -13,17 +14,18 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/holiman/uint256" + "github.com/stretchr/testify/suite" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" - "github.com/evmos/ethermint/crypto/ethsecp256k1" - "github.com/evmos/ethermint/encoding" - "github.com/evmos/ethermint/tests" - "github.com/evmos/ethermint/testutil" - "github.com/evmos/ethermint/x/evm/statedb" - "github.com/evmos/ethermint/x/evm/types" + "github.com/zeta-chain/ethermint/crypto/ethsecp256k1" + "github.com/zeta-chain/ethermint/encoding" + "github.com/zeta-chain/ethermint/tests" + "github.com/zeta-chain/ethermint/testutil" + "github.com/zeta-chain/ethermint/x/evm/statedb" + "github.com/zeta-chain/ethermint/x/evm/types" ) type StateDBTestSuite struct { diff --git a/x/evm/statedb/mock_test.go b/x/evm/statedb/mock_test.go index c2028e45..ad3d23dd 100644 --- a/x/evm/statedb/mock_test.go +++ b/x/evm/statedb/mock_test.go @@ -7,7 +7,7 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" diff --git a/x/evm/statedb/statedb_test.go b/x/evm/statedb/statedb_test.go index ef7c668a..5a08f6ba 100644 --- a/x/evm/statedb/statedb_test.go +++ b/x/evm/statedb/statedb_test.go @@ -24,11 +24,6 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" - "github.com/evmos/ethermint/app" - ethermint "github.com/evmos/ethermint/types" - evmkeeper "github.com/evmos/ethermint/x/evm/keeper" - "github.com/evmos/ethermint/x/evm/statedb" - evmtypes "github.com/evmos/ethermint/x/evm/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" "github.com/zeta-chain/ethermint/app" diff --git a/x/evm/types/msg_test.go b/x/evm/types/msg_test.go index 508a44d3..ea1948a4 100644 --- a/x/evm/types/msg_test.go +++ b/x/evm/types/msg_test.go @@ -13,15 +13,15 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/ethermint/app" - "github.com/evmos/ethermint/crypto/ethsecp256k1" - "github.com/evmos/ethermint/tests" + "github.com/zeta-chain/ethermint/app" + "github.com/zeta-chain/ethermint/crypto/ethsecp256k1" + "github.com/zeta-chain/ethermint/tests" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/evmos/ethermint/x/evm/types" + "github.com/zeta-chain/ethermint/x/evm/types" ) const invalidFromAddress = "0x0000" diff --git a/x/evm/types/utils_test.go b/x/evm/types/utils_test.go index a09a43d7..b88a5ddf 100644 --- a/x/evm/types/utils_test.go +++ b/x/evm/types/utils_test.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" proto "github.com/cosmos/gogoproto/proto" - "github.com/evmos/ethermint/app" - evmtypes "github.com/evmos/ethermint/x/evm/types" + "github.com/zeta-chain/ethermint/app" + evmtypes "github.com/zeta-chain/ethermint/x/evm/types" "github.com/zeta-chain/ethermint/tests" diff --git a/x/feemarket/handler.go b/x/feemarket/handler.go deleted file mode 100644 index b261eb6b..00000000 --- a/x/feemarket/handler.go +++ /dev/null @@ -1,26 +0,0 @@ -package feemarket - -import ( - errorsmod "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" - errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/zeta-chain/ethermint/x/feemarket/types" -) - -// NewHandler returns a handler for Ethermint type messages. -func NewHandler(server types.MsgServer) sdk.Handler { - return func(ctx sdk.Context, msg sdk.Msg) (result *sdk.Result, err error) { - ctx = ctx.WithEventManager(sdk.NewEventManager()) - - switch msg := msg.(type) { - case *types.MsgUpdateParams: - // execute state transition - res, err := server.UpdateParams(sdk.WrapSDKContext(ctx), msg) - return sdk.WrapServiceResult(ctx, res, err) - - default: - err := errorsmod.Wrapf(errortypes.ErrUnknownRequest, "unrecognized %s message type: %T", types.ModuleName, msg) - return nil, err - } - } -} diff --git a/x/feemarket/keeper/abci.go b/x/feemarket/keeper/abci.go index 19913bf2..b72d959b 100644 --- a/x/feemarket/keeper/abci.go +++ b/x/feemarket/keeper/abci.go @@ -20,7 +20,7 @@ import ( "fmt" "math" - "github.com/evmos/ethermint/x/feemarket/types" + "github.com/zeta-chain/ethermint/x/feemarket/types" sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/telemetry" diff --git a/x/feemarket/keeper/integration_test.go b/x/feemarket/keeper/integration_test.go index 539ba4c3..ec16933b 100644 --- a/x/feemarket/keeper/integration_test.go +++ b/x/feemarket/keeper/integration_test.go @@ -18,10 +18,10 @@ import ( authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/evmos/ethermint/tests" - "github.com/evmos/ethermint/testutil" - evmtypes "github.com/evmos/ethermint/x/evm/types" - feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" + "github.com/zeta-chain/ethermint/tests" + "github.com/zeta-chain/ethermint/testutil" + evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" ) var _ = Describe("Feemarket", func() { diff --git a/x/feemarket/keeper/keeper_test.go b/x/feemarket/keeper/keeper_test.go index 354a5222..9473f7d2 100644 --- a/x/feemarket/keeper/keeper_test.go +++ b/x/feemarket/keeper/keeper_test.go @@ -8,8 +8,8 @@ import ( sdkmath "cosmossdk.io/math" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/evmos/ethermint/testutil" "github.com/stretchr/testify/suite" + "github.com/zeta-chain/ethermint/testutil" ) type KeeperTestSuite struct { diff --git a/x/feemarket/keeper/params.go b/x/feemarket/keeper/params.go index 06a48278..9abb5714 100644 --- a/x/feemarket/keeper/params.go +++ b/x/feemarket/keeper/params.go @@ -19,7 +19,7 @@ import ( "math/big" sdkmath "cosmossdk.io/math" - "github.com/evmos/ethermint/x/feemarket/types" + "github.com/zeta-chain/ethermint/x/feemarket/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/feemarket/migrations/v4/migrate_test.go b/x/feemarket/migrations/v4/migrate_test.go index 33c16694..8f7176a5 100644 --- a/x/feemarket/migrations/v4/migrate_test.go +++ b/x/feemarket/migrations/v4/migrate_test.go @@ -6,9 +6,6 @@ import ( storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/ethermint/app" - v4 "github.com/evmos/ethermint/x/feemarket/migrations/v4" - "github.com/evmos/ethermint/x/feemarket/types" "github.com/stretchr/testify/require" "github.com/zeta-chain/ethermint/app" v4 "github.com/zeta-chain/ethermint/x/feemarket/migrations/v4"