fix: avoid collision in PartialAccountTree#2598
Open
igamigo wants to merge 2 commits intorelease/v0.14.0-betafrom
Open
fix: avoid collision in PartialAccountTree#2598igamigo wants to merge 2 commits intorelease/v0.14.0-betafrom
PartialAccountTree#2598igamigo wants to merge 2 commits intorelease/v0.14.0-betafrom
Conversation
igamigo
changed the title
PartialAccountTree
igamigo
force-pushed
the
igamigo-fix-partial-smt
branch
from
2acc5bc to
ac28f6a
Compare
igamigo
force-pushed
the
igamigo-fix-partial-smt
branch
from
ac28f6a to
49519f3
Compare
3 tasks
PhilippGackstatter
approved these changes
Mar 16, 2026
Contributor
PhilippGackstatter
left a comment
PhilippGackstatter
left a comment
There was a problem hiding this comment.
Looks good, thanks for the fix!
Comment on lines
+125
to
129
| if let Ok(SmtLeaf::Single((existing_key, _))) = self.smt.get_leaf(&id_key) | ||
| && id_key != existing_key | ||
| { | ||
| return Err(AccountTreeError::DuplicateIdPrefix { duplicate_prefix: id_prefix }); | ||
| } |
Contributor
There was a problem hiding this comment.
Thinking out loud: This allows adding the same account witness twice, but that should be fine. Since PartialSmt::add_proof will error if a root mismatch occurs, the only allowed case is if the previously added account witness is the same as the current one, so we could technically return early if id_key == existing_key. Though, I'd leave things as is to avoid introducing special logic that needs to be tested, etc.
Comment on lines
+306
to
+307
| let mut partial_tree = PartialAccountTree::with_witnesses([witness0, witness1, witness2])?; | ||
|
|
Contributor
There was a problem hiding this comment.
Should we add a partial_tree.track_account(witness1) here just to have a code path that adds the same witness twice (to make sure this does not error)?
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
PartialSmt::get_leafreturnsOk(SmtLeaf::Empty)for a provably empty space, which was causing errors in the node. Seems this changed with the recent migration to plonky 3 (noticed here) buttrack_accountwas not rewritten to account for this.Seems like the original change was reviewed here.
This PR basically uses the same pattern that
insert()uses for catching real collision cases. A (maybe more correct) alternative could be to add something likePartialSmt::has_explicit_leaf(&key)but that requires crypto changes.