diff --git a/geth.yml b/geth.yml index b8e3ebdc..d9a93105 100644 --- a/geth.yml +++ b/geth.yml @@ -30,7 +30,6 @@ services: - IPV6=${IPV6:-false} - ANCIENT_DIR=${ANCIENT_DIR:-} - ERA_URL=${ERA_URL:-} - - MAX_BLOBS=${MAX_BLOBS:-} - COMPOSE_FILE=${COMPOSE_FILE} volumes: - geth-eth1-data:/var/lib/goethereum @@ -79,6 +78,8 @@ services: - --authrpc.vhosts=* - ${EL_MAX_PEER_COUNT:+--maxpeers} - ${EL_MAX_PEER_COUNT:+${EL_MAX_PEER_COUNT}} + - ${MAX_BLOBS:+--miner.maxblobs} + - ${MAX_BLOBS:+${MAX_BLOBS}} labels: - metrics.scrape=true - metrics.path=/debug/metrics/prometheus diff --git a/geth/docker-entrypoint.sh b/geth/docker-entrypoint.sh index 35515d30..8c9dda0a 100755 --- a/geth/docker-entrypoint.sh +++ b/geth/docker-entrypoint.sh @@ -145,12 +145,6 @@ if [[ -n "${ERA_URL}" && ! -d /var/lib/geth/geth/chaindata && ! -d /var/lib/goet geth --datadir /var/lib/geth "--${NETWORK}" --era.format erae --remotedb "${ERA_URL}" fi -if [[ -n "${MAX_BLOBS}" ]]; then - __blobs="--miner.maxblobs ${MAX_BLOBS}" -else - __blobs="" -fi - # Traces if [[ "${COMPOSE_FILE}" =~ (grafana\.yml|grafana-rootless\.yml) ]]; then __trace="--rpc.telemetry=true --rpc.telemetry.endpoint http://tempo:4317 --rpc.telemetry.instance-id geth --rpc.telemetry.sample-ratio 0.1" @@ -174,5 +168,5 @@ if [[ -f /var/lib/geth/prune-marker ]]; then # shellcheck disable=SC2086 exec "$@" ${__datadir} ${__ancient} ${__network} ${EL_EXTRAS} prune-history else - exec "$@" ${__datadir} ${__ancient} ${__network} ${__prune} ${__blobs} ${__trace} ${__verbosity} ${EL_EXTRAS} + exec "$@" ${__datadir} ${__ancient} ${__network} ${__prune} ${__trace} ${__verbosity} ${EL_EXTRAS} fi diff --git a/nimbus-el.yml b/nimbus-el.yml index 7d4f6066..0bf622a0 100644 --- a/nimbus-el.yml +++ b/nimbus-el.yml @@ -28,7 +28,6 @@ services: - NODE_TYPE=${EL_NODE_TYPE:-pre-merge-expiry} - NETWORK=${NETWORK} - ERA_URL=${ERA_URL:-} - - MAX_BLOBS=${MAX_BLOBS:-} volumes: - nimbus-el-data:/var/lib/nimbus - /etc/localtime:/etc/localtime:ro @@ -63,6 +62,7 @@ services: - --engine-api-address=0.0.0.0 - --engine-api-ws - ${EL_MAX_PEER_COUNT:+--max-peers=${EL_MAX_PEER_COUNT}} + - ${MAX_BLOBS:+--max-blobs=${MAX_BLOBS}} - --log-level=${LOG_LEVEL} labels: - metrics.scrape=true diff --git a/nimbus-el/docker-entrypoint.sh b/nimbus-el/docker-entrypoint.sh index 2ef0813c..fd7150fa 100755 --- a/nimbus-el/docker-entrypoint.sh +++ b/nimbus-el/docker-entrypoint.sh @@ -194,15 +194,9 @@ fi # rm -rf /var/lib/nimbus/era #fi -if [[ -n "${MAX_BLOBS}" ]]; then - __blobs="--max-blobs=${MAX_BLOBS}" -else - __blobs="" -fi - __strip_empty_args "$@" set -- "${__args[@]}" # Word splitting is desired for the command line parameters # shellcheck disable=SC2086 -exec "$@" ${__prune} ${__network} ${__blobs} ${EL_EXTRAS} +exec "$@" ${__prune} ${__network} ${EL_EXTRAS}