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

Author: thomas-nguy

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### 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.
 
 
 *Oct 30, 2025*

app/app.go

@@ -175,6 +175,9 @@ const (
 	FlagUnsafeIgnoreBlockListFailure = "unsafe-ignore-block-list-failure"
 	FlagUnsafeDummyCheckTx           = "unsafe-dummy-check-tx"
 
+	FlagMempoolFeeBump = "mempool.feebump"
+
+	FlagDisableTxReplacement       = "cronos.disable-tx-replacement"
 	FlagDisableOptimisticExecution = "cronos.disable-optimistic-execution"
 )
 
@@ -379,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")
@@ -423,6 +434,8 @@ func New(
 
 	// The default value of optimisticExecution is enabled.
 	if !optimisticExecutionDisabled {
+		// enable optimistic execution
+		logger.Info("Enable optimistic execution")
 		baseAppOptions = append(baseAppOptions, baseapp.SetOptimisticExecution())
 	}
 
@@ -968,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)

cmd/cronosd/cmd/root.go

@@ -12,6 +12,7 @@ import (
 	rosettaCmd "github.com/cosmos/rosetta/cmd"
 	memiavlcfg "github.com/crypto-org-chain/cronos/store/config"
 	"github.com/crypto-org-chain/cronos/v2/app"
+	config2 "github.com/crypto-org-chain/cronos/v2/cmd/cronosd/config"
 	"github.com/crypto-org-chain/cronos/v2/cmd/cronosd/opendb"
 	"github.com/crypto-org-chain/cronos/v2/x/cronos"
 	e2eecli "github.com/crypto-org-chain/cronos/v2/x/e2ee/client/cli"
@@ -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 }}
+`

integration_tests/configs/default.jsonnet

@@ -28,6 +28,7 @@
       },
       mempool: {
         'max-txs': 1000,
+        'feebump': 10,
       },
     },
     validators: [{

integration_tests/test_basic.py

@@ -26,13 +26,11 @@
     deploy_contract,
     derive_new_account,
     fund_acc,
-    get_account_nonce,
     get_expedited_params,
     get_receipts_by_block,
     get_sync_info,
     modify_command_in_supervisor_config,
     remove_cancun_prague_params,
-    replace_transaction,
     send_transaction,
     send_txs,
     sign_transaction,
@@ -1071,50 +1069,6 @@ def test_textual(cronos):
     assert rsp["code"] == 0, rsp["raw_log"]
 
 
-def test_tx_replacement(cronos):
-    w3 = cronos.w3
-    gas_price = w3.eth.gas_price
-    nonce = get_account_nonce(w3)
-    initial_balance = w3.eth.get_balance(ADDRS["community"])
-    txhash = replace_transaction(
-        w3,
-        {
-            "to": ADDRS["community"],
-            "value": 1,
-            "gasPrice": gas_price,
-            "nonce": nonce,
-            "from": ADDRS["validator"],
-        },
-        {
-            "to": ADDRS["community"],
-            "value": 5,
-            "gasPrice": gas_price * 2,
-            "nonce": nonce,
-            "from": ADDRS["validator"],
-        },
-        KEYS["validator"],
-    )["transactionHash"]
-    tx1 = w3.eth.get_transaction(txhash)
-    assert tx1["transactionIndex"] == 0
-    assert w3.eth.get_balance(ADDRS["community"]) == initial_balance + 5
-
-    # check that already accepted transaction cannot be replaced
-    txhash_noreplacemenet = send_transaction(
-        w3,
-        {"to": ADDRS["community"], "value": 10, "gasPrice": gas_price},
-        KEYS["validator"],
-    )["transactionHash"]
-    tx2 = w3.eth.get_transaction(txhash_noreplacemenet)
-    assert tx2["transactionIndex"] == 0
-
-    with pytest.raises(ValueError) as exc:
-        w3.eth.replace_transaction(
-            txhash_noreplacemenet,
-            {"to": ADDRS["community"], "value": 15, "gasPrice": gas_price},
-        )
-    assert "has already been mined" in str(exc)
-
-
 def test_block_tx_properties(cronos):
     """
     test block tx properties on cronos network

integration_tests/test_mempool.py

@@ -9,6 +9,9 @@
     CONTRACTS,
     KEYS,
     deploy_contract,
+    get_account_nonce,
+    replace_transaction,
+    send_transaction,
     send_txs,
     sign_transaction,
     wait_for_new_blocks,
@@ -138,3 +141,88 @@ def send_with_nonce(nonce):
             sender
         )
         assert orig_nonce + 4 + i == local_nonce
+
+
+@pytest.mark.flaky(max_runs=3)
+def test_tx_replacement(cronos_mempool):
+    w3 = cronos_mempool.w3
+    base_fee = w3.eth.get_block("latest")["baseFeePerGas"]
+    priority_fee = w3.eth.max_priority_fee
+    nonce = get_account_nonce(w3)
+    # replace with less than 10% bump, should fail
+    with pytest.raises(ValueError) as exc:
+        _ = replace_transaction(
+            w3,
+            {
+                "to": ADDRS["community"],
+                "value": 1,
+                "maxFeePerGas": base_fee + priority_fee,
+                "maxPriorityFeePerGas": priority_fee,
+                "nonce": nonce,
+                "from": ADDRS["validator"],
+            },
+            {
+                "to": ADDRS["community"],
+                "value": 2,
+                "maxFeePerGas": int((base_fee + priority_fee) * 1.05),  # +5% bump
+                "maxPriorityFeePerGas": int(priority_fee * 1.05),
+                "nonce": nonce,
+                "from": ADDRS["validator"],
+            },
+            KEYS["validator"],
+        )["transactionHash"]
+    assert "tx doesn't fit the replacement rule" in str(exc)
+
+    wait_for_new_blocks(cronos_mempool.cosmos_cli(), 1)
+    nonce = get_account_nonce(w3)
+    initial_balance = w3.eth.get_balance(ADDRS["community"])
+    # replace with more than 10% bump, should succeed
+    txhash = replace_transaction(
+        w3,
+        {
+            "to": ADDRS["community"],
+            "value": 3,
+            "maxFeePerGas": base_fee + priority_fee,
+            "maxPriorityFeePerGas": priority_fee,
+            "nonce": nonce,
+            "from": ADDRS["validator"],
+        },
+        {
+            "to": ADDRS["community"],
+            "value": 5,
+            "maxFeePerGas": int((base_fee + priority_fee) * 1.15),  # +15% bump
+            "maxPriorityFeePerGas": int(priority_fee * 1.15),
+            "nonce": nonce,
+            "from": ADDRS["validator"],
+        },
+        KEYS["validator"],
+    )["transactionHash"]
+    tx1 = w3.eth.get_transaction(txhash)
+    assert tx1["transactionIndex"] == 0
+    assert w3.eth.get_balance(ADDRS["community"]) == initial_balance + 5
+
+    # check that already accepted transaction cannot be replaced
+    txhash_noreplacemenet = send_transaction(
+        w3,
+        {
+            "to": ADDRS["community"],
+            "value": 10,
+            "maxFeePerGas": base_fee + priority_fee,
+            "maxPriorityFeePerGas": priority_fee,
+        },
+        KEYS["validator"],
+    )["transactionHash"]
+    tx2 = w3.eth.get_transaction(txhash_noreplacemenet)
+    assert tx2["transactionIndex"] == 0
+
+    with pytest.raises(ValueError) as exc:
+        w3.eth.replace_transaction(
+            txhash_noreplacemenet,
+            {
+                "to": ADDRS["community"],
+                "value": 15,
+                "maxFeePerGas": int((base_fee + priority_fee) * 1.15),  # +15% bump
+                "maxPriorityFeePerGas": int(priority_fee * 1.15),
+            },
+        )
+    assert "has already been mined" in str(exc)