Merge branch 'master' into tf/remove-pedersen-hash

.github/ensure-builder/action.yml

@@ -53,7 +53,7 @@ runs:
         ec2_key: ${{ env.BUILD_INSTANCE_SSH_KEY }}
         # idempotency, see https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html
         # makes e2e tests hitting the API at once not cause multiple spots
-        client_token: ${{ format('ci-yml-{0}-{1}', env.RUN_ID, env.RUN_ATTEMPT) }}
+        client_token: ${{ format('ci-yml-{0}-{1}-{2}', inputs.runner_type, env.RUN_ID, env.RUN_ATTEMPT) }}
         # constants:
         runner_concurrency: ${{ steps.select_instance.outputs.runner_concurrency }}
         ec2_instance_type: ${{ steps.select_instance.outputs.instance_type }}

.github/workflows/publish-aztec-packages.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - "*/release-master*"
+      - ludamad-patch-2
   workflow_dispatch:
     inputs:
       tag:
@@ -22,11 +23,9 @@ permissions:
   issues: write
 
 env:
-  # Add any global environment variables here
   DOCKERHUB_PASSWORD: "${{ secrets.DOCKERHUB_PASSWORD }}"
   RUN_ID: ${{ github.run_id }}
   RUN_ATTEMPT: ${{ github.run_attempt }}
-  USERNAME: ${{ github.actor }}
   GITHUB_TOKEN: ${{ github.token }}
   GH_SELF_HOSTED_RUNNER_TOKEN: ${{ secrets.GH_SELF_HOSTED_RUNNER_TOKEN }}
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -35,10 +34,31 @@ env:
   GIT_COMMIT: ${{ github.event.pull_request.head.sha || github.sha }}
   SHOULD_PUBLISH_DOCKER_IMAGES: ${{ github.event.inputs.publish == 'true' || github.event_name == 'push' }}
   DEPLOY_TAG: ${{ github.event.inputs.tag }}
+
 jobs:
-  check-version:
+  configure:
     runs-on: ubuntu-latest
+    outputs:
+      username: ${{ steps.compute_username.outputs.username }}
     steps:
+      - name: Compute Username
+        id: compute_username
+        shell: bash
+        env:
+          REPO: "${{ github.repository }}"
+          BRANCH: "${{ github.ref_name }}"
+        run: |
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            echo "username=${{ github.event.pull_request.user.login }}"
+            echo "username=${{ github.event.pull_request.user.login }}" >> $GITHUB_OUTPUT
+          else
+            GIT_HASH="${{ github.sha }}"
+            GIT_HASH_LAST8=${GIT_HASH: -8}
+            GIT_HASH_LAST8_DEC=$(printf "%d" 0x$GIT_HASH_LAST8)
+            GIT_HASH_MODULO_8=$((GIT_HASH_LAST8_DEC % 8))
+            echo "username=master-${GIT_HASH_MODULO_8}"
+            echo "username=master-${GIT_HASH_MODULO_8}" >> $GITHUB_OUTPUT
+          fi
       - name: Check if tag is valid
         id: check_tag
         if: github.event_name == 'workflow_dispatch'
@@ -51,34 +71,33 @@ jobs:
           else
             echo "Invalid tag format. Expected aztec-packages-v*"
             exit 1
-          fi
 
   setup-x86:
-    needs: check-version
+    needs: [configure]
     uses: ./.github/workflows/setup-runner.yml
     with:
-      username: ${{ github.actor }}
+      username: ${{ needs.configure.outputs.username }}
       runner_type: builder-x86
     secrets: inherit
 
   setup-arm:
-    needs: check-version
+    needs: [configure]
     uses: ./.github/workflows/setup-runner.yml
     with:
-      username: ${{ github.actor }}
+      username: ${{ needs.configure.outputs.username }}
       runner_type: builder-arm
     secrets: inherit
 
   build-aztec-x86:
-    needs: setup-x86
-    runs-on: ${{ github.actor }}-x86
+    needs: [configure, setup-x86]
+    runs-on: ${{ needs.configure.outputs.username }}-x86
     steps:
       - uses: actions/checkout@v4
         with:
           ref: "${{ env.GIT_COMMIT }}"
       - uses: ./.github/ci-setup-action
         with:
-          concurrency_key: build-aztec-${{ github.actor }}
+          concurrency_key: build-aztec
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
       - name: Build & Push Aztec x86_64
         timeout-minutes: 40
@@ -91,19 +110,20 @@ jobs:
             --ARCH=x86_64
 
   build-aztec-arm:
-    needs: setup-arm
-    runs-on: ${{ github.actor }}-arm
+    needs: [configure, setup-arm]
+    runs-on: ${{ needs.configure.outputs.username }}-arm
     steps:
       - uses: actions/checkout@v4
         with:
           ref: "${{ env.GIT_COMMIT }}"
       - uses: ./.github/ci-setup-action
         with:
-          concurrency_key: build-aztec-${{ github.actor }}
+          concurrency_key: build-aztec
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
       - name: Build & Push Aztec arm64
-        timeout-minutes: 60
+        timeout-minutes: 80
         run: |
+          sudo shutdown -P 80
           earthly-ci \
             --no-output \
             --push \
@@ -112,71 +132,68 @@ jobs:
             --ARCH=arm64
 
   build-nargo-x86:
-    needs: [setup-x86, build-aztec-x86]
-    runs-on: ${{ github.actor }}-x86
+    needs: [configure, build-aztec-x86]
+    runs-on: ${{ needs.configure.outputs.username }}-x86
     steps:
       - uses: actions/checkout@v4
         with:
           ref: "${{ env.GIT_COMMIT }}"
       - uses: ./.github/ci-setup-action
         with:
-          concurrency_key: build-aztec-nargo-${{ github.actor }}
+          concurrency_key: build-aztec-nargo
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
-
       - name: Build & push aztec nargo image
         run: |
           earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=x86_64
 
   build-nargo-arm:
-    needs: [setup-arm, build-aztec-arm]
-    runs-on: ${{ github.actor }}-arm
+    needs: [configure, build-aztec-arm]
+    runs-on: ${{ needs.configure.outputs.username }}-arm
     steps:
       - uses: actions/checkout@v4
         with:
           ref: "${{ env.GIT_COMMIT }}"
       - uses: ./.github/ci-setup-action
         with:
-          concurrency_key: build-aztec-nargo-${{ github.actor }}
+          concurrency_key: build-aztec-nargo
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
-
       - name: Build & push aztec nargo image
         run: |
           earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=arm64
 
   build-cli-wallet-x86:
-    needs: [setup-x86, build-aztec-x86]
-    runs-on: ${{ github.actor }}-x86
+    needs: [configure, build-aztec-x86]
+    runs-on: ${{ needs.configure.outputs.username }}-x86
     steps:
       - uses: actions/checkout@v4
         with:
           ref: "${{ env.GIT_COMMIT }}"
       - uses: ./.github/ci-setup-action
         with:
-          concurrency_key: build-aztec-cli-wallet-${{ github.actor }}
+          concurrency_key: build-aztec-cli-wallet
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
-
       - name: Build & push aztec cli wallet image
         run: |
           earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=x86_64
 
   build-cli-wallet-arm:
-    needs: [setup-arm, build-aztec-arm]
-    runs-on: ${{ github.actor }}-arm
+    needs: [configure, build-aztec-arm]
+    runs-on: ${{ needs.configure.outputs.username }}-arm
     steps:
       - uses: actions/checkout@v4
         with:
           ref: "${{ env.GIT_COMMIT }}"
       - uses: ./.github/ci-setup-action
         with:
-          concurrency_key: build-aztec-cli-wallet-${{ github.actor }}
+          concurrency_key: build-aztec-cli-wallet
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
-
       - name: Build & push aztec cli wallet image
         run: |
           earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=arm64
 
   publish-manifests:
     needs:
+      - configure
       - build-aztec-x86
       - build-aztec-arm
       - build-nargo-x86
@@ -210,7 +227,6 @@ jobs:
           docker pull aztecprotocol/cli-wallet:${{ env.GIT_COMMIT }}-x86_64
           docker pull aztecprotocol/cli-wallet:${{ env.GIT_COMMIT }}-arm64
 
-          # Create and push versioned manifest if a version is provided
           if [ -n "$VERSION" ]; then
             docker manifest create aztecprotocol/aztec:$VERSION \
               aztecprotocol/aztec:${{ env.GIT_COMMIT }}-x86_64 \
@@ -245,8 +261,8 @@ jobs:
 
   publish-npm:
     if: github.event_name == 'workflow_dispatch'
-    needs: publish-manifests
-    runs-on: ${{ github.actor }}-x86
+    needs: [configure, publish-manifests]
+    runs-on: ${{ needs.configure.outputs.username }}-x86
     env:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
     steps:
@@ -256,7 +272,7 @@ jobs:
           ref: ${{ env.GIT_COMMIT }}
       - uses: ./.github/ci-setup-action
         with:
-          concurrency_key: publish-npm-${{ github.actor }}
+          concurrency_key: publish-npm
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
       - name: Publish yarn-project NPM packages
         run: |
@@ -284,7 +300,7 @@ jobs:
 
   # Sometimes runners get killed because they can be spot, we try once more for good measure
   rerun-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       actions: write
     needs:
@@ -302,12 +318,14 @@ jobs:
     steps:
       - name: Check for Rerun
         env:
-          # We treat any skipped or failing jobs as a failure for the workflow as a whole.
           HAD_FAILURE: ${{ contains(needs.*.result, 'failure') }}
           GH_REPO: ${{ github.repository }}
           GH_TOKEN: ${{ github.token }}
+          RUN_ATTEMPT: ${{ env.RUN_ATTEMPT }}
         run: |
-          if [[ $HAD_FAILURE == true ]] && [[ $RUN_ATTEMPT -lt 2 ]] ; then
-            echo "Retrying first workflow failure. This is a stop-gap until things are more stable."
+          # Retry first with failed and then with all, in case a runner snagged (e.g. ARM runner going down doesn't get rescued by a rescue script currently)
+          if [[ $HAD_FAILURE == true ]] && [[ $RUN_ATTEMPT == 1 ]]; then
             gh workflow run rerun.yml -F run_id=${{ github.run_id }}
+          elif [[ $HAD_FAILURE == true ]] && [[ $RUN_ATTEMPT == 2 ]]; then
+            gh workflow run rerun.yml -F run_id=${{ github.run_id }} -F rerun_mode=all
           fi

.github/workflows/rerun.yml

@@ -5,6 +5,10 @@ on:
     inputs:
       run_id:
         required: true
+      rerun_mode:
+        description: 'Specify rerun mode: failed or all'
+        required: false
+        default: 'failed'
 
 jobs:
   rerun:
@@ -20,11 +24,12 @@ jobs:
         run: |
           gh run watch ${{ inputs.run_id }} > /dev/null 2>&1
 
-      - name: Rerun failed jobs if the commit is the latest on the branch
+      - name: Rerun jobs if the commit is the latest on the branch
         env:
           GH_REPO: ${{ github.repository }}
           GH_TOKEN: ${{ github.token }}
           GH_DEBUG: api
+          RERUN_MODE: ${{ inputs.rerun_mode }}
         run: |
           RUN_ID="${{ inputs.run_id }}"
           # Get the run details
@@ -42,5 +47,11 @@ jobs:
             echo "Commit $COMMIT_SHA is not the latest commit on branch $BRANCH_NAME (latest is $LATEST_COMMIT_SHA) and the branch is not master/main. Skipping rerun."
           else
             echo "Commit $COMMIT_SHA is the latest on branch $BRANCH_NAME. Proceeding with rerun."
-            gh run rerun ${{ inputs.run_id }} --failed
+
+            if [[ "$RERUN_MODE" == "all" ]]; then
+              gh run rerun $RUN_ID
+            else
+              gh run rerun $RUN_ID --failed
+            fi
           fi
+

.noir-sync-commit

@@ -1 +1 @@
-c4273a0c8f8b751a3dbe097e070e4e7b2c8ec438
+ae87d287ab1fae0f999dfd0d1166fbddb927ba97

avm-transpiler/.rebuild_patterns

@@ -1 +1 @@
-^avm-transpiler/.*$
+^avm-transpiler/.*$

avm-transpiler/Earthfile

@@ -12,7 +12,11 @@ source:
 build:
     FROM +source
     # build avm transpiler, and make sure the big build and deps folders don't hit cache
-    RUN ./scripts/bootstrap_native.sh && rm -rf target/release/{build,deps}
+    DO ../build-system/s3-cache-scripts/+WITH_CACHE \
+        --prefix="avm-transpiler" \
+        --rebuild_patterns="../noir/.rebuild_patterns_native .rebuild_patterns" \
+        --command="./scripts/bootstrap_native.sh && rm -rf target/release/{build,deps}" \
+        --build_artifacts="target"
     SAVE ARTIFACT target/release/avm-transpiler avm-transpiler
     SAVE ARTIFACT scripts/compile_then_transpile.sh
 

avm-transpiler/bootstrap_cache.sh

@@ -2,10 +2,7 @@
 set -eu
 
 cd "$(dirname "$0")"
-source ../build-system/scripts/setup_env '' '' mainframe_$USER > /dev/null
 
 echo -e "\033[1mRetrieving avm-transpiler from remote cache...\033[0m"
-extract_repo_if_working_copy_clean avm-transpiler \
-  /usr/src/avm-transpiler/target/release/avm-transpiler ./target/release/
-
-remove_old_images avm-transpiler
+HASH=$(AZTEC_CACHE_REBUILD_PATTERNS="../noir/.rebuild_patterns_native .rebuild_patterns" ../build-system/s3-cache-scripts/compute-content-hash.sh)
+../build-system/s3-cache-scripts/cache-download.sh avm-transpiler-$HASH.tar.gz

avm-transpiler/src/transpile.rs

@@ -88,7 +88,7 @@ pub fn brillig_to_avm(
                             .direct_operand(destination)
                             .build(),
                     ),
-                    tag: Some(AvmTypeTag::FIELD),
+                    tag: None,
                     operands: vec![
                         make_operand(bits_needed, &lhs.to_usize()),
                         make_operand(bits_needed, &rhs.to_usize()),
@@ -181,7 +181,7 @@ pub fn brillig_to_avm(
                             .direct_operand(destination)
                             .build(),
                     ),
-                    tag: Some(tag_from_bit_size(BitSize::Integer(*bit_size))),
+                    tag: None,
                     operands: vec![
                         make_operand(bits_needed, &lhs.to_usize()),
                         make_operand(bits_needed, &rhs.to_usize()),

barretenberg/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 3440d85262930b05b32aecb51384b775b4f4da70
-	parent = c59d6936ea46296359abbd3cbf0823d44e64da90
+	commit = 14969f58deb182ebff9b8353f7e9ae2c3ca59ea7
+	parent = 14e73e29a784a3b6131b464b40058dcf8bb53a86
 	method = merge
 	cmdver = 0.4.6