feat: merge-train/avm#22986
Merged
Merged
Conversation
#22982) The 6 boolean pairs (non_revertible_append_X, revertible_append_X) for X in {note_hash, nullifier, l2_l1_msg} in TX_PHASE_SPEC_MAP were perfectly correlated with is_revertible: in every phase where one of them is set, is_revertible already determines which side. Replace each pair with a single sel_append_X selector and let is_revertible carry the revertibility bit. This removes 3 precomputed columns and 3 committed columns in the tx trace, shrinks the #[READ_PHASE_SPEC] lookup tuple, and simplifies the sel_try_X_append / is_tree_insert_phase / SEL_CAN_EMIT_X expressions. In #[NOTE_HASH_APPEND], the sel_unique flag (previously fed by sel_revertible_append_note_hash) is now is_revertible directly: on the two rows where the lookup is gated on, the two values agree by construction, and is_revertible is the more direct semantic for the "make this note hash unique with a nonce" decision. Updates the hardcoded precomputed VK commitments in avm_fixed_vk.hpp and the corresponding vk_hash; new values obtained from AvmFixedVKTests.FixedVKCommitments.
AztecBot
requested review from
IlyasRidhuan,
MirandaWood and
jeanmon
as code owners
Collaborator
Author
|
🤖 Auto-merge enabled after 4 hours of inactivity. This PR will be merged automatically once all checks pass. |
federicobarbacovi
added a commit
that referenced
this pull request
May 7, 2026
commit fe8ed94 Author: federicobarbacovi <171914500+federicobarbacovi@users.noreply.github.com> Date: Thu May 7 14:09:02 2026 +0000 Fix name commit c704130 Author: federicobarbacovi <171914500+federicobarbacovi@users.noreply.github.com> Date: Thu May 7 13:34:34 2026 +0000 Extend calldata types, minor changes to README commit de94416 Author: ledwards2225 <l.edwards.d@gmail.com> Date: Thu May 7 00:43:23 2026 +0000 prover tomls commit c554fd0 Author: ledwards2225 <l.edwards.d@gmail.com> Date: Wed May 6 21:59:54 2026 +0000 vks commit 0ae600b Author: ledwards2225 <l.edwards.d@gmail.com> Date: Wed May 6 21:08:25 2026 +0000 constants commit 6686c89 Author: ledwards2225 <l.edwards.d@gmail.com> Date: Wed May 6 20:16:44 2026 +0000 extend databus with 2 more cols commit f8ac6da Merge: 42e2e67 b3031a2 Author: AztecBot <tech@aztecprotocol.com> Date: Wed May 6 17:47:36 2026 +0000 Merge branch 'next' into merge-train/barretenberg commit b3031a2 Merge: 420fd55 d06c141 Author: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Wed May 6 16:32:12 2026 +0000 chore: Update Noir to nightly-2026-05-05 (#22911) Automated update of Noir submodule to latest nightly. **Current**: unknown **New**: nightly-2026-05-05 [View changes in noir-lang/noir](noir-lang/noir@20391fd...nightly-2026-05-05) commit d06c141 Author: AztecBot <49558828+AztecBot@users.noreply.github.com> Date: Wed May 6 16:31:28 2026 +0000 chore: Update Noir to nightly-2026-05-05 Automated update of Noir submodule to latest nightly. **Current**: unknown **New**: nightly-2026-05-05 [View changes in noir-lang/noir](noir-lang/noir@20391fd...nightly-2026-05-05) commit 420fd55 Merge: 72c125c 22231d5 Author: ledwards2225 <98505400+ledwards2225@users.noreply.github.com> Date: Wed May 6 16:30:52 2026 +0000 feat: merge-train/barretenberg (#22969) BEGIN_COMMIT_OVERRIDE chore: skip zero-init and reserve copy_cycle vectors (#22963) feat: Multi app per kernel (#22640) END_COMMIT_OVERRIDE commit 72c125c Merge: a864dec 38115ab Author: Aztec Bot <49558828+AztecBot@users.noreply.github.com> Date: Wed May 6 16:30:50 2026 +0000 feat: merge-train/avm (#22986) BEGIN_COMMIT_OVERRIDE refactor(avm)!: consolidate revertible/non-revertible append selectors (#22982) END_COMMIT_OVERRIDE commit 42e2e67 Author: federicobarbacovi <171914500+federicobarbacovi@users.noreply.github.com> Date: Wed May 6 16:54:17 2026 +0100 feat: Improve add_scaled_batch (#22981) Two improvements: 1. `add_scaled_batch` was iterating over all polys to be batched and processing indices based on the range of the destination poly (the biggest of the polys to be batched). This PR adds a skipping condition that speeds up the function: we only iterate over the poly to be batched 2. Write a bespoke `add_batch_scaled` for use in the AVM with dynamic allocation of threads: each thread picks up the new available poly and works with it. This makes optimal usage of the fact that many polys in the AVM are small. Link to AVM bulk test: http://ci.aztec-labs.com/1df80aa9b6ae0088. The PCS component is `446ms` down from ~`600ms` commit 22231d5 Merge: 36d6ec8 a864dec Author: AztecBot <tech@aztecprotocol.com> Date: Wed May 6 15:35:10 2026 +0000 Merge branch 'next' into merge-train/barretenberg commit 38115ab Merge: 024b01b a864dec Author: AztecBot <tech@aztecprotocol.com> Date: Wed May 6 15:35:07 2026 +0000 Merge branch 'next' into merge-train/avm commit a864dec Merge: 1211a03 b23fb63 Author: PhilWindle <60546371+PhilWindle@users.noreply.github.com> Date: Wed May 6 14:55:36 2026 +0000 chore(p2p): drop unused ENR xxhash versioning path (#22943) ## Summary Removes dead code from `p2p/src/versioning.ts`: - `USE_XX_HASH` was never `true` outside tests; production ENRs always used the compressed string from `compressComponentVersions`. - Peer discovery already validates with `checkCompressedComponentVersion` in `discV5_service.ts`; `checkAztecEnrVersion` was only used from tests. - Drops `xxhash-wasm` / `toBufferBE` from this module (gossip `encoding.ts` still uses xxhash for message IDs). Related to [A-766](https://linear.app/aztec-labs/issue/A-766/audit-97-enr-version-detection-uses-string-prefix-matching-fragile) commit 024b01b Author: Jean M <132435771+jeanmon@users.noreply.github.com> Date: Wed May 6 14:18:16 2026 +0200 refactor(avm)!: consolidate revertible/non-revertible append selectors (#22982) The 6 boolean pairs (non_revertible_append_X, revertible_append_X) for X in {note_hash, nullifier, l2_l1_msg} in TX_PHASE_SPEC_MAP were perfectly correlated with is_revertible: in every phase where one of them is set, is_revertible already determines which side. Replace each pair with a single sel_append_X selector and let is_revertible carry the revertibility bit. This removes 3 precomputed columns and 3 committed columns in the tx trace, shrinks the #[READ_PHASE_SPEC] lookup tuple, and simplifies the sel_try_X_append / is_tree_insert_phase / SEL_CAN_EMIT_X expressions. In #[NOTE_HASH_APPEND], the sel_unique flag (previously fed by sel_revertible_append_note_hash) is now is_revertible directly: on the two rows where the lookup is gated on, the two values agree by construction, and is_revertible is the more direct semantic for the "make this note hash unique with a nonce" decision. Updates the hardcoded precomputed VK commitments in avm_fixed_vk.hpp and the corresponding vk_hash; new values obtained from AvmFixedVKTests.FixedVKCommitments. commit b23fb63 Author: spypsy <spypsy@outlook.com> Date: Tue May 5 10:07:46 2026 +0000 chore(p2p): drop unused ENR xxhash versioning path USE_XX_HASH was never true in production; discv5 already validates via checkCompressedComponentVersion. Removes xxhash/toBufferBE from versioning.ts and tests the string format only.
federicobarbacovi
added a commit
that referenced
this pull request
May 7, 2026
commit fe8ed94 Author: federicobarbacovi <171914500+federicobarbacovi@users.noreply.github.com> Date: Thu May 7 14:09:02 2026 +0000 Fix name commit c704130 Author: federicobarbacovi <171914500+federicobarbacovi@users.noreply.github.com> Date: Thu May 7 13:34:34 2026 +0000 Extend calldata types, minor changes to README commit de94416 Author: ledwards2225 <l.edwards.d@gmail.com> Date: Thu May 7 00:43:23 2026 +0000 prover tomls commit c554fd0 Author: ledwards2225 <l.edwards.d@gmail.com> Date: Wed May 6 21:59:54 2026 +0000 vks commit 0ae600b Author: ledwards2225 <l.edwards.d@gmail.com> Date: Wed May 6 21:08:25 2026 +0000 constants commit 6686c89 Author: ledwards2225 <l.edwards.d@gmail.com> Date: Wed May 6 20:16:44 2026 +0000 extend databus with 2 more cols commit f8ac6da Merge: 42e2e67 b3031a2 Author: AztecBot <tech@aztecprotocol.com> Date: Wed May 6 17:47:36 2026 +0000 Merge branch 'next' into merge-train/barretenberg commit b3031a2 Merge: 420fd55 d06c141 Author: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Wed May 6 16:32:12 2026 +0000 chore: Update Noir to nightly-2026-05-05 (#22911) Automated update of Noir submodule to latest nightly. **Current**: unknown **New**: nightly-2026-05-05 [View changes in noir-lang/noir](noir-lang/noir@20391fd...nightly-2026-05-05) commit d06c141 Author: AztecBot <49558828+AztecBot@users.noreply.github.com> Date: Wed May 6 16:31:28 2026 +0000 chore: Update Noir to nightly-2026-05-05 Automated update of Noir submodule to latest nightly. **Current**: unknown **New**: nightly-2026-05-05 [View changes in noir-lang/noir](noir-lang/noir@20391fd...nightly-2026-05-05) commit 420fd55 Merge: 72c125c 22231d5 Author: ledwards2225 <98505400+ledwards2225@users.noreply.github.com> Date: Wed May 6 16:30:52 2026 +0000 feat: merge-train/barretenberg (#22969) BEGIN_COMMIT_OVERRIDE chore: skip zero-init and reserve copy_cycle vectors (#22963) feat: Multi app per kernel (#22640) END_COMMIT_OVERRIDE commit 72c125c Merge: a864dec 38115ab Author: Aztec Bot <49558828+AztecBot@users.noreply.github.com> Date: Wed May 6 16:30:50 2026 +0000 feat: merge-train/avm (#22986) BEGIN_COMMIT_OVERRIDE refactor(avm)!: consolidate revertible/non-revertible append selectors (#22982) END_COMMIT_OVERRIDE commit 42e2e67 Author: federicobarbacovi <171914500+federicobarbacovi@users.noreply.github.com> Date: Wed May 6 16:54:17 2026 +0100 feat: Improve add_scaled_batch (#22981) Two improvements: 1. `add_scaled_batch` was iterating over all polys to be batched and processing indices based on the range of the destination poly (the biggest of the polys to be batched). This PR adds a skipping condition that speeds up the function: we only iterate over the poly to be batched 2. Write a bespoke `add_batch_scaled` for use in the AVM with dynamic allocation of threads: each thread picks up the new available poly and works with it. This makes optimal usage of the fact that many polys in the AVM are small. Link to AVM bulk test: http://ci.aztec-labs.com/1df80aa9b6ae0088. The PCS component is `446ms` down from ~`600ms` commit 22231d5 Merge: 36d6ec8 a864dec Author: AztecBot <tech@aztecprotocol.com> Date: Wed May 6 15:35:10 2026 +0000 Merge branch 'next' into merge-train/barretenberg commit 38115ab Merge: 024b01b a864dec Author: AztecBot <tech@aztecprotocol.com> Date: Wed May 6 15:35:07 2026 +0000 Merge branch 'next' into merge-train/avm commit a864dec Merge: 1211a03 b23fb63 Author: PhilWindle <60546371+PhilWindle@users.noreply.github.com> Date: Wed May 6 14:55:36 2026 +0000 chore(p2p): drop unused ENR xxhash versioning path (#22943) ## Summary Removes dead code from `p2p/src/versioning.ts`: - `USE_XX_HASH` was never `true` outside tests; production ENRs always used the compressed string from `compressComponentVersions`. - Peer discovery already validates with `checkCompressedComponentVersion` in `discV5_service.ts`; `checkAztecEnrVersion` was only used from tests. - Drops `xxhash-wasm` / `toBufferBE` from this module (gossip `encoding.ts` still uses xxhash for message IDs). Related to [A-766](https://linear.app/aztec-labs/issue/A-766/audit-97-enr-version-detection-uses-string-prefix-matching-fragile) commit 024b01b Author: Jean M <132435771+jeanmon@users.noreply.github.com> Date: Wed May 6 14:18:16 2026 +0200 refactor(avm)!: consolidate revertible/non-revertible append selectors (#22982) The 6 boolean pairs (non_revertible_append_X, revertible_append_X) for X in {note_hash, nullifier, l2_l1_msg} in TX_PHASE_SPEC_MAP were perfectly correlated with is_revertible: in every phase where one of them is set, is_revertible already determines which side. Replace each pair with a single sel_append_X selector and let is_revertible carry the revertibility bit. This removes 3 precomputed columns and 3 committed columns in the tx trace, shrinks the #[READ_PHASE_SPEC] lookup tuple, and simplifies the sel_try_X_append / is_tree_insert_phase / SEL_CAN_EMIT_X expressions. In #[NOTE_HASH_APPEND], the sel_unique flag (previously fed by sel_revertible_append_note_hash) is now is_revertible directly: on the two rows where the lookup is gated on, the two values agree by construction, and is_revertible is the more direct semantic for the "make this note hash unique with a nonce" decision. Updates the hardcoded precomputed VK commitments in avm_fixed_vk.hpp and the corresponding vk_hash; new values obtained from AvmFixedVKTests.FixedVKCommitments. commit b23fb63 Author: spypsy <spypsy@outlook.com> Date: Tue May 5 10:07:46 2026 +0000 chore(p2p): drop unused ENR xxhash versioning path USE_XX_HASH was never true in production; discv5 already validates via checkCompressedComponentVersion. Removes xxhash/toBufferBE from versioning.ts and tests the string format only.
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.
BEGIN_COMMIT_OVERRIDE
refactor(avm)!: consolidate revertible/non-revertible append selectors (#22982)
END_COMMIT_OVERRIDE