Skip to content

Commit

Permalink
Public Testnet - Fix non-determism in legacy evm proposals (#1585)
Browse files Browse the repository at this point in the history
* update ethermint to fix non-determism when processing legacy evm
proposals transactions

* fix evm app module and keeper calls

* update evm keeper params to include store keys for the params module
to match testnet ethermint patch that isolates migration subspace
to keep behavior inline with +2/3 voting power

* update ethermint for full fix for non-determinant behavior on public
testnet

* update go.sum - download new ethermint module
  • Loading branch information
nddeluca authored May 2, 2023
1 parent a2615f3 commit f818d16
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,9 @@ func NewApp(

evmBankKeeper := evmutilkeeper.NewEvmBankKeeper(app.evmutilKeeper, app.bankKeeper, app.accountKeeper)
app.evmKeeper = evmkeeper.NewKeeper(
appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey],
appCodec, legacyAmino,
keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey],
keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey],
// Authority
authtypes.NewModuleAddress(govtypes.ModuleName),
app.accountKeeper, evmBankKeeper, app.stakingKeeper, app.feeMarketKeeper,
Expand Down Expand Up @@ -764,7 +766,7 @@ func NewApp(
crisis.NewAppModule(&app.crisisKeeper, options.SkipGenesisInvariants),
slashing.NewAppModule(appCodec, app.slashingKeeper, app.accountKeeper, app.bankKeeper, app.stakingKeeper),
ibc.NewAppModule(app.ibcKeeper),
evm.NewAppModule(app.evmKeeper, app.accountKeeper, evmSubspace),
evm.NewAppModule(app.evmKeeper, app.accountKeeper),
feemarket.NewAppModule(app.feeMarketKeeper, feemarketSubspace),
upgrade.NewAppModule(app.upgradeKeeper),
evidence.NewAppModule(app.evidenceKeeper),
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ replace (
// See https://github.com/cosmos/cosmos-sdk/pull/13093
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
// Use ethermint fork that respects min-gas-price with NoBaseFee true and london enabled, and includes eip712 support
github.com/evmos/ethermint => github.com/kava-labs/ethermint v0.21.0-kava-v22-2
github.com/evmos/ethermint => github.com/kava-labs/ethermint v0.21.0-kava-v22-4
// See https://github.com/cosmos/cosmos-sdk/pull/10401, https://github.com/cosmos/cosmos-sdk/commit/0592ba6158cd0bf49d894be1cef4faeec59e8320
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
// Use the cosmos modified protobufs
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -806,8 +806,8 @@ github.com/kava-labs/cometbft-db v0.7.0-rocksdb-v7.9.2-kava.1 h1:EZnZAkZ+dqK+1OM
github.com/kava-labs/cometbft-db v0.7.0-rocksdb-v7.9.2-kava.1/go.mod h1:mI/4J4IxRzPrXvMiwefrt0fucGwaQ5Hm9IKS7HnoJeI=
github.com/kava-labs/cosmos-sdk v0.46.11-kava.1 h1:3VRpm4zf/gQgmpRVd1p99/2P8ZecAu2FVAXHru5caIo=
github.com/kava-labs/cosmos-sdk v0.46.11-kava.1/go.mod h1:bG4AkW9bqc8ycrryyKGQEl3YV9BY2wr6HggGq8kvcgM=
github.com/kava-labs/ethermint v0.21.0-kava-v22-2 h1:JU5So7ZINfgo4rbS+ffzGtFxVR4Zak0uDdTikJ8PMgM=
github.com/kava-labs/ethermint v0.21.0-kava-v22-2/go.mod h1:rdm6AinxZ4dzPEv/cjH+/AGyTbKufJ3RE7M2MDyklH0=
github.com/kava-labs/ethermint v0.21.0-kava-v22-4 h1:cUoR87HsoVJlahy99X1+cKkQK3JPtmLyWLnNtfcQRag=
github.com/kava-labs/ethermint v0.21.0-kava-v22-4/go.mod h1:rdm6AinxZ4dzPEv/cjH+/AGyTbKufJ3RE7M2MDyklH0=
github.com/kava-labs/tm-db v0.6.7-kava.1 h1:7cVYlvWx1yP+gGdaAWcfm6NwMLzf4z6DxXguWn3+O3w=
github.com/kava-labs/tm-db v0.6.7-kava.1/go.mod h1:HVZfZzWXuqWseXQVplxsWXK6kLHLkk3kQB6c+nuSZvk=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
Expand Down

0 comments on commit f818d16

Please sign in to comment.