WEB3-132: fix: verify beacon inclusion proof against node index #249
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
github-actions
bot
changed the title
nategraf
approved these changes
Sep 20, 2024
intoverflow
reviewed
Sep 20, 2024
| @@ -33,7 +37,9 @@ impl<H: EvmBlockHeader> BeaconInput<H> { | |||
| pub fn into_env(self) -> GuestEvmEnv<H> { | |||
| let mut env = self.input.into_env(); | |||
|
|
|||
| let beacon_root = self.proof.process(env.header.seal()); | |||
| let beacon_root = | |||
| merkle::process_proof(env.header.seal(), &self.proof, BLOCK_HASH_LEAF_INDEX) | |||
There was a problem hiding this comment.
Is a length check on the proof's Vec needed here?
There was a problem hiding this comment.
We are actually using the generalized Merkle tree index which is defined as 2**depth + index. So the BLOCK_HASH_LEAF_INDEX also encodes the depth and it is verified here: https://github.com/risc0/risc0-ethereum/blob/fix/beacon-inclusion-proof/steel/src/merkle.rs#L71-L74
There was a problem hiding this comment.
I have also added a test for this in cfc9572
Wollac
added a commit
that referenced
this pull request
Oct 7, 2024
Previously, the node index of the `block_hash` was part of the input. With this PR the Merkle proof is checked with respect to the (generalized) index of the `block_hash` field.
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.
Previously, the node index of the
block_hashwas part of the input. With this PR the Merkle proof is checked with respect to the (generalized) index of theblock_hashfield.