update deps

app/app.go

@@ -155,7 +155,6 @@ import (
 	"github.com/crypto-org-chain/cronos/v2/client/docs"
 
 	// Force-load the tracer engines to trigger registration
-	"github.com/ethereum/go-ethereum/core/vm"
 	_ "github.com/ethereum/go-ethereum/eth/tracers/js"
 	_ "github.com/ethereum/go-ethereum/eth/tracers/native"
 
@@ -531,18 +530,23 @@ func New(
 	)
 	// Set authority to x/gov module account to only expect the module account to update params
 	evmS := app.GetSubspace(evmtypes.ModuleName)
+	newKeys := make(map[string]*storetypes.KVStoreKey, len(keys))
+	for k, v := range keys {
+		newKeys[k] = v
+	}
+	for k := range memKeys {
+		newKeys[k] = sdk.NewKVStoreKey(k)
+	}
 	app.EvmKeeper = evmkeeper.NewKeeper(
 		appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey], authtypes.NewModuleAddress(govtypes.ModuleName),
 		app.AccountKeeper, app.BankKeeper, app.StakingKeeper,
 		app.FeeMarketKeeper,
 		tracer,
 		evmS,
-		func(ctx sdk.Context, stateDB vm.StateDB) []precompiles.StatefulPrecompiledContract {
-			return []precompiles.StatefulPrecompiledContract{
-				cronosprecompiles.NewRelayerContract(app.IBCKeeper, appCodec),
-			}
+		[]precompiles.StatefulPrecompiledContract{
+			cronosprecompiles.NewRelayerContract(app.IBCKeeper, appCodec),
 		},
-		keys,
+		newKeys,
 	)
 
 	var gravityKeeper gravitykeeper.Keeper

go.mod

@@ -239,7 +239,7 @@ replace (
 	// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
 	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/ethereum/go-ethereum => github.com/evmos/go-ethereum v1.10.26-evmos-rc1
-	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20230908053020-668737177ae6
+	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20230909013404-6a00c3a1e048
 	// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
 	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0

go.sum

@@ -497,8 +497,8 @@ github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6 h1:d4
 github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6/go.mod h1:hF5aclS++7WrW8USOA3zPeKI0CuzwUD2TPYug25ANlQ=
 github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20230905040840-b3af5590283b h1:d2GOFR3i3BjDlPsmJkp8Gsrt9LK2nq2IVEnE/rMv1Fo=
 github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20230905040840-b3af5590283b/go.mod h1:EHwCeN9IXonsjKcjpS12MqeStdZvIdxt3VYXhus3G3c=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20230908053020-668737177ae6 h1:j995CNfEaOno1cFCUSxMNXhLgCpxtw5AM1246FPyJPo=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20230908053020-668737177ae6/go.mod h1:xT6yzwilauRVhkvhjj7lDzazfgG4ZeUNSoQsuKImitY=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20230909013404-6a00c3a1e048 h1:ywpTAnLbh2PsqAwxMxRF8y642eao6MxZTOPNzCjqbjA=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20230909013404-6a00c3a1e048/go.mod h1:xT6yzwilauRVhkvhjj7lDzazfgG4ZeUNSoQsuKImitY=
 github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e h1:rSTc35OBjjCBx47rHPWBCIHNGPbMnEj8f7fNcK2TjVI=
 github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e/go.mod h1:HBaDqlFjlaXJwVQtA7jHejyaA7xwjXI2o6pU/ccP3tE=
 github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=

gomod2nix.toml

@@ -219,8 +219,8 @@ schema = 3
     hash = "sha256-GgcReGsIIuBE2TabDYqDO9sBGogdVr9RSh4arQzdPnE="
     replaced = "github.com/evmos/go-ethereum"
   [mod."github.com/evmos/ethermint"]
-    version = "v0.6.1-0.20230908053020-668737177ae6"
-    hash = "sha256-WogOWeQ8wifQQUAYhV68X9HYFG+/TuELkG1sHOZXsbI="
+    version = "v0.6.1-0.20230909013404-6a00c3a1e048"
+    hash = "sha256-6BqQEF40SzdjDoBk0NCPaXeblLkEbk4KVj9ls9noknI="
     replaced = "github.com/crypto-org-chain/ethermint"
   [mod."github.com/felixge/httpsnoop"]
     version = "v1.0.2"

scripts/run-integration-tests

@@ -10,4 +10,4 @@ cd ../integration_tests/contracts
 HUSKY_SKIP_INSTALL=1 npm install
 npm run typechain
 cd ..
-nix-shell --run "pytest -vv -s"
+nix-shell --run "pytest -v -s test_ibc_rly.py::test_ibc"