feat: Add option for returning TrieNodes instead of RLP encoded Bytes #14335
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
varun-doshi
requested review from
rkrasiuk,
mattsse,
Rjected and
fgimenez
as code owners
|
@Rjected please correct me if im going about this wrong |
emhane
requested changes
Feb 8, 2025
crates/engine/tree/src/tree/root.rs
Outdated
| @@ -229,7 +233,7 @@ impl ProofSequencer { | |||
|
|
|||
| // return early if we don't have the next expected proof | |||
| if !self.pending_proofs.contains_key(&self.next_to_deliver) { | |||
| return Vec::new() | |||
| return Vec::new(); | |||
There was a problem hiding this comment.
Suggested change
| return Vec::new(); | |
| return Vec::new() |
pls revert unrelated formatting changes. makes it hard to see the actual diff to review.
emhane
added
C-perf
varun-doshi
force-pushed
the
varun/decode-proofs
branch
from
97ebde3 to
ce8fd4f
Compare
emhane
requested changes
Feb 8, 2025
crates/engine/tree/src/tree/root.rs
Outdated
| @@ -66,13 +67,16 @@ pub struct StateRootComputeOutcome { | |||
| /// A trie update that can be applied to sparse trie alongside the proofs for touched parts of the | |||
| /// state. | |||
| #[derive(Default, Debug)] | |||
| #[allow(dead_code)] | |||
There was a problem hiding this comment.
this attribute shouldn't be needed
crates/engine/tree/src/tree/root.rs
Outdated
| @@ -438,6 +443,25 @@ where | |||
| } | |||
| } | |||
|
|
|||
| #[derive(Debug, Default)] | |||
| struct DecodedProofs { | |||
| #[allow(dead_code)] | |||
There was a problem hiding this comment.
Suggested change
| #[allow(dead_code)] |
this attribute shouldn't be needed
… in proof retainer
varun-doshi
force-pushed
the
varun/decode-proofs
branch
from
ce8fd4f to
862dbd2
Compare
Rjected
requested changes
Feb 9, 2025
Comment on lines
+445
to
+461
| #[derive(Debug, Default)] | ||
| struct DecodedProofs { | ||
| pub decoded_nodes: Vec<TrieNode>, | ||
| } | ||
|
|
||
| fn decode_proofs(multiproof: MultiProof) -> Result<DecodedProofs, SparseStateTrieError> { | ||
| let mut nodes: Vec<TrieNode> = vec![]; | ||
| let account_subtree = multiproof.account_subtree.into_nodes_sorted(); | ||
| let account_nodes = account_subtree.into_iter(); | ||
|
|
||
| // Reveal the remaining proof nodes. | ||
| for (_path, bytes) in account_nodes { | ||
| let node = TrieNode::decode(&mut &bytes[..])?; | ||
| nodes.push(node); | ||
| } | ||
| Ok(DecodedProofs { decoded_nodes: nodes }) | ||
| } |
There was a problem hiding this comment.
Instead of this, let's just start by creating a struct like StorageMultiProof:
reth/crates/trie/common/src/proofs.rs
Line 141 in 905fd37
In trie-common, that uses alloy_trie::DecodedProofNodes instead of ProofNodes
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.
Ref #14313
Closely related to #14312