Skip to content

cmd/blsync: remove todo add flag --datadir #33191

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cmd/blsync: remove todo add flag --datadir #33191

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
18 changes: 13 additions & 5 deletions cmd/blsync/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"fmt"
"os"
"path/filepath"
"slices"

"github.com/ethereum/go-ethereum/beacon/blsync"
Expand All @@ -44,7 +45,7 @@ func main() {
utils.BeaconGenesisTimeFlag,
utils.BeaconCheckpointFlag,
utils.BeaconCheckpointFileFlag,
//TODO datadir for optional permanent database
utils.DataDirFlag,
utils.MainnetFlag,
utils.SepoliaFlag,
utils.HoleskyFlag,
Expand Down Expand Up @@ -87,11 +88,18 @@ func makeRPCClient(ctx *cli.Context) *rpc.Client {
log.Warn("No engine API target specified, performing a dry run")
return nil
}
if !ctx.IsSet(utils.BlsyncJWTSecretFlag.Name) {
utils.Fatalf("JWT secret parameter missing") //TODO use default if datadir is specified
}

engineApiUrl, jwtFileName := ctx.String(utils.BlsyncApiFlag.Name), ctx.String(utils.BlsyncJWTSecretFlag.Name)
engineApiUrl := ctx.String(utils.BlsyncApiFlag.Name)
var jwtFileName string
if ctx.IsSet(utils.BlsyncJWTSecretFlag.Name) {
jwtFileName = ctx.String(utils.BlsyncJWTSecretFlag.Name)
} else if ctx.IsSet(utils.DataDirFlag.Name) {
// Use default JWT secret path in datadir
datadir := ctx.String(utils.DataDirFlag.Name)
jwtFileName = filepath.Join(datadir, "jwtsecret")
} else {
utils.Fatalf("JWT secret parameter missing")
}
var jwtSecret [32]byte
if jwt, err := node.ObtainJWTSecret(jwtFileName); err == nil {
copy(jwtSecret[:], jwt)
Expand Down