diff --git a/spartan/aztec-network/templates/_helpers.tpl b/spartan/aztec-network/templates/_helpers.tpl index 73d8d5cc6423..bcd198a3e94b 100644 --- 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 index b542cf41977d..48c74db4eb4a 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 35b7ba243ab0..f134f9146aba 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 05e6ebea9022..5c6a3d44af4a 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 c846e89094c7..fbd775704363 100644 --- 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 index dfc1acac37cf..e7eb9e6f7aeb 100644 --- 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 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/rc-2.yaml b/spartan/aztec-network/values/rc-2.yaml index edded02e9d38..7c5822683612 100644 --- 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 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/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 ef8aecf11fc8..59127b69df88 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,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 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" diff --git a/spartan/terraform/deploy-release/main.tf b/spartan/terraform/deploy-release/main.tf index fb9fd2870ec2..98dd76f67e90 100644 --- 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 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 }