Merge branch 'next' into spy/ha

Author: spypsy

.claude/skills/noir-sync-update/SKILL.md

@@ -0,0 +1,77 @@
+---
+name: noir-sync-update
+description: Perform necessary follow-on updates as a result of updating the noir git submodule.
+---
+
+# Noir Sync Update
+
+## Workflow
+
+Copy this checklist and track progress:
+
+```
+Noir Sync Update Progress:
+- [ ] Step 1: Ensure that the new submodule commit has been pulled.
+- [ ] Step 2: Update the `Cargo.lock` file in `avm-transpiler`.
+- [ ] Step 3: Update the `yarn.lock` file in `yarn-project`.
+- [ ] Step 4: Format `noir-projects`.
+- [ ] Step 5: Check `noir-projects` still compiles.
+```
+
+After each step, commit the results.
+
+## Critical Verification Rules
+
+**ALWAYS verify file changes with `git status` after any modification step before marking it complete.** Command output showing "updating" does not guarantee the file was written to disk.
+
+### Step 1: Ensure that the new submodule commit has been pulled
+
+Run `./bootstrap.sh` in `noir` to ensure that the new submodule commit has been pulled.
+
+This shouldn't update any files such that a commit is necessary.
+
+### Step 2: Update `Cargo.lock` in `avm-transpiler`
+
+**Before updating**, determine the expected noir version:
+1. Read `noir/noir-repo/.release-please-manifest.json` to find the expected version (e.g., `1.0.0-beta.18`)
+2. Check the current version in `avm-transpiler/Cargo.lock` by searching for `acir` or similar noir packages
+
+**To update the lock file**, run `cargo update` in `avm-transpiler` with **only noir-repo packages**:
+
+```bash
+cd avm-transpiler
+cargo update -p acir -p acir_field -p acvm -p acvm_blackbox_solver -p bn254_blackbox_solver -p brillig -p brillig_vm -p fm -p iter-extended -p noirc_abi -p noirc_arena -p noirc_artifacts -p noirc_errors -p noirc_evaluator -p noirc_frontend -p noirc_printable_type -p noirc_span
+```
+
+**IMPORTANT:** Do NOT use `cargo update` without `-p` flags—this will update ALL dependencies, not just noir-repo packages.
+
+**After updating**, verify:
+1. Run `git status avm-transpiler/` to confirm `Cargo.lock` was modified
+2. Run `cargo check` to ensure it still builds
+3. Grep `Cargo.lock` for `acir` to verify the version matches the expected version from `.release-please-manifest.json`
+
+It's possible that changes in dependencies result in `avm-transpiler` no longer building.
+  - If transient dependency mismatches mean changes to the dependency tree are necessary, then the `Cargo.lock` file in `avm-transpiler` should be modified. **DO NOT MODIFY `noir/noir-repo`**.
+  - If updates are necessary due to changes in exports from `noir/noir-repo` packages, then perform the necessary updates to import statements, etc.
+
+### Step 3: Update `yarn.lock` in `yarn-project`
+
+Run `yarn install` in `yarn-project` to update the `yarn.lock` file.
+
+**After running**, verify with `git status yarn-project/yarn.lock` that the file was modified before committing.
+
+### Step 4: Format `noir-projects`
+
+Run `./bootstrap.sh format` in `noir-projects`.
+
+This is necessary as the updates to the noir compiler may result in the formatter handling the same code differently.
+
+Failing to run the formatter will result in a CI failure.
+
+**After running**, check `git status noir-projects/` for any formatting changes that need to be committed.
+
+### Step 5: Check `noir-projects` still compiles
+
+Run `./bootstrap.sh` in `noir-projects`.
+
+As a sanity check, we want to ensure that `noir-projects` still compiles after the update.

.claude/skills/updating-changelog/SKILL.md

@@ -0,0 +1,109 @@
+---
+name: updating-changelog
+description: Updates changelog documentation for contract developers and node operators by analyzing branch changes relative to 'next'. Use when preparing a PR, updating migration notes, documenting breaking changes, or when asked to update changelog/release notes.
+---
+
+# Updating Changelog
+
+## Workflow
+
+Copy this checklist and track progress:
+
+```
+Changelog Update Progress:
+- [ ] Step 1: Determine target changelog file from .release-please-manifest.json
+- [ ] Step 2: Analyze branch changes (git diff next...HEAD)
+- [ ] Step 3: Generate draft entries for review
+- [ ] Step 4: Edit documentation files after approval
+```
+
+### Step 1: Determine Target Files
+
+Read `.release-please-manifest.json` to get the version (e.g., `{"." : "4.0.0"}` → edit `v4.md`).
+
+**Target files:**
+
+- Aztec contract developers: `docs/docs-developers/docs/resources/migration_notes.md`
+- Node operators and Ethereum contract developers: `docs/docs-network/reference/changelog/v{major}.md`
+
+### Step 2: Analyze Branch Changes
+
+Run `git diff next...HEAD --stat` for overview, then `git diff next...HEAD` for details.
+
+**Categorize changes:**
+
+- Breaking changes (API modifications, removals, renames)
+- New features (APIs, CLI flags, configuration)
+- Deprecations
+- Configuration changes (CLI flags, environment variables)
+
+### Step 3: Generate Draft Entries
+
+Present draft entries for review BEFORE editing files. Match the formatting conventions by reading existing entries in each file.
+
+### Step 4: Edit Documentation
+
+After approval, add entries to the appropriate files.
+
+## Migration Notes Format
+
+**File:** `docs/docs-developers/docs/resources/migration_notes.md`
+
+Add entries under `## TBD` section:
+
+````markdown
+### [Component] Brief description
+
+Explanation of what changed.
+
+**Migration:**
+
+```diff
+- old code
++ new code
+```
+````
+
+**Impact**: Effect on existing code.
+
+````
+
+**Component tags:** `[Aztec.nr]`, `[Aztec.js]`, `[PXE]`, `[Aztec Node]`, `[AVM]`, `[L1 Contracts]`, `[CLI]`
+
+## Node Operator Changelog Format
+
+**File:** `docs/docs-network/reference/changelog/v{major}.md`
+
+**Breaking changes:**
+```markdown
+### Feature Name
+
+**v{previous}:**
+```bash
+--old-flag <value>                    ($OLD_ENV_VAR)
+````
+
+**v{current}:**
+
+```bash
+--new-flag <value>                    ($NEW_ENV_VAR)
+```
+
+**Migration**: How to migrate.
+
+````
+
+**New features:**
+```markdown
+### Feature Name
+
+```bash
+--new-flag <value>                    ($ENV_VAR)
+````
+
+Description of the feature.
+
+```
+
+**Changed defaults:** Use table format with Flag, Environment Variable, Previous, New columns.
+```

.github/workflows/ci3.yml

@@ -123,8 +123,9 @@ jobs:
   ci-network-scenario:
     runs-on: ubuntu-latest
     # We either run after a release (tag starting with v), or when the ci-network-scenario label is present in a PR.
+    # We exclude ci-release-pr test tags (v0.0.1-commit.*) which are only for testing the release process.
     needs: ci
-    if: github.event.pull_request.head.repo.fork != true && github.event.pull_request.draft == false && (startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'ci-network-scenario'))
+    if: github.event.pull_request.head.repo.fork != true && github.event.pull_request.draft == false && ((startsWith(github.ref, 'refs/tags/v') && !contains(github.ref_name, '-commit.')) || contains(github.event.pull_request.labels.*.name, 'ci-network-scenario'))
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -144,7 +145,7 @@ jobs:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
           RUN_ID: ${{ github.run_id }}
-          AWS_SHUTDOWN_TIME: 360
+          AWS_SHUTDOWN_TIME: 540 # temporarily increased to 9 hours, todo(revert to 360)
           NO_SPOT: 1
         run: |
           # For release tags, use the release image; for PRs, omit to build and push to aztecdev

.github/workflows/ensure-funded-environment.yml

@@ -56,7 +56,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: ${{ github.ref }}
-          fetch-depth: 0
+          fetch-depth: 1
           persist-credentials: false
 
       - name: Validate inputs

.github/workflows/nightly-spartan-bench.yml

@@ -46,6 +46,7 @@ jobs:
           fi
 
       - name: Run benchmarks
+        timeout-minutes: 120
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -55,7 +56,7 @@ jobs:
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
           RUN_ID: ${{ github.run_id }}
-          AWS_SHUTDOWN_TIME: 360
+          AWS_SHUTDOWN_TIME: 120
           NO_SPOT: 1
         run: |
           # Pass the arguments expected in ./bootstrap.sh ci-network-bench

.github/workflows/publish-bb-mac.yml

@@ -153,12 +153,23 @@ jobs:
         with:
           name: barretenberg-arm64-darwin-starknet.tar.gz
 
+      - name: Determine if prerelease
+        id: check-prerelease
+        run: |
+          VERSION="${{ inputs.ref_name || inputs.tag || github.ref_name }}"
+          # Check if version has a prerelease tag (e.g., -rc.1, -alpha, -beta)
+          if [[ "$VERSION" =~ ^v?[0-9]+\.[0-9]+\.[0-9]+-.+ ]]; then
+            echo "is_prerelease=true" >> $GITHUB_OUTPUT
+          else
+            echo "is_prerelease=false" >> $GITHUB_OUTPUT
+          fi
+
       - name: Publish to GitHub
         uses: softprops/action-gh-release@26994186c0ac3ef5cae75ac16aa32e8153525f77
         if: ${{ github.event_name != 'workflow_dispatch' || inputs.publish }}
         with:
           tag_name: ${{ inputs.ref_name || inputs.tag || github.ref_name }}
-          prerelease: true
+          prerelease: ${{ steps.check-prerelease.outputs.is_prerelease == 'true' }}
           files: |
             barretenberg-amd64-darwin.tar.gz
             barretenberg-arm64-darwin.tar.gz
@@ -169,7 +180,7 @@ jobs:
         continue-on-error: true
         with:
           tag_name: ${{ inputs.ref_name || inputs.tag || github.ref_name }}
-          prerelease: true
+          prerelease: ${{ steps.check-prerelease.outputs.is_prerelease == 'true' }}
           files: |
             barretenberg-amd64-darwin-starknet.tar.gz
             barretenberg-arm64-darwin-starknet.tar.gz