Merge remote-tracking branch 'origin' into mw/hash-l2l1msgs-once

.circleci/config.yml

@@ -360,7 +360,7 @@ jobs:
           command: build aztec
           aztec_manifest_key: aztec
 
-  aztec-builder:
+  cli-wallet:
     machine:
       image: default
     resource_class: small
@@ -369,8 +369,8 @@ jobs:
       - *setup_env
       - run:
           name: "Build image"
-          command: build aztec-builder
-          aztec_manifest_key: aztec-builder
+          command: build cli-wallet
+          aztec_manifest_key: cli-wallet
 
   end-to-end:
     machine:
@@ -419,7 +419,7 @@ jobs:
             should_release || exit 0
             deploy_dockerhub aztec-nargo
             deploy_dockerhub aztec
-            deploy_dockerhub aztec-builder
+            deploy_dockerhub cli-wallet
       - run:
           name: "Release canary to NPM: bb.js"
           command: |
@@ -584,7 +584,7 @@ workflows:
 
       # Artifacts
       - aztec-package: *defaults_yarn_project
-      - aztec-builder: *defaults_yarn_project
+      - cli-wallet: *defaults_yarn_project
 
       # End to end tests.
       - e2e-join:
@@ -602,7 +602,7 @@ workflows:
             - barretenberg-wasm-linux-clang
             - barretenberg-docs
             - e2e-join
-            - aztec-builder
+            - cli-wallet
           <<: *defaults
 
       # Production releases.

.github/ensure-tester-with-images/action.yml

@@ -16,7 +16,7 @@ inputs:
   tester_ttl:
     required: false
     description: "Time to live for the tester instance in minutes"
-    default: 30
+    default: 45
 runs:
   # define an action, runs in OS of caller
   using: composite

.github/scripts/wait_for_infra.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+
+INFRA=$1
+DEPLOY_TAG=$2
+API_KEY=$3
+
+# When destroying and applying terraforms, they may not be
+# ready for a while, as it must register with DNS etc.
+# This script waits on a healthy status from the infra - a valid response to a request
+# 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"
+  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
+elif [ "$INFRA" == "pxe" ]; then
+  export PXE_URL="https://api.aztec.network/$DEPLOY_TAG/aztec-pxe/$API_KEY/status"
+  curl \
+    --connect-timeout 30 \
+    --retry 15 \
+    --retry-delay 20 \
+    $PXE_URL
+else
+  echo "Invalid infra type"
+  exit 1
+fi

.github/workflows/ci.yml

@@ -91,14 +91,14 @@ jobs:
     runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
     steps:
       - uses: actions/checkout@v4
-        if: ${{ needs.changes.outputs.build-images }}
+        if: ${{ needs.changes.outputs.build-images == 'true' }}
         with: { ref: "${{ env.GIT_COMMIT }}" }
       - uses: ./.github/ci-setup-action
-        if: ${{ needs.changes.outputs.build-images }}
+        if: ${{ needs.changes.outputs.build-images == 'true' }}
         with:
           concurrency_key: build-images-x86
       - name: "Push Build Images If Changed"
-        if: ${{ needs.changes.outputs.build-images }}
+        if: ${{ needs.changes.outputs.build-images == 'true' }}
         timeout-minutes: 40
         run: |
           earthly-ci --push ./build-images/+build
@@ -125,7 +125,7 @@ jobs:
       # (Note ARM uses just 2 tests as a smoketest)
       - name: Create list of non-bench end-to-end jobs
         id: e2e_list
-        run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep -v '+base' | grep -v '+bench' |  sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT
+        run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep -v '+base' | grep -v '+bench' | grep -v 'devnet' | sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT
       - name: Create list of bench end-to-end jobs
         id: bench_list
         run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep '+bench' |  sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT
@@ -190,7 +190,7 @@ jobs:
             cd ./yarn-project/end-to-end/
             export FORCE_COLOR=1
             export EARTHLY_BUILD_ARGS="${{ env.EARTHLY_BUILD_ARGS }}"
-            ../../scripts/earthly-ci -P --no-output +${{ matrix.test }}
+            ../../scripts/earthly-ci --exec-stats -P --no-output +${{ matrix.test }}
 
   acir-bench:
     runs-on: ubuntu-20.04
@@ -255,6 +255,8 @@ jobs:
         working-directory: ./yarn-project/scripts
         run: |
           earthly-ci -P +bench-comment
+        env:
+          AZTEC_BOT_GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
 
   bb-gcc:
     needs: [build-images, changes]
@@ -292,7 +294,7 @@ jobs:
         working-directory: ./barretenberg/cpp/
         timeout-minutes: 40
         # limit our parallelism to half our cores
-        run: earthly-ci --no-output +test --hardware_concurrency=64
+        run: earthly-ci --exec-stats --no-output +test --hardware_concurrency=64
 
   bb-js-test:
     needs: [build-images, changes]
@@ -353,6 +355,21 @@ jobs:
         timeout-minutes: 40
         run: earthly-ci --no-output ./+barretenberg-acir-tests-sol
 
+  bb-acir-tests-sol-honk:
+    needs: [noir-build-acir-tests, changes]
+    runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
+    if: ${{ needs.changes.outputs.barretenberg == 'true' || needs.changes.outputs.noir == 'true' }}
+    steps:
+      - uses: actions/checkout@v4
+        with: { ref: "${{ env.GIT_COMMIT }}" }
+      - uses: ./.github/ci-setup-action
+        with:
+          concurrency_key: barretenberg-acir-tests-sol-honk-x86
+      - name: "BB Solidity Acir Tests"
+        working-directory: ./barretenberg/
+        timeout-minutes: 40
+        run: earthly-ci --no-output ./+barretenberg-acir-tests-sol-honk
+
   bb-acir-tests-bb-js:
     needs: [noir-build-acir-tests, changes]
     runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
@@ -665,6 +682,7 @@ jobs:
       - noir-build-acir-tests
       - bb-acir-tests-bb
       - bb-acir-tests-sol
+      - bb-acir-tests-sol-honk
       - bb-acir-tests-bb-js
       - noir-format
       - noir-test
@@ -715,6 +733,7 @@ jobs:
       - noir-build-acir-tests
       - bb-acir-tests-bb
       - bb-acir-tests-sol
+      - bb-acir-tests-sol-honk
       - bb-acir-tests-bb-js
       - noir-format
       - noir-test