fix: remove txs from mempool when antehandler fails in recheck

baseapp/abci_test.go

@@ -1749,15 +1749,15 @@ func TestABCI_PrepareProposal_Failures(t *testing.T) {
 
 	err = pool.Insert(sdk.Context{}, failTx)
 	require.NoError(t, err)
-	require.Equal(t, 2, pool.CountTx())
+	require.Equal(t, 1, pool.CountTx())
 
 	req := abci.RequestPrepareProposal{
 		MaxTxBytes: 1000,
 		Height:     1,
 	}
 	res, err := suite.baseApp.PrepareProposal(&req)
 	require.NoError(t, err)
-	require.Equal(t, 1, len(res.Txs))
+	require.Equal(t, 0, len(res.Txs))
 }
 
 func TestABCI_PrepareProposal_PanicRecovery(t *testing.T) {

baseapp/baseapp.go

@@ -911,6 +911,13 @@ func (app *BaseApp) runTx(mode execMode, txBytes []byte) (gInfo sdk.GasInfo, res
 		gasWanted = ctx.GasMeter().Limit()
 
 		if err != nil {
+			if mode == execModeReCheck {
+				fmt.Println("here")
+				// if the ante handler fails on recheck, we want to remove the tx from the mempool
+				if err := app.mempool.Remove(tx); err != nil {
+					return gInfo, nil, anteEvents, errors.Join(err, err)
+				}
+			}
 			return gInfo, nil, nil, err
 		}
 

baseapp/baseapp_test.go

@@ -32,6 +32,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/testutil"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/mempool"
 )
 
 var (
@@ -80,6 +81,12 @@ func NewBaseAppSuite(t *testing.T, opts ...func(*baseapp.BaseApp)) *BaseAppSuite
 	app.SetParamStore(paramStore{db: dbm.NewMemDB()})
 	app.SetTxDecoder(txConfig.TxDecoder())
 	app.SetTxEncoder(txConfig.TxEncoder())
+	mem := mempool.NewPriorityMempool[int64](mempool.PriorityNonceMempoolConfig[int64]{
+		TxPriority:      mempool.NewDefaultTxPriority(),
+		MaxTx:           0,
+		SignerExtractor: mempool.NewDefaultSignerExtractionAdapter(),
+	})
+	app.SetMempool(mem)
 
 	// mount stores and seal
 	require.Nil(t, app.LoadLatestVersion())