remove invalid txs out of the loop

yihuang · Aug 30, 2024 · 3157730 · 3157730
1 parent 1e3cb89
commit 3157730
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/baseapp/abci_utils.go b/baseapp/abci_utils.go
@@ -288,6 +288,7 @@ func (h *DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHan
 		var (
 			err             error
 			selectedTxsNums int
+			invalidTxs      []sdk.Tx // invalid txs to be removed after the iteration
 		)
 		h.mempool.SelectBy(ctx, req.Txs, func(memTx mempool.Tx) bool {
 			var signerData []mempool.SignerData
@@ -327,10 +328,7 @@ func (h *DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHan
 			var txBz []byte
 			txBz, err = h.txVerifier.PrepareProposalVerifyTx(memTx.Tx)
 			if err != nil {
-				err = h.mempool.Remove(memTx.Tx)
-				if err != nil && !errors.Is(err, mempool.ErrTxNotFound) {
-					return false
-				}
+				invalidTxs = append(invalidTxs, memTx.Tx)
 			} else {
 				stop := h.txSelector.SelectTxForProposal(ctx, uint64(req.MaxTxBytes), maxBlockGas, memTx.Tx, txBz, memTx.GasWanted)
 				if stop {
@@ -362,6 +360,13 @@ func (h *DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHan
 			return nil, err
 		}
 
+		for _, tx := range invalidTxs {
+			err := h.mempool.Remove(tx)
+			if err != nil && !errors.Is(err, mempool.ErrTxNotFound) {
+				return nil, err
+			}
+		}
+
 		return &abci.ResponsePrepareProposal{Txs: h.txSelector.SelectedTxs(ctx)}, nil
 	}
 }