Skip to content

l2: cumulative updates for builder uni #153

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

Open
0x416e746f6e wants to merge 11 commits into
base: main
Choose a base branch
from
Open

l2: cumulative updates for builder uni #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
676ed8c
Merge pull request #139 from flashbots/main
0x416e746f6e May 25, 2026
526af72
fix: use `systemd-repart` from nix
0x416e746f6e May 26, 2026
7577976
Merge pull request #151 from flashbots/trunk/l2-builder-uni-main
0x416e746f6e May 27, 2026
7e98290
Merge branch 'main' of https://github.com/flashbots/flashbots-images …
0x416e746f6e Jun 3, 2026
38e81f9
Merge pull request #157 from flashbots/trunk/l2-builder-uni-main
0x416e746f6e Jun 3, 2026
1e0721f
chore: upgrade op-rbuilder to `v0.4.7`
0x416e746f6e Jun 3, 2026
1af50da
chore: bump op-rbuilder to op-rbuilder/v0.4.8
flashbots-images-deploy-bot[bot] Jun 8, 2026
2e6b817
chore: bump op-rbuilder to op-rbuilder/v0.4.9
flashbots-images-deploy-bot[bot] Jun 16, 2026
10031cf
feat: implement node cordoning
0x416e746f6e Jun 17, 2026
4e7005c
chore: bump rproxy to v0.0.12
KA-ROM Jun 23, 2026
78e2dfc
chore: bump op-rbuilder to op-rbuilder/v0.4.10
flashbots-images-deploy-bot[bot] Jun 24, 2026
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 modules/l2/op-rbuilder-bproxy/mkosi.extra/etc/flashbots/op-rbuilder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ bproxy:
node_healthchecker:
git_reference: v0.1.11
op_rbuilder:
git_reference: op-rbuilder/v0.4.6
git_reference: op-rbuilder/v0.4.10
rust:
version: 1.94.0
tdx_quote_provider:
Expand Down
25 changes: 0 additions & 25 deletions modules/l2/op-rbuilder-bproxy/mkosi.extra/etc/systemd/system/node-healthchecker.service
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion modules/l2/op-rbuilder-bproxy/mkosi.extra/etc/vault-agent/gomplate/bproxy.service.ctmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Install]
WantedBy=default.target
WantedBy=minimal.target

[Unit]
Description=L2 builder proxy
Expand Down
2 changes: 1 addition & 1 deletion modules/l2/op-rbuilder-bproxy/mkosi.extra/etc/vault-agent/gomplate/bproxy.service.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ template {

command = ["/bin/sh", "-c",
<<-EOT
printf '{"@level":"info","@message":"rendered template","@destination":"/etc/systemd/system/bproxy.service","@content":"%s"}\n' "$( cat /etc/systemd/system/bproxy.service | base64 -w 0 )"
cat /etc/systemd/system/bproxy.service | base64 -w 2048

systemctl daemon-reload
systemctl add-wants minimal.target bproxy.service
Expand Down
31 changes: 31 additions & 0 deletions .../op-rbuilder-bproxy/mkosi.extra/etc/vault-agent/gomplate/node-healthchecker.service.ctmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[Install]
WantedBy=minimal.target

[Unit]
Description=Blockchain node healthchecker
After=network.target
Wants=network.target

[Service]
Type=simple
SyslogIdentifier=node-healthchecker
User=op-rbuilder
Group=optimism

Restart=always
RestartSec=5
TimeoutStopSec=60

((- $cordon := ( secret "[[ gcp.Meta "attributes/vault_kv_path" ]]/node/_cordon/[[ gcp.Meta "name" ]]" ).Data.data ))
((- $cordon_after := "0" ))(( if $cordon.after ))(( $cordon_after = $cordon.after ))(( end ))
((- $cordon_before := "0" ))(( if $cordon.before ))(( $cordon_before = $cordon.before ))(( end ))
((- $status := "200" ))(( if ( and ( ge (timestamp "unix") $cordon_after ) ( le (timestamp "unix") $cordon_before ) ) ))(( $status = "503" ))(( end ))

ExecStart=/usr/bin/node-healthchecker serve \
--healthcheck-block-age-threshold 10s \
--healthcheck-timeout 500ms \
--healthcheck-reth-base-url http://127.0.0.1:18645 \
--healthcheck-unconditional-fail-duration 1m \
--http-status-ok (( $status )) \
--http-status-warning (( $status )) \
--server-listen-address 0.0.0.0:8080
25 changes: 25 additions & 0 deletions ...l2/op-rbuilder-bproxy/mkosi.extra/etc/vault-agent/gomplate/node-healthchecker.service.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
template {
left_delimiter = "(("
right_delimiter = "))"

source = "/etc/vault-agent/node-healthchecker.service.ctmpl"
destination = "/etc/systemd/system/node-healthchecker.service"

user = "root"
group = "root"
perms = "0644"

exec {
timeout = "60s"

command = ["/bin/sh", "-c",
<<-EOT
cat /etc/systemd/system/node-healthchecker.service | base64 -w 2048

systemctl daemon-reload
systemctl add-wants minimal.target node-healthchecker.service
systemctl restart node-healthchecker.service
EOT
]
}
}
4 changes: 1 addition & 3 deletions modules/l2/op-rbuilder-bproxy/mkosi.extra/etc/vault-agent/gomplate/op-rbuilder.service.ctmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# op-rbuilder

[Install]
WantedBy=default.target
WantedBy=minimal.target

[Unit]
Description=op-rbuilder
Expand Down
2 changes: 1 addition & 1 deletion modules/l2/op-rbuilder-bproxy/mkosi.extra/etc/vault-agent/gomplate/op-rbuilder.service.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ template {

command = ["/bin/sh", "-c",
<<-EOT
printf '{"@level":"info","@message":"rendered template","@destination":"/etc/systemd/system/op-rbuilder.service","@content":"%s"}\n' "$( cat /etc/systemd/system/op-rbuilder.service | base64 -w 0 )"
cat /etc/systemd/system/op-rbuilder.service | base64 -w 2048

systemctl daemon-reload
systemctl add-wants minimal.target op-rbuilder.service
Expand Down
1 change: 0 additions & 1 deletion modules/l2/op-rbuilder-bproxy/mkosi.postinst.chroot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set -euxo pipefail
# Enable systemd services

systemctl add-wants minimal.target \
node-healthchecker.service \
tdx-quote-provider.service

# Create users and groups
Expand Down
4 changes: 2 additions & 2 deletions modules/l2/op-rbuilder/mkosi.extra/etc/flashbots/op-rbuilder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
node_healthchecker:
git_reference: v0.1.11
op_rbuilder:
git_reference: op-rbuilder/v0.4.6
git_reference: op-rbuilder/v0.4.9
rproxy:
git_reference: v0.0.11
git_reference: v0.0.12
rust:
version: 1.94.0
tdx_quote_provider:
Expand Down
25 changes: 0 additions & 25 deletions modules/l2/op-rbuilder/mkosi.extra/etc/systemd/system/node-healthchecker.service
View file
Open in desktop

This file was deleted.

31 changes: 31 additions & 0 deletions modules/l2/op-rbuilder/mkosi.extra/etc/vault-agent/gomplate/node-healthchecker.service.ctmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[Install]
WantedBy=minimal.target

[Unit]
Description=Blockchain node healthchecker
After=network.target
Wants=network.target

[Service]
Type=simple
SyslogIdentifier=node-healthchecker
User=op-rbuilder
Group=optimism

Restart=always
RestartSec=5
TimeoutStopSec=60

((- $cordon := ( secret "[[ gcp.Meta "attributes/vault_kv_path" ]]/node/_cordon/[[ gcp.Meta "name" ]]" ).Data.data ))
((- $cordon_after := "0" ))(( if $cordon.after ))(( $cordon_after = $cordon.after ))(( end ))
((- $cordon_before := "0" ))(( if $cordon.before ))(( $cordon_before = $cordon.before ))(( end ))
((- $status := "200" ))(( if ( and ( ge (timestamp "unix") $cordon_after ) ( le (timestamp "unix") $cordon_before ) ) ))(( $status = "503" ))(( end ))

ExecStart=/usr/bin/node-healthchecker serve \
--healthcheck-block-age-threshold 10s \
--healthcheck-timeout 500ms \
--healthcheck-reth-base-url http://127.0.0.1:18645 \
--healthcheck-unconditional-fail-duration 1m \
--http-status-ok (( $status )) \
--http-status-warning (( $status )) \
--server-listen-address 0.0.0.0:8080
25 changes: 25 additions & 0 deletions modules/l2/op-rbuilder/mkosi.extra/etc/vault-agent/gomplate/node-healthchecker.service.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
template {
left_delimiter = "(("
right_delimiter = "))"

source = "/etc/vault-agent/node-healthchecker.service.ctmpl"
destination = "/etc/systemd/system/node-healthchecker.service"

user = "root"
group = "root"
perms = "0644"

exec {
timeout = "60s"

command = ["/bin/sh", "-c",
<<-EOT
cat /etc/systemd/system/node-healthchecker.service | base64 -w 2048

systemctl daemon-reload
systemctl add-wants minimal.target node-healthchecker.service
systemctl restart node-healthchecker.service
EOT
]
}
}
4 changes: 1 addition & 3 deletions modules/l2/op-rbuilder/mkosi.extra/etc/vault-agent/gomplate/op-rbuilder.service.ctmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# op-rbuilder

[Install]
WantedBy=default.target
WantedBy=minimal.target

[Unit]
Description=op-rbuilder
Expand Down
2 changes: 1 addition & 1 deletion modules/l2/op-rbuilder/mkosi.extra/etc/vault-agent/gomplate/op-rbuilder.service.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ template {

command = ["/bin/sh", "-c",
<<-EOT
printf '{"@level":"info","@message":"rendered template","@destination":"/etc/systemd/system/op-rbuilder.service","@content":"%s"}\n' "$( cat /etc/systemd/system/op-rbuilder.service | base64 -w 0 )"
cat /etc/systemd/system/op-rbuilder.service | base64 -w 2048

systemctl daemon-reload
systemctl add-wants minimal.target op-rbuilder.service
Expand Down
2 changes: 1 addition & 1 deletion modules/l2/op-rbuilder/mkosi.extra/etc/vault-agent/gomplate/rproxy.service.ctmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Install]
WantedBy=default.target
WantedBy=minimal.target

[Unit]
Description=L2 builder proxy
Expand Down
2 changes: 1 addition & 1 deletion modules/l2/op-rbuilder/mkosi.extra/etc/vault-agent/gomplate/rproxy.service.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ template {

command = ["/bin/sh", "-c",
<<-EOT
printf '{"@level":"info","@message":"rendered template","@destination":"/etc/systemd/system/rproxy.service","@content":"%s"}\n' "$( cat /etc/systemd/system/rproxy.service | base64 -w 0 )"
cat /etc/systemd/system/rproxy.service | base64 -w 2048

systemctl daemon-reload
systemctl add-wants minimal.target rproxy.service
Expand Down
1 change: 0 additions & 1 deletion modules/l2/op-rbuilder/mkosi.postinst.chroot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set -euxo pipefail
# Enable systemd services

systemctl add-wants minimal.target \
node-healthchecker.service \
tdx-quote-provider.service

# Create users and groups
Expand Down