feat(avm): merkle tree gadget #9205
Open
+1,142
−515
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
This stack of pull requests is managed by Graphite. Learn more about stacking. Join @IlyasRidhuan and the rest of your teammates on |
IlyasRidhuan
requested review from
jeanmon,
fcarreiro and
Maddiaa0
as code owners
IlyasRidhuan
force-pushed
the
ir/10-11-feat_avm_merkle_tree_gadget
branch
from
1f36cf1
to
76f5435
Compare
IlyasRidhuan
force-pushed
the
ir/10-08-feat_avm_full_poseidon2
branch
from
a421532
to
0959678
Compare
IlyasRidhuan
force-pushed
the
ir/10-11-feat_avm_merkle_tree_gadget
branch
5 times, most recently
from
3832bb7
to
8f022b7
Compare
jeanmon
approved these changes
Oct 25, 2024
barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/merkle_tree.hpp
Outdated
Show resolved
Hide resolved
barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/merkle_tree.cpp
Outdated
Show resolved
Hide resolved
| std::vector<bool> path_bits; | ||
| std::vector<FF> path_values; | ||
| // These will be eventually stored somewhere as a "clock speed" | ||
| auto entry_id = clk << 6; |
There was a problem hiding this comment.
Can you please add some explanations? the shift << 6 seems a magic constant.
barretenberg/cpp/src/barretenberg/vm/avm/tests/merkle_tree.test.cpp
Outdated
Show resolved
Hide resolved
IlyasRidhuan
force-pushed
the
ir/10-11-feat_avm_merkle_tree_gadget
branch
from
8f022b7
to
bfe9c36
Compare
IlyasRidhuan
changed the base branch from
master
to
ir/10-25-fix_avm_address_bytecode_hashing_comments
This was referenced Oct 25, 2024
dbanks12
reviewed
Oct 25, 2024
Comment on lines
15
to
17
| // These will be eventually stored somewhere as a "clock speed" | ||
| auto entry_id = clk << 6; |
There was a problem hiding this comment.
I don't understand what entry_id is here, how can be interpreted as "clock speed", and why we shift left by 6
barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/merkle_tree.cpp
Outdated
Show resolved
Hide resolved
Comment on lines
+34
to
+25
| // latch == 1 when the path_len == 0 | ||
| sel_merkle_tree * (path_len * (latch * (1 - path_len_inv) + path_len_inv) - 1 + latch) = 0; |
There was a problem hiding this comment.
My brain is having trouble understaning this
There was a problem hiding this comment.
This looks very confusing but is our standard check for "set A = 1 when B = 0, and set A = 0 when B !=0".
It works as follows
- Note that
a * a_inverse == 1, buta_inverseonly exists ifa != 0(0 is the only element without an inverse in the field). - If
latch == 0, then the formula becomespath_len * path_len_inv - 1 = 0(which can only be true whenpath_len != 0,since we need a validpath_len_inv. - If
latch == 1then the formula becomespath_len * ( 1 - path_len_inv + path_len_inv) = 0, simplified this ispath_len = 0
There was a problem hiding this comment.
Ah I see.... Makes sense! I'd through this in comments (either everywhere we use it, or in one place that we can point to) 🤷
Comment on lines
+40
to
+35
| // If we are not done, the next leaf index is half the current leaf index; | ||
| // We don't need to worry about underflowing the field since (leaf_index - LEAF_INDEX_IS_ODD) | ||
| // wil be even (over the integers) and as the field is not of characteristic 2, leaf_index' == leaf_index / 2 over the integers | ||
| sel_merkle_tree * (1 - latch) * (leaf_index' * 2 + LEAF_INDEX_IS_ODD - leaf_index) = 0; |
There was a problem hiding this comment.
nit: maybe silly, this would be easier to read for me if the + LEAF_INDEX_IS_ODD was at the end.
IlyasRidhuan
force-pushed
the
ir/10-25-fix_avm_address_bytecode_hashing_comments
branch
from
1385a08
to
5ce56b4
Compare
IlyasRidhuan
force-pushed
the
ir/10-11-feat_avm_merkle_tree_gadget
branch
from
bfe9c36
to
e716c97
Compare
IlyasRidhuan
force-pushed
the
ir/10-25-fix_avm_address_bytecode_hashing_comments
branch
from
5ce56b4
to
54c1e3d
Compare
IlyasRidhuan
force-pushed
the
ir/10-11-feat_avm_merkle_tree_gadget
branch
from
e716c97
to
88ce7d8
Compare
Base automatically changed from
ir/10-25-fix_avm_address_bytecode_hashing_comments
to
master
October 27, 2024 15:02
IlyasRidhuan
force-pushed
the
ir/10-11-feat_avm_merkle_tree_gadget
branch
from
88ce7d8
to
4ae36f3
Compare
IlyasRidhuan
force-pushed
the
ir/10-11-feat_avm_merkle_tree_gadget
branch
from
4ae36f3
to
a9434cd
Compare
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.
Resolves #9458