chore: values for sepolia deployment

.github/workflows/network-deploy.yml

@@ -17,7 +17,7 @@ on:
         type: string
       deployment_mnemonic_secret_name:
         description: The name of the secret which holds the boot node's contract deployment mnemonic
-        required: true
+        required: false
         type: string
         default: testnet-deployment-mnemonic
       respect_tf_lock:
@@ -41,7 +41,7 @@ on:
         required: true
       deployment_mnemonic_secret_name:
         description: The name of the secret which holds the boot node's contract deployment mnemonic
-        required: true
+        required: false
         default: testnet-deployment-mnemonic
       respect_tf_lock:
         description: Whether to respect the Terraform lock
@@ -68,6 +68,12 @@ jobs:
       TF_STATE_BUCKET: aztec-terraform
       GKE_CLUSTER_CONTEXT: gke_testnet-440309_us-west1-a_aztec-gke
 
+      # Sepolia deployment secrets
+      TF_VAR_L1_DEPLOYMENT_PRIVATE_KEY: ${{ secrets.L1_DEPLOYMENT_PRIVATE_KEY }}
+      TF_VAR_VALIDATOR_KEYS: ${{ secrets.VALIDATOR_KEYS }}
+      TF_VAR_BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY: ${{ secrets.BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY }}
+      TF_VAR_PROVER_NODE_PROVER_PUBLISHER_PRIVATE_KEY: ${{ secrets.PROVER_NODE_PROVER_PUBLISHER_PRIVATE_KEY }}
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -125,6 +131,10 @@ jobs:
             -var="GKE_CLUSTER_CONTEXT=${{ env.GKE_CLUSTER_CONTEXT }}" \
             -var="AZTEC_DOCKER_IMAGE=${{ env.AZTEC_DOCKER_IMAGE }}" \
             -var="L1_DEPLOYMENT_MNEMONIC=${{ steps.get-mnemonic.outputs.mnemonic }}" \
+            -var="L1_DEPLOYMENT_PRIVATE_KEY=${{ secrets.L1_DEPLOYMENT_PRIVATE_KEY }}" \
+            -var="VALIDATOR_KEYS=${{ secrets.VALIDATOR_KEYS }}" \
+            -var="BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY=${{ secrets.BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY }}" \
+            -var="PROVER_NODE_PROVER_PUBLISHER_PRIVATE_KEY=${{ secrets.PROVER_NODE_PROVER_PUBLISHER_PRIVATE_KEY }}" \
             -out=tfplan \
             -lock=${{ inputs.respect_tf_lock }}
 

cspell.json

@@ -322,4 +322,4 @@
   "flagWords": [
     "anonymous"
   ]
-}
+}

scripts/run_interleaved.sh

@@ -3,13 +3,24 @@ set -eu
 # propagate errors inside while loop pipe
 set -o pipefail
 
-# Usage: run_interleaved.sh <main command> <background commands>...
+# Usage: run_interleaved.sh [-w "condition command"] <main command> <background commands>...
 # Runs the main command with output logging and background commands without logging.
 # Finishes when the main command exits.
+# -w: Optional wait condition command that must succeed before starting next command
+
+# Parse options
+WAIT_CMD=""
+while getopts "w:" opt; do
+  case $opt in
+    w) WAIT_CMD="$OPTARG";;
+    \?) echo "Invalid option -$OPTARG" >&2; exit 1;;
+  esac
+done
+shift $((OPTIND-1))
 
 # Check if at least two commands are provided (otherwise what is the point)
 if [ "$#" -lt 2 ]; then
-  echo "Usage: $0 <main-command> <background commands>..."
+  echo "Usage: $0 [-w 'condition command'] <main-command> <background commands>..."
   exit 1
 fi
 
@@ -51,6 +62,13 @@ function run_command() {
 # Run background commands without logging output
 i=0
 for cmd in "$@"; do
+  if [ $i -gt 0 ] && [ -n "$WAIT_CMD" ]; then
+    echo "Waiting for condition before starting next command..."
+    until eval "$WAIT_CMD"; do
+      sleep 1
+    done
+  fi
+
   (run_command "$cmd" "${colors[$((i % ${#colors[@]}))]}" || [ $FINISHED = true ] || (echo "$cmd causing terminate" && kill 0) ) &
   ((i++)) || true # annoyingly considered a failure based on result
 done

spartan/aztec-network/files/config/config-validator-env.sh

@@ -3,7 +3,7 @@ set -eu
 
 # Pass a PXE url as an argument
 # Ask the PXE's node for l1 contract addresses
-output=$(node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js get-node-info -u $1 --node-url '')
+output=$(node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js get-node-info -u $1)
 
 echo "$output"
 

spartan/aztec-network/files/config/deploy-l1-contracts.sh

@@ -3,22 +3,34 @@ set -exu
 
 CHAIN_ID=$1
 
-
 # Run the deploy-l1-contracts command and capture the output
 output=""
 MAX_RETRIES=5
 RETRY_DELAY=60
 for attempt in $(seq 1 $MAX_RETRIES); do
-  # if INIT_VALIDATORS is true, then we need to pass the validators flag to the deploy-l1-contracts command
+  # Construct base command
+  base_cmd="node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js deploy-l1-contracts"
+
+  # Add account - use private key if set, otherwise use mnemonic
+  if [ -n "${L1_DEPLOYMENT_PRIVATE_KEY:-}" ]; then
+    base_cmd="$base_cmd --private-key $L1_DEPLOYMENT_PRIVATE_KEY"
+  else
+    base_cmd="$base_cmd --mnemonic $MNEMONIC"
+  fi
+
+  # Add validators if INIT_VALIDATORS is true
   if [ "${INIT_VALIDATORS:-false}" = "true" ]; then
-    output=$(node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js deploy-l1-contracts --mnemonic "$MNEMONIC" --validators $2 --l1-chain-id $CHAIN_ID) && break
+    output=$($base_cmd --validators $2 --l1-chain-id $CHAIN_ID) && break
   else
-    output=$(node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js deploy-l1-contracts --mnemonic "$MNEMONIC" --l1-chain-id $CHAIN_ID) && break
+    output=$($base_cmd --l1-chain-id $CHAIN_ID) && break
   fi
+
   echo "Attempt $attempt failed. Retrying in $RETRY_DELAY seconds..."
   sleep "$RETRY_DELAY"
-done || { echo "All l1 contract deploy attempts failed."; exit 1; }
-
+done || {
+  echo "All l1 contract deploy attempts failed."
+  exit 1
+}
 
 echo "$output"
 

spartan/aztec-network/files/config/setup-service-addresses.sh

@@ -53,8 +53,8 @@ get_service_address() {
 }
 
 # Configure Ethereum address
-if [ "${ETHEREUM_EXTERNAL_HOST}" != "" ]; then
-    ETHEREUM_ADDR="${ETHEREUM_EXTERNAL_HOST}"
+if [ "${EXTERNAL_ETHEREUM_HOST}" != "" ]; then
+    ETHEREUM_ADDR="${EXTERNAL_ETHEREUM_HOST}"
 elif [ "${NETWORK_PUBLIC}" = "true" ]; then
     ETHEREUM_ADDR=$(get_service_address "ethereum" "${ETHEREUM_PORT}")
 else

spartan/aztec-network/templates/boot-node.yaml

@@ -36,8 +36,8 @@ spec:
               cat /shared/config/service-addresses
               echo "Awaiting ethereum node at ${ETHEREUM_HOST}"
               until curl -s -X POST -H 'Content-Type: application/json' \
-                -d '{"jsonrpc":"2.0","method":"web3_clientVersion","params":[],"id":67}' \
-                ${ETHEREUM_HOST} | grep -q reth; do
+                -d '{"jsonrpc":"2.0","method":"eth_chainId","params":[],"id":67}' \
+                ${ETHEREUM_HOST} | grep 0x; do
                 echo "Waiting for Ethereum node ${ETHEREUM_HOST}..."
                 sleep 5
               done
@@ -78,6 +78,8 @@ spec:
               value: "true"
             - name: MNEMONIC
               value: "{{ .Values.aztec.l1DeploymentMnemonic }}"
+            - name: L1_DEPLOYMENT_PRIVATE_KEY
+              value: "{{ .Values.ethereum.deployL1ContractsPrivateKey }}"
             - name: ETHEREUM_SLOT_DURATION
               value: "{{ .Values.ethereum.blockTime }}"
             - name: AZTEC_SLOT_DURATION
@@ -154,6 +156,8 @@ spec:
               value: "{{ .Values.bootNode.sequencer.minTxsPerBlock }}"
             - name: VALIDATOR_PRIVATE_KEY
               value: "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+            - name: SEQ_PUBLISHER_PRIVATE_KEY
+              value: "{{ .Values.bootNode.seqPublisherPrivateKey }}"
             - name: OTEL_RESOURCE_ATTRIBUTES
               value: service.name={{ .Release.Name }},service.namespace={{ .Release.Namespace }},service.version={{ .Chart.AppVersion }},environment={{ .Values.environment | default "production" }}
             - name: PROVER_REAL_PROOFS
@@ -168,6 +172,14 @@ spec:
               value: "{{ .Values.aztec.epochDuration }}"
             - name: AZTEC_EPOCH_PROOF_CLAIM_WINDOW_IN_L2_SLOTS
               value: "{{ .Values.aztec.epochProofClaimWindow }}"
+            - name: ARCHIVER_POLLING_INTERVAL_MS
+              value: {{ .Values.bootNode.archiverPollingInterval | quote }}
+            - name: ARCHIVER_VIEM_POLLING_INTERVAL_MS
+              value: {{ .Values.bootNode.archiverViemPollingInterval | quote }}
+            - name: L1_READER_VIEM_POLLING_INTERVAL_MS
+              value: {{ .Values.bootNode.archiverViemPollingInterval | quote }}
+            - name: SEQ_VIEM_POLLING_INTERVAL_MS
+              value: {{ .Values.bootNode.viemPollingInterval | quote }}
             - name: PEER_ID_PRIVATE_KEY
               value: "{{ .Values.bootNode.peerIdPrivateKey }}"
           ports:

spartan/aztec-network/templates/prover-node.yaml

@@ -34,8 +34,8 @@ spec:
             - |
               source /shared/config/service-addresses
               until curl -s -X POST -H 'Content-Type: application/json' \
-                -d '{"jsonrpc":"2.0","method":"web3_clientVersion","params":[],"id":67}' \
-                ${ETHEREUM_HOST} | grep -q reth; do
+                -d '{"jsonrpc":"2.0","method":"eth_chainId","params":[],"id":67}' \
+                ${ETHEREUM_HOST} | grep 0x; do
                 echo "Waiting for Ethereum node ${ETHEREUM_HOST}..."
                 sleep 5
               done
@@ -140,7 +140,7 @@ spec:
             - name: PROVER_BROKER_DATA_DIRECTORY
               value: "{{ .Values.proverNode.proverBroker.dataDirectory }}"
             - name: PROVER_PUBLISHER_PRIVATE_KEY
-              value: "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+              value: "{{ .Values.proverNode.proverPublisherPrivateKey }}"
             - name: OTEL_RESOURCE_ATTRIBUTES
               value: service.name={{ .Release.Name }},service.namespace={{ .Release.Namespace }},service.version={{ .Chart.AppVersion }},environment={{ .Values.environment | default "production" }}
             - name: L1_CHAIN_ID
@@ -159,6 +159,8 @@ spec:
               value: "{{ .Values.aztec.epochDuration }}"
             - name: AZTEC_EPOCH_PROOF_CLAIM_WINDOW_IN_L2_SLOTS
               value: "{{ .Values.aztec.epochProofClaimWindow }}"
+            - name: PROVER_VIEM_POLLING_INTERVAL_MS
+              value: {{ .Values.proverNode.viemPollingInterval | quote }}
           ports:
             - containerPort: {{ .Values.proverNode.service.nodePort }}
             - containerPort: {{ .Values.proverNode.service.p2pTcpPort }}

spartan/aztec-network/templates/reth.yaml

@@ -1,3 +1,4 @@
+{{- if not .Values.network.disableEthNode }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -135,4 +136,5 @@ spec:
     requests:
       storage: {{ .Values.ethereum.storage }}
 {{- end }}
----
+---
+{{ end }}

spartan/aztec-network/templates/validator.yaml

@@ -37,8 +37,8 @@ spec:
               cat /shared/config/service-addresses
               # First check ethereum node
               until curl -s -X POST -H 'Content-Type: application/json' \
-                -d '{"jsonrpc":"2.0","method":"web3_clientVersion","params":[],"id":67}' \
-                $ETHEREUM_HOST | grep -q reth; do
+                -d '{"jsonrpc":"2.0","method":"eth_chainId","params":[],"id":67}' \
+                $ETHEREUM_HOST | grep 0x; do
                 echo "Waiting for Ethereum node ${ETHEREUM_HOST}..."
                 sleep 5
               done
@@ -175,6 +175,16 @@ spec:
               value: "{{ .Values.aztec.epochDuration }}"
             - name: AZTEC_EPOCH_PROOF_CLAIM_WINDOW_IN_L2_SLOTS
               value: "{{ .Values.aztec.epochProofClaimWindow }}"
+            - name: VALIDATOR_ATTESTATIONS_POLLING_INTERVAL_MS
+              value: {{ .Values.validator.attestationPollingInterval | quote }}
+            - name: ARCHIVER_POLLING_INTERVAL_MS
+              value: {{ .Values.validator.archiverPollingInterval | quote }}
+            - name: ARCHIVER_VIEM_POLLING_INTERVAL_MS
+              value: {{ .Values.validator.viemPollingInterval | quote }}
+            - name: L1_READER_VIEM_POLLING_INTERVAL_MS
+              value: {{ .Values.validator.viemPollingInterval | quote }}
+            - name: SEQ_VIEM_POLLING_INTERVAL_MS
+              value: {{ .Values.validator.viemPollingInterval | quote }}
           ports:
             - containerPort: {{ .Values.validator.service.nodePort }}
             - containerPort: {{ .Values.validator.service.p2pTcpPort }}

spartan/aztec-network/values.yaml

@@ -37,6 +37,7 @@ aztec:
   l1DeploymentMnemonic: "test test test test test test test test test test test junk" # the mnemonic used when deploying contracts
 
 bootNode:
+  seqPublisherPrivateKey: ""
   peerIdPrivateKey: ""
   externalHost: ""
   replicas: 1
@@ -72,6 +73,9 @@ bootNode:
     feeJuiceAddress: ""
     feeJuicePortalAddress: ""
   storage: "8Gi"
+  archiverPollingInterval: 1000
+  archiverViemPollingInterval: 1000
+  viemPollingInterval: 1000
 
 validator:
   # If true, the validator will use its peers to serve as the boot node.
@@ -108,8 +112,13 @@ validator:
     requests:
       memory: "2Gi"
       cpu: "200m"
+  archiverPollingInterval: 1000
+  archiverViemPollingInterval: 1000
+  attestationPollingInterval: 1000
+  viemPollingInterval: 1000
 
 proverNode:
+  proverPublisherPrivateKey: "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
   externalHost: ""
   replicas: 1
   p2pEnabled: true
@@ -134,6 +143,10 @@ proverNode:
       memory: "2Gi"
       cpu: "200m"
   storage: "8Gi"
+  archiverPollingInterval: 1000
+  archiverViemPollingInterval: 1000
+  pollInterval: 1000
+  viemPollingInterval: 1000
 
 pxe:
   logLevel: "debug"
@@ -204,6 +217,7 @@ ethereum:
       memory: "2Gi"
       cpu: "200m"
   storage: "80Gi"
+  deployL1ContractsPrivateKey:
 
 proverAgent:
   service:
@@ -219,6 +233,7 @@ proverAgent:
     hardwareConcurrency: ""
   nodeSelector: {}
   resources: {}
+  pollInterval: 200
 
 proverBroker:
   service:

spartan/aztec-network/values/sepolia-3-validators-with-metrics.yaml

@@ -0,0 +1,30 @@
+telemetry:
+  enabled: true
+  otelCollectorEndpoint: http://metrics-opentelemetry-collector.metrics:4318
+
+network:
+  setupL2Contracts: false
+  disableEthNode: true
+  public: false
+
+ethereum:
+  externalHost: "https://sepolia.infura.io/v3/${INFURA_API_KEY}"
+  chainId: "11155111"
+
+validator:
+  replicas: 3
+  validatorKeys:
+  validatorAddresses:
+    - 0xB5221f3FA03acDEA5A68e355CcDed3f76847F375
+    - 0x226E9D4c69525884b0A52C1E9E4C11054729223e
+    - 0xA33Fa6E2890C37C42CFC0875B86462E73885e02b
+  validator:
+    disabled: false
+
+bootNode:
+  seqPublisherPrivateKey:
+  validator:
+    disabled: true
+
+proverNode:
+  proverPublisherPrivateKey:

spartan/terraform/deploy-release/main.tf

@@ -52,6 +52,28 @@ resource "helm_release" "aztec-gke-cluster" {
     value = var.L1_DEPLOYMENT_MNEMONIC
   }
 
+  set {
+    name  = "ethereum.deployL1ContractsPrivateKey"
+    value = var.L1_DEPLOYMENT_PRIVATE_KEY
+  }
+
+  set {
+    name = "validator.validatorKeys"
+    value = jsonencode({
+      for key in var.VALIDATOR_KEYS : key => true
+    })
+  }
+
+  set {
+    name  = "bootNode.seqPublisherPrivateKey"
+    value = var.BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY
+  }
+
+  set {
+    name  = "proverNode.proverPublisherPrivateKey"
+    value = var.PROVER_PUBLISHER_PRIVATE_KEY
+  }
+
   # Setting timeout and wait conditions
   timeout       = 1200 # 20 minutes in seconds
   wait          = true