From 15ea056b86f8cd245bf9175f1f8a519fc0b401e7 Mon Sep 17 00:00:00 2001
From: Jackson Gothie <jackson.gothie@gmail.com>
Date: Thu, 23 Apr 2026 11:45:59 -0600
Subject: [PATCH] Use default if datadir specified and JWT secret not set

---
 cmd/blsync/main.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/cmd/blsync/main.go b/cmd/blsync/main.go
index 39a9407304..85e3ab200f 100644
--- a/cmd/blsync/main.go
+++ b/cmd/blsync/main.go
@@ -44,7 +44,7 @@ func main() {
 		utils.BeaconGenesisTimeFlag,
 		utils.BeaconCheckpointFlag,
 		utils.BeaconCheckpointFileFlag,
-		//TODO datadir for optional permanent database
+		utils.DataDirFlag,
 		utils.MainnetFlag,
 		utils.SepoliaFlag,
 		utils.HoleskyFlag,
@@ -87,11 +87,15 @@ 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
+	jwtFileName := ctx.String(utils.BlsyncJWTSecretFlag.Name)
+	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
 	if jwt, err := node.ObtainJWTSecret(jwtFileName); err == nil {
 		copy(jwtSecret[:], jwt)