Skip to content

Fix ethd config bugs #2437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yorickdowne merged 1 commit into from
Jan 23, 2026
Merged

Fix ethd config bugs #2437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions ethd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3817,44 +3817,44 @@ __query_deployment() {

__query_validator_client() {
if [[ "${NETWORK}" = "gnosis" ]]; then
CONSENSUS_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
VALIDATOR_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
"Which validator client do you want to run?" 12 65 4 \
"lighthouse-vc-only.yml" "Lighthouse validator client" \
"teku-vc-only.yml" "Teku validator client" \
"lodestar-vc-only.yml" "Lodestar validator client" \
"nimbus-vc-only.yml" "Nimbus validator client" 3>&1 1>&2 2>&3)
elif [[ "${NETWORK}" = "ephemery" ]]; then
CONSENSUS_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
VALIDATOR_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
"Which validator client do you want to run?" 9 65 2 \
"teku-vc-only.yml" "Teku validator client" \
"lodestar-vc-only.yml" "Lodestar validator client" \
3>&1 1>&2 2>&3)
elif [[ "${__deployment}" = "rocket" ]]; then
if uname -m | grep -q aarch64 || uname -m | grep -q arm64; then
CONSENSUS_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
VALIDATOR_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
"Which validator client do you want to run?" 12 65 4 \
"lighthouse-vc-only.yml" "Lighthouse validator client" \
"teku-vc-only.yml" "Teku validator client" \
"lodestar-vc-only.yml" "Lodestar validator client" \
"nimbus-vc-only.yml" "Nimbus validator client" 3>&1 1>&2 2>&3)
else
CONSENSUS_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
VALIDATOR_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
"Which validator client do you want to run?" 12 65 4 \
"teku-vc-only.yml" "Teku validator client" \
"lighthouse-vc-only.yml" "Lighthouse validator client" \
"lodestar-vc-only.yml" "Lodestar validator client" \
"nimbus-vc-only.yml" "Nimbus validator client" 3>&1 1>&2 2>&3)
fi
elif uname -m | grep -q aarch64 || uname -m | grep -q arm64; then
CONSENSUS_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
VALIDATOR_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
"Which validator client do you want to run?" 13 65 5 \
"lighthouse-vc-only.yml" "Lighthouse validator client" \
"teku-vc-only.yml" "Teku validator client" \
"lodestar-vc-only.yml" "Lodestar validator client" \
"nimbus-vc-only.yml" "Nimbus validator client" \
"prysm-vc-only.yml" "Prysm validator client" 3>&1 1>&2 2>&3)
else
CONSENSUS_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
VALIDATOR_CLIENT=$(whiptail --notags --title "Select validator client" --menu \
"Which validator client do you want to run?" 13 65 5 \
"teku-vc-only.yml" "Teku validator client" \
"lighthouse-vc-only.yml" "Lighthouse validator client" \
Expand All @@ -3863,7 +3863,7 @@ __query_validator_client() {
"prysm-vc-only.yml" "Prysm validator client" 3>&1 1>&2 2>&3)
fi

echo "Your validator client file is:" "${CONSENSUS_CLIENT}"
echo "Your validator client file is:" "${VALIDATOR_CLIENT}"
}


Expand Down Expand Up @@ -3912,7 +3912,8 @@ __query_consensus_client() {
fi

if [[ "${__deployment}" = "lido_obol" && "${CONSENSUS_CLIENT}" = "lodestar.yml" ]]; then
CONSENSUS_CLIENT="lodestar-cl-only.yml:lodestar-vc-only.yml" # Charon does not handle SSZ
CONSENSUS_CLIENT="lodestar-cl-only.yml" # Charon does not handle SSZ
VALIDATOR_CLIENT="lodestar-vc-only.yml"
fi

echo "Your consensus client file is:" "${CONSENSUS_CLIENT}"
Expand Down Expand Up @@ -4306,7 +4307,7 @@ https://0x98650451ba02064f7b000f5768cf0cf4d4e492317d82871bdc87ef841a0743f69f0f1e
__get_value_from_env "${var}" "${__env_file}" "__value"
# I do mean to match literally
# shellcheck disable=SC2076
if [[ "${CONSENSUS_CLIENT}" =~ "-vc-only.yml" && ! "${__deployment}" =~ "lido_obol" ]]; then
if [[ "${__deployment}" =~ (validator|rocket) ]]; then
if (whiptail --title "MEV Boost" --yesno "Is MEV Boost configured on your remote consensus client and do you \
want to use MEV Boost?" 10 65); then
MEV_BOOST="true"
Expand Down Expand Up @@ -4769,12 +4770,12 @@ __check_legacy() {

# Literal match intended
# shellcheck disable=SC2076
if [[ "${__value}" =~ "-allin1.yml" && ! "${__value}" =~ "grandine-allin1.yml" ]]; then # Warn re Grandine once VC
if [[ "${__value}" =~ "-allin1.yml" && ! "${__value}" =~ (grandine-allin1\.yml|grandine-plugin-allin1\.yml) ]]; then # Warn re Grandine once VC
if [[ "${__value}" =~ "teku-allin1.yml" ]]; then
client="Teku"
elif [[ "${__value}" =~ "nimbus-allin1.yml" ]]; then
client="Nimbus"
elif [[ "${__value}" =~ "grandine-allin1.yml" ]]; then
elif [[ "${__value}" =~ (grandine-allin1\.yml|grandine-plugin-allin1\.yml) ]]; then
client="Grandine"
else
client="Mystery"
Expand Down Expand Up @@ -4872,11 +4873,11 @@ config() {
# I do mean to match literally
# shellcheck disable=SC2076
if [[ ! "${__deployment}" =~ ^(validator|rocket)$ ]]; then
if [[ "${CONSENSUS_CLIENT}" = "caplin" ]]; then
if [[ "${CONSENSUS_CLIENT}" = "caplin.yml" ]]; then
CL_NODE=http://execution:5052
__query_execution_client
if [[ ! "${__deployment}" =~ ^(ssv|lido_ssv|rpc)$ ]]; then
__query_validator_client # This sets CONSENSUS_CLIENT
__query_validator_client
fi
else
CL_NODE="http://consensus:5052"
Expand Down Expand Up @@ -5049,7 +5050,17 @@ config() {
fi
fi

COMPOSE_FILE="${CONSENSUS_CLIENT}"
if [[ -n "${CONSENSUS_CLIENT+x}" ]]; then
COMPOSE_FILE="${CONSENSUS_CLIENT}"
if [[ -n "${VALIDATOR_CLIENT+x}" ]]; then
COMPOSE_FILE="${COMPOSE_FILE}:${VALIDATOR_CLIENT}"
fi
elif [[ -n "${VALIDATOR_CLIENT+x}" ]]; then
COMPOSE_FILE="${VALIDATOR_CLIENT}"
else
echo "No consensus client or validator client selected. This is a bug. Aborting"
exit 70
fi
if [[ -n "${EXECUTION_CLIENT+x}" ]]; then
COMPOSE_FILE="${COMPOSE_FILE}:${EXECUTION_CLIENT}"
fi
Expand Down