Merge pull request #21 from dappnode/pablo/stakers-ui

Implement stakers UI support

build/Dockerfile

@@ -2,31 +2,17 @@ ARG UPSTREAM_VERSION
 
 FROM hyperledger/besu:${UPSTREAM_VERSION}
 
-COPY jwtsecret.hex /jwtsecret
+COPY security /security
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 
 USER root
+RUN apt update && apt install curl -y
+
 RUN mkdir /var/lib/besu
 RUN chown -R besu:besu /var/lib/besu
+
 USER besu
 
 ENV BESU_OPTS=$BESU_OPTS
 
-ENTRYPOINT besu \
-    --rpc-ws-host='0.0.0.0' \ 
-    --rpc-ws-enabled=$WS_ENABLED \
-    --rpc-http-host='0.0.0.0' \
-    --rpc-http-enabled=true \ 
-    --host-allowlist=* \
-    --rpc-http-cors-origins=* \
-    --engine-rpc-port=8551 \
-    --engine-host-allowlist=* \
-    --engine-jwt-secret='/jwtsecret' \
-    --engine-rpc-enabled=true \
-    --data-storage-format=$STORAGE_FORMAT \
-    --metrics-enabled \
-    --metrics-host='0.0.0.0' \
-    --data-path=/var/lib/besu \
-    --sync-mode=$SYNC_MODE \
-    --rpc-http-max-active-connections=$MAX_HTTP_CONNECTIONS \
-    --p2p-port=$P2P_PORT \
-    $EXTRA_OPTS
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

build/entrypoint.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+case "$_DAPPNODE_GLOBAL_CONSENSUS_CLIENT_MAINNET" in
+"prysm.dnp.dappnode.eth")
+  echo "Using prysm.dnp.dappnode.eth"
+  JWT_PATH="/security/prysm/jwtsecret.hex"
+  ;;
+"lighthouse.dnp.dappnode.eth")
+  echo "Using lighthouse.dnp.dappnode.eth"
+  JWT_PATH="/security/lighthouse/jwtsecret.hex"
+  ;;
+"teku.dnp.dappnode.eth")
+  echo "Using teku.dnp.dappnode.eth"
+  JWT_PATH="/security/teku/jwtsecret.hex"
+  ;;
+"nimbus.dnp.dappnode.eth")
+  echo "Using nimbus.dnp.dappnode.eth"
+  JWT_PATH="/security/nimbus/jwtsecret.hex"
+  ;;
+*)
+  echo "Using default"
+  JWT_PATH="/security/default/jwtsecret.hex"
+  ;;
+esac
+
+# Print the jwt to the dappmanager
+JWT=$(cat $JWT_PATH)
+curl -X POST "http://my.dappnode/data-send?key=jwt&data=${JWT}"
+
+exec besu --rpc-ws-host='0.0.0.0' \
+  --rpc-ws-enabled=$WS_ENABLED \
+  --rpc-http-host='0.0.0.0' \
+  --rpc-http-enabled=true \
+  --host-allowlist=* \
+  --rpc-http-cors-origins=* \
+  --engine-rpc-port=8551 \
+  --engine-host-allowlist=* \
+  --engine-jwt-secret=$JWT_PATH \
+  --engine-rpc-enabled=true \
+  --data-storage-format=$STORAGE_FORMAT \
+  --metrics-enabled \
+  --metrics-host='0.0.0.0' \
+  --data-path=/var/lib/besu \
+  --sync-mode=$SYNC_MODE \
+  --rpc-http-max-active-connections=$MAX_HTTP_CONNECTIONS \
+  --p2p-port=$P2P_PORT \
+  $EXTRA_OPTS

build/security/default/jwtsecret.hex

@@ -0,0 +1 @@
+7ad9cfdec75eceb662f5e48f5765701c17f51a5233a60fbcfa5f9e495fa99d15

build/security/lighthouse/jwtsecret.hex

@@ -0,0 +1 @@
+7ad9cfdec75eceb662f5e48f5765701c17f51a5233a60fbcfa5f9e495fa99d16

build/security/nimbus/jwtsecret.hex

@@ -0,0 +1 @@
+7ad9cfdec75eceb662f5e48f5765701c17f51a5233a60fbcfa5f9e495fa99d17

build/security/teku/jwtsecret.hex

@@ -0,0 +1 @@
+7ad9cfdec75eceb662f5e48f5765701c17f51a5233a60fbcfa5f9e495fa99d19

dappnode_package.json

@@ -1,5 +1,5 @@
 {
-  "name": "besu.dnp.dappnode.eth",
+  "name": "besu.public.dappnode.eth",
   "version": "1.2.1",
   "description": "An enterprise-grade Java-based, Apache 2.0 licensed Ethereum Execution Layer client",
   "shortDescription": "Java-based Ethereum Client",
@@ -15,6 +15,9 @@
   "categories": ["Blockchain"],
   "architectures": ["linux/amd64", "linux/arm64"],
   "chain": "ethereum",
+   "requirements": {
+    "minimumDappnodeVersion": "0.2.60"
+  },
   "exposable": [
     {
       "name": "Besu JSON RPC",
@@ -30,8 +33,8 @@
     }
   ],
   "links": {
-    "endpoint": "http://besu.dappnode:8545",
-    "apiEngine": "http://besu.dapppnode:8551",
+    "endpoint": "http://besu.public.dappnode:8545",
+    "apiEngine": "http://besu.public.dapppnode:8551",
     "homepage": "https://github.com/hyperledger/besu",
     "docs": "https://besu.hyperledger.org/en/stable/"
   },
@@ -42,5 +45,11 @@
     "type": "git",
     "url": "https://github.com/dappnode/DAppNodePackage-Besu.git"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "globalEnvs": [
+    {
+      "envs": ["CONSENSUS_CLIENT_MAINNET"],
+      "services": ["besu"]
+    }
+  ]
 }

docker-compose.yml

@@ -1,6 +1,6 @@
 version: "3.5"
 services:
-  node:
+  besu:
     build:
       context: build
       args:
@@ -19,7 +19,7 @@ services:
       MAX_HTTP_CONNECTIONS: "170"
       P2P_PORT: "30414"
       BESU_OPTS: ""
-    image: "node.besu.dnp.dappnode.eth:1.2.1"
+    image: "besu.besu.public.dappnode.eth:1.2.1"
     restart: unless-stopped
 volumes:
   data: {}

getting-started.md

@@ -1,10 +1,10 @@
 ## Besu (Execution Client)
 
-Welcome to the Merged Besu Ethereum Mainnet Consensus Layer Client
+Welcome to the Merged Besu Ethereum Mainnet Execution Layer Client
 
 There are now two RPC APIs in Execution Clients:
 
-1. Querying API `http://besu.dappnode:8545`. Use this endpoint to query transactions on your node and connect to it with your web3 wallet.
-2. Engine API `http://besu.dappnode:8551`. Use this endpoint to connect your Beacon Chain (Consensus Layer) client.
+1. Querying API `http://besu.public.dappnode:8545`. Use this endpoint to query transactions on your node and connect to it with your web3 wallet.
+2. Engine API `http://besu.public.dappnode:8551`. Use this endpoint to connect your Beacon Chain (Consensus Layer) client.
 
 If your Execution Client is not connected to a Consensus Layer client, you won't be able to keep it synced, nor use it to query the blockchain, nor will you be able to connect your wallet to it!

prometheus-targets.json

@@ -1,12 +1,10 @@
 [
-    {
-        "labels": {
-            "package": "besu.dnp.dappnode.eth",
-            "service": "node.besu.dappnode",
-            "__metrics_path__": "/metrics"
-        },
-        "targets": [
-            "node.besu.dnp.dappnode:9545"
-        ]
-    }
+  {
+    "labels": {
+      "package": "besu.public.dappnode.eth",
+      "service": "node.besu.dappnode",
+      "__metrics_path__": "/metrics"
+    },
+    "targets": ["node.besu.public.dappnode:9545"]
+  }
 ]

setup-wizard.yml

@@ -9,7 +9,7 @@ fields:
     target:
       type: environment
       name: CONFIG_MODE
-      service: node
+      service: besu
     enum:
       - "normal"
       - "advanced"
@@ -26,7 +26,7 @@ fields:
     target:
       type: environment
       name: STORAGE_FORMAT
-      service: node
+      service: besu
     enum:
       - BONSAI
       - FOREST
@@ -45,7 +45,7 @@ fields:
     target:
       type: environment
       name: SYNC_MODE
-      service: node
+      service: besu
     enum:
       - FAST
       - FULL
@@ -60,7 +60,7 @@ fields:
     target:
       type: environment
       name: WS_ENABLED
-      service: node
+      service: besu
     enum:
       - "true"
       - "false"
@@ -72,5 +72,5 @@ fields:
     target:
       type: environment
       name: MAX_HTTP_CONNECTIONS
-      service: besu.public.dappnode.eth
+      service: besu
     if: { "config_mode": { "enum": ["advanced"] } }