From 1551c2e9b97fc3705d2cefe4048c6b1f6a40d0e4 Mon Sep 17 00:00:00 2001 From: kakysha Date: Fri, 11 Oct 2024 15:30:26 +0300 Subject: [PATCH 1/2] fix: simapp adapt for EVM changes --- testing/simapp/app.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testing/simapp/app.go b/testing/simapp/app.go index af023eed295..4e420dc53e8 100644 --- a/testing/simapp/app.go +++ b/testing/simapp/app.go @@ -131,6 +131,7 @@ import ( ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" ibcmock "github.com/cosmos/ibc-go/v8/testing/mock" ibctestingtypes "github.com/cosmos/ibc-go/v8/testing/types" + evmtypes "github.com/evmos/ethermint/x/evm/types" ) const appName = "SimApp" @@ -312,6 +313,7 @@ func NewSimApp( tkeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, ibcmock.MemStoreKey) + objKeys := storetypes.NewObjectStoreKeys(banktypes.ObjectStoreKey, evmtypes.ObjectStoreKey) app := &SimApp{ BaseApp: bApp, @@ -359,6 +361,7 @@ func NewSimApp( appCodec, runtime.NewKVStoreService(keys[banktypes.StoreKey]), runtime.NewTransientKVStoreService(tkeys[banktypes.TStoreKey]), + objKeys[banktypes.ObjectStoreKey], app.AccountKeeper, BlockedAddresses(), authtypes.NewModuleAddress(govtypes.ModuleName).String(), From 9bdeacdceafb2f1a718f87349d8485c7cd78ca3f Mon Sep 17 00:00:00 2001 From: kakysha Date: Fri, 29 Nov 2024 00:36:31 +0200 Subject: [PATCH 2/2] fix: evmtypes package migrated into core --- testing/simapp/app.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/simapp/app.go b/testing/simapp/app.go index 4e420dc53e8..29ae17d45de 100644 --- a/testing/simapp/app.go +++ b/testing/simapp/app.go @@ -131,7 +131,8 @@ import ( ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" ibcmock "github.com/cosmos/ibc-go/v8/testing/mock" ibctestingtypes "github.com/cosmos/ibc-go/v8/testing/types" - evmtypes "github.com/evmos/ethermint/x/evm/types" + + evmtypes "github.com/InjectiveLabs/injective-core/injective-chain/modules/evm/types" ) const appName = "SimApp"