AztecProtocol · Maddiaa0 · Feb 7, 2025 · Jan 29, 2025 · Jan 29, 2025 · Feb 7, 2025
diff --git a/spartan/aztec-network/templates/_helpers.tpl b/spartan/aztec-network/templates/_helpers.tpl
@@ -146,7 +146,7 @@ Service Address Setup Container
     - name: OTEL_COLLECTOR_ENDPOINT
       value: "{{ .Values.telemetry.otelCollectorEndpoint }}"
     - name: EXTERNAL_ETHEREUM_HOST
-      value: "{{ .Values.ethereum.externalHost }}"
+      value: "{{ .Values.ethereum.execution.externalHost }}"
     - name: ETHEREUM_PORT
       value: "{{ .Values.ethereum.execution.service.port }}"
     - name: EXTERNAL_ETHEREUM_CONSENSUS_HOST

diff --git a/spartan/aztec-network/templates/eth/eth-beacon.yaml b/spartan/aztec-network/templates/eth/eth-beacon.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.ethereum.externalHost }}
+{{- if not .Values.ethereum.beacon.externalHost }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/spartan/aztec-network/templates/eth/eth-execution.yaml b/spartan/aztec-network/templates/eth/eth-execution.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.ethereum.externalHost }}
+{{- if not .Values.ethereum.execution.externalHost }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/spartan/aztec-network/templates/eth/eth-validator.yaml b/spartan/aztec-network/templates/eth/eth-validator.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.ethereum.externalHost }}
+{{- if not .Values.ethereum.beacon.externalHost }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/spartan/aztec-network/templates/faucet.yaml b/spartan/aztec-network/templates/faucet.yaml
@@ -1,4 +1,4 @@
-{{- if and (not .Values.ethereum.externalHost) .Values.pxe.enabled }}
+{{- if and (not .Values.ethereum.execution.externalHost) .Values.pxe.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml
@@ -240,8 +240,8 @@ ethereum:
   # 10 times the default of 131072
   maxTxInputSizeBytes: "1310720"
   args: ""
-  externalHost: ""
   execution:
+    externalHost: ""
     service:
       port: 8545
       targetPort: 8545

diff --git a/spartan/aztec-network/values/ci-sepolia.yaml b/spartan/aztec-network/values/ci-sepolia.yaml
@@ -8,9 +8,10 @@ aztec:
 
 ethereum:
   chainId: "11155111"
-  externalHost: ""
   l1GasPriceMax: 500
   l1FixedPriorityFeePerGas: 3
+  execution:
+    externalHost: ""
   beacon:
     externalHost: ""
     apiKey: ""

diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml
@@ -68,8 +68,8 @@ ethereum:
   l1GasPriceMax: 500
   l1FixedPriorityFeePerGas: 3
   deployL1ContractsPrivateKey:
-  externalHost:
   execution:
+    externalHost:
     resources:
       requests:
         memory: "1Gi"

diff --git a/spartan/aztec-network/values/rc-2.yaml b/spartan/aztec-network/values/rc-2.yaml
@@ -21,7 +21,8 @@ network:
 ethereum:
   chainId: "11155111"
   deployL1ContractsPrivateKey:
-  externalHost:
+  execution:
+    externalHost:
   beacon:
     externalHost:
     apiKey: ""

diff --git a/spartan/aztec-network/values/sepolia-3-validators-with-metrics.yaml b/spartan/aztec-network/values/sepolia-3-validators-with-metrics.yaml
@@ -15,7 +15,8 @@ ethereum:
   proverKeyIndexStart: 0
   validatorKeyIndexStart: 1
   chainId: "11155111"
-  externalHost:
+  execution:
+    externalHost:
   beacon:
     externalHost:
     apiKey:

diff --git a/spartan/aztec-network/values/sepolia-48-validators-with-metrics.yaml b/spartan/aztec-network/values/sepolia-48-validators-with-metrics.yaml
@@ -11,7 +11,10 @@ network:
 ethereum:
   chainId: "11155111"
   deployL1ContractsPrivateKey:
-  externalHost:
+  execution:
+    externalHost:
+  beacon:
+    externalHost:
 
 validator:
   l1FixedPriorityFeePerGas: 2

diff --git a/spartan/aztec-network/values/sepolia-48-validators-with-proving-and-metrics.yaml b/spartan/aztec-network/values/sepolia-48-validators-with-proving-and-metrics.yaml
@@ -17,7 +17,8 @@ network:
 ethereum:
   chainId: "11155111"
   deployL1ContractsPrivateKey:
-  externalHost:
+  execution:
+    externalHost:
   beacon:
     externalHost:
     apiKey: ""

diff --git a/spartan/scripts/deploy_kind.sh b/spartan/scripts/deploy_kind.sh
@@ -93,7 +93,7 @@ helm_set_args=(
 # If this is a sepolia run, we need to write some values
 if [ "$sepolia_deployment" = "true" ]; then
   helm_set_args+=(
-    --set ethereum.externalHost="$EXTERNAL_ETHEREUM_HOST"
+    --set ethereum.execution.externalHost="$EXTERNAL_ETHEREUM_HOST"
     --set ethereum.beacon.externalHost="$EXTERNAL_ETHEREUM_CONSENSUS_HOST"
     --set aztec.l1DeploymentMnemonic="$L1_ACCOUNTS_MNEMONIC"
     --set ethereum.deployL1ContractsPrivateKey="$L1_DEPLOYMENT_PRIVATE_KEY"

diff --git a/spartan/terraform/deploy-release/main.tf b/spartan/terraform/deploy-release/main.tf
@@ -75,7 +75,7 @@ resource "helm_release" "aztec-gke-cluster" {
   dynamic "set" {
     for_each = var.EXTERNAL_ETHEREUM_HOST != "" ? toset(["iterate"]) : toset([])
     content {
-      name  = "ethereum.externalHost"
+      name  = "ethereum.execution.externalHost"
       value = var.EXTERNAL_ETHEREUM_HOST
     }
   }

diff --git a/spartan/terraform/multicloud-deploy/main.tf b/spartan/terraform/multicloud-deploy/main.tf
@@ -172,7 +172,7 @@ resource "helm_release" "aztec-gke-cluster" {
 
   # pointing Google Cloud provers to nodes in AWS
   set {
-    name  = "ethereum.externalHost"
+    name  = "ethereum.execution.externalHost"
     value = data.kubernetes_service.lb_ethereum_tcp.status.0.load_balancer.0.ingress.0.hostname
   }