From bbf664459d8daf8f5af75e1c7164fe32ed052c67 Mon Sep 17 00:00:00 2001 From: Vlad Date: Mon, 13 Oct 2025 15:20:27 -0400 Subject: [PATCH] re-add getter for test compatibility --- evmd/app.go | 42 ++++++-------------- evmd/tests/integration/x_precisebank_test.go | 14 +++---- interfaces.go | 4 +- 3 files changed, 21 insertions(+), 39 deletions(-) diff --git a/evmd/app.go b/evmd/app.go index d39be14c8..1d386d35a 100644 --- a/evmd/app.go +++ b/evmd/app.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" "fmt" - + precisebankkeeper "github.com/cosmos/evm/x/precisebank/keeper" "io" "os" @@ -40,9 +40,6 @@ import ( "github.com/cosmos/evm/x/ibc/transfer" transferkeeper "github.com/cosmos/evm/x/ibc/transfer/keeper" transferv2 "github.com/cosmos/evm/x/ibc/transfer/v2" - "github.com/cosmos/evm/x/precisebank" - precisebankkeeper "github.com/cosmos/evm/x/precisebank/keeper" - precisebanktypes "github.com/cosmos/evm/x/precisebank/types" "github.com/cosmos/evm/x/vm" evmkeeper "github.com/cosmos/evm/x/vm/keeper" evmtypes "github.com/cosmos/evm/x/vm/types" @@ -187,11 +184,10 @@ type EVMD struct { CallbackKeeper ibccallbackskeeper.ContractKeeper // Cosmos EVM keepers - FeeMarketKeeper feemarketkeeper.Keeper - EVMKeeper *evmkeeper.Keeper - Erc20Keeper erc20keeper.Keeper - PreciseBankKeeper precisebankkeeper.Keeper - EVMMempool *evmmempool.ExperimentalEVMMempool + FeeMarketKeeper feemarketkeeper.Keeper + EVMKeeper *evmkeeper.Keeper + Erc20Keeper erc20keeper.Keeper + EVMMempool *evmmempool.ExperimentalEVMMempool // the module manager ModuleManager *module.Manager @@ -242,7 +238,7 @@ func NewExampleApp( // ibc keys ibcexported.StoreKey, ibctransfertypes.StoreKey, // Cosmos EVM store keys - evmtypes.StoreKey, feemarkettypes.StoreKey, erc20types.StoreKey, precisebanktypes.StoreKey, + evmtypes.StoreKey, feemarkettypes.StoreKey, erc20types.StoreKey, ) tkeys := storetypes.NewTransientStoreKeys(evmtypes.TransientKey, feemarkettypes.TransientKey) @@ -405,7 +401,7 @@ func NewExampleApp( app.GovKeeper = *govKeeper.SetHooks( govtypes.NewMultiGovHooks( - // register the governance hooks + // register the governance hooks ), ) @@ -428,16 +424,6 @@ func NewExampleApp( tkeys[feemarkettypes.TransientKey], ) - // Set up PreciseBank keeper - // - // NOTE: PreciseBank is not needed if SDK use 18 decimals for gas coin. Use BankKeeper instead. - app.PreciseBankKeeper = precisebankkeeper.NewKeeper( - appCodec, - keys[precisebanktypes.StoreKey], - app.BankKeeper, - app.AccountKeeper, - ) - // Set up EVM keeper tracer := cast.ToString(appOpts.Get(srvflags.EVMTracer)) @@ -447,7 +433,7 @@ func NewExampleApp( appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey], keys, authtypes.NewModuleAddress(govtypes.ModuleName), app.AccountKeeper, - app.PreciseBankKeeper, + app.BankKeeper, app.StakingKeeper, app.FeeMarketKeeper, &app.ConsensusParamsKeeper, @@ -458,7 +444,7 @@ func NewExampleApp( precompiletypes.DefaultStaticPrecompiles( *app.StakingKeeper, app.DistrKeeper, - app.PreciseBankKeeper, + app.BankKeeper, &app.Erc20Keeper, &app.TransferKeeper, app.IBCKeeper.ChannelKeeper, @@ -473,7 +459,7 @@ func NewExampleApp( appCodec, authtypes.NewModuleAddress(govtypes.ModuleName), app.AccountKeeper, - app.PreciseBankKeeper, + app.BankKeeper, app.EVMKeeper, app.StakingKeeper, &app.TransferKeeper, @@ -572,7 +558,6 @@ func NewExampleApp( vm.NewAppModule(app.EVMKeeper, app.AccountKeeper, app.BankKeeper, app.AccountKeeper.AddressCodec()), feemarket.NewAppModule(app.FeeMarketKeeper), erc20.NewAppModule(app.Erc20Keeper, app.AccountKeeper), - precisebank.NewAppModule(app.PreciseBankKeeper, app.BankKeeper, app.AccountKeeper), ) // BasicModuleManager defines the module BasicManager which is in charge of setting up basic, @@ -620,7 +605,6 @@ func NewExampleApp( authtypes.ModuleName, banktypes.ModuleName, govtypes.ModuleName, genutiltypes.ModuleName, authz.ModuleName, feegrant.ModuleName, consensusparamtypes.ModuleName, - precisebanktypes.ModuleName, vestingtypes.ModuleName, ) @@ -639,7 +623,6 @@ func NewExampleApp( slashingtypes.ModuleName, minttypes.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, feegrant.ModuleName, upgradetypes.ModuleName, consensusparamtypes.ModuleName, - precisebanktypes.ModuleName, vestingtypes.ModuleName, ) @@ -659,7 +642,6 @@ func NewExampleApp( evmtypes.ModuleName, feemarkettypes.ModuleName, erc20types.ModuleName, - precisebanktypes.ModuleName, ibctransfertypes.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, @@ -1065,7 +1047,9 @@ func (app *EVMD) GetMintKeeper() mintkeeper.Keeper { } func (app *EVMD) GetPreciseBankKeeper() *precisebankkeeper.Keeper { - return &app.PreciseBankKeeper + return nil + // Uncomment if using PreciseBank + //return &app.PreciseBankKeeper } func (app *EVMD) GetCallbackKeeper() ibccallbackskeeper.ContractKeeper { diff --git a/evmd/tests/integration/x_precisebank_test.go b/evmd/tests/integration/x_precisebank_test.go index 950b473f4..ae8c7a8c3 100644 --- a/evmd/tests/integration/x_precisebank_test.go +++ b/evmd/tests/integration/x_precisebank_test.go @@ -2,18 +2,16 @@ package integration import ( "testing" - - "github.com/stretchr/testify/suite" - - "github.com/cosmos/evm/tests/integration/x/precisebank" ) func TestPreciseBankGenesis(t *testing.T) { - s := precisebank.NewGenesisTestSuite(CreateEvmd) - suite.Run(t, s) + // Uncomment these lines if using PreciseBank + //s := precisebank.NewGenesisTestSuite(CreateEvmd) + //suite.Run(t, s) } func TestPreciseBankKeeper(t *testing.T) { - s := precisebank.NewKeeperIntegrationTestSuite(CreateEvmd) - suite.Run(t, s) + // Uncomment these lines if using PreciseBank + //s := precisebank.NewKeeperIntegrationTestSuite(CreateEvmd) + //suite.Run(t, s) } diff --git a/interfaces.go b/interfaces.go index ecebf7e16..9b8c21a3a 100644 --- a/interfaces.go +++ b/interfaces.go @@ -2,12 +2,12 @@ package evm import ( "encoding/json" + precisebankkeeper "github.com/cosmos/evm/x/precisebank/keeper" erc20keeper "github.com/cosmos/evm/x/erc20/keeper" feemarketkeeper "github.com/cosmos/evm/x/feemarket/keeper" "github.com/cosmos/evm/x/ibc/callbacks/keeper" transferkeeper "github.com/cosmos/evm/x/ibc/transfer/keeper" - precisebankkeeper "github.com/cosmos/evm/x/precisebank/keeper" evmkeeper "github.com/cosmos/evm/x/vm/keeper" ibctesting "github.com/cosmos/ibc-go/v10/testing" @@ -50,7 +50,6 @@ type EvmApp interface { //nolint:revive GetDistrKeeper() distrkeeper.Keeper GetStakingKeeper() *stakingkeeper.Keeper GetMintKeeper() mintkeeper.Keeper - GetPreciseBankKeeper() *precisebankkeeper.Keeper GetFeeGrantKeeper() feegrantkeeper.Keeper GetConsensusParamsKeeper() consensusparamkeeper.Keeper GetCallbackKeeper() keeper.ContractKeeper @@ -61,4 +60,5 @@ type EvmApp interface { //nolint:revive GetAnteHandler() sdk.AnteHandler MsgServiceRouter() *baseapp.MsgServiceRouter GetMempool() mempool.ExtMempool + GetPreciseBankKeeper() *precisebankkeeper.Keeper }