From 4c5254b937e9811646c2243cff719ab0669bf3dd Mon Sep 17 00:00:00 2001 From: fryorcraken Date: Tue, 29 Jul 2025 10:29:26 +1000 Subject: [PATCH] Re-introduce default path for rln creds, deactivate light push if no RLN creds --- run_node.sh | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/run_node.sh b/run_node.sh index 3203a37..063e02a 100755 --- a/run_node.sh +++ b/run_node.sh @@ -87,15 +87,21 @@ if [ -n "${NODEKEY}" ]; then NODEKEY=--nodekey=${NODEKEY} fi -if [ -n "${RLN_RELAY_CRED_PATH}" ]; then - echo "Using RLN credentials from ${RLN_RELAY_CRED_PATH}" - RLN_RELAY_CRED_PATH=--rln-relay-cred-path="${RLN_RELAY_CRED_PATH}" -fi - if [ -n "${RLN_RELAY_CRED_PASSWORD}" ]; then RLN_RELAY_CRED_PASSWORD=--rln-relay-cred-password="${RLN_RELAY_CRED_PASSWORD}" + ## Enable Light Push (RLNaaS) if RLN credentials are used + LIGHTPUSH=--lightpush=true + ## Pass default value for credentials path if not set + RLN_RELAY_CRED_PATH=--rln-relay-cred-path=${RLN_RELAY_CRED_PATH:-/keystore/keystore.json} + echo "Using RLN credentials from ${RLN_RELAY_CRED_PATH}" +else + LIGHTPUSH=--lightpush=false + # Ensure no empty values are passed + RLN_RELAY_CRED_PATH="" + RLN_RELAY_CRED_PASSWORD="" fi + STORE_RETENTION_POLICY=--store-message-retention-policy=size:1GB if [ -n "${STORAGE_SIZE}" ]; then @@ -105,7 +111,7 @@ fi exec /usr/bin/wakunode\ --relay=true\ --filter=true\ - --lightpush=false\ + ${LIGHTPUSH}\ --keep-alive=true\ --max-connections=150\ --cluster-id=1\ @@ -128,8 +134,8 @@ exec /usr/bin/wakunode\ --store-message-db-url="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/postgres"\ --rln-relay-eth-client-address="${RLN_RELAY_ETH_CLIENT_ADDRESS}"\ --rln-relay-tree-path="/etc/rln_tree"\ - ${RLN_RELAY_CRED_PATH:+${RLN_RELAY_CRED_PATH}}\ - ${RLN_RELAY_CRED_PASSWORD:+${RLN_RELAY_CRED_PASSWORD}}\ + ${RLN_RELAY_CRED_PATH}\ + ${RLN_RELAY_CRED_PASSWORD}\ ${DNS_WSS_CMD}\ ${NODEKEY}\ ${STORE_RETENTION_POLICY}\