chore: Accumulated backports to v5-next#24971
Open
AztecBot wants to merge 3 commits into
Open
Conversation
Bumps `noir/noir-repo` from `v1.0.0-beta.22` to `v1.0.0-beta.25` (`c57152f9` → `75061fab15986eedee4e7d9104ff87dd9fa4ca10`) and applies the required follow-on compatibility updates. - Updates the Noir submodule to `v1.0.0-beta.25`. - Refreshes `avm-transpiler/Cargo.lock` with targeted Noir-package updates and adapts the transpiler to the public `BrilligOpcodeLocation` / `BrilligFunctionId` APIs. - Refreshes `yarn-project/yarn.lock` for the beta.25 Noir packages. - Adapts aztec-nr macros and helpers to beta.25: - accounts for kernel-validated oracle outputs; - removes obsolete storage-proof and state-variable imports; - applies the beta.25 formatter output. - Normalizes beta.25's named contract globals before artifact-schema parsing, including storage-layout extraction, with regression coverage. - Refreshes the contract expansion and compile-failure snapshots produced by beta.25. - Excludes two new upstream compiler-only fixtures from Barretenberg's UltraHonk ACIR integration suite: one uses unsupported CallData blocks, and one intentionally optimizes to an empty circuit while retaining unused inputs. - `cargo check --all-targets` in `avm-transpiler` - `yarn workspace @aztec/stdlib build` - `yarn format stdlib` - `yarn lint stdlib` - `yarn workspace @aztec/stdlib test src/abi/contract_artifact.test.ts` - `./noir-projects/contract-snapshots/bootstrap.sh test` (60 passed) - `./barretenberg/acir_tests/bootstrap.sh` - CI3 passed on the complete pre-squash tree; the final head contains the same change set as one commit on current `next`. --- *Created by [claudebox](https://claudebox.work/v2/sessions/c0d43cb515b09702/jobs/1) · group: `slackbot` · [Slack thread](https://aztecfoundation.slack.com/archives/C0B278STDMZ/p1784718350039199?thread_ts=1784718350.039199&cid=C0B278STDMZ)*
## Summary Backport of #24907 to `v5-next` via `backport-to-v5-next-staging`. This replays the Noir `v1.0.0-beta.25` bump onto the v5 staging branch, including the Noir submodule update, avm-transpiler compatibility updates, yarn lockfile refresh, aztec-nr formatter/macros updates, contract snapshot refreshes, and stdlib artifact-loader changes. ## Conflict Resolution The cherry-pick conflicted in `yarn-project/stdlib/src/abi/contract_artifact.test.ts`. The resolution keeps the existing v5 `loadContractArtifactWithValidation` coverage and adds the beta.25 storage-global normalization tests from the original PR. ## Commit Structure 1. Cherry-pick of `b0ed85797a7bf8668950ab4078fc42eb42d69689` with the test conflict resolved in place. ## Verification - `git diff --check origin/backport-to-v5-next-staging..HEAD` - Strict conflict-marker scan: `rg -n '^(<<<<<<< |=======$|>>>>>>> )'` Could not run the focused stdlib test locally: `yarn workspace @aztec/stdlib test src/abi/contract_artifact.test.ts` first failed because the checkout had no Yarn install state. Preparing that state required the Noir bootstrap, but `DENOISE=0 ./bootstrap.sh` in `noir/` failed while trying to install `just@1.42.4` from crates.io due a tunnel/DNS error. The container also has Rust 1.85.0 while this branch expects Rust 1.89.0. --- *Created by [claudebox](https://claudebox.work/v2/sessions/edfda45656ef1ad6/jobs/1) · group: `slackbot` · [Slack thread](https://aztecprotocol.slack.com/archives/C0AGN2WT3CP/p1784820075707329?thread_ts=1784820075.707329&cid=C0AGN2WT3CP)*
…m-alpha-ci (#24963) ## What Two related changes for the spartan / spartan-v5 merge-train Slack notifications: 1. **Route them to `#team-alpha-ci`** instead of `#team-alpha`, so the team channel stops receiving CI noise. 2. **Stop silently dropping failed Slack posts** in `ci3/slack_notify`, so a mis-delivered notification (e.g. the bot isn't a member of the target channel) is visible in the CI log instead of vanishing. ## (1) Notification sites re-routed | File | Notification | Before → After | |---|---|---| | `ci3/merge_train_failure_slack_notify` | "PR merged into …", CI failure, and dequeue notifications for spartan / spartan-v5 (each also kicks off a ClaudeBox investigation) | `#team-alpha` → `#team-alpha-ci` | | `.github/workflows/merge-train-stale-check.yml` | daily "`merge-train/spartan…` has not merged into `next`/`v5-next`" stale alert | `#team-alpha` → `#team-alpha-ci` | | `.github/workflows/network-healthcheck.yml` | "Starting network healthcheck …" kickoff + the ClaudeBox `respond_to_user` summary | `#team-alpha` → `#team-alpha-ci` | | `scripts/socket-fix-ci.sh` | Socket dependency-vulnerability fix notification | `#team-alpha` → `#team-alpha-ci` | | `ci3/merge_train_stale_check` | usage-example comment only | updated for consistency | `ci3/run_test_cmd` — flake notifications for spartan / spartan-v5 **already** post to `#team-alpha-ci` (since [#23219](#23219), 2026-05-12). ## (2) Surface Slack post failures (`ci3/slack_notify`) Previously the `chat.postMessage` curl ended in `&>/dev/null`, so any failure — most commonly `not_in_channel` when the bot isn't a member of the target channel — disappeared with no trace. This is the likely reason flake notifications to `#team-alpha-ci` were never observed despite the routing being correct: the posts were failing silently. The script now captures the API response and logs a clear error to stderr (`slack_notify: failed to post to Slack channel '<chan>': <error>`) on any non-`ok` response or curl/network failure. It stays best-effort — the failure is logged, the caller is not failed. ## Base & backport Based on **`merge-train/spartan`** (targets `next`), and labeled **`backport-to-v5-next`** so the same change is carried over to the `v5-next` line. The `network-healthcheck` and `merge-train-stale-check` schedules ultimately run from the default branch once this reaches `next` via the train; the per-train CI scripts (`merge_train_failure_slack_notify`, `slack_notify`, `socket-fix-ci.sh`) run from the checked-out train head. ## Left untouched (intentionally) - `.claude/skills/merge-trains/SKILL.md` team-mapping table, `ci3/dashboard/.../ci-health-report.html`, `spartan/testnet-runbook.md` — these reference the owning **team** (`#team-alpha`) or are a manual human runbook step, not automated CI notifications. - Other merge-train channel mappings (`#team-bonobos`, `#honk-team`, `#help-ci`, `#dev-rels`, `#team-fairies`) are unrelated and unchanged. ## Notes - No new Slack scopes are required — every call uses the same `SLACK_BOT_TOKEN` + `chat.postMessage`. The bot must be a **member of `#team-alpha-ci`** for delivery; once (2) lands, a missing membership shows up as a `not_in_channel` line in the CI log. The **ClaudeBox app** must also be a member so the healthcheck summary and failure/dequeue kickoff replies can post. --- *Created by [claudebox](https://claudebox.work/v2/sessions/e345f34e9b2da947/jobs/1) · group: `slackbot` · requested by Santiago Palladino · [Slack thread](https://aztecprotocol.slack.com/archives/C0AU8BULZHC/p1784902660161109?thread_ts=1784902660.161109&cid=C0AU8BULZHC)*
AztecBot
requested review from
IlyasRidhuan,
MirandaWood,
charlielye,
nventuro and
sirasistant
as code owners
July 24, 2026 18:37
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
Collaborator
Author
|
🤖 Auto-merge enabled after 8 hours of inactivity. This PR will be merged automatically once all checks pass. |
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 25, 2026
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
chore: update Noir to v1.0.0-beta.25 (#24907)
chore: update Noir to v1.0.0-beta.25 (backport #24907) (#24945)
chore(ci): route spartan/spartan-v5 merge-train notifications to #team-alpha-ci (#24963)
END_COMMIT_OVERRIDE