Prysm persist w3s keys loaded via keymanager (#1917)

eth-educators · Aug 31, 2024 · 04a95c0 · 04a95c0
1 parent 197d42b
commit 04a95c0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -34,4 +34,4 @@ Eth Docker uses a "semver-ish" scheme.
 large.
 - Second through fourth digit, [semver](https://semver.org/).
 
-This is Eth Docker v2.12.1.0
+This is Eth Docker v2.12.2.0
diff --git a/prysm/docker-entrypoint-vc.sh b/prysm/docker-entrypoint-vc.sh
@@ -47,7 +47,13 @@ fi
 
 # Web3signer URL
 if [ "${WEB3SIGNER}" = "true" ]; then
-  __w3s_url="--validators-external-signer-url http://web3signer:9000 --validators-external-signer-public-keys http://web3signer:9000/api/v1/eth2/publicKeys"
+  __w3s_url="--validators-external-signer-url http://web3signer:9000 \
+  --validators-external-signer-public-keys http://web3signer:9000/api/v1/eth2/publicKeys \
+  --validators-external-signer-key-file=/var/lib/prysm/w3s-keys.txt"
+
+  if [ ! -f /var/lib/prysm/w3s-keys.txt ]; then
+    touch /var/lib/prysm/w3s-keys.txt
+  fi
 else
   __w3s_url=""
 fi

diff --git a/vc-utils/keymanager.sh b/vc-utils/keymanager.sh
@@ -886,11 +886,7 @@ and secrets directories into .eth/validator_keys instead."
             __api_port=${__vc_api_port}
             __api_tls=${__vc_api_tls}
 
-            if [ -z "${PRYSM:+x}" ]; then
-                jq --arg pubkey_value "$__pubkey" --arg url_value "http://web3signer:9000" '. | .remote_keys += [{"pubkey": $pubkey_value, "url": $url_value}]' <<< '{}' >/tmp/apidata.txt
-            else
-                jq --arg pubkey_value "$__pubkey" --arg url_value "http://web3signer:9000" '. | .remote_keys += [{"pubkey": $pubkey_value}]' <<< '{}' >/tmp/apidata.txt
-            fi
+            jq --arg pubkey_value "$__pubkey" --arg url_value "http://web3signer:9000" '. | .remote_keys += [{"pubkey": $pubkey_value, "url": $url_value}]' <<< '{}' >/tmp/apidata.txt
 
             get-token
             __api_data=@/tmp/apidata.txt
@@ -991,11 +987,7 @@ validator-register() {
 
     __w3s_pubkeys="$(echo "$__result" | jq -r '.data[].validating_pubkey')"
     while IFS= read -r __pubkey; do
-        if [ -z "${PRYSM:+x}" ]; then
-            jq --arg pubkey_value "$__pubkey" --arg url_value "http://web3signer:9000" '. | .remote_keys += [{"pubkey": $pubkey_value, "url": $url_value}]' <<< '{}' >/tmp/apidata.txt
-        else
-            jq --arg pubkey_value "$__pubkey" --arg url_value "http://web3signer:9000" '. | .remote_keys += [{"pubkey": $pubkey_value}]' <<< '{}' >/tmp/apidata.txt
-        fi
+         jq --arg pubkey_value "$__pubkey" --arg url_value "http://web3signer:9000" '. | .remote_keys += [{"pubkey": $pubkey_value, "url": $url_value}]' <<< '{}' >/tmp/apidata.txt
 
         __api_data=@/tmp/apidata.txt
         __api_path=eth/v1/remotekeys