Skip to content

disable experimental evm mempool #53

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

Closed
wants to merge 2 commits into from
Closed

disable experimental evm mempool #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee5b916
disable experimental evm mempool
aniketdivekar Sep 30, 2025
765d886
fix: add nil check of mempool
aniketdivekar Sep 30, 2025
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
2 changes: 1 addition & 1 deletion server/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ func startInProcess(svrCtx *server.Context, clientCtx client.Context, opts Start
return err
}

if m, ok := evmApp.GetMempool().(*evmmempool.ExperimentalEVMMempool); ok {
if m, ok := evmApp.GetMempool().(*evmmempool.ExperimentalEVMMempool); m != nil && ok {
m.SetEventBus(bftNode.EventBus())
}
defer func() {
Expand Down
48 changes: 24 additions & 24 deletions shardeumd/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,29 +737,29 @@ func NewShardeumApp(

// set the EVM priority nonce mempool
// If you wish to use the noop mempool, remove this codeblock
if evmtypes.GetChainConfig() != nil {
// Get the block gas limit from genesis file
blockGasLimit := evmconfig.GetBlockGasLimit(appOpts, logger)
// Get GetMinTip from app.toml or cli flag configuration
mipTip := evmconfig.GetMinTip(appOpts, logger)

mempoolConfig := &evmmempool.EVMMempoolConfig{
AnteHandler: app.GetAnteHandler(),
BlockGasLimit: blockGasLimit,
MinTip: mipTip,
}

evmMempool := evmmempool.NewExperimentalEVMMempool(app.CreateQueryContext, logger, app.EVMKeeper, app.FeeMarketKeeper, app.txConfig, app.clientCtx, mempoolConfig)
app.EVMMempool = evmMempool

app.SetMempool(evmMempool)
checkTxHandler := evmmempool.NewCheckTxHandler(evmMempool)
app.SetCheckTxHandler(checkTxHandler)

abciProposalHandler := baseapp.NewDefaultProposalHandler(evmMempool, app)
abciProposalHandler.SetSignerExtractionAdapter(evmmempool.NewEthSignerExtractionAdapter(sdkmempool.NewDefaultSignerExtractionAdapter()))
app.SetPrepareProposal(abciProposalHandler.PrepareProposalHandler())
}
// if evmtypes.GetChainConfig() != nil {
// // Get the block gas limit from genesis file
// blockGasLimit := evmconfig.GetBlockGasLimit(appOpts, logger)
// // Get GetMinTip from app.toml or cli flag configuration
// mipTip := evmconfig.GetMinTip(appOpts, logger)

// mempoolConfig := &evmmempool.EVMMempoolConfig{
// AnteHandler: app.GetAnteHandler(),
// BlockGasLimit: blockGasLimit,
// MinTip: mipTip,
// }

// evmMempool := evmmempool.NewExperimentalEVMMempool(app.CreateQueryContext, logger, app.EVMKeeper, app.FeeMarketKeeper, app.txConfig, app.clientCtx, mempoolConfig)
// app.EVMMempool = evmMempool

// app.SetMempool(evmMempool)
// checkTxHandler := evmmempool.NewCheckTxHandler(evmMempool)
// app.SetCheckTxHandler(checkTxHandler)

// abciProposalHandler := baseapp.NewDefaultProposalHandler(evmMempool, app)
// abciProposalHandler.SetSignerExtractionAdapter(evmmempool.NewEthSignerExtractionAdapter(sdkmempool.NewDefaultSignerExtractionAdapter()))
// app.SetPrepareProposal(abciProposalHandler.PrepareProposalHandler())
// }

// In v0.46, the SDK introduces _postHandlers_. PostHandlers are like
// antehandlers, but are run _after_ the `runMsgs` execution. They are also
Expand Down Expand Up @@ -1115,7 +1115,7 @@ func (app *ShardeumApp) SetClientCtx(clientCtx client.Context) {
// Close unsubscribes from the CometBFT event bus (if set) and closes the mempool and underlying BaseApp.
func (app *ShardeumApp) Close() error {
var err error
if m, ok := app.GetMempool().(*evmmempool.ExperimentalEVMMempool); ok {
if m, ok := app.GetMempool().(*evmmempool.ExperimentalEVMMempool); m != nil && ok {
app.Logger().Info("Shutting down mempool")
err = m.Close()
}
Expand Down
Loading