From 2308021d31b1087a5c373f254a8601853db736b5 Mon Sep 17 00:00:00 2001 From: flisko Date: Tue, 7 Jan 2025 13:05:46 +0100 Subject: [PATCH 1/2] bump ssvlabs/ssv to v2.1.0 bump ssvlabs/ssv to v2.1.0, dappnode/staker-package-scripts to v0.1.1 --- 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 2c09736..415bc21 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -2,7 +2,7 @@ "upstream": [ { "repo": "ssvlabs/ssv", - "version": "v2.0.2", + "version": "v2.1.0", "arg": "OPERATOR_UPSTREAM_VERSION" }, { diff --git a/docker-compose.yml b/docker-compose.yml index 6c06fd4..f842fc1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: build: context: operator args: - OPERATOR_UPSTREAM_VERSION: v2.0.2 + OPERATOR_UPSTREAM_VERSION: v2.1.0 STAKER_SCRIPTS_VERSION: v0.1.1 restart: unless-stopped volumes: From 719d924f995cca27b9bd3d603dc71ac3eef37659 Mon Sep 17 00:00:00 2001 From: flisko Date: Tue, 4 Feb 2025 21:46:26 +0100 Subject: [PATCH 2/2] feat: bump ssv-node to 2.2.0, ssv-dkg to 3.0.1 Bumped ssv-node to 2.2.0, bumped ssv-dkg to 3.0.1 and adjusted the files so the version works. --- dappnode_package.json | 2 +- dkg/Dockerfile | 8 ++++-- dkg/entrypoint.sh | 25 +++++++++++++------ docker-compose.yml | 7 +++--- .../mainnet/dappnode_package.json | 2 +- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 083d3b5..d7ac209 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -2,7 +2,7 @@ "upstream": [ { "repo": "ssvlabs/ssv", - "version": "v2.1.1", + "version": "v2.2.0", "arg": "OPERATOR_UPSTREAM_VERSION" }, { diff --git a/dkg/Dockerfile b/dkg/Dockerfile index 690c607..6780ed1 100644 --- a/dkg/Dockerfile +++ b/dkg/Dockerfile @@ -1,9 +1,11 @@ ARG DGK_UPSTREAM_VERSION +FROM ssvlabs/ssv-dkg:${DGK_UPSTREAM_VERSION} -FROM bloxstaking/ssv-dkg:${DGK_UPSTREAM_VERSION} +WORKDIR / ARG NETWORK ARG DKG_PORT +ARG STAKER_SCRIPTS_VERSION RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ yq inotify-tools jq curl @@ -16,6 +18,8 @@ ENV DKG_PORT=${DKG_PORT} \ OPERATOR_DATA_DIR=/data/operator \ NETWORK=${NETWORK} \ METRICS_PORT=15000 \ - DKG_CONFIG_DIR=/ssv-dkg/config + DKG_CONFIG_DIR=/ssv-dkg/config \ + STAKER_SCRIPTS_URL=https://github.com/dappnode/staker-package-scripts/releases/download/${STAKER_SCRIPTS_VERSION} +ADD ${STAKER_SCRIPTS_URL}/dvt_lsd_tools.sh /etc/profile.d/ ENTRYPOINT [ "entrypoint.sh" ] \ No newline at end of file diff --git a/dkg/entrypoint.sh b/dkg/entrypoint.sh index 64a09f5..afd1944 100755 --- a/dkg/entrypoint.sh +++ b/dkg/entrypoint.sh @@ -14,6 +14,15 @@ DKG_LOG_FILE=${DKG_LOGS_DIR}/dkg.log CERT_FILE="$DKG_CERT_DIR/tls.crt" KEY_FILE="$DKG_CERT_DIR/tls.key" +# To use staker scripts +# shellcheck disable=SC1091 +. /etc/profile + +assign_execution_endpoint() { + EXECUTION_LAYER=$(get_execution_rpc_api_url_from_global_env "$NETWORK") + export EXECUTION_LAYER +} + create_directories() { mkdir -p "${DKG_CONFIG_DIR}" "${DKG_LOGS_DIR}" "${DKG_OUTPUT_DIR}" } @@ -95,19 +104,21 @@ generate_tls_cert() { start_dkg() { exec /bin/ssv-dkg start-operator \ --operatorID "${OPERATOR_ID}" \ - --configPath "${DKG_CONFIG_FILE}" \ - --logFilePath "${DKG_LOG_FILE}" \ + --configPath ".${DKG_CONFIG_FILE}" \ + --logFilePath ".${DKG_LOG_FILE}" \ --logLevel "${LOG_LEVEL}" \ - --outputPath "${DKG_OUTPUT_DIR}" \ + --outputPath ".${DKG_OUTPUT_DIR}" \ --port "${DKG_PORT}" \ - --privKey "${PRIVATE_KEY_FILE}" \ - --privKeyPassword "${PRIVATE_KEY_PASSWORD_FILE}" \ - --serverTLSCertPath "${CERT_FILE}" \ - --serverTLSKeyPath "${KEY_FILE}" + --privKey ".${PRIVATE_KEY_FILE}" \ + --privKeyPassword ".${PRIVATE_KEY_PASSWORD_FILE}" \ + --serverTLSCertPath ".${CERT_FILE}" \ + --ethEndpointURL "${EXECUTION_LAYER}" \ + --serverTLSKeyPath ".${KEY_FILE}" } main() { create_directories + assign_execution_endpoint wait_for_private_key get_operator_id generate_tls_cert diff --git a/docker-compose.yml b/docker-compose.yml index 2007058..1a10490 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: build: context: operator args: - OPERATOR_UPSTREAM_VERSION: v2.1.1 + OPERATOR_UPSTREAM_VERSION: v2.2.0 STAKER_SCRIPTS_VERSION: v0.1.1 restart: unless-stopped volumes: @@ -19,7 +19,8 @@ services: build: context: dkg args: - DGK_UPSTREAM_VERSION: v2.1.0 + DGK_UPSTREAM_VERSION: v3.0.1 + STAKER_SCRIPTS_VERSION: v0.1.1 restart: on-failure volumes: - operator-data:/data/operator @@ -30,4 +31,4 @@ services: EXTRA_OPTS: "" volumes: dkg-data: {} - operator-data: {} + operator-data: {} \ No newline at end of file diff --git a/package_variants/mainnet/dappnode_package.json b/package_variants/mainnet/dappnode_package.json index 72d09d4..6386c69 100644 --- a/package_variants/mainnet/dappnode_package.json +++ b/package_variants/mainnet/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ssv.dnp.dappnode.eth", - "version": "0.1.5", + "version": "0.1.6", "globalEnvs": [ { "envs": ["EXECUTION_CLIENT_MAINNET", "CONSENSUS_CLIENT_MAINNET"],