feat: async recheck support

evmd/mempool.go

@@ -57,7 +57,7 @@ func (app *EVMD) configureEVMMempool(appOpts servertypes.AppOptions, logger log.
 	)
 	app.EVMMempool = evmMempool
 	app.SetMempool(evmMempool)
-	checkTxHandler := evmmempool.NewCheckTxHandler(evmMempool)
+	checkTxHandler := evmmempool.NewCheckTxHandler(evmMempool, app.Trace(), server.GetCheckTxTimeout(appOpts, logger))
 	app.SetCheckTxHandler(checkTxHandler)
 	app.SetInsertTxHandler(app.NewInsertTxHandler(evmMempool))
 	app.SetReapTxsHandler(app.NewReapTxsHandler(evmMempool))

mempool/check_tx.go

@@ -1,49 +1,36 @@
 package mempool
 
 import (
-	"errors"
+	"context"
+	"time"
 
 	abci "github.com/cometbft/cometbft/abci/types"
 
-	"github.com/cosmos/evm/mempool/txpool"
-
 	"github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 // NewCheckTxHandler creates a CheckTx handler that integrates with the EVM mempool for transaction validation.
-// It wraps the standard transaction execution flow to handle EVM-specific nonce gap errors by routing
-// transactions with higher tx sequence numbers to the mempool for potential future execution.
-// Returns a handler function that processes ABCI CheckTx requests and manages EVM transaction sequencing.
-func NewCheckTxHandler(mempool *ExperimentalEVMMempool) types.CheckTxHandler {
-	return func(runTx types.RunTx, request *abci.RequestCheckTx) (*abci.ResponseCheckTx, error) {
-		gInfo, result, anteEvents, err := runTx(request.Tx, nil)
+// It routes new CheckTx requests through the same async insert worker path used by
+// the app-side mempool and waits for the insert result.
+func NewCheckTxHandler(mempool *ExperimentalEVMMempool, debug bool, timeout time.Duration) types.CheckTxHandler {
+	if timeout <= 0 {
+		panic("invalid timeout CheckTxHandler timeout value")
+	}
+	return func(_ types.RunTx, request *abci.RequestCheckTx) (*abci.ResponseCheckTx, error) {
+		if request.GetType() == abci.CheckTxType_Recheck {
+			panic("checkTx does not support recheck")
+		}
+		tx, err := mempool.txConfig.TxDecoder()(request.Tx)
 		if err != nil {
-			// detect if there is a nonce gap error (only returned for EVM transactions)
-			if errors.Is(err, ErrNonceGap) || errors.Is(err, ErrNonceLow) {
-				// send it to the mempool for further triage
-				err := mempool.InsertInvalidNonce(request.Tx)
-				if err != nil {
-					return sdkerrors.ResponseCheckTxWithEvents(err, gInfo.GasWanted, gInfo.GasUsed, anteEvents, false), nil
-				}
-			}
-			// If its already known, this can mean the the tx was promoted from nonce gap to valid
-			// and by allowing ErrAlreadyKnown to be silent, we allow re-gossiping of such txs
-			// this also covers the case of re-submission of the same tx enforcing overpricing for replacement
-			if errors.Is(err, txpool.ErrAlreadyKnown) {
-				return sdkerrors.ResponseCheckTxWithEvents(nil, gInfo.GasWanted, gInfo.GasUsed, anteEvents, false), nil
-			}
-
-			// anything else, return regular error
-			return sdkerrors.ResponseCheckTxWithEvents(err, gInfo.GasWanted, gInfo.GasUsed, anteEvents, false), nil
+			return sdkerrors.ResponseCheckTxWithEvents(err, 0, 0, nil, debug), nil
 		}
 
-		return &abci.ResponseCheckTx{
-			GasWanted: int64(gInfo.GasWanted), // #nosec G115 -- this is copied from the Cosmos SDK
-			GasUsed:   int64(gInfo.GasUsed),   // #nosec G115 -- this is copied from the Cosmos SDK
-			Log:       result.Log,
-			Data:      result.Data,
-			Events:    types.MarkEventsToIndex(result.Events, nil),
-		}, nil
+		ctx, cancel := context.WithTimeout(context.Background(), timeout)
+		defer cancel()
+		if err := mempool.Insert(ctx, tx); err != nil {
+			return sdkerrors.ResponseCheckTxWithEvents(err, 0, 0, nil, debug), nil
+		}
+		return &abci.ResponseCheckTx{Code: abci.CodeTypeOK}, nil
 	}
 }