Skip to content

Rename sequencer flag from http to rpc #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maurelian wants to merge 1 commit into from
Closed

Rename sequencer flag from http to rpc #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/geth/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ var (
utils.GpoIgnoreGasPriceFlag,
utils.MinerNotifyFullFlag,
utils.IgnoreLegacyReceiptsFlag,
utils.RollupSequencerHTTPFlag,
utils.RollupSequencerRPCFlag,
utils.RollupDisableTxPoolGossipFlag,
configFileFlag,
}, utils.NetworkFlags, utils.DatabasePathFlags)
Expand Down
12 changes: 6 additions & 6 deletions cmd/utils/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,9 +883,9 @@ var (
}

// Rollup Flags
RollupSequencerHTTPFlag = &cli.StringFlag{
Name: "rollup.sequencerhttp",
Usage: "HTTP endpoint for the sequencer mempool",
RollupSequencerRPCFlag = &cli.StringFlag{
Name: "rollup.sequencerrpc",
Usage: "RPC endpoint for the sequencer mempool",
Category: flags.RollupCategory,
}

Expand Down Expand Up @@ -1872,9 +1872,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
cfg.EthDiscoveryURLs = SplitAndTrim(urls)
}
}
// Only configure sequencer http flag if we're running in verifier mode i.e. --mine is disabled.
if ctx.IsSet(RollupSequencerHTTPFlag.Name) && !ctx.IsSet(MiningEnabledFlag.Name) {
cfg.RollupSequencerHTTP = ctx.String(RollupSequencerHTTPFlag.Name)
// Only configure sequencer rpc flag if we're running in verifier mode i.e. --mine is disabled.
if ctx.IsSet(RollupSequencerRPCFlag.Name) && !ctx.IsSet(MiningEnabledFlag.Name) {
cfg.RollupSequencerRPC = ctx.String(RollupSequencerRPCFlag.Name)
}
cfg.RollupDisableTxPoolGossip = ctx.Bool(RollupDisableTxPoolGossipFlag.Name)
// Override any default configs for hard coded networks.
Expand Down
4 changes: 2 additions & 2 deletions eth/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
return nil, err
}

if config.RollupSequencerHTTP != "" {
if config.RollupSequencerRPC != "" {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
client, err := rpc.DialContext(ctx, config.RollupSequencerHTTP)
client, err := rpc.DialContext(ctx, config.RollupSequencerRPC)
cancel()
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion eth/ethconfig/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ type Config struct {
// OverrideTerminalTotalDifficultyPassed (TODO: remove after the fork)
OverrideTerminalTotalDifficultyPassed *bool `toml:",omitempty"`

RollupSequencerHTTP string
RollupSequencerRPC string

RollupDisableTxPoolGossip bool
}
Expand Down