merge

AztecProtocol · Jan 24, 2025 · 48ff479 · 48ff479
2 parents 0c484a3 + 644570b
commit 48ff479
Show file tree

Hide file tree

Showing 685 changed files with 19,729 additions and 8,200 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -373,15 +373,22 @@ jobs:
         uses: ./.github/ensure-tester
         with:
           username: ${{ needs.configure.outputs.username }}
-          runner_type: 8core-tester-x86
+          runner_type: 16core-tester-x86
           ttl: 60
           run: |
             until docker info &>/dev/null; do sleep 1; done
             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
-            NAMESPACE=smoke FRESH_INSTALL=true VALUES_FILE=ci-smoke.yaml ./scripts/network_test.sh ./src/spartan/smoke.test.ts
+
+            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
       - name: Copy Network Logs
         if: always()
         run: scripts/copy_from_tester yarn-project/end-to-end/scripts/network-test.log network-test.log || true
@@ -494,25 +501,26 @@ jobs:
           alert-comment-cc-users: "@ludamad @codygunton"
           max-items-in-chart: 50
 
-  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
+  # 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
 
-      - 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]
@@ -644,7 +652,7 @@ jobs:
       - bb-native-tests
       - kind-network-smoke
       - kind-network-test
-      - boxes-test
+      # - boxes-test
       # - testnet-installer
     if: always()
     outputs:

diff --git a/.github/workflows/devnet-deploy.yml b/.github/workflows/devnet-deploy.yml
@@ -26,6 +26,11 @@ on:
         description: Whether to deploy to Sepolia
         required: false
         default: "false"
+      ref:
+        description: The branch name to deploy from
+        required: false
+        type: string
+        default: "master"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -52,6 +57,8 @@ jobs:
       respect_tf_lock: ${{ github.event.inputs.respect_tf_lock }}
       run_terraform_destroy: "true"
       sepolia_deployment: ${{ github.event.inputs.sepolia_deployment }}
+      ref: ${{ github.event.inputs.ref }}
+
     secrets:
       GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
 
@@ -111,7 +118,7 @@ jobs:
 
           PXE_PORT="$(jq -r .pxe.service.nodePort helm_values.json)"
           FAUCET_PORT="$(jq -r .faucet.apiServerPort helm_values.json)"
-          ETHEREUM_PORT="$(jq -r .ethereum.service.port helm_values.json)"
+          ETHEREUM_PORT="$(jq -r .ethereum.execution.service.port helm_values.json)"
           L1_CHAIN_ID="$(jq -r .ethereum.chainId helm_values.json)"
 
           MNEMONIC="$(jq -r .aztec.l1DeploymentMnemonic helm_values.json)"

diff --git a/.github/workflows/network-deploy.yml b/.github/workflows/network-deploy.yml
@@ -146,6 +146,18 @@ jobs:
           echo "::add-mask::$(gcloud secrets versions access latest --secret=${{ env.DEPLOYMENT_MNEMONIC_SECRET_NAME }})"
           echo "mnemonic=$(gcloud secrets versions access latest --secret=${{ env.DEPLOYMENT_MNEMONIC_SECRET_NAME }})" >> "$GITHUB_OUTPUT"
 
+      - name: Generate eth devnet config
+        id: generate-eth-devnet-config
+        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
+
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v2
         with:
@@ -156,7 +168,7 @@ jobs:
         run: |
           terraform init \
             -backend-config="bucket=${{ env.TF_STATE_BUCKET }}" \
-            -backend-config="prefix=network-deploy/${{ env.REGION }}/${{ env.CLUSTER_NAME }}/${{ env.NAMESPACE }}/terraform.tfstate" \
+            -backend-config="prefix=network-deploy/${{ env.REGION }}/${{ env.CLUSTER_NAME }}/${{ env.NAMESPACE }}/terraform.tfstate"
 
       - name: Terraform Destroy
         working-directory: ./spartan/terraform/deploy-release
@@ -171,9 +183,9 @@ jobs:
               -var="GKE_CLUSTER_CONTEXT=${{ env.GKE_CLUSTER_CONTEXT }}" \
               -var="AZTEC_DOCKER_IMAGE=${{ env.AZTEC_DOCKER_IMAGE }}" \
               -var="L1_DEPLOYMENT_PRIVATE_KEY=${{ secrets.SEPOLIA_L1_DEPLOYMENT_PRIVATE_KEY }}" \
-              -var="VALIDATOR_KEYS=${{ secrets.VALIDATOR_KEYS }}" \
-              -var="BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY=${{ secrets.BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY }}" \
-              -var="PROVER_PUBLISHER_PRIVATE_KEY=${{ secrets.PROVER_PUBLISHER_PRIVATE_KEY }}" \
+              -var="VALIDATOR_KEYS=${{ secrets.SEPOLIA_VALIDATOR_KEYS }}" \
+              -var="BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY=${{ secrets.SEPOLIA_BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY }}" \
+              -var="PROVER_PUBLISHER_PRIVATE_KEY=${{ secrets.SEPOLIA_PROVER_PUBLISHER_PRIVATE_KEY }}" \
               -var="ETHEREUM_EXTERNAL_HOST=${{ secrets.SEPOLIA_EXTERNAL_HOST }}" \
             -lock=${{ inputs.respect_tf_lock }}
           else
@@ -182,8 +194,8 @@ jobs:
               -var="VALUES_FILE=${{ env.VALUES_FILE }}" \
               -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 }}"
-            -lock=${{ inputs.respect_tf_lock }}
+              -var="L1_DEPLOYMENT_MNEMONIC=${{ steps.get-mnemonic.outputs.mnemonic }}" \
+              -lock=${{ inputs.respect_tf_lock }}
           fi
 
       - name: Terraform Plan
@@ -197,9 +209,9 @@ jobs:
               -var="AZTEC_DOCKER_IMAGE=${{ env.AZTEC_DOCKER_IMAGE }}" \
               -var="L1_DEPLOYMENT_PRIVATE_KEY=${{ secrets.SEPOLIA_L1_DEPLOYMENT_PRIVATE_KEY }}" \
               -var="L1_DEPLOYMENT_SALT=${DEPLOYMENT_SALT:-$RANDOM}" \
-              -var="VALIDATOR_KEYS=${{ secrets.VALIDATOR_KEYS }}" \
-              -var="BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY=${{ secrets.BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY }}" \
-              -var="PROVER_PUBLISHER_PRIVATE_KEY=${{ secrets.PROVER_PUBLISHER_PRIVATE_KEY }}" \
+              -var="VALIDATOR_KEYS=${{ secrets.SEPOLIA_VALIDATOR_KEYS }}" \
+              -var="BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY=${{ secrets.SEPOLIA_BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY }}" \
+              -var="PROVER_PUBLISHER_PRIVATE_KEY=${{ secrets.SEPOLIA_PROVER_PUBLISHER_PRIVATE_KEY }}" \
               -var="ETHEREUM_EXTERNAL_HOST=${{ secrets.SEPOLIA_EXTERNAL_HOST }}" \
               -out=tfplan \
               -lock=${{ inputs.respect_tf_lock }}

diff --git a/.github/workflows/publish-aztec-packages.yml b/.github/workflows/publish-aztec-packages.yml
@@ -39,6 +39,8 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       username: ${{ steps.compute_username.outputs.username }}
+      version: ${{ steps.set_version.outputs.version }}
+      dist_tag: ${{ steps.set_version.outputs.dist_tag }}
     steps:
       - name: Compute Username
         id: compute_username
@@ -58,6 +60,25 @@ jobs:
             echo "username=master-${GIT_HASH_MODULO_8}"
             echo "username=master-${GIT_HASH_MODULO_8}" >> $GITHUB_OUTPUT
           fi
+      - name: Set version and tags
+        id: set_version
+        run: |
+          if [[ "${{ github.ref_name }}" =~ ^release/ ]]; then
+            echo "dist_tag=devnet" >> $GITHUB_OUTPUT
+            TAG="${{ github.ref_name }}"
+            VERSION="${TAG#release/}"
+            if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+              VERSION=${DEPLOY_TAG#aztec-packages-v}-devnet
+            fi
+          elif [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            echo "dist_tag=latest" >> $GITHUB_OUTPUT
+            TAG=${{ env.DEPLOY_TAG }}
+            VERSION=${TAG#aztec-packages-v}
+          else
+            echo "dist_tag=$(echo "${{ github.ref_name }}" | sed 's/\//-/g')" >> $GITHUB_OUTPUT
+            VERSION=""
+          fi
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
       - name: Check if tag is valid
         id: check_tag
         if: github.event_name == 'workflow_dispatch'
@@ -101,10 +122,17 @@ jobs:
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
       - name: Build & Push Aztec and End-to-End x86_64
         timeout-minutes: 40
+        env:
+          VERSION: ${{ needs.configure.outputs.version }}
         run: |
-          ./bootstrap.sh image-aztec
+          if [ -n "$VERSION" ]; then
+            ./bootstrap.sh image-aztec --version $VERSION
+          else
+            ./bootstrap.sh image-aztec
+          fi
           docker tag aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/aztec:${{ env.GIT_COMMIT }}-x86_64
           docker push aztecprotocol/aztec:${{ env.GIT_COMMIT }}-x86_64
+
   build-aztec-arm:
     needs: [configure, setup-arm]
     runs-on: ${{ needs.configure.outputs.username }}-arm
@@ -118,11 +146,18 @@ jobs:
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
       - name: Build & Push Aztec arm64
         timeout-minutes: 80
+        env:
+          VERSION: ${{ needs.configure.outputs.version }}
         run: |
           sudo shutdown -P 80
-          ./bootstrap.sh image-aztec --check-arch
+          if [ -n "$VERSION" ]; then
+            ./bootstrap.sh image-aztec --check-arch --version $VERSION
+          else
+            ./bootstrap.sh image-aztec --check-arch
+          fi
           docker tag aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/aztec:${{ env.GIT_COMMIT }}-arm64
           docker push aztecprotocol/aztec:${{ env.GIT_COMMIT }}-arm64
+
   build-nargo-x86:
     needs: [configure, build-aztec-x86]
     runs-on: ${{ needs.configure.outputs.username }}-x86
@@ -202,20 +237,10 @@ jobs:
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
       - name: Publish aztec manifests
         if: ${{ env.SHOULD_PUBLISH_DOCKER_IMAGES == 'true' }}
+        env:
+          VERSION: ${{ needs.configure.outputs.version }}
+          DIST_TAG: ${{ needs.configure.outputs.dist_tag }}
         run: |
-          if [[ "${{ github.ref_name }}" =~ ^release/ ]]; then
-            TAG="${{ github.ref_name }}"
-            VERSION="${TAG#release/}"
-            DIST_TAG=devnet
-          elif [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
-            TAG=${{ env.DEPLOY_TAG }}
-            VERSION=${TAG#aztec-packages-v}
-            DIST_TAG=latest
-          else
-            VERSION=""
-            DIST_TAG=$(echo "${{ github.ref_name }}" | sed 's/\//-/g')
-          fi
-
           docker pull aztecprotocol/aztec:${{ env.GIT_COMMIT }}-x86_64
           docker pull aztecprotocol/aztec:${{ env.GIT_COMMIT }}-arm64
           docker pull aztecprotocol/aztec-nargo:${{ env.GIT_COMMIT }}-x86_64
@@ -271,29 +296,17 @@ jobs:
           concurrency_key: publish-npm
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
 
-      - name: Set tags and versions
-        id: version_step
-        run: |
-          if [[ "${{ github.ref_name }}" =~ ^release/ ]]; then
-            DIST_TAG=devnet
-            TAG=${{ env.DEPLOY_TAG }}
-            VERSION=${TAG#aztec-packages-v}-devnet
-          else
-            DIST_TAG=latest
-            TAG=${{ env.DEPLOY_TAG }}
-            VERSION=${TAG#aztec-packages-v}
-          fi
-          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
-          echo "DIST_TAG=$DIST_TAG" >> $GITHUB_OUTPUT
-
       - name: Publish bb.js NPM package
+        env:
+          VERSION: ${{ needs.configure.outputs.version }}
+          DIST_TAG: ${{ needs.configure.outputs.dist_tag }}
         run: |
           earthly-ci \
             --no-output \
             --secret NPM_TOKEN=${{ env.NPM_TOKEN }} \
             ./barretenberg/ts+publish-npm \
-            --DIST_TAG=${{ steps.version_step.outputs.DIST_TAG }} \
-            --VERSION=${{ steps.version_step.outputs.VERSION }} \
+            --DIST_TAG=$DIST_TAG \
+            --VERSION=$VERSION \
             --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }}
 
       - name: Publish yarn-project NPM packages

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,7 +1,7 @@
 {
-  ".": "0.71.0",
+  ".": "0.72.0",
   "yarn-project/cli": "0.35.1",
-  "yarn-project/aztec": "0.71.0",
-  "barretenberg": "0.71.0",
-  "barretenberg/ts": "0.71.0"
+  "yarn-project/aztec": "0.72.0",
+  "barretenberg": "0.72.0",
+  "barretenberg/ts": "0.72.0"
 }
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz