feat: backport release/v1.5.x to main (#1906)

* fix: disable memiavl cache when optimistic execution is enabled (#1892)

* fix: disable memiavl cache when optimistic execution is enabled

* update go.mod

* fmt

* add changelog

* fix: check authorisation list for blocklisted address (#1898)

* check authorisation list for blocklisted address

* v1.5.3 release

* add changelog

* fix lint

* chore: cleanup release branch (#1900)

* cleanup release branch

* cleanup

* feat: add additional flags for mempool  (#1901)

* fix prioritynoncemempool and add additional flags

* add changelog

* fix build

* add tests

* avoid conflicts

* move tx replacement test to mempool

* isort

* release: v1.5.4 (#1902)

* feat: check authorization list in e2ee (#1903)

* check authorisation list in e2ee

* fix golang-ci

* fix upgrade

* add integration tests

* fix changelog

* fix typo

* add missing commit

* tdy

* update ethermint

* fix: bug on multiple tx replacements (#1911)

* add integration tests for multiple replace txs

* change wait block

* fix

* change dep to crypto org chain

* fix integration tests

* update cosmos sdk

* fix integration tests

---------

Signed-off-by: Thomas <81727899+thomas-nguy@users.noreply.github.com>
Co-authored-by: songgaoye <songgao.ye@crypto.com>

Author: thomas-nguy

CHANGELOG.md

@@ -2,11 +2,42 @@
 
 ## UNRELEASED
 
-* [#1869](https://github.com/crypto-org-chain/cronos/pull/1869) Add missing tx context during vm initialisation
-* [#1872](https://github.com/crypto-org-chain/cronos/pull/1872) Support 4byteTracer for tracer
 * [#1875](https://github.com/crypto-org-chain/cronos/pull/1875) Support for preinstalls
 * [#1882](https://github.com/crypto-org-chain/cronos/pull/1882) Support for eip2935
 * [#1880](https://github.com/crypto-org-chain/cronos/pull/1880) Move module from v2 to v1 to follow semver convention
+
+
+
+*Nov 30, 2025*
+
+## v1.5.4
+
+### Improvements
+
+* [#1898](https://github.com/crypto-org-chain/cronos/pull/1898) Chore: cleanup release by reverting #1892, #1893 and #1850.
+* [#1901](https://github.com/crypto-org-chain/cronos/pull/1901) Feat: add mempool.feebump and disable-tx-replacement flags.
+* [#1911](https://github.com/crypto-org-chain/cronos/pull/1911) Fix: bug on multiple tx replacements
+
+
+*Oct 30, 2025*
+
+## v1.5.3
+
+### Bug fixes
+* [#1898](https://github.com/crypto-org-chain/cronos/pull/1898) Check authorisation list for blocklisted address.
+
+## v1.5.2
+
+* [#1892](https://github.com/crypto-org-chain/cronos/pull/1892) fix: disable memiavl cache when optimistic execution is enabled.
+* [#1893](https://github.com/crypto-org-chain/cronos/pull/1893) Normalize cache validator queue key to be UTC.
+* [#1850](https://github.com/crypto-org-chain/cronos/pull/1850) Optimize staking endblocker execution by caching queue entries from iterators. Upgrade RocksDB to `v10.4.2` and enable asyncIO.
+
+*Oct 15, 2025*
+
+## v1.5.1
+
+* [#1869](https://github.com/crypto-org-chain/cronos/pull/1869) Add missing tx context during vm initialisation
+* [#1872](https://github.com/crypto-org-chain/cronos/pull/1872) fix(evm): support 4byteTracer for tracer
 * [#1888](https://github.com/crypto-org-chain/cronos/pull/1888) Patch comet bft (GHSA-hrhf-2vcr-ghch)
 
 *Sep 4, 2025*

app/app.go

@@ -112,7 +112,7 @@ import (
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	mempool "github.com/cosmos/cosmos-sdk/types/mempool"
+	"github.com/cosmos/cosmos-sdk/types/mempool"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	sigtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
@@ -174,6 +174,11 @@ const (
 	FlagBlockedAddresses             = "blocked-addresses"
 	FlagUnsafeIgnoreBlockListFailure = "unsafe-ignore-block-list-failure"
 	FlagUnsafeDummyCheckTx           = "unsafe-dummy-check-tx"
+
+	FlagMempoolFeeBump = "mempool.feebump"
+
+	FlagDisableTxReplacement       = "cronos.disable-tx-replacement"
+	FlagDisableOptimisticExecution = "cronos.disable-optimistic-execution"
 )
 
 var Forks = []Fork{}
@@ -377,14 +382,22 @@ func New(
 	addressCodec := authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix())
 
 	var mpool mempool.Mempool
-	if maxTxs := cast.ToInt(appOpts.Get(server.FlagMempoolMaxTxs)); maxTxs >= 0 {
+	mempoolMaxTxs := cast.ToInt(appOpts.Get(server.FlagMempoolMaxTxs))
+	feeBump := cast.ToInt64(appOpts.Get(FlagMempoolFeeBump))
+	if mempoolMaxTxs >= 0 && feeBump >= 0 {
 		// NOTE we use custom transaction decoder that supports the sdk.Tx interface instead of sdk.StdTx
 		// Setup Mempool and Proposal Handlers
-		logger.Info("NewPriorityMempool is enabled")
+		logger.Info("NewPriorityMempool is enabled", "feebump", feeBump)
 		mpool = mempool.NewPriorityMempool(mempool.PriorityNonceMempoolConfig[int64]{
 			TxPriority:      mempool.NewDefaultTxPriority(),
 			SignerExtractor: evmapp.NewEthSignerExtractionAdapter(mempool.NewDefaultSignerExtractionAdapter()),
-			MaxTx:           maxTxs,
+			MaxTx:           mempoolMaxTxs,
+			TxReplacement: func(op, np int64, oTx, nTx sdk.Tx) bool {
+				// we set a rule which the priority of the new Tx must be {feebump}% more than the priority of the old Tx
+				// otherwise, the Insert will return error
+				threshold := 100 + feeBump
+				return np >= op*threshold/100
+			},
 		})
 	} else {
 		logger.Info("NoOpMempool is enabled")
@@ -410,16 +423,21 @@ func New(
 	})
 
 	blockSTMEnabled := cast.ToString(appOpts.Get(srvflags.EVMBlockExecutor)) == "block-stm"
+	optimisticExecutionDisabled := cast.ToBool(appOpts.Get(FlagDisableOptimisticExecution))
 
 	var cacheSize int
-	if !blockSTMEnabled {
-		// only enable memiavl cache if block-stm is not enabled, because it's not concurrency-safe.
+	if !blockSTMEnabled && optimisticExecutionDisabled {
+		// only enable memiavl cache if neither block-stm nor optimistic execution is enabled, because it's not concurrency-safe.
 		cacheSize = cast.ToInt(appOpts.Get(memiavlstore.FlagCacheSize))
 	}
 	baseAppOptions = memiavlstore.SetupMemIAVL(logger, homePath, appOpts, false, false, cacheSize, baseAppOptions)
 
-	// enable optimistic execution
-	baseAppOptions = append(baseAppOptions, baseapp.SetOptimisticExecution())
+	// The default value of optimisticExecution is enabled.
+	if !optimisticExecutionDisabled {
+		// enable optimistic execution
+		logger.Info("Enable optimistic execution")
+		baseAppOptions = append(baseAppOptions, baseapp.SetOptimisticExecution())
+	}
 
 	// NOTE we use custom transaction decoder that supports the sdk.Tx interface instead of sdk.StdTx
 	bApp := baseapp.NewBaseApp(Name, logger, db, txConfig.TxDecoder(), baseAppOptions...)
@@ -963,9 +981,19 @@ func New(
 	app.SetPreBlocker(app.PreBlocker)
 	app.SetBeginBlocker(app.BeginBlocker)
 	app.SetEndBlocker(app.EndBlocker)
+
+	mempoolCacheMaxTxs := mempoolMaxTxs
+	if cast.ToBool(appOpts.Get(FlagDisableTxReplacement)) {
+		mempoolCacheMaxTxs = -1
+	}
+	if mempoolCacheMaxTxs >= 0 {
+		logger.Info("Tx replacement is enabled")
+	} else {
+		logger.Info("Tx replacement is disabled")
+	}
 	if err := app.setAnteHandler(txConfig,
 		cast.ToUint64(appOpts.Get(srvflags.EVMMaxTxGasWanted)),
-		cast.ToInt(appOpts.Get(server.FlagMempoolMaxTxs)),
+		mempoolCacheMaxTxs,
 		cast.ToStringSlice(appOpts.Get(FlagBlockedAddresses)),
 	); err != nil {
 		panic(err)

app/block_address.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/crypto-org-chain/cronos/x/cronos/types"
+	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
 	"cosmossdk.io/errors"
 
@@ -41,6 +42,25 @@ func (bad BlockAddressesDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simula
 				}
 			}
 		}
+
+		// check EIP-7702 authorisation list
+		for _, msg := range tx.GetMsgs() {
+			msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx)
+			if ok {
+				ethTx := msgEthTx.AsTransaction()
+				if ethTx.SetCodeAuthorizations() != nil {
+					for _, auth := range ethTx.SetCodeAuthorizations() {
+						addr, err := auth.Authority()
+						if err == nil {
+							if _, ok := bad.blockedMap[sdk.AccAddress(addr.Bytes()).String()]; ok {
+								return ctx, fmt.Errorf("signer is blocked: %s", addr.String())
+							}
+						}
+					}
+				}
+			}
+		}
+
 		admin := bad.getParams(ctx).CronosAdmin
 		for _, msg := range tx.GetMsgs() {
 			if blocklistMsg, ok := msg.(*types.MsgStoreBlockList); ok {

app/proposal.go

@@ -9,6 +9,7 @@ import (
 
 	"filippo.io/age"
 	abci "github.com/cometbft/cometbft/abci/types"
+	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
 	"cosmossdk.io/core/address"
 
@@ -173,6 +174,25 @@ func (h *ProposalHandler) ValidateTransaction(tx sdk.Tx, txBz []byte) error {
 			return fmt.Errorf("signer is blocked: %s", encoded)
 		}
 	}
+
+	// check EIP-7702 authorisation list
+	for _, msg := range tx.GetMsgs() {
+		msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx)
+		if ok {
+			ethTx := msgEthTx.AsTransaction()
+			if ethTx.SetCodeAuthorizations() != nil {
+				for _, auth := range ethTx.SetCodeAuthorizations() {
+					addr, err := auth.Authority()
+					if err == nil {
+						if _, ok := h.blocklist[sdk.AccAddress(addr.Bytes()).String()]; ok {
+							return fmt.Errorf("signer is blocked: %s", addr.String())
+						}
+					}
+				}
+			}
+		}
+	}
+
 	return nil
 }
 

app/upgrades.go

@@ -2,9 +2,7 @@ package app
 
 import (
 	"context"
-	"fmt"
 
-	storetypes "cosmossdk.io/store/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -13,24 +11,9 @@ import (
 
 // RegisterUpgradeHandlers returns if store loader is overridden
 func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec, maxVersion int64) bool {
-	planName := "v1.5" // TBD
+	planName := "v1.6" // TBD
 	app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
 		return app.ModuleManager.RunMigrations(ctx, app.configurator, fromVM)
 	})
-
-	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
-	if err != nil {
-		panic(fmt.Sprintf("failed to read upgrade info from disk %s", err))
-	}
-
-	if !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
-		if upgradeInfo.Name == planName {
-			app.SetStoreLoader(MaxVersionUpgradeStoreLoader(maxVersion, upgradeInfo.Height, &storetypes.StoreUpgrades{
-				Deleted: []string{"capability", "feeibc"},
-			}))
-			return true
-		}
-	}
-
 	return false
 }

cmd/cronosd/cmd/root.go

@@ -11,6 +11,7 @@ import (
 	dbm "github.com/cosmos/cosmos-db"
 	rosettaCmd "github.com/cosmos/rosetta/cmd"
 	"github.com/crypto-org-chain/cronos/app"
+	config2 "github.com/crypto-org-chain/cronos/cmd/cronosd/config"
 	"github.com/crypto-org-chain/cronos/cmd/cronosd/opendb"
 	memiavlcfg "github.com/crypto-org-chain/cronos/store/config"
 	"github.com/crypto-org-chain/cronos/x/cronos"
@@ -272,6 +273,7 @@ func initAppConfig() (string, interface{}) {
 
 		MemIAVL   memiavlcfg.MemIAVLConfig `mapstructure:"memiavl"`
 		VersionDB VersionDBConfig          `mapstructure:"versiondb"`
+		Cronos    config2.CronosConfig     `mapstructure:"cronos"`
 	}
 
 	tpl, cfg := servercfg.AppConfig("")
@@ -280,9 +282,10 @@ func initAppConfig() (string, interface{}) {
 		Config:    cfg.(servercfg.Config),
 		MemIAVL:   memiavlcfg.DefaultMemIAVLConfig(),
 		VersionDB: DefaultVersionDBConfig(),
+		Cronos:    config2.DefaultCronosConfig(),
 	}
 
-	return tpl + memiavlcfg.DefaultConfigTemplate + DefaultVersionDBTemplate, customAppConfig
+	return tpl + memiavlcfg.DefaultConfigTemplate + DefaultVersionDBTemplate + config2.DefaultCronosConfigTemplate, customAppConfig
 }
 
 // newApp creates the application

cmd/cronosd/config/config.go

@@ -8,3 +8,17 @@ func SetBech32Prefixes(config *sdk.Config) {
 	config.SetBech32PrefixForValidator(Bech32PrefixValAddr, Bech32PrefixValPub)
 	config.SetBech32PrefixForConsensusNode(Bech32PrefixConsAddr, Bech32PrefixConsPub)
 }
+
+type CronosConfig struct {
+	// Set to true to disable tx replacement.
+	DisableTxReplacement bool `mapstructure:"disable-tx-replacement"`
+	// Set to true to disable optimistic execution.
+	DisableOptimisticExecution bool `mapstructure:"disable-optimistic-execution"`
+}
+
+func DefaultCronosConfig() CronosConfig {
+	return CronosConfig{
+		DisableTxReplacement:       false,
+		DisableOptimisticExecution: false,
+	}
+}

cmd/cronosd/config/toml.go

@@ -0,0 +1,16 @@
+package config
+
+// DefaultCronosConfigTemplate defines the configuration template for cronos configuration
+const DefaultCronosConfigTemplate = `
+###############################################################################
+###                             Cronos Configuration                       ###
+###############################################################################
+
+[cronos]
+
+# Set to true to disable tx replacement.
+disable-tx-replacement = {{ .Cronos.DisableTxReplacement }}
+
+# Set to true to disable optimistic execution (not recommended on validator nodes).
+disable-optimistic-execution = {{ .Cronos.DisableOptimisticExecution }}
+`

default.nix

@@ -11,7 +11,7 @@
   nativeByteOrder ? true, # nativeByteOrder mode will panic on big endian machines
 }:
 let
-  version = "v1.5.0";
+  version = "v1.6.0";
   pname = "cronosd";
   tags = [
     "ledger"

go.mod

@@ -303,7 +303,7 @@ replace (
 	// release/v1.15
 	github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20250815065500-a4fbafcae0dd
 	// develop
-	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.22.1-0.20251007011737-164da0caf703
+	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.22.1-0.20251112062728-d8a1c9e5f577
 	// 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