Fix mempool batching for v0.11.x

Author: Ganesha Upadhyaya

mempool/clist_mempool.go

@@ -530,27 +530,18 @@ func (mem *CListMempool) ReapMaxBytesMaxGas(maxBytes, maxGas int64) types.Txs {
 	txs := make([]types.Tx, 0, mem.txs.Len())
 	for e := mem.txs.Front(); e != nil; e = e.Next() {
 		memTx := e.Value.(*mempoolTx)
-
-		txs = append(txs, memTx.tx)
-
-		dataSize := types.ComputeProtoSizeForTxs([]types.Tx{memTx.tx})
-
-		// Check total size requirement
-		if maxBytes > -1 && runningSize+dataSize > maxBytes {
-			return txs[:len(txs)-1]
-		}
-
-		runningSize += dataSize
-
-		// Check total gas requirement.
+		// Check total gas requirement and total size requirement.
 		// If maxGas is negative, skip this check.
 		// Since newTotalGas < masGas, which
 		// must be non-negative, it follows that this won't overflow.
 		newTotalGas := totalGas + memTx.gasWanted
-		if maxGas > -1 && newTotalGas > maxGas {
-			return txs[:len(txs)-1]
+		totalDataSize := runningSize + types.ComputeProtoSizeForTxs([]types.Tx{memTx.tx})
+		if (maxGas > -1 && newTotalGas > maxGas) || (maxBytes > -1 && totalDataSize > maxBytes) {
+			continue
 		}
 		totalGas = newTotalGas
+		runningSize = totalDataSize
+		txs = append(txs, memTx.tx)
 	}
 	return txs
 }

mempool/clist_mempool_test.go

@@ -256,6 +256,24 @@ func TestReapMaxBytesMaxGas(t *testing.T) {
 	}
 }
 
+func TestTxMempoolTxLargerThanMaxBytes(t *testing.T) {
+	app := kvstore.NewInMemoryApplication()
+	cc := proxy.NewLocalClientCreator(app)
+	txmp, cleanup := newMempoolWithApp(cc)
+	defer cleanup()
+
+	// large high priority tx
+	bigTx := kvstore.NewRandomTx(100)
+	smallTx := kvstore.NewRandomTx(20)
+	require.NoError(t, txmp.CheckTx(bigTx, nil, TxInfo{SenderID: 1}))
+	require.NoError(t, txmp.CheckTx(smallTx, nil, TxInfo{SenderID: 2}))
+
+	// reap by max bytes less than the large tx
+	reapedTxs := txmp.ReapMaxBytesMaxGas(100, -1)
+	require.Len(t, reapedTxs, 1)
+	require.Equal(t, types.Tx(smallTx), reapedTxs[0])
+}
+
 func TestMempoolFilters(t *testing.T) {
 	app := kvstore.NewInMemoryApplication()
 	cc := proxy.NewLocalClientCreator(app)