Merge branch 'master' into zpedro/boxes_readme

AztecProtocol · Sep 3, 2024 · ca2a0bb · ca2a0bb
2 parents 7a73dbc + e8a097c
commit ca2a0bb
Show file tree

Hide file tree

Showing 580 changed files with 18,272 additions and 12,432 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -430,6 +430,11 @@ jobs:
           command: |
             should_release || exit 0
             yarn-project/deploy_npm.sh canary
+      - run:
+          name: "Release canary to NPM: l1-contracts"
+          command: |
+            should_release || exit 0
+            deploy_npm l1-contracts canary
       - run:
           name: "Release latest to NPM: bb.js"
           command: |
@@ -440,6 +445,11 @@ jobs:
           command: |
             should_release || exit 0
             yarn-project/deploy_npm.sh latest
+      - run:
+          name: "Release latest to NPM: l1-contracts"
+          command: |
+            should_release || exit 0
+            deploy_npm l1-contracts latest
       - run:
           name: "Update aztec-up"
           command: |

diff --git a/.github/ensure-tester/action.yml b/.github/ensure-tester/action.yml
@@ -68,6 +68,10 @@ runs:
         ec2_key_name: "build-instance"
         ec2_instance_tags: "[]"
 
+    - name: Print Startup Log
+      shell: bash
+      run: cat /run/log.out || true # don't fail
+
     # Set up a context for this run
     - name: Copy Repo to Tester
       shell: bash

diff --git a/.github/spot-runner-action/dist/index.js b/.github/spot-runner-action/dist/index.js
@@ -1040,7 +1040,8 @@ class UserData {
                 `sudo service docker restart`,
                 "sudo wget -q https://github.com/earthly/earthly/releases/download/v0.8.10/earthly-linux-$(dpkg --print-architecture) -O /usr/local/bin/earthly",
                 "sudo chmod +x /usr/local/bin/earthly",
-                "for i in {1..3} ; do sudo apt install -y brotli && break; sleep 10; done",
+                `sudo bash -c 'echo \'Acquire::Retries "3"; Acquire::https::Timeout "240"; Acquire::http::Timeout "240"; APT::Get::Assume-Yes "true"; APT::Install-Recommends "false"; APT::Install-Suggests "false";\' > /etc/apt/apt.conf.d/99-aztec-build'`,
+                "sudo apt install -y brotli",
                 'echo "MaxStartups 1000" >> /etc/ssh/sshd_config',
                 'echo "ClientAliveInterval=30" >> /etc/ssh/sshd_config',
                 'echo "ClientAliveCountMax=20" >> /etc/ssh/sshd_config',

diff --git a/.github/spot-runner-action/src/userdata.ts b/.github/spot-runner-action/src/userdata.ts
@@ -22,7 +22,8 @@ export class UserData {
       `sudo service docker restart`,
       "sudo wget -q https://github.com/earthly/earthly/releases/download/v0.8.10/earthly-linux-$(dpkg --print-architecture) -O /usr/local/bin/earthly",
       "sudo chmod +x /usr/local/bin/earthly",
-      "for i in {1..3} ; do sudo apt install -y brotli && break; sleep 10; done",
+      `sudo bash -c 'echo \'Acquire::Retries "3"; Acquire::https::Timeout "240"; Acquire::http::Timeout "240"; APT::Get::Assume-Yes "true"; APT::Install-Recommends "false"; APT::Install-Suggests "false";\' > /etc/apt/apt.conf.d/99-aztec-build'`,
+      "sudo apt install -y brotli",
       'echo "MaxStartups 1000" >> /etc/ssh/sshd_config',
       'echo "ClientAliveInterval=30" >> /etc/ssh/sshd_config',
       'echo "ClientAliveCountMax=20" >> /etc/ssh/sshd_config',
@@ -35,4 +36,4 @@ export class UserData {
     );
     return Buffer.from(cmds.join("\n")).toString("base64");
   }
-}
+}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 name: CI
 on:
   push:
-    branches: [master]
+    branches: [master, provernet]
   pull_request:
     branches-ignore: [devnet]
   workflow_dispatch:
@@ -161,11 +161,13 @@ jobs:
             export FORCE_COLOR=1
             ../../scripts/earthly-ci -P --no-output +${{ matrix.test }}
 
-  # all the network end-to-end tests for aztec (not required to merge)
   network-e2e:
     needs: [build, changes]
     if: ${{ needs.changes.outputs.non-barretenberg-cpp == 'true' }}
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        values_file: ["default.yaml", "3-validators.yaml"]
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }
@@ -188,7 +190,7 @@ jobs:
             ./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 ./+network-transfer
+            ../../scripts/earthly-ci --exec-stats -P --no-output ./+network-transfer --values-file=${{ matrix.values_file }}
 
   # all the benchmarking end-to-end integration tests for aztec (not required to merge)
   bench-e2e:
@@ -472,6 +474,7 @@ jobs:
         with:
           concurrency_key: noir-packages-x86
       - name: "Test Noir JS packages"
+        timeout-minutes: 50
         run: earthly-ci --no-output ./noir+packages-test
 
   noir-projects:

diff --git a/.github/workflows/devnet-deploys.yml b/.github/workflows/devnet-deploys.yml
@@ -33,6 +33,7 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   API_KEY: ${{ secrets.DEVNET_API_KEY }}
+  PUBLIC_API_KEY: ${{ secrets.DEVNET_API_KEY }}
   FORK_MNEMONIC: ${{ secrets.FORK_MNEMONIC }}
   CONTRACT_PUBLISHER_PRIVATE_KEY: ${{ secrets.CONTRACT_PUBLISHER_PRIVATE_KEY }}
   CONTRACT_S3_BUCKET: s3://static.aztec.network
@@ -64,6 +65,7 @@ env:
   # Anvil
   TF_VAR_FORK_MNEMONIC: ${{ secrets.FORK_MNEMONIC }}
   TF_VAR_INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
+  TF_VAR_PUBLIC_API_KEY: ${{ secrets.DEVNET_API_KEY }}
 
   # Faucet
   TF_VAR_FAUCET_ACCOUNT_INDEX: 9
@@ -105,6 +107,7 @@ jobs:
       deploy_tag: ${{ steps.set_network_vars.outputs.deploy_tag }}
       branch_name: ${{ steps.set_network_vars.outputs.branch_name }}
       network_api_key: ${{ steps.set_network_vars.outputs.network_api_key }}
+      network_public_api_key: ${{ steps.set_network_vars.outputs.network_public_api_key }}
       agents_per_prover: ${{ steps.set_network_vars.outputs.agents_per_prover }}
       bot_interval: ${{ steps.set_network_vars.outputs.bot_interval }}
       node_tcp_range_start: ${{ steps.set_network_vars.outputs.node_tcp_range_start }}
@@ -131,6 +134,7 @@ jobs:
               echo "deploy_tag=devnet" >> $GITHUB_OUTPUT
               echo "branch_name=devnet" >> $GITHUB_OUTPUT
               echo "network_api_key=DEVNET_API_KEY" >> $GITHUB_OUTPUT
+              echo "network_public_api_key=DEVNET_API_KEY" >> $GITHUB_OUTPUT
               echo "agents_per_prover=4" >> $GITHUB_OUTPUT
               echo "bot_interval=180" >> $GITHUB_OUTPUT
               echo "node_tcp_range_start=40100" >> $GITHUB_OUTPUT
@@ -151,8 +155,9 @@ jobs:
               echo "deploy_tag=provernet" >> $GITHUB_OUTPUT
               echo "branch_name=provernet" >> $GITHUB_OUTPUT
               echo "network_api_key=PROVERNET_API_KEY" >> $GITHUB_OUTPUT
-              echo "agents_per_prover=4" >> $GITHUB_OUTPUT
-              echo "bot_interval=300" >> $GITHUB_OUTPUT
+              echo "network_public_api_key=PROVERNET_PUBLIC_API_KEY" >> $GITHUB_OUTPUT
+              echo "agents_per_prover=8" >> $GITHUB_OUTPUT
+              echo "bot_interval=10" >> $GITHUB_OUTPUT
               echo "node_tcp_range_start=40200" >> $GITHUB_OUTPUT
               echo "node_udp_range_start=45200" >> $GITHUB_OUTPUT
               echo "prover_node_tcp_range_start=41200" >> $GITHUB_OUTPUT
@@ -165,12 +170,13 @@ jobs:
               echo "max_txs_per_block=4" >> $GITHUB_OUTPUT
               echo "bot_follow_chain=NONE" >> $GITHUB_OUTPUT
               echo "bot_flush_setup_txs=true" >> $GITHUB_OUTPUT
-              echo "bot_max_pending_txs=20" >> $GITHUB_OUTPUT
+              echo "bot_max_pending_txs=32" >> $GITHUB_OUTPUT
           elif [ "$BRANCH_NAME" = "alphanet" ]
           then
               echo "deploy_tag=alphanet" >> $GITHUB_OUTPUT
               echo "branch_name=alphanet" >> $GITHUB_OUTPUT
               echo "network_api_key=ALPHANET_API_KEY" >> $GITHUB_OUTPUT
+              echo "network_public_api_key=ALPHANET_API_KEY" >> $GITHUB_OUTPUT
               echo "agents_per_prover=1" >> $GITHUB_OUTPUT
               echo "bot_interval=30" >> $GITHUB_OUTPUT
               echo "node_tcp_range_start=40000" >> $GITHUB_OUTPUT
@@ -200,6 +206,8 @@ jobs:
       TF_VAR_DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }}
       API_KEY: ${{ secrets[needs.set-network.outputs.network_api_key] }}
       TF_VAR_API_KEY: ${{ secrets[needs.set-network.outputs.network_api_key] }}
+      PUBLIC_API_KEY: ${{ secrets[needs.set-network.outputs.network_public_api_key] }}
+      TF_VAR_PUBLIC_API_KEY: ${{ secrets[needs.set-network.outputs.network_public_api_key] }}
       API_KEY_NAME: ${{ needs.set-network.outputs.network_api_key }}
     runs-on: ${{ github.actor }}-x86
     steps:
@@ -443,6 +451,8 @@ jobs:
       TF_VAR_DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }}
       API_KEY: ${{ secrets[needs.set-network.outputs.network_api_key] }}
       TF_VAR_API_KEY: ${{ secrets[needs.set-network.outputs.network_api_key] }}
+      PUBLIC_API_KEY: ${{ secrets[needs.set-network.outputs.network_public_api_key] }}
+      TF_VAR_PUBLIC_API_KEY: ${{ secrets[needs.set-network.outputs.network_public_api_key] }}
       TF_VAR_AGENTS_PER_PROVER: ${{ needs.set-network.outputs.agents_per_prover }}
       TF_VAR_BOT_TX_INTERVAL_SECONDS: ${{ needs.set-network.outputs.bot_interval }}
       TF_VAR_NODE_LB_RULE_PRIORITY: ${{ needs.set-network.outputs.node_lb_priority_range_start }}

diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml
@@ -204,6 +204,7 @@ jobs:
   build-check:
     name: Check builds are successful
     needs: [build-x86_64-linux-gnu, build-mac-intel, build-mac-m1,build-wasm-ts]
+    if: ${{ always() }}
     runs-on: ubuntu-latest
     steps:
       - name: Report overall success

diff --git a/.github/workflows/sepolia-test.yml b/.github/workflows/sepolia-test.yml
@@ -60,4 +60,34 @@ jobs:
           --ETHEREUM_HOST="https://sepolia.infura.io/v3/${{ secrets.SEPOLIA_API_KEY }}" \
           --L1_CHAIN_ID="11155111"
 
+  success-check:
+    runs-on: ubuntu-20.04
+    needs:
+      - build-and-test
+    if: always()
+    steps:
+      - name: Report overall success
+        env:
+          # We treat any skipped or failing jobs as a failure for the workflow as a whole.
+          FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
+        run: |
+          if [[ $FAIL == true ]]; then
+              echo "Test failed."
+              exit 1
+          fi
 
+  notify:
+    needs:
+      - success-check
+    runs-on: ubuntu-20.04
+    if: ${{ github.ref == 'refs/heads/master' && failure() }}
+    steps:
+      - name: Send notification to aztec3-ci channel if workflow failed on master
+        uses: slackapi/[email protected]
+        with:
+          payload: |
+            {
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WORKFLOW_TRIGGER_URL }}
diff --git a/.noir-sync-commit b/.noir-sync-commit
@@ -1 +1 @@
-86c151aa43ba990a0e900995064a88fc2ae6637d
+f0c268606a71381ab4504396695a0adb9b3258b6
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,7 +1,7 @@
 {
-  ".": "0.51.0",
+  ".": "0.52.0",
   "yarn-project/cli": "0.35.1",
-  "yarn-project/aztec": "0.51.0",
-  "barretenberg": "0.51.0",
-  "barretenberg/ts": "0.51.0"
+  "yarn-project/aztec": "0.52.0",
+  "barretenberg": "0.52.0",
+  "barretenberg/ts": "0.52.0"
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		86c151aa43ba990a0e900995064a88fc2ae6637d
		f0c268606a71381ab4504396695a0adb9b3258b6