From 34fe6d2406a2f0d3dec610bde66e34c768c115f3 Mon Sep 17 00:00:00 2001
From: ylembachar <ylembachar@users.noreply.github.com>
Date: Fri, 19 Dec 2025 21:23:18 +0100
Subject: [PATCH 1/4] bump keyper version to v1.4.0

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4c55ea0..0606ea4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     build:
       context: shutter
       args:
-        UPSTREAM_VERSION: v1.3.13
+        UPSTREAM_VERSION: v1.4.0
         KEYPER_CONFIG_DIR: /keyper/config
         SHUTTER_CHAIN_DIR: /chain
         STAKER_SCRIPTS_VERSION: v0.1.0

From 3c2049e608ee7c2d11cb50a18ea591400b60a1b2 Mon Sep 17 00:00:00 2001
From: ylembachar <ylembachar@users.noreply.github.com>
Date: Fri, 19 Dec 2025 21:25:40 +0100
Subject: [PATCH 2/4] bump staker script to v0.1.2

---
 dappnode_package.json | 2 +-
 docker-compose.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 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 0606ea4..29663c1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
         UPSTREAM_VERSION: v1.4.0
         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=""

From 6eee8304255ebb27edf71a149959217703603dae Mon Sep 17 00:00:00 2001
From: ylembachar <ylembachar@users.noreply.github.com>
Date: Fri, 19 Dec 2025 21:32:46 +0100
Subject: [PATCH 3/4] update websocket port handling

---
 shutter/scripts/configure_keyper.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/shutter/scripts/configure_keyper.sh b/shutter/scripts/configure_keyper.sh
index 0211f3f..447cb08 100755
--- a/shutter/scripts/configure_keyper.sh
+++ b/shutter/scripts/configure_keyper.sh
@@ -14,12 +14,14 @@ 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} ${SUPPORTED_NETWORKS})}
+    if [ -z "$ETHEREUM_WS" ]; then
+        export SHUTTER_NETWORK_NODE_ETHEREUMURL=$(get_execution_ws_url_from_global_env ${NETWORK})
+    else
+        export SHUTTER_NETWORK_NODE_ETHEREUMURL=$ETHEREUM_WS
+    fi
     RESULT=$(wscat -c "$SHUTTER_NETWORK_NODE_ETHEREUMURL" -x '{"jsonrpc": "2.0", "method": "eth_syncing", "params": [], "id": 1}')
     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:8545 # fallback to old URL
         RESULT=$(wscat -c "$SHUTTER_NETWORK_NODE_ETHEREUMURL" -x '{"jsonrpc": "2.0", "method": "eth_syncing", "params": [], "id": 1}')
         if [[ $RESULT =~ '"id":1' ]]; then return 0; else
             echo "Could not find DAppNode RPC/WS url for this package!"

From b492699ca6e9fed10c00fd8e1c4dfc0e8c3b2c87 Mon Sep 17 00:00:00 2001
From: ylembachar <ylembachar@users.noreply.github.com>
Date: Fri, 19 Dec 2025 21:42:04 +0100
Subject: [PATCH 4/4] update restart policy for metrics service

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 29663c1..b5a4c69 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
   metrics:
     build:
       context: metrics
-    restart: on-failure
+    restart: unless-stopped
     environment:
       SHUTTER_PUSH_METRICS_ENABLED: true
       KEYPER_NAME: ""