Skip to content

Commit

Permalink
L1 submission endpoint (#346)
Browse files Browse the repository at this point in the history
  • Loading branch information
macwis authored Mar 8, 2024
1 parent 2e65cc6 commit d6ce0c5
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 5 deletions.
16 changes: 14 additions & 2 deletions services/sidecar/internal/sidecar/infra/services/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@ func NewDisseminator(
log.Info("disseminator is not enabled")
return nil, nil
}
l1TxMgr, err := createTxManager(ctx, "disseminator", cfg.L1().Endpoint, cfg.Protocol(), cfg.Disseminator())
var endpoint string
if cfg.L1().SubmissionEndpoint != "" {
endpoint = cfg.L1().SubmissionEndpoint
} else {
endpoint = cfg.L1().Endpoint
}
l1TxMgr, err := createTxManager(ctx, "disseminator", endpoint, cfg.Protocol(), cfg.Disseminator())
if err != nil {
return nil, fmt.Errorf("failed to initialize l1 tx manager: %w", err)
}
Expand All @@ -61,7 +67,13 @@ func NewValidator(
log.Info("validator is not enabled")
return nil, nil
}
l1TxMgr, err := createTxManager(ctx, "validator", cfg.L1().Endpoint, cfg.Protocol(), cfg.Validator())
var endpoint string
if cfg.L1().SubmissionEndpoint != "" {
endpoint = cfg.L1().SubmissionEndpoint
} else {
endpoint = cfg.L1().Endpoint
}
l1TxMgr, err := createTxManager(ctx, "validator", endpoint, cfg.Protocol(), cfg.Validator())
if err != nil {
return nil, fmt.Errorf("failed to initialize l1 tx manager: %w", err)
}
Expand Down
8 changes: 6 additions & 2 deletions services/sidecar/rollup/services/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,15 @@ func (c ProtocolConfig) GetL1OracleAddr() common.Address {

// L1 configuration
type L1Config struct {
Endpoint string `toml:"endpoint,omitempty"` // L1 API endpoint
Endpoint string `toml:"endpoint,omitempty"` // L1 API endpoint
SubmissionEndpoint string `toml:"submission_endpoint,omitempty"`
}

func newL1ConfigFromCLI(cliCtx *cli.Context) L1Config {
return L1Config{Endpoint: cliCtx.String(l1EndpointFlag.Name)}
return L1Config{
Endpoint: cliCtx.String(l1EndpointFlag.Name),
SubmissionEndpoint: cliCtx.String(l1SubmissionEndpointFlag.Name),
}
}

func (c L1Config) GetEndpoint() string { return c.Endpoint }
Expand Down
7 changes: 6 additions & 1 deletion services/sidecar/rollup/services/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ var (
Usage: "The L1 API endpoint",
Required: true,
}
l1SubmissionEndpointFlag = &cli.StringFlag{
Name: "l1.submission-endpoint",
Usage: "The L1 API submission endpoint",
Required: false,
}
// L2 config flags
l2EndpointFlag = &cli.StringFlag{
Name: "l2.endpoint",
Expand Down Expand Up @@ -120,7 +125,7 @@ var (
)

var (
generalFlags = []cli.Flag{VerbosityFlag, l1EndpointFlag, l2EndpointFlag}
generalFlags = []cli.Flag{VerbosityFlag, l1EndpointFlag, l1SubmissionEndpointFlag, l2EndpointFlag}
protocolFlags = []cli.Flag{protocolRollupCfgPathFlag}
disseminatorCLIFlags = []cli.Flag{
disseminatorEnableFlag,
Expand Down

0 comments on commit d6ce0c5

Please sign in to comment.