fix: create intermediate nodes when needed #60
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fgimenez
requested review from
DaniPopes,
gakonst and
rkrasiuk
as code owners
fgimenez
force-pushed
the
fgimenez/fix-intermediate-node-creation
branch
from
f3fb619
to
cc94266
Compare
rkrasiuk
requested changes
Oct 29, 2024
Comment on lines
+204
to
+207
| // guard against accessing beyond the current key length | ||
| if common_prefix_len >= current.len() { | ||
| return; | ||
| } |
There was a problem hiding this comment.
common_prefix_len > current.len() is just not possible here due to common_prefix_length call. that leaves us with common_prefix_len == current.len(), why the change of behavior to return early
Comment on lines
+209
to
+214
| // calculate len ensuring we don't exceed current key boundaries | ||
| let len = if current.is_empty() { | ||
| 0 | ||
| } else { | ||
| cmp::min(cmp::max(preceding_len, common_prefix_len), current.len() - 1) | ||
| }; |
There was a problem hiding this comment.
same, what's the behavior being fixed here?
Comment on lines
+244
to
+273
| // handle intermediate nodes if needed, when current path is more | ||
| // than 1 nibble longer than common prefix | ||
| let needs_update = len + 1 < current.len() - 1; | ||
| if needs_update { | ||
| for intermediate_len in (len + 1)..current.len() { | ||
| let intermediate_path = current.slice(..intermediate_len); | ||
|
|
||
| if self | ||
| .updated_branch_nodes | ||
| .as_ref() | ||
| .map_or(true, |nodes| !nodes.contains_key(&intermediate_path)) | ||
| { | ||
| let next_nibble = current[intermediate_len]; | ||
| let state_mask = TrieMask::from_nibble(next_nibble); | ||
| let tree_mask = | ||
| if self.stored_in_database { state_mask } else { TrieMask::default() }; | ||
|
|
||
| let node = BranchNodeCompact::new( | ||
| state_mask, | ||
| tree_mask, | ||
| TrieMask::default(), | ||
| Vec::new(), | ||
| None, | ||
| ); | ||
|
|
||
| if let Some(ref mut nodes) = self.updated_branch_nodes { | ||
| nodes.insert(intermediate_path, node); | ||
| } | ||
| } | ||
| } |
Comment on lines
+418
to
+419
| // only set tree mask bits for positions that exist in state mask | ||
| my_state_mask & self.tree_masks[len] |
There was a problem hiding this comment.
self.tree_masks[len] must always be a subset of self.groups[len]. it's currently validated below, why is this needed?
Lines 285 to 298 in cf984af
|
this PR introduces branch node retention that violates MPT structure |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Towards: paradigmxyz/reth#12129
0b060502, the node at0bhas tree mask0000000001000000(expects child at position 6), there is no node at0b06but there is a node at0b0605. These changes fix the creation of the missing intermediate node.