Skip to content

Handle max blobs like max peers #2510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yorickdowne merged 1 commit into from
Mar 29, 2026
Merged

Handle max blobs like max peers #2510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion geth.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions geth/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
2 changes: 1 addition & 1 deletion nimbus-el.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions nimbus-el/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Loading