Merge branch 'next' into bump-noir

Author: TomAFrench

.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,13 +145,13 @@ 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: 180
           NO_SPOT: 1
         run: |
           # For release tags, use the release image; for PRs, omit to build and push to aztecdev
           if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
             tag="${{ github.ref_name }}"
-            tag="${tag#refs/tags/v}"
+            tag="${tag#v}"
             major_version=$(./ci3/semver major "$tag")
             namespace="v${major_version}-scenario"
             docker_image="aztecprotocol/aztec:${tag}"

.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

.github/workflows/test-network-scenarios.yml

@@ -38,7 +38,6 @@ jobs:
           BUILD_INSTANCE_SSH_KEY: ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
           GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
           RUN_ID: ${{ github.run_id }}
           AWS_SHUTDOWN_TIME: 360
           NO_SPOT: 1

.github/workflows/update-red-team-image.yml

@@ -32,3 +32,5 @@ docs/docs/protocol-specs/public-vm/gen/
 
 # for those who use Claude Code
 /.claude
+
+__pycache__

.gitignore

@@ -282,8 +282,8 @@ function test_cmds_native {
       while read -r test; do
         local prefix=$hash
         # A little extra resource for these tests.
-        # IPARecursiveTests and AcirHonkRecursionConstraint fail with 2 threads.
-        if [[ "$test" =~ ^(AcirAvmRecursionConstraint|ChonkKernelCapacity|AvmRecursiveTests|IPARecursiveTests|AcirHonkRecursionConstraint) ]]; then
+        # IPARecursiveTests fails with 2 threads.
+        if [[ "$test" =~ ^(AcirAvmRecursionConstraint|ChonkKernelCapacity|AvmRecursiveTests|IPARecursiveTests|HonkRecursionConstraintTest) ]]; then
           prefix="$prefix:CPUS=4:MEM=8g"
         fi
         echo -e "$prefix barretenberg/cpp/scripts/run_test.sh $bin_name $test"
@@ -306,7 +306,7 @@ function test_cmds_asan {
     ["commitment_schemes_recursion_tests"]="IPARecursiveTests.AccumulationAndFullRecursiveVerifier"
     ["chonk_tests"]="ChonkTests.Basic"
     ["ultra_honk_tests"]="MegaHonkTests/0.Basic"
-    ["dsl_tests"]="AcirHonkRecursionConstraint/1.TestBasicDoubleHonkRecursionConstraints"
+    ["dsl_tests"]="HonkRecursionConstraintTestWithoutPredicate/2.Tampering"
   )
   for bin_name in "${!asan_tests[@]}"; do
     local filter=${asan_tests[$bin_name]}