forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-12 01:41:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use default if datadir specified and JWT secret not set

Browse source
This commit is contained in:
Jackson Gothie 2026-04-23 11:45:59 -06:00
parent 526ad4f6f1
commit 15ea056b86
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/blsync/main.go
View file

@ -44,7 +44,7 @@ func main() {
utils.BeaconGenesisTimeFlag, utils.BeaconGenesisTimeFlag,
utils.BeaconCheckpointFlag, utils.BeaconCheckpointFlag,
utils.BeaconCheckpointFileFlag, utils.BeaconCheckpointFileFlag,
//TODO datadir for optional permanent database utils.DataDirFlag,
utils.MainnetFlag, utils.MainnetFlag,
utils.SepoliaFlag, utils.SepoliaFlag,
utils.HoleskyFlag, utils.HoleskyFlag,
@ -87,11 +87,15 @@ func makeRPCClient(ctx *cli.Context) *rpc.Client {
log.Warn("No engine API target specified, performing a dry run") log.Warn("No engine API target specified, performing a dry run")
return nil return nil
} }
if !ctx.IsSet(utils.BlsyncJWTSecretFlag.Name) { jwtFileName := ctx.String(utils.BlsyncJWTSecretFlag.Name)
utils.Fatalf("JWT secret parameter missing") //TODO use default if datadir is specified if jwtFileName == "" && ctx.IsSet(utils.DataDirFlag.Name) {
jwtFileName = (&node.Config{Name: "geth", DataDir: ctx.String(utils.DataDirFlag.Name)}).ResolvePath("jwtsecret")
}
if jwtFileName == "" {
utils.Fatalf("JWT secret parameter missing")
} }
engineApiUrl, jwtFileName := ctx.String(utils.BlsyncApiFlag.Name), ctx.String(utils.BlsyncJWTSecretFlag.Name) engineApiUrl := ctx.String(utils.BlsyncApiFlag.Name)
var jwtSecret [32]byte var jwtSecret [32]byte
if jwt, err := node.ObtainJWTSecret(jwtFileName); err == nil { if jwt, err := node.ObtainJWTSecret(jwtFileName); err == nil {
copy(jwtSecret[:], jwt) copy(jwtSecret[:], jwt)