Merge branch 'master' into sync-noir

* master: (67 commits) chore: pull out more sync stuff (#11617) refactor: consolidate contract functions in pxe (#10480) feat: txe native world state (#11226) feat(avm): vm2 bitwise subtrace (#11473) fix: boxes playwright + web bundles (#11615) chore: pull lazy memory initialization from sync (#11607) 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: add method to filemanager (#11610) feat(avm): get_row optimization - 25x faster logderiv inv (#11605) fix(spartan): get svc addresses from load balancers (#11606) chore: remove old public circuit public inputs (#11594) fix: fix boxes (#11592) fix: only set node version in node pools (#11604) chore: replace usage of stdlib with sha256 library (#11394) fix: pin k8s version (#11599) chore: make target contract public (#11582) fix(spartan): reduce l1 deploy retry time (#11591) ...
AztecProtocol · Jan 30, 2025 · 722e3aa · 722e3aa
2 parents 578a92d + 30dc56c
commit 722e3aa
Show file tree

Hide file tree

Showing 866 changed files with 19,674 additions and 10,557 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -380,24 +380,17 @@ jobs:
             docker pull aztecprotocol/aztec:${{ env.GIT_COMMIT }}
             docker pull aztecprotocol/end-to-end:${{ env.GIT_COMMIT }}
             echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
-            cd yarn-project/end-to-end
 
-            export INSTALL_CHAOS_MESH=false
-            export INSTALL_METRICS=false
-            export NAMESPACE=smoke
-            export FRESH_INSTALL=true
-            export VALUES_FILE=ci-smoke.yaml
-
-            ./scripts/network_test.sh ./src/spartan/smoke.test.ts
+            INSTALL_METRICS=false ./spartan/scripts/test_kind.sh ./src/spartan/smoke.test.ts ci-smoke.yaml
       - name: Copy Network Logs
         if: always()
-        run: scripts/copy_from_tester yarn-project/end-to-end/scripts/network-test.log network-test.log || true
+        run: scripts/copy_from_tester spartan/scripts/logs/test_kind.log test_kind.log || true
       - name: Upload Network Logs
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: kind-network-smoke.log
-          path: network-test.log
+          path: test_kind.log
 
   kind-network-test:
     needs: [images-e2e, configure]
@@ -408,15 +401,15 @@ jobs:
       matrix:
         config:
           # - test: reorg.test.ts
-          #   values: ci
+          #   values: ci.yaml
           #   runner_type: 16core-tester-x86-high-memory
           #   timeout: 60
           - test: 4epochs.test.ts
-            values: ci
+            values: ci.yaml
             runner_type: 16core-tester-x86
             timeout: 40
           # - test: gating-passive.test.ts
-          #   values: ci
+          #   values: ci.yaml
           #   runner_type: 16core-tester-x86
           #   timeout: 40
     steps:
@@ -433,23 +426,23 @@ jobs:
           run: |
             until docker info &>/dev/null; do sleep 1; done
             export CI=1 USE_CACHE=1
-            artifact="kind-network-${{matrix.config.test}}-$(./yarn-project/bootstrap.sh hash)"
+            artifact="kind-network-${{matrix.config.test}}-$(./spartan/bootstrap.sh hash)"
             if ci3/test_should_run "$artifact"; then
               docker pull aztecprotocol/aztec:${{ env.GIT_COMMIT }}
               docker pull aztecprotocol/end-to-end:${{ env.GIT_COMMIT }}
-              ./ci.sh test-kind-network ${{ matrix.config.test }} ${{ matrix.config.values }}
+              INSTALL_METRICS=false ./spartan/scripts/test_kind.sh "./src/spartan/${{ matrix.config.test }}" "${{ matrix.config.values }}"
               ci3/cache_upload_flag "$artifact"
             fi
       - name: Copy Network Logs
         if: always()
-        run: scripts/copy_from_tester yarn-project/end-to-end/scripts/network-test.log network-test.log || true
+        run: scripts/copy_from_tester spartan/scripts/logs/test_kind.log test_kind.log || true
 
       - name: Upload Network Logs
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: kind-network-test-${{ matrix.config.values }}-${{ matrix.config.test }}.log
-          path: network-test.log
+          path: test_kind.log
 
   bb-bench:
     runs-on: ubuntu-latest
@@ -501,26 +494,25 @@ jobs:
           alert-comment-cc-users: "@ludamad @codygunton"
           max-items-in-chart: 50
 
-  # TODO(https://github.com/AztecProtocol/aztec-packages/issues/11471) reenable
-  # boxes-test:
-  #   needs: [ci-rest, configure]
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #       with: { ref: "${{ github.event.pull_request.head.sha }}" }
-  #     - uses: ./.github/ci-setup-action
+  boxes-test:
+    needs: [ci-rest, configure]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with: { ref: "${{ github.event.pull_request.head.sha }}" }
+      - uses: ./.github/ci-setup-action
 
-  #     - name: Build Boxes
-  #       uses: ./.github/ensure-builder
-  #       timeout-minutes: 40
-  #       with:
-  #         username: ${{ needs.configure.outputs.username }}
-  #         runner_type: builder-x86
-  #         run: |
-  #           export CI=1 USE_CACHE=1
-  #           if ci3/test_should_run "boxes-test-$(./boxes/bootstrap.sh hash)"; then
-  #             ./bootstrap.sh test-boxes
-  #           fi
+      - name: Build Boxes
+        uses: ./.github/ensure-builder
+        timeout-minutes: 40
+        with:
+          username: ${{ needs.configure.outputs.username }}
+          runner_type: builder-x86
+          run: |
+            export CI=1 USE_CACHE=1
+            if ci3/test_should_run "boxes-test-$(./boxes/bootstrap.sh hash)"; then
+              ./bootstrap.sh test-boxes
+            fi
 
   prover-client-test:
     needs: [ci-rest, configure]

diff --git a/.github/workflows/devnet-deploy.yml b/.github/workflows/devnet-deploy.yml
@@ -3,6 +3,10 @@ name: Deploy devnet
 on:
   workflow_dispatch:
     inputs:
+      cluster:
+        description: The cluster to deploy to, e.g. aztec-gke-private
+        required: true
+        default: "aztec-gke-private"
       namespace:
         description: The namespace to deploy to, e.g. smoke
         required: true
@@ -40,7 +44,7 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   CONTRACT_S3_BUCKET: s3://static.aztec.network
-  CLUSTER_NAME: aztec-gke
+  CLUSTER_NAME: ${{ inputs.cluster }}
   REGION: us-west1-a
   NAMESPACE: ${{ inputs.namespace }}
   AZTEC_DOCKER_IMAGE: ${{ inputs.aztec_docker_image }}
@@ -50,6 +54,7 @@ jobs:
     uses: ./.github/workflows/network-deploy.yml
     with:
       namespace: ${{ github.event.inputs.namespace }}
+      cluster: ${{ github.event.inputs.cluster }}
       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 }}

diff --git a/.github/workflows/network-deploy.yml b/.github/workflows/network-deploy.yml
@@ -3,6 +3,10 @@ name: Aztec Network Deployment
 on:
   workflow_call:
     inputs:
+      cluster:
+        description: The cluster to deploy to, e.g. aztec-gke-private
+        required: true
+        type: string
       namespace:
         description: The namespace to deploy to, e.g. smoke
         required: true
@@ -50,6 +54,10 @@ on:
         required: true
   workflow_dispatch:
     inputs:
+      cluster:
+        description: The cluster to deploy to, e.g. aztec-gke-private
+        required: true
+        type: string
       namespace:
         description: The namespace to deploy to, e.g. smoke
         required: true
@@ -103,10 +111,10 @@ jobs:
       DEPLOYMENT_MNEMONIC_SECRET_NAME: ${{ inputs.deployment_mnemonic_secret_name }}
       DEPLOYMENT_SALT: ${{ inputs.deployment_salt }}
       CHART_PATH: ./spartan/aztec-network
-      CLUSTER_NAME: aztec-gke
+      CLUSTER_NAME: ${{ inputs.cluster }}
       REGION: us-west1-a
       TF_STATE_BUCKET: aztec-terraform
-      GKE_CLUSTER_CONTEXT: gke_testnet-440309_us-west1-a_aztec-gke
+      GKE_CLUSTER_CONTEXT: "gke_testnet-440309_us-west1-a_${{ inputs.cluster }}"
 
     steps:
       - name: Checkout code
@@ -151,12 +159,9 @@ jobs:
         run: |
           REPO=$(git rev-parse --show-toplevel)
 
-          export VALUES_PATH="$REPO/spartan/aztec-network/values/${{ env.VALUES_FILE }}"
-          export DEFAULT_VALUES_PATH="$REPO/spartan/aztec-network/values.yaml"
-
           export MNEMONIC="${{ steps.get-mnemonic.outputs.mnemonic }}"
 
-          $REPO/yarn-project/end-to-end/scripts/bash/generate_devnet_config.sh
+          $REPO/spartan/scripts/generate_devnet_config.sh ${{ env.VALUES_FILE }}
 
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v2

diff --git a/.github/workflows/network-test.yml b/.github/workflows/network-test.yml
@@ -3,6 +3,10 @@ name: Aztec Network Test
 on:
   workflow_dispatch:
     inputs:
+      cluster:
+        description: The cluster to deploy to, e.g. aztec-gke-private
+        required: true
+        default: "aztec-gke-private"
       namespace:
         description: The namespace to deploy to, e.g. smoke
         required: true
@@ -22,10 +26,10 @@ jobs:
       NAMESPACE: ${{ inputs.namespace }}
       TEST: ${{ inputs.test }}
       CHART_PATH: ./spartan/aztec-network
-      CLUSTER_NAME: aztec-gke
+      CLUSTER_NAME: ${{ inputs.cluster }}
       REGION: us-west1-a
       PROJECT_ID: testnet-440309
-      GKE_CLUSTER_CONTEXT: gke_testnet-440309_us-west1-a_aztec-gke
+      GKE_CLUSTER_CONTEXT: "gke_testnet-440309_us-west1-a_${{ inputs.cluster }}"
 
     steps:
       - name: Checkout code

diff --git a/.github/workflows/nightly-kind-test.yml b/.github/workflows/nightly-kind-test.yml
@@ -51,8 +51,8 @@ jobs:
     strategy:
       matrix:
         test:
-          - transfer
-          - reorg
+          - transfer.test.ts
+          - reorg.test.ts
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }
@@ -66,7 +66,7 @@ jobs:
           run: |
             docker pull aztecprotocol/aztec:${{ env.GIT_COMMIT }}
             docker pull aztecprotocol/end-to-end:${{ env.GIT_COMMIT }}
-            FORCE_COLOR=1 CLEANUP_CLUSTER=true ./ci.sh test-kind-network ${{ matrix.test }}.test.ts 16-validators || true
+            FORCE_COLOR=1 INSTALL_METRICS=false ./spartan/scripts/test_kind.sh "./src/spartan/${{ matrix.config.test }}" 16-validators.yaml
 
   proving-test:
     needs: build
@@ -85,8 +85,8 @@ jobs:
           run: |
             docker pull aztecprotocol/aztec:${{ env.GIT_COMMIT }}
             docker pull aztecprotocol/end-to-end:${{ env.GIT_COMMIT }}
-            INSTALL_TIMEOUT=45m FORCE_COLOR=1 CLEANUP_CLUSTER=true \
-              ./ci.sh test-kind-network proving.test.ts 1-validator-with-proving || true
+            INSTALL_TIMEOUT=45m FORCE_COLOR=1 INSTALL_METRICS=false \
+              ./spartan/scripts/test_kind.sh ./src/spartan/proving.test.ts 1-validator-with-proving || true
 
   success-check:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/nightly-masternet-deploy.yml b/.github/workflows/nightly-masternet-deploy.yml
@@ -28,6 +28,7 @@ jobs:
     uses: ./.github/workflows/network-deploy.yml
     with:
       ref: master
+      cluster: aztec-gke-private
       namespace: masternet
       values_file: rc-1.yaml
       aztec_docker_image: aztecprotocol/aztec@${{ needs.get-latest-commit.outputs.commit }}

diff --git a/Earthfile b/Earthfile
@@ -243,7 +243,7 @@ noir-projects-with-cache:
   FROM +bootstrap
   ENV CI=1
   ENV USE_CACHE=1
-  LET artifact=noir-projects-ci-tests-$(./noir-projects/bootstrap.sh hash)
+  LET artifact=noir-projects-ci-tests-$(./noir-projects/bootstrap.sh hash)-$(ci3/cache_content_hash yarn-project/txe)
   IF ci3/test_should_run $artifact
     # could be changed to bootstrap once txe solution found
     WAIT

diff --git a/aztec-nargo/compile_then_postprocess.sh b/aztec-nargo/compile_then_postprocess.sh
@@ -5,7 +5,7 @@
 # run nargo and then postprocess any created artifacts.
 #
 # Usage: compile_then_postprocess.sh [nargo args]
-set -eu
+set -euo pipefail
 
 NARGO=${NARGO:-nargo}
 TRANSPILER=${TRANSPILER:-avm-transpiler}

diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = e67c50dbf5e3c978662b5eab0789fd2b3aefb47d
-	parent = ad604ea017b6158efa2ea8934721d9a557ef946b
+	commit = 2b718dec0624621c81bdc406bed8db0c30ed2a77
+	parent = 6ce23892c8762ffde6fc3198e1e392cd1a72969b
 	method = merge
 	cmdver = 0.4.6
diff --git a/barretenberg/acir_tests/browser-test-app/package.json b/barretenberg/acir_tests/browser-test-app/package.json
@@ -6,7 +6,7 @@
   "type": "module",
   "scripts": {
     "build": "rm -rf dest && webpack",
-    "serve:dest:st": "serve -n -L -p ${PORT:-8080} dest",
+    "serve:dest:st": "serve -n -L -p ${PORT:-8080} -c ../serve.st.json dest",
     "serve:dest:mt": "serve -n -L -p ${PORT:-8080} -c ../serve.mt.json dest"
   },
   "devDependencies": {

diff --git a/barretenberg/acir_tests/browser-test-app/serve.mt.json b/barretenberg/acir_tests/browser-test-app/serve.mt.json
@@ -12,6 +12,17 @@
           "value": "same-origin"
         }
       ]
+    },
+    {
+      "source" : "**/*.gz",
+      "headers" : [{
+        "key" : "Content-Encoding",
+        "value" : "gzip"
+      },
+      {
+        "key" : "Content-Type",
+        "value" : "application/wasm"
+      }]
     }
   ]
 }
diff --git a/barretenberg/acir_tests/browser-test-app/serve.st.json b/barretenberg/acir_tests/browser-test-app/serve.st.json
@@ -0,0 +1,15 @@
+{
+  "headers": [
+    {
+      "source" : "**/*.gz",
+      "headers" : [{
+        "key" : "Content-Encoding",
+        "value" : "gzip"
+      },
+      {
+        "key" : "Content-Type",
+        "value" : "application/wasm"
+      }]
+    }
+  ]
+}
diff --git a/barretenberg/acir_tests/browser-test-app/src/index.html b/barretenberg/acir_tests/browser-test-app/src/index.html
@@ -4,6 +4,6 @@
     <title>My Test bb.js App</title>
   </head>
   <body>
-    <script src="index.js"></script>
+    <script type="module" src="index.js"></script>
   </body>
 </html>
diff --git a/barretenberg/acir_tests/browser-test-app/webpack.config.js b/barretenberg/acir_tests/browser-test-app/webpack.config.js
@@ -12,7 +12,14 @@ export default {
     index: "./src/index.ts",
   },
   module: {
+    parser: {
+      javascript: { importMeta: false },
+    },
     rules: [
+      {
+        test: /\.gz$/,
+        type: 'asset/resource',
+      },
       {
         test: /\.tsx?$/,
         use: [{ loader: "ts-loader" }],
@@ -23,8 +30,23 @@ export default {
     path: resolve(dirname(fileURLToPath(import.meta.url)), "./dest"),
     filename: "[name].js",
     chunkFilename: "[name].chunk.js", // This naming pattern is used for chunks produced from code-splitting.
+    library: {
+      type: 'module',
+    },
+    chunkFormat: 'module',
+  },
+  experiments: {
+    outputModule: true,
   },
   plugins: [
+    new CopyWebpackPlugin({
+      patterns: [
+        {
+          context: '../../ts/dest/browser',
+          from: '*.gz',
+        },
+      ],
+    }),
     new HtmlWebpackPlugin({ inject: false, template: "./src/index.html" }),
     new webpack.DefinePlugin({ "process.env.NODE_DEBUG": false }),
   ],

diff --git a/barretenberg/acir_tests/browser-test-app/yarn.lock b/barretenberg/acir_tests/browser-test-app/yarn.lock
@@ -6,8 +6,8 @@ __metadata:
   cacheKey: 10c0
 
 "@aztec/bb.js@file:../../ts::locator=browser-test-app%40workspace%3A.":
-  version: 0.67.1
-  resolution: "@aztec/bb.js@file:../../ts#../../ts::hash=cd38cd&locator=browser-test-app%40workspace%3A."
+  version: 0.72.1
+  resolution: "@aztec/bb.js@file:../../ts#../../ts::hash=2e6237&locator=browser-test-app%40workspace%3A."
   dependencies:
     comlink: "npm:^4.4.1"
     commander: "npm:^12.1.0"
@@ -17,7 +17,7 @@ __metadata:
     tslib: "npm:^2.4.0"
   bin:
     bb.js: ./dest/node/main.js
-  checksum: 10c0/c6c1476f5f5d5cc1ea7022043e00870ee0743fd73a532c171586ab74bac53f3888c648bd4057de5a602e4a556cbb5d91454f57e0875ab002ccc87e7f83f12e43
+  checksum: 10c0/174074ea937d9e4888e1aa600717ace0f0c5745d15bdd23730c136d927c2d58eec87ba83cb21fbfb72f7aa00ec128a564d7fa6d822f709e0327e01aa6475e255
   languageName: node
   linkType: hard