chore!: enable multiple L1 nodes to be used

.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/devnet-deploy.yml

@@ -151,7 +151,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,7 +116,7 @@ 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_HOSTS: "https://json-rpc.${{ secrets.SEPOLIA_EXTERNAL_HOST }}?key=${{ secrets.SEPOLIA_API_KEY }}"
       EXTERNAL_ETHEREUM_CONSENSUS_HOST: "https://beacon.${{ secrets.SEPOLIA_EXTERNAL_HOST }}"
 
     steps:
@@ -195,8 +195,8 @@ jobs:
               -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_HOSTS=${{ env.EXTERNAL_ETHEREUM_HOSTS }}" \
               -var="BOT_L1_MNEMONIC=$L1_DEPLOYMENT_MNEMONIC" \
-              -var="EXTERNAL_ETHEREUM_HOST=${{ env.EXTERNAL_ETHEREUM_HOST }}" \
               -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_HEADER=${{ env.GCP_API_KEY_HEADER }}" \
@@ -226,7 +226,7 @@ jobs:
               -var="L1_DEPLOYMENT_MNEMONIC=$L1_DEPLOYMENT_MNEMONIC" \
               -var="BOT_L1_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_HEADER=${{ env.GCP_API_KEY_HEADER }}" \

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

@@ -19,7 +19,7 @@ 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_HOSTS: "https://json-rpc.${{ secrets.SEPOLIA_EXTERNAL_HOST }}?key=${{ secrets.SEPOLIA_API_KEY }}"
   EXTERNAL_ETHEREUM_CONSENSUS_HOST: "https://beacon.${{ secrets.SEPOLIA_EXTERNAL_HOST }}"
   GCP_API_KEY_HEADER: "X-goog-api-key"
 jobs:
@@ -121,7 +121,7 @@ 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_HEADER=${{ env.GCP_API_KEY_HEADER }}

boxes/docker-compose.yml

@@ -15,8 +15,8 @@ services:
     working_dir: /root/aztec-packages/yarn-project/aztec
     command: "node ./dest/bin start --sandbox"
     environment:
+      ETHEREUM_HOSTS: http://ethereum:8545
       HARDWARE_CONCURRENCY: 4
-      ETHEREUM_HOST: http://ethereum:8545
       L1_CHAIN_ID: 31337
       FORCE_COLOR: ${FORCE_COLOR:-1}
       ARCHIVER_POLLING_INTERVAL_MS: 50
@@ -45,7 +45,7 @@ services:
       HARDWARE_CONCURRENCY: 4
       DEBUG: "aztec:*"
       DEBUG_COLORS: "true"
-      ETHEREUM_HOST: http://ethereum:8545
+      ETHEREUM_HOSTS: http://ethereum:8545
       L1_CHAIN_ID: 31337
       FORCE_COLOR: ${FORCE_COLOR:-1}
       PXE_URL: http://aztec:8080

ci3/tmux_split

@@ -6,8 +6,8 @@ set -eu
 
 # Check if at least two commands are provided (otherwise what is the point)
 if [ "$#" -lt 2 ]; then
-    echo "Usage: $0 <main-command> <background commands>..."
-    exit 1
+  echo "Usage: $0 <main-command> <background commands>..."
+  exit 1
 fi
 
 # Launches tmux with 1 window that has as many panes as commands
@@ -23,7 +23,7 @@ tmux new-session -d -s "$session_name" -e LOG_LEVEL=${LOG_LEVEL:-"debug"} \
   -e OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=${OTEL_EXPORTER_OTLP_METRICS_ENDPOINT:-} \
   -e OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:-} \
   -e L1_CONSENSUS_HOST_URL=${L1_CONSENSUS_HOST_URL:-} \
-  -e ETHEREUM_HOST=${ETHEREUM_HOST:-} \
+  -e ETHEREUM_HOSTS=${ETHEREUM_HOSTS:-} \
   -e LOG_JSON=${LOG_JSON:-}
 
 shift 1
@@ -39,7 +39,7 @@ echo "Using tmux base_index=$base_index"
 
 # Create the necessary number of panes and set titles
 num_commands=${#commands[@]}
-for ((i=0; i<num_commands; i++)); do
+for ((i = 0; i < num_commands; i++)); do
   if [[ $i -gt 0 ]]; then
     # Split the first pane each time
     tmux split-window -t "$session_name:${base_index}.${base_index}" -h
@@ -53,9 +53,9 @@ done
 tmux set-hook -t "$session_name" pane-exited "if-shell -F '#{==:#{pane_index},0}' 'kill-session -t \"$session_name\"'"
 
 # Now send commands to each pane
-for ((i=0; i<num_commands; i++)); do
+for ((i = 0; i < num_commands; i++)); do
   tmux send-keys -t "$session_name:$base_index.$((base_index + i))" "${commands[$i]}" C-m
 done
 
 # Attach to the session
-tmux attach-session -t "$session_name"
+tmux attach-session -t "$session_name"

docker-compose.provernet.yml

@@ -3,11 +3,10 @@
 # Logs latest block numbers every 10 seconds.
 name: aztec-provernet
 services:
-
   # Anvil instance that serves as L1
   ethereum:
     image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64}
-    entrypoint: 'anvil --block-time 12 --silent -p 8545 --host 0.0.0.0 --chain-id 31337'
+    entrypoint: "anvil --block-time 12 --silent -p 8545 --host 0.0.0.0 --chain-id 31337"
     ports:
       - 8545:8545
 
@@ -18,7 +17,7 @@ services:
       - "8080:80"
     environment:
       LOG_LEVEL: info
-      ETHEREUM_HOST: http://ethereum:8545
+      ETHEREUM_HOSTS: http://ethereum:8545
       L1_CHAIN_ID: 31337
       AZTEC_PORT: 80
       DEPLOY_AZTEC_CONTRACTS: 1
@@ -37,7 +36,7 @@ services:
     volumes:
       - ./log/aztec-node/:/usr/src/yarn-project/aztec/log:rw
     healthcheck:
-      test: [ "CMD", "curl", "-fSs", "http://127.0.0.1:80/status" ]
+      test: ["CMD", "curl", "-fSs", "http://127.0.0.1:80/status"]
       interval: 3s
       timeout: 30s
       start_period: 120s
@@ -58,7 +57,7 @@ services:
       - "8083:80"
     environment:
       LOG_LEVEL: verbose
-      ETHEREUM_HOST: http://ethereum:8545
+      ETHEREUM_HOSTS: http://ethereum:8545
       PROVER_COORDINATION_NODE_URL: http://aztec-node
       AZTEC_PORT: 80
       ARCHIVER_POLLING_INTERVAL_MS: 1000
@@ -79,11 +78,11 @@ services:
       aztec-prover-broker:
         condition: service_healthy
     healthcheck:
-      test: [ "CMD", "curl", "-fSs", "http://127.0.0.1:80/status" ]
+      test: ["CMD", "curl", "-fSs", "http://127.0.0.1:80/status"]
       interval: 3s
       timeout: 30s
       start_period: 120s
-    command: [ "start", "--prover-node", "--archiver" ]
+    command: ["start", "--prover-node", "--archiver"]
     restart: on-failure:5
 
   aztec-prover-broker:
@@ -94,11 +93,11 @@ services:
       LOG_LEVEL: verbose
       AZTEC_PORT: 80
     healthcheck:
-      test: [ "CMD", "curl", "-fSs", "http://127.0.0.1:80/status" ]
+      test: ["CMD", "curl", "-fSs", "http://127.0.0.1:80/status"]
       interval: 3s
       timeout: 30s
       start_period: 120s
-    command: [ "start", "--prover-broker" ]
+    command: ["start", "--prover-broker"]
     restart: on-failure:5
 
   # Prover agent that connects to the prover-node for fetching proving jobs and executing them
@@ -109,7 +108,7 @@ services:
       - "8090:80"
     environment:
       LOG_LEVEL: verbose
-      ETHEREUM_HOST: http://ethereum:8545
+      ETHEREUM_HOSTS: http://ethereum:8545
       PROVER_BROKER_HOST: http://aztec-prover-broker
       L1_CHAIN_ID: 31337
       AZTEC_PORT: 80
@@ -124,13 +123,13 @@ services:
     depends_on:
       aztec-prover-broker:
         condition: service_healthy
-    command: [ "start", "--prover-agent" ]
+    command: ["start", "--prover-agent"]
     deploy:
       mode: replicated
       replicas: 2
     restart: on-failure:5
     healthcheck:
-      test: [ "CMD", "curl", "-fSs", "http://127.0.0.1:80/status" ]
+      test: ["CMD", "curl", "-fSs", "http://127.0.0.1:80/status"]
       interval: 3s
       timeout: 30s
       start_period: 20s
@@ -143,7 +142,7 @@ services:
       - "8082:80"
     environment:
       LOG_LEVEL: info
-      ETHEREUM_HOST: http://ethereum:8545
+      ETHEREUM_HOSTS: http://ethereum:8545
       AZTEC_NODE_URL: http://aztec-node
       L1_CHAIN_ID: 31337
       AZTEC_PORT: 80
@@ -167,23 +166,23 @@ services:
       aztec-node:
         condition: service_healthy
     healthcheck:
-      test: [ "CMD", "curl", "-fSs", "http://127.0.0.1:80/status" ]
+      test: ["CMD", "curl", "-fSs", "http://127.0.0.1:80/status"]
       interval: 3s
       timeout: 30s
       start_period: 90s
     restart: on-failure:5
-    command: [ "start", "--bot", "--pxe" ]
+    command: ["start", "--bot", "--pxe"]
 
   # Simple watcher that logs the latest block numbers every few seconds using the CLI and the bot's PXE
   aztec-block-watcher:
     image: "aztecprotocol/${IMAGE:-aztec:master}"
     environment:
-      ETHEREUM_HOST: http://ethereum:8545
+      ETHEREUM_HOSTS: http://ethereum:8545
       L1_CHAIN_ID: 31337
     depends_on:
       aztec-bot:
         condition: service_healthy
-    entrypoint: '/bin/bash -c'
+    entrypoint: "/bin/bash -c"
     command: >
       'while true; do node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js block-number -u http://aztec-bot | head -n2; sleep 10; done'
     restart: on-failure:5
@@ -194,7 +193,7 @@ services:
   aztec-cli:
     image: "aztecprotocol/${IMAGE:-aztec:master}"
     environment:
-      ETHEREUM_HOST: http://ethereum:8545
+      ETHEREUM_HOSTS: http://ethereum:8545
       PXE_URL: http://aztec-bot
       L1_CHAIN_ID: 31337
     stdin_open: true

docker-compose.yml

@@ -48,7 +48,7 @@ services:
       OUTBOX_CONTRACT_ADDRESS: "0x3ec4b6c68a8c2ce4c78cdd465b3019b11a568d1d"
       FEE_JUICE_CONTRACT_ADDRESS: "0x73c43b919973711e096bfc04c9d4b3be511ffc0b"
       FEE_JUICE_PORTAL_CONTRACT_ADDRESS: "0xdf25b0a34dbee9f25518f7a4d63bab8b3bb3e496"
-      ETHEREUM_HOST:
+      ETHEREUM_HOSTS:
       P2P_TCP_LISTEN_ADDR: "0.0.0.0:9000"
       P2P_UDP_LISTEN_ADDR: "0.0.0.0:9001"
       P2P_TCP_ANNOUNCE_ADDR: ":9000"
@@ -64,7 +64,7 @@ services:
       - p2p-boot-node
     entrypoint: |
       /bin/sh -c '
-        export ETHEREUM_HOST=$$(cat /var/run/secrets/ethereum-host)
+        export ETHEREUM_HOSTS=$$(cat /var/run/secrets/ethereum-host)
         export BOOTSTRAP_NODES=$$(cat /var/run/secrets/p2p-boot-node)
 
         test -z "$$PEER_ID_PRIVATE_KEY" -a ! -f /var/lib/aztec/p2p-private-key && node /usr/src/yarn-project/cli/dest/bin/index.js generate-p2p-private-key | head -1 | cut -d" " -f 3 | tee /var/lib/aztec/p2p-private-key || echo "Re-using existing P2P private key"
@@ -105,7 +105,7 @@ services:
       PXE_URL: http://pxe:8080
       NODE_NO_WARNINGS: 1
       SECRET_KEY:
-      ETHEREUM_HOST:
+      ETHEREUM_HOSTS:
     profiles:
       - cli
 
@@ -122,6 +122,6 @@ secrets:
   aztec-node-url:
     environment: AZTEC_NODE_URL
   ethereum-host:
-    environment: ETHEREUM_HOST
+    environment: ETHEREUM_HOSTS
   p2p-boot-node:
     environment: BOOTSTRAP_NODES

iac/mainnet-fork/scripts/run_nginx_anvil.sh

@@ -17,7 +17,7 @@ trap 'kill $(jobs -p)' SIGTERM
 # Anvil defaults - Nginx assumes these values to be as they are
 HOST="0.0.0.0"
 PORT=8544
-ETHEREUM_HOST=$HOST:$PORT
+ETHEREUM_HOSTS=$HOST:$PORT
 # Stripping double quotations from the mnemonic seed phrase
 echo "stripping double quotations from the mnemonic seed phrase: ${MNEMONIC:0:10}..."
 MNEMONIC_STRIPPED=${MNEMONIC//\"/}
@@ -32,12 +32,12 @@ mkdir -p /var/log/anvil/
 # Run anvil logging to stdout
 .foundry/bin/anvil --block-time 12 --host $HOST -p $PORT -m "$MNEMONIC_STRIPPED" -f=https://mainnet.infura.io/v3/$INFURA_API_KEY --chain-id=$L1_CHAIN_ID --fork-block-number=15918000 --block-base-fee-per-gas=10 -s=$SNAPSHOT_FREQUENCY --state=./data/state --balance=1000000000000000000 &
 
-echo "Waiting for ethereum host at $ETHEREUM_HOST..."
-while ! curl -s $ETHEREUM_HOST >/dev/null; do sleep 1; done
+echo "Waiting for ethereum host at $ETHEREUM_HOSTS..."
+while ! curl -s $ETHEREUM_HOSTS >/dev/null; do sleep 1; done
 
 # Fix anvil's fork timestamp
-curl -s -H "Content-Type: application/json" -XPOST -d"{\"id\":1,\"jsonrpc\":\"2.0\",\"method\":\"evm_setNextBlockTimestamp\",\"params\":[\"$(date +%s | xargs printf '0x%x')\"]}" $ETHEREUM_HOST > /dev/null
-curl -s -H "Content-Type: application/json" -XPOST -d"{\"id\":2,\"jsonrpc\":\"2.0\",\"method\":\"evm_mine\",\"params\":[]}" $ETHEREUM_HOST > /dev/null
+curl -s -H "Content-Type: application/json" -XPOST -d"{\"id\":1,\"jsonrpc\":\"2.0\",\"method\":\"evm_setNextBlockTimestamp\",\"params\":[\"$(date +%s | xargs printf '0x%x')\"]}" $ETHEREUM_HOSTS >/dev/null
+curl -s -H "Content-Type: application/json" -XPOST -d"{\"id\":2,\"jsonrpc\":\"2.0\",\"method\":\"evm_mine\",\"params\":[]}" $ETHEREUM_HOSTS >/dev/null
 
 echo "Starting nginx..."
 nginx &

iac/mainnet-fork/scripts/wait_for_fork

@@ -6,10 +6,10 @@ set -e
 # This script waits on a healthy status from the fork - a valid response to the chainid request
 # We retry every 20 seconds, and wait for a total of 5 minutes (15 times)
 
-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":33,"jsonrpc":"2.0"}' \
   --connect-timeout 30 \
   --retry 15 \
   --retry-delay 20 \
-  $ETHEREUM_HOST
+  $ETHEREUM_HOSTS

noir/noir-repo/examples/codegen_verifier/codegen_verifier.sh

@@ -25,15 +25,15 @@ HEX_PUBLIC_INPUTS=$(head -c $PUBLIC_INPUT_BYTES $PROOF_PATH | od -An -v -t x1 |
 HEX_PROOF=$(tail -c +$(($PUBLIC_INPUT_BYTES + 1)) $PROOF_PATH | od -An -v -t x1 | tr -d $' \n')
 
 # Split public inputs into strings where each string represents a `bytes32`.
-SPLIT_HEX_PUBLIC_INPUTS=$(sed -e 's/.\{64\}/0x&,/g' <<< $HEX_PUBLIC_INPUTS)
+SPLIT_HEX_PUBLIC_INPUTS=$(sed -e 's/.\{64\}/0x&,/g' <<<$HEX_PUBLIC_INPUTS)
 
 # Spin up an anvil node to deploy the contract to
 anvil &
 
 DEPLOY_INFO=$(forge create UltraVerifier \
-    --rpc-url "127.0.0.1:8545" \
-    --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" \
-    --json)
+  --rpc-urls "127.0.0.1:8545" \
+  --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" \
+  --json)
 VERIFIER_ADDRESS=$(echo $DEPLOY_INFO | jq -r '.deployedTo')
 
 # Call the verifier contract with our proof.