Merge branch 'master' into sync-noir

* master: (31 commits)
  feat: Slack message to ci channel tagging owners on flakes. (#12284)
  fix: slack notify was broken by quoted commit titles
  revert: "chore: Fix and reenable fees-settings test (#12302)"
  fix: run arm64 on master (#12307)
  yolo fix
  chore: Fix and reenable fees-settings test (#12302)
  feat!: rename compute_nullifier_without_context (#12308)
  chore: Lazy loading artifacts everywhere (#12285)
  chore: Reenable dapp subscription test (#12304)
  chore: Run prover test with fake proofs when requested (#12305)
  chore: Do not set CI_FULL outside CI (#12300)
  chore: new mnemonic deployments on sepolia (#12076)
  chore!: enable multiple L1 nodes to be used (#11945)
  chore: remove no longer supported extension from vscode/extension.json (#12303)
  fix(e2e): p2p_reqresp (#12297)
  feat: Sync from noir (#12298)
  chore: enabling `e2e_contract_updates` in CI + nuking irrelevant test (#12293)
  feat: prepend based merge (#12093)
  feat: fetch addresses from registry (#12000)
  feat: live logs (#12271)
  ...

Author: TomAFrench

.github/scripts/wait_for_infra.sh

@@ -11,12 +11,12 @@ API_KEY=$3
 # We retry every 20 seconds, and wait for a total of 5 minutes (15 times)
 
 if [ "$INFRA" == "mainnet-fork" ]; then
-  export ETHEREUM_HOST="https://$DEPLOY_TAG-mainnet-fork.aztec.network:8545/$API_KEY"
+  export ETHEREUM_HOSTS="https://$DEPLOY_TAG-mainnet-fork.aztec.network:8545/$API_KEY"
   curl -H "Content-Type: application/json" -X POST --data '{"method":"eth_chainId","params":[],"id":49,"jsonrpc":"2.0"}' \
     --connect-timeout 30 \
     --retry 15 \
     --retry-delay 20 \
-    $ETHEREUM_HOST
+    $ETHEREUM_HOSTS
 elif [ "$INFRA" == "pxe" ]; then
   export PXE_URL="https://api.aztec.network/$DEPLOY_TAG/aztec-pxe/$API_KEY/status"
   curl \

.github/workflows/ci3.yml

@@ -27,10 +27,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Only run arm64 build with arm64-ci label.
+        # Only run arm64 build with arm64-ci label or on master.
         # The way to do conditions here is to parse full strings as JSON.
-        settings:  >-
-          ${{ fromJson(contains(github.event.pull_request.labels.*.name, 'arm64-ci') &&
+        settings: >-
+          ${{ fromJson(
+            (contains(github.event.pull_request.labels.*.name, 'arm64-ci') || github.ref_name == 'master') &&
             '[{"arch":"amd64"},{"arch":"arm64"}]' ||
             '[{"arch":"amd64"}]') }}
     steps:
@@ -75,6 +76,7 @@ jobs:
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
         run: |
           ./ci.sh ec2
 
@@ -169,6 +171,7 @@ jobs:
           INSTANCE_POSTFIX: ${{ matrix.number }}
           DRY_RUN: 1
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
         run: |
           ./ci.sh ec2-test
 
@@ -197,7 +200,8 @@ jobs:
         run: |
           authors=$(git log -1 --pretty=format:'%an <%ae>')
           echo "authors=${authors}" >> $GITHUB_OUTPUT
-          title=$(git log -1 --pretty=format:'%s')
+          # Note, we have to make sure double quotes don't break our JSON.
+          title=$(git log -1 --pretty=format:'%s' | sed s/\"/\'/g)
           echo "commit_title=${title}" >> $GITHUB_OUTPUT
           failed_jobs=""
           [ "${{ needs.ci-grind.result }}" = "failure" ] && failed_jobs+="ci-grind"

.github/workflows/devnet-deploy.yml

@@ -152,7 +152,7 @@ jobs:
 
           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-rpc-urls http://127.0.0.1:$ETHEREUM_PORT \
             --l1-chain-id "$L1_CHAIN_ID" \
             --mnemonic "$MNEMONIC" \
             --address-index "$ADDRESS_INDEX" \

.github/workflows/network-deploy.yml

@@ -116,8 +116,8 @@ jobs:
       TF_STATE_BUCKET: aztec-terraform
       GKE_CLUSTER_CONTEXT: "gke_testnet-440309_us-west1-a_${{ inputs.cluster }}"
       GCP_API_KEY_HEADER: "X-goog-api-key"
-      EXTERNAL_ETHEREUM_HOST: "https://json-rpc.${{ secrets.SEPOLIA_EXTERNAL_HOST }}?key=${{ secrets.SEPOLIA_API_KEY }}"
-      EXTERNAL_ETHEREUM_CONSENSUS_HOST: "https://beacon.${{ secrets.SEPOLIA_EXTERNAL_HOST }}"
+      EXTERNAL_ETHEREUM_HOSTS: "https://json-rpc.${{ secrets.GCP_SEPOLIA_URL }}?key=${{ secrets.GCP_SEPOLIA_API_KEY }},${{ secrets.INFURA_SEPOLIA_URL }}"
+      EXTERNAL_ETHEREUM_CONSENSUS_HOST: "https://beacon.${{ secrets.GCP_SEPOLIA_URL }}"
 
     steps:
       - name: Checkout code
@@ -168,6 +168,17 @@ jobs:
 
           $REPO/spartan/scripts/generate_devnet_config.sh ${{ env.VALUES_FILE }}
 
+      - name: Generate sepolia accounts
+        id: generate-sepolia-accounts
+        if: ${{ inputs.sepolia_deployment == 'true' }}
+        run: |
+          REPO=$(git rev-parse --show-toplevel)
+          export FUNDING_PRIVATE_KEY=${{ secrets.SEPOLIA_FUNDING_PRIVATE_KEY }}
+          export ETHEREUM_HOST=${{ env.EXTERNAL_ETHEREUM_HOST }}
+          mnemonic=$(bash $REPO/spartan/scripts/prepare_sepolia_accounts.sh ${{ env.VALUES_FILE }} 5)
+          echo "::add-mask::$mnemonic"
+          echo "mnemonic=$mnemonic" >> "$GITHUB_OUTPUT"
+
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v2
         with:
@@ -187,17 +198,17 @@ jobs:
         continue-on-error: true
         run: |
           if ${{ inputs.sepolia_deployment == 'true' }}; then
-            export L1_DEPLOYMENT_MNEMONIC="${{ secrets.SEPOLIA_ACCOUNTS_MNEMONIC }}"
+            export L1_DEPLOYMENT_MNEMONIC="${{ steps.generate-sepolia-accounts.outputs.mnemonic }}"
             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="L1_DEPLOYMENT_MNEMONIC=$L1_DEPLOYMENT_MNEMONIC" \
-              -var="EXTERNAL_ETHEREUM_HOST=${{ env.EXTERNAL_ETHEREUM_HOST }}" \
+              -var="EXTERNAL_ETHEREUM_HOSTS=${{ env.EXTERNAL_ETHEREUM_HOSTS }}" \
               -var="EXTERNAL_ETHEREUM_CONSENSUS_HOST=${{ env.EXTERNAL_ETHEREUM_CONSENSUS_HOST }}" \
-              -var="EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY=${{ secrets.SEPOLIA_API_KEY }}" \
+              -var="EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY=${{ secrets.GCP_SEPOLIA_API_KEY }}" \
               -var="EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY_HEADER=${{ env.GCP_API_KEY_HEADER }}" \
               -lock=${{ inputs.respect_tf_lock }}
           else
@@ -214,7 +225,7 @@ jobs:
         working-directory: ./spartan/terraform/deploy-release
         run: |
           if ${{ inputs.sepolia_deployment == 'true' }}; then
-            export L1_DEPLOYMENT_MNEMONIC="${{ secrets.SEPOLIA_ACCOUNTS_MNEMONIC }}"
+            export L1_DEPLOYMENT_MNEMONIC="${{ steps.generate-sepolia-accounts.outputs.mnemonic }}"
             terraform plan \
               -var="RELEASE_NAME=${{ env.NAMESPACE }}" \
               -var="VALUES_FILE=${{ env.VALUES_FILE }}" \
@@ -223,9 +234,9 @@ jobs:
               -var="L1_DEPLOYMENT_PRIVATE_KEY=${{ secrets.SEPOLIA_L1_DEPLOYMENT_PRIVATE_KEY }}" \
               -var="L1_DEPLOYMENT_MNEMONIC=$L1_DEPLOYMENT_MNEMONIC" \
               -var="L1_DEPLOYMENT_SALT=${DEPLOYMENT_SALT:-$RANDOM}" \
-              -var="EXTERNAL_ETHEREUM_HOST=${{ env.EXTERNAL_ETHEREUM_HOST }}" \
+              -var="EXTERNAL_ETHEREUM_HOSTS=${{ env.EXTERNAL_ETHEREUM_HOSTS }}" \
               -var="EXTERNAL_ETHEREUM_CONSENSUS_HOST=${{ env.EXTERNAL_ETHEREUM_CONSENSUS_HOST }}" \
-              -var="EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY=${{ secrets.SEPOLIA_API_KEY }}" \
+              -var="EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY=${{ secrets.GCP_SEPOLIA_API_KEY }}" \
               -var="EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY_HEADER=${{ env.GCP_API_KEY_HEADER }}" \
               ${{ contains(env.VALUES_FILE, 'devnet') && '-var="EXPOSE_HTTPS_BOOTNODE=true"' || '' }} \
               -out=tfplan \

.github/workflows/nightly-kind-test.yml

@@ -19,8 +19,8 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   BUILD_INSTANCE_SSH_KEY: ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
   GIT_COMMIT: ${{ github.event.pull_request.head.sha || github.sha }}
-  EXTERNAL_ETHEREUM_HOST: "https://json-rpc.${{ secrets.SEPOLIA_EXTERNAL_HOST }}?key=${{ secrets.SEPOLIA_API_KEY }}"
-  EXTERNAL_ETHEREUM_CONSENSUS_HOST: "https://beacon.${{ secrets.SEPOLIA_EXTERNAL_HOST }}"
+  EXTERNAL_ETHEREUM_HOSTS: "https://json-rpc.${{ secrets.GCP_SEPOLIA_URL }}?key=${{ secrets.GCP_SEPOLIA_API_KEY }}"
+  EXTERNAL_ETHEREUM_CONSENSUS_HOST: "https://beacon.${{ secrets.GCP_SEPOLIA_URL }}"
   GCP_API_KEY_HEADER: "X-goog-api-key"
 jobs:
   setup:
@@ -121,12 +121,11 @@ jobs:
               docker pull aztecprotocol/end-to-end:${{ env.GIT_COMMIT }}
 
               # Set the sepolia run variables
-              export EXTERNAL_ETHEREUM_HOST=${{ env.EXTERNAL_ETHEREUM_HOST }}
+              export EXTERNAL_ETHEREUM_HOSTS=${{ env.EXTERNAL_ETHEREUM_HOSTS }}
               export EXTERNAL_ETHEREUM_CONSENSUS_HOST=${{ env.EXTERNAL_ETHEREUM_CONSENSUS_HOST }}
-              export EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY=${{ secrets.SEPOLIA_API_KEY }}
+              export EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY=${{ secrets.GCP_SEPOLIA_API_KEY }}
               export EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY_HEADER=${{ env.GCP_API_KEY_HEADER }}
               export L1_DEPLOYMENT_PRIVATE_KEY=${{ secrets.SEPOLIA_L1_DEPLOYMENT_PRIVATE_KEY }}
-              export L1_ACCOUNTS_MNEMONIC="${{ secrets.SEPOLIA_ACCOUNTS_MNEMONIC }}"
               SEPOLIA_RUN=true INSTALL_METRICS=false ./spartan/scripts/test_kind.sh "./src/spartan/${{ matrix.config.test }}" "${{ matrix.config.values }}"
               ci3/cache_upload_flag "$artifact"
             fi

.test_patterns.yml

@@ -0,0 +1,139 @@
+# Describes tests that we either:
+#   - Outright skip.
+#   - Run and alert owners on failure.
+# To outright skip a test add a "skip: true" property.
+# Only do this for tests that are currently expected to fail constantly and the noise is unbearable!
+# Otherwise, tests must have owner(s). Owners are identified by their Slack id, (profile, three dots, copy member id).
+# If there is no owner for failed test the build will fail, regardless of if it matches in this file.
+# When a failing test matches one or more of the "regex" properties below,
+# a message is sent to slack channel #aztec3-ci tagging the owners.
+
+tests:
+  # barretenberg
+  #
+  # Rare. But I saw it happen twice in 10 CI runs. Then twice in 10000 mainframe runs. Today I can't reproduce.
+  # Grind with: seq 1 10000 | parallel --bar "barretenberg/cpp/scripts/run_test.sh join_split_example_tests join_split_tests.test_defi_deposit_second_bridge_output_in_use_and_same_virtual_bridge_output_asset_ids >/dev/null"
+  # Logic failed: field_t::range_constraint
+  # /home/aztec-dev/aztec-packages/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.test.cpp:1735: Failure
+  # Value of: result.valid
+  #   Actual: false
+  # Expected: true
+  - regex: "join_split_example_tests"
+    owners:
+      - "U03JYU7AQET" # luke
+
+  # noir
+  # Something to do with how I run the tests now. Think these are fine in nextest.
+  - regex: "noir_lsp-.* notifications::notification_tests::test_caches_open_files"
+    skip: true
+    owners:
+      - "UKUMA5J7K" # charlie
+  - regex: "noir_lsp-.* requests::"
+    skip: true
+    owners:
+      - "UKUMA5J7K" # charlie
+  # Sometimes see this on ARM. But not when run on it's own...
+  # FAILED 6a60c4e796ac0aef: noir/scripts/run_test.sh debug-21ff1948430ded06 tests::debug_ram_blowup_regression (code: 101)
+  #                                                                                                                                                                                running 1 test
+  # test tests::debug_ram_blowup_regression has been running for over 60 seconds                                                                                                   test tests::debug_ram_blowup_regression ... FAILED
+  #                                                                                                                                                                                failures:
+  #                                                                                                                                                                                ---- tests::debug_ram_blowup_regression stdout ----
+  # thread 'tests::debug_ram_blowup_regression' panicked at tooling/debugger/tests/debug.rs:27:14:                                                                                 Could not start debugger: Timeout { expected: "Regex: \".*\Starting debugger.*\"", got: "`^`[?2004l`\r``\r``\n`
+  # Waiting for lock on Nargo.toml...`\r``\n`                                                                                                                                      ", timeout: 30s }
+  # note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+  #                                                                                                                                                                                failures:
+  #     tests::debug_ram_blowup_regression
+  # test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 232 filtered out; finished in 60.34s
+  - regex: "tests::debug_ram_blowup_regression"
+    skip: true
+    owners:
+      - "UKUMA5J7K" # charlie
+
+  # Seen this error on all the below.
+  # e.g. to grind: seq 1 16 | parallel --bar --tag --halt now,fail=1 ci3/dump_fail "NAME_POSTFIX=_{} yarn-project/end-to-end/scripts/run_test.sh simple e2e_p2p/gossip_network >/dev/null"
+  # FAIL  e2e_p2p/reqresp.test.ts
+  #  ● e2e_p2p_reqresp_tx › should produce an attestation by requesting tx data over the p2p network
+
+  #    TypeError: Cannot read properties of null (reading 'address')
+
+  #      19 |
+  #      20 |   get(): T | undefined {
+  #    > 21 |     return this.#db.get(this.#slot);
+  #         |                     ^
+  #      22 |   }
+  #      23 |
+  #      24 |   getAsync(): Promise<T | undefined> {
+
+  #      at LMDBStore.getBinaryFast (../../node_modules/lmdb/read.js:90:9)
+  #      at LMDBStore.get (../../node_modules/lmdb/read.js:334:22)
+  #      at LmdbAztecSingleton.get (../../kv-store/src/lmdb/singleton.ts:21:21)
+  #      at initStoreForRollup (../../kv-store/src/utils.ts:26:82)
+  #      at createStore (../../kv-store/src/lmdb/index.ts:25:12)
+  #      at createArchiver (../../archiver/src/factory.ts:30:25)
+  #      at Function.createAndSync (../../aztec-node/src/aztec-node/server.ts:157:28)
+  #      at createAndSync (fixtures/setup_p2p_test.ts:72:33)
+  #          at async Promise.all (index 0)
+  #      at Object.<anonymous> (e2e_p2p/reqresp.test.ts:66:13)
+  - regex: "simple e2e_p2p/"
+    owners:
+      - "U04DT239VQU" # sean
+
+  # FAIL  ./flakey_e2e_inclusion_proofs_contract.test.ts
+  # ● e2e_inclusion_proofs_contract › contract inclusion › proves public deployment of a contract
+  #
+  #   Undefined argument value of type field
+  #
+  #     41 |   private encodeArgument(abiType: AbiType, arg: any, name?: string) {
+  #     42 |     if (arg === undefined || arg == null) {
+  #   > 43 |       throw new Error(`Undefined argument ${name ?? 'unnamed'} of type ${abiType.kind}`);
+  #        |             ^
+  #     44 |     }
+  #     45 |     switch (abiType.kind) {
+  #     46 |       case 'field':
+  #
+  #     at ArgumentEncoder.encodeArgument (../../stdlib/src/abi/encoder.ts:43:13)
+  #     at ArgumentEncoder.encode (../../stdlib/src/abi/encoder.ts:137:12)
+  #     at encodeArguments (../../stdlib/src/abi/encoder.ts:150:41)
+  #     at computeInitializationHash (../../stdlib/src/contract/contract_address.ts:75:20)
+  #     at getContractInstanceFromDeployParams (../../stdlib/src/contract/contract_instance.ts:124:9)
+  #     at Object.getContractInstanceFromDeployParams (flakey_e2e_inclusion_proofs_contract.test.ts:275:24)
+  - regex: "simple flakey_e2e_inclusion_proofs_contract"
+    owners:
+      - "UKUMA5J7K" # charlie
+
+  # FAIL  src/test/bb_prover_parity.test.ts (34.059 s)
+  #  prover/bb_prover/parity
+  #    ✕ proves the parity circuits (30003 ms)
+  #
+  #  ● prover/bb_prover/parity › proves the parity circuits
+  #
+  #    thrown: "Exceeded timeout of 30000 ms for a test.
+  #    Add a timeout value to this test to increase the timeout, if this is a long-running test. See https://jestjs.io/docs/api#testname-fn-timeout."
+  - regex: "prover-client/src/test/bb_prover_parity.test.ts"
+    owners:
+      - "U04TPBU26E8" # palla
+  - regex: "prover-client/src/proving_broker/broker_prover_facade.test.ts"
+    owners:
+      - "U04TPBU26E8" # palla
+  - regex: "prover-client/src/orchestrator/orchestrator_errors.test.ts"
+    owners:
+      - "U04TPBU26E8" # palla
+
+  # yarn-project tests
+  - regex: "p2p/src/services/reqresp/reqresp.test.ts"
+    owners:
+      - "U04DT239VQU" # sean
+  - regex: "sequencer-client/src/slasher/slasher_client.test.ts"
+    owners:
+      - "U03E5SYLY3Z" # lasse
+
+  # kind tests
+  - regex: "spartan/bootstrap.sh"
+    owners:
+      - "UKUMA5J7K" # charlie
+      - "U04BM8H25NJ" # adam
+
+  # Slack testing.
+  - regex: "nonsense to match"
+    owners:
+      - "UKUMA5J7K" # charlie