From 75fb3d70d5f55228dd7f60af69515ded2d26d812 Mon Sep 17 00:00:00 2001
From: yorickdowne <71337066+yorickdowne@users.noreply.github.com>
Date: Thu, 26 Sep 2024 08:21:21 -0400
Subject: [PATCH] Add support for commit-boost (#1939)

---
 .gitignore                         |  1 +
 commit-boost-pbs.yml               | 22 ++++++++++++++++++++++
 commit-boost/cb-config.toml.sample | 17 +++++++++++++++++
 default.env                        |  7 +++++--
 ethd                               |  8 ++++++--
 5 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 commit-boost-pbs.yml
 create mode 100644 commit-boost/cb-config.toml.sample

diff --git a/.gitignore b/.gitignore
index 32cddf71..eac3f087 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,5 @@ ssv-config/config.yaml
 ssv-config/config.yaml.original
 ssv-config/dkg-config.yaml
 ssv-config/dkg-config.yaml.original
+commit-boost/cb-config.toml
 .nada
diff --git a/commit-boost-pbs.yml b/commit-boost-pbs.yml
new file mode 100644
index 00000000..e9d11024
--- /dev/null
+++ b/commit-boost-pbs.yml
@@ -0,0 +1,22 @@
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 100m
+      max-file: "3"
+      tag: '{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}'
+
+services:
+  cb-pbs:
+    image: ${CB_PBS_DOCKER_REPO:-ghcr.io/commit-boost/pbs}:${CB_PBS_DOCKER_TAG:-latest}
+    environment:
+      CB_CONFIG: /cb-config.toml
+      CB_METRICS_PORT: 10000
+    volumes:
+    - ./commit-boost/cb-config.toml:/cb-config.toml:ro
+    labels:
+      - metrics.scrape=true
+      - metrics.path=/metrics
+      - metrics.port=10000
+      - metrics.instance=cb-pbs
+      - metrics.network=${NETWORK}
diff --git a/commit-boost/cb-config.toml.sample b/commit-boost/cb-config.toml.sample
new file mode 100644
index 00000000..934ad9ee
--- /dev/null
+++ b/commit-boost/cb-config.toml.sample
@@ -0,0 +1,17 @@
+chain = "Holesky"
+
+[pbs]
+port = 18550
+
+[[relays]]
+id = "bloxroute"
+url = "https://0x821f2a65afb70e7f2e820a925a9b4c80a159620582c1766b1b09729fec178b11ea22abb3a51f07b288be815a1a2ff516@bloxroute.holesky.blxrbdn.com"
+[[relays]]
+id = "aestus"
+url = "https://0xab78bf8c781c58078c3beb5710c57940874dd96aef2835e7742c866b4c7c0406754376c2c8285a36c630346aa5c5f833@holesky.aestus.live"
+[[relays]]
+id = "titan"
+url = "https://0xaa58208899c6105603b74396734a6263cc7d947f444f396a90f7b7d3e65d102aec7e5e5291b27e08d02c50a050825c2f@holesky.titanrelay.xyz"
+[[relays]]
+id = "flashbots"
+url = "https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-holesky.flashbots.net"
diff --git a/default.env b/default.env
index 6540c21c..ae0e17c1 100644
--- a/default.env
+++ b/default.env
@@ -8,7 +8,7 @@ FEE_RECIPIENT=
 # If "true" and used with a CL, it also requires :mev-boost.yml in COMPOSE_FILE
 MEV_BOOST=false
 # For relay information, please see https://ethstaker.cc/mev-relay-list/
-MEV_RELAYS=https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-holesky.flashbots.net,https://0xaa58208899c6105603b74396734a6263cc7d947f444f396a90f7b7d3e65d102aec7e5e5291b27e08d02c50a050825c2f@holesky.titanrelay.xyz,https://0xb1d229d9c21298a87846c7022ebeef277dfc321fe674fa45312e20b5b6c400bfde9383f801848d7837ed5fc449083a12@relay-holesky.edennetwork.io,https://0x821f2a65afb70e7f2e820a925a9b4c80a159620582c1766b1b09729fec178b11ea22abb3a51f07b288be815a1a2ff516@bloxroute.holesky.blxrbdn.com
+MEV_RELAYS=https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-holesky.flashbots.net,https://0xaa58208899c6105603b74396734a6263cc7d947f444f396a90f7b7d3e65d102aec7e5e5291b27e08d02c50a050825c2f@holesky.titanrelay.xyz,https://0x821f2a65afb70e7f2e820a925a9b4c80a159620582c1766b1b09729fec178b11ea22abb3a51f07b288be815a1a2ff516@bloxroute.holesky.blxrbdn.com
 # Set a minimum MEV bid (e.g. 0.05), used by mev-boost.yml. If empty, no minimum is used.
 MEV_MIN_BID=
 # Graffiti to use for validator
@@ -194,6 +194,9 @@ VE_ORACLE_ADDRESSES_ALLOWLIST=
 ENABLE_DIST_ATTESTATION_AGGR=
 LIDO_DV_EXIT_EXIT_EPOCH=
 
+# Commit-Boost
+CB_PBS_DOCKER_TAG=latest
+CB_PBS_DOCKER_REPO=ghcr.io/commit-boost/pbs
 # MEV-Boost
 # SRC build target can be a tag, a branch, or a pr as "pr-ID"
 MEV_SRC_BUILD_TARGET=stable
@@ -328,4 +331,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=15
+ENV_VERSION=16
diff --git a/ethd b/ethd
index deb67b93..32718fc9 100755
--- a/ethd
+++ b/ethd
@@ -244,6 +244,10 @@ __prep_conffiles() {
   if [ ! -f "ext-network.yml" ]; then
     ${__as_owner} cp ext-network.yml.sample ext-network.yml
   fi
+# Create cb-config.toml if it doesn't exist
+  if [ ! -f "commit-boost/cb-config.toml" ]; then
+    ${__as_owner} cp commit-boost/cb-config.toml.sample commit-boost/cb-config.toml
+  fi
 }
 
 
@@ -1013,8 +1017,8 @@ __env_migrate() {
     ERIGON_SRC_REPO ERIGON_DOCKER_TAG ERIGON_DOCKER_REPO ERIGON_DOCKERFILE MEV_SRC_BUILD_TARGET MEV_SRC_REPO \
     MEV_DOCKERFILE MEV_DOCKER_TAG MEV_DOCKER_REPO NIMEL_SRC_BUILD_TARGET NIMEL_SRC_REPO NIMEL_DOCKER_TAG \
     NIMEL_DOCKER_REPO NIMEL_DOCKERFILE LS_SRC_BUILD_TARGET LS_SRC_REPO LS_DOCKER_TAG LS_DOCKER_REPO LS_DOCKERFILE \
-    GETH_SRC_BUILD_TARGET GETH_SRC_REPO GETH_DOCKER_TAG GETH_DOCKER_REPO TRAEFIK_TAG DDNS_TAG \
-    GETH_DOCKERFILE NM_SRC_BUILD_TARGET NM_SRC_REPO NM_DOCKER_TAG NM_DOCKER_REPO NM_DOCKERFILE \
+    GETH_SRC_BUILD_TARGET GETH_SRC_REPO GETH_DOCKER_TAG GETH_DOCKER_REPO TRAEFIK_TAG DDNS_TAG CB_PBS_DOCKER_TAG \
+    GETH_DOCKERFILE NM_SRC_BUILD_TARGET NM_SRC_REPO NM_DOCKER_TAG NM_DOCKER_REPO NM_DOCKERFILE CB_PBS_DOCKER_REPO \
     BESU_SRC_BUILD_TARGET BESU_SRC_REPO BESU_DOCKER_TAG BESU_DOCKER_REPO BESU_DOCKERFILE SSV_NODE_TAG CHARON_VERSION \
     DEPCLI_SRC_BUILD_TARGET DEPCLI_SRC_REPO DEPCLI_DOCKER_TAG W3S_DOCKER_TAG W3S_DOCKER_REPO \
     PG_DOCKER_TAG RETH_SRC_BUILD_TARGET RETH_SRC_REPO RETH_DOCKER_TAG RETH_DOCKER_REPO RETH_DOCKERFILE \