Skip to content

Fix receipts deletion #9231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marchhill merged 3 commits into from
Sep 2, 2025
Merged

Fix receipts deletion #9231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67fe91d
separate receipt deletion from receipt tx deletion
Marchhill Sep 2, 2025
00e0047
regression test
Marchhill Sep 2, 2025
6524495
tidy test
Marchhill Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Nethermind/Nethermind.Blockchain.Test/Receipts/PersistentReceiptStorageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ public async Task When_NewHeadBlock_Remove_TxIndex_OfRemovedBlock_Unless_ItsAlso
}

[Test]
public void When_NewHeadBlock_ClearOldTxIndex()
public void When_NewHeadBlock_ClearOldTxIndex_And_KeepsReceipts()
{
_receiptConfig.TxLookupLimit = 1000;
CreateStorage();
Expand All @@ -466,6 +466,7 @@ public void When_NewHeadBlock_ClearOldTxIndex()
() => _receiptsDb.GetColumnDb(ReceiptsColumns.Transactions)[receipts[0].TxHash!.Bytes],
Is.Null.After(1000, 100)
);
Assert.That(_storage.HasBlock(receipts[0].BlockNumber, receipts[0].BlockHash!));
}

private (Block block, TxReceipt[] receipts) PrepareBlock(Block? block = null, bool isFinalized = false, long? headNumber = null)
Expand Down
7 changes: 6 additions & 1 deletion src/Nethermind/Nethermind.Blockchain/Receipts/PersistentReceiptStorage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private void BlockTreeOnBlockAddedToMain(object? sender, BlockReplacementEventAr
Block newOldTx = _blockTree.FindBlock(newMain.Number - _receiptConfig.TxLookupLimit.Value);
if (newOldTx is not null)
{
RemoveReceipts(newOldTx);
RemoveBlockTx(newOldTx);
}
}
});
Expand Down Expand Up @@ -338,6 +338,11 @@ public void RemoveReceipts(Block block)
GetBlockNumPrefixedKey(block.Number, block.Hash, blockNumPrefixed);
_receiptsDb.Remove(blockNumPrefixed);

RemoveBlockTx(block);
}

private void RemoveBlockTx(Block block)
{
using IWriteBatch writeBatch = _transactionDb.StartWriteBatch();
foreach (Transaction tx in block.Transactions)
{
Expand Down