Skip to content

Snap server GetTrieNodes to return empty bytes when trienode doesn't exist #7305

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
jframe merged 11 commits into from
Jul 28, 2024
Merged

Snap server GetTrieNodes to return empty bytes when trienode doesn't exist #7305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
82fdcdf
Snapserver GetTrieNodes to return empty bytes when trienode doesn't e…
jframe Jun 28, 2024
14e729d
Merge remote-tracking branch 'upstream/main' into snapserver_trienode…
jframe Jul 10, 2024
6c47650
Fix BFT snap syncing when there is no state breaking due to empty byt…
jframe Jul 16, 2024
28090e8
Merge remote-tracking branch 'upstream/main' into snapserver_trienode…
jframe Jul 16, 2024
1020a4d
Consider tridnode requests to be received even if they are empty if t…
jframe Jul 16, 2024
ed609d3
Fix complete task tests
jframe Jul 16, 2024
9d9765e
Merge branch 'main' into snapserver_trienode_nonexisting_node
jframe Jul 22, 2024
02902c7
Remove BFT empty byte changes
jframe Jul 26, 2024
1b13b11
Add BFT changes for empty state back in
jframe Jul 26, 2024
b10aa19
test case for empty account for storage trie. remove invalid test cas…
jframe Jul 26, 2024
fa9217a
Merge branch 'main' into snapserver_trienode_nonexisting_node
jframe Jul 26, 2024
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
32 changes: 16 additions & 16 deletions ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/SnapServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,15 +518,13 @@ MessageData constructGetTrieNodesResponse(final MessageData message) {
if (optStorage.isEmpty() && location.isEmpty()) {
optStorage = Optional.of(MerkleTrie.EMPTY_TRIE_NODE);
}
if (optStorage.isPresent()) {
if (!trieNodes.isEmpty()
&& (sumListBytes(trieNodes) + optStorage.get().size() > maxResponseBytes
|| stopWatch.getTime() > StatefulPredicate.MAX_MILLIS_PER_REQUEST)) {
break;
}
trieNodes.add(optStorage.get());
var trieNode = optStorage.orElse(Bytes.EMPTY);
if (!trieNodes.isEmpty()
&& (sumListBytes(trieNodes) + trieNode.size() > maxResponseBytes
|| stopWatch.getTime() > StatefulPredicate.MAX_MILLIS_PER_REQUEST)) {
break;
}

trieNodes.add(trieNode);
} else {
// There must be at least one element in the path otherwise it is invalid
if (triePath.isEmpty()) {
Expand All @@ -537,7 +535,11 @@ MessageData constructGetTrieNodesResponse(final MessageData message) {
// otherwise the first element should be account hash, and subsequent paths
// are compact encoded account storage paths

final Bytes accountPrefix = Bytes32.leftPad(triePath.getFirst());
final Bytes32 accountPrefix = Bytes32.leftPad(triePath.getFirst());
var optAccount = storage.getAccount(Hash.wrap(accountPrefix));
if (optAccount.isEmpty()) {
continue;
}

List<Bytes> storagePaths = triePath.subList(1, triePath.size());
for (var path : storagePaths) {
Expand All @@ -547,14 +549,12 @@ MessageData constructGetTrieNodesResponse(final MessageData message) {
if (optStorage.isEmpty() && location.isEmpty()) {
optStorage = Optional.of(MerkleTrie.EMPTY_TRIE_NODE);
}
if (optStorage.isPresent()) {
if (!trieNodes.isEmpty()
&& sumListBytes(trieNodes) + optStorage.get().size()
> maxResponseBytes) {
break;
}
trieNodes.add(optStorage.get());
var trieNode = optStorage.orElse(Bytes.EMPTY);
if (!trieNodes.isEmpty()
&& sumListBytes(trieNodes) + trieNode.size() > maxResponseBytes) {
break;
}
trieNodes.add(trieNode);
}
}
}
Expand Down
23 changes: 20 additions & 3 deletions ...reum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/snap/SnapServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,25 @@ public void assertStorageTriePathRequest() {
assertThat(trieNodeRequest).isNotNull();
List<Bytes> trieNodes = trieNodeRequest.nodes(false);
assertThat(trieNodes).isNotNull();
assertThat(trieNodes.size()).isEqualTo(4);
assertThat(trieNodes.size()).isEqualTo(6);
assertThat(trieNodes.get(2)).isEqualTo(Bytes.EMPTY);
assertThat(trieNodes.get(5)).isEqualTo(Bytes.EMPTY);
}

@Test
public void assertStorageTriePathRequest_accountNotPresent() {
insertTestAccounts(acct4);
var pathToSlot11 = CompactEncoding.encode(Bytes.fromHexStringLenient("0x0101"));
var trieNodeRequest =
requestTrieNodes(
storageTrie.getRootHash(),
List.of(
List.of(acct3.addressHash, pathToSlot11) // account not present
));
assertThat(trieNodeRequest).isNotNull();
List<Bytes> trieNodes = trieNodeRequest.nodes(false);
assertThat(trieNodes).isNotNull();
assertThat(trieNodes.size()).isEqualTo(0);
}

@Test
Expand Down Expand Up @@ -582,8 +600,7 @@ public void assertStorageTrieLimitRequest() {
assertThat(trieNodeRequest).isNotNull();
List<Bytes> trieNodes = trieNodeRequest.nodes(false);
assertThat(trieNodes).isNotNull();
// TODO: adjust this assertion after sorting out the request fudge factor
assertThat(trieNodes.size()).isEqualTo(trieNodeLimit * 90 / 100);
assertThat(trieNodes.size()).isEqualTo(3);
}

@Test
Expand Down