Merge branch 'master' into sync-noir

* master: (37 commits)
  chore(avm:): Fix execution tests in proving mode (#9466)
  chore: remove unnecessary trait (#9437)
  fix: yarn build:fast (#9464)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  chore: replace relative paths to noir-protocol-circuits
  git subrepo push --branch=master barretenberg
  fix: cleanup of janky encryption apis (#9390)
  feat!: getcontractinstance instruction returns only a specified member (#9300)
  refactor: replace token note with uint note (#8143)
  fix(avm): address bytecode hashing comments (#9436)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  chore: replace relative paths to noir-protocol-circuits
  git subrepo push --branch=master barretenberg
  chore: noir bug workaround (#9443)
  feat: derive address and class id in avm (#8897)
  fix: bb-only-change fix e2e build instability (#9441)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  ...

.github/ensure-tester-with-images/action.yml

@@ -5,6 +5,8 @@ description: "Reusable setup steps"
 inputs:
   runner_type:
     required: true
+  spot_strategy:
+    default: BestEffort
   builder_type:
     required: true
   builder_images_to_copy:
@@ -59,6 +61,7 @@ runs:
       if: ${{ env.CACHE_SUCCESS != 'true' }}
       with:
         runner_type: ${{ inputs.runner_type}}
+        spot_strategy: ${{ inputs.spot_strategy }}
         ttl: ${{ inputs.tester_ttl }}
         run: |
           set -eux

.github/ensure-tester/action.yml

@@ -8,11 +8,12 @@ inputs:
   run:
     # command to run once tester available
     required: false
-
   ttl:
     required: false
     description: "Time to live for the tester instance in minutes"
     default: 30
+  spot_strategy:
+    default: BestEffort
 runs:
   # define an action, runs in OS of caller
   using: composite
@@ -23,15 +24,15 @@ runs:
       run: |
         TYPE=${{ inputs.runner_type }}
         # Try to use spot for every runner type for now
-        echo "spot_strategy=BestEffort" >> $GITHUB_OUTPUT
+        echo "spot_strategy=${{ inputs.spot_strategy }}" >> $GITHUB_OUTPUT
         echo "runner_label=$USERNAME-$runner_type" >> $GITHUB_OUTPUT
         echo "ami_id=ami-04d8422a9ba4de80f" >> $GITHUB_OUTPUT
         # no github runners, 'bare spot' in action code
         echo "runner_concurrency=0" >> $GITHUB_OUTPUT
         echo "ttl=${{ inputs.ttl }}" >> $GITHUB_OUTPUT
         SIZE=large
         if [[ $TYPE == 4core-* ]]; then
-          SIZE=large
+          SIZE=xlarge
         elif [[ $TYPE == 8core-* ]]; then
           SIZE=2xlarge
         elif [[ $TYPE == 16core-* ]]; then

.github/workflows/ci.yml

@@ -51,6 +51,7 @@ jobs:
       barretenberg-cpp: ${{ steps.filter.outputs.barretenberg-cpp }}
       noir: ${{ steps.filter.outputs.noir }}
       noir-projects: ${{ steps.filter.outputs.noir-projects }}
+      yarn-project: ${{ steps.filter.outputs.yarn-project }}
       txe: ${{ steps.filter.outputs.txe }}
       l1-contracts: ${{ steps.filter.outputs.l1-contracts }}
       non-docs: ${{ steps.filter.outputs.non-docs }}
@@ -95,6 +96,8 @@ jobs:
               - 'l1-contracts/**'
             noir-projects:
               - 'noir-projects/**'
+            yarn-project:
+              - 'yarn-project/**'
             txe:
               - 'yarn-project/txe/**'
             non-barretenberg-cpp:
@@ -155,7 +158,7 @@ jobs:
       # prepare images locally, tagged by commit hash
       - name: "Build E2E Image"
         timeout-minutes: 40
-        if: (needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master'
+        if: (needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master'
         run: |
           earthly-ci ./yarn-project+export-e2e-test-images
       # We base our e2e list used in e2e-x86 off the targets in ./yarn-project/end-to-end
@@ -184,7 +187,7 @@ jobs:
   # all the non-bench end-to-end integration tests for aztec
   e2e:
     needs: [build, configure]
-    if: (needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'e2e')
+    if: (needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'e2e')
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -216,7 +219,7 @@ jobs:
   # all the benchmarking end-to-end integration tests for aztec (not required to merge)
   bench-e2e:
     needs: [build, configure]
-    if: needs.build.outputs.bench_list != '[]' && ((needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'bench'))
+    if: needs.build.outputs.bench_list != '[]' && ((needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'bench'))
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -525,7 +528,7 @@ jobs:
   noir-examples:
     needs: [build, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
-    if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
+    if: needs.configure.outputs.noir == 'true'
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }
@@ -552,7 +555,7 @@ jobs:
   noir-projects:
     needs: [build, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
-    if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true' || needs.configure.outputs.noir-projects == 'true' || needs.configure.outputs.txe == 'true'
+    if: needs.configure.outputs.noir == 'true' || needs.configure.outputs.noir-projects == 'true' || needs.configure.outputs.txe == 'true'
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }
@@ -581,6 +584,7 @@ jobs:
 
   yarn-project-formatting:
     needs: [build, configure]
+    if: needs.configure.outputs.yarn-project == 'true' || github.ref_name == 'master' 
     runs-on: ${{ needs.configure.outputs.username }}-x86
     steps:
       - uses: actions/checkout@v4
@@ -594,6 +598,7 @@ jobs:
 
   yarn-project-test:
     needs: [build, configure]
+    if: needs.configure.outputs.yarn-project == 'true' || github.ref_name == 'master' 
     runs-on: ${{ needs.configure.outputs.username }}-x86
     steps:
       - uses: actions/checkout@v4
@@ -608,6 +613,7 @@ jobs:
   prover-client-test:
     needs: [build, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
+    if: needs.configure.outputs.yarn-project == 'true' || github.ref_name == 'master' 
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }
@@ -621,6 +627,7 @@ jobs:
   # proving disabled
   network-test:
     needs: [build, configure]
+    if: needs.configure.outputs.yarn-project == 'true'
     runs-on: ${{ needs.configure.outputs.username }}-x86
     strategy:
       max-parallel: 1
@@ -634,19 +641,20 @@ jobs:
         with:
           concurrency_key: network-test-${{ matrix.test }}
       - name: "Setup and Local Network Tests"
-        timeout-minutes: 40
+        timeout-minutes: 60
         # Only allow transfer test to run on every (non-network-all) PR
         if: matrix.test == 'test-transfer.sh' || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'network-all')
-        run: earthly-ci --no-output ./yarn-project/+network-test --test=./${{ matrix.test }}
+        run: sudo shutdown -P 60 ; earthly-ci --no-output ./yarn-project/+network-test --test=./${{ matrix.test }}
 
   # note: proving disabled
   kind-network-test:
     needs: [build, configure]
+    if: needs.configure.output.yarn-project == 'true'
     runs-on: ${{ needs.configure.outputs.username }}-x86
     strategy:
       fail-fast: false
       matrix:
-        test: [smoke.test.ts, transfer.test.ts, 4epochs.test.ts]
+        test: [smoke.test.ts, transfer.test.ts] # TODO reinstate: 4epochs.test.ts
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }
@@ -660,16 +668,16 @@ jobs:
         env:
           USERNAME: ${{ needs.configure.outputs.username }}
         with:
-          runner_type: 16core-tester-x86
+          runner_type: 8core-tester-x86
           spot_strategy: None # use on-demand machines
           builder_type: builder-x86
           # these are copied to the tester and expected by the earthly command below
           # if they fail to copy, it will try to build them on the tester and fail
           builder_images_to_copy: aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/end-to-end:${{ env.GIT_COMMIT }}
           # command to produce the images in case they don't exist
           builder_command: scripts/earthly-ci ./yarn-project+export-e2e-test-images
+          tester_ttl: 60
           run: |
-            sudo shutdown -P 60 # extend ttl
             cd yarn-project/end-to-end
             echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
             test=${{ matrix.test }}
@@ -797,7 +805,7 @@ jobs:
 
   protocol-circuits-gates-report:
     needs: [build, configure]
-    if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true'
+    if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true'
     runs-on: ${{ needs.configure.outputs.username }}-x86
     permissions:
       pull-requests: write

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

@@ -299,6 +299,33 @@ jobs:
             --VERSION=$VERSION \
             --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }}
 
+  publish-aztec-up:
+    needs: [configure, publish-manifests]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GIT_COMMIT }}
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: 1.7.5
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-2
+
+      - name: Publish aztec-up
+        working-directory: ./aztec-up/terraform
+        run: |
+          terraform init
+          TAG=${{ env.DEPLOY_TAG }}
+          export TF_VAR_VERSION=${TAG#aztec-packages-v}
+          terraform apply -auto-approve
+
   # Sometimes runners get killed because they can be spot, we try once more for good measure
   rerun-check:
     runs-on: ubuntu-latest