From 28315e8a0199519e861fefdbc03b99437d2115e6 Mon Sep 17 00:00:00 2001
From: Yorick Downe <yorickdowne@gmail.com>
Date: Mon, 22 Jun 2026 23:55:41 +0100
Subject: [PATCH] Better blob-archive handling

---
 ethd                            | 2 +-
 lighthouse/docker-entrypoint.sh | 6 +++---
 lodestar/docker-entrypoint.sh   | 2 +-
 prysm/docker-entrypoint.sh      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ethd b/ethd
index 5b48a248..c6f724ab 100755
--- a/ethd
+++ b/ethd
@@ -3680,7 +3680,7 @@ prune-lighthouse() {
   # Check for archive node
   var="CL_NODE_TYPE"
   __get_value_from_env "${var}" "${__env_file}" "__value"
-  if [[ "${__value}" = "archive" ]]; then
+  if [[ "${__value}" =~ archive$ ]]; then
     echo "Lighthouse is an archive node: Aborting."
     exit 1
   fi
diff --git a/lighthouse/docker-entrypoint.sh b/lighthouse/docker-entrypoint.sh
index 640f314d..14a2497a 100755
--- a/lighthouse/docker-entrypoint.sh
+++ b/lighthouse/docker-entrypoint.sh
@@ -104,8 +104,8 @@ fi
 if [[ -n "${CHECKPOINT_SYNC_URL}" ]]; then
   __checkpoint_sync="--checkpoint-sync-url=${CHECKPOINT_SYNC_URL}"
   echo "Checkpoint sync enabled"
-  if [[ "${NODE_TYPE}" = "archive" ]]; then
-    __prune+=" --reconstruct-historic-states --genesis-backfill --disable-backfill-rate-limiting"
+  if [[ "${NODE_TYPE}" =~ archive$ ]]; then
+    __prune+=" --archive --genesis-backfill --disable-backfill-rate-limiting"
   fi
 else
   __checkpoint_sync="--allow-insecure-genesis-sync"
@@ -169,7 +169,7 @@ done
 
 if [[ -f /var/lib/lighthouse/beacon/prune-marker ]]; then
   rm -f /var/lib/lighthouse/beacon/prune-marker
-  if [[ "${NODE_TYPE}" = "archive" ]]; then
+  if [[ "${NODE_TYPE}" =~ archive$ ]]; then
     echo "Lighthouse is an archive node. Not attempting to prune state: Aborting."
     exit 1
   fi
diff --git a/lodestar/docker-entrypoint.sh b/lodestar/docker-entrypoint.sh
index 4bea322c..0d65112c 100755
--- a/lodestar/docker-entrypoint.sh
+++ b/lodestar/docker-entrypoint.sh
@@ -102,7 +102,7 @@ esac
 
 # Check whether we should rapid sync
 if [[ -n "${CHECKPOINT_SYNC_URL}" ]]; then
-  if [[ ! "${NODE_TYPE}" = "archive" ]]; then
+  if [[ ! "${NODE_TYPE}" =~ archive$ ]]; then
     __checkpoint_sync="--checkpointSyncUrl=${CHECKPOINT_SYNC_URL}"
     echo "Checkpoint sync enabled"
   else
diff --git a/prysm/docker-entrypoint.sh b/prysm/docker-entrypoint.sh
index b629fdd0..c47449eb 100755
--- a/prysm/docker-entrypoint.sh
+++ b/prysm/docker-entrypoint.sh
@@ -61,7 +61,7 @@ fi
 # Check whether we should rapid sync
 if [[ -n "${CHECKPOINT_SYNC_URL:+x}" ]]; then
   __checkpoint_sync="--checkpoint-sync-url=${CHECKPOINT_SYNC_URL} --enable-backfill"
-  if [[ "${NODE_TYPE}" = "archive" ]]; then
+  if [[ "${NODE_TYPE}" =~ archive$ ]]; then
     __checkpoint_sync+=" --backfill-oldest-slot 0"
   fi
   echo "Checkpoint sync enabled"