(feat):Appside Mempool (cosmos#387)

* wip

* wip: iterator

* nil check

* wip: selectby

* add todo

* pointer

* pointer 2

* remove impl, type assertions

* add txpool locally

* change statedb types to interface

* fix tests

* scaffold app setup

* Add initial tests to ExtMempool

* real priority nonce mempool + fixes

* improve test for wrong denom ordering

* move initialization to mempool

* ok

* Nonce gap tx test

* revert

* bloom parsing dumb

* redundant

* ignore this dir for markdown linting

* Cleanup + Test SelectBy

* implement blockchain

* update systemtest test tag

* add subscription

* fix tests

* wiring and bug fixes and todos and etc

* wip

* fix

* WIP on vlad/mempool

* Auto stash before checking out "origin/vlad/mempool"

* rpc no error

* clean up logging

* verification

* Add broadcasting

* add retries to tx results

* feature: Add txpool namespace stubs ahead of app-side mempool implementation (cosmos#344)

* add txpool implementation stubs

* update interface

* fix lint

---------

Co-authored-by: Alex | Interchain Labs <alex@interchainlabs.io>

* txpool endpoint

* wip refactor

* do not allow block 1 submission

* fix some tests

* fix more tests

* fix last remaining evmd test

* add second registry for testing

* wip: integration tests

* wip: functional tests

time to add more test cases

* fix tests and chain

* demo ready

todo: fix removals

* fix removals (out of gas errors should be skipped)

* add gas to config

* attempt to fix flakes

* strict equalities

* FIXED FLAKES

* reformat tests into original structure

* nonce gap tests

* add demo test and fix prev system case

* remove done todos and the other mempool

* add instructions to remove mempool

* remove mocks

* lint fixes

* review test cases

* add some more test cases

* fix scripts

* add more backoff for testing

* remove logs from simplesends

* fix systest CI

* skip test for now see if main one works

* Update .markdownlintignore

Co-authored-by: Alex | Interchain Labs <alex@interchainlabs.io>

* Update evmd/tests/integration/create_app.go

Co-authored-by: Eric Warehime <eric.warehime@gmail.com>

* Refactor: Rename 'nonce' to 'accountNonce' in IncrementNonce function

* refactor app.go imports

* extract atest to constant

* fix nonce name test

* use actual release

* evmd use release tag

* refactor ctx -> getCtxCallback

* rename errors2 and types2 to sdkerrors and sdktypes

* group vars in mempool init

* privatize newBlockchain

* enhance mempool init readability on nil checks

* move txPool checks to right after initialization

* use errors.Is for nonce gap errors in rpc

* group vars

* Update tests/systemtests/.gitignore

* refactor iterator to make it more readable

* refactor iterator to make it more readable

* rename blocked -> queued and runnable -> pending

* explain some questionable naming choices

* add some status constants

* add logging

* move custom endblocker to vm

* fix rpc error compare

* fix system tests

* lints

* fixed from main merge

* rename mempool to experimental

* Auto-fix markdown lint issues

* we tidy

* overflow comment

* add changelog entry

* Update evmd/app.go

Co-authored-by: Hyunwoo Lee <124245155+zsystm@users.noreply.github.com>

* remove comment

* initialize txpool unconditionally

* sort by effective gas tips instead of fees on cosmos

* lints

* small test cleanup

---------

Co-authored-by: Tyler <48813565+technicallyty@users.noreply.github.com>
Co-authored-by: Alex | Interchain Labs <alex@interchainlabs.io>
Co-authored-by: Abdul Malek <me@almk.dev>
Co-authored-by: Eric Warehime <eric.warehime@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Hyunwoo Lee <124245155+zsystm@users.noreply.github.com>

Author: 7 people

.github/workflows/system-test.yml

@@ -24,6 +24,10 @@ jobs:
         with:
           go-version: "1.22"
           check-latest: true
+      - name: Install Foundry (forge/cast/anvil)
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: stable
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6.1.2
         with:

.golangci.yml

@@ -93,6 +93,8 @@ linters:
         text: 'ST1001:'
     paths:
       - x/vm/core
+      - mempool/txpool
+      - mempool/miner
       - third_party$
       - builtin$
       - examples$
@@ -121,6 +123,8 @@ formatters:
     generated: lax
     paths:
       - x/vm/core
+      - mempool/txpool
+      - mempool/miner
       - third_party$
       - builtin$
       - examples$

.markdownlintignore

@@ -1 +1 @@
-tests/systemtests/Counter
+tests/systemtests/Counter

CHANGELOG.md

@@ -39,6 +39,7 @@
 - [\#389](https://github.com/cosmos/evm/pull/389) Post-audit security fixes (batch 3)
 - [\#392](https://github.com/cosmos/evm/pull/392) Post-audit security fixes (batch 5)
 - [\#398](https://github.com/cosmos/evm/pull/398) Post-audit security fixes (batch 4)
+- [\#387](https://github.com/cosmos/evm/pull/387) (Experimental) EVM-compatible appside mempool
 
 ### FEATURES
 

ante/evm/09_increment_sequence.go

@@ -4,6 +4,7 @@ import (
 	"math"
 
 	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
+	"github.com/cosmos/evm/mempool"
 
 	errorsmod "cosmossdk.io/errors"
 
@@ -18,28 +19,34 @@ func IncrementNonce(
 	account sdk.AccountI,
 	txNonce uint64,
 ) error {
-	nonce := account.GetSequence()
-	// we merged the nonce verification to nonce increment, so when tx includes multiple messages
+	accountNonce := account.GetSequence()
+	// we merged the accountNonce verification to accountNonce increment, so when tx includes multiple messages
 	// with same sender, they'll be accepted.
-	if txNonce != nonce {
+	if txNonce != accountNonce {
+		if txNonce > accountNonce {
+			return errorsmod.Wrapf(
+				mempool.ErrNonceGap,
+				"tx nonce: %d, account accountNonce: %d", txNonce, accountNonce,
+			)
+		}
 		return errorsmod.Wrapf(
 			errortypes.ErrInvalidSequence,
-			"invalid nonce; got %d, expected %d", txNonce, nonce,
+			"invalid nonce; got %d, expected %d", txNonce, accountNonce,
 		)
 	}
 
 	// EIP-2681 / state safety: refuse to overflow beyond 2^64-1.
-	if nonce == math.MaxUint64 {
+	if accountNonce == math.MaxUint64 {
 		return errorsmod.Wrap(
 			errortypes.ErrInvalidSequence,
 			"nonce overflow: increment beyond 2^64-1 violates EIP-2681",
 		)
 	}
 
-	nonce++
+	accountNonce++
 
-	if err := account.SetSequence(nonce); err != nil {
-		return errorsmod.Wrapf(err, "failed to set sequence to %d", nonce)
+	if err := account.SetSequence(accountNonce); err != nil {
+		return errorsmod.Wrapf(err, "failed to set sequence to %d", accountNonce)
 	}
 
 	accountKeeper.SetAccount(ctx, account)

evmd/app.go

@@ -21,6 +21,7 @@ import (
 	evmconfig "github.com/cosmos/evm/config"
 	evmosencoding "github.com/cosmos/evm/encoding"
 	"github.com/cosmos/evm/evmd/ante"
+	evmmempool "github.com/cosmos/evm/mempool"
 	srvflags "github.com/cosmos/evm/server/flags"
 	cosmosevmtypes "github.com/cosmos/evm/types"
 	"github.com/cosmos/evm/x/erc20"
@@ -88,6 +89,7 @@ import (
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	testdata_pulsar "github.com/cosmos/cosmos-sdk/testutil/testdata/testpb"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
@@ -161,6 +163,7 @@ type EVMD struct {
 	appCodec          codec.Codec
 	interfaceRegistry types.InterfaceRegistry
 	txConfig          client.TxConfig
+	clientCtx         client.Context
 
 	pendingTxListeners []evmante.PendingTxListener
 
@@ -194,6 +197,7 @@ type EVMD struct {
 	EVMKeeper         *evmkeeper.Keeper
 	Erc20Keeper       erc20keeper.Keeper
 	PreciseBankKeeper precisebankkeeper.Keeper
+	EVMMempool        *evmmempool.ExperimentalEVMMempool
 
 	// the module manager
 	ModuleManager      *module.Manager
@@ -232,7 +236,7 @@ func NewExampleApp(
 	// Example:
 	//
 	// bApp := baseapp.NewBaseApp(...)
-	// nonceMempool := mempool.NewSenderNonceMempool()
+	// nonceMempool := evmmempool.NewSenderNonceMempool()
 	// abciPropHandler := NewDefaultProposalHandler(nonceMempool, bApp)
 	//
 	// bApp.SetMempool(nonceMempool)
@@ -439,7 +443,7 @@ func NewExampleApp(
 
 	app.GovKeeper = *govKeeper.SetHooks(
 		govtypes.NewMultiGovHooks(
-			// register the governance hooks
+		// register the governance hooks
 		),
 	)
 
@@ -757,6 +761,31 @@ func NewExampleApp(
 
 	app.setAnteHandler(app.txConfig, maxGasWanted)
 
+	// set the EVM priority nonce mempool
+	// If you wish to use the noop mempool, remove this codeblock
+	if evmtypes.GetChainConfig() != nil {
+		// TODO: Get the actual block gas limit from consensus parameters
+		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)
+		}
+		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
 	// defined as a chain, and have the same signature as antehandlers.
@@ -1103,6 +1132,10 @@ func (app *EVMD) SetTransferKeeper(transferKeeper transferkeeper.Keeper) {
 	app.TransferKeeper = transferKeeper
 }
 
+func (app *EVMD) GetMempool() sdkmempool.ExtMempool {
+	return app.EVMMempool
+}
+
 func (app *EVMD) GetAnteHandler() sdk.AnteHandler {
 	return app.BaseApp.AnteHandler()
 }
@@ -1112,6 +1145,10 @@ func (app *EVMD) GetTxConfig() client.TxConfig {
 	return app.txConfig
 }
 
+func (app *EVMD) SetClientCtx(clientCtx client.Context) {
+	app.clientCtx = clientCtx
+}
+
 // AutoCliOpts returns the autocli options for the app.
 func (app *EVMD) AutoCliOpts() autocli.AppOptions {
 	modules := make(map[string]appmodule.AppModule, 0)

evmd/cmd/evmd/cmd/root.go

@@ -35,12 +35,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/pruning"
 	"github.com/cosmos/cosmos-sdk/client/rpc"
 	"github.com/cosmos/cosmos-sdk/client/snapshot"
-	"github.com/cosmos/cosmos-sdk/server"
 	sdkserver "github.com/cosmos/cosmos-sdk/server"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/mempool"
 	sdktestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
@@ -318,25 +316,6 @@ func newApp(
 		baseapp.SetChainID(chainID),
 	}
 
-	// Set up the required mempool and ABCI proposal handlers for Cosmos EVM
-	baseappOptions = append(baseappOptions, func(app *baseapp.BaseApp) {
-		var mpool mempool.Mempool
-		if maxTxs := cast.ToInt(appOpts.Get(server.FlagMempoolMaxTxs)); maxTxs >= 0 {
-			// Setup Mempool and Proposal Handlers
-			mpool = mempool.NewPriorityMempool(mempool.PriorityNonceMempoolConfig[int64]{
-				TxPriority:      mempool.NewDefaultTxPriority(),
-				SignerExtractor: evmd.NewEthSignerExtractionAdapter(mempool.NewDefaultSignerExtractionAdapter()),
-				MaxTx:           maxTxs,
-			})
-		} else {
-			mpool = mempool.NoOpMempool{}
-		}
-		app.SetMempool(mpool)
-		handler := baseapp.NewDefaultProposalHandler(mpool, app)
-		app.SetPrepareProposal(handler.PrepareProposalHandler())
-		app.SetProcessProposal(handler.ProcessProposalHandler())
-	})
-
 	return evmd.NewExampleApp(
 		logger, db, traceStore, true,
 		appOpts,

evmd/cmd/evmd/cmd/testnet.go

@@ -65,6 +65,8 @@ var (
 	unsafeStartValidatorFn UnsafeStartValidatorCmdCreator
 )
 
+const TEST_DENOM = "atest"
+
 var mnemonics = []string{
 	"copper push brief egg scan entry inform record adjust fossil boss egg comic alien upon aspect dry avoid interest fury window hint race symptom",
 	"maximum display century economy unlock van census kite error heart snow filter midnight usage egg venture cash kick motor survey drastic edge muffin visual",
@@ -384,7 +386,7 @@ func initTestnetFiles(
 		accTokens := sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction)
 		accStakingTokens := sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction)
 		coins := sdk.Coins{
-			sdk.NewCoin("atest", accTokens),
+			sdk.NewCoin(TEST_DENOM, accTokens),
 			sdk.NewCoin(sdk.DefaultBondDenom, accStakingTokens),
 		}
 
@@ -462,7 +464,7 @@ func addExtraAccounts(kb keyring.Keyring, algo keyring.SignatureAlgo) ([]banktyp
 	accTokens := sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction)
 	accStakingTokens := sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction)
 	coins := sdk.Coins{
-		sdk.NewCoin("atest", accTokens),
+		sdk.NewCoin(TEST_DENOM, accTokens),
 		sdk.NewCoin(sdk.DefaultBondDenom, accStakingTokens),
 	}
 	coins = coins.Sort()

evmd/go.mod

@@ -31,7 +31,6 @@ require (
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/sync v0.16.0
 	google.golang.org/grpc v1.74.2
-	google.golang.org/protobuf v1.36.7
 )
 
 require (
@@ -263,6 +262,7 @@ require (
 	google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
+	google.golang.org/protobuf v1.36.7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gotest.tools/v3 v3.5.2 // indirect

evmd/tests/integration/create_app.go

@@ -21,18 +21,20 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 
-// CreateEvmd creates an evmos app
+// CreateEvmd creates an evm app for regular integration tests (non-mempool)
+// This version uses a noop mempool to avoid state issues during transaction processing
 func CreateEvmd(chainID string, evmChainID uint64, customBaseAppOptions ...func(*baseapp.BaseApp)) evm.EvmApp {
 	defaultNodeHome, err := clienthelpers.GetNodeHomeDirectory(".evmd")
 	if err != nil {
 		panic(err)
 	}
-	// create evmos app
+
 	db := dbm.NewMemDB()
 	logger := log.NewNopLogger()
 	loadLatest := true
 	appOptions := simutils.NewAppOptionsWithFlagHome(defaultNodeHome)
-	baseAppOptions := append(customBaseAppOptions, baseapp.SetChainID(chainID)) //nolint:gocritic
+
+	baseAppOptions := append(customBaseAppOptions, baseapp.SetChainID(chainID))
 
 	return evmd.NewExampleApp(
 		logger,