From 2b16d82dbc10ee88110b2e61ecda41b3dcfc6549 Mon Sep 17 00:00:00 2001 From: maskpp Date: Sun, 15 Sep 2024 20:23:47 +0800 Subject: [PATCH] feat(taiko-client): allow `--l1.beacon` to be optional when a blob server is given (#18094) Co-authored-by: David --- packages/taiko-client/driver/config.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/taiko-client/driver/config.go b/packages/taiko-client/driver/config.go index ebe792c7b4..3eb3b95e23 100644 --- a/packages/taiko-client/driver/config.go +++ b/packages/taiko-client/driver/config.go @@ -42,8 +42,9 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { return nil, errors.New("empty L2 check point URL") } - if !c.IsSet(flags.L1BeaconEndpoint.Name) { - return nil, errors.New("empty L1 beacon endpoint") + var beaconEndpoint string + if c.IsSet(flags.L1BeaconEndpoint.Name) { + beaconEndpoint = c.String(flags.L1BeaconEndpoint.Name) } var blobServerEndpoint *url.URL @@ -64,11 +65,15 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { } } + if beaconEndpoint == "" && blobServerEndpoint == nil && socialScanEndpoint == nil { + return nil, errors.New("empty L1 beacon endpoint, blob server and Social Scan endpoint") + } + var timeout = c.Duration(flags.RPCTimeout.Name) return &Config{ ClientConfig: &rpc.ClientConfig{ L1Endpoint: c.String(flags.L1WSEndpoint.Name), - L1BeaconEndpoint: c.String(flags.L1BeaconEndpoint.Name), + L1BeaconEndpoint: beaconEndpoint, L2Endpoint: c.String(flags.L2WSEndpoint.Name), L2CheckPoint: l2CheckPoint, TaikoL1Address: common.HexToAddress(c.String(flags.TaikoL1Address.Name)),