Remove batcher <> proposer link

Switch to eager proving unsafe blocks

op-batcher/batcher/batch_submitter.go

@@ -9,8 +9,6 @@ import (
 	opservice "github.com/ethereum-optimism/optimism/op-service"
 	"github.com/ethereum-optimism/optimism/op-service/cliapp"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
-	"github.com/ethereum/go-ethereum/rpc"
-	thisflags "github.com/mdehoog/op-enclave/op-batcher/flags"
 	"github.com/urfave/cli/v2"
 )
 
@@ -28,18 +26,11 @@ func Main(version string) cliapp.LifecycleAction {
 
 		l := oplog.NewLogger(oplog.AppOut(cliCtx), cfg.LogConfig)
 		oplog.SetGlobalLogHandler(l.Handler())
-		opservice.ValidateEnvVars(flags.EnvVarPrefix, thisflags.Flags, l)
-
-		proposerClient, err := rpc.DialContext(cliCtx.Context, cliCtx.String(thisflags.ProposerRpcFlag.Name))
-		if err != nil {
-			return nil, fmt.Errorf("failed to connect to Proposer: %w", err)
-		}
+		opservice.ValidateEnvVars(flags.EnvVarPrefix, flags.Flags, l)
 
 		l.Info("Initializing Batch Submitter")
 		channelFactoryOpt := func(setup *batcher.DriverSetup) {
-			metricer := NewMetricer(setup.Metr, setup.Log, proposerClient)
-			setup.Metr = metricer
-			setup.ChannelOutFactory = ChannelOutFactory(metricer)
+			setup.ChannelOutFactory = NewChannelOut
 		}
 		return batcher.BatcherServiceFromCLIConfig(cliCtx.Context, version, cfg, l, channelFactoryOpt)
 	}

op-batcher/batcher/channel_out.go

@@ -12,37 +12,22 @@ import (
 
 var ErrWithdrawalDetected = errors.New("withdrawal detected")
 
-type ChannelOut interface {
-	derive.ChannelOut
-	Blocks() []*types.Block
-}
-
-func ChannelOutFactory(metricer Metricer) batcher.ChannelOutFactory {
-	return func(cfg batcher.ChannelConfig, rollupCfg *rollup.Config) (derive.ChannelOut, error) {
-		co, err := batcher.NewChannelOut(cfg, rollupCfg)
-		if err != nil {
-			return nil, err
-		}
-		wrapped := &channelOut{
-			ChannelOut: co,
-		}
-		metricer.RegisterChannel(wrapped)
-		return wrapped, nil
+func NewChannelOut(cfg batcher.ChannelConfig, rollupCfg *rollup.Config) (derive.ChannelOut, error) {
+	co, err := batcher.NewChannelOut(cfg, rollupCfg)
+	if err != nil {
+		return nil, err
 	}
+	return &channelOut{
+		ChannelOut: co,
+	}, nil
 }
 
 type channelOut struct {
 	derive.ChannelOut
 	fullErr error
-	blocks  []*types.Block
-}
-
-func (c *channelOut) Blocks() []*types.Block {
-	return c.blocks
 }
 
 func (c *channelOut) AddBlock(config *rollup.Config, block *types.Block) (*derive.L1BlockInfo, error) {
-	c.blocks = append(c.blocks, block)
 	if block.Bloom().Test(predeploys.L2ToL1MessagePasserAddr.Bytes()) {
 		c.fullErr = ErrWithdrawalDetected
 	}

op-batcher/cmd/main.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"os"
 
+	"github.com/ethereum-optimism/optimism/op-batcher/flags"
 	"github.com/mdehoog/op-enclave/op-batcher/batcher"
-	"github.com/mdehoog/op-enclave/op-batcher/flags"
 	"github.com/urfave/cli/v2"
 
 	opservice "github.com/ethereum-optimism/optimism/op-service"

op-enclave/enclave/server.go

@@ -383,6 +383,13 @@ func (s *Server) ExecuteStateless(
 }
 
 func (s *Server) Aggregate(ctx context.Context, configHash common.Hash, prevOutputRoot common.Hash, proposals []*Proposal) (*Proposal, error) {
+	if len(proposals) == 0 {
+		return nil, errors.New("no proposals")
+	}
+	if len(proposals) == 1 {
+		return proposals[0], nil
+	}
+
 	outputRoot := prevOutputRoot
 	var l1OriginHash common.Hash
 	for _, p := range proposals {

op-proposer/proposer/clients.go

@@ -17,6 +17,7 @@ import (
 )
 
 type L1Client interface {
+	BlockNumber(ctx context.Context) (uint64, error)
 	HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error)
 	HeaderByHash(ctx context.Context, hash common.Hash) (*types.Header, error)
 	BlockReceipts(ctx context.Context, hash common.Hash) (types.Receipts, error)
@@ -73,6 +74,10 @@ func (e *ethClient) ChainConfig(ctx context.Context) (*params.ChainConfig, error
 	return &config, nil
 }
 
+func (e *ethClient) BlockNumber(ctx context.Context) (uint64, error) {
+	return e.client.BlockNumber(ctx)
+}
+
 func (e *ethClient) HeaderByHash(ctx context.Context, hash common.Hash) (*types.Header, error) {
 	if header, ok := e.headersCache.Get(hash); ok {
 		return header, nil