From ad7ce2c8fe3f9b55c5bf3f08b906df6bdce03049 Mon Sep 17 00:00:00 2001
From: blockchainluffy <jainpunit1997@gmail.com>
Date: Wed, 5 Nov 2025 14:36:02 +0530
Subject: [PATCH 1/2] feat: update staker scripts to v0.1.2

---
 dappnode_package.json               | 2 +-
 docker-compose.yml                  | 2 +-
 shutter/scripts/configure_keyper.sh | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dappnode_package.json b/dappnode_package.json
index d64379e..c5336da 100644
--- a/dappnode_package.json
+++ b/dappnode_package.json
@@ -10,7 +10,7 @@
   "upstream": [
     {
       "repo": "dappnode/staker-package-scripts",
-      "version": "v0.1.0",
+      "version": "v0.1.2",
       "arg": "STAKER_SCRIPTS_VERSION"
     }
   ],
diff --git a/docker-compose.yml b/docker-compose.yml
index 1ff847a..20fcf97 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
         UPSTREAM_VERSION: v1.3.12
         KEYPER_CONFIG_DIR: /keyper/config
         SHUTTER_CHAIN_DIR: /chain
-        STAKER_SCRIPTS_VERSION: v0.1.0
+        STAKER_SCRIPTS_VERSION: v0.1.2
     restart: unless-stopped
     environment:
       - SHUTTER_API_NODE_PRIVATEKEY=""
diff --git a/shutter/scripts/configure_keyper.sh b/shutter/scripts/configure_keyper.sh
index 0211f3f..44699c7 100755
--- a/shutter/scripts/configure_keyper.sh
+++ b/shutter/scripts/configure_keyper.sh
@@ -16,11 +16,14 @@ PATH=$NODE_HOME/bin:$PATH
 function test_ethereum_url() {
     # FIXME: This is a workaround for the issue with the staker-scripts@v0.1.1 not setting get_execution_ws_url_from_global_env correctly in the environment variables.
     # Git Issue: https://github.com/dappnode/staker-package-scripts/issues/11
-    export SHUTTER_NETWORK_NODE_ETHEREUMURL=${ETHEREUM_WS:-$(get_execution_ws_url_from_global_env ${NETWORK} ${SUPPORTED_NETWORKS})}
+    export SHUTTER_NETWORK_NODE_ETHEREUMURL=${ETHEREUM_WS:-$(get_execution_ws_url_from_global_env ${NETWORK})}
+    echo "[DEBUG | configure] SHUTTER_NETWORK_NODE_ETHEREUMURL is ${SHUTTER_NETWORK_NODE_ETHEREUMURL}"
     RESULT=$(wscat -c "$SHUTTER_NETWORK_NODE_ETHEREUMURL" -x '{"jsonrpc": "2.0", "method": "eth_syncing", "params": [], "id": 1}')
+    echo "[DEBUG | configure] RESULT is ${RESULT}"
     if [[ $RESULT =~ '"id":1' ]]; then return 0; else
-        export SHUTTER_NETWORK_NODE_ETHEREUMURL=ws://execution.${NETWORK}.dncore.dappnode:8545
+        export SHUTTER_NETWORK_NODE_ETHEREUMURL=ws://execution.${NETWORK}.dncore.dappnode:8546
         RESULT=$(wscat -c "$SHUTTER_NETWORK_NODE_ETHEREUMURL" -x '{"jsonrpc": "2.0", "method": "eth_syncing", "params": [], "id": 1}')
+        echo "[DEBUG | configure] RESULT is ${RESULT}"
         if [[ $RESULT =~ '"id":1' ]]; then return 0; else
             echo "Could not find DAppNode RPC/WS url for this package!"
             echo "Please configure 'ETHEREUM_WS' to point to an applicable websocket RPC service."

From 2fd48bf440e50b4b141e0a74d8bc5301b18ad928 Mon Sep 17 00:00:00 2001
From: blockchainluffy <jainpunit1997@gmail.com>
Date: Wed, 5 Nov 2025 19:41:16 +0530
Subject: [PATCH 2/2] chore: revert debug logs

---
 shutter/scripts/configure_keyper.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/shutter/scripts/configure_keyper.sh b/shutter/scripts/configure_keyper.sh
index 44699c7..77bf9ca 100755
--- a/shutter/scripts/configure_keyper.sh
+++ b/shutter/scripts/configure_keyper.sh
@@ -14,16 +14,11 @@ NODE_PATH=$NODE_HOME/lib/node_modules
 PATH=$NODE_HOME/bin:$PATH
 
 function test_ethereum_url() {
-    # FIXME: This is a workaround for the issue with the staker-scripts@v0.1.1 not setting get_execution_ws_url_from_global_env correctly in the environment variables.
-    # Git Issue: https://github.com/dappnode/staker-package-scripts/issues/11
     export SHUTTER_NETWORK_NODE_ETHEREUMURL=${ETHEREUM_WS:-$(get_execution_ws_url_from_global_env ${NETWORK})}
-    echo "[DEBUG | configure] SHUTTER_NETWORK_NODE_ETHEREUMURL is ${SHUTTER_NETWORK_NODE_ETHEREUMURL}"
     RESULT=$(wscat -c "$SHUTTER_NETWORK_NODE_ETHEREUMURL" -x '{"jsonrpc": "2.0", "method": "eth_syncing", "params": [], "id": 1}')
-    echo "[DEBUG | configure] RESULT is ${RESULT}"
     if [[ $RESULT =~ '"id":1' ]]; then return 0; else
-        export SHUTTER_NETWORK_NODE_ETHEREUMURL=ws://execution.${NETWORK}.dncore.dappnode:8546
+        export SHUTTER_NETWORK_NODE_ETHEREUMURL=ws://execution.${NETWORK}.dncore.dappnode:8545 #letting it default to the old URL, incase the node running on the dappnode is not updated to the new version
         RESULT=$(wscat -c "$SHUTTER_NETWORK_NODE_ETHEREUMURL" -x '{"jsonrpc": "2.0", "method": "eth_syncing", "params": [], "id": 1}')
-        echo "[DEBUG | configure] RESULT is ${RESULT}"
         if [[ $RESULT =~ '"id":1' ]]; then return 0; else
             echo "Could not find DAppNode RPC/WS url for this package!"
             echo "Please configure 'ETHEREUM_WS' to point to an applicable websocket RPC service."