feat(trie): use branch node hash masks in sparse trie #13135
Merged
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
…ash-masks' into alexey/proofs-branch-node-hash-masks
…ash-masks' into alexey/proofs-branch-node-hash-masks
This reverts commit b1424b1.
…ash-masks' into alexey/proofs-branch-node-hash-masks
Base automatically changed from
alexey/trie-proofs-branch-node-hash-masks
to
main
December 4, 2024 20:49
rkrasiuk
reviewed
Dec 5, 2024
crates/trie/sparse/src/trie.rs
Outdated
| @@ -933,7 +976,8 @@ where | |||
| if let Some(node) = self.provider.blinded_node(child_path.clone())? { | |||
| let decoded = TrieNode::decode(&mut &node[..])?; | |||
| trace!(target: "trie::sparse", ?child_path, ?decoded, "Revealing remaining blinded branch child"); | |||
| self.reveal_node(child_path.clone(), decoded)?; | |||
| // TODO: fetch hash mask | |||
There was a problem hiding this comment.
plan to address it in the next PR, as it requires modifying the BlindedProvider trait
There was a problem hiding this comment.
replaced with a comment
| @@ -102,75 +102,6 @@ impl<F: BlindedProviderFactory> SparseStateTrie<F> { | |||
| self.storages.get_mut(account).and_then(|e| e.as_revealed_mut()) | |||
| } | |||
|
|
|||
| /// Reveal unknown trie paths from provided leaf path and its proof for the account. | |||
| /// NOTE: This method does not extensively validate the proof. | |||
| pub fn reveal_account( | |||
There was a problem hiding this comment.
i'd prefer to keep this methods, they are still useful. mb with debug_assert!(!self.updates_enabled)
There was a problem hiding this comment.
fair, useful at least for tests
rkrasiuk
approved these changes
Dec 5, 2024
mattsse
approved these changes
Dec 6, 2024
| let node = TrieNode::decode(&mut &bytes[..])?; | ||
| trace!(target: "trie::sparse", ?account, ?path, ?node, "Revealing storage node"); | ||
| trie.reveal_node(path, node)?; | ||
| let hash_mask = if let TrieNode::Branch(_) = node { |
There was a problem hiding this comment.
looks like we could use fn is_branch()
suggestion for followup
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.
Integrates #13129 into the sparse trie, revealing the hash masks of branch nodes along with the proofs.