Merge branch 'master' into zw/monomial-accumulaator

.devcontainer/dev/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "Development",
-  "image": "aztecprotocol/devbox:1.0",
+  "image": "aztecprotocol/devbox:1.2",
   "features": {
     // Use custom fork with noble added to list of supported distros.
     "./docker-in-docker": {}

.github/workflows/ci-arm.yml

@@ -86,30 +86,31 @@ jobs:
           sudo shutdown -P 60 # necessary to get around builtin hard timeout
           earthly-ci ./yarn-project+export-e2e-test-images
 
-  # all the non-bench end-to-end integration tests for aztec
-  e2e:
-    needs: [build]
-    runs-on: master-arm
-    steps:
-      # permission kludge before checkout, see https://github.com/actions/checkout/issues/211#issuecomment-611986243
-      - run: sudo chown -R $USER:$USER /home/ubuntu/
-      - uses: actions/checkout@v4
-        with: { ref: "${{ env.GIT_COMMIT }}" }
-      - uses: ./.github/ci-setup-action
-        with:
-          concurrency_key: e2e-arm
-      # prepare images locally, tagged by commit hash
-      - name: "Build E2E Image"
-        timeout-minutes: 40
-        working-directory: ./yarn-project/end-to-end
-        run: |
-          ./scripts/e2e_compose_test.sh uniswap_trade_on_l1_from_l2.test.ts
+  # TODO(https://github.com/AztecProtocol/aztec-packages/issues/10681)
+  # # all the non-bench end-to-end integration tests for aztec
+  # e2e:
+  #   needs: [build]
+  #   runs-on: master-arm
+  #   steps:
+  #     # permission kludge before checkout, see https://github.com/actions/checkout/issues/211#issuecomment-611986243
+  #     - run: sudo chown -R $USER:$USER /home/ubuntu/
+  #     - uses: actions/checkout@v4
+  #       with: { ref: "${{ env.GIT_COMMIT }}" }
+  #     - uses: ./.github/ci-setup-action
+  #       with:
+  #         concurrency_key: e2e-arm
+  #     # prepare images locally, tagged by commit hash
+  #     - name: "Build E2E Image"
+  #       timeout-minutes: 40
+  #       working-directory: ./yarn-project/end-to-end
+  #       run: |
+  #         ./scripts/e2e_compose_test.sh uniswap_trade_on_l1_from_l2.test.ts
 
   rerun-check:
     runs-on: ubuntu-20.04
     permissions:
       actions: write
-    needs: [setup, build-images, build, e2e]
+    needs: [setup, build-images, build] #, e2e]
     if: ${{ !cancelled() }}
     steps:
       - name: Check for Rerun
@@ -126,7 +127,7 @@ jobs:
 
   # NOTE: we only notify failures after a rerun has occurred
   notify:
-    needs: [e2e]
+    needs: [build] #[e2e]
     runs-on: ubuntu-latest
     if: ${{ github.ref == 'refs/heads/master' && failure() && github.run_attempt >= 2 }}
     steps:

.github/workflows/ci.yml

@@ -166,22 +166,32 @@ jobs:
       # (Note ARM uses just 2 tests as a smoketest)
       - name: Create list of non-bench end-to-end jobs
         id: e2e_list
-        env:
-          REF: contains(github.ref_name, 'gh-readonly-queue') && 'master' || github.ref_name
         run: |
+          if [[ "$GITHUB_REF_NAME" == *"gh-readonly-queue"* ]]; then
+            REF="master"
+          else
+            REF="$GITHUB_REF_NAME"
+          fi
+
           if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
             LABELS=$(jq -r '.pull_request.labels | map(.name) | join(",")' "$GITHUB_EVENT_PATH")
           else
             LABELS=""
           fi
+
+          echo REF: $REF
           echo Labels: $LABELS
           echo "list=$(./scripts/ci/get_e2e_jobs.sh $REF "$LABELS")"
           echo "list=$(./scripts/ci/get_e2e_jobs.sh $REF "$LABELS")" >> $GITHUB_OUTPUT
       - name: Create list of bench end-to-end jobs
         id: bench_list
-        env:
-          REF: contains(github.ref_name, 'gh-readonly-queue') && 'master' || github.ref_name
         run: |
+          if [[ "$GITHUB_REF_NAME" == *"gh-readonly-queue"* ]]; then
+            REF="master"
+          else
+            REF="$GITHUB_REF_NAME"
+          fi
+
           if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
             LABELS=$(jq -r '.pull_request.labels | map(.name) | join(",")' "$GITHUB_EVENT_PATH")
           else
@@ -205,15 +215,15 @@ jobs:
       - run: "echo Full E2E tests enabled."
 
   network-test-gate:
-    needs: [build, configure]
+    needs: [build, yarn-project-test, configure]
     if: github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'network-all')
     runs-on: ubuntu-20.04
     steps:
       - run: "echo Full network tests enabled."
 
   # all the non-bench end-to-end integration tests for aztec
   e2e:
-    needs: [build, e2e-test-gate, configure]
+    needs: [build, configure]
     if: needs.configure.outputs.non-docs == 'true'
     runs-on: ubuntu-20.04
     strategy:
@@ -230,7 +240,7 @@ jobs:
           runner=$(./scripts/ci/select_runner.sh ${{ matrix.test }})
           echo "type=$runner" >> $GITHUB_OUTPUT
       - name: Setup and Test
-        timeout-minutes: 40
+        timeout-minutes: 50
         uses: ./.github/ensure-tester-with-images
         env:
           USERNAME: ${{ needs.configure.outputs.username }}
@@ -657,7 +667,7 @@ jobs:
         with:
           concurrency_key: prover-client-test-x86
       - name: "Prover Client Tests"
-        timeout-minutes: 40
+        timeout-minutes: 60
         run: earthly-ci --no-output ./yarn-project/+prover-client-test
 
   network-transfer-test:
@@ -674,7 +684,7 @@ jobs:
         run: sudo shutdown -P 60 ; earthly-ci --no-output ./yarn-project/+network-test --test=./test-transfer.sh
 
   network-full-test:
-    needs: [network-test-gate, configure]
+    needs: [network-test-gate, network-transfer-test, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
     strategy:
       max-parallel: 1
@@ -746,10 +756,10 @@ jobs:
             values: 16-validators
             runner_type: 16core-tester-x86
             timeout: 60
-          - test: gating-passive.test.ts
-            values: 16-validators
-            runner_type: 16core-tester-x86
-            timeout: 60
+          # - test: gating-passive.test.ts
+          #   values: 16-validators
+          #   runner_type: 16core-tester-x86
+          #   timeout: 60
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }
@@ -868,11 +878,26 @@ jobs:
           alert-comment-cc-users: "@ludamad @codygunton"
           max-items-in-chart: 50
 
-  boxes-test:
+  boxes:
     needs: [e2e-test-gate, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
+    steps:
+      - uses: actions/checkout@v4
+        with: { ref: "${{ github.event.pull_request.head.sha }}" }
+      - uses: ./.github/ci-setup-action
+        with:
+          concurrency_key: boxes-${{ matrix.box }}-${{ matrix.browser }}
+      - name: Build
+        working-directory: ./boxes
+        timeout-minutes: 40
+        run: earthly-ci +export-boxes
+
+  boxes-test:
+    needs: [boxes, configure]
+    runs-on: ${{ needs.configure.outputs.username }}-x86
     strategy:
       fail-fast: false
+      max-parallel: 1
       matrix:
         box: [vanilla, react]
         # intermittent issues with firefox https://github.com/AztecProtocol/aztec-packages/issues/6676
@@ -884,10 +909,6 @@ jobs:
       - uses: ./.github/ci-setup-action
         with:
           concurrency_key: boxes-${{ matrix.box }}-${{ matrix.browser }}
-      - name: Build
-        working-directory: ./boxes
-        timeout-minutes: 40
-        run: earthly-ci +export-boxes
       - name: Box test
         working-directory: ./boxes
         timeout-minutes: 40
@@ -1062,7 +1083,7 @@ jobs:
       actions: write
     needs:
       - merge-check
-    if: github.event.pull_request.draft == false && !cancelled() && !true
+    if: github.event.pull_request.draft == false && !cancelled()
     steps:
       - name: Check for Rerun
         env:

.github/workflows/devnet-deploy.yml

@@ -13,6 +13,11 @@ on:
         description: The name of the secret which holds the boot node's contract deployment mnemonic
         required: true
         default: testnet-deployment-mnemonic
+      deployment_salt:
+        description: The salt to use for this deployment. Defaults to random
+        required: false
+        type: string
+        default: ""
       respect_tf_lock:
         description: Whether to respect the Terraform lock
         required: false
@@ -39,6 +44,7 @@ jobs:
       values_file: release-devnet.yaml
       aztec_docker_image: ${{ github.event.inputs.aztec_docker_image }}
       deployment_mnemonic_secret_name: ${{ github.event.inputs.deployment_mnemonic_secret_name }}
+      deployment_salt: ${{ github.event.inputs.deployment_salt }}
       respect_tf_lock: ${{ github.event.inputs.respect_tf_lock }}
     secrets:
       GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}

.github/workflows/network-deploy.yml

@@ -20,6 +20,11 @@ on:
         required: true
         type: string
         default: testnet-deployment-mnemonic
+      deployment_salt:
+        description: The salt to use for this deployment. Defaults to random
+        required: false
+        type: string
+        default: ""
       respect_tf_lock:
         description: Whether to respect the Terraform lock
         required: false
@@ -53,6 +58,10 @@ on:
         description: The name of the secret which holds the boot node's contract deployment mnemonic
         required: true
         default: testnet-deployment-mnemonic
+      deployment_salt:
+        description: The salt to use for this deployment. Defaults to random
+        required: false
+        default: ""
       respect_tf_lock:
         description: Whether to respect the Terraform lock
         required: false
@@ -82,6 +91,7 @@ jobs:
       NAMESPACE: ${{ inputs.namespace }}
       VALUES_FILE: ${{ inputs.values_file }}
       DEPLOYMENT_MNEMONIC_SECRET_NAME: ${{ inputs.deployment_mnemonic_secret_name }}
+      DEPLOYMENT_SALT: ${{ inputs.deployment_salt }}
       CHART_PATH: ./spartan/aztec-network
       CLUSTER_NAME: aztec-gke
       REGION: us-west1-a
@@ -161,6 +171,7 @@ jobs:
             -var="GKE_CLUSTER_CONTEXT=${{ env.GKE_CLUSTER_CONTEXT }}" \
             -var="AZTEC_DOCKER_IMAGE=${{ env.AZTEC_DOCKER_IMAGE }}" \
             -var="L1_DEPLOYMENT_MNEMONIC=${{ steps.get-mnemonic.outputs.mnemonic }}" \
+            -var="L1_DEPLOYMENT_SALT=${DEPLOYMENT_SALT:-$RANDOM}" \
             -out=tfplan \
             -lock=${{ inputs.respect_tf_lock }}
 

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

@@ -211,7 +211,7 @@ jobs:
       - name: Publish aztec manifests
         if: ${{ env.SHOULD_PUBLISH_DOCKER_IMAGES == 'true' }}
         run: |
-          if [ "${{ github.ref_name }}" == "release/*" ]; then
+          if [[ "${{ github.ref_name }}" =~ ^release/ ]]; then
             TAG="${{ github.ref_name }}"
             VERSION="${TAG#release/}"
             DIST_TAG=devnet
@@ -282,7 +282,7 @@ jobs:
       - name: Set tags and versions
         id: version_step
         run: |
-          if [ "${{ github.ref_name }}" == "release/*" ]; then
+          if [[ "${{ github.ref_name }}" =~ ^release/ ]]; then
             DIST_TAG=devnet
             TAG=${{ env.DEPLOY_TAG }}
             VERSION=${TAG#aztec-packages-v}-devnet
@@ -356,7 +356,7 @@ jobs:
       - name: Publish aztec-up
         working-directory: ./aztec-up/terraform
         run: |
-          if [ "${{ github.ref_name }}" == "release/*" ]; then
+          if [[ "${{ github.ref_name }}" =~ ^release/ ]]; then
             TAG="${{ github.ref_name }}"
             VERSION="${TAG#release/}"
           elif [ -n "${{ env.DEPLOY_TAG }}" ]; then

.github/workflows/release-please.yml

@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - master
-      - "release/*"
 
 permissions:
   contents: write

.noir-sync-commit

@@ -1 +1 @@
-6d0f86ba389a5b59b1d7fdcadcbce3e40eecaa48
+f337992de96ef656681ebfc96a30c2c9c9b82a70

.release-please-manifest.json

@@ -1,7 +1,7 @@
 {
-  ".": "0.66.0",
+  ".": "0.67.1",
   "yarn-project/cli": "0.35.1",
-  "yarn-project/aztec": "0.66.0",
-  "barretenberg": "0.66.0",
-  "barretenberg/ts": "0.66.0"
+  "yarn-project/aztec": "0.67.1",
+  "barretenberg": "0.67.1",
+  "barretenberg/ts": "0.67.1"
 }