Skip to content

fix: improve discovery via bootnode #395

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

Merged
canercidam merged 3 commits into from
Mar 10, 2026
Merged

fix: improve discovery via bootnode #395

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
660f4f7
fix: improve discovery via bootnode
dvush Mar 6, 2026
5f6b498
docs
dvush Mar 6, 2026
ecdd597
Fix op-geth bootnode peering (#396)
canercidam Mar 10, 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
1 change: 0 additions & 1 deletion docs/recipes/opstack.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ graph LR
beacon -->|authrpc| el
beacon_healthmon -->|http| beacon
validator -->|http| beacon
op_geth -->|rpc| bootnode
op_geth_healthmon -->|http| op_geth
op_node -->|http| el
op_node -->|http| beacon
Expand Down
54 changes: 28 additions & 26 deletions playground/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ package playground

import (
"context"
_ "embed"
"fmt"
"os"
"strconv"
"strings"
"time"

_ "embed"

"github.com/ethereum/go-ethereum/common/hexutil"
mevboostrelay "github.com/flashbots/builder-playground/mev-boost-relay"
"github.com/flashbots/go-boost-utils/bls"
Expand Down Expand Up @@ -81,7 +80,6 @@ func (o *OpRbuilder) Apply(ctx *ExContext) *Component {
"--http.port", `{{Port "http" 8545}}`,
"--chain", "/data/l2-genesis.json",
"--datadir", "/data_op_reth",
"--disable-discovery",
"--color", "never",
"--metrics", `0.0.0.0:{{Port "metrics" 9090}}`,
"--port", `{{Port "rpc" 30303}}`,
Expand All @@ -100,7 +98,9 @@ func (o *OpRbuilder) Apply(ctx *ExContext) *Component {
})

if ctx.Bootnode != nil {
service.WithArgs("--bootnodes", ctx.Bootnode.Connect())
service.WithArgs("--bootnodes", ctx.Bootnode.Connect(), "--nat", "none", "--rollup.discovery.v4")
Copy link
Contributor

@claude claude bot Mar 6, 2026

Choose a reason for hiding this comment

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

The bootnode discovery pattern is repeated across 4 components (OpRbuilder, FlashblocksRPC, RethEL, OpReth) with slight variations (some include --rollup.discovery.v4, some don't). Consider extracting a helper like applyBootnodeArgs(svc, ctx, isRollup bool) to centralize this logic — it would make it easier to update in one place if the flags change again.

} else {
service.WithArgs("--disable-discovery")
}

if o.Flashblocks {
Expand Down Expand Up @@ -159,7 +159,6 @@ func (f *FlashblocksRPC) Apply(ctx *ExContext) *Component {
"--http.port", `{{Port "http" 8545}}`,
"--chain", "/data/l2-genesis.json",
"--datadir", "/data_op_reth",
"--disable-discovery",
"--color", "never",
"--metrics", `0.0.0.0:{{Port "metrics" 9090}}`,
"--port", `{{Port "rpc" 30303}}`,
Expand All @@ -171,7 +170,11 @@ func (f *FlashblocksRPC) Apply(ctx *ExContext) *Component {
if ctx.Bootnode != nil {
service.WithArgs(
"--bootnodes", ctx.Bootnode.Connect(),
"--nat", "none",
"--rollup.discovery.v4",
)
} else {
service.WithArgs("--disable-discovery")
}

return component
Expand Down Expand Up @@ -376,10 +379,12 @@ func (o *OpGeth) Apply(ctx *ExContext) *Component {
component := NewComponent("op-geth")
o.Enode = ctx.Output.GetEnodeAddr()

var trustedPeers string
if ctx.Bootnode != nil {
trustedPeers = fmt.Sprintf("--bootnodes %s ", ctx.Bootnode.Connect())
}
// TODO: this does not work for op-geth because hostnames are not allowed
// in geth bootnode config (node will break on startup if we remove --nodiscover below)
// var trustedPeers string
// if ctx.Bootnode != nil {
// trustedPeers = fmt.Sprintf("--bootnodes %s ", ctx.Bootnode.Connect())
// }

svc := component.NewService("op-geth").
WithImage("us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth").
Expand Down Expand Up @@ -415,7 +420,7 @@ func (o *OpGeth) Apply(ctx *ExContext) *Component {
"--state.scheme hash "+
"--port "+`{{Port "rpc" 30303}} `+
"--nodekey /data/p2p_key.txt "+
trustedPeers+
// trustedPeers+
"--metrics "+
"--metrics.addr 0.0.0.0 "+
"--metrics.port "+`{{Port "metrics" 6061}}`,
Expand Down Expand Up @@ -483,7 +488,6 @@ func (r *RethEL) Apply(ctx *ExContext) *Component {
"--color", "never",
"--addr", "0.0.0.0",
"--port", `{{Port "rpc" 30303}}`,
// "--disable-discovery",
"--ipcpath", "/data_reth/reth.ipc",
// http config
"--http",
Expand All @@ -510,7 +514,9 @@ func (r *RethEL) Apply(ctx *ExContext) *Component {
WithVolume("data", "/data_reth", true)

if ctx.Bootnode != nil {
svc.WithArgs("--bootnodes", ctx.Bootnode.Connect())
svc.WithArgs("--bootnodes", ctx.Bootnode.Connect(), "--nat", "none")
} else {
svc.WithArgs("--disable-discovery")
}

UseHealthmon(component, svc, healthmonExecution)
Expand Down Expand Up @@ -691,7 +697,6 @@ func (o *OpReth) Apply(ctx *ExContext) *Component {
"--http.port", `{{Port "http" 8545}}`,
"--chain", "/data/l2-genesis.json",
"--datadir", "/data_op_reth",
"--disable-discovery",
"--color", "never",
"--metrics", `0.0.0.0:{{Port "metrics" 9090}}`,
"--addr", "0.0.0.0",
Expand All @@ -701,6 +706,12 @@ func (o *OpReth) Apply(ctx *ExContext) *Component {
WithArtifact("/data/l2-genesis.json", "l2-genesis.json").
WithVolume("data", "/data_op_reth")

if ctx.Bootnode != nil {
svc.WithArgs("--bootnodes", ctx.Bootnode.Connect(), "--nat", "none", "--rollup.discovery.v4")
} else {
svc.WithArgs("--disable-discovery")
}

UseHealthmon(component, svc, healthmonExecution)

return component
Expand Down Expand Up @@ -1057,22 +1068,15 @@ func registerBuilderHook(ctx context.Context, exCtx *ExContext, manifest *Manife
return nil
}

type BootnodeProtocol string

const (
BootnodeProtocolV5 BootnodeProtocol = "v5"
)

type Bootnode struct {
Protocol BootnodeProtocol
Enode *EnodeAddr
Enode *EnodeAddr
}

func (b *Bootnode) Apply(ctx *ExContext) *Component {
component := NewComponent("bootnode")

b.Enode = ctx.Output.GetEnodeAddr()
svc := component.NewService("bootnode").
component.NewService("bootnode").
WithImage("ghcr.io/paradigmxyz/reth").
WithTag("v1.9.3").
WithEntrypoint("/usr/local/bin/reth").
Expand All @@ -1082,13 +1086,11 @@ func (b *Bootnode) Apply(ctx *ExContext) *Component {
"--p2p-secret-key", "/data/p2p_key.txt",
"-vvvv",
"--color", "never",
"--nat", "none",
"--v5",
).
WithArtifact("/data/p2p_key.txt", b.Enode.Artifact)

if b.Protocol == BootnodeProtocolV5 {
svc.WithArgs("--v5")
}

// Mutate the execution context by setting the bootnode.
ctx.Bootnode = &BootnodeRef{
Service: "bootnode",
Expand Down