Merge branch 'master' into lde/structured_commit

AztecProtocol · Oct 9, 2024 · 6b7c824 · 6b7c824
2 parents fedbdbb + 52c3485
commit 6b7c824
Show file tree

Hide file tree

Showing 1,050 changed files with 47,591 additions and 18,396 deletions.
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]

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
diff --git a/.github/workflows/publish-aztec-packages.yml b/.github/workflows/publish-aztec-packages.yml
@@ -32,7 +32,9 @@ jobs:
         run: |
           TAG=${{ github.event.inputs.tag }}
           if [[ "$TAG" == aztec-packages-v* ]]; then
-            echo "Tag is valid. Proceeding with setup."
+            DEPLOY_TAG=${{ env.DEPLOY_TAG }}
+            VERSION=${DEPLOY_TAG#aztec-packages-v}
+            echo "Tag is valid. Proceeding with publishing v$VERSION."
           else
             echo "Invalid tag format. Expected aztec-packages-v*"
             exit 1
@@ -181,7 +183,8 @@ jobs:
       - name: Publish aztec manifests
         if: ${{ github.event.inputs.publish == 'true' }}
         run: |
-          VERSION=${${{ env.DEPLOY_TAG }}#aztec-packages-v}
+          DEPLOY_TAG=${{ env.DEPLOY_TAG }}
+          VERSION=${DEPLOY_TAG#aztec-packages-v}
 
           docker pull aztecprotocol/aztec:${{ env.GIT_COMMIT }}-x86_64
           docker pull aztecprotocol/aztec:${{ env.GIT_COMMIT }}-arm64
@@ -233,22 +236,24 @@ jobs:
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
       - name: Publish yarn-project NPM packages
         run: |
-          VERSION=${${{ env.DEPLOY_TAG }}#aztec-packages-v}
+          DEPLOY_TAG=${{ env.DEPLOY_TAG }}
+          VERSION=${DEPLOY_TAG#aztec-packages-v}
           earthly-ci \
             --no-output \
             --secret NPM_TOKEN=${{ env.NPM_TOKEN }} \
             ./yarn-project+publish-npm \
             --DIST_TAG=latest \
-            --VERSION=$VERSION
+            --VERSION=$VERSION \
             --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }}
 
       - name: Publish bb.js NPM package
         run: |
-          VERSION=${${{ env.DEPLOY_TAG }}#aztec-packages-v}
+          DEPLOY_TAG=${{ env.DEPLOY_TAG }}
+          VERSION=${DEPLOY_TAG#aztec-packages-v}
           earthly-ci \
             --no-output \
             --secret NPM_TOKEN=${{ env.NPM_TOKEN }} \
             ./barretenberg/ts+publish-npm \
             --DIST_TAG=latest \
-            --VERSION=$VERSION
+            --VERSION=$VERSION \
             --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }}
diff --git a/.gitignore b/.gitignore
@@ -26,4 +26,7 @@ terraform.tfstate*
 .bb_tmp
 
 # Terraform
-*.tfvars
+*.tfvars
+
+# tmux
+tmux-client-*.log
diff --git a/.noir-sync-commit b/.noir-sync-commit
@@ -1 +1 @@
-be9dcfe56d808b1bd5ef552d41274705b2df7062
+c4273a0c8f8b751a3dbe097e070e4e7b2c8ec438
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,7 +1,7 @@
 {
-  ".": "0.56.0",
+  ".": "0.57.0",
   "yarn-project/cli": "0.35.1",
-  "yarn-project/aztec": "0.56.0",
-  "barretenberg": "0.56.0",
-  "barretenberg/ts": "0.56.0"
+  "yarn-project/aztec": "0.57.0",
+  "barretenberg": "0.57.0",
+  "barretenberg/ts": "0.57.0"
 }