Skip to content
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

Jump to bottom

feat(taiko-client): allow --l1.beacon to be optional when a blob server is given #18094

Merged
merged 7 commits into from
Sep 15, 2024
Merged

feat(taiko-client): allow --l1.beacon to be optional when a blob server is given #18094

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
69c73df
let l1.beacon be optional
mask-pp Sep 14, 2024
8ce95b8
Merge branch 'main' into driver_optional_l1_beacon_
mask-pp Sep 14, 2024
3199175
revert change
mask-pp Sep 14, 2024
4e10fff
Merge branch 'main' into driver_optional_l1_beacon_
mask-pp Sep 15, 2024
287dd95
Merge branch 'main' into driver_optional_l1_beacon_
mask-pp Sep 15, 2024
388fa25
l1.beacon is optional and let at least one blob client is not empty
mask-pp Sep 15, 2024
32b1026
Update packages/taiko-client/driver/config.go
davidtaikocha Sep 15, 2024
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
11 changes: 8 additions & 3 deletions packages/taiko-client/driver/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)),
Expand Down
Loading