From 3d271b614dc1ad1299268cfff370757a5baba8ec Mon Sep 17 00:00:00 2001
From: GuillemGarciaDev <guillem.garcia.gil@protonmail.com>
Date: Mon, 15 Sep 2025 16:12:52 +0200
Subject: [PATCH] fix(app): unwire experimental evm mempool

---
 app/app.go | 46 ----------------------------------------------
 1 file changed, 46 deletions(-)

diff --git a/app/app.go b/app/app.go
index 8e224a4..f6b0f60 100644
--- a/app/app.go
+++ b/app/app.go
@@ -10,7 +10,6 @@ import (
 
 	"cosmossdk.io/client/v2/autocli"
 	"cosmossdk.io/core/appmodule"
-	sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
 	"github.com/cosmos/cosmos-sdk/x/auth/posthandler"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -54,7 +53,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/consensus"
 	consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
 	consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
-	evmmempool "github.com/cosmos/evm/mempool"
 	"github.com/xrplevm/node/v9/x/poa"
 
 	"cosmossdk.io/log"
@@ -239,7 +237,6 @@ type App struct {
 	EvmKeeper       *evmkeeper.Keeper
 	FeeMarketKeeper feemarketkeeper.Keeper
 	Erc20Keeper     erc20keeper.Keeper
-	EVMMempool      *evmmempool.ExperimentalEVMMempool
 
 	// exrp keepers
 	PoaKeeper poakeeper.Keeper
@@ -810,45 +807,6 @@ func New(
 
 	app.setAnteHandler(app.txConfig, cast.ToUint64(appOpts.Get(srvflags.EVMMaxTxGasWanted)))
 
-	if evmtypes.GetChainConfig() != nil {
-		mempoolConfig := &evmmempool.EVMMempoolConfig{
-			AnteHandler:   app.GetAnteHandler(),
-			BlockGasLimit: 100_000_000,
-		}
-
-		evmMempool := evmmempool.NewExperimentalEVMMempool(
-			app.CreateQueryContext,
-			logger,
-			app.EvmKeeper,
-			app.FeeMarketKeeper,
-			app.txConfig,
-			app.clientCtx,
-			mempoolConfig,
-		)
-		app.EVMMempool = evmMempool
-
-		// Set the global mempool for RPC access
-		if err := evmmempool.SetGlobalEVMMempool(evmMempool); err != nil {
-			panic(err)
-		}
-
-		// Replace BaseApp mempool
-		app.SetMempool(evmMempool)
-
-		// Set custom CheckTx handler for nonce gap support
-		checkTxHandler := evmmempool.NewCheckTxHandler(evmMempool)
-		app.SetCheckTxHandler(checkTxHandler)
-
-		// Set custom PrepareProposal handler
-		abciProposalHandler := baseapp.NewDefaultProposalHandler(evmMempool, app)
-		abciProposalHandler.SetSignerExtractionAdapter(
-			evmmempool.NewEthSignerExtractionAdapter(
-				sdkmempool.NewDefaultSignerExtractionAdapter(),
-			),
-		)
-		app.SetPrepareProposal(abciProposalHandler.PrepareProposalHandler())
-	}
-
 	app.setPostHandler()
 	app.setupUpgradeHandlers()
 
@@ -1112,10 +1070,6 @@ func (app *App) GetStakingKeeperSDK() *stakingkeeper.Keeper {
 	return app.StakingKeeper
 }
 
-func (app *App) GetMempool() sdkmempool.ExtMempool {
-	return app.EVMMempool
-}
-
 func (app *App) GetAnteHandler() sdk.AnteHandler {
 	return app.BaseApp.AnteHandler()
 }