Use JWT from staker tools

beacon-chain/Dockerfile

@@ -7,15 +7,14 @@ ARG STAKER_SCRIPTS_VERSION
 ARG DATA_DIR
 ARG P2P_PORT
 
-ENV JWT_SECRET_FILE=/jwtsecret \
+ENV JWT_SECRET_FILE=/jwtsecret.hex \
     VALIDATOR_PORT=3500 \
     DATA_DIR=${DATA_DIR} \
     P2P_PORT=${P2P_PORT} \
     NIMBUS_BIN="/home/user/nimbus_beacon_node" \
     STAKER_SCRIPTS_URL=https://github.com/dappnode/staker-package-scripts/releases/download/${STAKER_SCRIPTS_VERSION}
 
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-COPY jwtsecret.hex ${JWT_SECRET_FILE}
 
 ADD ${STAKER_SCRIPTS_URL}/consensus_tools.sh /etc/profile.d/
 

beacon-chain/entrypoint.sh

@@ -1,15 +1,17 @@
 #!/bin/sh
 
-SUPPORTED_NETWORKS="gnosis holesky mainnet"
 MEVBOOST_FLAG_KEYS="--payload-builder=true --payload-builder-url"
 
 # shellcheck disable=SC1091 # Path is relative to the Dockerfile
 . /etc/profile
 
-ENGINE_URL=$(get_engine_api_url "${NETWORK}" "${SUPPORTED_NETWORKS}")
+ENGINE_URL="http://execution.${NETWORK}.staker.dappnode:8551"
 VALID_FEE_RECIPIENT=$(get_valid_fee_recipient "${FEE_RECIPIENT}")
 MEVBOOST_FLAG=$(get_mevboost_flag "${NETWORK}" "${MEVBOOST_FLAG_KEYS}")
 
+JWT_SECRET=$(get_jwt_secret_by_network "${NETWORK}")
+echo "${JWT_SECRET}" >"${JWT_FILE_PATH}"
+
 if [ -n "$(ls -A "${DATA_DIR}/db" 2>/dev/null)" ]; then
     echo "[INFO - entrypoint] Data directory has already been initialized, skipping checkpoint sync."
 

package_variants/gnosis/dappnode_package.json

@@ -6,15 +6,5 @@
     "homepage": "https://nimbus.team/",
     "readme": "https://github.com/dappnode/DAppNodePackage-nimbus-generic",
     "docs": "https://nimbus.guide"
-  },
-  "globalEnvs": [
-    {
-      "envs": ["EXECUTION_CLIENT_GNOSIS", "MEVBOOST_GNOSIS"],
-      "services": ["beacon-chain"]
-    },
-    {
-      "envs": ["MEVBOOST_GNOSIS"],
-      "services": ["validator"]
-    }
-  ]
+  }
 }

package_variants/holesky/dappnode_package.json

@@ -8,13 +8,9 @@
     "docs": "https://nimbus.guide"
   },
   "globalEnvs": [
-    {
-      "envs": ["EXECUTION_CLIENT_HOLESKY", "MEVBOOST_HOLESKY"],
-      "services": ["beacon-chain"]
-    },
     {
       "envs": ["MEVBOOST_HOLESKY"],
-      "services": ["validator"]
+      "services": ["validator", "beacon-chain"]
     }
   ]
 }

package_variants/mainnet/dappnode_package.json

@@ -8,13 +8,9 @@
     "docs": "https://nimbus.guide"
   },
   "globalEnvs": [
-    {
-      "envs": ["EXECUTION_CLIENT_MAINNET", "MEVBOOST_MAINNET"],
-      "services": ["beacon-chain"]
-    },
     {
       "envs": ["MEVBOOST_MAINNET"],
-      "services": ["validator"]
+      "services": ["validator", "beacon-chain"]
     }
   ]
 }