Merge pull request #297 from yorickdowne/main

PoS-friendly prune Erigon; ethd config sets Geth/Erigon Grafana

Author: yorickdowne

default.env

@@ -75,13 +75,6 @@ EC_WS_PORT=8546
 #GETH_CACHE=--cache=256
 GETH_CACHE=
 
-# Erigon pruning mode. hrtc is maximum prune; this requires an Infura or other
-# 3rd-party temporarily while initial-syncing the consensus client, after which
-# Erigon can be used. htc is a partial prune, which doesn't require that dance
-# but takes considerably more disk space. Leaving the variable empty would
-# configure an archive node.
-ERIGON_PRUNE=hrtc
-
 # Restart policy: Set to no if you do not want services to automatically restart
 RESTART=unless-stopped
 # If you want debug logs, set this to debug instead of info

erigon.yml

@@ -21,6 +21,7 @@ services:
     expose:
       - 9090/tcp
     entrypoint:
+      - docker-entrypoint.sh
       - erigon
       - --private.api.addr
       - 0.0.0.0:9090
@@ -32,7 +33,7 @@ services:
       - any
       - --chain
       - ${EC_NETWORK}
-      - --prune=${ERIGON_PRUNE}
+      - --prune=hrtc
   execution:
     restart: "${RESTART}"
     image: erigon:local

erigon/Dockerfile.binary

@@ -9,10 +9,12 @@ ARG UID=10001
 
 USER root
 
-RUN apk --no-cache add shadow && groupmod -g "${UID}" erigon && usermod -u "${UID}" -g "${UID}" erigon
+RUN apk --no-cache add shadow bash && groupmod -g "${UID}" erigon && usermod -u "${UID}" -g "${UID}" erigon
 
 RUN mkdir -p /var/lib/erigon && chown -R erigon:erigon /var/lib/erigon
 
+COPY ./docker-entrypoint.sh /usr/local/bin/
+
 USER erigon
 
-ENTRYPOINT ["erigon"]
+ENTRYPOINT ["docker-entrypoint.sh", "erigon"]

erigon/Dockerfile.source

@@ -17,7 +17,7 @@ FROM alpine:latest
 ARG USER=erigon
 ARG UID=10001
 
-RUN apk add --no-cache libgcc libstdc++ ca-certificates tzdata
+RUN apk add --no-cache libgcc libstdc++ bash ca-certificates tzdata
 
 # See https://stackoverflow.com/a/55757473/12429735RUN
 RUN adduser \
@@ -32,7 +32,8 @@ RUN mkdir -p /var/lib/erigon && chown ${USER}:${USER} /var/lib/erigon
 # Copy executable
 COPY --from=builder /src/erigon/build/bin/erigon /usr/local/bin/
 COPY --from=builder /src/erigon/build/bin/rpcdaemon /usr/local/bin/
+COPY ./docker-entrypoint.sh /usr/local/bin/
 
 USER ${USER}
 
-ENTRYPOINT ["erigon"]
+ENTRYPOINT ["docker-entrypoint.sh", "erigon"]

erigon/docker-entrypoint.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+# Check for mainnet or goerli, and set prune accordingly
+
+if [[ "$@" =~ "--chain mainnet" ]]; then
+  echo "mainnet: Running with prune.r.before=11184524 for eth deposit contract"
+  exec "$@" --prune.r.before=11184524
+elif [[ "$@" =~ "--chain goerli" ]]; then
+  echo "goerli: Running with prune.r.before=4367322 for eth deposit contract"
+  exec "$@" --prune.r.before=4367322
+else
+  echo "Unable to determine eth deposit contract, running without prune.r.before"
+  exec "$@"
+fi

ethd

@@ -323,6 +323,7 @@ query_execution_client() {
       "Which execution client do you want to run?  Choose Custom for 3rd parties like Infura" 15 60 6 \
       "NONE" "Custom" \
       "geth.yml" "Geth (Go)" \
+      "erigon.yml" "Erigon (Go)" \
       "nm.yml" "Nethermind (.NET)" \
       "besu.yml" "Besu (Java)" 3>&1 1>&2 2>&3)
     fi
@@ -359,6 +360,9 @@ query_execution_client() {
 query_grafana() {
     if (whiptail --title "Select Option" --yesno --defaultno "Do you want to use Grafana dashboards?" 10 60) then
         GRAFANA_CLIENT=$(echo $(echo "${CONSENSUS_CLIENT}" | cut -d '-' -f1)-grafana.yml:grafana-insecure.yml)
+        if [[ ${EXECUTION_CLIENT} == "geth.yml" || ${EXECUTION_CLIENT} == "erigon.yml" ]]; then
+          GRAFANA_CLIENT=${GRAFANA_CLIENT}:$(echo $(echo "${EXECUTION_CLIENT}" | cut -d '.' -f1)-grafana.yml)
+        fi
     else
         unset GRAFANA_CLIENT
     fi