Merge branch 'master' into md/peer-manager-improvements

AztecProtocol · Dec 20, 2024 · 35e0a91 · 35e0a91
2 parents 8269106 + 9ed43bc
commit 35e0a91
Show file tree

Hide file tree

Showing 201 changed files with 5,274 additions and 3,211 deletions.
diff --git a/.github/workflows/bb-sanitizers.yml b/.github/workflows/bb-sanitizers.yml
@@ -2,10 +2,10 @@
 # Unlike most jobs uses free 4 core github runners of which we have lots of capacity (of total 1000 concurrency).
 name: BB MSAN
 on:
-  push:
-    branches:
-      - master
-      - "*/bb-sanitizers*"
+#   push:
+#     branches:
+#       - master
+#       - "*/bb-sanitizers*"
   workflow_dispatch:
     inputs:
       branch:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -447,6 +447,7 @@ jobs:
       - name: Copy Network Logs
         if: always()
         run: scripts/copy_from_tester yarn-project/end-to-end/scripts/network-test.log network-test.log || true
+
       - name: Upload Network Logs
         if: always()
         uses: actions/upload-artifact@v4
@@ -490,6 +491,7 @@ jobs:
         run: scripts/copy_from_tester barretenberg/cpp/bench.json bench.json || true
       - name: Store benchmark result
         if: github.ref == 'refs/heads/master'
+        continue-on-error: true
         uses: benchmark-action/github-action-benchmark@4de1bed97a47495fc4c5404952da0499e31f5c29
         with:
           name: C++ Benchmark

diff --git a/.github/workflows/devnet-deploy.yml b/.github/workflows/devnet-deploy.yml
@@ -22,6 +22,11 @@ on:
         description: Whether to respect the Terraform lock
         required: false
         default: "true"
+      sepolia_deployment:
+        description: "Whether to deploy on Sepolia network (default: false)"
+        required: false
+        type: boolean
+        default: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -46,6 +51,7 @@ jobs:
       deployment_mnemonic_secret_name: ${{ github.event.inputs.deployment_mnemonic_secret_name }}
       deployment_salt: ${{ github.event.inputs.deployment_salt }}
       respect_tf_lock: ${{ github.event.inputs.respect_tf_lock }}
+      sepolia_deployment: ${{ github.event.inputs.sepolia_deployment }}
     secrets:
       GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
 
@@ -127,11 +133,20 @@ jobs:
           # wait for port-forwards to establish
           sleep 5
 
-          docker run --rm --network host $AZTEC_DOCKER_IMAGE bootstrap-network \
-            --rpc-url http://127.0.0.1:$PXE_PORT \
-            --l1-rpc-url http://127.0.0.1:$ETHEREUM_PORT \
-            --l1-chain-id "$L1_CHAIN_ID" \
-            --mnemonic "$MNEMONIC" \
-            --json | tee ./basic_contracts.json
+          if ${{ inputs.sepolia_deployment }}; then
+            docker run --rm --network host $AZTEC_DOCKER_IMAGE bootstrap-network \
+              --rpc-url http://127.0.0.1:$PXE_PORT \
+              --l1-rpc-url ${{ secrets.SEPOLIA_EXTERNAL_HOST }} \
+              --l1-chain-id "$L1_CHAIN_ID" \
+              --l1-private-key ${{ secrets.SEPOLIA_L1_DEPLOYMENT_PRIVATE_KEY }} \
+              --json | tee ./basic_contracts.json
+          else
+            docker run --rm --network host $AZTEC_DOCKER_IMAGE bootstrap-network \
+              --rpc-url http://127.0.0.1:$PXE_PORT \
+              --l1-rpc-url http://127.0.0.1:$ETHEREUM_PORT \
+              --l1-chain-id "$L1_CHAIN_ID" \
+              --mnemonic "$MNEMONIC" \
+              --json | tee ./basic_contracts.json
+          fi
 
           aws s3 cp ./basic_contracts.json ${{ env.CONTRACT_S3_BUCKET }}/devnet/basic_contracts.json
diff --git a/.github/workflows/network-deploy.yml b/.github/workflows/network-deploy.yml
@@ -17,7 +17,7 @@ on:
         type: string
       deployment_mnemonic_secret_name:
         description: The name of the secret which holds the boot node's contract deployment mnemonic
-        required: true
+        required: false
         type: string
         default: testnet-deployment-mnemonic
       deployment_salt:
@@ -40,6 +40,11 @@ on:
         required: false
         type: string
         default: "master"
+      sepolia_deployment:
+        description: "Whether to deploy on Sepolia network (default: false)"
+        required: false
+        type: boolean
+        default: false
     secrets:
       GCP_SA_KEY:
         required: true
@@ -56,7 +61,7 @@ on:
         required: true
       deployment_mnemonic_secret_name:
         description: The name of the secret which holds the boot node's contract deployment mnemonic
-        required: true
+        required: false
         default: testnet-deployment-mnemonic
       deployment_salt:
         description: The salt to use for this deployment. Defaults to random
@@ -76,6 +81,11 @@ on:
         required: false
         type: string
         default: "master"
+      sepolia_deployment:
+        description: "Whether to deploy on Sepolia network (default: false)"
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   network_deployment:
@@ -154,26 +164,56 @@ jobs:
         # Destroy fails if the resources are already destroyed, so we continue on error
         continue-on-error: true
         run: |
-          terraform destroy -auto-approve \
-            -var="RELEASE_NAME=${{ env.NAMESPACE }}" \
-            -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 }}"
+          if ${{ inputs.sepolia_deployment }}; then
+            terraform destroy -auto-approve \
+              -var="RELEASE_NAME=${{ env.NAMESPACE }}" \
+              -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_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="ETHEREUM_EXTERNAL_HOST=${{ secrets.SEPOLIA_EXTERNAL_HOST }}" \
             -lock=${{ inputs.respect_tf_lock }}
+          else
+            terraform destroy -auto-approve \
+              -var="RELEASE_NAME=${{ env.NAMESPACE }}" \
+              -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 }}
+          fi
 
       - name: Terraform Plan
         working-directory: ./spartan/terraform/deploy-release
         run: |
-          terraform plan \
-            -var="RELEASE_NAME=${{ env.NAMESPACE }}" \
-            -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 }}" \
-            -var="L1_DEPLOYMENT_SALT=${DEPLOYMENT_SALT:-$RANDOM}" \
-            -out=tfplan \
-            -lock=${{ inputs.respect_tf_lock }}
+          if ${{ inputs.sepolia_deployment }}; then
+            terraform plan \
+              -var="RELEASE_NAME=${{ env.NAMESPACE }}" \
+              -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_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="ETHEREUM_EXTERNAL_HOST=${{ secrets.SEPOLIA_EXTERNAL_HOST }}" \
+              -out=tfplan \
+              -lock=${{ inputs.respect_tf_lock }}
+          else
+            terraform plan \
+              -var="RELEASE_NAME=${{ env.NAMESPACE }}" \
+              -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 }}" \
+              -var="L1_DEPLOYMENT_SALT=${DEPLOYMENT_SALT:-$RANDOM}" \
+              -out=tfplan \
+              -lock=${{ inputs.respect_tf_lock }}
+          fi
 
       - name: Terraform Apply
         working-directory: ./spartan/terraform/deploy-release

diff --git a/.github/workflows/vm_full_tests.yml b/.github/workflows/vm_full_tests.yml
@@ -33,6 +33,7 @@ jobs:
         uses: ./.github/ensure-tester
         timeout-minutes: 75
         with:
+          ttl: 75
+          runner_type: 128core-tester-x86
           run: |
-            sudo shutdown -P 75 # hack until core part of the scripts
             scripts/earthly-ci --no-output ./barretenberg/cpp/+vm-full-test --hardware_concurrency=64  # limit our parallelism to half our cores
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,7 +1,7 @@
 {
-  ".": "0.67.1",
+  ".": "0.68.0",
   "yarn-project/cli": "0.35.1",
-  "yarn-project/aztec": "0.67.1",
-  "barretenberg": "0.67.1",
-  "barretenberg/ts": "0.67.1"
+  "yarn-project/aztec": "0.68.0",
+  "barretenberg": "0.68.0",
+  "barretenberg/ts": "0.68.0"
 }