Skip to content

chore: update Noir to v1.0.0-beta.22 (v5-next, redo of #23870)#23886

Merged
ludamad merged 3 commits into
v5-nextfrom
cb/bump-noir-beta22-v5-next-redo
Jun 4, 2026
Merged

chore: update Noir to v1.0.0-beta.22 (v5-next, redo of #23870)#23886
ludamad merged 3 commits into
v5-nextfrom
cb/bump-noir-beta22-v5-next-redo

Conversation

@AztecBot

@AztecBot AztecBot commented Jun 4, 2026

Copy link
Copy Markdown
Collaborator

Summary

Redo of #23870 against the current v5-next (after it was reverted in 9e53e1f "revert two bad automerges").

Cherry-pick of the original PR head 884e84e8 (the noir submodule bump + Rust/Noir source fixes) plus a second commit that regenerates yarn-project/yarn.lock. That lockfile refresh was the explicit "Remaining knock-on" the original PR called out as needing CI/maintainer work; without it, CI's yarn install --immutable rejects the mismatched @aztec/noir-noir_js file: hash and the npm:1.0.0-beta.21 references for the noir-* packages.

Changes

Commit 1 (cherry-pick of 884e84e8, original PR #23870):

  • noir/noir-repoc57152f91260ecdb9faad4efc20abb14b6d2ece7 (v1.0.0-beta.22), replacing the off-mainline temp-serialization-tag commit (f1a4575, "Fixes") that v5-next was pinned back to after the revert.
  • avm-transpiler/Cargo.lock → noir crates 1.0.0-beta.211.0.0-beta.22 (adds msgpack_tagged, serde_bytes, bs58, tinyvec; bumps darling 0.23, serde_with 3.20).
  • noir-projects/aztec-nr → replace the now-deprecated BoundedVec::from_parts_unchecked with BoundedVec::from_parts in note_getter.nr and utils/array/subbvec.nr (aztec-nr CI runs nargo check --deny-warnings, so the deprecation is otherwise a hard failure).

Commit 2 (new):

  • yarn-project/yarn.lock → regenerated against the v5 noir commit c57152f (1.0.0-beta.22) via yarn install --mode=update-lockfile (noir-* package versions 1.0.0-beta.211.0.0-beta.22; @aztec/noir-noir_js@file: hash 294c27893a3e; checksum updated).

Notes

  • Same diff shape as the original PR (4 files, +91/-38) plus the yarn-project/yarn.lock regen. The yarn.lock change is binary in git diff --stat due to the .gitattributes -diff setting; the textual change is the noir-* version bump + the file: hash and checksum update, matching what the merge-train/fairies-v5 lockfile already carries.
  • This is the same lockfile regeneration the parallel fix in refactor(aztec-nr)!: move messages::message_delivery to messages::delivery #23875 (against merge-train/fairies-v5) used, sourced from the prebuilt noir-packages-7c3d4e0f9363947d.tar.gz build-cache artifact.
  • Tracking label private-port-next and C-noir mirror the original. ci-draft so CI runs while the PR is in draft.

Created by claudebox · group: slackbot

AztecBot added 2 commits June 4, 2026 20:00
Lockfile refresh that the original PR #23870 flagged as a needed
follow-up. Without this, CI's yarn install --immutable rejects the
mismatched @aztec/noir-noir_js file: hash and the beta.21 npm
references for noir-* packages.

Regenerated via yarn install --mode=update-lockfile against the v5
noir commit c57152f (1.0.0-beta.22): hash 294c27 -> 893a3e and noir-*
package versions 1.0.0-beta.21 -> 1.0.0-beta.22.
@AztecBot AztecBot added C-noir Component: Noir/Nargo ci-draft Run CI on draft PRs. claudebox Owned by claudebox. it can push to this PR. private-port-next labels Jun 4, 2026
@socket-security

socket-security Bot commented Jun 4, 2026

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Updatednpm/​@​aztec/​noir-noir_js@​1.0.0-beta.21 ⏵ 1.0.0-beta.22100100100100100

View full report

@vezenovm vezenovm marked this pull request as ready for review June 4, 2026 20:04
@vezenovm vezenovm requested a review from nventuro as a code owner June 4, 2026 20:05
vezenovm
vezenovm previously approved these changes Jun 4, 2026
@vezenovm vezenovm dismissed their stale review June 4, 2026 20:18

Not ready yet

@vezenovm vezenovm added this pull request to the merge queue Jun 4, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jun 4, 2026
@vezenovm vezenovm added this pull request to the merge queue Jun 4, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jun 4, 2026
@ludamad ludamad merged commit 8b53caa into v5-next Jun 4, 2026
16 checks passed
@ludamad ludamad deleted the cb/bump-noir-beta22-v5-next-redo branch June 4, 2026 21:16
vezenovm added a commit that referenced this pull request Jun 5, 2026
Green half of the demo for #23895.

The committed snapshots had drifted from aztec-nr changes landed since
the last regen in #23464, unnoticed because CI never ran the suite.
Regenerated with the branch's pinned nargo (1.0.0-beta.21+f1a4575a); all
61 tests pass locally.

With the CI wiring from #23895 included in this branch, the
contract-snapshots suite runs in CI here and should be green, in
contrast to the red run on #23895 itself.

Merge order: this PR into `mv/run-contract-snapshots-in-ci`, then #23895
into `merge-train/fairies-v5`.

Note: #23878 (regen for the beta.22 bump) stays parked as draft, since
the bump was reverted on v5-next in 9e53e1f.

---

Update: the beta.22 bump is back on the train via #23886, so this branch
now regenerates against 1.0.0-beta.22 with two more commits:

- chore: scrub macro-source line numbers in contract failure snapshots.
Locations inside the aztec-nr macro sources (call stack `at` lines and
code frame gutter numbers under `<repo>` headers) are scrubbed to
`<line>`/`<col>` markers, like the existing `<repo>` path marker. Macro
edits previously churned every compile_failure snapshot with pure line
number diffs (see `authorize_once_from_wrong_type` in #23878 for an
example). Locations in the test program itself and in the stdlib are
kept. Resolves
#23878 (comment)
- chore: regenerate expand snapshots for noir 1.0.0-beta.22. `nargo
expand` output changed with the bump.

All 61 tests pass locally with the branch's pinned nargo
(1.0.0-beta.22).

---------

Co-authored-by: AztecBot <tech@aztec-labs.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C-noir Component: Noir/Nargo ci-draft Run CI on draft PRs. claudebox Owned by claudebox. it can push to this PR. private-port-next

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants