diff --git a/CHANGELOG.md b/CHANGELOG.md index 177b461b4e..8bd759b119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## Unreleased +* (evm) [#725](https://github.com/crypto-org-chain/ethermint/pull/743) Optimize staking endblocker execution by caching queue entries from iterators. * (evm) [#725](https://github.com/crypto-org-chain/ethermint/pull/725) feat(RPC): add authorizationList from eth_getTransactionByHash response for EIP-7702 transactions * (evm) [#739](https://github.com/crypto-org-chain/ethermint/pull/739) fix: missing tx context during vm initialisation * (evm) [#736](https://github.com/crypto-org-chain/ethermint/pull/736) fix: prevent nil pointer dereference in tracer hooks diff --git a/evmd/app.go b/evmd/app.go index 88a5499366..2fa0e988f6 100644 --- a/evmd/app.go +++ b/evmd/app.go @@ -380,6 +380,7 @@ func NewEthermintApp( panic(err) } app.txConfig = txConfig + stakingCacheSize := cast.ToInt(appOpts.Get(server.FlagStakingCacheSize)) app.StakingKeeper = stakingkeeper.NewKeeper( appCodec, runtime.NewKVStoreService(keys[stakingtypes.StoreKey]), @@ -388,6 +389,7 @@ func NewEthermintApp( authAddr, address.NewBech32Codec(sdk.GetConfig().GetBech32ValidatorAddrPrefix()), address.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix()), + stakingCacheSize, ) app.MintKeeper = mintkeeper.NewKeeper( appCodec, diff --git a/evmd/simulation_test.go b/evmd/simulation_test.go index 6099f4ccba..77eed48e11 100644 --- a/evmd/simulation_test.go +++ b/evmd/simulation_test.go @@ -234,7 +234,7 @@ func TestAppImportExport(t *testing.T) { simApp.GetKey(stakingtypes.StoreKey), newApp.GetKey(stakingtypes.StoreKey), [][]byte{ stakingtypes.UnbondingQueueKey, stakingtypes.RedelegationQueueKey, stakingtypes.ValidatorQueueKey, - stakingtypes.HistoricalInfoKey, stakingtypes.UnbondingIDKey, stakingtypes.UnbondingIndexKey, stakingtypes.UnbondingTypeKey, stakingtypes.ValidatorUpdatesKey, + stakingtypes.HistoricalInfoKey, stakingtypes.ValidatorUpdatesKey, }, }, // ordering may change but it doesn't matter {simApp.GetKey(slashingtypes.StoreKey), newApp.GetKey(slashingtypes.StoreKey), [][]byte{}}, diff --git a/go.mod b/go.mod index aca43714a1..52e0460290 100644 --- a/go.mod +++ b/go.mod @@ -281,7 +281,7 @@ replace ( // release/v0.50.x cosmossdk.io/store => github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241217090828-cfbca9fe8254 cosmossdk.io/x/tx => github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241217090828-cfbca9fe8254 - github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20250424063720-28ea58ae20d8 + github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20251015030247-d8ed3ff5806b ) replace ( diff --git a/go.sum b/go.sum index 19a8aab780..51c1eb6e2e 100644 --- a/go.sum +++ b/go.sum @@ -896,8 +896,8 @@ github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c h1:MOgfS4+F github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/crypto-org-chain/cometbft v0.0.0-20241106091515-ce418f845d9a h1:0EN1TkzHTAxpgpGaZJY3G7L4jf4+sYnI7FOmBFLCg4U= github.com/crypto-org-chain/cometbft v0.0.0-20241106091515-ce418f845d9a/go.mod h1:khbgmtxbgwJfMqDmnGY4rl2sQpTdzpPb1f9nqnfpy1o= -github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20250424063720-28ea58ae20d8 h1:Sif0pGNc4C384OLucyQ7P/+KjYiJ6uDn8Cf8wR7MI+c= -github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20250424063720-28ea58ae20d8/go.mod h1:JwwsMeZldLN20b72mmbWPY0EV9rs+v/12hRu1JFttvY= +github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20251015030247-d8ed3ff5806b h1:k6iBxHzjy9oTSwyzBa7/9bwtsvvuimvAnzW1QqWS9+8= +github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20251015030247-d8ed3ff5806b/go.mod h1:8/AdT5lF3ILCCl/sDQXyBgzWGtcmD1tInWyhYeREVPA= github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241217090828-cfbca9fe8254 h1:NEgy0r3otU/O+0OAjMdEhbn4VotQlg+98hHbD7M23wU= github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241217090828-cfbca9fe8254/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241217090828-cfbca9fe8254 h1:JzLOFRiKsDtLJt5h0M0jkEIPDKvFFyja7VEp7gG6O9U= diff --git a/gomod2nix.toml b/gomod2nix.toml index af77f1a543..8fc416ce62 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -213,8 +213,8 @@ schema = 3 version = "v1.0.0-beta.5" hash = "sha256-Fy/PbsOsd6iq0Njy3DVWK6HqWsogI+MkE8QslHGWyVg=" [mod."github.com/cosmos/cosmos-sdk"] - version = "v0.50.6-0.20250424063720-28ea58ae20d8" - hash = "sha256-UCynFh2IangiNqQsgux4dKCk8wuF1vgoINQGA8N59QY=" + version = "v0.50.6-0.20251015030247-d8ed3ff5806b" + hash = "sha256-Z1NUKKaQVZj4joCkF7qfQ/nmhwUJC185JUISgc+9R9E=" replaced = "github.com/crypto-org-chain/cosmos-sdk" [mod."github.com/cosmos/go-bip39"] version = "v1.0.0"