From db61faed071745979a8be252fa5762dd8e79b91b Mon Sep 17 00:00:00 2001
From: dappnodedev <diego@dappnode.io>
Date: Tue, 24 Sep 2024 12:00:32 +0200
Subject: [PATCH] Echo flags

---
 beacon-chain/entrypoint.sh | 33 +++++++++++++++++----------------
 validator/entrypoint.sh    | 33 +++++++++++++++++----------------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/beacon-chain/entrypoint.sh b/beacon-chain/entrypoint.sh
index 3efe49d..52cc498 100755
--- a/beacon-chain/entrypoint.sh
+++ b/beacon-chain/entrypoint.sh
@@ -61,22 +61,23 @@ else
   CHECKPOINT_SYNC_FLAGS="${checkpoint_flag_1} ${checkpoint_flag_2}"
 fi
 
-echo "[INFO - entrypoint] Running beacon service"
-
-# shellcheck disable=SC2086
-exec /beacon-chain \
-  --accept-terms-of-use \
-  --datadir=${DATA_DIR} \
-  --jwt-secret="${JWT_FILE_PATH}" \
-  --execution-endpoint="${ENGINE_URL}" \
+FLAGS="--accept-terms-of-use \
+  --datadir=$DATA_DIR \
+  --jwt-secret=$JWT_FILE_PATH \
+  --execution-endpoint=$ENGINE_URL \
   --monitoring-host=0.0.0.0 \
   --grpc-gateway-host=0.0.0.0 \
-  --grpc-gateway-port="${BEACON_API_PORT}" \
-  --grpc-gateway-corsdomain="${CORSDOMAIN}" \
+  --grpc-gateway-port=$BEACON_API_PORT \
+  --grpc-gateway-corsdomain=$CORSDOMAIN \
   --rpc-host=0.0.0.0 \
-  --verbosity="${VERBOSITY}" \
-  --p2p-tcp-port="${P2P_TCP_PORT}" \
-  --p2p-udp-port="${P2P_UDP_PORT}" \
-  --p2p-max-peers="${MAX_PEERS}" \
-  --min-sync-peers="${MIN_SYNC_PEERS}" \
-  --subscribe-all-subnets="${SUBSCRIBE_ALL_SUBNETS}" ${NETWORK_FLAGS} ${CHECKPOINT_SYNC_FLAGS} ${MEVBOOST_FLAG} ${EXTRA_OPTS}
+  --verbosity=$VERBOSITY \
+  --p2p-tcp-port=$P2P_TCP_PORT \
+  --p2p-udp-port=$P2P_UDP_PORT \
+  --p2p-max-peers=$MAX_PEERS \
+  --min-sync-peers=$MIN_SYNC_PEERS \
+  --subscribe-all-subnets=$SUBSCRIBE_ALL_SUBNETS $NETWORK_FLAGS $CHECKPOINT_SYNC_FLAGS $MEVBOOST_FLAG $EXTRA_OPTS"
+
+echo "[INFO - entrypoint] Starting beacon with flags: $FLAGS"
+
+# shellcheck disable=SC2086
+exec /beacon-chain $FLAGS
diff --git a/validator/entrypoint.sh b/validator/entrypoint.sh
index 05fd86c..fc14289 100755
--- a/validator/entrypoint.sh
+++ b/validator/entrypoint.sh
@@ -46,22 +46,23 @@ case "$NETWORK" in
     ;;
 esac
 
-echo "[INFO - entrypoint] Running validator service"
-
-# shellcheck disable=SC2086
-exec /validator \
-    --datadir="${DATA_DIR}" \
-    --wallet-dir="${WALLET_DIR}" \
-    --monitoring-host 0.0.0.0 \
-    --beacon-rpc-provider="${BEACON_RPC_PROVIDER}" \
-    --beacon-rpc-gateway-provider="${BEACON_RPC_GATEWAY_PROVIDER}" \
-    --validators-external-signer-url="${SIGNER_API_URL}" \
+FLAGS="--datadir=$DATA_DIR \
+    --wallet-dir=$WALLET_DIR \
+    --monitoring-host=0.0.0.0 \
+    --beacon-rpc-provider=$BEACON_RPC_PROVIDER \
+    --beacon-rpc-gateway-provider=$BEACON_RPC_GATEWAY_PROVIDER \
+    --validators-external-signer-url=$SIGNER_API_URL \
     --grpc-gateway-host=0.0.0.0 \
-    --grpc-gateway-port="${VALIDATOR_API_PORT}" \
-    --grpc-gateway-corsdomain=http://0.0.0.0:"${VALIDATOR_API_PORT}" \
-    --graffiti="${VALID_GRAFFITI}" \
-    --suggested-fee-recipient="${VALID_FEE_RECIPIENT}" \
-    --verbosity="${VERBOSITY}" \
+    --grpc-gateway-port=$VALIDATOR_API_PORT \
+    --grpc-gateway-corsdomain=http://0.0.0.0:$VALIDATOR_API_PORT \
+    --graffiti=$VALID_GRAFFITI \
+    --suggested-fee-recipient=$VALID_FEE_RECIPIENT \
+    --verbosity=$VERBOSITY \
     --web \
     --accept-terms-of-use \
-    --enable-doppelganger ${NETWORK_FLAGS} ${MEVBOOST_FLAG} ${EXTRA_OPTS}
+    --enable-doppelganger ${NETWORK_FLAGS} ${MEVBOOST_FLAG} ${EXTRA_OPTS}"
+
+echo "[INFO - entrypoint] Starting validator with flags: $FLAGS"
+
+# shellcheck disable=SC2086
+exec /validator $FLAGS