Skip to content

N
nebula
Commit 4c8ed5ae authored by refcell's avatar refcell
Browse files
Options

feat(op-challenger): Rollup Client Hoist

parent 73ef726b
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 25 deletions
op-challenger/game/fault/register.go
View file @ 4c8ed5ae
......@@ -14,7 +14,6 @@ import (
"github.com/ethereum-optimism/optimism/op-challenger/game/scheduler"
"github.com/ethereum-optimism/optimism/op-challenger/game/types"
"github.com/ethereum-optimism/optimism/op-challenger/metrics"
"github.com/ethereum-optimism/optimism/op-service/dial"
"github.com/ethereum-optimism/optimism/op-service/sources/batching"
"github.com/ethereum-optimism/optimism/op-service/txmgr"
"github.com/ethereum/go-ethereum/ethclient"
......@@ -40,6 +39,7 @@ func RegisterGameTypes(
logger log.Logger,
m metrics.Metricer,
cfg *config.Config,
rollupClient outputs.OutputRollupClient,
txMgr txmgr.TxManager,
caller *batching.MultiCaller,
) (CloseFunc, error) {
......@@ -54,16 +54,16 @@ func RegisterGameTypes(
closer = l2Client.Close
}
if cfg.TraceTypeEnabled(config.TraceTypeOutputCannon) {
registerOutputCannon(registry, ctx, logger, m, cfg, txMgr, caller, l2Client)
registerOutputCannon(registry, ctx, logger, m, cfg, rollupClient, txMgr, caller, l2Client)
}
if cfg.TraceTypeEnabled(config.TraceTypeOutputAlphabet) {
registerOutputAlphabet(registry, ctx, logger, m, cfg, txMgr, caller)
registerOutputAlphabet(registry, ctx, logger, m, rollupClient, txMgr, caller)
}
if cfg.TraceTypeEnabled(config.TraceTypeCannon) {
registerCannon(registry, ctx, logger, m, cfg, txMgr, caller, l2Client)
}
if cfg.TraceTypeEnabled(config.TraceTypeAlphabet) {
registerAlphabet(registry, ctx, logger, m, cfg, txMgr, caller)
registerAlphabet(registry, ctx, logger, m, cfg.AlphabetTrace, txMgr, caller)
}
return closer, nil
}
......@@ -73,7 +73,7 @@ func registerOutputAlphabet(
ctx context.Context,
logger log.Logger,
m metrics.Metricer,
cfg *config.Config,
rollupClient outputs.OutputRollupClient,
txMgr txmgr.TxManager,
caller *batching.MultiCaller) {
playerCreator := func(game types.GameMetadata, dir string) (scheduler.GamePlayer, error) {
......@@ -85,17 +85,13 @@ func registerOutputAlphabet(
if err != nil {
return nil, err
}
rollupClient, err := dial.DialRollupClientWithTimeout(ctx, dial.DefaultDialTimeout, logger, cfg.RollupRpc)
if err != nil {
return nil, err
}
prestateProvider := outputs.NewPrestateProvider(ctx, logger, rollupClient, prestateBlock)
creator := func(ctx context.Context, logger log.Logger, gameDepth uint64, dir string) (faultTypes.TraceAccessor, error) {
splitDepth, err := contract.GetSplitDepth(ctx)
if err != nil {
return nil, err
}
accessor, err := outputs.NewOutputAlphabetTraceAccessor(ctx, logger, m, cfg, prestateProvider, rollupClient, gameDepth, splitDepth, prestateBlock, poststateBlock)
accessor, err := outputs.NewOutputAlphabetTraceAccessor(ctx, logger, m, prestateProvider, rollupClient, gameDepth, splitDepth, prestateBlock, poststateBlock)
if err != nil {
return nil, err
}
......@@ -114,6 +110,7 @@ func registerOutputCannon(
logger log.Logger,
m metrics.Metricer,
cfg *config.Config,
rollupClient outputs.OutputRollupClient,
txMgr txmgr.TxManager,
caller *batching.MultiCaller,
l2Client cannon.L2HeaderSource) {
......@@ -126,10 +123,6 @@ func registerOutputCannon(
if err != nil {
return nil, err
}
rollupClient, err := dial.DialRollupClientWithTimeout(ctx, dial.DefaultDialTimeout, logger, cfg.RollupRpc)
if err != nil {
return nil, err
}
prestateProvider := outputs.NewPrestateProvider(ctx, logger, rollupClient, prestateBlock)
creator := func(ctx context.Context, logger log.Logger, gameDepth uint64, dir string) (faultTypes.TraceAccessor, error) {
splitDepth, err := contract.GetSplitDepth(ctx)
......@@ -163,7 +156,7 @@ func registerCannon(
if err != nil {
return nil, err
}
prestateProvider := cannon.NewPrestateProvider(cfg)
prestateProvider := cannon.NewPrestateProvider(cfg.CannonAbsolutePreState)
creator := func(ctx context.Context, logger log.Logger, gameDepth uint64, dir string) (faultTypes.TraceAccessor, error) {
localInputs, err := cannon.FetchLocalInputs(ctx, contract, l2Client)
if err != nil {
......@@ -183,7 +176,7 @@ func registerAlphabet(
ctx context.Context,
logger log.Logger,
m metrics.Metricer,
cfg *config.Config,
alphabetTrace string,
txMgr txmgr.TxManager,
caller *batching.MultiCaller) {
playerCreator := func(game types.GameMetadata, dir string) (scheduler.GamePlayer, error) {
......@@ -193,7 +186,7 @@ func registerAlphabet(
}
prestateProvider := &alphabet.AlphabetPrestateProvider{}
creator := func(ctx context.Context, logger log.Logger, gameDepth uint64, dir string) (faultTypes.TraceAccessor, error) {
traceProvider := alphabet.NewTraceProvider(cfg.AlphabetTrace, gameDepth)
traceProvider := alphabet.NewTraceProvider(alphabetTrace, gameDepth)
return trace.NewSimpleTraceAccessor(traceProvider), nil
}
validator := NewPrestateValidator(contract.GetAbsolutePrestateHash, prestateProvider)
......
op-challenger/game/fault/trace/cannon/prestate.go
View file @ 4c8ed5ae
......@@ -7,7 +7,6 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum-optimism/optimism/cannon/mipsevm"
"github.com/ethereum-optimism/optimism/op-challenger/config"
"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
)
......@@ -17,10 +16,8 @@ type CannonPrestateProvider struct {
prestate string
}
func NewPrestateProvider(cfg *config.Config) *CannonPrestateProvider {
return &CannonPrestateProvider{
prestate: cfg.CannonAbsolutePreState,
}
func NewPrestateProvider(prestate string) *CannonPrestateProvider {
return &CannonPrestateProvider{prestate}
}
func (p *CannonPrestateProvider) absolutePreState() ([]byte, error) {
......
op-challenger/game/fault/trace/outputs/output_alphabet.go
View file @ 4c8ed5ae
......@@ -3,7 +3,6 @@ package outputs
import (
"context"
"github.com/ethereum-optimism/optimism/op-challenger/config"
"github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts"
"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace"
"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/alphabet"
......@@ -18,7 +17,6 @@ func NewOutputAlphabetTraceAccessor(
ctx context.Context,
logger log.Logger,
m metrics.Metricer,
cfg *config.Config,
prestateProvider types.PrestateProvider,
rollupClient OutputRollupClient,
gameDepth uint64,
......
op-challenger/game/service.go
View file @ 4c8ed5ae
......@@ -13,6 +13,7 @@ import (
"github.com/ethereum-optimism/optimism/op-challenger/config"
"github.com/ethereum-optimism/optimism/op-challenger/game/fault"
"github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts"
"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/outputs"
"github.com/ethereum-optimism/optimism/op-challenger/game/loader"
"github.com/ethereum-optimism/optimism/op-challenger/game/registry"
"github.com/ethereum-optimism/optimism/op-challenger/game/scheduler"
......@@ -40,6 +41,8 @@ type Service struct {
loader *loader.GameLoader
rollupClient outputs.OutputRollupClient
l1Client *ethclient.Client
pollClient client.RPC
......@@ -73,6 +76,9 @@ func (s *Service) initFromConfig(ctx context.Context, cfg *config.Config) error
if err := s.initL1Client(ctx, cfg); err != nil {
return err
}
if err := s.initRollupClient(ctx, cfg); err != nil {
return err
}
if err := s.initPollClient(ctx, cfg); err != nil {
return err
}
......@@ -166,10 +172,19 @@ func (s *Service) initGameLoader(cfg *config.Config) error {
return nil
}
func (s *Service) initRollupClient(ctx context.Context, cfg *config.Config) error {
rollupClient, err := dial.DialRollupClientWithTimeout(ctx, dial.DefaultDialTimeout, s.logger, cfg.RollupRpc)
if err != nil {
return err
}
s.rollupClient = rollupClient
return nil
}
func (s *Service) initScheduler(ctx context.Context, cfg *config.Config) error {
gameTypeRegistry := registry.NewGameTypeRegistry()
caller := batching.NewMultiCaller(s.l1Client.Client(), batching.DefaultBatchSize)
closer, err := fault.RegisterGameTypes(gameTypeRegistry, ctx, s.logger, s.metrics, cfg, s.txMgr, caller)
closer, err := fault.RegisterGameTypes(gameTypeRegistry, ctx, s.logger, s.metrics, cfg, s.rollupClient, s.txMgr, caller)
if err != nil {
return err
}
......
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