fix(replay): fix execution with eth_getProof #4616
Merged
+73
−39
Conversation
This file contains hidden or 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
There was a problem hiding this comment.
Pull Request Overview
This PR fixes execution with eth_getProof by addressing issues with the trie implementation when nodes are missing. The solution involves pre-injecting nodes into the trie and adding dummy nodes to handle missing references.
Key changes:
- Pre-inject root nodes into the state trie to ensure they're available for child node discovery
- Extract trie traversal logic into a helper function for code reusability
- Insert dummy branch nodes for missing storage node references to prevent execution failures
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| crates/common/trie/node/branch.rs | Add Default trait to BranchNode to enable creation of dummy nodes |
| cmd/ethrex_replay/src/rpc/db.rs | Fix root node injection by ensuring it's added to state_nodes collection |
| cmd/ethrex_replay/src/lib.rs | Add helpers module to lib exports |
| cmd/ethrex_replay/src/helpers.rs | New helper function to extract referenced hashes from trie nodes |
| cmd/ethrex_replay/src/cli.rs | Refactor trie handling to use helper function and add dummy node injection for storage tries |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Co-authored-by: Copilot <[email protected]>
Benchmark for 8085d49Click to view benchmark
|
ilitteri
reviewed
Sep 24, 2025
cmd/ethrex_replay/src/helpers.rs
Outdated
| Node::Branch(node) => { | ||
| for choice in &node.choices { | ||
| let NodeRef::Hash(hash) = *choice else { | ||
| unreachable!() |
There was a problem hiding this comment.
Return errors instead of this.
ilitteri
approved these changes
Sep 24, 2025
Benchmark for 5dc4763Click to view benchmark
|
Benchmark for 48c2cd0Click to view benchmark
|
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Benchmark for d43e64cClick to view benchmark
|
auto-merge was automatically disabled
September 24, 2025 22:23
Pull Request is not mergeable
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Benchmark for 72c30cdClick to view benchmark
|
Benchmark for 14c6871Click to view benchmark
|
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.
Motivation
Description
Execution with eth_getProof had some caveats regarding the trie. For making it work we need to do 2 things:
The
1was already done in the code but wasn't working properly, the problem was just that the root node wasn't being inserted into the nodes that were used for building the trie that's used for getting potential child nodes.The 2 is a modification that we don't want in our MPT so we didn't carry along with that. However, in execution without zkVM we have the possibility of inserting arbitrary nodes with the hashes that we want and RLP content that doesn't necessarily match to that hash, so we can "deceive" the trie into thinking it has some nodes when in fact they are just dummy nodes.
How can we use it to our advantage? We insert dummy branch nodes in every single place where a storage node is being referenced but it's missing. This way, if we want to do a trie restructuring we will find the node that otherwise we wouldn't have found, and the good thing is that we don't care about the contents of this node because they won't change, in this particular case the node will be referenced by a one nibble extension node. For more info read https://github.com/kkrt-labs/zk-pig/blob/main/docs/modified-mpt.md#modified-mpt-implementation
Closes #issue_number