Skip to content

N
nebula
Commit c9fd3b49 authored by protolambda's avatar protolambda Committed by GitHub
Browse files
Options

op-node: move engine controller into its own package (#10782)

parent 52d6e4b3
Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 95 deletions
op-e2e/actions/l2_verifier.go
View file @ c9fd3b49
...@@ -17,6 +17,7 @@ import ( ...@@ -17,6 +17,7 @@ import (
"github.com/ethereum-optimism/optimism/op-node/rollup/clsync" "github.com/ethereum-optimism/optimism/op-node/rollup/clsync"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/driver" "github.com/ethereum-optimism/optimism/op-node/rollup/driver"
"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
"github.com/ethereum-optimism/optimism/op-node/rollup/finality" "github.com/ethereum-optimism/optimism/op-node/rollup/finality"
"github.com/ethereum-optimism/optimism/op-node/rollup/sync" "github.com/ethereum-optimism/optimism/op-node/rollup/sync"
"github.com/ethereum-optimism/optimism/op-service/client" "github.com/ethereum-optimism/optimism/op-service/client"
...@@ -31,19 +32,19 @@ type L2Verifier struct { ...@@ -31,19 +32,19 @@ type L2Verifier struct {
log log.Logger log log.Logger
eng interface { eng interface {
derive.Engine engine.Engine
L2BlockRefByNumber(ctx context.Context, num uint64) (eth.L2BlockRef, error) L2BlockRefByNumber(ctx context.Context, num uint64) (eth.L2BlockRef, error)
} }
syncDeriver *driver.SyncDeriver syncDeriver *driver.SyncDeriver
// L2 rollup // L2 rollup
engine *derive.EngineController engine *engine.EngineController
derivation *derive.DerivationPipeline derivation *derive.DerivationPipeline
clSync *clsync.CLSync clSync *clsync.CLSync
attributesHandler driver.AttributesHandler attributesHandler driver.AttributesHandler
safeHeadListener derive.SafeHeadListener safeHeadListener rollup.SafeHeadListener
finalizer driver.Finalizer finalizer driver.Finalizer
syncCfg *sync.Config syncCfg *sync.Config
...@@ -61,7 +62,7 @@ type L2Verifier struct { ...@@ -61,7 +62,7 @@ type L2Verifier struct {
} }
type L2API interface { type L2API interface {
derive.Engine engine.Engine
L2BlockRefByNumber(ctx context.Context, num uint64) (eth.L2BlockRef, error) L2BlockRefByNumber(ctx context.Context, num uint64) (eth.L2BlockRef, error)
InfoByHash(ctx context.Context, hash common.Hash) (eth.BlockInfo, error) InfoByHash(ctx context.Context, hash common.Hash) (eth.BlockInfo, error)
// GetProof returns a proof of the account, it may return a nil result without error if the address was not found. // GetProof returns a proof of the account, it may return a nil result without error if the address was not found.
...@@ -70,13 +71,13 @@ type L2API interface { ...@@ -70,13 +71,13 @@ type L2API interface {
} }
type safeDB interface { type safeDB interface {
derive.SafeHeadListener rollup.SafeHeadListener
node.SafeDBReader node.SafeDBReader
} }
func NewL2Verifier(t Testing, log log.Logger, l1 derive.L1Fetcher, blobsSrc derive.L1BlobsFetcher, plasmaSrc driver.PlasmaIface, eng L2API, cfg *rollup.Config, syncCfg *sync.Config, safeHeadListener safeDB) *L2Verifier { func NewL2Verifier(t Testing, log log.Logger, l1 derive.L1Fetcher, blobsSrc derive.L1BlobsFetcher, plasmaSrc driver.PlasmaIface, eng L2API, cfg *rollup.Config, syncCfg *sync.Config, safeHeadListener safeDB) *L2Verifier {
metrics := &testutils.TestDerivationMetrics{} metrics := &testutils.TestDerivationMetrics{}
engine := derive.NewEngineController(eng, log, metrics, cfg, syncCfg.SyncMode) engine := engine.NewEngineController(eng, log, metrics, cfg, syncCfg.SyncMode)
clSync := clsync.NewCLSync(log, cfg, metrics, engine) clSync := clsync.NewCLSync(log, cfg, metrics, engine)
...@@ -273,7 +274,7 @@ func (s *L2Verifier) ActL2PipelineStep(t Testing) { ...@@ -273,7 +274,7 @@ func (s *L2Verifier) ActL2PipelineStep(t Testing) {
} else if err != nil && errors.Is(err, derive.ErrReset) { } else if err != nil && errors.Is(err, derive.ErrReset) {
s.log.Warn("Derivation pipeline is reset", "err", err) s.log.Warn("Derivation pipeline is reset", "err", err)
s.derivation.Reset() s.derivation.Reset()
if err := derive.ResetEngine(t.Ctx(), s.log, s.rollupCfg, s.engine, s.l1, s.eng, s.syncCfg, s.safeHeadListener); err != nil { if err := engine.ResetEngine(t.Ctx(), s.log, s.rollupCfg, s.engine, s.l1, s.eng, s.syncCfg, s.safeHeadListener); err != nil {
s.log.Error("Derivation pipeline not ready, failed to reset engine", "err", err) s.log.Error("Derivation pipeline not ready, failed to reset engine", "err", err)
// Derivation-pipeline will return a new ResetError until we confirm the engine has been successfully reset. // Derivation-pipeline will return a new ResetError until we confirm the engine has been successfully reset.
return return
......
op-node/node/node.go
View file @ c9fd3b49
...@@ -8,11 +8,6 @@ import ( ...@@ -8,11 +8,6 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/ethereum-optimism/optimism/op-node/node/safedb"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
plasma "github.com/ethereum-optimism/optimism/op-plasma"
"github.com/ethereum-optimism/optimism/op-service/httputil"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/peer"
...@@ -22,13 +17,17 @@ import ( ...@@ -22,13 +17,17 @@ import (
"github.com/ethereum-optimism/optimism/op-node/heartbeat" "github.com/ethereum-optimism/optimism/op-node/heartbeat"
"github.com/ethereum-optimism/optimism/op-node/metrics" "github.com/ethereum-optimism/optimism/op-node/metrics"
"github.com/ethereum-optimism/optimism/op-node/node/safedb"
"github.com/ethereum-optimism/optimism/op-node/p2p" "github.com/ethereum-optimism/optimism/op-node/p2p"
"github.com/ethereum-optimism/optimism/op-node/rollup"
"github.com/ethereum-optimism/optimism/op-node/rollup/conductor" "github.com/ethereum-optimism/optimism/op-node/rollup/conductor"
"github.com/ethereum-optimism/optimism/op-node/rollup/driver" "github.com/ethereum-optimism/optimism/op-node/rollup/driver"
"github.com/ethereum-optimism/optimism/op-node/rollup/sync" "github.com/ethereum-optimism/optimism/op-node/rollup/sync"
"github.com/ethereum-optimism/optimism/op-node/version" "github.com/ethereum-optimism/optimism/op-node/version"
plasma "github.com/ethereum-optimism/optimism/op-plasma"
"github.com/ethereum-optimism/optimism/op-service/client" "github.com/ethereum-optimism/optimism/op-service/client"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
"github.com/ethereum-optimism/optimism/op-service/httputil"
"github.com/ethereum-optimism/optimism/op-service/oppprof" "github.com/ethereum-optimism/optimism/op-service/oppprof"
"github.com/ethereum-optimism/optimism/op-service/retry" "github.com/ethereum-optimism/optimism/op-service/retry"
"github.com/ethereum-optimism/optimism/op-service/sources" "github.com/ethereum-optimism/optimism/op-service/sources"
...@@ -37,7 +36,7 @@ import ( ...@@ -37,7 +36,7 @@ import (
var ErrAlreadyClosed = errors.New("node is already closed") var ErrAlreadyClosed = errors.New("node is already closed")
type closableSafeDB interface { type closableSafeDB interface {
derive.SafeHeadListener rollup.SafeHeadListener
SafeDBReader SafeDBReader
io.Closer io.Closer
} }
......
op-node/rollup/attributes/attributes.go
View file @ c9fd3b49
...@@ -15,11 +15,12 @@ import ( ...@@ -15,11 +15,12 @@ import (
"github.com/ethereum-optimism/optimism/op-node/rollup/async" "github.com/ethereum-optimism/optimism/op-node/rollup/async"
"github.com/ethereum-optimism/optimism/op-node/rollup/conductor" "github.com/ethereum-optimism/optimism/op-node/rollup/conductor"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
) )
type Engine interface { type Engine interface {
derive.EngineControl engine.EngineControl
SetUnsafeHead(eth.L2BlockRef) SetUnsafeHead(eth.L2BlockRef)
SetSafeHead(eth.L2BlockRef) SetSafeHead(eth.L2BlockRef)
...@@ -146,13 +147,13 @@ func (eq *AttributesHandler) forceNextSafeAttributes(ctx context.Context, attrib ...@@ -146,13 +147,13 @@ func (eq *AttributesHandler) forceNextSafeAttributes(ctx context.Context, attrib
} }
if err != nil { if err != nil {
switch errType { switch errType {
case derive.BlockInsertTemporaryErr: case engine.BlockInsertTemporaryErr:
// RPC errors are recoverable, we can retry the buffered payload attributes later. // RPC errors are recoverable, we can retry the buffered payload attributes later.
return derive.NewTemporaryError(fmt.Errorf("temporarily cannot insert new safe block: %w", err)) return derive.NewTemporaryError(fmt.Errorf("temporarily cannot insert new safe block: %w", err))
case derive.BlockInsertPrestateErr: case engine.BlockInsertPrestateErr:
_ = eq.ec.CancelPayload(ctx, true) _ = eq.ec.CancelPayload(ctx, true)
return derive.NewResetError(fmt.Errorf("need reset to resolve pre-state problem: %w", err)) return derive.NewResetError(fmt.Errorf("need reset to resolve pre-state problem: %w", err))
case derive.BlockInsertPayloadErr: case engine.BlockInsertPayloadErr:
_ = eq.ec.CancelPayload(ctx, true) _ = eq.ec.CancelPayload(ctx, true)
eq.log.Warn("could not process payload derived from L1 data, dropping batch", "err", err) eq.log.Warn("could not process payload derived from L1 data, dropping batch", "err", err)
// Count the number of deposits to see if the tx list is deposit only. // Count the number of deposits to see if the tx list is deposit only.
......
op-node/rollup/attributes/attributes_test.go
View file @ c9fd3b49
...@@ -17,6 +17,7 @@ import ( ...@@ -17,6 +17,7 @@ import (
"github.com/ethereum-optimism/optimism/op-node/metrics" "github.com/ethereum-optimism/optimism/op-node/metrics"
"github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
"github.com/ethereum-optimism/optimism/op-node/rollup/sync" "github.com/ethereum-optimism/optimism/op-node/rollup/sync"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
"github.com/ethereum-optimism/optimism/op-service/testlog" "github.com/ethereum-optimism/optimism/op-service/testlog"
...@@ -181,7 +182,7 @@ func TestAttributesHandler(t *testing.T) { ...@@ -181,7 +182,7 @@ func TestAttributesHandler(t *testing.T) {
t.Run("drop stale attributes", func(t *testing.T) { t.Run("drop stale attributes", func(t *testing.T) {
logger := testlog.Logger(t, log.LevelInfo) logger := testlog.Logger(t, log.LevelInfo)
eng := &testutils.MockEngine{} eng := &testutils.MockEngine{}
ec := derive.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync) ec := engine.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync)
ah := NewAttributesHandler(logger, cfg, ec, eng) ah := NewAttributesHandler(logger, cfg, ec, eng)
defer eng.AssertExpectations(t) defer eng.AssertExpectations(t)
...@@ -195,7 +196,7 @@ func TestAttributesHandler(t *testing.T) { ...@@ -195,7 +196,7 @@ func TestAttributesHandler(t *testing.T) {
t.Run("pending gets reorged", func(t *testing.T) { t.Run("pending gets reorged", func(t *testing.T) {
logger := testlog.Logger(t, log.LevelInfo) logger := testlog.Logger(t, log.LevelInfo)
eng := &testutils.MockEngine{} eng := &testutils.MockEngine{}
ec := derive.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync) ec := engine.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync)
ah := NewAttributesHandler(logger, cfg, ec, eng) ah := NewAttributesHandler(logger, cfg, ec, eng)
defer eng.AssertExpectations(t) defer eng.AssertExpectations(t)
...@@ -210,7 +211,7 @@ func TestAttributesHandler(t *testing.T) { ...@@ -210,7 +211,7 @@ func TestAttributesHandler(t *testing.T) {
t.Run("consolidation fails", func(t *testing.T) { t.Run("consolidation fails", func(t *testing.T) {
logger := testlog.Logger(t, log.LevelInfo) logger := testlog.Logger(t, log.LevelInfo)
eng := &testutils.MockEngine{} eng := &testutils.MockEngine{}
ec := derive.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync) ec := engine.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync)
ah := NewAttributesHandler(logger, cfg, ec, eng) ah := NewAttributesHandler(logger, cfg, ec, eng)
ec.SetUnsafeHead(refA1) ec.SetUnsafeHead(refA1)
...@@ -264,7 +265,7 @@ func TestAttributesHandler(t *testing.T) { ...@@ -264,7 +265,7 @@ func TestAttributesHandler(t *testing.T) {
fn := func(t *testing.T, lastInSpan bool) { fn := func(t *testing.T, lastInSpan bool) {
logger := testlog.Logger(t, log.LevelInfo) logger := testlog.Logger(t, log.LevelInfo)
eng := &testutils.MockEngine{} eng := &testutils.MockEngine{}
ec := derive.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync) ec := engine.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync)
ah := NewAttributesHandler(logger, cfg, ec, eng) ah := NewAttributesHandler(logger, cfg, ec, eng)
ec.SetUnsafeHead(refA1) ec.SetUnsafeHead(refA1)
...@@ -323,7 +324,7 @@ func TestAttributesHandler(t *testing.T) { ...@@ -323,7 +324,7 @@ func TestAttributesHandler(t *testing.T) {
logger := testlog.Logger(t, log.LevelInfo) logger := testlog.Logger(t, log.LevelInfo)
eng := &testutils.MockEngine{} eng := &testutils.MockEngine{}
ec := derive.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync) ec := engine.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync)
ah := NewAttributesHandler(logger, cfg, ec, eng) ah := NewAttributesHandler(logger, cfg, ec, eng)
ec.SetUnsafeHead(refA0) ec.SetUnsafeHead(refA0)
...@@ -374,7 +375,7 @@ func TestAttributesHandler(t *testing.T) { ...@@ -374,7 +375,7 @@ func TestAttributesHandler(t *testing.T) {
logger := testlog.Logger(t, log.LevelInfo) logger := testlog.Logger(t, log.LevelInfo)
eng := &testutils.MockEngine{} eng := &testutils.MockEngine{}
ec := derive.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync) ec := engine.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync)
ah := NewAttributesHandler(logger, cfg, ec, eng) ah := NewAttributesHandler(logger, cfg, ec, eng)
ec.SetUnsafeHead(refA0) ec.SetUnsafeHead(refA0)
...@@ -398,7 +399,7 @@ func TestAttributesHandler(t *testing.T) { ...@@ -398,7 +399,7 @@ func TestAttributesHandler(t *testing.T) {
t.Run("no attributes", func(t *testing.T) { t.Run("no attributes", func(t *testing.T) {
logger := testlog.Logger(t, log.LevelInfo) logger := testlog.Logger(t, log.LevelInfo)
eng := &testutils.MockEngine{} eng := &testutils.MockEngine{}
ec := derive.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync) ec := engine.NewEngineController(eng, logger, metrics.NoopMetrics, cfg, sync.CLSync)
ah := NewAttributesHandler(logger, cfg, ec, eng) ah := NewAttributesHandler(logger, cfg, ec, eng)
defer eng.AssertExpectations(t) defer eng.AssertExpectations(t)
......
op-node/rollup/clsync/clsync.go
View file @ c9fd3b49
...@@ -9,6 +9,7 @@ import ( ...@@ -9,6 +9,7 @@ import (
"github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
) )
...@@ -20,7 +21,7 @@ type Metrics interface { ...@@ -20,7 +21,7 @@ type Metrics interface {
} }
type Engine interface { type Engine interface {
derive.EngineState engine.EngineState
InsertUnsafePayload(ctx context.Context, payload *eth.ExecutionPayloadEnvelope, ref eth.L2BlockRef) error InsertUnsafePayload(ctx context.Context, payload *eth.ExecutionPayloadEnvelope, ref eth.L2BlockRef) error
} }
......
op-node/rollup/derive/pipeline.go
View file @ c9fd3b49
...@@ -6,6 +6,7 @@ import ( ...@@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup"
...@@ -36,6 +37,15 @@ type ResettableStage interface { ...@@ -36,6 +37,15 @@ type ResettableStage interface {
Reset(ctx context.Context, base eth.L1BlockRef, baseCfg eth.SystemConfig) error Reset(ctx context.Context, base eth.L1BlockRef, baseCfg eth.SystemConfig) error
} }
type L2Source interface {
PayloadByHash(context.Context, common.Hash) (*eth.ExecutionPayloadEnvelope, error)
PayloadByNumber(context.Context, uint64) (*eth.ExecutionPayloadEnvelope, error)
L2BlockRefByLabel(ctx context.Context, label eth.BlockLabel) (eth.L2BlockRef, error)
L2BlockRefByHash(ctx context.Context, l2Hash common.Hash) (eth.L2BlockRef, error)
L2BlockRefByNumber(ctx context.Context, num uint64) (eth.L2BlockRef, error)
SystemConfigL2Fetcher
}
// DerivationPipeline is updated with new L1 data, and the Step() function can be iterated on to generate attributes // DerivationPipeline is updated with new L1 data, and the Step() function can be iterated on to generate attributes
type DerivationPipeline struct { type DerivationPipeline struct {
log log.Logger log log.Logger
......
op-node/rollup/derive/pipeline_test.go
View file @ c9fd3b49
...@@ -2,8 +2,6 @@ package derive ...@@ -2,8 +2,6 @@ package derive
import "github.com/ethereum-optimism/optimism/op-service/testutils" import "github.com/ethereum-optimism/optimism/op-service/testutils"
var _ Engine = (*testutils.MockEngine)(nil)
var _ L1Fetcher = (*testutils.MockL1Source)(nil) var _ L1Fetcher = (*testutils.MockL1Source)(nil)
var _ Metrics = (*testutils.TestDerivationMetrics)(nil) var _ Metrics = (*testutils.TestDerivationMetrics)(nil)
op-node/rollup/driver/driver.go
View file @ c9fd3b49
...@@ -13,6 +13,7 @@ import ( ...@@ -13,6 +13,7 @@ import (
"github.com/ethereum-optimism/optimism/op-node/rollup/clsync" "github.com/ethereum-optimism/optimism/op-node/rollup/clsync"
"github.com/ethereum-optimism/optimism/op-node/rollup/conductor" "github.com/ethereum-optimism/optimism/op-node/rollup/conductor"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
"github.com/ethereum-optimism/optimism/op-node/rollup/finality" "github.com/ethereum-optimism/optimism/op-node/rollup/finality"
"github.com/ethereum-optimism/optimism/op-node/rollup/sync" "github.com/ethereum-optimism/optimism/op-node/rollup/sync"
plasma "github.com/ethereum-optimism/optimism/op-plasma" plasma "github.com/ethereum-optimism/optimism/op-plasma"
...@@ -52,7 +53,7 @@ type L1Chain interface { ...@@ -52,7 +53,7 @@ type L1Chain interface {
} }
type L2Chain interface { type L2Chain interface {
derive.Engine engine.Engine
L2BlockRefByLabel(ctx context.Context, label eth.BlockLabel) (eth.L2BlockRef, error) L2BlockRefByLabel(ctx context.Context, label eth.BlockLabel) (eth.L2BlockRef, error)
L2BlockRefByHash(ctx context.Context, l2Hash common.Hash) (eth.L2BlockRef, error) L2BlockRefByHash(ctx context.Context, l2Hash common.Hash) (eth.L2BlockRef, error)
L2BlockRefByNumber(ctx context.Context, num uint64) (eth.L2BlockRef, error) L2BlockRefByNumber(ctx context.Context, num uint64) (eth.L2BlockRef, error)
...@@ -67,7 +68,7 @@ type DerivationPipeline interface { ...@@ -67,7 +68,7 @@ type DerivationPipeline interface {
} }
type EngineController interface { type EngineController interface {
derive.LocalEngineControl engine.LocalEngineControl
IsEngineSyncing() bool IsEngineSyncing() bool
InsertUnsafePayload(ctx context.Context, payload *eth.ExecutionPayloadEnvelope, ref eth.L2BlockRef) error InsertUnsafePayload(ctx context.Context, payload *eth.ExecutionPayloadEnvelope, ref eth.L2BlockRef) error
TryUpdateEngine(ctx context.Context) error TryUpdateEngine(ctx context.Context) error
...@@ -81,14 +82,20 @@ type CLSync interface { ...@@ -81,14 +82,20 @@ type CLSync interface {
} }
type AttributesHandler interface { type AttributesHandler interface {
// HasAttributes returns if there are any block attributes to process.
// HasAttributes is for EngineQueue testing only, and can be removed when attribute processing is fully independent.
HasAttributes() bool
// SetAttributes overwrites the set of attributes. This may be nil, to clear what may be processed next.
SetAttributes(attributes *derive.AttributesWithParent) SetAttributes(attributes *derive.AttributesWithParent)
// Proceed runs one attempt of processing attributes, if any.
// Proceed returns io.EOF if there are no attributes to process.
Proceed(ctx context.Context) error Proceed(ctx context.Context) error
} }
type Finalizer interface { type Finalizer interface {
Finalize(ctx context.Context, ref eth.L1BlockRef) Finalize(ctx context.Context, ref eth.L1BlockRef)
FinalizedL1() eth.L1BlockRef FinalizedL1() eth.L1BlockRef
derive.FinalizerHooks engine.FinalizerHooks
} }
type PlasmaIface interface { type PlasmaIface interface {
...@@ -161,7 +168,7 @@ func NewDriver( ...@@ -161,7 +168,7 @@ func NewDriver(
snapshotLog log.Logger, snapshotLog log.Logger,
metrics Metrics, metrics Metrics,
sequencerStateListener SequencerStateListener, sequencerStateListener SequencerStateListener,
safeHeadListener derive.SafeHeadListener, safeHeadListener rollup.SafeHeadListener,
syncCfg *sync.Config, syncCfg *sync.Config,
sequencerConductor conductor.SequencerConductor, sequencerConductor conductor.SequencerConductor,
plasma PlasmaIface, plasma PlasmaIface,
...@@ -171,7 +178,7 @@ func NewDriver( ...@@ -171,7 +178,7 @@ func NewDriver(
sequencerConfDepth := NewConfDepth(driverCfg.SequencerConfDepth, l1State.L1Head, l1) sequencerConfDepth := NewConfDepth(driverCfg.SequencerConfDepth, l1State.L1Head, l1)
findL1Origin := NewL1OriginSelector(log, cfg, sequencerConfDepth) findL1Origin := NewL1OriginSelector(log, cfg, sequencerConfDepth)
verifConfDepth := NewConfDepth(driverCfg.VerifierConfDepth, l1State.L1Head, l1) verifConfDepth := NewConfDepth(driverCfg.VerifierConfDepth, l1State.L1Head, l1)
engine := derive.NewEngineController(l2, log, metrics, cfg, syncCfg.SyncMode) engine := engine.NewEngineController(l2, log, metrics, cfg, syncCfg.SyncMode)
clSync := clsync.NewCLSync(log, cfg, metrics, engine) clSync := clsync.NewCLSync(log, cfg, metrics, engine)
var finalizer Finalizer var finalizer Finalizer
......
op-node/rollup/driver/metered_engine.go
View file @ c9fd3b49
...@@ -10,6 +10,7 @@ import ( ...@@ -10,6 +10,7 @@ import (
"github.com/ethereum-optimism/optimism/op-node/rollup/async" "github.com/ethereum-optimism/optimism/op-node/rollup/async"
"github.com/ethereum-optimism/optimism/op-node/rollup/conductor" "github.com/ethereum-optimism/optimism/op-node/rollup/conductor"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
) )
...@@ -23,7 +24,7 @@ type EngineMetrics interface { ...@@ -23,7 +24,7 @@ type EngineMetrics interface {
// MeteredEngine wraps an EngineControl and adds metrics such as block building time diff and sealing time // MeteredEngine wraps an EngineControl and adds metrics such as block building time diff and sealing time
type MeteredEngine struct { type MeteredEngine struct {
inner derive.EngineControl inner engine.EngineControl
cfg *rollup.Config cfg *rollup.Config
metrics EngineMetrics metrics EngineMetrics
...@@ -32,7 +33,7 @@ type MeteredEngine struct { ...@@ -32,7 +33,7 @@ type MeteredEngine struct {
buildingStartTime time.Time buildingStartTime time.Time
} }
func NewMeteredEngine(cfg *rollup.Config, inner derive.EngineControl, metrics EngineMetrics, log log.Logger) *MeteredEngine { func NewMeteredEngine(cfg *rollup.Config, inner engine.EngineControl, metrics EngineMetrics, log log.Logger) *MeteredEngine {
return &MeteredEngine{ return &MeteredEngine{
inner: inner, inner: inner,
cfg: cfg, cfg: cfg,
...@@ -53,7 +54,7 @@ func (m *MeteredEngine) SafeL2Head() eth.L2BlockRef { ...@@ -53,7 +54,7 @@ func (m *MeteredEngine) SafeL2Head() eth.L2BlockRef {
return m.inner.SafeL2Head() return m.inner.SafeL2Head()
} }
func (m *MeteredEngine) StartPayload(ctx context.Context, parent eth.L2BlockRef, attrs *derive.AttributesWithParent, updateSafe bool) (errType derive.BlockInsertionErrType, err error) { func (m *MeteredEngine) StartPayload(ctx context.Context, parent eth.L2BlockRef, attrs *derive.AttributesWithParent, updateSafe bool) (errType engine.BlockInsertionErrType, err error) {
m.buildingStartTime = time.Now() m.buildingStartTime = time.Now()
errType, err = m.inner.StartPayload(ctx, parent, attrs, updateSafe) errType, err = m.inner.StartPayload(ctx, parent, attrs, updateSafe)
if err != nil { if err != nil {
...@@ -62,7 +63,7 @@ func (m *MeteredEngine) StartPayload(ctx context.Context, parent eth.L2BlockRef, ...@@ -62,7 +63,7 @@ func (m *MeteredEngine) StartPayload(ctx context.Context, parent eth.L2BlockRef,
return errType, err return errType, err
} }
func (m *MeteredEngine) ConfirmPayload(ctx context.Context, agossip async.AsyncGossiper, sequencerConductor conductor.SequencerConductor) (out *eth.ExecutionPayloadEnvelope, errTyp derive.BlockInsertionErrType, err error) { func (m *MeteredEngine) ConfirmPayload(ctx context.Context, agossip async.AsyncGossiper, sequencerConductor conductor.SequencerConductor) (out *eth.ExecutionPayloadEnvelope, errTyp engine.BlockInsertionErrType, err error) {
sealingStart := time.Now() sealingStart := time.Now()
// Actually execute the block and add it to the head of the chain. // Actually execute the block and add it to the head of the chain.
payload, errType, err := m.inner.ConfirmPayload(ctx, agossip, sequencerConductor) payload, errType, err := m.inner.ConfirmPayload(ctx, agossip, sequencerConductor)
......
op-node/rollup/driver/sequencer.go
View file @ c9fd3b49
...@@ -14,6 +14,7 @@ import ( ...@@ -14,6 +14,7 @@ import (
"github.com/ethereum-optimism/optimism/op-node/rollup/async" "github.com/ethereum-optimism/optimism/op-node/rollup/async"
"github.com/ethereum-optimism/optimism/op-node/rollup/conductor" "github.com/ethereum-optimism/optimism/op-node/rollup/conductor"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
) )
...@@ -37,7 +38,7 @@ type Sequencer struct { ...@@ -37,7 +38,7 @@ type Sequencer struct {
rollupCfg *rollup.Config rollupCfg *rollup.Config
spec *rollup.ChainSpec spec *rollup.ChainSpec
engine derive.EngineControl engine engine.EngineControl
attrBuilder derive.AttributesBuilder attrBuilder derive.AttributesBuilder
l1OriginSelector L1OriginSelectorIface l1OriginSelector L1OriginSelectorIface
...@@ -50,7 +51,7 @@ type Sequencer struct { ...@@ -50,7 +51,7 @@ type Sequencer struct {
nextAction time.Time nextAction time.Time
} }
func NewSequencer(log log.Logger, rollupCfg *rollup.Config, engine derive.EngineControl, attributesBuilder derive.AttributesBuilder, l1OriginSelector L1OriginSelectorIface, metrics SequencerMetrics) *Sequencer { func NewSequencer(log log.Logger, rollupCfg *rollup.Config, engine engine.EngineControl, attributesBuilder derive.AttributesBuilder, l1OriginSelector L1OriginSelectorIface, metrics SequencerMetrics) *Sequencer {
return &Sequencer{ return &Sequencer{
log: log, log: log,
rollupCfg: rollupCfg, rollupCfg: rollupCfg,
......
op-node/rollup/driver/sequencer_test.go
View file @ c9fd3b49
...@@ -21,6 +21,7 @@ import ( ...@@ -21,6 +21,7 @@ import (
"github.com/ethereum-optimism/optimism/op-node/rollup/async" "github.com/ethereum-optimism/optimism/op-node/rollup/async"
"github.com/ethereum-optimism/optimism/op-node/rollup/conductor" "github.com/ethereum-optimism/optimism/op-node/rollup/conductor"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
"github.com/ethereum-optimism/optimism/op-service/testlog" "github.com/ethereum-optimism/optimism/op-service/testlog"
"github.com/ethereum-optimism/optimism/op-service/testutils" "github.com/ethereum-optimism/optimism/op-service/testutils"
...@@ -46,7 +47,7 @@ type FakeEngineControl struct { ...@@ -46,7 +47,7 @@ type FakeEngineControl struct {
makePayload func(onto eth.L2BlockRef, attrs *eth.PayloadAttributes) *eth.ExecutionPayload makePayload func(onto eth.L2BlockRef, attrs *eth.PayloadAttributes) *eth.ExecutionPayload
errTyp derive.BlockInsertionErrType errTyp engine.BlockInsertionErrType
err error err error
totalBuildingTime time.Duration totalBuildingTime time.Duration
...@@ -62,7 +63,7 @@ func (m *FakeEngineControl) avgTxsPerBlock() float64 { ...@@ -62,7 +63,7 @@ func (m *FakeEngineControl) avgTxsPerBlock() float64 {
return float64(m.totalTxs) / float64(m.totalBuiltBlocks) return float64(m.totalTxs) / float64(m.totalBuiltBlocks)
} }
func (m *FakeEngineControl) StartPayload(ctx context.Context, parent eth.L2BlockRef, attrs *derive.AttributesWithParent, updateSafe bool) (errType derive.BlockInsertionErrType, err error) { func (m *FakeEngineControl) StartPayload(ctx context.Context, parent eth.L2BlockRef, attrs *derive.AttributesWithParent, updateSafe bool) (errType engine.BlockInsertionErrType, err error) {
if m.err != nil { if m.err != nil {
return m.errTyp, m.err return m.errTyp, m.err
} }
...@@ -72,10 +73,10 @@ func (m *FakeEngineControl) StartPayload(ctx context.Context, parent eth.L2Block ...@@ -72,10 +73,10 @@ func (m *FakeEngineControl) StartPayload(ctx context.Context, parent eth.L2Block
m.buildingSafe = updateSafe m.buildingSafe = updateSafe
m.buildingAttrs = attrs.Attributes m.buildingAttrs = attrs.Attributes
m.buildingStart = m.timeNow() m.buildingStart = m.timeNow()
return derive.BlockInsertOK, nil return engine.BlockInsertOK, nil
} }
func (m *FakeEngineControl) ConfirmPayload(ctx context.Context, agossip async.AsyncGossiper, sequencerConductor conductor.SequencerConductor) (out *eth.ExecutionPayloadEnvelope, errTyp derive.BlockInsertionErrType, err error) { func (m *FakeEngineControl) ConfirmPayload(ctx context.Context, agossip async.AsyncGossiper, sequencerConductor conductor.SequencerConductor) (out *eth.ExecutionPayloadEnvelope, errTyp engine.BlockInsertionErrType, err error) {
if m.err != nil { if m.err != nil {
return nil, m.errTyp, m.err return nil, m.errTyp, m.err
} }
...@@ -94,7 +95,7 @@ func (m *FakeEngineControl) ConfirmPayload(ctx context.Context, agossip async.As ...@@ -94,7 +95,7 @@ func (m *FakeEngineControl) ConfirmPayload(ctx context.Context, agossip async.As
m.resetBuildingState() m.resetBuildingState()
m.totalTxs += len(payload.Transactions) m.totalTxs += len(payload.Transactions)
return &eth.ExecutionPayloadEnvelope{ExecutionPayload: payload}, derive.BlockInsertOK, nil return &eth.ExecutionPayloadEnvelope{ExecutionPayload: payload}, engine.BlockInsertOK, nil
} }
func (m *FakeEngineControl) CancelPayload(ctx context.Context, force bool) error { func (m *FakeEngineControl) CancelPayload(ctx context.Context, force bool) error {
...@@ -127,7 +128,7 @@ func (m *FakeEngineControl) resetBuildingState() { ...@@ -127,7 +128,7 @@ func (m *FakeEngineControl) resetBuildingState() {
m.buildingAttrs = nil m.buildingAttrs = nil
} }
var _ derive.EngineControl = (*FakeEngineControl)(nil) var _ engine.EngineControl = (*FakeEngineControl)(nil)
type testAttrBuilderFn func(ctx context.Context, l2Parent eth.L2BlockRef, epoch eth.BlockID) (attrs *eth.PayloadAttributes, err error) type testAttrBuilderFn func(ctx context.Context, l2Parent eth.L2BlockRef, epoch eth.BlockID) (attrs *eth.PayloadAttributes, err error)
...@@ -327,7 +328,7 @@ func TestSequencerChaosMonkey(t *testing.T) { ...@@ -327,7 +328,7 @@ func TestSequencerChaosMonkey(t *testing.T) {
if engControl.err != mockResetErr { // the mockResetErr requires the sequencer to Reset() to recover. if engControl.err != mockResetErr { // the mockResetErr requires the sequencer to Reset() to recover.
engControl.err = nil engControl.err = nil
} }
engControl.errTyp = derive.BlockInsertOK engControl.errTyp = engine.BlockInsertOK
// maybe make something maybe fail, or try a new L1 origin // maybe make something maybe fail, or try a new L1 origin
switch rng.Intn(20) { // 9/20 = 45% chance to fail sequencer action (!!!) switch rng.Intn(20) { // 9/20 = 45% chance to fail sequencer action (!!!)
...@@ -337,10 +338,10 @@ func TestSequencerChaosMonkey(t *testing.T) { ...@@ -337,10 +338,10 @@ func TestSequencerChaosMonkey(t *testing.T) {
attrsErr = errors.New("mock attributes error") attrsErr = errors.New("mock attributes error")
case 4, 5: case 4, 5:
engControl.err = errors.New("mock temporary engine error") engControl.err = errors.New("mock temporary engine error")
engControl.errTyp = derive.BlockInsertTemporaryErr engControl.errTyp = engine.BlockInsertTemporaryErr
case 6, 7: case 6, 7:
engControl.err = errors.New("mock prestate engine error") engControl.err = errors.New("mock prestate engine error")
engControl.errTyp = derive.BlockInsertPrestateErr engControl.errTyp = engine.BlockInsertPrestateErr
case 8: case 8:
engControl.err = mockResetErr engControl.err = mockResetErr
default: default:
......
op-node/rollup/driver/state.go
View file @ c9fd3b49
...@@ -17,6 +17,7 @@ import ( ...@@ -17,6 +17,7 @@ import (
"github.com/ethereum-optimism/optimism/op-node/rollup/async" "github.com/ethereum-optimism/optimism/op-node/rollup/async"
"github.com/ethereum-optimism/optimism/op-node/rollup/conductor" "github.com/ethereum-optimism/optimism/op-node/rollup/conductor"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
"github.com/ethereum-optimism/optimism/op-node/rollup/sync" "github.com/ethereum-optimism/optimism/op-node/rollup/sync"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
"github.com/ethereum-optimism/optimism/op-service/retry" "github.com/ethereum-optimism/optimism/op-service/retry"
...@@ -367,7 +368,7 @@ func (s *Driver) eventLoop() { ...@@ -367,7 +368,7 @@ func (s *Driver) eventLoop() {
s.Finalizer.Reset() s.Finalizer.Reset()
s.metrics.RecordPipelineReset() s.metrics.RecordPipelineReset()
reqStep() reqStep()
if err := derive.ResetEngine(s.driverCtx, s.log, s.config, s.Engine, s.l1, s.l2, s.syncCfg, s.SafeHeadNotifs); err != nil { if err := engine.ResetEngine(s.driverCtx, s.log, s.config, s.Engine, s.l1, s.l2, s.syncCfg, s.SafeHeadNotifs); err != nil {
s.log.Error("Derivation pipeline not ready, failed to reset engine", "err", err) s.log.Error("Derivation pipeline not ready, failed to reset engine", "err", err)
// Derivation-pipeline will return a new ResetError until we confirm the engine has been successfully reset. // Derivation-pipeline will return a new ResetError until we confirm the engine has been successfully reset.
continue continue
...@@ -448,7 +449,7 @@ type SyncDeriver struct { ...@@ -448,7 +449,7 @@ type SyncDeriver struct {
AttributesHandler AttributesHandler AttributesHandler AttributesHandler
SafeHeadNotifs derive.SafeHeadListener // notified when safe head is updated SafeHeadNotifs rollup.SafeHeadListener // notified when safe head is updated
lastNotifiedSafeHead eth.L2BlockRef lastNotifiedSafeHead eth.L2BlockRef
CLSync CLSync CLSync CLSync
...@@ -469,7 +470,7 @@ func (s *SyncDeriver) SyncStep(ctx context.Context) error { ...@@ -469,7 +470,7 @@ func (s *SyncDeriver) SyncStep(ctx context.Context) error {
} }
// If we don't need to call FCU, keep going b/c this was a no-op. If we needed to // If we don't need to call FCU, keep going b/c this was a no-op. If we needed to
// perform a network call, then we should yield even if we did not encounter an error. // perform a network call, then we should yield even if we did not encounter an error.
if err := s.Engine.TryUpdateEngine(ctx); !errors.Is(err, derive.ErrNoFCUNeeded) { if err := s.Engine.TryUpdateEngine(ctx); !errors.Is(err, engine.ErrNoFCUNeeded) {
return err return err
} }
......
op-node/rollup/derive/engine_controller.go → op-node/rollup/engine/engine_controller.go
View file @ c9fd3b49
package derive package engine
import ( import (
"context" "context"
...@@ -6,15 +6,17 @@ import ( ...@@ -6,15 +6,17 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup"
"github.com/ethereum-optimism/optimism/op-node/rollup/async" "github.com/ethereum-optimism/optimism/op-node/rollup/async"
"github.com/ethereum-optimism/optimism/op-node/rollup/conductor" "github.com/ethereum-optimism/optimism/op-node/rollup/conductor"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/sync" "github.com/ethereum-optimism/optimism/op-node/rollup/sync"
"github.com/ethereum-optimism/optimism/op-service/clock" "github.com/ethereum-optimism/optimism/op-service/clock"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
) )
type syncStatusEnum int type syncStatusEnum int
...@@ -34,9 +36,6 @@ const ( ...@@ -34,9 +36,6 @@ const (
var ErrNoFCUNeeded = errors.New("no FCU call was needed") var ErrNoFCUNeeded = errors.New("no FCU call was needed")
var _ EngineControl = (*EngineController)(nil)
var _ LocalEngineControl = (*EngineController)(nil)
type ExecEngine interface { type ExecEngine interface {
GetPayload(ctx context.Context, payloadInfo eth.PayloadInfo) (*eth.ExecutionPayloadEnvelope, error) GetPayload(ctx context.Context, payloadInfo eth.PayloadInfo) (*eth.ExecutionPayloadEnvelope, error)
ForkchoiceUpdate(ctx context.Context, state *eth.ForkchoiceState, attr *eth.PayloadAttributes) (*eth.ForkchoiceUpdatedResult, error) ForkchoiceUpdate(ctx context.Context, state *eth.ForkchoiceState, attr *eth.PayloadAttributes) (*eth.ForkchoiceUpdatedResult, error)
...@@ -47,7 +46,7 @@ type ExecEngine interface { ...@@ -47,7 +46,7 @@ type ExecEngine interface {
type EngineController struct { type EngineController struct {
engine ExecEngine // Underlying execution engine RPC engine ExecEngine // Underlying execution engine RPC
log log.Logger log log.Logger
metrics Metrics metrics derive.Metrics
syncMode sync.Mode syncMode sync.Mode
syncStatus syncStatusEnum syncStatus syncStatusEnum
chainSpec *rollup.ChainSpec chainSpec *rollup.ChainSpec
...@@ -73,10 +72,10 @@ type EngineController struct { ...@@ -73,10 +72,10 @@ type EngineController struct {
buildingOnto eth.L2BlockRef buildingOnto eth.L2BlockRef
buildingInfo eth.PayloadInfo buildingInfo eth.PayloadInfo
buildingSafe bool buildingSafe bool
safeAttrs *AttributesWithParent safeAttrs *derive.AttributesWithParent
} }
func NewEngineController(engine ExecEngine, log log.Logger, metrics Metrics, rollupCfg *rollup.Config, syncMode sync.Mode) *EngineController { func NewEngineController(engine ExecEngine, log log.Logger, metrics derive.Metrics, rollupCfg *rollup.Config, syncMode sync.Mode) *EngineController {
syncStatus := syncStatusCL syncStatus := syncStatusCL
if syncMode == sync.ELSync { if syncMode == sync.ELSync {
syncStatus = syncStatusWillStartEL syncStatus = syncStatusWillStartEL
...@@ -207,7 +206,7 @@ func (e *EngineController) logSyncProgressMaybe() func() { ...@@ -207,7 +206,7 @@ func (e *EngineController) logSyncProgressMaybe() func() {
// Engine Methods // Engine Methods
func (e *EngineController) StartPayload(ctx context.Context, parent eth.L2BlockRef, attrs *AttributesWithParent, updateSafe bool) (errType BlockInsertionErrType, err error) { func (e *EngineController) StartPayload(ctx context.Context, parent eth.L2BlockRef, attrs *derive.AttributesWithParent, updateSafe bool) (errType BlockInsertionErrType, err error) {
if e.IsEngineSyncing() { if e.IsEngineSyncing() {
return BlockInsertTemporaryErr, fmt.Errorf("engine is in progess of p2p sync") return BlockInsertTemporaryErr, fmt.Errorf("engine is in progess of p2p sync")
} }
...@@ -260,9 +259,9 @@ func (e *EngineController) ConfirmPayload(ctx context.Context, agossip async.Asy ...@@ -260,9 +259,9 @@ func (e *EngineController) ConfirmPayload(ctx context.Context, agossip async.Asy
if err != nil { if err != nil {
return nil, errTyp, fmt.Errorf("failed to complete building on top of L2 chain %s, id: %s, error (%d): %w", e.buildingOnto, e.buildingInfo.ID, errTyp, err) return nil, errTyp, fmt.Errorf("failed to complete building on top of L2 chain %s, id: %s, error (%d): %w", e.buildingOnto, e.buildingInfo.ID, errTyp, err)
} }
ref, err := PayloadToBlockRef(e.rollupCfg, envelope.ExecutionPayload) ref, err := derive.PayloadToBlockRef(e.rollupCfg, envelope.ExecutionPayload)
if err != nil { if err != nil {
return nil, BlockInsertPayloadErr, NewResetError(fmt.Errorf("failed to decode L2 block ref from payload: %w", err)) return nil, BlockInsertPayloadErr, derive.NewResetError(fmt.Errorf("failed to decode L2 block ref from payload: %w", err))
} }
// Backup unsafeHead when new block is not built on original unsafe head. // Backup unsafeHead when new block is not built on original unsafe head.
if e.unsafeHead.Number >= ref.Number { if e.unsafeHead.Number >= ref.Number {
...@@ -360,12 +359,12 @@ func (e *EngineController) TryUpdateEngine(ctx context.Context) error { ...@@ -360,12 +359,12 @@ func (e *EngineController) TryUpdateEngine(ctx context.Context) error {
if errors.As(err, &inputErr) { if errors.As(err, &inputErr) {
switch inputErr.Code { switch inputErr.Code {
case eth.InvalidForkchoiceState: case eth.InvalidForkchoiceState:
return NewResetError(fmt.Errorf("forkchoice update was inconsistent with engine, need reset to resolve: %w", inputErr.Unwrap())) return derive.NewResetError(fmt.Errorf("forkchoice update was inconsistent with engine, need reset to resolve: %w", inputErr.Unwrap()))
default: default:
return NewTemporaryError(fmt.Errorf("unexpected error code in forkchoice-updated response: %w", err)) return derive.NewTemporaryError(fmt.Errorf("unexpected error code in forkchoice-updated response: %w", err))
} }
} else { } else {
return NewTemporaryError(fmt.Errorf("failed to sync forkchoice with engine: %w", err)) return derive.NewTemporaryError(fmt.Errorf("failed to sync forkchoice with engine: %w", err))
} }
} }
e.needFCUCall = false e.needFCUCall = false
...@@ -386,17 +385,17 @@ func (e *EngineController) InsertUnsafePayload(ctx context.Context, envelope *et ...@@ -386,17 +385,17 @@ func (e *EngineController) InsertUnsafePayload(ctx context.Context, envelope *et
e.log.Info("Skipping EL sync and going straight to CL sync because there is a finalized block", "id", b.ID()) e.log.Info("Skipping EL sync and going straight to CL sync because there is a finalized block", "id", b.ID())
return nil return nil
} else { } else {
return NewTemporaryError(fmt.Errorf("failed to fetch finalized head: %w", err)) return derive.NewTemporaryError(fmt.Errorf("failed to fetch finalized head: %w", err))
} }
} }
// Insert the payload & then call FCU // Insert the payload & then call FCU
status, err := e.engine.NewPayload(ctx, envelope.ExecutionPayload, envelope.ParentBeaconBlockRoot) status, err := e.engine.NewPayload(ctx, envelope.ExecutionPayload, envelope.ParentBeaconBlockRoot)
if err != nil { if err != nil {
return NewTemporaryError(fmt.Errorf("failed to update insert payload: %w", err)) return derive.NewTemporaryError(fmt.Errorf("failed to update insert payload: %w", err))
} }
if !e.checkNewPayloadStatus(status.Status) { if !e.checkNewPayloadStatus(status.Status) {
payload := envelope.ExecutionPayload payload := envelope.ExecutionPayload
return NewTemporaryError(fmt.Errorf("cannot process unsafe payload: new - %v; parent: %v; err: %w", return derive.NewTemporaryError(fmt.Errorf("cannot process unsafe payload: new - %v; parent: %v; err: %w",
payload.ID(), payload.ParentID(), eth.NewPayloadErr(payload, status))) payload.ID(), payload.ParentID(), eth.NewPayloadErr(payload, status)))
} }
...@@ -420,17 +419,17 @@ func (e *EngineController) InsertUnsafePayload(ctx context.Context, envelope *et ...@@ -420,17 +419,17 @@ func (e *EngineController) InsertUnsafePayload(ctx context.Context, envelope *et
if errors.As(err, &inputErr) { if errors.As(err, &inputErr) {
switch inputErr.Code { switch inputErr.Code {
case eth.InvalidForkchoiceState: case eth.InvalidForkchoiceState:
return NewResetError(fmt.Errorf("pre-unsafe-block forkchoice update was inconsistent with engine, need reset to resolve: %w", inputErr.Unwrap())) return derive.NewResetError(fmt.Errorf("pre-unsafe-block forkchoice update was inconsistent with engine, need reset to resolve: %w", inputErr.Unwrap()))
default: default:
return NewTemporaryError(fmt.Errorf("unexpected error code in forkchoice-updated response: %w", err)) return derive.NewTemporaryError(fmt.Errorf("unexpected error code in forkchoice-updated response: %w", err))
} }
} else { } else {
return NewTemporaryError(fmt.Errorf("failed to update forkchoice to prepare for new unsafe payload: %w", err)) return derive.NewTemporaryError(fmt.Errorf("failed to update forkchoice to prepare for new unsafe payload: %w", err))
} }
} }
if !e.checkForkchoiceUpdatedStatus(fcRes.PayloadStatus.Status) { if !e.checkForkchoiceUpdatedStatus(fcRes.PayloadStatus.Status) {
payload := envelope.ExecutionPayload payload := envelope.ExecutionPayload
return NewTemporaryError(fmt.Errorf("cannot prepare unsafe chain for new payload: new - %v; parent: %v; err: %w", return derive.NewTemporaryError(fmt.Errorf("cannot prepare unsafe chain for new payload: new - %v; parent: %v; err: %w",
payload.ID(), payload.ParentID(), eth.ForkchoiceUpdateErr(fcRes.PayloadStatus))) payload.ID(), payload.ParentID(), eth.ForkchoiceUpdateErr(fcRes.PayloadStatus)))
} }
e.SetUnsafeHead(ref) e.SetUnsafeHead(ref)
...@@ -490,15 +489,15 @@ func (e *EngineController) TryBackupUnsafeReorg(ctx context.Context) (bool, erro ...@@ -490,15 +489,15 @@ func (e *EngineController) TryBackupUnsafeReorg(ctx context.Context) (bool, erro
e.SetBackupUnsafeL2Head(eth.L2BlockRef{}, false) e.SetBackupUnsafeL2Head(eth.L2BlockRef{}, false)
switch inputErr.Code { switch inputErr.Code {
case eth.InvalidForkchoiceState: case eth.InvalidForkchoiceState:
return true, NewResetError(fmt.Errorf("forkchoice update was inconsistent with engine, need reset to resolve: %w", inputErr.Unwrap())) return true, derive.NewResetError(fmt.Errorf("forkchoice update was inconsistent with engine, need reset to resolve: %w", inputErr.Unwrap()))
default: default:
return true, NewTemporaryError(fmt.Errorf("unexpected error code in forkchoice-updated response: %w", err)) return true, derive.NewTemporaryError(fmt.Errorf("unexpected error code in forkchoice-updated response: %w", err))
} }
} else { } else {
// Retry when forkChoiceUpdate returns non-input error. // Retry when forkChoiceUpdate returns non-input error.
// Do not reset backupUnsafeHead because it will be used again. // Do not reset backupUnsafeHead because it will be used again.
e.needFCUCallForBackupUnsafeReorg = true e.needFCUCallForBackupUnsafeReorg = true
return true, NewTemporaryError(fmt.Errorf("failed to sync forkchoice with engine: %w", err)) return true, derive.NewTemporaryError(fmt.Errorf("failed to sync forkchoice with engine: %w", err))
} }
} }
if fcRes.PayloadStatus.Status == eth.ExecutionValid { if fcRes.PayloadStatus.Status == eth.ExecutionValid {
...@@ -510,7 +509,7 @@ func (e *EngineController) TryBackupUnsafeReorg(ctx context.Context) (bool, erro ...@@ -510,7 +509,7 @@ func (e *EngineController) TryBackupUnsafeReorg(ctx context.Context) (bool, erro
} }
e.SetBackupUnsafeL2Head(eth.L2BlockRef{}, false) e.SetBackupUnsafeL2Head(eth.L2BlockRef{}, false)
// Execution engine could not reorg back to previous unsafe head. // Execution engine could not reorg back to previous unsafe head.
return true, NewTemporaryError(fmt.Errorf("cannot restore unsafe chain using backupUnsafe: err: %w", return true, derive.NewTemporaryError(fmt.Errorf("cannot restore unsafe chain using backupUnsafe: err: %w",
eth.ForkchoiceUpdateErr(fcRes.PayloadStatus))) eth.ForkchoiceUpdateErr(fcRes.PayloadStatus)))
} }
......
op-node/rollup/derive/engine_reset.go → op-node/rollup/engine/engine_reset.go
View file @ c9fd3b49
package derive package engine
import ( import (
"context" "context"
...@@ -7,29 +7,41 @@ import ( ...@@ -7,29 +7,41 @@ import (
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/sync" "github.com/ethereum-optimism/optimism/op-node/rollup/sync"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
) )
type ResetL2 interface { type ResetL2 interface {
sync.L2Chain sync.L2Chain
SystemConfigL2Fetcher derive.SystemConfigL2Fetcher
}
type ResetEngineControl interface {
SetUnsafeHead(eth.L2BlockRef)
SetSafeHead(eth.L2BlockRef)
SetFinalizedHead(eth.L2BlockRef)
SetBackupUnsafeL2Head(block eth.L2BlockRef, triggerReorg bool)
SetPendingSafeL2Head(eth.L2BlockRef)
ResetBuildingState()
} }
// ResetEngine walks the L2 chain backwards until it finds a plausible unsafe head, // ResetEngine walks the L2 chain backwards until it finds a plausible unsafe head,
// and an L2 safe block that is guaranteed to still be from the L1 chain. // and an L2 safe block that is guaranteed to still be from the L1 chain.
func ResetEngine(ctx context.Context, log log.Logger, cfg *rollup.Config, ec ResetEngineControl, l1 sync.L1Chain, l2 ResetL2, syncCfg *sync.Config, safeHeadNotifs SafeHeadListener) error { func ResetEngine(ctx context.Context, log log.Logger, cfg *rollup.Config, ec ResetEngineControl, l1 sync.L1Chain, l2 ResetL2, syncCfg *sync.Config, safeHeadNotifs rollup.SafeHeadListener) error {
result, err := sync.FindL2Heads(ctx, cfg, l1, l2, log, syncCfg) result, err := sync.FindL2Heads(ctx, cfg, l1, l2, log, syncCfg)
if err != nil { if err != nil {
return NewTemporaryError(fmt.Errorf("failed to find the L2 Heads to start from: %w", err)) return derive.NewTemporaryError(fmt.Errorf("failed to find the L2 Heads to start from: %w", err))
} }
finalized, safe, unsafe := result.Finalized, result.Safe, result.Unsafe finalized, safe, unsafe := result.Finalized, result.Safe, result.Unsafe
l1Origin, err := l1.L1BlockRefByHash(ctx, safe.L1Origin.Hash) l1Origin, err := l1.L1BlockRefByHash(ctx, safe.L1Origin.Hash)
if err != nil { if err != nil {
return NewTemporaryError(fmt.Errorf("failed to fetch the new L1 progress: origin: %v; err: %w", safe.L1Origin, err)) return derive.NewTemporaryError(fmt.Errorf("failed to fetch the new L1 progress: origin: %v; err: %w", safe.L1Origin, err))
} }
if safe.Time < l1Origin.Time { if safe.Time < l1Origin.Time {
return NewResetError(fmt.Errorf("cannot reset block derivation to start at L2 block %s with time %d older than its L1 origin %s with time %d, time invariant is broken", return derive.NewResetError(fmt.Errorf("cannot reset block derivation to start at L2 block %s with time %d older than its L1 origin %s with time %d, time invariant is broken",
safe, safe.Time, l1Origin, l1Origin.Time)) safe, safe.Time, l1Origin, l1Origin.Time))
} }
......
op-node/rollup/derive/engine_update.go → op-node/rollup/engine/engine_update.go
View file @ c9fd3b49
package derive package engine
import ( import (
"context" "context"
......
op-node/rollup/derive/iface.go → op-node/rollup/engine/iface.go
View file @ c9fd3b49
package derive package engine
import ( import (
"context" "context"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum-optimism/optimism/op-node/rollup/async" "github.com/ethereum-optimism/optimism/op-node/rollup/async"
"github.com/ethereum-optimism/optimism/op-node/rollup/conductor" "github.com/ethereum-optimism/optimism/op-node/rollup/conductor"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
) )
// SafeHeadListener is called when the safe head is updated.
// The safe head may advance by more than one block in a single update
// The l1Block specified is the first L1 block that includes sufficient information to derive the new safe head
type SafeHeadListener interface {
// Enabled reports if this safe head listener is actively using the posted data. This allows the ResetEngine to
// optionally skip making calls that may be expensive to prepare.
// Callbacks may still be made if Enabled returns false but are not guaranteed.
Enabled() bool
// SafeHeadUpdated indicates that the safe head has been updated in response to processing batch data
// The l1Block specified is the first L1 block containing all required batch data to derive newSafeHead
SafeHeadUpdated(newSafeHead eth.L2BlockRef, l1Block eth.BlockID) error
// SafeHeadReset indicates that the derivation pipeline reset back to the specified safe head
// The L1 block that made the new safe head safe is unknown.
SafeHeadReset(resetSafeHead eth.L2BlockRef) error
}
// EngineState provides a read-only interface of the forkchoice state properties of the L2 Engine. // EngineState provides a read-only interface of the forkchoice state properties of the L2 Engine.
type EngineState interface { type EngineState interface {
Finalized() eth.L2BlockRef Finalized() eth.L2BlockRef
...@@ -38,7 +18,7 @@ type EngineState interface { ...@@ -38,7 +18,7 @@ type EngineState interface {
type Engine interface { type Engine interface {
ExecEngine ExecEngine
L2Source derive.L2Source
} }
// EngineControl enables other components to build blocks with the Engine, // EngineControl enables other components to build blocks with the Engine,
...@@ -49,7 +29,7 @@ type EngineControl interface { ...@@ -49,7 +29,7 @@ type EngineControl interface {
// StartPayload requests the engine to start building a block with the given attributes. // StartPayload requests the engine to start building a block with the given attributes.
// If updateSafe, the resulting block will be marked as a safe block. // If updateSafe, the resulting block will be marked as a safe block.
StartPayload(ctx context.Context, parent eth.L2BlockRef, attrs *AttributesWithParent, updateSafe bool) (errType BlockInsertionErrType, err error) StartPayload(ctx context.Context, parent eth.L2BlockRef, attrs *derive.AttributesWithParent, updateSafe bool) (errType BlockInsertionErrType, err error)
// ConfirmPayload requests the engine to complete the current block. If no block is being built, or if it fails, an error is returned. // ConfirmPayload requests the engine to complete the current block. If no block is being built, or if it fails, an error is returned.
ConfirmPayload(ctx context.Context, agossip async.AsyncGossiper, sequencerConductor conductor.SequencerConductor) (out *eth.ExecutionPayloadEnvelope, errTyp BlockInsertionErrType, err error) ConfirmPayload(ctx context.Context, agossip async.AsyncGossiper, sequencerConductor conductor.SequencerConductor) (out *eth.ExecutionPayloadEnvelope, errTyp BlockInsertionErrType, err error)
// CancelPayload requests the engine to stop building the current block without making it canonical. // CancelPayload requests the engine to stop building the current block without making it canonical.
...@@ -66,32 +46,12 @@ type LocalEngineState interface { ...@@ -66,32 +46,12 @@ type LocalEngineState interface {
BackupUnsafeL2Head() eth.L2BlockRef BackupUnsafeL2Head() eth.L2BlockRef
} }
type ResetEngineControl interface {
SetUnsafeHead(eth.L2BlockRef)
SetSafeHead(eth.L2BlockRef)
SetFinalizedHead(eth.L2BlockRef)
SetBackupUnsafeL2Head(block eth.L2BlockRef, triggerReorg bool)
SetPendingSafeL2Head(eth.L2BlockRef)
ResetBuildingState()
}
type LocalEngineControl interface { type LocalEngineControl interface {
LocalEngineState LocalEngineState
EngineControl EngineControl
ResetEngineControl ResetEngineControl
} }
type L2Source interface {
PayloadByHash(context.Context, common.Hash) (*eth.ExecutionPayloadEnvelope, error)
PayloadByNumber(context.Context, uint64) (*eth.ExecutionPayloadEnvelope, error)
L2BlockRefByLabel(ctx context.Context, label eth.BlockLabel) (eth.L2BlockRef, error)
L2BlockRefByHash(ctx context.Context, l2Hash common.Hash) (eth.L2BlockRef, error)
L2BlockRefByNumber(ctx context.Context, num uint64) (eth.L2BlockRef, error)
SystemConfigL2Fetcher
}
type FinalizerHooks interface { type FinalizerHooks interface {
// OnDerivationL1End remembers the given L1 block, // OnDerivationL1End remembers the given L1 block,
// and finalizes any prior data with the latest finality signal based on block height. // and finalizes any prior data with the latest finality signal based on block height.
...@@ -102,13 +62,5 @@ type FinalizerHooks interface { ...@@ -102,13 +62,5 @@ type FinalizerHooks interface {
Reset() Reset()
} }
type AttributesHandler interface { var _ EngineControl = (*EngineController)(nil)
// HasAttributes returns if there are any block attributes to process. var _ LocalEngineControl = (*EngineController)(nil)
// HasAttributes is for EngineQueue testing only, and can be removed when attribute processing is fully independent.
HasAttributes() bool
// SetAttributes overwrites the set of attributes. This may be nil, to clear what may be processed next.
SetAttributes(attributes *AttributesWithParent)
// Proceed runs one attempt of processing attributes, if any.
// Proceed returns io.EOF if there are no attributes to process.
Proceed(ctx context.Context) error
}
op-node/rollup/iface.go 0 → 100644
View file @ c9fd3b49
package rollup
import "github.com/ethereum-optimism/optimism/op-service/eth"
// SafeHeadListener is called when the safe head is updated.
// The safe head may advance by more than one block in a single update
// The l1Block specified is the first L1 block that includes sufficient information to derive the new safe head
type SafeHeadListener interface {
// Enabled reports if this safe head listener is actively using the posted data. This allows the engine queue to
// optionally skip making calls that may be expensive to prepare.
// Callbacks may still be made if Enabled returns false but are not guaranteed.
Enabled() bool
// SafeHeadUpdated indicates that the safe head has been updated in response to processing batch data
// The l1Block specified is the first L1 block containing all required batch data to derive newSafeHead
SafeHeadUpdated(newSafeHead eth.L2BlockRef, l1Block eth.BlockID) error
// SafeHeadReset indicates that the derivation pipeline reset back to the specified safe head
// The L1 block that made the new safe head safe is unknown.
SafeHeadReset(resetSafeHead eth.L2BlockRef) error
}
op-program/client/driver/driver.go
View file @ c9fd3b49
...@@ -13,6 +13,7 @@ import ( ...@@ -13,6 +13,7 @@ import (
"github.com/ethereum-optimism/optimism/op-node/rollup/attributes" "github.com/ethereum-optimism/optimism/op-node/rollup/attributes"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/driver" "github.com/ethereum-optimism/optimism/op-node/rollup/driver"
"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
"github.com/ethereum-optimism/optimism/op-node/rollup/sync" "github.com/ethereum-optimism/optimism/op-node/rollup/sync"
plasma "github.com/ethereum-optimism/optimism/op-plasma" plasma "github.com/ethereum-optimism/optimism/op-plasma"
"github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/eth"
...@@ -33,11 +34,11 @@ type Engine interface { ...@@ -33,11 +34,11 @@ type Engine interface {
SafeL2Head() eth.L2BlockRef SafeL2Head() eth.L2BlockRef
PendingSafeL2Head() eth.L2BlockRef PendingSafeL2Head() eth.L2BlockRef
TryUpdateEngine(ctx context.Context) error TryUpdateEngine(ctx context.Context) error
derive.ResetEngineControl engine.ResetEngineControl
} }
type L2Source interface { type L2Source interface {
derive.Engine engine.Engine
L2OutputRoot(uint64) (eth.Bytes32, error) L2OutputRoot(uint64) (eth.Bytes32, error)
} }
...@@ -64,17 +65,17 @@ func (d *MinimalSyncDeriver) SafeL2Head() eth.L2BlockRef { ...@@ -64,17 +65,17 @@ func (d *MinimalSyncDeriver) SafeL2Head() eth.L2BlockRef {
func (d *MinimalSyncDeriver) SyncStep(ctx context.Context) error { func (d *MinimalSyncDeriver) SyncStep(ctx context.Context) error {
if !d.initialResetDone { if !d.initialResetDone {
if err := d.engine.TryUpdateEngine(ctx); !errors.Is(err, derive.ErrNoFCUNeeded) { if err := d.engine.TryUpdateEngine(ctx); !errors.Is(err, engine.ErrNoFCUNeeded) {
return err return err
} }
if err := derive.ResetEngine(ctx, d.logger, d.cfg, d.engine, d.l1Source, d.l2Source, d.syncCfg, nil); err != nil { if err := engine.ResetEngine(ctx, d.logger, d.cfg, d.engine, d.l1Source, d.l2Source, d.syncCfg, nil); err != nil {
return err return err
} }
d.pipeline.ConfirmEngineReset() d.pipeline.ConfirmEngineReset()
d.initialResetDone = true d.initialResetDone = true
} }
if err := d.engine.TryUpdateEngine(ctx); !errors.Is(err, derive.ErrNoFCUNeeded) { if err := d.engine.TryUpdateEngine(ctx); !errors.Is(err, engine.ErrNoFCUNeeded) {
return err return err
} }
if err := d.attributesHandler.Proceed(ctx); err != io.EOF { if err := d.attributesHandler.Proceed(ctx); err != io.EOF {
...@@ -100,7 +101,7 @@ type Driver struct { ...@@ -100,7 +101,7 @@ type Driver struct {
} }
func NewDriver(logger log.Logger, cfg *rollup.Config, l1Source derive.L1Fetcher, l1BlobsSource derive.L1BlobsFetcher, l2Source L2Source, targetBlockNum uint64) *Driver { func NewDriver(logger log.Logger, cfg *rollup.Config, l1Source derive.L1Fetcher, l1BlobsSource derive.L1BlobsFetcher, l2Source L2Source, targetBlockNum uint64) *Driver {
engine := derive.NewEngineController(l2Source, logger, metrics.NoopMetrics, cfg, sync.CLSync) engine := engine.NewEngineController(l2Source, logger, metrics.NoopMetrics, cfg, sync.CLSync)
attributesHandler := attributes.NewAttributesHandler(logger, cfg, engine, l2Source) attributesHandler := attributes.NewAttributesHandler(logger, cfg, engine, l2Source)
syncCfg := &sync.Config{SyncMode: sync.CLSync} syncCfg := &sync.Config{SyncMode: sync.CLSync}
pipeline := derive.NewDerivationPipeline(logger, cfg, l1Source, l1BlobsSource, plasma.Disabled, l2Source, metrics.NoopMetrics) pipeline := derive.NewDerivationPipeline(logger, cfg, l1Source, l1BlobsSource, plasma.Disabled, l2Source, metrics.NoopMetrics)
......
op-program/client/l2/engine_test.go
View file @ c9fd3b49
...@@ -5,9 +5,8 @@ import ( ...@@ -5,9 +5,8 @@ import (
"math/big" "math/big"
"testing" "testing"
"github.com/ethereum-optimism/optimism/op-node/chaincfg" "github.com/stretchr/testify/require"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-service/eth"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/consensus" "github.com/ethereum/go-ethereum/consensus"
"github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/state"
...@@ -15,11 +14,15 @@ import ( ...@@ -15,11 +14,15 @@ import (
"github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/trie" "github.com/ethereum/go-ethereum/trie"
"github.com/stretchr/testify/require"
"github.com/ethereum-optimism/optimism/op-node/chaincfg"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
"github.com/ethereum-optimism/optimism/op-service/eth"
) )
// Should implement derive.Engine // Should implement derive.Engine
var _ derive.Engine = (*OracleEngine)(nil) var _ engine.Engine = (*OracleEngine)(nil)
func TestPayloadByHash(t *testing.T) { func TestPayloadByHash(t *testing.T) {
ctx := context.Background() ctx := context.Background()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment