Merge branch 'master' into sync-noir

* master: (155 commits) fix(ci): don't report for now on kind-network-test (#9163) chore(ci): disable gossip_network.test.ts (#9165) chore: script for deploying the spartan network (#9167) feat!: Brillig with a stack and conditional inlining (#8989) fix: spartan account pre-funding (#9161) chore: reenable sync test (#9160) feat: Browser tests for UltraHonk (#9047) feat: make index in inbox global (#9110) feat: add sequencer address to metrics (#9145) feat: add validator address to logs (#9143) refactor(avm): type aliasing for VmPublicInputs (#8884) feat: drop epoch duration / block times (#9149) feat: stable deployments for spartan (#9147) fix: e2e-p2p attestation timeout (#9154) feat!: unrevert "feat: new per-enqueued-call gas limit" (#9140) feat: better tracing/metrics in validator and archiver (#9108) chore: revert deletion of the old bbup (#9146) chore(docs): rewriting bbup script, refactoring bb readme for clarity (#9073) git subrepo push --branch=master noir-projects/aztec-nr git_subrepo.sh: Fix parent in .gitrepo file. [skip ci] ...
AztecProtocol · Oct 10, 2024 · 04e12a9 · 04e12a9
2 parents 3a60573 + c59d693
commit 04e12a9
Show file tree

Hide file tree

Showing 961 changed files with 30,688 additions and 15,743 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -372,18 +372,6 @@ jobs:
           command: build cli-wallet
           aztec_manifest_key: cli-wallet
 
-  end-to-end:
-    machine:
-      image: default
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build"
-          command: build end-to-end
-          aztec_manifest_key: end-to-end
-
   # For old e2e tests see yarn-project/end-to-end/Earthfile
   # Semantics are similar to Dockerfile
 
@@ -583,7 +571,6 @@ workflows:
             - l1-contracts
             - noir-projects
           <<: *defaults
-      - end-to-end: *defaults_yarn_project
       - yarn-project-x86_64: *defaults_yarn_project_pre_join
       - yarn-project-arm64: *defaults_yarn_project_pre_join
       - yarn-project-ecr-manifest:
@@ -599,7 +586,6 @@ workflows:
       # End to end tests.
       - e2e-join:
           requires:
-            - end-to-end
             - aztec-package
           <<: *defaults
 
@@ -613,4 +599,4 @@ workflows:
             - barretenberg-docs
             - e2e-join
             - cli-wallet
-          <<: *defaults
+          <<: *defaults
diff --git a/.github/img/bb_banner.png b/.github/img/bb_banner.png
diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml
@@ -81,8 +81,9 @@ jobs:
           concurrency_key: build-arm
       # prepare images locally, tagged by commit hash
       - name: "Build E2E Image"
-        timeout-minutes: 40
+        timeout-minutes: 60
         run: |
+          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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -305,24 +305,24 @@ jobs:
         run: earthly-ci --no-output +preset-gcc
 
   # barretenberg (prover) native, AVM (public VM) and Merkle tree (world state) tests
-  # only ran on x86 for resource reasons (memory intensive)
+  # ran on own runner for resource reasons (memory x cpu intensive)
   bb-native-tests:
-    needs: [build, changes]
-    runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
+    runs-on: ubuntu-20.04
+    needs: [build-images, changes]
     if: needs.changes.outputs.barretenberg-cpp == 'true'
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }
-      # Only allow one memory-hunger prover test to use this runner
       - uses: ./.github/ci-setup-action
-        with:
-          # must be globally unique for build x runner
-          concurrency_key: bb-native-tests-x86
       - name: "Native Prover Tests"
-        working-directory: ./barretenberg/cpp/
-        timeout-minutes: 40
-        # limit our parallelism to half our cores
-        run: earthly-ci --exec-stats --no-output +test --hardware_concurrency=64
+        uses: ./.github/ensure-tester
+        # note: tester by default times out at 30, would need to delay shutdwon for more
+        timeout-minutes: 30
+        with:
+          runner_type: 128core-tester-x86
+          run: |
+            echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
+            scripts/earthly-ci --exec-stats --no-output --no-cache ./barretenberg/cpp+test --hardware_concurrency=32
 
   bb-js-test:
     needs: [build, changes]
@@ -474,7 +474,7 @@ jobs:
         run: earthly-ci --no-output ./noir+packages-test
 
   noir-projects:
-    needs: [build, changes, build]
+    needs: [build, changes]
     runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
     if: needs.changes.outputs.barretenberg == 'true' || needs.changes.outputs.noir == 'true' || needs.changes.outputs.noir-projects == 'true' || needs.changes.outputs.txe == 'true'
     steps:
@@ -486,7 +486,7 @@ jobs:
       - name: "Noir Projects"
         timeout-minutes: 40
         run: |
-          earthly-ci --no-output ./noir-projects/+test
+          earthly-ci --no-output ./noir-projects/+test --RAYON_NUM_THREADS=$(nproc)
 
   avm-format:
     needs: [build, changes]
@@ -542,6 +542,19 @@ jobs:
         timeout-minutes: 40
         run: earthly-ci --no-output ./yarn-project/+prover-client-test
 
+  network-test-fake-proofs:
+    needs: build
+    runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
+    steps:
+      - uses: actions/checkout@v4
+        with: { ref: "${{ env.GIT_COMMIT }}" }
+      - uses: ./.github/ci-setup-action
+        with:
+          concurrency_key: network-test-fake-proofs-x86
+      - name: "Prover Client Tests"
+        timeout-minutes: 40
+        run: earthly-ci --no-output ./yarn-project/+network-test-fake-proofs
+
   l1-contracts-test:
     needs: [build, changes]
     runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
@@ -766,6 +779,7 @@ jobs:
       - yarn-project-formatting
       - yarn-project-test
       - prover-client-test
+      - network-test-fake-proofs
       - l1-contracts-test
       - docs-preview
       # - bb-bench # non-blocking
@@ -821,6 +835,7 @@ jobs:
       - yarn-project-formatting
       - yarn-project-test
       - prover-client-test
+      - network-test-fake-proofs
       - l1-contracts-test
       - docs-preview
       # - bb-bench # non-blocking

diff --git a/.github/workflows/devnet-deploys.yml b/.github/workflows/devnet-deploys.yml
@@ -617,12 +617,12 @@ jobs:
           env
           ./.github/scripts/wait_for_infra.sh pxe ${{ env.DEPLOY_TAG }} ${{ env.API_KEY }}
 
-      - name: Deploy protocol contracts
+      - name: Setup protocol contracts
         run: |
           set -e
           set -o pipefail
           docker pull aztecprotocol/aztec:${{ env.DEPLOY_TAG }}
-          docker run aztecprotocol/aztec:${{ env.DEPLOY_TAG }} deploy-protocol-contracts \
+          docker run aztecprotocol/aztec:${{ env.DEPLOY_TAG }} setup-protocol-contracts \
             --rpc-url https://api.aztec.network/${{ env.DEPLOY_TAG }}/aztec-pxe/${{ env.API_KEY }} \
             --l1-chain-id ${{ env.L1_CHAIN_ID }} \
             --json | tee ./protocol_contracts.json

diff --git a/.github/workflows/network-deploy.yml b/.github/workflows/network-deploy.yml
@@ -38,12 +38,12 @@ jobs:
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-east-2
+          aws-region: us-east-1
 
       # Step 3: Set up Kubernetes context for AWS EKS
       - name: Configure kubectl with EKS cluster
         run: |
-          aws eks update-kubeconfig --region us-east-2 --name spartan_cluster
+          aws eks update-kubeconfig --region us-east-1 --name spartan
 
       # Step 4: Install Helm
       - name: Install Helm
@@ -54,4 +54,4 @@ jobs:
       - name: Deploy Helm chart
         run: |
           helm dependency update ${{ env.CHART_PATH }}
-          helm upgrade --install ${{ env.NAMESPACE }} ${{ env.CHART_PATH }} --namespace ${{ env.NAMESPACE }} --atomic
+          helm upgrade --install ${{ env.NAMESPACE }} ${{ env.CHART_PATH }} --namespace ${{ env.NAMESPACE }} --set network.public=true --atomic --create-namespace --timeout 20m
diff --git a/.github/workflows/nightly-kind-test.yml b/.github/workflows/nightly-kind-test.yml
@@ -75,7 +75,7 @@ jobs:
             ./spartan/scripts/setup_local_k8s.sh
             export FORCE_COLOR=1
             export EARTHLY_BUILD_ARGS="${{ env.EARTHLY_BUILD_ARGS }}"
-            ./scripts/earthly-ci --exec-stats -P --no-output ./yarn-project/end-to-end/+network-transfer --values-file=${{ matrix.values_file }}
+            ./scripts/earthly-ci --exec-stats -P --no-output ./yarn-project/end-to-end/+kind-network-transfer --values-file=${{ matrix.values_file }}
 
   success-check:
     runs-on: ubuntu-20.04