From aa89093d57bedcee1104f87c463e86d7ebc26bc8 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Tue, 20 May 2025 23:31:54 -0300
Subject: [PATCH] accept bunker URIs in $NOSTR_SECRET_KEY, simplify.

fixes https://github.com/fiatjaf/nak/issues/66
---
 helpers_key.go | 15 ++++-----------
 mcp.go         | 10 +---------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/helpers_key.go b/helpers_key.go
index 16fbb51..b06fb8c 100644
--- a/helpers_key.go
+++ b/helpers_key.go
@@ -20,10 +20,12 @@ import (
 var defaultKeyFlags = []cli.Flag{
 	&cli.StringFlag{
 		Name:        "sec",
-		Usage:       "secret key to sign the event, as nsec, ncryptsec or hex, or a bunker URL, it is more secure to use the environment variable NOSTR_SECRET_KEY than this flag",
+		Usage:       "secret key to sign the event, as nsec, ncryptsec or hex, or a bunker URL",
 		DefaultText: "the key '1'",
-		Aliases:     []string{"connect"},
 		Category:    CATEGORY_SIGNER,
+		Sources:     cli.EnvVars("NOSTR_SECRET_KEY"),
+		Value:       nostr.KeyOne.Hex(),
+		HideDefault: true,
 	},
 	&cli.BoolFlag{
 		Name:     "prompt-sec",
@@ -80,15 +82,6 @@ func gatherSecretKeyOrBunkerFromArguments(ctx context.Context, c *cli.Command) (
 		return nostr.SecretKey{}, bunker, err
 	}
 
-	// take private from flags, environment variable or default to 1
-	if sec == "" {
-		if key, ok := os.LookupEnv("NOSTR_SECRET_KEY"); ok {
-			sec = key
-		} else {
-			sec = "0000000000000000000000000000000000000000000000000000000000000001"
-		}
-	}
-
 	if c.Bool("prompt-sec") {
 		var err error
 		sec, err = askPassword("type your secret key as ncryptsec, nsec or hex: ", nil)
diff --git a/mcp.go b/mcp.go
index ddade00..5ab4250 100644
--- a/mcp.go
+++ b/mcp.go
@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"os"
 	"strings"
 
 	"fiatjaf.com/nostr"
@@ -28,13 +27,10 @@ var mcpServer = &cli.Command{
 			version,
 		)
 
-		keyer, sk, err := gatherKeyerFromArguments(ctx, c)
+		keyer, _, err := gatherKeyerFromArguments(ctx, c)
 		if err != nil {
 			return err
 		}
-		if sk == nostr.KeyOne && !c.IsSet("sec") {
-			keyer = nil
-		}
 
 		s.AddTool(mcp.NewTool("publish_note",
 			mcp.WithDescription("Publish a short note event to Nostr with the given text content"),
@@ -46,10 +42,6 @@ var mcpServer = &cli.Command{
 			mention, _ := optional[string](r, "mention")
 			relay, _ := optional[string](r, "relay")
 
-			sk := os.Getenv("NOSTR_SECRET_KEY")
-			if sk == "" {
-				sk = "0000000000000000000000000000000000000000000000000000000000000001"
-			}
 			var relays []string
 
 			evt := nostr.Event{