Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 op-devstack/sysgo/l2_cl.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func WithL2CLNode(l2CLID stack.L2CLNodeID, l1CLID stack.L1CLNodeID, l1ELID stack
func WithL2CLNodeFollowL2(l2CLID stack.L2CLNodeID, l1CLID stack.L1CLNodeID, l1ELID stack.L1ELNodeID, l2ELID stack.L2ELNodeID, l2FollowSourceID stack.L2CLNodeID, opts ...L2CLOption) stack.Option[*Orchestrator] {
switch os.Getenv("DEVSTACK_L2CL_KIND") {
case "kona":
panic("kona does not support following")
return WithKonaNodeFollowL2(l2CLID, l1CLID, l1ELID, l2ELID, l2FollowSourceID, opts...)
case "supernode":
panic("supernode does not support following")
default:
Expand Down
27 changes: 25 additions & 2 deletions op-devstack/sysgo/l2_cl_kona.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,25 @@ func (k *KonaNode) InteropRPC() (endpoint string, jwtSecret eth.Bytes32) {

var _ L2CLNode = (*KonaNode)(nil)

func WithKonaNode(l2CLID stack.L2CLNodeID, l1CLID stack.L1CLNodeID, l1ELID stack.L1ELNodeID, l2ELID stack.L2ELNodeID, opts ...L2CLOption) stack.Option[*Orchestrator] {
func WithKonaNodeFollowL2(l2CLID stack.L2CLNodeID, l1CLID stack.L1CLNodeID, l1ELID stack.L1ELNodeID, l2ELID stack.L2ELNodeID, l2FollowSourceID stack.L2CLNodeID, opts ...L2CLOption) stack.Option[*Orchestrator] {
return stack.AfterDeploy(func(orch *Orchestrator) {
followSource := func(orch *Orchestrator) string {
p := orch.P().WithCtx(stack.ContextWithID(orch.P().Ctx(), l2CLID))
l2CLFollowSource, ok := orch.l2CLs.Get(l2FollowSourceID)
p.Require().True(ok, "l2 CL Follow Source required")
return l2CLFollowSource.UserRPC()
}(orch)
opts = append(opts, L2CLFollowSource(followSource))
withKonaNode(l2CLID, l1CLID, l1ELID, l2ELID, opts...)(orch)
})
}

func WithKonaNode(l2CLID stack.L2CLNodeID, l1CLID stack.L1CLNodeID, l1ELID stack.L1ELNodeID, l2ELID stack.L2ELNodeID, opts ...L2CLOption) stack.Option[*Orchestrator] {
return stack.AfterDeploy(withKonaNode(l2CLID, l1CLID, l1ELID, l2ELID, opts...))
}

func withKonaNode(l2CLID stack.L2CLNodeID, l1CLID stack.L1CLNodeID, l1ELID stack.L1ELNodeID, l2ELID stack.L2ELNodeID, opts ...L2CLOption) func(orch *Orchestrator) {
return func(orch *Orchestrator) {
p := orch.P().WithCtx(stack.ContextWithID(orch.P().Ctx(), l2CLID))

require := p.Require()
Expand Down Expand Up @@ -236,6 +253,12 @@ func WithKonaNode(l2CLID stack.L2CLNodeID, l1CLID stack.L1CLNodeID, l1ELID stack
envVars = append(envVars, "KONA_METRICS_ENABLED=true")
}

if cfg.FollowSource != "" {
envVars = append(envVars,
"KONA_NODE_L2_FOLLOW_SOURCE="+cfg.FollowSource,
)
}

if cfg.IsSequencer {
p2pKey, err := orch.keys.Secret(devkeys.SequencerP2PRole.Key(l2CLID.ChainID().ToBig()))
require.NoError(err, "need p2p key for sequencer")
Expand Down Expand Up @@ -279,5 +302,5 @@ func WithKonaNode(l2CLID stack.L2CLNodeID, l1CLID stack.L1CLNodeID, l1ELID stack
p.Cleanup(k.Stop)
p.Logger().Info("Kona-node is up", "rpc", k.UserRPC())
require.True(orch.l2CLs.SetIfMissing(l2CLID, k), "must not already exist")
})
}
}