Merge remote-tracking branch 'origin/v5-next' into backport-to-v5-next-staging

Author: spalladino

.claude/skills/merge-train-infra/SKILL.md

@@ -11,11 +11,11 @@ This skill covers the automation internals of the merge-train system. For contri
 
 The merge-train system is fully automated via GitHub Actions in `.github/workflows/merge-train-*.yml`:
 
-1. **PR Creation** (`merge-train-create-pr.yml`): Triggered on push to `merge-train/*` branches. Creates a PR targeting `next` (or `v5-next` for `merge-train/spartan-v5`) with the `ci-no-squash` label (and `ci-full-no-test-cache` for `merge-train/spartan`, `merge-train/spartan-v5`, and `merge-train/ci`). Skips merge commits and commits already in the base branch.
+1. **PR Creation** (`merge-train-create-pr.yml`): Triggered on push to `merge-train/*` branches. Creates a PR targeting `next` (or `v5-next` for `-v5` trains such as `merge-train/spartan-v5` and `merge-train/fairies-v5`) with the `ci-no-squash` label (plus `private-port-next` for any train that targets `v5-next`, and `ci-full-no-test-cache` for `merge-train/spartan`, `merge-train/spartan-v5`, and `merge-train/ci`). Skips merge commits and commits already in the base branch.
 
 2. **Body Updates** (`merge-train-update-pr-body.yml`): Triggered on push to `merge-train/**` and `backport-to-*-staging` branches. Updates the PR body with meaningful commits (those containing PR references like `(#1234)`). The body wraps the commit list in `BEGIN_COMMIT_OVERRIDE` / `END_COMMIT_OVERRIDE` markers. Backport staging PRs also call `update-pr-body.sh` inline from `scripts/backport_to_staging.sh` to handle the first-push case (where the PR doesn't exist yet when the workflow fires).
 
-3. **Next Integration** (`merge-train-next-to-branches.yml`): Triggered on push to `next` and `v5-next`. A push to `next` merges `next` into each `next`-based train; a push to `v5-next` merges `v5-next` into `merge-train/spartan-v5`. Both go through `scripts/merge-train/merge-next.sh`, which takes an optional second argument for the source branch (defaults to `next`). Uses `continue-on-error: true` so a conflict in one branch does not block others. Skips branches whose PR already has auto-merge enabled.
+3. **Next Integration** (`merge-train-next-to-branches.yml`): Triggered on push to `next` and `v5-next`. A push to `next` merges `next` into each `next`-based train; a push to `v5-next` merges `v5-next` into the `-v5` trains (`merge-train/spartan-v5`, `merge-train/fairies-v5`). Both go through `scripts/merge-train/merge-next.sh`, which takes an optional second argument for the source branch (defaults to `next`). Uses `continue-on-error: true` so a conflict in one branch does not block others. Skips branches whose PR already has auto-merge enabled.
 
 4. **Auto-Merge** (`merge-train-auto-merge.yml`): Runs hourly via cron (`0 * * * *`). Calls `scripts/merge-train/auto-merge.sh` for both merge-train (4-hour inactivity) and backport-train (8-hour inactivity) branches. Uses separate GitHub tokens: `AZTEC_BOT_GITHUB_TOKEN` for API calls and `MERGE_TRAIN_GITHUB_TOKEN` for approvals. Will not auto-merge if the last merge-queue CI run failed or was cancelled.
 
@@ -73,9 +73,9 @@ When a CI run fails on an EC2 instance, it calls `merge_train_failure_slack_noti
 
 ## Creating a New Merge Train
 
-1. Create a branch from the desired base (`next` for most trains; a release line like `v5-next` for a release-specific train) with naming pattern `merge-train/{team}`
-2. Add the branch to the loop in `.github/workflows/merge-train-next-to-branches.yml`. If it tracks a base branch other than `next`, also add that base to the workflow's `push` trigger and pass it as the second argument to `merge-next.sh` (see the `merge-train/spartan-v5` → `v5-next` wiring)
-3. If the base is not `next`, set the PR base in `.github/workflows/merge-train-create-pr.yml` and pass `BASE_BRANCH` to the stale check in `.github/workflows/merge-train-stale-check.yml`
+1. Create a branch from the desired base (`next` for most trains; a release line like `v5-next` for a release-specific train) with naming pattern `merge-train/{team}`. For a v5-release train use the `-v5` suffix (`merge-train/{team}-v5`): `merge-train-create-pr.yml` routes any `*-v5` branch to a `v5-next` base automatically and adds the `private-port-next` label.
+2. Add the branch to the loop in `.github/workflows/merge-train-next-to-branches.yml`. If it tracks a base branch other than `next`, also add that base to the workflow's `push` trigger and pass it as the second argument to `merge-next.sh` (see the `v5-next` → `-v5` trains wiring)
+3. For a base other than `next` that the `*-v5` convention does not already cover, set the PR base in `.github/workflows/merge-train-create-pr.yml`. Either way, add a stale-check job that passes `BASE_BRANCH` in `.github/workflows/merge-train-stale-check.yml`
 4. Add the branch-to-Slack-channel mapping in `ci3/merge_train_failure_slack_notify`
 5. Optionally add CI mode overrides in `.github/ci3_labels_to_env.sh` and `bootstrap.sh`
 6. Push code to the branch -- automation handles PR creation from there

.claude/skills/merge-trains/SKILL.md

@@ -20,8 +20,9 @@ A merge train is an automated batching system (inspired by [Rust rollups](https:
 | `merge-train/fairies` | aztec-nr | `#team-fairies` |
 | `merge-train/spartan` | Spartan / infra / yarn-project sequencer and prover orchestration | `#team-alpha` |
 | `merge-train/spartan-v5` | Same as `merge-train/spartan` but for the v5 release line (targets `v5-next` instead of `next`) | `#team-alpha` |
+| `merge-train/fairies-v5` | Same as `merge-train/fairies` (aztec-nr) but for the v5 release line (targets `v5-next` instead of `next`) | `#team-fairies` |
 
-> Every train targets `next` except `merge-train/spartan-v5`, which targets `v5-next`.
+> Trains target `next`, except the `-v5` trains (`merge-train/spartan-v5`, `merge-train/fairies-v5`), which target `v5-next`. Train PRs that target `v5-next` are auto-labeled `private-port-next` in addition to `ci-no-squash`.
 
 ## How to Use a Merge Train
 

.github/workflows/merge-train-create-pr.yml

@@ -23,10 +23,11 @@ jobs:
         run: |
             branch="${{ github.ref_name }}"
 
-            # Determine base branch. Most trains target next; the spartan-v5
-            # train targets the v5 release line (v5-next) instead.
+            # Determine base branch. Most trains target next; trains suffixed
+            # with -v5 (e.g. spartan-v5, fairies-v5) target the v5 release line
+            # (v5-next) instead.
             base_branch="next"
-            if [[ "$branch" == "merge-train/spartan-v5" ]]; then
+            if [[ "$branch" == *-v5 ]]; then
               base_branch="v5-next"
             fi
 
@@ -54,6 +55,10 @@ jobs:
               if [[ "$branch" == "merge-train/spartan" || "$branch" == "merge-train/spartan-v5" || "$branch" == "merge-train/ci" ]]; then
                 labels="$labels,ci-full-no-test-cache"
               fi
+              # Trains targeting the v5 release line are ports into v5-next.
+              if [[ "$base_branch" == "v5-next" ]]; then
+                labels="$labels,private-port-next"
+              fi
               gh pr create --base "$base_branch" --head "$branch" \
                 --title "feat: $branch" \
                 --body "$(echo -e "See [merge-train-readme.md](https://github.com/${{ github.repository }}/blob/next/.github/workflows/merge-train-readme.md).\nThis is a merge-train.")" \

.github/workflows/merge-train-next-to-branches.yml

@@ -27,11 +27,13 @@ jobs:
           GH_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
           COMMIT_SHA: ${{ github.sha }}
         run: |
-          # The spartan-v5 train tracks the v5 release line (v5-next); every
-          # other train tracks next. Sync only the trains fed by the branch
-          # that was just pushed.
+          # The -v5 trains track the v5 release line (v5-next); every other
+          # train tracks next. Sync only the trains fed by the branch that was
+          # just pushed.
           if [[ "${{ github.ref_name }}" == "v5-next" ]]; then
-            ./scripts/merge-train/merge-next.sh merge-train/spartan-v5 v5-next || true
+            for branch in merge-train/spartan-v5 merge-train/fairies-v5; do
+              ./scripts/merge-train/merge-next.sh "$branch" v5-next || true
+            done
           else
             for branch in merge-train/avm merge-train/barretenberg merge-train/ci merge-train/docs merge-train/fairies merge-train/spartan; do
               ./scripts/merge-train/merge-next.sh "$branch" || true

.github/workflows/merge-train-stale-check.yml

@@ -35,3 +35,18 @@ jobs:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
           BASE_BRANCH: v5-next
         run: ./ci3/merge_train_stale_check merge-train/spartan-v5 '#team-alpha'
+
+  fairies-v5:
+    name: Check merge-train/fairies-v5
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+    steps:
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+      - name: Run stale check
+        env:
+          GH_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          BASE_BRANCH: v5-next
+        run: ./ci3/merge_train_stale_check merge-train/fairies-v5 '#team-fairies'

Makefile

@@ -55,7 +55,7 @@ endef
 
 # Fast bootstrap.
 fast: release-image barretenberg boxes playground docs aztec-up \
-		  bb-tests l1-contracts-tests yarn-project-tests boxes-tests playground-tests aztec-up-tests docs-tests noir-protocol-circuits-tests release-image-tests spartan claude-tests
+		  bb-tests l1-contracts-tests yarn-project-tests boxes-tests playground-tests aztec-up-tests docs-tests noir-protocol-circuits-tests contract-snapshots-tests release-image-tests spartan claude-tests
 
 # Full bootstrap.
 full: fast bb-full-tests bb-cpp-full yarn-project-benches
@@ -308,6 +308,9 @@ noir-projects-txe-tests:
 	$(call test,$@,noir-projects/aztec-nr)
 	$(call test,$@,noir-projects/noir-contracts)
 
+contract-snapshots-tests: noir
+	$(call test,$@,noir-projects/contract-snapshots)
+
 # Noir Projects - Aggregate target (builds all sub-projects)
 noir-projects: noir-protocol-circuits mock-protocol-circuits noir-contracts aztec-nr
 

avm-transpiler/src/transpile.rs

@@ -563,7 +563,7 @@ fn handle_foreign_call(
         "aztec_avm_revert" => handle_revert(avm_instrs, destinations, inputs),
         "aztec_avm_storageRead" => handle_storage_read(avm_instrs, destinations, inputs),
         "aztec_avm_storageWrite" => handle_storage_write(avm_instrs, destinations, inputs),
-        "aztec_utl_log" => handle_debug_log(avm_instrs, destinations, inputs),
+        "aztec_misc_log" => handle_debug_log(avm_instrs, destinations, inputs),
         // Getters.
         _ if inputs.is_empty() && destinations.len() == 1 => {
             handle_getter_instruction(avm_instrs, function, destinations, inputs);
@@ -1341,7 +1341,7 @@ fn handle_debug_log(
 ) {
     // We need to handle two flavors here:
     //
-    // #[oracle(aztec_utl_log)]
+    // #[oracle(aztec_misc_log)]
     // unconstrained fn log_oracle<let M: u32, let N: u32>(
     //     log_level: u8,
     //     msg: str<M>,
@@ -1351,7 +1351,7 @@ fn handle_debug_log(
     //
     // and
     //
-    //#[oracle(aztec_utl_log)]
+    //#[oracle(aztec_misc_log)]
     // unconstrained fn log_slice_oracle<let M: u32>(log_level: u8, msg: str<M>, args: [Field]) {}
     //
     // Luckily, these two flavors have both 4 arguments, since noir inserts a length field for slices before the slice.

boxes/boxes/react/src/contracts/src/main.nr

@@ -4,7 +4,7 @@ use aztec::macros::aztec;
 contract BoxReact {
     use aztec::{
         macros::{functions::{external, initializer}, storage::storage},
-        messages::message_delivery::MessageDelivery,
+        messages::delivery::MessageDelivery,
         protocol::address::AztecAddress,
         state_vars::{Owned, PrivateMutable},
     };

boxes/boxes/vite/src/contracts/src/main.nr

@@ -4,7 +4,7 @@ use aztec::macros::aztec;
 contract BoxReact {
     use aztec::{
         macros::{functions::{external, initializer}, storage::storage},
-        messages::message_delivery::MessageDelivery,
+        messages::delivery::MessageDelivery,
         protocol::address::AztecAddress,
         state_vars::{Owned, PrivateMutable},
     };

ci3/merge_train_failure_slack_notify

@@ -33,6 +33,8 @@ elif [[ "$REF_NAME" == "merge-train/docs" ]]; then
   channel="#dev-rels"
 elif [[ "$REF_NAME" == "merge-train/fairies" ]]; then
   channel="#team-fairies"
+elif [[ "$REF_NAME" == "merge-train/fairies-v5" ]]; then
+  channel="#team-fairies"
 elif [[ "$REF_NAME" == "merge-train/spartan" ]]; then
   channel="#team-alpha"
 elif [[ "$REF_NAME" == "merge-train/spartan-v5" ]]; then