Merge remote-tracking branch 'origin/main' into cosmos_override

Author: mmsqe

CHANGELOG.md

@@ -65,6 +65,7 @@
 - [\#709](https://github.com/cosmos/evm/pull/709) Fix mempool e2e test
 - [\#710](https://github.com/cosmos/evm/pull/710) Fix EoA-CA Identification logic
 - [\#711](https://github.com/cosmos/evm/pull/711) Add debug_traceCall api
+- [\#734](https://github.com/cosmos/evm/pull/734) Disable evm mempool if max-txs set to -1.
 
 
 ### FEATURES

evmd/mempool.go

@@ -21,11 +21,16 @@ func (app *EVMD) configureEVMMempool(appOpts servertypes.AppOptions, logger log.
 		return nil
 	}
 
+	cosmosPoolMaxTx := evmconfig.GetCosmosPoolMaxTx(appOpts, logger)
+	if cosmosPoolMaxTx < 0 {
+		logger.Debug("app-side mempool is disabled, skipping evm mempool configuration")
+		return nil
+	}
+
 	mempoolConfig, err := app.createMempoolConfig(appOpts, logger)
 	if err != nil {
 		return fmt.Errorf("failed to get mempool config: %w", err)
 	}
-	cosmosPoolMaxTx := evmconfig.GetCosmosPoolMaxTx(appOpts, logger)
 
 	evmMempool := evmmempool.NewExperimentalEVMMempool(
 		app.CreateQueryContext,