Skip to content

[TA-5489] unwire evm mempool #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2025
Merged

[TA-5489] unwire evm mempool #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 0 additions & 46 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -239,7 +237,6 @@ type App struct {
EvmKeeper *evmkeeper.Keeper
FeeMarketKeeper feemarketkeeper.Keeper
Erc20Keeper erc20keeper.Keeper
EVMMempool *evmmempool.ExperimentalEVMMempool

// exrp keepers
PoaKeeper poakeeper.Keeper
Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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()
}
Expand Down
Loading