Open
Conversation
Cherry-pick of merge commit 0daa54d with conflicts. Conflicts in: avm-transpiler/Cargo.lock, noir-projects Nargo.toml files, noir-projects macro files, noir/noir-repo submodule.
Resolved conflicts by taking the PR side for all changes: - poseidon v0.2.3 -> v0.3.0 in Nargo.toml files - bignum v0.9.0 -> v0.10.0, bigcurve v0.13.0 -> v0.14.0 in blob/rollup-lib - indexmap 2.13.0 -> 2.13.1, added itertools in Cargo.lock - Comment reformatting to 120-char line limit in .nr files - Updated noir/noir-repo submodule to 842974fcf034b0
Cherry-pick of 17ba18a — removes unnecessary 'let mut' across noir-projects (now errors in newer Noir). Conflicts in private_context.nr and discovery/mod.nr resolved by keeping HEAD which already has the fixes via newer code. Cargo.lock/yarn.lock/submodule kept at our versions.
…ds from macros) Cherry-pick of 5de59a7 — replaces deprecated Noir comptime APIs: - add_attribute('abi(events)') -> add_abi('events') - set_body/set_parameters/add_attribute/set_return_public -> function.disable() - fn_has_noinitcheck now also checks is_fn_only_self() - Removes f.add_attribute('noinitcheck') from only_self
- Remove unnecessary mut from is_static_call in private_context.nr - Simplify fn_has_noinitcheck in utils.nr to match next
…#22485) ## Summary Backport of #22393 (Update Noir to nightly-2026-04-10) to v4-next, plus 3 companion PRs needed for Noir compatibility since v4-next was still on nightly-2026-02-12. ## Companion PRs included Since v4-next hadn't updated Noir since nightly-2026-02-12 (~2 months behind), several intermediate Noir-adaptation PRs were also needed: 1. **#20702** — Remove unnecessary `comptime` qualifier from VK tree constants (Noir broke comptime globals used in non-comptime contexts) 2. **#20798** — Remove unnecessary `let mut` across noir-projects (newer Noir errors on this) 3. **#21801** — Replace deprecated Noir comptime APIs: `add_attribute()` → `add_abi()`, `set_body()`/`set_parameters()`/`set_return_public()` → `function.disable()`, update `fn_has_noinitcheck` to also check `is_fn_only_self()` ## Commits 1. **Cherry-pick with conflict markers** — raw cherry-pick of #22393 2. **Conflict resolution** — version bumps + reformatting resolved 3. **Cherry-pick #20702** — comptime globals + poseidon2 hash fix 4. **Cherry-pick #20798** — unnecessary mut removal (24 files) 5. **Cherry-pick #21801** — macro API migration (4 files) 6. **Remaining fixes** — private_context.nr mut + utils.nr style alignment
AztecBot
requested review from
a team,
IlyasRidhuan,
LeilaWang,
Maddiaa0,
fcarreiro,
jeanmon and
nventuro
as code owners
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
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
4 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
cherry-pick: chore: Update Noir to nightly-2026-04-10 (#22393)
chore: backport #22393 (Update Noir to nightly-2026-04-10) to v4-next (#22485)
fix: add @aztec/accounts to backwards compatibility test infra (#22490)
END_COMMIT_OVERRIDE