sysgo: l1 geth subprocess support

Author: joshklop

op-devstack/stack/match/labels.go

@@ -20,6 +20,7 @@ const (
 type Vendor string
 
 const (
+	Geth                      Vendor = "geth"
 	OpReth                    Vendor = "op-reth"
 	OpGeth                    Vendor = "op-geth"
 	Proxyd                    Vendor = "proxyd"

op-devstack/sysgo/engine_client.go

@@ -0,0 +1,89 @@
+package sysgo
+
+import (
+	"context"
+
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/geth"
+	"github.com/ethereum/go-ethereum/beacon/engine"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	gn "github.com/ethereum/go-ethereum/node"
+	"github.com/ethereum/go-ethereum/rpc"
+	gethrpc "github.com/ethereum/go-ethereum/rpc"
+)
+
+type engineClient struct {
+	inner *rpc.Client
+}
+
+func dialEngine(ctx context.Context, endpoint string, jwtSecret [32]byte) (*engineClient, error) {
+	engineCl, err := gethrpc.DialOptions(ctx, endpoint, rpc.WithHTTPAuth(gn.NewJWTAuth(jwtSecret)))
+	if err != nil {
+		return nil, err
+	}
+	return &engineClient{
+		inner: engineCl,
+	}, nil
+}
+
+var _ geth.EngineAPI = (*engineClient)(nil)
+
+func (e *engineClient) forkchoiceUpdated(fs engine.ForkchoiceStateV1, pa *engine.PayloadAttributes, method string) (engine.ForkChoiceResponse, error) {
+	var x engine.ForkChoiceResponse
+	if err := e.inner.CallContext(context.Background(), &x, method, fs, pa); err != nil {
+		return engine.ForkChoiceResponse{}, err
+	}
+	return x, nil
+}
+
+func (e *engineClient) ForkchoiceUpdatedV2(fs engine.ForkchoiceStateV1, pa *engine.PayloadAttributes) (engine.ForkChoiceResponse, error) {
+	return e.forkchoiceUpdated(fs, pa, "engine_forkchoiceUpdatedV2")
+}
+
+func (e *engineClient) ForkchoiceUpdatedV3(fs engine.ForkchoiceStateV1, pa *engine.PayloadAttributes) (engine.ForkChoiceResponse, error) {
+	return e.forkchoiceUpdated(fs, pa, "engine_forkchoiceUpdatedV3")
+}
+
+func (e *engineClient) getPayload(id engine.PayloadID, method string) (*engine.ExecutionPayloadEnvelope, error) {
+	var result engine.ExecutionPayloadEnvelope
+	if err := e.inner.CallContext(context.Background(), &result, method, id); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+func (e *engineClient) GetPayloadV2(id engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
+	return e.getPayload(id, "engine_getPayloadV2")
+}
+
+func (e *engineClient) GetPayloadV3(id engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
+	return e.getPayload(id, "engine_getPayloadV3")
+}
+
+func (e *engineClient) GetPayloadV4(id engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
+	return e.getPayload(id, "engine_getPayloadV4")
+}
+
+func (e *engineClient) NewPayloadV2(data engine.ExecutableData) (engine.PayloadStatusV1, error) {
+	var result engine.PayloadStatusV1
+	if err := e.inner.CallContext(context.Background(), &result, "engine_newPayloadV2", data); err != nil {
+		return engine.PayloadStatusV1{}, err
+	}
+	return result, nil
+}
+
+func (e *engineClient) NewPayloadV3(data engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash) (engine.PayloadStatusV1, error) {
+	var result engine.PayloadStatusV1
+	if err := e.inner.CallContext(context.Background(), &result, "engine_newPayloadV3", data, versionedHashes, beaconRoot); err != nil {
+		return engine.PayloadStatusV1{}, err
+	}
+	return result, nil
+}
+
+func (e *engineClient) NewPayloadV4(data engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash, executionRequests []hexutil.Bytes) (engine.PayloadStatusV1, error) {
+	var result engine.PayloadStatusV1
+	if err := e.inner.CallContext(context.Background(), &result, "engine_newPayloadV4", data, versionedHashes, beaconRoot, executionRequests); err != nil {
+		return engine.PayloadStatusV1{}, err
+	}
+	return result, nil
+}

op-devstack/sysgo/faucet.go

@@ -75,7 +75,7 @@ func WithFaucets(l1ELs []stack.L1ELNodeID, l2ELs []stack.L2ELNodeID) stack.Optio
 			require.True(ok, "need L1 EL for faucet", elID)
 
 			faucets[id] = &fconf.FaucetEntry{
-				ELRPC:   endpoint.MustRPC{Value: endpoint.URL(el.userRPC)},
+				ELRPC:   endpoint.MustRPC{Value: endpoint.URL(el.UserRPC())},
 				ChainID: elID.ChainID(),
 				TxCfg: fconf.TxManagerConfig{
 					PrivateKey: funderKeyStr,

op-devstack/sysgo/l1_nodes.go

@@ -1,6 +1,7 @@
 package sysgo
 
 import (
+	"os"
 	"path/filepath"
 
 	"github.com/ethereum-optimism/optimism/op-devstack/shim"
@@ -12,14 +13,32 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/clock"
 )
 
-type L1ELNode struct {
+type L1ELNode interface {
+	hydrator
+	l1ELNode()
+	UserRPC() string
+	AuthRPC() string
+}
+
+type L1Geth struct {
 	id       stack.L1ELNodeID
 	userRPC  string
+	authRPC  string
 	l1Geth   *geth.GethInstance
 	blobPath string
 }
 
-func (n *L1ELNode) hydrate(system stack.ExtensibleSystem) {
+func (*L1Geth) l1ELNode() {}
+
+func (g *L1Geth) UserRPC() string {
+	return g.userRPC
+}
+
+func (g *L1Geth) AuthRPC() string {
+	return g.authRPC
+}
+
+func (n *L1Geth) hydrate(system stack.ExtensibleSystem) {
 	require := system.T().Require()
 	rpcCl, err := client.NewRPC(system.T().Ctx(), system.Logger(), n.userRPC, client.WithLazyDial())
 	require.NoError(err)
@@ -54,7 +73,16 @@ func (n *L1CLNode) hydrate(system stack.ExtensibleSystem) {
 	l1Net.(stack.ExtensibleL1Network).AddL1CLNode(frontend)
 }
 
+const GethExecPathEnvVar = "SYSGO_GETH_EXEC_PATH"
+
 func WithL1Nodes(l1ELID stack.L1ELNodeID, l1CLID stack.L1CLNodeID) stack.Option[*Orchestrator] {
+	if gethExecPath, ok := os.LookupEnv(GethExecPathEnvVar); ok {
+		return WithL1NodesSubprocess(l1ELID, l1CLID, gethExecPath)
+	}
+	return WithL1NodesInProcess(l1ELID, l1CLID)
+}
+
+func WithL1NodesInProcess(l1ELID stack.L1ELNodeID, l1CLID stack.L1CLNodeID) stack.Option[*Orchestrator] {
 	return stack.AfterDeploy(func(orch *Orchestrator) {
 		clP := orch.P().WithCtx(stack.ContextWithID(orch.P().Ctx(), l1CLID))
 		elP := orch.P().WithCtx(stack.ContextWithID(orch.P().Ctx(), l1ELID))
@@ -96,9 +124,10 @@ func WithL1Nodes(l1ELID stack.L1ELNodeID, l1CLID stack.L1CLNodeID) stack.Option[
 			_ = l1Geth.Close()
 		})
 
-		l1ELNode := &L1ELNode{
+		l1ELNode := &L1Geth{
 			id:       l1ELID,
 			userRPC:  l1Geth.Node.HTTPEndpoint(),
+			authRPC:  l1Geth.Node.HTTPAuthEndpoint(),
 			l1Geth:   l1Geth,
 			blobPath: blobPath,
 		}
@@ -120,7 +149,7 @@ func WithExtL1Nodes(l1ELID stack.L1ELNodeID, l1CLID stack.L1CLNodeID, elRPCEndpo
 		require := orch.P().Require()
 
 		// Create L1 EL node with external RPC
-		l1ELNode := &L1ELNode{
+		l1ELNode := &L1Geth{
 			id:      l1ELID,
 			userRPC: elRPCEndpoint,
 		}