Bump rbuilder to latest + add rbuilder-rebalancer + bump reth/lighthouse

recipes-core/images/cvm-initramfs.bbappend

@@ -1 +1 @@
-PACKAGE_INSTALL:append = " bid-scraper rbuilder flowproxy system-api ssh-key-injection haproxy config-watchdog acme-le"
+PACKAGE_INSTALL:append = " rbuilder-rebalancer rbuilder flowproxy system-api ssh-key-injection haproxy config-watchdog acme-le"

recipes-nodes/lighthouse/lighthouse_v7.0.1.bb → recipes-nodes/lighthouse/lighthouse_v8.0.0.bb

@@ -1,4 +1,4 @@
 include lighthouse.inc
 
 SRC_URI = "git://github.com/sigp/lighthouse;protocol=https;branch=stable"
-SRCREV = "v7.0.1"
+SRCREV = "v8.0.0"

recipes-nodes/rbuilder-bidding/init

@@ -15,7 +15,7 @@ LOG_DIR=/var/log/containers
 LOGFILE="$LOG_DIR/rbuilder-bidding.log"
 RUN_DIR=/var/run/rbuilder
 RBUILDER_USER=rbuilder
-RBUILDER_BIDDING_VERSION=1.2.9@sha256:f99aee17d8fba7645796d2c36364cad93393467c8e3761707b568fe50311a500
+RBUILDER_BIDDING_VERSION=1.2.24@sha256:3a6414ecf0d950432fef838fb2b3d72814d1dba1217138df662051d8b134e5a2
 ETH_GROUP=eth
 
 source /etc/rbuilder-bidding/rbuilder-bidding-token
@@ -24,6 +24,8 @@ start_builder_bidding() {
     podman run -dt --rm --restart on-failure --name $NAME \
         -v /etc/rbuilder-bidding:/rbuilder-bidding \
         -v $RUN_DIR:$RUN_DIR \
+        -v /dev/shm:/dev/shm \
+        -v /tmp/iceoryx2:/tmp/iceoryx2 \
         --user $(id -u rbuilder):$(id -g rbuilder) \
         --log-opt path=$LOGFILE \
         --network=none \
@@ -67,4 +69,4 @@ case "$1" in
     ;;
 esac
 
-exit 0
+exit 0

recipes-nodes/rbuilder-rebalancer/config.toml.mustache

@@ -0,0 +1,9 @@
+rpc_url = "ws://127.0.0.1:8546"
+builder_url = "http://127.0.0.1:8645"
+transfer_max_priority_fee_per_gas = "1000000000"
+
+env_filter = "info"
+log_color = false
+log_json = true
+
+{{{rebalancer.config}}}

recipes-nodes/rbuilder-rebalancer/env.mustache

@@ -0,0 +1 @@
+export BUILDER_EOA_KEY={{rbuilder.coinbase_secret_key}}

recipes-nodes/bid-scraper/init → recipes-nodes/rbuilder-rebalancer/init

@@ -1,36 +1,36 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:          bid-scraper
+# Provides:          rbuilder-rebalancer
 # Required-Start:    $network $remote_fs fetch-config reth-sync
 # Required-Stop:     $network $remote_fs
 # Default-Start:     5
 # Default-Stop:      0 1 6
-# Short-Description: bid-scraper
-# Description:       Start and stop the bid-scraper daemon
+# Short-Description: rbuilder-rebalancer
+# Description:       Start and stop the rbuilder-rebalancer daemon
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/bid-scraper
-NAME=bid-scraper
-DESC="Bid Scraper"
-PIDFILE=/var/run/bid-scraper.pid
-LOGFILE=/var/log/bid-scraper.log
-BID_SCRAPER_USER=bid-scraper
-BID_SCRAPER_GROUP=bid-scraper
-BID_SCRAPER_CONFIG=/etc/bid-scraper/config.toml
+DAEMON=/usr/bin/rbuilder-rebalancer
+NAME=rbuilder-rebalancer
+DESC="rbuilder rebalancer"
+PIDFILE=/var/run/rbuilder-rebalancer.pid
+LOGFILE=/var/log/rbuilder-rebalancer.log
+REBALANCER_USER=rbuilder-rebalancer
+REBALANCER_GROUP=rbuilder-rebalancer
+REBALANCER_CONFIG=/etc/rbuilder-rebalancer/config.toml
 
-source /etc/bid-scraper/env
+source /etc/rbuilder-rebalancer/env
 
 start() {
   echo -n "Starting $DESC: "
   echo "Starting $DESC" > /var/volatile/system-api.fifo
 
-  # Ensure the bid-scraper log file exists and has correct permissions
+  # Ensure the rebalancer log file exists and has correct permissions
   touch $LOGFILE
-  chown $BID_SCRAPER_USER:$BID_SCRAPER_GROUP $LOGFILE
+  chown $REBALANCER_USER:$REBALANCER_USER $LOGFILE
 
-  start-stop-daemon -S --make-pidfile -p $PIDFILE -c $BID_SCRAPER_USER:$BID_SCRAPER_GROUP -N -10 -b -a /bin/sh -- -c "exec ${DAEMON} \
-    ${BID_SCRAPER_CONFIG} \
+  start-stop-daemon -S --make-pidfile -p $PIDFILE -c $REBALANCER_USER:$REBALANCER_USER -N -10 -b -a /bin/sh -- -c "exec ${DAEMON} \
+    ${REBALANCER_CONFIG} \
     2>&1 | tee -a ${LOGFILE}"
 
   echo "$NAME"
@@ -79,4 +79,5 @@ case "$1" in
   exit 1
   ;;
 esac
+
 exit 0

recipes-nodes/bid-scraper/bid-scraper.inc → recipes-nodes/rbuilder-rebalancer/rbuilder-rebalancer.inc

@@ -1,8 +1,9 @@
-SUMMARY = "Bid Scraper"
-DESCRIPTION = "Bid scraper service"
+SUMMARY = "Rbuilder Rebalancer"
+DESCRIPTION = "Rbuilder rebalancer service"
 HOMEPAGE = "https://github.com/flashbots/rbuilder"
-LICENSE="CLOSED"
-LIC_FILES_CHKSUM=""
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=4faa81fe3f8de83516cf066fcac8f951 \
+                    file://LICENSE-APACHE;md5=28f6506253cb1046c900c907426bb615"
 
 inherit cargo_bin update-rc.d useradd
 
@@ -21,11 +22,11 @@ SRC_URI += "file://config.toml.mustache"
 SRC_URI += "file://env.mustache"
 S = "${WORKDIR}/git"
 
-INITSCRIPT_NAME = "bid-scraper"
+INITSCRIPT_NAME = "rbuilder-rebalancer"
 INITSCRIPT_PARAMS = "defaults 98"
 
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "-r -s /bin/false -G eth bid-scraper"
+USERADD_PARAM:${PN} = "-r -s /bin/false -G eth rbuilder-rebalancer"
 
 # Specify the toolchain to use
 TOOLCHAIN = "clang"
@@ -43,7 +44,7 @@ RUSTFLAGS += "-C link-arg=-Wl,--build-id=none"
 # Use a consistent symbol mangling version
 RUSTFLAGS += "-C symbol-mangling-version=v0"
 # Remap the build path to a generic path
-RUSTFLAGS += "--remap-path-prefix=${WORKDIR}=/usr/src/bid-scraper"
+RUSTFLAGS += "--remap-path-prefix=${WORKDIR}=/usr/src/rbuilder-rebalancer"
 
 # Cargo profile settings for release builds
 # Optimize for size
@@ -100,31 +101,31 @@ do_compile:prepend() {
 }
 
 # Additional Cargo build arguments
-EXTRA_OECARGO_BUILDARGS += "--frozen --package bid-scraper --bin bid-scraper"
+EXTRA_OECARGO_BUILDARGS += "--frozen --package rbuilder-rebalancer --bin rbuilder-rebalancer"
 
 do_install() {
     # Install the service
     install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${THISDIR}/init ${D}${sysconfdir}/init.d/bid-scraper
+    install -m 0755 ${THISDIR}/init ${D}${sysconfdir}/init.d/rbuilder-rebalancer
 
     # Install the binary
     install -d ${D}${bindir}
-    install -m 0755 ${B}/${CARGO_TARGET_SUBDIR}/bid-scraper ${D}${bindir}/bid-scraper
+    install -m 0755 ${B}/${CARGO_TARGET_SUBDIR}/rbuilder-rebalancer ${D}${bindir}/rbuilder-rebalancer
 
     # Install config files
-    install -m 0755 -o bid-scraper -g bid-scraper -d ${D}${sysconfdir}/bid-scraper
-    install -m 0644 -o bid-scraper -g bid-scraper    ${THISDIR}/config.toml.mustache ${D}${sysconfdir}/bid-scraper/config.toml.mustache
-    install -m 0644 -o bid-scraper -g bid-scraper    ${THISDIR}/env.mustache         ${D}${sysconfdir}/bid-scraper/env.mustache
-    install -m 0644 -o bid-scraper -g bid-scraper    /dev/null                       ${D}${sysconfdir}/bid-scraper/config.toml
-    install -m 0640 -o bid-scraper -g bid-scraper    /dev/null                       ${D}${sysconfdir}/bid-scraper/env
+    install -m 0755 -o rbuilder-rebalancer -g rbuilder-rebalancer -d ${D}${sysconfdir}/rbuilder-rebalancer
+    install -m 0644 -o rbuilder-rebalancer -g rbuilder-rebalancer    ${THISDIR}/config.toml.mustache ${D}${sysconfdir}/rbuilder-rebalancer/config.toml.mustache
+    install -m 0644 -o rbuilder-rebalancer -g rbuilder-rebalancer    ${THISDIR}/env.mustache         ${D}${sysconfdir}/rbuilder-rebalancer/env.mustache
+    install -m 0644 -o rbuilder-rebalancer -g rbuilder-rebalancer    /dev/null                       ${D}${sysconfdir}/rbuilder-rebalancer/config.toml
+    install -m 0640 -o rbuilder-rebalancer -g rbuilder-rebalancer    /dev/null                       ${D}${sysconfdir}/rbuilder-rebalancer/env
 }
 
 # Ensure do_install task is re-run if CARGO_TARGET_SUBDIR changes
 do_install[vardeps] += "CARGO_TARGET_SUBDIR"
 
 # Define the files to be included in the package
-FILES:${PN} += "${bindir}/bid-scraper"
+FILES:${PN} += "${bindir}/rbuilder-rebalancer"
 FILES:${PN} += "${sysconfdir}/init.d/${INITSCRIPT_NAME}"
-FILES:${PN} += "${sysconfdir}/bid-scraper/config.toml.mustache"
-FILES:${PN} += "${sysconfdir}/bid-scraper/config.toml"
-FILES:${PN} += "${sysconfdir}/bid-scraper/env.mustache"
+FILES:${PN} += "${sysconfdir}/rbuilder-rebalancer/config.toml.mustache"
+FILES:${PN} += "${sysconfdir}/rbuilder-rebalancer/config.toml"
+FILES:${PN} += "${sysconfdir}/rbuilder-rebalancer/env.mustache"

recipes-nodes/rbuilder-rebalancer/rbuilder-rebalancer_v1.2.24.bb

@@ -0,0 +1,6 @@
+include rbuilder-rebalancer.inc
+
+SRC_URI = "git://github.com/flashbots/rbuilder;protocol=https;nobranch=1"
+SRCREV = "v1.2.24"
+
+PV = "1.0+git${SRCPV}"

recipes-nodes/rbuilder/config.mustache

@@ -1,3 +1,4 @@
+adjust_finalized_blocks = {{rbuilder.adjust_finalized_blocks}}
 bidding_service_ipc_path = "/var/run/rbuilder/rpc_bidding_server.sock"
 blocklist = "{{rbuilder.blocklist}}"
 blocks_processor_url = "https://orderflow-archive.flashbots.net/api"
@@ -20,9 +21,14 @@ live_builders = {{{rbuilder.live_builders}}}
 log_color = false
 log_json = true
 log_level = "info,rbuilder=debug"
+max_order_execution_duration_warning_us = {{rbuilder.max_order_execution_duration_warning_us}}
 optimistic_enabled = true
 optimistic_max_bid_value_eth = "10"
 optimistic_relay_secret_key = "{{rbuilder.optimistic_relay_secret_key}}"
+optimistic_v3_server_ip = "0.0.0.0"
+optimistic_v3_server_port = 6000
+optimistic_v3_public_url = "{{rbuilder.optimistic_v3_public_url}}"
+optimistic_v3_relay_pubkeys = {{{rbuilder.optimistic_v3_relay_pubkeys}}}
 relay_secret_key = "{{rbuilder.relay_secret_key}}"
 require_non_empty_blocklist = {{rbuilder.require_non_empty_blocklist}}
 reth_db_path = "/persistent/reth/db"
@@ -31,11 +37,13 @@ root_hash_sparse_trie_version = "v2"
 root_hash_threads = {{rbuilder.root_hash_threads}}
 root_hash_use_sparse_trie = true
 sbundle_mergeable_signers = ["0xFC171C46A32DC7fF09fBDDD4884a65b2aD596517"]
-scraped_bids_publisher_url = "{{rbuilder.scraped_bids_publisher_url}}"
 simulation_threads = 8
+system_recipient_allowlist = {{{rbuilder.system_recipient_allowlist}}}
 time_to_keep_mempool_txs_secs = {{rbuilder.time_to_keep_mempool_txs_secs}}
 watchdog_timeout_sec = {{rbuilder.watchdog_timeout_sec}}
 
 {{{rbuilder.builders}}}
 
 {{{rbuilder.relays}}}
+
+{{{rbuilder.relay_bid_scrapers}}}

recipes-nodes/rbuilder/rbuilder.inc

@@ -1,8 +1,9 @@
 SUMMARY = "Rust Builder"
 DESCRIPTION = "Rust builder running with a full ethereum node (reth) implemented in rust."
-HOMEPAGE = "https://github.com/flashbots/rbuilder-operator"
-LICENSE="CLOSED"
-LIC_FILES_CHKSUM=""
+HOMEPAGE = "https://github.com/flashbots/rbuilder"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=4faa81fe3f8de83516cf066fcac8f951 \
+                    file://LICENSE-APACHE;md5=28f6506253cb1046c900c907426bb615"
 
 inherit cargo_bin update-rc.d useradd
 

recipes-nodes/rbuilder/rbuilder_v1.2.24.bb

@@ -0,0 +1,6 @@
+include rbuilder.inc
+
+SRC_URI = "git://github.com/flashbots/rbuilder;protocol=https;nobranch=1"
+SRCREV = "v1.2.24"
+
+PV = "1.0+git${SRCPV}"

recipes-nodes/render-config/fetch-config.sh

@@ -12,8 +12,8 @@
 set -e
 
 INIT_CONFIG_FILE="/etc/init-config.json"
-TEMPLATED_CONFIG_FILES="/etc/td-agent-bit/td-agent-bit.conf /etc/process-exporter/process-exporter.yaml /etc/prometheus/prometheus.yml /etc/rclone.conf /etc/flowproxy/env /etc/system-api/systemapi-config.toml /etc/bid-scraper/env /etc/rbuilder-bidding/rbuilder-bidding-token /etc/haproxy/haproxy.cfg /etc/td-agent-bit/aws-auth /etc/acme.sh/acme-le.env /etc/rbuilder.env"
-TEMPLATED_CONFIG_FILES_UNSAFE="/etc/rbuilder-bidding/bidding-service.toml /etc/disk-encryption/key /etc/rbuilder.config /etc/bid-scraper/config.toml"
+TEMPLATED_CONFIG_FILES="/etc/td-agent-bit/td-agent-bit.conf /etc/process-exporter/process-exporter.yaml /etc/prometheus/prometheus.yml /etc/rclone.conf /etc/flowproxy/env /etc/system-api/systemapi-config.toml /etc/rbuilder-rebalancer/env /etc/rbuilder-bidding/rbuilder-bidding-token /etc/haproxy/haproxy.cfg /etc/td-agent-bit/aws-auth /etc/acme.sh/acme-le.env /etc/rbuilder.env"
+TEMPLATED_CONFIG_FILES_UNSAFE="/etc/rbuilder-bidding/bidding-service.toml /etc/disk-encryption/key /etc/rbuilder.config /etc/rbuilder-rebalancer/config.toml"
 OPTIONAL_TEMPLATES="/etc/disk-encryption/key"
 SYSTEM_API_FIFO=/var/volatile/system-api.fifo
 

recipes-nodes/reth/reth_v1.9.2.bb

@@ -0,0 +1,5 @@
+include reth.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}:"
+SRC_URI = "git://github.com/paradigmxyz/reth;protocol=https;nobranch=1"
+SRCREV = "v1.9.2"