Skip to content

Fix snap sync edge case due to unnecessary proof #9166

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
benaadams merged 1 commit into from
Aug 19, 2025
Merged

Fix snap sync edge case due to unnecessary proof #9166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions ...ethermind/Nethermind.Synchronization.Test/SnapSync/RecreateStateFromStorageRangesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
using System;
using System.Linq;
using Autofac;
using FluentAssertions;
using Nethermind.Core;
using Nethermind.Core.Collections;
using Nethermind.Core.Crypto;
using Nethermind.Core.Extensions;
using Nethermind.Core.Test;
using Nethermind.Core.Test.Builders;
using Nethermind.Db;
Expand All @@ -18,6 +20,8 @@
using Nethermind.State.Proofs;
using Nethermind.State.Snap;
using Nethermind.Synchronization.SnapSync;
using Nethermind.Trie;
using Nethermind.Trie.Pruning;
using NUnit.Framework;

namespace Nethermind.Synchronization.Test.SnapSync
Expand Down Expand Up @@ -161,6 +165,32 @@ public void MissingAccountFromRange()
Assert.That(result3, Is.EqualTo(AddRangeResult.OK));
}

[Test]
public void AddStorageRange_WhereProofIsTheSameAsAllKey_ShouldStillStore()
{
Hash256 account = TestItem.KeccakA;
TestMemDb testMemDb = new();
var rawTrieStore = new RawScopedTrieStore(new NodeStorage(testMemDb), account);
StorageTree tree = new(rawTrieStore, LimboLogs.Instance);

(AddRangeResult result, bool moreChildrenToRight) = SnapProviderHelper.AddStorageRange(
tree,
new PathWithAccount(account, new Account(1, 1, new Hash256("0xeb8594ba5b3314111518b584bbd3801fb3aed5970bd8b47fd9ff744505fe101c"), TestItem.KeccakA)),
[
new PathWithStorageSlot(new ValueHash256("0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"), Bytes.FromHexString("94654f75e491acf8c380d2a6906e67e2e56813665e")),
],
Keccak.Zero,
null,
proofs: [
Bytes.FromHexString("f838a120290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5639594654f75e491acf8c380d2a6906e67e2e56813665e"),
Bytes.FromHexString("f838a120290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5639594654f75e491acf8c380d2a6906e67e2e56813665e"),
]);

result.Should().Be(AddRangeResult.OK);
moreChildrenToRight.Should().BeFalse();
testMemDb.WritesCount.Should().Be(1);
}

private static StorageRange PrepareStorageRequest(ValueHash256 accountPath, Hash256 storageRoot, ValueHash256 startingHash)
{
return new StorageRange()
Expand Down
11 changes: 11 additions & 0 deletions src/Nethermind/Nethermind.Synchronization/SnapSync/SnapProviderHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,17 @@ private static (AddRangeResult result, List<(TrieNode, TreePath)> sortedBoundary
return (AddRangeResult.MissingRootHashInProofs, null, true);
}

if (dict.Count == 1 && root.IsLeaf)
{
// Special case with some server sending proof where the root is the same as the only path.
// Without this the proof's IsBoundaryNode flag will cause the key to not get saved.
var rootPath = TreePath.FromNibble(root.Key);
if (rootPath.Length == 64 && rootPath.Path.Equals(endHash))
{
return (AddRangeResult.OK, null, false);
}
}

TreePath leftBoundaryPath = TreePath.FromPath(effectiveStartingHAsh.Bytes);
TreePath rightBoundaryPath = TreePath.FromPath(endHash.Bytes);
TreePath rightLimitPath = TreePath.FromPath(limitHash.Bytes);
Expand Down