fix(aggregation_mode): merkle-tree backend openzeppelin compliant #1931
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
MauroToscano
approved these changes
May 13, 2025
MauroToscano
approved these changes
May 13, 2025
Changes to gas cost
🧾 Summary (10% most significant diffs)
Full diff report 👇
|
JuArce
changed the title
fix: add missing new line chore: update program ids
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a bug by updating the merkle tree backend in aggregation mode to be OpenZeppelin compliant. The key changes include updating program IDs across several configuration files and modifying the hash_new_parent implementations to use sorted child nodes in the hash computation.
Reviewed Changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| contracts/script/deploy/config/**.json | Updated program IDs for consistency with new zkvm program IDs |
| batcher/aligned-sdk/src/sdk/aggregation.rs | Added sorted hash computation documented per OpenZeppelin guidelines |
| aggregation_mode/src/aggregators/mod.rs | Added sorted hash computation as above |
| aggregation_mode/programs_ids.json | Updated program IDs |
| aggregation_mode/aggregation_programs/sp1/src/lib.rs | Added sorted hash computation per OpenZeppelin guidelines |
| aggregation_mode/aggregation_programs/risc0/src/lib.rs | Added sorted hash computation; uses a different Keccak hasher variant |
Comments suppressed due to low confidence (1)
aggregation_mode/aggregation_programs/risc0/src/lib.rs:55
- [nitpick] The Risc0 implementation uses Keccak::v256() while other modules use Keccak256. Consider aligning the hasher usage or adding a comment clarifying the reason for this difference.
let mut hasher = Keccak::v256();
JuArce
approved these changes
May 14, 2025
# Conflicts: # contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json
JuArce
requested changes
May 15, 2025
Collaborator
JuArce
left a comment
JuArce
left a comment
There was a problem hiding this comment.
I'm updating the ethereum package contracts
JuArce
approved these changes
May 15, 2025
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.
Description
Update merkle tree backend in aggregation mode to be OpenZeppelin compliant. For it, we have to make sure that node pairs are sorted when hashing. That is:
Given node_1 and node_2:
if$node_1$ < $node_2$ $\Rightarrow$ hash($node_1$ , $node_2$ )$\Rightarrow$ hash($node_2$ , $node_1$ )
else
See OpenZeppelin reference here.
Consideration
zkvm programs ids have changed, so they must be changed in the proof aggregation contract once merged.
Type of change
Checklist
testnet, everything else tostaging