Merge remote-tracking branch 'upstream/main' into migration-done

.gitignore

@@ -20,5 +20,7 @@ ssv-config/password.pass
 ssv-config/password
 ssv-config/encrypted_private_key.json
 ssv-config/config.yaml
+ssv-config/config.yaml.original
 ssv-config/dkg-config.yaml
+ssv-config/dkg-config.yaml.original
 .nada

README.md

@@ -34,4 +34,4 @@ Eth Docker uses a "semver-ish" scheme.
 large.
 - Second through fourth digit, [semver](https://semver.org/).
 
-This is Eth Docker v2.9.0.0
+This is Eth Docker v2.12.0.0

besu.yml

@@ -79,6 +79,7 @@ services:
       - metrics.path=/metrics
       - metrics.port=6060
       - metrics.instance=execution
+      - metrics.network=${NETWORK}
 
   set-prune-marker:
     profiles: ["tools"]

besu/Dockerfile.binary

@@ -1,5 +1,5 @@
-ARG DOCKER_TAG
-ARG DOCKER_REPO
+ARG DOCKER_TAG=latest
+ARG DOCKER_REPO=hyperledger/besu
 
 FROM ${DOCKER_REPO}:${DOCKER_TAG}
 

besu/Dockerfile.source

@@ -1,5 +1,5 @@
 # Build Besu in a stock Ubuntu container
-FROM eclipse-temurin:17-jdk-jammy as builder
+FROM eclipse-temurin:21-jdk-jammy AS builder
 
 # This is here to avoid build-time complaints
 ARG DOCKER_TAG
@@ -8,7 +8,7 @@ ARG DOCKER_REPO
 ARG BUILD_TARGET
 ARG SRC_REPO
 
-RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates git
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates git libjemalloc-dev
 
 WORKDIR /usr/src
 RUN bash -c "git clone --recurse-submodules -j8 ${SRC_REPO} besu && cd besu && git config advice.detachedHead false && git fetch --all --tags && if [[ ${BUILD_TARGET} =~ pr-.+ ]]; then git fetch origin pull/$(echo ${BUILD_TARGET} | cut -d '-' -f 2)/head:besu-pr; git checkout besu-pr; else git checkout ${BUILD_TARGET}; fi && ./gradlew installDist"

besu/docker-entrypoint.sh

@@ -55,7 +55,7 @@ if [ "${ARCHIVE_NODE}" = "true" ]; then
   echo "Besu archive node without pruning"
   __prune="--data-storage-format=FOREST --sync-mode=FULL"
 else
-  __prune="--data-storage-format=BONSAI --sync-mode=SNAP --Xbonsai-limit-trie-logs-enabled=true"
+  __prune="--data-storage-format=BONSAI --sync-mode=SNAP"
 fi
 
 __memtotal=$(awk '/MemTotal/ {printf "%d", int($2/1024/1024)}' /proc/meminfo)
@@ -73,7 +73,7 @@ if [ -f /var/lib/besu/prune-marker ]; then
   fi
 # Word splitting is desired for the command line parameters
 # shellcheck disable=SC2086
-  exec "$@" ${__network} ${__prune} ${EL_EXTRAS} storage x-trie-log prune
+  exec "$@" ${__network} ${__prune} ${EL_EXTRAS} storage trie-log prune
 else
 # Word splitting is desired for the command line parameters
 # shellcheck disable=SC2086

central-metrics.yml

@@ -21,3 +21,4 @@ services:
       - metrics.path=/metrics
       - metrics.port=9090
       - metrics.instance=ethereum-metrics-exporter
+      - metrics.network=${NETWORK}

default.env

@@ -30,9 +30,11 @@ WEB3SIGNER=false
 # Whether to explicitly enable IPv6 P2P. See https://ethdocker.com/Support/ipv6
 # Needs to be false or true for Eth Docker to work
 IPV6=false
-# Directory to keep ancient data. In use for Geth, optional.
+# Directory to keep ancient/static data. In use for Reth and Geth, optional.
 # If you use this, make sure to chown the directory to uid 10001
 ANCIENT_DIR=
+# Password for Lighthouse Siren
+SIREN_PASSWORD=
 
 # Promtail logs label, something unique like the server name
 LOGS_LABEL=eth-docker
@@ -86,8 +88,8 @@ PRYSM_UDP_PORT=9000
 CL_QUIC_PORT=9001
 # Local grafana dashboard port. Do not expose to Internet, it is insecure http
 GRAFANA_PORT=3000
-# Local Siren UI port. Do not expose to Internet, it is insecure http
-SIREN_PORT=8080
+# Local Siren UI port
+SIREN_PORT=2443
 # Prometheus port used when exposing directly on host; used for federation
 PROMETHEUS_PORT=9090
 # Local key manager port. Reachable only via localhost. Also doubles as Prysm web port
@@ -202,8 +204,7 @@ TEKU_DOCKERFILE=Dockerfile.binary
 # SRC build target can be a tag, a branch, or a pr as "pr-ID"
 LH_SRC_BUILD_TARGET=stable
 LH_SRC_REPO=https://github.com/sigp/lighthouse
-# If Lighthouse terminates with a SIGILL, make this "latest"
-LH_DOCKER_TAG=latest-modern
+LH_DOCKER_TAG=latest
 LH_DOCKER_REPO=sigp/lighthouse
 LH_DOCKERFILE=Dockerfile.binary
 
@@ -235,7 +236,7 @@ LS_DOCKERFILE=Dockerfile.binary
 # SRC build target can be a tag, a branch, or a pr as "pr-ID"
 GRANDINE_SRC_BUILD_TARGET=master
 GRANDINE_SRC_REPO=https://github.com/grandinetech/grandine
-GRANDINE_DOCKER_TAG=latest
+GRANDINE_DOCKER_TAG=stable
 GRANDINE_DOCKER_REPO=sifrai/grandine
 GRANDINE_DOCKERFILE=Dockerfile.binary
 
@@ -256,8 +257,7 @@ BESU_DOCKERFILE=Dockerfile.binary
 # SRC build target can be a tag, a branch, or a pr as "pr-ID"
 ERIGON_SRC_BUILD_TARGET='$(git describe --tags $(git rev-list --tags --max-count=1))'
 ERIGON_SRC_REPO=https://github.com/ledgerwatch/erigon
-#ERIGON_DOCKER_TAG=stable # stable tag was abandoned by Erigon team, set a tag manually
-ERIGON_DOCKER_TAG=v2.59.3
+ERIGON_DOCKER_TAG=v2.60.4
 ERIGON_DOCKER_REPO=thorax/erigon
 ERIGON_DOCKERFILE=Dockerfile.binary
 
@@ -308,4 +308,4 @@ DDNS_TAG=v2
 NODE_EXPORTER_IGNORE_MOUNT_REGEX='^/(dev|proc|sys|run|var/lib/docker/.+)($|/)'
 
 # Used by ethd update - please do not adjust
-ENV_VERSION=11
+ENV_VERSION=13

erigon.yml

@@ -101,6 +101,7 @@ services:
       - metrics.path=/debug/metrics/prometheus
       - metrics.port=6060
       - metrics.instance=execution
+      - metrics.network=${NETWORK}
 
 volumes:
   erigon-el-data:

erigon/Dockerfile.binary

@@ -1,5 +1,5 @@
-ARG DOCKER_TAG
-ARG DOCKER_REPO
+ARG DOCKER_TAG=stable
+ARG DOCKER_REPO=thorax/erigon
 
 FROM ${DOCKER_REPO}:${DOCKER_TAG}
 

erigon/Dockerfile.source

@@ -1,5 +1,5 @@
 # Build Erigon in a stock Go build container
-FROM golang:1.22-alpine as builder
+FROM golang:1.22-alpine AS builder
 
 # Unused, this is here to avoid build time complaints
 ARG DOCKER_TAG