Skip to content

Fix/pow forward header provider cache ownership #9614

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
asdacap merged 2 commits into from
Oct 30, 2025
Merged

Fix/pow forward header provider cache ownership #9614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b05931c
Fix: return copy from cache to avoid use-after-dispose
radik878 Oct 30, 2025
d29d2c0
add a test
radik878 Oct 30, 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
25 changes: 25 additions & 0 deletions src/Nethermind/Nethermind.Synchronization.Test/ForwardHeaderProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,31 @@ public async Task Cache_block_headers_unless_peer_changed()
await newSyncPeer.Received(1).GetBlockHeaders(Arg.Any<long>(), Arg.Any<int>(), Arg.Any<int>(), Arg.Any<CancellationToken>());
}

[Test]
public async Task Cache_block_headers_with_disposal()
{
await using IContainer node = CreateNode();
Context ctx = node.Resolve<Context>();

ISyncPeer syncPeer = Substitute.For<ISyncPeer>();
syncPeer.TotalDifficulty.Returns(UInt256.MaxValue);
syncPeer.GetBlockHeaders(Arg.Any<long>(), Arg.Any<int>(), Arg.Any<int>(), Arg.Any<CancellationToken>())
.Returns(ci => ctx.ResponseBuilder.BuildHeaderResponse(ci.ArgAt<long>(0), ci.ArgAt<int>(1), Response.AllCorrect));

PeerInfo peerInfo = new(syncPeer);
syncPeer.HeadNumber.Returns(1000);
ctx.ConfigureBestPeer(peerInfo);

IForwardHeaderProvider forwardHeader = ctx.ForwardHeaderProvider;

using IOwnedReadOnlyList<BlockHeader?>? headers1 = await forwardHeader.GetBlockHeaders(0, 128, CancellationToken.None);
headers1.Should().NotBeNull();
using IOwnedReadOnlyList<BlockHeader?>? headers2 = await forwardHeader.GetBlockHeaders(0, 128, CancellationToken.None);
headers2.Should().NotBeNull();

await syncPeer.Received(1).GetBlockHeaders(Arg.Any<long>(), Arg.Any<int>(), Arg.Any<int>(), Arg.Any<CancellationToken>());
}

private class SlowSealValidator : ISealValidator
{
public bool ValidateParams(BlockHeader parent, BlockHeader header, bool isUncle = false)
Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Synchronization/Blocks/PowForwardHeaderProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private IOwnedReadOnlyList<BlockHeader>? LastResponseBatch
}

LastResponseBatch = newResponse;
return LastResponseBatch;
return newResponse.ToPooledList(newResponse.Count);
}

private void OnNewBestPeer(PeerInfo newBestPeer)
Expand Down