Refactor ethd config

.github/test-ethd-config.exp

@@ -25,77 +25,49 @@ proc default-deployment {} {
     expect "Select Network"
     accept_default
 
-    expect "Select deployment"
+    expect "Select deployment type"
     accept_default
 
-    expect "Select consensus"
+    expect "Select consensus client"
     accept_default
 
-    expect "Select execution"
+    expect "Select execution client"
     accept_default
 }
 
 proc all-defaults {} {
     global spawn_id
     default-deployment
 
-    expect "Checkpoint Sync"
-    yes
-
-    expect "Configure checkpoint"
+    expect "Configure CL checkpoint sync URL"
     accept_default
 
     expect "MEV Boost"
     yes
 
-    expect "Configure MEV"
+    expect "Relays list"
     accept_default
 
     expect "Grafana"
     yes
 
-    expect "Configure rewards"
+    expect "Configure rewards address"
     address
 
     expect "Configure Graffiti"
     accept_default
 
-    expect EOF
-}
-
-proc no-checkpoint {} {
-    global spawn_id
-    default-deployment
-
-    expect "Checkpoint Sync"
-    no
-
-    expect "MEV Boost"
-    yes
-
-    expect "Configure MEV"
-    accept_default
-
-    expect "Grafana"
+    expect "Default Graffiti"
     yes
 
-    expect "Configure rewards"
-    accept_default
-
-    expect "Configure Graffiti"
-    accept_default
-
     expect EOF
 }
 
 proc no-mev {} {
     global spawn_id
     default-deployment
 
-    expect "Checkpoint Sync"
-    yes
-
-    expect "Configure checkpoint"
+    expect "Configure CL checkpoint sync URL"
     accept_default
 
     expect "MEV Boost"
@@ -104,40 +76,43 @@ proc no-mev {} {
     expect "Grafana"
     yes
 
-    expect "Configure rewards"
-    accept_default
+    expect "Configure rewards address"
+    address
 
     expect "Configure Graffiti"
     accept_default
 
+    expect "Default Graffiti"
+    yes
+
     expect EOF
 }
 
 proc no-grafana {} {
     global spawn_id
     default-deployment
 
-    expect "Checkpoint Sync"
-    yes
-
-    expect "Configure checkpoint"
+    expect "Configure CL checkpoint sync URL"
     accept_default
 
     expect "MEV Boost"
     yes
 
-    expect "Configure MEV"
+    expect "Relays list"
     accept_default
 
     expect "Grafana"
     no
 
-    expect "Configure rewards"
-    accept_default
+    expect "Configure rewards address"
+    address
 
     expect "Configure Graffiti"
     accept_default
 
+    expect "Default Graffiti"
+    yes
+
     expect EOF
 }
 

.github/workflows/test-ethd.yml

@@ -45,6 +45,9 @@ jobs:
           ENV_VERSION=42
           var=ENV_VERSION
           set_value_in_env
+          COMPOSE_FILE=teku.yml:besu.yml
+          var=COMPOSE_FILE
+          set_value_in_env
       - name: Test ethd update
         run: ./ethd update --debug --non-interactive
       - name: Remove .env
@@ -53,10 +56,6 @@ jobs:
         run: expect ./.github/test-ethd-config.exp all-defaults
         env:
           TERM: xterm
-      - name: Test ethd config no checkpoint
-        run: expect ./.github/test-ethd-config.exp no-checkpoint
-        env:
-          TERM: xterm
       - name: Test ethd config no mev
         run: expect ./.github/test-ethd-config.exp no-mev
         env:

default.env

@@ -1,6 +1,12 @@
 # The settings for eth-docker are in .env, use "nano .env". Don't edit default.env itself.
 # Client choice: See https://ethdocker.com/Usage/Advanced/ClientSetup for available options
-COMPOSE_FILE=teku.yml:besu.yml:deposit-cli.yml
+# Compose yml files you'd like to add into the config manually, that wouldn't ever be added
+# by "ethd config". For overrides use custom.yml
+CUSTOM_FILES=
+# This variable is overwritten on every run of "ethd config"
+CORE_FILES=teku.yml:web3signer.yml:besu.yml:deposit-cli.yml
+# Do not touch this, it combines the two
+COMPOSE_FILE=${CORE_FILES}${CUSTOM_FILES:+:${CUSTOM_FILES}}
 # Set the ETH address that priority fees and MEV rewards should be sent to
 FEE_RECIPIENT=
 # Decide whether to connect the CL to Commit Boost or Flashbots MEV Boost, and configure the VC to register with it.
@@ -9,9 +15,9 @@ FEE_RECIPIENT=
 MEV_BOOST=false
 # For relay information, please see https://ethstaker.cc/mev-relay-list/
 MEV_RELAYS="
-https://0xaa58208899c6105603b74396734a6263cc7d947f444f396a90f7b7d3e65d102aec7e5e5291b27e08d02c50a050825c2f@hoodi.titanrelay.xyz,
 https://0x98f0ef62f00780cf8eb06701a7d22725b9437d4768bb19b363e882ae87129945ec206ec2dc16933f31d983f8225772b6@hoodi.aestus.live,
 https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-hoodi.flashbots.net,
+https://0xaa58208899c6105603b74396734a6263cc7d947f444f396a90f7b7d3e65d102aec7e5e5291b27e08d02c50a050825c2f@hoodi.titanrelay.xyz,
 https://0xb1559beef7b5ba3127485bbbb090362d9f497ba64e177ee2c8e7db74746306efad687f2cf8574e38d70067d40ef136dc@relay-hoodi.ultrasound.money
 "
 # Set a minimum MEV bid (e.g. 0.05), used by mev-boost.yml. If empty, no minimum is used.
@@ -24,7 +30,7 @@ MAX_BLOBS=
 GRAFFITI=
 # Set to true to use the client's default Graffiti. Overrides GRAFFITI
 DEFAULT_GRAFFITI=true
-# Merged network to use. If using main net, set to mainnet.
+# Network to use. Supports hoodi, sepolia, ephemery, mainnet, gnosis, and custom URL
 NETWORK=hoodi
 # CL rapid sync via initial state/checkpoint. Please use one from https://eth-clients.github.io/checkpoint-sync-endpoints/
 # Alternatively, use an already synced CL that you trust. No trailing / for Teku, please.
@@ -48,8 +54,6 @@ SIREN_PASSWORD=
 CONTRIBUTOOR_USERNAME=
 # EthPandaOps Contributoor Password
 CONTRIBUTOOR_PASSWORD=
-# EthPandaOps Contributoor additional parameters
-CONTRIBUTOOR_EXTRAS=
 
 # Promtail logs label, something unique like the server name
 LOGS_LABEL=eth-docker
@@ -182,16 +186,16 @@ CL_REST_PORT=5052
 NODE_EXPORTER_PORT=9199
 
 
-# Additional parameters for the EL client. For example, on low-memory machines,
-# you may want to use it to lower Geth cache, or to increase it on high-memory machines
-#EL_EXTRAS=--cache=256
+# Additional parameters for the execution layer (EL) client
 EL_EXTRAS=
-# Additional parameters for the CL client.
+# Additional parameters for the consensus layer (CL) client
 CL_EXTRAS=
-# Additional parameters for the validator client.
+# Additional parameters for the validator client (VC)
 VC_EXTRAS=
 # Additional parameters for a DVT client - only in use with Anchor
 DVT_EXTRAS=
+# EthPandaOps Contributoor additional parameters
+CONTRIBUTOOR_EXTRAS=
 # Additional parameters for MEV-boost. Examples:
 # Request timeouts to prevent missed blocks due to slow relays:
 #   MEV_EXTRAS=--request-timeout-getheader 1500 --request-timeout-getpayload 4000
@@ -201,14 +205,14 @@ MEV_EXTRAS=
 # Additional parameters for a verified RPC proxy
 PROXY_EXTRAS=
 
-# Heap for Besu and Teku, both written in Java. Sets JAVA_OPTS to this value, for example TEKU_HEAP=-Xmx8g to set it
-# to 8g. If left empty, the defaults in besu.yml and teku.yml are used.
+# Heap for Besu and Teku, both written in Java. Sets JAVA_OPTS to this value, for example TEKU_HEAP=-Xmx12g to set it
+# to 12g. If left empty, the defaults in besu.yml and teku.yml are used
 BESU_HEAP=
 TEKU_HEAP=
 # Heap for Web3signer. Defaults to -Xmx4g; -Xmx2g should also work in many setups
 W3S_HEAP=
-# Heap for Lodestar. Sets NODE_OPTIONS to this value, for example --max-old-space-size=8192.
-# If left empty, the default in lodestar.yml will be used.
+# Heap for Lodestar. Sets NODE_OPTIONS to this value, for example --max-old-space-size=16384
+# If left empty, the default in lodestar.yml will be used
 LODESTAR_HEAP=
 
 # CL_NODE_TYPE can be "archive", "full", "pruned" or "pruned-with-zkproofs"
@@ -224,7 +228,7 @@ CL_NODE_TYPE=pruned
 # Switching node type typically requires a resync
 # Consider using `./ethd prune-history`, which guides you as to whether to prune in-place
 # or resync, depending on client
-# "pre-prague-expiry" is supported with Reth and Nethermind
+# "pre-prague-expiry" is supported with Geth, Reth and Nethermind
 # "rolling-expiry" is supported with Reth, Erigon, Nethermind and Besu
 # "rolling-expiry" is experimental in Nethermind and Besu as of Jan 27th 2026
 # "aggressive-expiry" is supported with Reth, Erigon and Besu
@@ -261,7 +265,6 @@ CL_ALIAS=${NETWORK}-consensus
 EL_ALIAS=${NETWORK}-execution
 MEV_ALIAS=${NETWORK}-mev
 RPC_PROXY_ALIAS=${NETWORK}-rpc-proxy
-WS_PROXY_ALIAS=${NETWORK}-ws-proxy
 # MEV-boost address. This would only be changed for Vouch setups
 MEV_NODE=http://${MEV_ALIAS}:18550
 # Web3signer address - match service name or alias, or it can be remote
@@ -481,4 +484,4 @@ NODE_EXPORTER_IGNORE_MOUNT_REGEX='^/(dev|proc|sys|run|var/snap/.+|var/lib/docker
 DOCKER_ROOT=/var/lib/docker
 
 # Used by ethd update - please do not adjust
-ENV_VERSION=53
+ENV_VERSION=54