Geth 1.14 defaults

geth.yml

@@ -64,7 +64,6 @@ services:
       - ${EL_WS_PORT:-8546}
       - --ws.origins=*
       - --metrics
-      - --metrics.expensive
       - --pprof
       - --pprof.addr
       - 0.0.0.0

geth/docker-entrypoint.sh

@@ -92,19 +92,6 @@ else
   __prune=""
 fi
 
-# Detect existing DB; use PBSS if fresh
-if [ -d "/var/lib/goethereum/geth/chaindata/" ]; then
-  __pbss=""
-else
-  if [ "${ARCHIVE_NODE}" = "true" ]; then
-    echo "Geth is an archive node. Syncing without PBSS."
-    __pbss=""
-  else
-    echo "Choosing PBSS for fresh sync"
-    __pbss="--state.scheme path"
-  fi
-fi
-
 if [ "${IPV6}" = "true" ]; then
   echo "Configuring Geth for discv5 for IPv6 advertisements"
   __ipv6="--discv5"
@@ -124,5 +111,5 @@ if [ -f /var/lib/goethereum/prune-marker ]; then
 else
 # Word splitting is desired for the command line parameters
 # shellcheck disable=SC2086
-  exec "$@" ${__ancient} ${__pbss} ${__ipv6} ${__network} ${__prune} ${__verbosity} ${EL_EXTRAS}
+  exec "$@" ${__ancient} ${__ipv6} ${__network} ${__prune} ${__verbosity} ${EL_EXTRAS}
 fi

reth.yml

@@ -33,7 +33,7 @@ services:
       - RUST_LOG_STYLE=never
     volumes:
       - reth-el-data:/var/lib/reth
-      - ${ANCIENT_DIR:-.nada}:/var/lib/ancient
+      - ${ANCIENT_DIR:-.nada}:/var/lib/static
       - /etc/localtime:/etc/localtime:ro
       - jwtsecret:/var/lib/reth/ee-secret
     ports:

reth/docker-entrypoint.sh

@@ -81,13 +81,13 @@ else
   __prune="--full"
 fi
 
-__ancient=""
+__static=""
 
 #if [ -n "${ANCIENT_DIR}" ] && [ ! "${ANCIENT_DIR}" = ".nada" ]; then
-#  echo "Using separate ancient directory at ${ANCIENT_DIR}."
-#  __ancient="--sumthin /var/lib/ancient"
+#  echo "Using separate static files directory at ${ANCIENT_DIR}."
+#  __static="--datadir.static-files /var/lib/static"
 #fi
 
 # Word splitting is desired for the command line parameters
 # shellcheck disable=SC2086
-exec "$@" ${__network} ${__verbosity} ${__prune} ${__ancient} ${EL_EXTRAS}
+exec "$@" ${__network} ${__verbosity} ${__prune} ${__static} ${EL_EXTRAS}