From a76102c8cbfe5beeae2fc9c5294104bca69c8917 Mon Sep 17 00:00:00 2001 From: Marketen Date: Wed, 2 Jul 2025 19:15:57 +0200 Subject: [PATCH 1/2] remove holesky --- cluster/scripts/charon/run-charon.sh | 2 +- getting-started.md | 3 +- lido-charon-grafana-dashboard.json | 7 +-- .../holesky/dappnode_package.json | 16 ----- package_variants/holesky/docker-compose.yml | 51 ---------------- .../holesky/prometheus-targets.json | 58 ------------------- 6 files changed, 3 insertions(+), 134 deletions(-) delete mode 100644 package_variants/holesky/dappnode_package.json delete mode 100644 package_variants/holesky/docker-compose.yml delete mode 100644 package_variants/holesky/prometheus-targets.json diff --git a/cluster/scripts/charon/run-charon.sh b/cluster/scripts/charon/run-charon.sh index 123923c..78a1fe8 100755 --- a/cluster/scripts/charon/run-charon.sh +++ b/cluster/scripts/charon/run-charon.sh @@ -28,7 +28,7 @@ export CHARON_P2P_EXTERNAL_HOSTNAME=${_DAPPNODE_GLOBAL_DOMAIN} ############# function get_beacon_node_endpoint() { - local supported_networks="mainnet holesky gnosis hoodi" + local supported_networks="mainnet gnosis hoodi" local local_beacon_api local_beacon_api=$(get_beacon_api_url_from_global_env "$NETWORK" "$supported_networks") diff --git a/getting-started.md b/getting-started.md index ffcd81c..1fb8f6d 100644 --- a/getting-started.md +++ b/getting-started.md @@ -4,7 +4,7 @@ For detailed steps and screenshots, please refer to [Obol docs](https://docs.obo ### Preparing your Ethereum node (pre-requisite) -1. Go to [Stakers tab](http://my.dappnode/stakers/ethereum) and select the desired network (Ethereum mainnet, hoodi, holesky...) +1. Go to [Stakers tab](http://my.dappnode/stakers/ethereum) and select the desired network (Ethereum mainnet, hoodi...) 2. Choose an execution client (e.g. Nethermind) and a consensus client (e.g. Lodestar) 3. Click "Apply changes" and wait for install and sync processes. @@ -23,7 +23,6 @@ Under the Info tab, see pre-generated ENRs and validator containers' status. 1. Use the appropriate launchpad for your network: - [Mainnet Launchpad](https://mainnet.launchpad.obol.org/) - [Gnosis Launchpad](https://gnosischain.launchpad.obol.org/) - - [Holesky Launchpad](https://holesky.launchpad.obol.org/) - [Hoodi Launchpad](https://hoodi.launchpad.obol.org/) 2. Follow instructions to sign with your wallet and provide an ENR from the DappNode info section diff --git a/lido-charon-grafana-dashboard.json b/lido-charon-grafana-dashboard.json index c42ecc1..c7ffb15 100644 --- a/lido-charon-grafana-dashboard.json +++ b/lido-charon-grafana-dashboard.json @@ -6370,11 +6370,6 @@ "text": "goerli", "value": "goerli" }, - { - "selected": false, - "text": "holesky", - "value": "holesky" - }, { "selected": false, "text": "hoodi", @@ -6391,7 +6386,7 @@ "value": "gnosis" } ], - "query": "mainnet,goerli,holesky,sepolia,gnosis", + "query": "mainnet,hoodi,sepolia,gnosis", "queryValue": "", "skipUrlSync": false, "type": "custom" diff --git a/package_variants/holesky/dappnode_package.json b/package_variants/holesky/dappnode_package.json deleted file mode 100644 index dbf1b0f..0000000 --- a/package_variants/holesky/dappnode_package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "holesky-obol.dnp.dappnode.eth", - "version": "0.1.9", - "globalEnvs": [ - { - "envs": ["CONSENSUS_CLIENT_HOLESKY", "DOMAIN"], - "services": [ - "cluster-1", - "cluster-2", - "cluster-3", - "cluster-4", - "cluster-5" - ] - } - ] -} diff --git a/package_variants/holesky/docker-compose.yml b/package_variants/holesky/docker-compose.yml deleted file mode 100644 index a65a05e..0000000 --- a/package_variants/holesky/docker-compose.yml +++ /dev/null @@ -1,51 +0,0 @@ -services: - cluster-1: - build: - args: - CHARON_VERSION: 77b153e # to be deleted once pectra release is tagged in a normal version - NETWORK: holesky - P2P_TCP_PORT: 3711 - P2P_UDP_PORT: 3731 - ports: - - 3711:3711/tcp - - 3731:3731/udp - cluster-2: - build: - args: - CHARON_VERSION: 77b153e # to be deleted once pectra release is tagged in a normal version - NETWORK: holesky - P2P_TCP_PORT: 3712 - P2P_UDP_PORT: 3732 - ports: - - 3712:3712/tcp - - 3732:3732/udp - cluster-3: - build: - args: - CHARON_VERSION: 77b153e # to be deleted once pectra release is tagged in a normal version - NETWORK: holesky - P2P_TCP_PORT: 3713 - P2P_UDP_PORT: 3733 - ports: - - 3713:3713/tcp - - 3733:3733/udp - cluster-4: - build: - args: - CHARON_VERSION: 77b153e # to be deleted once pectra release is tagged in a normal version - NETWORK: holesky - P2P_TCP_PORT: 3714 - P2P_UDP_PORT: 3734 - ports: - - 3714:3714/tcp - - 3734:3734/udp - cluster-5: - build: - args: - CHARON_VERSION: 77b153e # to be deleted once pectra release is tagged in a normal version - NETWORK: holesky - P2P_TCP_PORT: 3715 - P2P_UDP_PORT: 3735 - ports: - - 3715:3715/tcp - - 3735:3735/udp diff --git a/package_variants/holesky/prometheus-targets.json b/package_variants/holesky/prometheus-targets.json deleted file mode 100644 index 3ba186a..0000000 --- a/package_variants/holesky/prometheus-targets.json +++ /dev/null @@ -1,58 +0,0 @@ -[ - { - "labels": { - "package": "holesky-obol.dnp.dappnode.eth", - "service": "cluster-1.holesky-obol.dappnode" - }, - "targets": ["cluster-1.holesky-obol.dappnode:3620"] - }, - { - "labels": { - "package": "holesky-obol.dnp.dappnode.eth", - "service": "cluster-1.holesky-obol.dappnode" - }, - "targets": ["cluster-1.holesky-obol.dappnode:8008"] - }, - { - "labels": { - "package": "holesky-obol.dnp.dappnode.eth", - "service": "cluster-2.holesky-obol.dappnode" - }, - "targets": ["cluster-2.holesky-obol.dappnode:3620"] - }, - { - "labels": { - "package": "holesky-obol.dnp.dappnode.eth", - "service": "cluster-2.holesky-obol.dappnode" - }, - "targets": ["cluster-2.holesky-obol.dappnode:8008"] - }, - { - "labels": { - "package": "holesky-obol.dnp.dappnode.eth", - "service": "cluster-3.holesky-obol.dappnode" - }, - "targets": ["cluster-3.holesky-obol.dappnode:3620"] - }, - { - "labels": { - "package": "holesky-obol.dnp.dappnode.eth", - "service": "cluster-3.holesky-obol.dappnode" - }, - "targets": ["cluster-3.holesky-obol.dappnode:8008"] - }, - { - "labels": { - "package": "holesky-obol.dnp.dappnode.eth", - "service": "cluster-4.holesky-obol.dappnode" - }, - "targets": ["cluster-4.holesky-obol.dappnode:3620"] - }, - { - "labels": { - "package": "holesky-obol.dnp.dappnode.eth", - "service": "cluster-5.holesky-obol.dappnode" - }, - "targets": ["cluster-5.holesky-obol.dappnode:8008"] - } -] From 0a2fe9f34725c5ec5986307f4ac6e8f3bb5bef2e Mon Sep 17 00:00:00 2001 From: Marketen Date: Wed, 2 Jul 2025 19:19:07 +0200 Subject: [PATCH 2/2] remove goerli --- lido-charon-grafana-dashboard.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lido-charon-grafana-dashboard.json b/lido-charon-grafana-dashboard.json index c7ffb15..d3fc7ff 100644 --- a/lido-charon-grafana-dashboard.json +++ b/lido-charon-grafana-dashboard.json @@ -397,7 +397,7 @@ "2": { "color": "purple", "index": 1, - "text": "Goerli" + "text": "Hoodi" }, "3": { "color": "purple", @@ -449,7 +449,7 @@ "datasource": "Prometheus", "editorMode": "code", "exemplar": false, - "expr": "( 1 * app_version{cluster_name=\"$cluster_name\",cluster_hash=\"$cluster_hash\",cluster_peer=\"$cluster_peer\", cluster_network=\"mainnet\"} )\nor \n( 2 * app_version{cluster_name=\"$cluster_name\",cluster_hash=\"$cluster_hash\",cluster_peer=\"$cluster_peer\", cluster_network=\"goerli\"} )\nor\n( 3 * app_version{cluster_name=\"$cluster_name\",cluster_hash=\"$cluster_hash\",cluster_peer=\"$cluster_peer\", cluster_network=\"sepolia\"} )\nor\n( 4 * app_version{cluster_name=\"$cluster_name\",cluster_hash=\"$cluster_hash\",cluster_peer=\"$cluster_peer\", cluster_network=\"gnosis\"} )", + "expr": "( 1 * app_version{cluster_name=\"$cluster_name\",cluster_hash=\"$cluster_hash\",cluster_peer=\"$cluster_peer\", cluster_network=\"mainnet\"} )\nor \n( 2 * app_version{cluster_name=\"$cluster_name\",cluster_hash=\"$cluster_hash\",cluster_peer=\"$cluster_peer\", cluster_network=\"hoodi\"} )\nor\n( 3 * app_version{cluster_name=\"$cluster_name\",cluster_hash=\"$cluster_hash\",cluster_peer=\"$cluster_peer\", cluster_network=\"sepolia\"} )\nor\n( 4 * app_version{cluster_name=\"$cluster_name\",cluster_hash=\"$cluster_hash\",cluster_peer=\"$cluster_peer\", cluster_network=\"gnosis\"} )", "format": "time_series", "hide": false, "instant": true, @@ -6365,11 +6365,6 @@ "text": "mainnet", "value": "mainnet" }, - { - "selected": false, - "text": "goerli", - "value": "goerli" - }, { "selected": false, "text": "hoodi",