chore!: enable multiple L1 nodes to be used

spartan/aztec-network/templates/_helpers.tpl

@@ -210,14 +210,16 @@ if [ -n "${EXTERNAL_ETHEREUM_HOSTS}" ]; then
   export ETHEREUM_HOSTS="${EXTERNAL_ETHEREUM_HOSTS}"
 fi
 echo "Awaiting any ethereum node from: ${ETHEREUM_HOSTS}"
-for HOST in $(echo "${ETHEREUM_HOSTS}" | tr ',' '\n'); do
-  if curl -s -X POST -H 'Content-Type: application/json' \
-    -d '{"jsonrpc":"2.0","method":"eth_chainId","params":[],"id":67}' \
-    "${HOST}" | grep -q 0x; then
-    echo "Ethereum node ${HOST} is ready!"
-    break
-  fi
-  echo "Waiting for Ethereum node ${HOST}..."
+while true; do
+  for HOST in $(echo "${ETHEREUM_HOSTS}" | tr ',' '\n'); do
+    if curl -s -X POST -H 'Content-Type: application/json' \
+      -d '{"jsonrpc":"2.0","method":"eth_chainId","params":[],"id":67}' \
+      "${HOST}" | grep -q 0x; then
+      echo "Ethereum node ${HOST} is ready!"
+      return 0
+    fi
+    echo "Waiting for Ethereum node ${HOST}..."
+  done
   sleep 5
 done
 {{- end -}}

yarn-project/end-to-end/scripts/native-network/deploy-l1-contracts.sh

@@ -27,29 +27,24 @@ export PRIVATE_KEY=${PRIVATE_KEY:-""}
 export SALT=${SALT:-"1337"}
 
 echo "Waiting for Ethereum node to be up..."
-found_node=0
-for HOST in $(echo "${ETHEREUM_HOSTS}" | tr ',' '\n'); do
-  if curl -s -X POST -H 'Content-Type: application/json' \
-    --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' \
-    "$HOST" 2>/dev/null | grep -q 'result'; then
-    echo "Node $HOST is ready"
-    found_node=1
-    break
-  fi
-  sleep 1
+while true; do
+  for HOST in $(echo "${ETHEREUM_HOSTS}" | tr ',' '\n'); do
+    if curl -s -X POST -H 'Content-Type: application/json' \
+      --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' \
+      "$HOST" 2>/dev/null | grep -q 'result'; then
+      echo "Node $HOST is ready"
+      found_node=1
+      break 2
+    fi
+    echo "Waiting for Ethereum node ${HOST}..."
+  done
+  sleep 5
 done
-
-if [ $found_node -eq 0 ]; then
-  echo "No Ethereum nodes available"
-  exit 1
-fi
 echo "Done waiting."
 
 # Fetch chain ID from the Ethereum node
 source "$REPO"/yarn-project/end-to-end/scripts/native-network/utils/get-chain-id.sh
 
-echo "L1_CHAIN_ID: $L1_CHAIN_ID"
-
 # Construct base command
 COMMAND="node --no-warnings $(git rev-parse --show-toplevel)/yarn-project/aztec/dest/bin/index.js \
   deploy-l1-contracts \

yarn-project/ethereum/package.json

@@ -21,7 +21,6 @@
   },
   "scripts": {
     "build": "yarn clean && tsc -b",
-    "b": "tsc -b ./src/try.ts",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",

yarn-project/ethereum/src/eth_cheat_codes.ts

@@ -29,13 +29,7 @@ export class EthCheatCodes {
 
   async rpcCall(method: string, params: any[]) {
     const paramsString = JSON.stringify(params);
-    // const content = {
-    //   body: `{"jsonrpc":"2.0", "method": "${method}", "params": ${paramsString}, "id": 1}`,
-    //   method: 'POST',
-    //   headers: { 'Content-Type': 'application/json' },
-    // };
     this.logger.info(`Calling ${method} with params: ${paramsString} on ${this.rpcUrls.join(', ')}`);
-    // return await (await fetch(this.rpcUrl, content)).json();
     return (await this.publicClient.transport.request({
       method,
       params,