Skip to content

Commit 8f97aea

Browse files
committed
fix: ci
1 parent 741dc59 commit 8f97aea

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

cmd/geth/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ var (
178178
utils.ShadowforkPeersFlag,
179179
utils.GossipTxBroadcastDisabledFlag,
180180
utils.GossipTxReceivingDisabledFlag,
181+
utils.GossipSequencerHTTPFlag,
181182
utils.GossipBroadcastToAllEnabledFlag,
182183
utils.GossipBroadcastToAllCapFlag,
183184
utils.DASyncEnabledFlag,

cmd/geth/usage.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ var AppHelpFlagGroups = []flags.FlagGroup{
252252
utils.CircuitCapacityCheckWorkersFlag,
253253
utils.GossipTxBroadcastDisabledFlag,
254254
utils.GossipTxReceivingDisabledFlag,
255+
utils.GossipSequencerHTTPFlag,
255256
utils.GossipBroadcastToAllEnabledFlag,
256257
utils.GossipBroadcastToAllCapFlag,
257258
},

cmd/utils/flags.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -902,6 +902,10 @@ var (
902902
Name: "gossip.disabletxreceiving",
903903
Usage: "Disable gossip receiving transactions from other peers",
904904
}
905+
GossipSequencerHTTPFlag = &cli.StringFlag{
906+
Name: "gossip.sequencerhttp",
907+
Usage: "Sequencer mempool HTTP endpoint",
908+
}
905909
GossipBroadcastToAllEnabledFlag = cli.BoolFlag{
906910
Name: "gossip.enablebroadcasttoall",
907911
Usage: "Enable gossip broadcast blocks and transactions to all peers",
@@ -1838,8 +1842,8 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
18381842
log.Info("Gossip broadcast to all enabled", "enabled", cfg.GossipBroadcastToAllEnabled, "cap", cfg.GossipBroadcastToAllCap)
18391843
}
18401844
// Only configure sequencer http flag if we're running in verifier mode i.e. --mine is disabled.
1841-
if ctx.IsSet(TxGossipSequencerHTTPFlag.Name) && !ctx.IsSet(MiningEnabledFlag.Name) {
1842-
cfg.TxGossipSequencerHTTP = ctx.String(TxGossipSequencerHTTPFlag.Name)
1845+
if ctx.IsSet(GossipSequencerHTTPFlag.Name) && !ctx.IsSet(MiningEnabledFlag.Name) {
1846+
cfg.GossipSequencerHTTP = ctx.String(GossipSequencerHTTPFlag.Name)
18431847
}
18441848

18451849
// Cap the cache allowance and tune the garbage collector

eth/backend.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ func New(stack *node.Node, config *ethconfig.Config, l1Client l1.Client) (*Ether
308308
// Some of the extraData is used with Clique consensus (before EuclidV2). After EuclidV2 we use SystemContract consensus where this is overridden when creating a block.
309309
eth.miner.SetExtra(makeExtraData(config.Miner.ExtraData))
310310

311-
eth.APIBackend = &EthAPIBackend{stack.Config().ExtRPCEnabled(), stack.Config().AllowUnprotectedTxs, config.TxGossipReceivingDisabled, eth, nil}
311+
eth.APIBackend = &EthAPIBackend{stack.Config().ExtRPCEnabled(), stack.Config().AllowUnprotectedTxs, config.GossipTxReceivingDisabled, eth, nil}
312312
if eth.APIBackend.allowUnprotectedTxs {
313313
log.Info("Unprotected transactions allowed")
314314
}
@@ -319,9 +319,9 @@ func New(stack *node.Node, config *ethconfig.Config, l1Client l1.Client) (*Ether
319319
gpoParams.DefaultBasePrice = new(big.Int).SetUint64(config.TxPool.PriceLimit)
320320
eth.APIBackend.gpo = gasprice.NewOracle(eth.APIBackend, gpoParams)
321321

322-
if config.TxGossipSequencerHTTP != "" {
322+
if config.GossipSequencerHTTP != "" {
323323
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
324-
client, err := rpc.DialContext(ctx, config.TxGossipSequencerHTTP)
324+
client, err := rpc.DialContext(ctx, config.GossipSequencerHTTP)
325325
cancel()
326326
if err != nil {
327327
return nil, fmt.Errorf("cannot initialize rollup sequencer client: %w", err)

eth/ethconfig/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ type Config struct {
233233

234234
GossipTxBroadcastDisabled bool
235235
GossipTxReceivingDisabled bool
236+
GossipSequencerHTTP string
236237
GossipBroadcastToAllEnabled bool
237238
GossipBroadcastToAllCap int
238239
}

0 commit comments

Comments
 (0)