Skip to content
Open
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
2 changes: 1 addition & 1 deletion recipes-core/images/cvm-initramfs.bbappend
Original file line number Diff line number Diff line change
@@ -1 +1 @@
PACKAGE_INSTALL:append = " bid-scraper rbuilder orderflow-proxy system-api ssh-key-injection haproxy config-watchdog acme-le"
PACKAGE_INSTALL:append = " rbuilder orderflow-proxy system-api ssh-key-injection haproxy config-watchdog acme-le"
130 changes: 0 additions & 130 deletions recipes-nodes/bid-scraper/bid-scraper.inc

This file was deleted.

6 changes: 0 additions & 6 deletions recipes-nodes/bid-scraper/bid-scraper_v1.2.9.bb

This file was deleted.

6 changes: 0 additions & 6 deletions recipes-nodes/bid-scraper/config.toml.mustache

This file was deleted.

1 change: 0 additions & 1 deletion recipes-nodes/bid-scraper/env.mustache

This file was deleted.

82 changes: 0 additions & 82 deletions recipes-nodes/bid-scraper/init

This file was deleted.

6 changes: 4 additions & 2 deletions recipes-nodes/rbuilder-bidding/init
Original file line number Diff line number Diff line change
Expand Up @@ -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.19@sha256:90f2682b8064187229bd381428f19bf3fe06c9f60eaadc8f1fbb354327717241
ETH_GROUP=eth

source /etc/rbuilder-bidding/rbuilder-bidding-token
Expand All @@ -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 \
Expand Down Expand Up @@ -67,4 +69,4 @@ case "$1" in
;;
esac

exit 0
exit 0
6 changes: 5 additions & 1 deletion recipes-nodes/rbuilder/config.mustache
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -30,12 +31,15 @@ reth_static_files_path = "/persistent/reth/static_files"
root_hash_sparse_trie_version = "v2"
root_hash_threads = {{rbuilder.root_hash_threads}}
root_hash_use_sparse_trie = true
system_recipient_allowlist = '{{rbuilder.system_recipient_allowlist}}'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix ordering

sbundle_mergeable_signers = ["0xFC171C46A32DC7fF09fBDDD4884a65b2aD596517"]
scraped_bids_publisher_url = "{{rbuilder.scraped_bids_publisher_url}}"
simulation_threads = 4
time_to_keep_mempool_txs_secs = {{rbuilder.time_to_keep_mempool_txs_secs}}
max_order_execution_duration_warning_us = {{rbuilder.max_order_execution_duration_warning_us}}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix ordering

watchdog_timeout_sec = {{rbuilder.watchdog_timeout_sec}}

{{{rbuilder.builders}}}

{{{rbuilder.relays}}}

{{{rbuilder.relay_bid_scrapers}}}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include rbuilder.inc

SRC_URI = "git://github.com/flashbots/rbuilder-operator;protocol=https;branch=main"
SRCREV = "v1.2.9"
SRCREV = "v1.2.19"

PV = "1.0+git${SRCPV}"
4 changes: 2 additions & 2 deletions recipes-nodes/render-config/fetch-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/orderflow-proxy.conf /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/orderflow-proxy.conf /etc/system-api/systemapi-config.toml /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"
OPTIONAL_TEMPLATES="/etc/disk-encryption/key"
SYSTEM_API_FIFO=/var/volatile/system-api.fifo

Expand Down