Make validator alias configurable

yorickdowne · Nov 17, 2024 · 913ebf2 · 913ebf2
1 parent a5dec50
commit 913ebf2
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 28 deletions.
diff --git a/default.env b/default.env
@@ -171,6 +171,8 @@ EL_NODE=http://execution:8551
 CL_NODE=http://consensus:5052
 # MEV-boost address. This would only be changed for Vouch setups
 MEV_NODE=http://mev-boost:18550
+# Used by "ethd keys", adjust this if you have multiple Eth Docker stacks connected to the same Docker bridge network
+VC_ALIAS=vc
 # Consensus client addresses for Charon in Obol setup
 OBOL_CHARON_CL_ENDPOINTS=http://consensus:5052
 # Consensus client address for Lido DV Exit and Lido Validator Ejector services in Obol setup
@@ -340,4 +342,4 @@ DDNS_TAG=v2
 NODE_EXPORTER_IGNORE_MOUNT_REGEX='^/(dev|proc|sys|run|var/lib/docker/.+)($|/)'
 
 # Used by ethd update - please do not adjust
-ENV_VERSION=19
+ENV_VERSION=20
diff --git a/ethd b/ethd
@@ -1169,7 +1169,7 @@ __env_migrate() {
     PRYSM_UDP_PORT CL_QUIC_PORT GRAFANA_PORT SIREN_PORT PROMETHEUS_PORT KEY_API_PORT TRAEFIK_WEB_PORT \
     TRAEFIK_WEB_HTTP_PORT CL_REST_PORT EL_RPC_PORT EL_WS_PORT EE_PORT ERIGON_TORRENT_PORT LOG_LEVEL JWT_SECRET \
     EL_EXTRAS CL_EXTRAS VC_EXTRAS ARCHIVE_NODE SSV_P2P_PORT SSV_P2P_PORT_UDP OBOL_P2P_PORT ERIGON_P2P_PORT_2 \
-    ERIGON_P2P_PORT_3 LODESTAR_HEAP SSV_DKG_PORT SIREN_PASSWORD LIDO_DV_EXIT_VERSION OBOL_CHARON_CL_ENDPOINTS )
+    ERIGON_P2P_PORT_3 LODESTAR_HEAP SSV_DKG_PORT SIREN_PASSWORD LIDO_DV_EXIT_VERSION OBOL_CHARON_CL_ENDPOINTS VC_ALIAS )
   __target_vars=( ETH_DOCKER_TAG NIM_SRC_BUILD_TARGET NIM_SRC_REPO NIM_DOCKER_TAG NIM_DOCKER_VC_TAG NIM_DOCKER_REPO \
     NIM_DOCKER_VC_REPO NIM_DOCKERFILE TEKU_SRC_BUILD_TARGET TEKU_SRC_REPO TEKU_DOCKER_TAG TEKU_DOCKER_REPO \
     TEKU_DOCKERFILE LH_SRC_BUILD_TARGET LH_SRC_REPO LH_DOCKER_TAG LH_DOCKER_REPO LH_DOCKERFILE SSV_NODE_REPO \

diff --git a/lighthouse-vc-only.yml b/lighthouse-vc-only.yml
@@ -39,7 +39,7 @@ services:
     networks:
       default:
         aliases:
-          - vc
+          - ${VC_ALIAS}
     <<: *logging
     entrypoint:
       - docker-entrypoint-vc.sh
@@ -130,7 +130,7 @@ services:
     entrypoint:
       - keymanager.sh
       - /var/lib/lighthouse/validators/api-token.txt
-      - vc
+      - ${VC_ALIAS}
 
 volumes:
   lhvalidator-data:

diff --git a/lighthouse.yml b/lighthouse.yml
@@ -116,7 +116,7 @@ services:
     networks:
       default:
         aliases:
-          - vc
+          - ${VC_ALIAS}
     <<: *logging
     entrypoint:
       - docker-entrypoint-vc.sh
@@ -217,7 +217,7 @@ services:
     entrypoint:
       - keymanager.sh
       - /var/lib/lighthouse/validators/api-token.txt
-      - vc
+      - ${VC_ALIAS}
 
   set-cl-prune-marker:
     profiles: ["tools"]

diff --git a/lodestar-vc-only.yml b/lodestar-vc-only.yml
@@ -40,7 +40,7 @@ services:
     networks:
       default:
         aliases:
-          - vc
+          - ${VC_ALIAS}
     <<: *logging
     entrypoint:
       - docker-entrypoint-vc.sh
@@ -123,7 +123,7 @@ services:
     entrypoint:
       - keymanager.sh
       - /var/lib/lodestar/validators/validator-db/api-token.txt
-      - vc
+      - ${VC_ALIAS}
 
 volumes:
   lsvalidator-data:

diff --git a/lodestar.yml b/lodestar.yml
@@ -115,7 +115,7 @@ services:
     networks:
       default:
         aliases:
-          - vc
+          - ${VC_ALIAS}
     <<: *logging
     entrypoint:
       - docker-entrypoint-vc.sh
@@ -200,7 +200,7 @@ services:
     entrypoint:
       - keymanager.sh
       - /var/lib/lodestar/validators/validator-db/api-token.txt
-      - vc
+      - ${VC_ALIAS}
 
 volumes:
   lsconsensus-data:

diff --git a/nimbus-vc-only.yml b/nimbus-vc-only.yml
@@ -42,7 +42,7 @@ services:
     networks:
       default:
         aliases:
-          - vc
+          - ${VC_ALIAS}
     <<: *logging
     entrypoint:
       - docker-entrypoint-vc.sh
@@ -98,7 +98,7 @@ services:
     entrypoint:
       - keymanager.sh
       - /var/lib/nimbus/api-token.txt
-      - vc
+      - ${VC_ALIAS}
 
 volumes:
   nimbus-vc-data:

diff --git a/nimbus.yml b/nimbus.yml
@@ -106,7 +106,7 @@ services:
     networks:
       default:
         aliases:
-          - vc
+          - ${VC_ALIAS}
     <<: *logging
     entrypoint:
       - docker-entrypoint-vc.sh
@@ -162,7 +162,7 @@ services:
     entrypoint:
       - keymanager.sh
       - /var/lib/nimbus/api-token.txt
-      - vc
+      - ${VC_ALIAS}
 
 volumes:
   nimbus-consensus-data:

diff --git a/prysm-vc-only.yml b/prysm-vc-only.yml
@@ -41,7 +41,7 @@ services:
     networks:
       default:
         aliases:
-          - vc
+          - ${VC_ALIAS}
     <<: *logging
     entrypoint:
       - docker-entrypoint-vc.sh
@@ -167,7 +167,7 @@ services:
     entrypoint:
       - keymanager.sh
       - /var/lib/prysm/auth-token
-      - vc
+      - ${VC_ALIAS}
 
 volumes:
   prysmvalidator-data:

diff --git a/prysm.yml b/prysm.yml
@@ -119,7 +119,7 @@ services:
     networks:
       default:
         aliases:
-          - vc
+          - ${VC_ALIAS}
     <<: *logging
     entrypoint:
       - docker-entrypoint-vc.sh
@@ -253,7 +253,7 @@ services:
     entrypoint:
       - keymanager.sh
       - /var/lib/prysm/auth-token
-      - vc
+      - ${VC_ALIAS}
 
 volumes:
   prysmbeacon-data:

diff --git a/teku-vc-only.yml b/teku-vc-only.yml
@@ -39,7 +39,7 @@ services:
     networks:
       default:
         aliases:
-          - vc
+          - ${VC_ALIAS}
     <<: *logging
     entrypoint:
       - docker-entrypoint-vc.sh
@@ -111,7 +111,7 @@ services:
     entrypoint:
       - keymanager.sh
       - /var/lib/teku/validator/key-manager/validator-api-bearer
-      - vc
+      - ${VC_ALIAS}
 
 volumes:
   teku-data:

diff --git a/teku.yml b/teku.yml
@@ -111,7 +111,7 @@ services:
     networks:
       default:
         aliases:
-          - vc
+          - ${VC_ALIAS}
     <<: *logging
     entrypoint:
       - docker-entrypoint-vc.sh
@@ -184,7 +184,7 @@ services:
     entrypoint:
       - keymanager.sh
       - /var/lib/teku/validator/key-manager/validator-api-bearer
-      - vc
+      - ${VC_ALIAS}
 
 volumes:
   tekuconsensus-data:

diff --git a/vc-utils/keymanager.sh b/vc-utils/keymanager.sh
@@ -1167,9 +1167,9 @@ set -e
 if [ "$(id -u)" = '0' ]; then
     __token_file=$1
     __api_container=$2
-    case "$__api_container" in
-        vc) __service=validator;;
-        *) __service="$__api_container";;
+    case "$__api_container" in  # It's either consensus or some alias for the validator service
+        consensus) __service=consensus;;
+        *) __service=validator;;
     esac
     __api_port=${KEY_API_PORT:-7500}
     if [ -z "${TLS:+x}" ]; then
@@ -1218,9 +1218,9 @@ else
     __api_tls=true
 fi
 
-case "$__api_container" in
-    vc) __service=validator;;
-    *) __service="$__api_container";;
+case "$__api_container" in  # It's either consensus or some alias for the validator service
+    consensus) __service=consensus;;
+    *) __service=validator;;
 esac
 
 if echo "$@" | grep -q '.*--debug.*' 2>/dev/null ; then