update ethermint

app/app.go

@@ -572,6 +572,7 @@ func New(
 		appCodec,
 		authtypes.NewModuleAddress(govtypes.ModuleName),
 		keys[feemarkettypes.StoreKey], okeys[feemarkettypes.ObjectStoreKey],
+		feeMarketS,
 	)
 	// Set authority to x/gov module account to only expect the module account to update params
 	evmS := app.GetSubspace(evmtypes.ModuleName)
@@ -582,6 +583,7 @@ func New(
 		keys[evmtypes.StoreKey], okeys[evmtypes.ObjectStoreKey], authtypes.NewModuleAddress(govtypes.ModuleName),
 		app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.FeeMarketKeeper,
 		tracer,
+		evmS,
 		[]evmkeeper.CustomContractFn{
 			func(_ sdk.Context, rules ethparams.Rules) vm.PrecompiledContract {
 				return cronosprecompiles.NewRelayerContract(app.IBCKeeper, appCodec, rules, app.Logger())

go.mod

@@ -267,12 +267,11 @@ replace (
 	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231207063621-43cf32d91c3e
 	// block-stm branch
-	github.com/evmos/ethermint => github.com/yihuang/ethermint v0.6.1-0.20240408035005-423db7fe92a3
+	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240410042357-84bb0fb9ceb9
 	// 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
 	github.com/jhump/protoreflect => github.com/jhump/protoreflect v1.9.0
-	github.com/peggyjv/gravity-bridge/module/v2 => github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	github.com/tidwall/btree => github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c
 )

go.sum

@@ -427,6 +427,8 @@ github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240408075616-5ad2d9a9dca1 h1:
 github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240408075616-5ad2d9a9dca1/go.mod h1:nRk8EA8/fEG4zSme2i/Rq5z3k7TrlsHkOYhrY79hhD8=
 github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240408075616-5ad2d9a9dca1 h1:iOzlHgKqYjdCQgBDztZVLC7KqxfgS8Ex0iOeFVdIGLw=
 github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240408075616-5ad2d9a9dca1/go.mod h1:lfuLI1f4o+0SGtlHQS4x5qsjRcZZfYqG8bp3k8hM0M8=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20240410042357-84bb0fb9ceb9 h1:bdS58WfgJ/9jaNu/frSrShcbP5zp0V96RUtiMBXkBfA=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20240410042357-84bb0fb9ceb9/go.mod h1:Z5SOf3qDZsk0/xTRxcxzEt1TlafqyMWMzHJKqKYPTD8=
 github.com/crypto-org-chain/go-block-stm v0.0.0-20240408011717-9f11af197bde h1:sQIHTJfVt5VTrF7po9eZiFkZiPjlHbFvnXtGCOoBjNM=
 github.com/crypto-org-chain/go-block-stm v0.0.0-20240408011717-9f11af197bde/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231207063621-43cf32d91c3e h1:vnyepPQ/m25+19xcTuBUdRxmltZ/EjVWNqEjhg7Ummk=
@@ -1154,8 +1156,6 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-github.com/yihuang/ethermint v0.6.1-0.20240408035005-423db7fe92a3 h1:gS8jy4oFoLMRNxiIbkVIKJNTJkCnMlT/38oRXuMdCDs=
-github.com/yihuang/ethermint v0.6.1-0.20240408035005-423db7fe92a3/go.mod h1:rODq/GbhjNkzQKLKA6+ADtPxvxJZnldkHYEUPy3sHe4=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

gomod2nix.toml

@@ -257,9 +257,9 @@ schema = 3
     hash = "sha256-lDIqRLUrXYCb9mmFBY/+WW+ee69+IkxOgqjHVyo4ij0="
     replaced = "github.com/crypto-org-chain/go-ethereum"
   [mod."github.com/evmos/ethermint"]
-    version = "v0.6.1-0.20240408035005-423db7fe92a3"
-    hash = "sha256-/VjqifWu5dbvRZ81WCtqm2Aku2YRegvDf5RI+6MBCDc="
-    replaced = "github.com/yihuang/ethermint"
+    version = "v0.6.1-0.20240410042357-84bb0fb9ceb9"
+    hash = "sha256-N+yRwvqs25c1dfMjmJ6c6rvCDajHMWVbiq7fU2Gwnuo="
+    replaced = "github.com/crypto-org-chain/ethermint"
   [mod."github.com/fatih/color"]
     version = "v1.16.0"
     hash = "sha256-Aq/SM28aPJVzvapllQ64R/DM4aZ5CHPewcm/AUJPyJQ="