Merge remote-tracking branch 'origin/master' into lx/update-honk-agg-…

…obj-handling

.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

@@ -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]
@@ -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