From 58ba58e6f2381e16f62782dd2320f17ce8aed290 Mon Sep 17 00:00:00 2001 From: Andrei Smirnov Date: Mon, 16 Jun 2025 18:09:28 +0300 Subject: [PATCH 1/3] Use commit-boost instead of mev-boost --- .env.sample.holesky | 15 +++------------ .env.sample.hoodi | 15 +++------------ .env.sample.mainnet | 15 +++------------ docker-compose.override.yml.sample | 6 +++--- docker-compose.yml | 30 +++++++++++++++--------------- promtail/config.yml.example | 4 ++-- 6 files changed, 29 insertions(+), 56 deletions(-) diff --git a/.env.sample.holesky b/.env.sample.holesky index 47d38c0..5981d9d 100644 --- a/.env.sample.holesky +++ b/.env.sample.holesky @@ -96,17 +96,8 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://checkpoint-sync.holesky.ethpandaops.io/ # Charon host exposed ports #CHARON_PORT_P2P_TCP= -######### MEV-Boost Config ######### - -# MEV-Boost docker container image version, e.g. `latest` or `1.7.0`. -#MEVBOOST_VERSION= - -# MEV-Boost docker container image name, e.g. flashbots/mev-boost. -#MEVBOOST_IMAGE= - -# Comma separated list of MEV-Boost relays. -# You can choose public relays from https://enchanted-direction-844.notion.site/6d369eb33f664487800b0dedfe32171e?v=d255247c822c409f99c498aeb6a4e51d. -#MEVBOOST_RELAYS=https://0xab78bf8c781c58078c3beb5710c57940874dd96aef2835e7742c866b4c7c0406754376c2c8285a36c630346aa5c5f833@holesky.aestus.live,https://0xb1559beef7b5ba3127485bbbb090362d9f497ba64e177ee2c8e7db74746306efad687f2cf8574e38d70067d40ef136dc@relay-stag.ultrasound.money,https://0xaa58208899c6105603b74396734a6263cc7d947f444f396a90f7b7d3e65d102aec7e5e5291b27e08d02c50a050825c2f@holesky.titanrelay.xyz +# commit-boost version, check https://github.com/Commit-Boost/commit-boost-client/pkgs/container/pbs +#COMMITBOOST_VERSION= ######### Monitoring Config ######### @@ -154,6 +145,6 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://checkpoint-sync.holesky.ethpandaops.io/ # LIGHTHOUSE_PROMTAIL_MONITORED=false # CHARON_PROMTAIL_MONITORED=false # LODESTAR_PROMTAIL_MONITORED=false -# MEV_BOOST_PROMTAIL_MONITORED=false +# COMMIT_BOOST_PROMTAIL_MONITORED=false # EJECTOR_PROMTAIL_MONITORED=false # DV_EXIT_PROMTAIL_MONITORED=false diff --git a/.env.sample.hoodi b/.env.sample.hoodi index f675ee7..d2d67df 100644 --- a/.env.sample.hoodi +++ b/.env.sample.hoodi @@ -96,17 +96,8 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://checkpoint-sync.hoodi.ethpandaops.io/ # Charon host exposed ports #CHARON_PORT_P2P_TCP= -######### MEV-Boost Config ######### - -# MEV-Boost docker container image version, e.g. `latest` or `1.7.0`. -#MEVBOOST_VERSION= - -# MEV-Boost docker container image name, e.g. flashbots/mev-boost. -#MEVBOOST_IMAGE= - -# Comma separated list of MEV-Boost relays. -# You can choose public relays from https://enchanted-direction-844.notion.site/6d369eb33f664487800b0dedfe32171e?v=d255247c822c409f99c498aeb6a4e51d. -#MEVBOOST_RELAYS=https://0x98f0ef62f00780cf8eb06701a7d22725b9437d4768bb19b363e882ae87129945ec206ec2dc16933f31d983f8225772b6@hoodi.aestus.live +# commit-boost version, check https://github.com/Commit-Boost/commit-boost-client/pkgs/container/pbs +#COMMITBOOST_VERSION= ######### Monitoring Config ######### @@ -154,6 +145,6 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://checkpoint-sync.hoodi.ethpandaops.io/ # LIGHTHOUSE_PROMTAIL_MONITORED=false # CHARON_PROMTAIL_MONITORED=false # LODESTAR_PROMTAIL_MONITORED=false -# MEV_BOOST_PROMTAIL_MONITORED=false +# COMMIT_BOOST_PROMTAIL_MONITORED=false # EJECTOR_PROMTAIL_MONITORED=false # DV_EXIT_PROMTAIL_MONITORED=false diff --git a/.env.sample.mainnet b/.env.sample.mainnet index 94ff5a2..73b5ef5 100644 --- a/.env.sample.mainnet +++ b/.env.sample.mainnet @@ -96,17 +96,8 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://mainnet.checkpoint.sigp.io/ # Charon host exposed ports #CHARON_PORT_P2P_TCP= -######### MEV-Boost Config ######### - -# MEV-Boost docker container image version, e.g. `latest` or `1.7.0`. -#MEVBOOST_VERSION= - -# MEV-Boost docker container image name, e.g. flashbots/mev-boost. -#MEVBOOST_IMAGE= - -# Comma separated list of MEV-Boost relays. -# You can choose public relays from https://enchanted-direction-844.notion.site/6d369eb33f664487800b0dedfe32171e?v=d255247c822c409f99c498aeb6a4e51d. -MEVBOOST_RELAYS=https://0xa15b52576bcbf1072f4a011c0f99f9fb6c66f3e1ff321f11f461d15e31b1cb359caa092c71bbded0bae5b5ea401aab7e@aestus.live,https://0xa1559ace749633b997cb3fdacffb890aeebdb0f5a3b6aaa7eeeaf1a38af0a8fe88b9e4b1f61f236d2e64d95733327a62@relay.ultrasound.money,https://0x8c4ed5e24fe5c6ae21018437bde147693f68cda427cd1122cf20819c30eda7ed74f72dece09bb313f2a1855595ab677d@global.titanrelay.xyz +# commit-boost version, check https://github.com/Commit-Boost/commit-boost-client/pkgs/container/pbs +#COMMITBOOST_VERSION= ######### Monitoring Config ######### @@ -154,6 +145,6 @@ MEVBOOST_RELAYS=https://0xa15b52576bcbf1072f4a011c0f99f9fb6c66f3e1ff321f11f461d1 # LIGHTHOUSE_PROMTAIL_MONITORED=false # CHARON_PROMTAIL_MONITORED=false # LODESTAR_PROMTAIL_MONITORED=false -# MEV_BOOST_PROMTAIL_MONITORED=false +# COMMIT_BOOST_PROMTAIL_MONITORED=false # EJECTOR_PROMTAIL_MONITORED=false # DV_EXIT_PROMTAIL_MONITORED=false diff --git a/docker-compose.override.yml.sample b/docker-compose.override.yml.sample index 4aabb4c..8954bd6 100644 --- a/docker-compose.override.yml.sample +++ b/docker-compose.override.yml.sample @@ -57,9 +57,9 @@ #ports: #- 9090:9090 # Metrics - #mev-boost: - # Disable mev-boost + #commit-boost: + # Disable commit-boost #profiles: [disable] - # Bind mev-boost internal ports to host ports + # Bind commit-boost internal ports to host ports #ports: #- 18550:18550 # Metrics diff --git a/docker-compose.yml b/docker-compose.yml index 728279c..f8f42f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,7 +61,7 @@ services: --execution-endpoint=http://nethermind:8551 --execution-jwt=/opt/jwt/jwt.hex --datadir=/opt/app/beacon/ - --builder=http://mev-boost:18550 + --builder=http://commit-boost:18550 --http --http-address=0.0.0.0 --http-port=5052 @@ -136,21 +136,21 @@ services: - ./data/lodestar:/opt/data restart: unless-stopped - # _ _ - # _ __ ___ _____ __ | |__ ___ ___ ___| |_ - # | '_ ` _ \ / _ \ \ / /____| '_ \ / _ \ / _ \/ __| __| - # | | | | | | __/\ V /_____| |_) | (_) | (_) \__ \ |_ - # |_| |_| |_|\___| \_/ |_.__/ \___/ \___/|___/\__| - mev-boost: - image: ${MEVBOOST_IMAGE:-flashbots/mev-boost}:${MEVBOOST_VERSION:-1.9} - command: | - -${NETWORK} - -loglevel=debug - -addr=0.0.0.0:18550 - -relay-check - -relays=${MEVBOOST_RELAYS} + # _ _ _ _ + # ___ ___ _ __ ___ _ __ ___ (_) |_ | |__ ___ ___ ___| |_ + # / __/ _ \| '_ ` _ \| '_ ` _ \| | __|____| '_ \ / _ \ / _ \/ __| __| + # | (_| (_) | | | | | | | | | | | | ||_____| |_) | (_) | (_) \__ \ |_ + # \___\___/|_| |_| |_|_| |_| |_|_|\__| |_.__/ \___/ \___/|___/\__| + # + commit-boost: + image: ghcr.io/commit-boost/pbs:${COMMITBOOST_VERSION:-v0.7.0} + command: + [ + "--listen-address=0.0.0.0:18550", + "--builder=https://boost.commitboost.xyz" + ] labels: - - "promtail-monitored=${MEV_BOOST_PROMTAIL_MONITORED:-true}" + - "promtail-monitored=${COMMIT_BOOST_PROMTAIL_MONITORED:-true}" networks: [dvnode] restart: unless-stopped diff --git a/promtail/config.yml.example b/promtail/config.yml.example index 87e6144..4a3a4b2 100644 --- a/promtail/config.yml.example +++ b/promtail/config.yml.example @@ -38,8 +38,8 @@ scrape_configs: replacement: 'lighthouse' target_label: 'job' - source_labels: ['container'] - regex: '.*mev-boost.*' - replacement: 'mev-boost' + regex: '.*commit-boost.*' + replacement: 'commit-boost' target_label: 'job' - target_label: 'cluster_name' replacement: $CLUSTER_NAME From f3596afd67562217fd31c0d3845e9501a7398f13 Mon Sep 17 00:00:00 2001 From: Andrei Smirnov Date: Mon, 16 Jun 2025 18:27:00 +0300 Subject: [PATCH 2/3] commit-boost config --- commit-boost/config.toml | 8 ++++++++ docker-compose.yml | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 commit-boost/config.toml diff --git a/commit-boost/config.toml b/commit-boost/config.toml new file mode 100644 index 0000000..a20aaaf --- /dev/null +++ b/commit-boost/config.toml @@ -0,0 +1,8 @@ +chain = "Mainnet" + +[pbs] +port = 18550 + +[[relays]] +id = "titan" +url = "https://0x8c4ed5e24fe5c6ae21018437bde147693f68cda427cd1122cf20819c30eda7ed74f72dece09bb313f2a1855595ab677d@titanrelay.xyz" diff --git a/docker-compose.yml b/docker-compose.yml index f8f42f1..f7c1b89 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -144,11 +144,10 @@ services: # commit-boost: image: ghcr.io/commit-boost/pbs:${COMMITBOOST_VERSION:-v0.7.0} - command: - [ - "--listen-address=0.0.0.0:18550", - "--builder=https://boost.commitboost.xyz" - ] + environment: + - CB_CONFIG=/etc/commit-boost/config.toml + volumes: + - ./commit-boost/config.toml:/etc/commit-boost/config.toml:ro labels: - "promtail-monitored=${COMMIT_BOOST_PROMTAIL_MONITORED:-true}" networks: [dvnode] From 95c9381ac9863385002dcd384a20494066b8458d Mon Sep 17 00:00:00 2001 From: Andrei Smirnov Date: Tue, 17 Jun 2025 08:42:22 +0300 Subject: [PATCH 3/3] Addressed PR feedback --- commit-boost/config.toml | 5 +++++ docker-compose.yml | 2 +- prometheus/prometheus.yml.example | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/commit-boost/config.toml b/commit-boost/config.toml index a20aaaf..a781fb1 100644 --- a/commit-boost/config.toml +++ b/commit-boost/config.toml @@ -2,6 +2,11 @@ chain = "Mainnet" [pbs] port = 18550 +host = "0.0.0.0" + +[metrics] +enabled = true +host = "0.0.0.0" [[relays]] id = "titan" diff --git a/docker-compose.yml b/docker-compose.yml index f7c1b89..73c578d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -143,7 +143,7 @@ services: # \___\___/|_| |_| |_|_| |_| |_|_|\__| |_.__/ \___/ \___/|___/\__| # commit-boost: - image: ghcr.io/commit-boost/pbs:${COMMITBOOST_VERSION:-v0.7.0} + image: ghcr.io/commit-boost/pbs:${COMMITBOOST_VERSION:-v0.8.0-rc.2} environment: - CB_CONFIG=/etc/commit-boost/config.toml volumes: diff --git a/prometheus/prometheus.yml.example b/prometheus/prometheus.yml.example index 5214620..93221d5 100644 --- a/prometheus/prometheus.yml.example +++ b/prometheus/prometheus.yml.example @@ -26,6 +26,9 @@ scrape_configs: - job_name: "lodestar" static_configs: - targets: ["lodestar:5064"] + - job_name: "commit-boost" + static_configs: + - targets: ["commit-boost:10000"] # Debug - job_name: "node-exporter" static_configs: