fix saving of processed blob txs

NethermindEth · Nov 3, 2023 · 7c2c556 · 7c2c556
1 parent 201f590
commit 7c2c556
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/src/Nethermind/Nethermind.TxPool/NullBlobTxStorage.cs b/src/Nethermind/Nethermind.TxPool/NullBlobTxStorage.cs
@@ -34,6 +34,5 @@ public bool TryGetBlobTransactionsFromBlock(long blockNumber, out Transaction[]?
 
     public void AddBlobTransactionsFromBlock(long blockNumber, IList<Transaction> blockBlobTransactions) { }
 
-    public void DeleteBlobTransactionsFromBlock(long blockNumber)
-    { }
+    public void DeleteBlobTransactionsFromBlock(long blockNumber) { }
 }
diff --git a/src/Nethermind/Nethermind.TxPool/TxPool.cs b/src/Nethermind/Nethermind.TxPool/TxPool.cs
@@ -265,30 +265,33 @@ private void RemoveProcessedTransactions(Block block)
 
             for (int i = 0; i < blockTransactions.Length; i++)
             {
-                Transaction transaction = blockTransactions[i];
-                Hash256 txHash = transaction.Hash ?? throw new ArgumentException("Hash was unexpectedly null!");
+                Transaction blockTx = blockTransactions[i];
+                Hash256 txHash = blockTx.Hash ?? throw new ArgumentException("Hash was unexpectedly null!");
 
-                if (!IsKnown(txHash))
+                if (blockTx.Supports1559)
                 {
-                    discoveredForHashCache++;
+                    eip1559Txs++;
                 }
 
-                if (!RemoveIncludedTransaction(transaction))
+                if (blockTx.SupportsBlobs)
                 {
-                    discoveredForPendingTxs++;
+                    blobs += blockTx.BlobVersionedHashes?.Length ?? 0;
+
+                    if (_blobTransactions.TryGetValue(blockTx.Hash, out Transaction? fullBlobTx))
+                    {
+                        blobTxs ??= new List<Transaction>(Eip4844Constants.GetMaxBlobsPerBlock());
+                        blobTxs.Add(fullBlobTx);
+                    }
                 }
 
-                if (transaction.Supports1559)
+                if (!IsKnown(txHash))
                 {
-                    eip1559Txs++;
+                    discoveredForHashCache++;
                 }
 
-                if (transaction.SupportsBlobs)
+                if (!RemoveIncludedTransaction(blockTx))
                 {
-                    blobTxs ??= new List<Transaction>(Eip4844Constants.GetMaxBlobsPerBlock());
-                    blobTxs.Add(transaction);
-
-                    blobs += transaction.BlobVersionedHashes?.Length ?? 0;
+                    discoveredForPendingTxs++;
                 }
             }