From fe5e10fdbc5ca3c26c415b3ffc225f69dc660cb3 Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Wed, 24 Jul 2024 03:28:58 +0000 Subject: [PATCH] Fix status script fork check (#18) Fixes the `status.sh` script to recognize Capella and Deneb as post-Merge forks. Fixes https://git.vdb.to/cerc-io/fixturenet-eth-stacks/issues/17. Reviewed-on: https://git.vdb.to/cerc-io/fixturenet-eth-stacks/pulls/18 --- .../scripts/status.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh index d9f33d1..7374935 100755 --- a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh +++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh @@ -9,7 +9,7 @@ STATUSES=( "beacon phase0" "beacon altair" "beacon bellatrix pre-merge" - "beacon bellatrix merge" + "beacon post-merge" "block number $MIN_BLOCK_NUM" ) STATUS=0 @@ -69,14 +69,22 @@ while [ $STATUS -lt ${#STATUSES[@]} ]; do ;; 2) result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.version'` - if [ ! -z "$result" ] && ([ "$result" == "altair" ] || [ "$result" == "bellatrix" ]); then - inc_status + if [ ! -z "$result" ]; then + case "$result" in + "altair" | "bellatrix" | "capella" | "deneb") + inc_status + ;; + esac fi ;; 3) result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.version'` - if [ ! -z "$result" ] && [ "$result" == "bellatrix" ]; then - inc_status + if [ ! -z "$result" ]; then + case "$result" in + "bellatrix" | "capella" | "deneb") + inc_status + ;; + esac fi ;; 4)