From 0898f8781e6729cdc28268b76d15de13581db551 Mon Sep 17 00:00:00 2001
From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Date: Wed, 29 Jan 2025 14:54:29 +0000
Subject: [PATCH 1/3] fix: reintroduce external hosts

---
 spartan/aztec-network/templates/_helpers.tpl | 2 +-
 spartan/aztec-network/values.yaml            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spartan/aztec-network/templates/_helpers.tpl b/spartan/aztec-network/templates/_helpers.tpl
index 23713329ce35..fd02106197ad 100644
--- a/spartan/aztec-network/templates/_helpers.tpl
+++ b/spartan/aztec-network/templates/_helpers.tpl
@@ -142,7 +142,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/values.yaml b/spartan/aztec-network/values.yaml
index c660769756f0..47d1eff87e78 100644
--- a/spartan/aztec-network/values.yaml
+++ b/spartan/aztec-network/values.yaml
@@ -228,8 +228,8 @@ ethereum:
   # 10 times the default of 131072
   maxTxInputSizeBytes: "1310720"
   args: ""
-  externalHost: ""
   execution:
+    externalHost: ""
     service:
       port: 8545
       targetPort: 8545
@@ -240,6 +240,7 @@ ethereum:
         cpu: "1"
     storageSize: "80Gi"
   beacon:
+    externalHost: ""
     service:
       port: 5052
       targetPort: 5052

From f88b674e78e73b92318fede6a74adb1375bc0ecf Mon Sep 17 00:00:00 2001
From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Date: Wed, 29 Jan 2025 15:02:26 +0000
Subject: [PATCH 2/3] fix: update host elsewhere

---
 spartan/aztec-network/templates/eth/eth-beacon.yaml          | 2 +-
 spartan/aztec-network/templates/eth/eth-execution.yaml       | 2 +-
 spartan/aztec-network/templates/eth/eth-validator.yaml       | 2 +-
 spartan/aztec-network/templates/faucet.yaml                  | 2 +-
 spartan/aztec-network/values/rc-2.yaml                       | 5 ++++-
 .../values/sepolia-48-validators-with-metrics.yaml           | 5 ++++-
 .../sepolia-48-validators-with-proving-and-metrics.yaml      | 5 ++++-
 spartan/terraform/deploy-release/main.tf                     | 2 +-
 spartan/terraform/multicloud-deploy/main.tf                  | 2 +-
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/spartan/aztec-network/templates/eth/eth-beacon.yaml b/spartan/aztec-network/templates/eth/eth-beacon.yaml
index 8ab5d89e41d6..d19f68d8aba8 100644
--- 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
index 6c4e475936b0..934bff3ef58f 100644
--- 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
index 87f34b023f89..c7aabbe5c9d3 100644
--- 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
index 0f93712e9759..245fb41166b9 100644
--- a/spartan/aztec-network/templates/faucet.yaml
+++ b/spartan/aztec-network/templates/faucet.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/values/rc-2.yaml b/spartan/aztec-network/values/rc-2.yaml
index ccd1f1018744..e3c2f6637317 100644
--- a/spartan/aztec-network/values/rc-2.yaml
+++ b/spartan/aztec-network/values/rc-2.yaml
@@ -17,7 +17,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-metrics.yaml b/spartan/aztec-network/values/sepolia-48-validators-with-metrics.yaml
index ba8b96834cab..1142e790c4d5 100644
--- 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
index 3307547318b7..0caf082ded0c 100644
--- 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,10 @@ network:
 ethereum:
   chainId: "11155111"
   deployL1ContractsPrivateKey:
-  externalHost:
+  execution:
+    externalHost:
+  beacon:
+    externalHost:
 
 validator:
   l1FixedPriorityFeePerGas: 2
diff --git a/spartan/terraform/deploy-release/main.tf b/spartan/terraform/deploy-release/main.tf
index 70967493b00f..deef6d1a1a16 100644
--- a/spartan/terraform/deploy-release/main.tf
+++ b/spartan/terraform/deploy-release/main.tf
@@ -90,7 +90,7 @@ resource "helm_release" "aztec-gke-cluster" {
   dynamic "set" {
     for_each = var.ETHEREUM_EXTERNAL_HOST != "" ? toset(["iterate"]) : toset([])
     content {
-      name  = "ethereum.externalHost"
+      name  = "ethereum.execution.externalHost"
       value = var.ETHEREUM_EXTERNAL_HOST
     }
   }
diff --git a/spartan/terraform/multicloud-deploy/main.tf b/spartan/terraform/multicloud-deploy/main.tf
index b946675a9e5f..340a20a00941 100644
--- 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
   }
 

From 4c9ef7ba339e7f2a23cb15312f3b2ed7dca128e0 Mon Sep 17 00:00:00 2001
From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:47:04 +0000
Subject: [PATCH 3/3] fix: post merge update

---
 spartan/aztec-network/values/ci-sepolia.yaml                   | 3 ++-
 spartan/aztec-network/values/ignition-testnet.yaml             | 2 +-
 .../values/sepolia-3-validators-with-metrics.yaml              | 3 ++-
 spartan/scripts/deploy_kind.sh                                 | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/spartan/aztec-network/values/ci-sepolia.yaml b/spartan/aztec-network/values/ci-sepolia.yaml
index 614c9f01803a..a7b60d5ffe00 100644
--- 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
index b38231fdb90d..9ee64cc1642c 100644
--- 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/sepolia-3-validators-with-metrics.yaml b/spartan/aztec-network/values/sepolia-3-validators-with-metrics.yaml
index 4f3c9c5d372e..02d64b1a7083 100644
--- 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/scripts/deploy_kind.sh b/spartan/scripts/deploy_kind.sh
index 929d17d857ed..0458a80eccd1 100755
--- 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"