wip

.github/workflows/release-cli.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         goos: [linux, freebsd, darwin, windows]
-        goarch: [arm, amd64, arm64, riscv64]
+        goarch: [amd64, arm64, riscv64]
         exclude:
           - goarch: arm64
             goos: windows
@@ -33,12 +33,6 @@ jobs:
             goos: windows
           - goarch: riscv64
             goos: darwin
-          - goarch: arm
-            goos: windows
-          - goarch: arm
-            goos: darwin
-          - goarch: arm
-            goos: freebsd
     steps:
       - uses: actions/checkout@v3
       - uses: wangyoucao577/go-release-action@v1.40
@@ -46,7 +40,6 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
-          ldflags: -X main.version=${{ github.ref_name }}
           overwrite: true
           md5sum: false
           sha256sum: false

.gitignore

@@ -1,2 +1 @@
 nak
-mnt

README.md

@@ -180,55 +180,6 @@ listening at [wss://relay.damus.io wss://nos.lol wss://relay.nsecbunker.com]:
 50000 events.jsonl
 ```
 
-### run a somewhat verbose local relay for test purposes
-```shell
-~> nak serve
-> relay running at ws://localhost:10547
-    got request {"kinds":[1],"authors":["79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798"],"since":1724082362}
-    got event {"kind":1,"id":"e3c6bf630d6deea74c0ee2f7f7ba6da55a627498a32f1e72029229bb1810bce3","pubkey":"79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798","created_at":1724082366,"tags":[],"content":"two","sig":"34261cf226c3fee2df24e55a89f43f5349c98a64bce46bdc46807b0329f334cea93e9e8bc285c1259a5684cf23f5e507c8e6dad47a31a6615d706b1130d09e69"}
-    got event {"kind":1,"id":"0bbb397c8f87ae557650b9d6ee847292df8e530c458ffea1b24bdcb7bed0ec5e","pubkey":"79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798","created_at":1724082369,"tags":[],"content":"three","sig":"aa1cb7d5f0f03f358fc4c0a4351a4f1c66e3a7627021b618601c56ba598b825b6d95d9c8720a4c60666a7eb21e17018cf326222f9f574a9396f2f2da7f007546"}
-  • events stored: 2, subscriptions opened: 1
-    got event {"kind":1,"id":"029ebff759dd54dbd01b929f879fea5802de297e1c3768ca16d9b97cc8bca38f","pubkey":"79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798","created_at":1724082371,"tags":[],"content":"four","sig":"9816de517d87d4c3ede57c1c50e3c237486794241afadcd891e1acbba2c5e672286090e6ad3402b047d69bae8095bc4e20e57ac70d92386dfa26db216379330f"}
-    got event {"kind":1,"id":"fe6489fa6fbb925be839377b9b7049d73be755dc2bdad97ff6dd9eecbf8b3a32","pubkey":"79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798","created_at":1724082383,"tags":[],"content":"five","sig":"865ce5e32eead5bdb950ac1fbc55bc92dde26818ee3136634538ec42914de179a51e672c2d4269d4362176e5e8cd5e08e69b35b91c6c2af867e129b93d607635"}
-    got request {"kinds":[30818]}
-  • events stored: 4, subscriptions opened: 1
-```
-
-### make an event with a PoW target
-```shell
-~> nak event -c 'hello getwired.app and labour.fiatjaf.com' --pow 24
-{"kind":1,"id":"0000009dcc7c62056eafdb41fac817379ec2becf0ce27c5fbe98d0735d968147","pubkey":"79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798","created_at":1724160828,"tags":[["nonce","515504","24"]],"content":"hello getwired.app and labour.fiatjaf.com","sig":"7edb988065ccc12779fe99270945b212f3723838f315d76d5e90e9ffa27198f13fa556614295f518d968d55bab81878167d4162b3a7cf81a6b423c6761bd504c"}
-```
-
-### make a nostr event signed with a key given as an environment variable
-
-```shell
-~> export NOSTR_SECRET_KEY=ncryptsec1qggyy9vw0nclmw8ly9caz6aa7f85a4ufhsct64uva337pulsdw00n6twa2lzhzk2znzsyu60urx9s08lx00ke6ual3lszyn5an9zarm6s70lw5lj6dv3mj3f9p4tvp0we6qyz4gp420mapfmvqheuttv
-~> nak event -c 'it supports keys as hex, nsec or ncryptsec'
-type the password to decrypt your secret key: ********
-{"kind":1,"id":"5cbf3feb9a7d99c3ee2a88693a591caca1a8348fea427b3652c27f7a8a76af48","pubkey":"b00bcab55375d8c7b731dd9841f6d805ff1cf6fdc945e7326786deb5ddac6ce4","created_at":1724247924,"tags":[],"content":"it supports keys as hex, nsec or ncryptsec","sig":"fb3fd170bc10e5042322c7a05dd4bbd8ac9947b39026b8a7afd1ee02524e8e3aa1d9554e9c7b6181ca1b45cab01cd06643bdffa5ce678b475e6b185e1c14b085"}
-```
-
-### download some helpful `jq` functions for dealing with nostr events
-```shell
-~> nak req -i 412f2d3e73acc312942c055ac2a695dc60bf58ff97e06689a8a79e97796c4cdb relay.westernbtc.com | jq -r .content > ~/.jq
-```
-
-### watch a NIP-53 livestream (zap.stream etc)
-```shell
-~> # this requires the jq utils from the step above
-~> mpv $(nak fetch naddr1qqjxvvm9xscnsdtx95cxvcfk956rsvtx943rje3k95mx2dp389jnwwrp8ymxgqg4waehxw309aex2mrp0yhxgctdw4eju6t09upzpn6956apxcad0mfp8grcuugdysg44eepex68h50t73zcathmfs49qvzqqqrkvu7ed38k | jq -r 'tag_value("streaming")')
-~>
-~> # or without the utils
-~> mpv $(nak fetch naddr1qqjxvvm9xscnsdtx95cxvcfk956rsvtx943rje3k95mx2dp389jnwwrp8ymxgqg4waehxw309aex2mrp0yhxgctdw4eju6t09upzpn6956apxcad0mfp8grcuugdysg44eepex68h50t73zcathmfs49qvzqqqrkvu7ed38k | jq -r '.tags | map(select(.[0] == "streaming") | .[1])[0]')
-```
-
-### download a NIP-35 torrent from an `nevent`
-```shell
-~> # this requires the jq utils from two steps above
-~> aria2c $(nak fetch nevent1qqsdsg6x7uujekac4ga7k7qa9q9sx8gqj7xzjf5w9us0dm0ghvf4ugspp4mhxue69uhkummn9ekx7mq6dw9y4 | jq -r '"magnet:?xt=urn:btih:\(tag_value("x"))&dn=\(tag_value("title"))&tr=http%3A%2F%2Ftracker.loadpeers.org%3A8080%2FxvRKfvAlnfuf5EfxTT5T0KIVPtbqAHnX%2Fannounce&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=\(tags("tracker") | map(.[1] | @uri) | join("&tr="))"')
-```
-
 ## contributing to this repository
 
 Use NIP-34 to send your patches to `naddr1qqpkucttqy28wumn8ghj7un9d3shjtnwdaehgu3wvfnsz9nhwden5te0wfjkccte9ehx7um5wghxyctwvsq3gamnwvaz7tmjv4kxz7fwv3sk6atn9e5k7q3q80cvv07tjdrrgpa0j7j7tmnyl2yr6yr7l8j4s3evf6u64th6gkwsxpqqqpmej2wctpn`.

blossom.go

@@ -1,222 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-
-	"github.com/nbd-wtf/go-nostr/keyer"
-	"github.com/nbd-wtf/go-nostr/nipb0/blossom"
-	"github.com/urfave/cli/v3"
-)
-
-var blossomCmd = &cli.Command{
-	Name:                      "blossom",
-	Suggest:                   true,
-	UseShortOptionHandling:    true,
-	Usage:                     "an army knife for blossom things",
-	DisableSliceFlagSeparator: true,
-	Flags: append(defaultKeyFlags,
-		&cli.StringFlag{
-			Name:     "server",
-			Aliases:  []string{"s"},
-			Usage:    "the hostname of the target mediaserver",
-			Required: true,
-		},
-	),
-	Commands: []*cli.Command{
-		{
-			Name:                      "list",
-			Usage:                     "lists blobs from a pubkey",
-			Description:               `takes one pubkey passed as an argument or derives one from the --sec supplied. if that is given then it will also pre-authorize the list, which some servers may require.`,
-			DisableSliceFlagSeparator: true,
-			ArgsUsage:                 "[pubkey]",
-			Action: func(ctx context.Context, c *cli.Command) error {
-				var client *blossom.Client
-				pubkey := c.Args().First()
-				if pubkey != "" {
-					client = blossom.NewClient(client.GetMediaServer(), keyer.NewReadOnlySigner(pubkey))
-				} else {
-					var err error
-					client, err = getBlossomClient(ctx, c)
-					if err != nil {
-						return err
-					}
-				}
-
-				bds, err := client.List(ctx)
-				if err != nil {
-					return err
-				}
-
-				for _, bd := range bds {
-					stdout(bd)
-				}
-
-				return nil
-			},
-		},
-		{
-			Name:                      "upload",
-			Usage:                     "uploads a file to a specific mediaserver.",
-			Description:               `takes any number of local file paths and uploads them to a mediaserver, printing the resulting blob descriptions when successful.`,
-			DisableSliceFlagSeparator: true,
-			ArgsUsage:                 "[files...]",
-			Action: func(ctx context.Context, c *cli.Command) error {
-				client, err := getBlossomClient(ctx, c)
-				if err != nil {
-					return err
-				}
-
-				hasError := false
-				for _, fpath := range c.Args().Slice() {
-					bd, err := client.UploadFile(ctx, fpath)
-					if err != nil {
-						fmt.Fprintf(os.Stderr, "%s\n", err)
-						hasError = true
-						continue
-					}
-
-					j, _ := json.Marshal(bd)
-					stdout(string(j))
-				}
-
-				if hasError {
-					os.Exit(3)
-				}
-				return nil
-			},
-		},
-		{
-			Name:                      "download",
-			Usage:                     "downloads files from mediaservers",
-			Description:               `takes any number of sha256 hashes as hex, downloads them and prints them to stdout (unless --output is specified).`,
-			DisableSliceFlagSeparator: true,
-			ArgsUsage:                 "[sha256...]",
-			Flags: []cli.Flag{
-				&cli.StringSliceFlag{
-					Name:    "output",
-					Aliases: []string{"o"},
-					Usage:   "file name to save downloaded file to, can be passed multiple times when downloading multiple hashes",
-				},
-			},
-			Action: func(ctx context.Context, c *cli.Command) error {
-				client, err := getBlossomClient(ctx, c)
-				if err != nil {
-					return err
-				}
-
-				outputs := c.StringSlice("output")
-
-				hasError := false
-				for i, hash := range c.Args().Slice() {
-					if len(outputs)-1 >= i && outputs[i] != "--" {
-						// save to this file
-						err := client.DownloadToFile(ctx, hash, outputs[i])
-						if err != nil {
-							fmt.Fprintf(os.Stderr, "%s\n", err)
-							hasError = true
-						}
-					} else {
-						// if output wasn't specified, print to stdout
-						data, err := client.Download(ctx, hash)
-						if err != nil {
-							fmt.Fprintf(os.Stderr, "%s\n", err)
-							hasError = true
-							continue
-						}
-						os.Stdout.Write(data)
-					}
-				}
-
-				if hasError {
-					os.Exit(2)
-				}
-				return nil
-			},
-		},
-		{
-			Name:    "del",
-			Aliases: []string{"delete"},
-			Usage:   "deletes a file from a mediaserver",
-			Description: `takes any number of sha256 hashes, signs authorizations and deletes them from the current mediaserver.
-
-if any of the files are not deleted command will fail, otherwise it will succeed. it will also print error messages to stderr and the hashes it successfully deletes to stdout.`,
-			DisableSliceFlagSeparator: true,
-			ArgsUsage:                 "[sha256...]",
-			Action: func(ctx context.Context, c *cli.Command) error {
-				client, err := getBlossomClient(ctx, c)
-				if err != nil {
-					return err
-				}
-
-				hasError := false
-				for _, hash := range c.Args().Slice() {
-					err := client.Delete(ctx, hash)
-					if err != nil {
-						fmt.Fprintf(os.Stderr, "%s\n", err)
-						hasError = true
-						continue
-					}
-
-					stdout(hash)
-				}
-
-				if hasError {
-					os.Exit(3)
-				}
-				return nil
-			},
-		},
-		{
-			Name:  "check",
-			Usage: "asks the mediaserver if it has the specified hashes.",
-			Description: `uses the HEAD request to succintly check if the server has the specified sha256 hash.
-
-if any of the files are not found the command will fail, otherwise it will succeed. it will also print error messages to stderr and the hashes it finds to stdout.`,
-			DisableSliceFlagSeparator: true,
-			ArgsUsage:                 "[sha256...]",
-			Action: func(ctx context.Context, c *cli.Command) error {
-				client, err := getBlossomClient(ctx, c)
-				if err != nil {
-					return err
-				}
-
-				hasError := false
-				for _, hash := range c.Args().Slice() {
-					err := client.Check(ctx, hash)
-					if err != nil {
-						hasError = true
-						fmt.Fprintf(os.Stderr, "%s\n", err)
-						continue
-					}
-
-					stdout(hash)
-				}
-
-				if hasError {
-					os.Exit(2)
-				}
-				return nil
-			},
-		},
-		{
-			Name:                      "mirror",
-			Usage:                     "",
-			Description:               ``,
-			DisableSliceFlagSeparator: true,
-			ArgsUsage:                 "",
-			Action: func(ctx context.Context, c *cli.Command) error {
-				return nil
-			},
-		},
-	},
-}
-
-func getBlossomClient(ctx context.Context, c *cli.Command) (*blossom.Client, error) {
-	keyer, _, err := gatherKeyerFromArguments(ctx, c)
-	if err != nil {
-		return nil, err
-	}
-	return blossom.NewClient(c.String("server"), keyer), nil
-}

bunker.go

@@ -2,24 +2,25 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"net/url"
 	"os"
-	"slices"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
 	"github.com/nbd-wtf/go-nostr/nip46"
+	"golang.org/x/exp/slices"
 )
 
 var bunker = &cli.Command{
 	Name:                      "bunker",
-	Usage:                     "starts a nip46 signer daemon with the given --sec key",
+	Usage:                     "starts a NIP-46 signer daemon with the given --sec key",
 	ArgsUsage:                 "[relay...]",
 	Description:               ``,
 	DisableSliceFlagSeparator: true,
@@ -28,6 +29,7 @@ var bunker = &cli.Command{
 			Name:        "sec",
 			Usage:       "secret key to sign the event, as hex or nsec",
 			DefaultText: "the key '1'",
+			Value:       "0000000000000000000000000000000000000000000000000000000000000001",
 		},
 		&cli.BoolFlag{
 			Name:  "prompt-sec",
@@ -49,7 +51,7 @@ var bunker = &cli.Command{
 		qs := url.Values{}
 		relayURLs := make([]string, 0, c.Args().Len())
 		if relayUrls := c.Args().Slice(); len(relayUrls) > 0 {
-			relays := connectToAllRelays(ctx, relayUrls, false)
+			_, relays := connectToAllRelays(ctx, relayUrls, false)
 			if len(relays) == 0 {
 				log("failed to connect to any of the given relays.\n")
 				os.Exit(3)
@@ -83,6 +85,8 @@ var bunker = &cli.Command{
 			return err
 		}
 		npub, _ := nip19.EncodePublicKey(pubkey)
+		bold := color.New(color.Bold).Sprint
+		italic := color.New(color.Italic).Sprint
 
 		// this function will be called every now and then
 		printBunkerInfo := func() {
@@ -91,12 +95,12 @@ var bunker = &cli.Command{
 
 			authorizedKeysStr := ""
 			if len(authorizedKeys) != 0 {
-				authorizedKeysStr = "\n  authorized keys:\n    - " + colors.italic(strings.Join(authorizedKeys, "\n    - "))
+				authorizedKeysStr = "\n  authorized keys:\n    - " + italic(strings.Join(authorizedKeys, "\n    - "))
 			}
 
 			authorizedSecretsStr := ""
 			if len(authorizedSecrets) != 0 {
-				authorizedSecretsStr = "\n  authorized secrets:\n    - " + colors.italic(strings.Join(authorizedSecrets, "\n    - "))
+				authorizedSecretsStr = "\n  authorized secrets:\n    - " + italic(strings.Join(authorizedSecrets, "\n    - "))
 			}
 
 			preauthorizedFlags := ""
@@ -128,24 +132,27 @@ var bunker = &cli.Command{
 			)
 
 			log("listening at %v:\n  pubkey: %s \n  npub: %s%s%s\n  to restart: %s\n  bunker: %s\n\n",
-				colors.bold(relayURLs),
+				bold(relayURLs),
-				colors.bold(pubkey),
+				bold(pubkey),
-				colors.bold(npub),
+				bold(npub),
 				authorizedKeysStr,
 				authorizedSecretsStr,
 				color.CyanString(restartCommand),
-				colors.bold(bunkerURI),
+				bold(bunkerURI),
 			)
 		}
 		printBunkerInfo()
 
 		// subscribe to relays
+		pool := nostr.NewSimplePool(ctx)
 		now := nostr.Now()
-		events := sys.Pool.SubscribeMany(ctx, relayURLs, nostr.Filter{
+		events := pool.SubMany(ctx, relayURLs, nostr.Filters{
+			{
 				Kinds:     []int{nostr.KindNostrConnect},
 				Tags:      nostr.TagMap{"p": []string{pubkey}},
 				Since:     &now,
 				LimitZero: true,
+			},
 		})
 
 		signer := nip46.NewStaticKeySigner(sec)
@@ -178,21 +185,21 @@ var bunker = &cli.Command{
 			cancelPreviousBunkerInfoPrint() // this prevents us from printing a million bunker info blocks
 
 			// handle the NIP-46 request event
-			req, resp, eventResponse, err := signer.HandleRequest(ctx, ie.Event)
+			req, resp, eventResponse, err := signer.HandleRequest(ie.Event)
 			if err != nil {
 				log("< failed to handle request from %s: %s\n", ie.Event.PubKey, err.Error())
 				continue
 			}
 
-			jreq, _ := json.MarshalIndent(req, "", "  ")
+			jreq, _ := json.MarshalIndent(req, "  ", "  ")
 			log("- got request from '%s': %s\n", color.New(color.Bold, color.FgBlue).Sprint(ie.Event.PubKey), string(jreq))
-			jresp, _ := json.MarshalIndent(resp, "", "  ")
+			jresp, _ := json.MarshalIndent(resp, "  ", "  ")
 			log("~ responding with %s\n", string(jresp))
 
 			handlerWg.Add(len(relayURLs))
 			for _, relayURL := range relayURLs {
 				go func(relayURL string) {
-					if relay, _ := sys.Pool.EnsureRelay(relayURL); relay != nil {
+					if relay, _ := pool.EnsureRelay(relayURL); relay != nil {
 						err := relay.Publish(ctx, eventResponse)
 						printLock.Lock()
 						if err == nil {
@@ -217,7 +224,7 @@ var bunker = &cli.Command{
 				select {
 				case <-ctx.Done():
 				case <-time.After(time.Minute * 5):
-					log("\n")
+					fmt.Fprintf(os.Stderr, "\n")
 					printBunkerInfo()
 				}
 			}()
@@ -225,23 +232,4 @@ var bunker = &cli.Command{
 
 		return nil
 	},
-	Commands: []*cli.Command{
-		{
-			Name:      "connect",
-			Usage:     "use the client-initiated NostrConnect flow of NIP46",
-			ArgsUsage: "<nostrconnect-uri>",
-			Action: func(ctx context.Context, c *cli.Command) error {
-				if c.Args().Len() != 1 {
-					return fmt.Errorf("must be called with a nostrconnect://... uri")
-				}
-
-				uri, err := url.Parse(c.Args().First())
-				if err != nil || uri.Scheme != "nostrconnect" || !nostr.IsValidPublicKey(uri.Host) {
-					return fmt.Errorf("invalid uri")
-				}
-
-				return nil
-			},
-		},
-	},
 }

count.go

@@ -2,20 +2,19 @@ package main
 
 import (
 	"context"
+	"encoding/json"
+	"errors"
 	"fmt"
-	"os"
 	"strings"
 
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip45"
-	"github.com/nbd-wtf/go-nostr/nip45/hyperloglog"
 )
 
 var count = &cli.Command{
 	Name:                      "count",
 	Usage:                     "generates encoded COUNT messages and optionally use them to talk to relays",
-	Description:               `outputs a nip45 request (the flags are mostly the same as 'nak req').`,
+	Description:               `outputs a NIP-45 request (the flags are mostly the same as 'nak req').`,
 	DisableSliceFlagSeparator: true,
 	Flags: []cli.Flag{
 		&cli.StringSliceFlag{
@@ -67,32 +66,6 @@ var count = &cli.Command{
 	},
 	ArgsUsage: "[relay...]",
 	Action: func(ctx context.Context, c *cli.Command) error {
-		biggerUrlSize := 0
-		relayUrls := c.Args().Slice()
-		if len(relayUrls) > 0 {
-			relays := connectToAllRelays(ctx,
-				relayUrls,
-				false,
-			)
-			if len(relays) == 0 {
-				log("failed to connect to any of the given relays.\n")
-				os.Exit(3)
-			}
-			relayUrls = make([]string, len(relays))
-			for i, relay := range relays {
-				relayUrls[i] = relay.URL
-				if len(relay.URL) > biggerUrlSize {
-					biggerUrlSize = len(relay.URL)
-				}
-			}
-
-			defer func() {
-				for _, relay := range relays {
-					relay.Close()
-				}
-			}()
-		}
-
 		filter := nostr.Filter{}
 
 		if authors := c.StringSlice("author"); len(authors) > 0 {
@@ -112,7 +85,7 @@ var count = &cli.Command{
 		tags := make([][]string, 0, 5)
 		for _, tagFlag := range c.StringSlice("tag") {
 			spl := strings.SplitN(tagFlag, "=", 2)
-			if len(spl) == 2 {
+			if len(spl) == 2 && len(spl[0]) == 1 {
 				tags = append(tags, spl)
 			} else {
 				return fmt.Errorf("invalid --tag '%s'", tagFlag)
@@ -146,35 +119,26 @@ var count = &cli.Command{
 			filter.Limit = int(limit)
 		}
 
+		relays := c.Args().Slice()
 		successes := 0
-		if len(relayUrls) > 0 {
+		failures := make([]error, 0, len(relays))
-			var hll *hyperloglog.HyperLogLog
+		if len(relays) > 0 {
-			if offset := nip45.HyperLogLogEventPubkeyOffsetForFilter(filter); offset != -1 && len(relayUrls) > 1 {
+			for _, relayUrl := range relays {
-				hll = hyperloglog.New(offset)
+				relay, err := nostr.RelayConnect(ctx, relayUrl)
-			}
-			for _, relayUrl := range relayUrls {
-				relay, _ := sys.Pool.EnsureRelay(relayUrl)
-				count, hllRegisters, err := relay.Count(ctx, nostr.Filters{filter})
-				fmt.Fprintf(os.Stderr, "%s%s: ", strings.Repeat(" ", biggerUrlSize-len(relayUrl)), relayUrl)
-
 				if err != nil {
-					fmt.Fprintf(os.Stderr, "❌ %s\n", err)
+					failures = append(failures, err)
 					continue
 				}
-
+				count, err := relay.Count(ctx, nostr.Filters{filter})
-				var hasHLLStr string
+				if err != nil {
-				if hll != nil && len(hllRegisters) == 256 {
+					failures = append(failures, err)
-					hll.MergeRegisters(hllRegisters)
+					continue
-					hasHLLStr = " 📋"
 				}
-
+				fmt.Printf("%s: %d\n", relay.URL, count)
-				fmt.Fprintf(os.Stderr, "%d%s\n", count, hasHLLStr)
 				successes++
 			}
 			if successes == 0 {
-				return fmt.Errorf("all relays have failed")
+				return errors.Join(failures...)
-			} else if hll != nil {
-				fmt.Fprintf(os.Stderr, "📋 HyperLogLog sum: %d\n", hll.Count())
 			}
 		} else {
 			// no relays given, will just print the filter

curl.go

@@ -1,132 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/base64"
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/urfave/cli/v3"
-	"golang.org/x/exp/slices"
-)
-
-var curlFlags []string
-
-var curl = &cli.Command{
-	Name:                      "curl",
-	Usage:                     "calls curl but with a nip98 header",
-	Description:               "accepts all flags and arguments exactly as they would be passed to curl.",
-	Flags:                     defaultKeyFlags,
-	DisableSliceFlagSeparator: true,
-	Action: func(ctx context.Context, c *cli.Command) error {
-		kr, _, err := gatherKeyerFromArguments(ctx, c)
-		if err != nil {
-			return err
-		}
-
-		// cowboy parsing of curl flags to get the data we need for nip98
-		var url string
-		var method string
-		var presumedMethod string
-
-		curlBodyBuildingFlags := []string{
-			"-d",
-			"--data",
-			"--data-binary",
-			"--data-ascii",
-			"--data-raw",
-			"--data-urlencode",
-			"-F",
-			"--form",
-			"--form-string",
-			"--form-escape",
-			"--upload-file",
-		}
-
-		nextIsMethod := false
-		for _, f := range curlFlags {
-			if nextIsMethod {
-				method = f
-				method, _ = strings.CutPrefix(method, `"`)
-				method, _ = strings.CutSuffix(method, `"`)
-				method = strings.ToUpper(method)
-			} else if strings.HasPrefix(f, "https://") || strings.HasPrefix(f, "http://") {
-				url = f
-			} else if f == "--request" || f == "-X" {
-				nextIsMethod = true
-				continue
-			} else if slices.Contains(curlBodyBuildingFlags, f) ||
-				slices.ContainsFunc(curlBodyBuildingFlags, func(s string) bool {
-					return strings.HasPrefix(f, s)
-				}) {
-				presumedMethod = "POST"
-			}
-			nextIsMethod = false
-		}
-
-		if url == "" {
-			return fmt.Errorf("can't create nip98 event: target url is empty")
-		}
-
-		if method == "" {
-			if presumedMethod != "" {
-				method = presumedMethod
-			} else {
-				method = "GET"
-			}
-		}
-
-		// make and sign event
-		evt := nostr.Event{
-			Kind:      27235,
-			CreatedAt: nostr.Now(),
-			Tags: nostr.Tags{
-				{"u", url},
-				{"method", method},
-			},
-		}
-		if err := kr.SignEvent(ctx, &evt); err != nil {
-			return err
-		}
-
-		// the first 2 indexes of curlFlags were reserved for this
-		curlFlags[0] = "-H"
-		curlFlags[1] = fmt.Sprintf("Authorization: Nostr %s", base64.StdEncoding.EncodeToString([]byte(evt.String())))
-
-		// call curl
-		cmd := exec.Command("curl", curlFlags...)
-		cmd.Stderr = os.Stderr
-		cmd.Stdin = os.Stdin
-		cmd.Stdout = os.Stdout
-		cmd.Run()
-		return nil
-	},
-}
-
-func realCurl() error {
-	curlFlags = make([]string, 2, max(len(os.Args)-4, 2))
-	keyFlags := make([]string, 0, 5)
-
-	for i := 0; i < len(os.Args[2:]); i++ {
-		arg := os.Args[i+2]
-		if slices.ContainsFunc(defaultKeyFlags, func(f cli.Flag) bool {
-			bareArg, _ := strings.CutPrefix(arg, "-")
-			bareArg, _ = strings.CutPrefix(bareArg, "-")
-			return slices.Contains(f.Names(), bareArg)
-		}) {
-			keyFlags = append(keyFlags, arg)
-			if arg != "--prompt-sec" {
-				i++
-				val := os.Args[i+2]
-				keyFlags = append(keyFlags, val)
-			}
-		} else {
-			curlFlags = append(curlFlags, arg)
-		}
-	}
-
-	return curl.Run(context.Background(), keyFlags)
-}

decode.go

@@ -3,12 +3,13 @@ package main
 import (
 	"context"
 	"encoding/hex"
+	"encoding/json"
 	"strings"
 
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/nbd-wtf/go-nostr/sdk"
+	sdk "github.com/nbd-wtf/nostr-sdk"
 )
 
 var decode = &cli.Command{
@@ -55,22 +56,11 @@ var decode = &cli.Command{
 				}
 			} else if evp := sdk.InputToEventPointer(input); evp != nil {
 				decodeResult = DecodeResult{EventPointer: evp}
-				if c.Bool("id") {
-					stdout(evp.ID)
-					continue
-				}
 			} else if pp := sdk.InputToProfile(ctx, input); pp != nil {
 				decodeResult = DecodeResult{ProfilePointer: pp}
-				if c.Bool("pubkey") {
-					stdout(pp.PublicKey)
-					continue
-				}
 			} else if prefix, value, err := nip19.Decode(input); err == nil && prefix == "naddr" {
-				if ep, ok := value.(nostr.EntityPointer); ok {
+				ep := value.(nostr.EntityPointer)
 				decodeResult = DecodeResult{EntityPointer: &ep}
-				} else {
-					ctx = lineProcessingError(ctx, "couldn't decode naddr: %s", err)
-				}
 			} else if prefix, value, err := nip19.Decode(input); err == nil && prefix == "nsec" {
 				decodeResult.PrivateKey.PrivateKey = value.(string)
 				decodeResult.PrivateKey.PublicKey, _ = nostr.GetPublicKey(value.(string))
@@ -79,10 +69,6 @@ var decode = &cli.Command{
 				continue
 			}
 
-			if c.Bool("pubkey") || c.Bool("id") {
-				return nil
-			}
-
 			stdout(decodeResult.JSON())
 
 		}

dvm.go

@@ -1,137 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip90"
-	"github.com/urfave/cli/v3"
-)
-
-var dvm = &cli.Command{
-	Name:                      "dvm",
-	Usage:                     "deal with nip90 data-vending-machine things (experimental)",
-	DisableSliceFlagSeparator: true,
-	Flags: append(defaultKeyFlags,
-		&cli.StringSliceFlag{
-			Name:    "relay",
-			Aliases: []string{"r"},
-		},
-	),
-	Commands: append([]*cli.Command{
-		{
-			Name:                      "list",
-			Usage:                     "find DVMs that have announced themselves for a specific kind",
-			DisableSliceFlagSeparator: true,
-			Action: func(ctx context.Context, c *cli.Command) error {
-				return fmt.Errorf("we don't know how to do this yet")
-			},
-		},
-	}, (func() []*cli.Command {
-		commands := make([]*cli.Command, len(nip90.Jobs))
-		for i, job := range nip90.Jobs {
-			flags := make([]cli.Flag, 0, 2+len(job.Params))
-
-			if job.InputType != "" {
-				flags = append(flags, &cli.StringSliceFlag{
-					Name:     "input",
-					Aliases:  []string{"i"},
-					Category: "INPUT",
-				})
-			}
-
-			for _, param := range job.Params {
-				flags = append(flags, &cli.StringSliceFlag{
-					Name:     param,
-					Category: "PARAMETER",
-				})
-			}
-
-			commands[i] = &cli.Command{
-				Name:                      strconv.Itoa(job.InputKind),
-				Usage:                     job.Name,
-				Description:               job.Description,
-				DisableSliceFlagSeparator: true,
-				Flags:                     flags,
-				Action: func(ctx context.Context, c *cli.Command) error {
-					relayUrls := c.StringSlice("relay")
-					relays := connectToAllRelays(ctx, relayUrls, false)
-					if len(relays) == 0 {
-						log("failed to connect to any of the given relays.\n")
-						os.Exit(3)
-					}
-					defer func() {
-						for _, relay := range relays {
-							relay.Close()
-						}
-					}()
-
-					evt := nostr.Event{
-						Kind:      job.InputKind,
-						Tags:      make(nostr.Tags, 0, 2+len(job.Params)),
-						CreatedAt: nostr.Now(),
-					}
-
-					for _, input := range c.StringSlice("input") {
-						evt.Tags = append(evt.Tags, nostr.Tag{"i", input, job.InputType})
-					}
-					for _, paramN := range job.Params {
-						for _, paramV := range c.StringSlice(paramN) {
-							tag := nostr.Tag{"param", paramN, "", ""}[0:2]
-							for _, v := range strings.Split(paramV, ";") {
-								tag = append(tag, v)
-							}
-							evt.Tags = append(evt.Tags, tag)
-						}
-					}
-
-					kr, _, err := gatherKeyerFromArguments(ctx, c)
-					if err != nil {
-						return err
-					}
-					if err := kr.SignEvent(ctx, &evt); err != nil {
-						return err
-					}
-
-					logverbose("%s", evt)
-
-					log("- publishing job request... ")
-					first := true
-					for res := range sys.Pool.PublishMany(ctx, relayUrls, evt) {
-						cleanUrl, ok := strings.CutPrefix(res.RelayURL, "wss://")
-						if !ok {
-							cleanUrl = res.RelayURL
-						}
-
-						if !first {
-							log(", ")
-						}
-						first = false
-
-						if res.Error != nil {
-							log("%s: %s", color.RedString(cleanUrl), res.Error)
-						} else {
-							log("%s: ok", color.GreenString(cleanUrl))
-						}
-					}
-
-					log("\n- waiting for response...\n")
-					for ie := range sys.Pool.SubscribeMany(ctx, relayUrls, nostr.Filter{
-						Kinds: []int{7000, job.OutputKind},
-						Tags:  nostr.TagMap{"e": []string{evt.ID}},
-					}) {
-						stdout(ie.Event)
-					}
-
-					return nil
-				},
-			}
-		}
-		return commands
-	})()...),
-}

encode.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fiatjaf/cli/v3"
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/urfave/cli/v3"
 )
 
 var encode = &cli.Command{
@@ -19,11 +19,11 @@ var encode = &cli.Command{
 		nak encode nevent <event-id>
 		nak encode nevent --author <pubkey-hex> --relay <relay-url> --relay <other-relay> <event-id>
 		nak encode nsec <privkey-hex>`,
-	Before: func(ctx context.Context, c *cli.Command) (context.Context, error) {
+	Before: func(ctx context.Context, c *cli.Command) error {
 		if c.Args().Len() < 1 {
-			return ctx, fmt.Errorf("expected more than 1 argument.")
+			return fmt.Errorf("expected more than 1 argument.")
 		}
-		return ctx, nil
+		return nil
 	},
 	DisableSliceFlagSeparator: true,
 	Commands: []*cli.Command{
@@ -153,7 +153,7 @@ var encode = &cli.Command{
 		},
 		{
 			Name:  "naddr",
-			Usage: "generate codes for addressable events",
+			Usage: "generate codes for NIP-33 parameterized replaceable events",
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "identifier",
@@ -189,7 +189,7 @@ var encode = &cli.Command{
 
 					kind := c.Int("kind")
 					if kind < 30000 || kind >= 40000 {
-						return fmt.Errorf("kind must be between 30000 and 39999, got %d", kind)
+						return fmt.Errorf("kind must be between 30000 and 39999, as per NIP-16, got %d", kind)
 					}
 
 					if d == "" {
@@ -212,6 +212,28 @@ var encode = &cli.Command{
 					}
 				}
 
+				exitIfLineProcessingError(ctx)
+				return nil
+			},
+		},
+		{
+			Name:                      "note",
+			Usage:                     "generate note1 event codes (not recommended)",
+			DisableSliceFlagSeparator: true,
+			Action: func(ctx context.Context, c *cli.Command) error {
+				for target := range getStdinLinesOrArguments(c.Args()) {
+					if ok := nostr.IsValid32ByteHex(target); !ok {
+						ctx = lineProcessingError(ctx, "invalid event id: %s", target)
+						continue
+					}
+
+					if note, err := nip19.EncodeNote(target); err == nil {
+						stdout(note)
+					} else {
+						return err
+					}
+				}
+
 				exitIfLineProcessingError(ctx)
 				return nil
 			},

encrypt_decrypt.go

@@ -1,140 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/urfave/cli/v3"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip04"
-)
-
-var encrypt = &cli.Command{
-	Name:                      "encrypt",
-	Usage:                     "encrypts a string with nip44 (or nip04 if specified using a flag) and returns the resulting ciphertext as base64",
-	ArgsUsage:                 "[plaintext string]",
-	DisableSliceFlagSeparator: true,
-	Flags: append(
-		defaultKeyFlags,
-		&cli.StringFlag{
-			Name:     "recipient-pubkey",
-			Aliases:  []string{"p", "tgt", "target", "pubkey"},
-			Required: true,
-		},
-		&cli.BoolFlag{
-			Name:  "nip04",
-			Usage: "use nip04 encryption instead of nip44",
-		},
-	),
-	Action: func(ctx context.Context, c *cli.Command) error {
-		target := c.String("recipient-pubkey")
-		if !nostr.IsValidPublicKey(target) {
-			return fmt.Errorf("target %s is not a valid public key", target)
-		}
-
-		plaintext := c.Args().First()
-
-		if c.Bool("nip04") {
-			sec, bunker, err := gatherSecretKeyOrBunkerFromArguments(ctx, c)
-			if err != nil {
-				return err
-			}
-
-			if bunker != nil {
-				ciphertext, err := bunker.NIP04Encrypt(ctx, target, plaintext)
-				if err != nil {
-					return err
-				}
-				stdout(ciphertext)
-			} else {
-				ss, err := nip04.ComputeSharedSecret(target, sec)
-				if err != nil {
-					return fmt.Errorf("failed to compute nip04 shared secret: %w", err)
-				}
-				ciphertext, err := nip04.Encrypt(plaintext, ss)
-				if err != nil {
-					return fmt.Errorf("failed to encrypt as nip04: %w", err)
-				}
-				stdout(ciphertext)
-			}
-		} else {
-			kr, _, err := gatherKeyerFromArguments(ctx, c)
-			if err != nil {
-				return err
-			}
-
-			res, err := kr.Encrypt(ctx, plaintext, target)
-			if err != nil {
-				return fmt.Errorf("failed to encrypt: %w", err)
-			}
-			stdout(res)
-		}
-
-		return nil
-	},
-}
-
-var decrypt = &cli.Command{
-	Name:                      "decrypt",
-	Usage:                     "decrypts a base64 nip44 ciphertext (or nip04 if specified using a flag) and returns the resulting plaintext",
-	ArgsUsage:                 "[ciphertext base64]",
-	DisableSliceFlagSeparator: true,
-	Flags: append(
-		defaultKeyFlags,
-		&cli.StringFlag{
-			Name:     "sender-pubkey",
-			Aliases:  []string{"p", "src", "source", "pubkey"},
-			Required: true,
-		},
-		&cli.BoolFlag{
-			Name:  "nip04",
-			Usage: "use nip04 encryption instead of nip44",
-		},
-	),
-	Action: func(ctx context.Context, c *cli.Command) error {
-		source := c.String("sender-pubkey")
-		if !nostr.IsValidPublicKey(source) {
-			return fmt.Errorf("source %s is not a valid public key", source)
-		}
-
-		ciphertext := c.Args().First()
-
-		if c.Bool("nip04") {
-			sec, bunker, err := gatherSecretKeyOrBunkerFromArguments(ctx, c)
-			if err != nil {
-				return err
-			}
-
-			if bunker != nil {
-				plaintext, err := bunker.NIP04Decrypt(ctx, source, ciphertext)
-				if err != nil {
-					return err
-				}
-				stdout(plaintext)
-			} else {
-				ss, err := nip04.ComputeSharedSecret(source, sec)
-				if err != nil {
-					return fmt.Errorf("failed to compute nip04 shared secret: %w", err)
-				}
-				plaintext, err := nip04.Decrypt(ciphertext, ss)
-				if err != nil {
-					return fmt.Errorf("failed to encrypt as nip04: %w", err)
-				}
-				stdout(plaintext)
-			}
-		} else {
-			kr, _, err := gatherKeyerFromArguments(ctx, c)
-			if err != nil {
-				return err
-			}
-
-			res, err := kr.Decrypt(ctx, ciphertext, source)
-			if err != nil {
-				return fmt.Errorf("failed to encrypt: %w", err)
-			}
-			stdout(res)
-		}
-
-		return nil
-	},
-}

event.go

@@ -2,24 +2,20 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"os"
-	"slices"
 	"strings"
 	"time"
 
+	"github.com/fiatjaf/cli/v3"
 	"github.com/mailru/easyjson"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip13"
 	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/urfave/cli/v3"
+	"golang.org/x/exp/slices"
 )
 
-const (
+const CATEGORY_EVENT_FIELDS = "EVENT FIELDS"
-	CATEGORY_EVENT_FIELDS = "EVENT FIELDS"
-	CATEGORY_SIGNER       = "SIGNER OPTIONS"
-	CATEGORY_EXTRAS       = "EXTRAS"
-)
 
 var event = &cli.Command{
 	Name:  "event",
@@ -36,7 +32,26 @@ example:
 		echo '{"id":"a889df6a387419ff204305f4c2d296ee328c3cd4f8b62f205648a541b4554dfb","pubkey":"c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5","created_at":1698623783,"kind":1,"tags":[],"content":"hello from the nostr army knife","sig":"84876e1ee3e726da84e5d195eb79358b2b3eaa4d9bd38456fde3e8a2af3f1cd4cda23f23fda454869975b3688797d4c66e12f4c51c1b43c6d2997c5e61865661"}' | nak event wss://offchain.pub
 		echo '{"tags": [["t", "spam"]]}' | nak event -c 'this is spam'`,
 	DisableSliceFlagSeparator: true,
-	Flags: append(defaultKeyFlags,
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:        "sec",
+			Usage:       "secret key to sign the event, as nsec, ncryptsec or hex",
+			DefaultText: "the key '1'",
+			Value:       "0000000000000000000000000000000000000000000000000000000000000001",
+		},
+		&cli.BoolFlag{
+			Name:  "prompt-sec",
+			Usage: "prompt the user to paste a hex or nsec with which to sign the event",
+		},
+		&cli.StringFlag{
+			Name:  "connect",
+			Usage: "sign event using NIP-46, expects a bunker://... URL",
+		},
+		&cli.StringFlag{
+			Name:        "connect-as",
+			Usage:       "private key to when communicating with the bunker given on --connect",
+			DefaultText: "a random key",
+		},
 		// ~ these args are only for the convoluted musig2 signing process
 		// they will be generally copy-shared-pasted across some manual coordination method between participants
 		&cli.UintFlag{
@@ -44,7 +59,6 @@ example:
 			Usage:       "number of signers to use for musig2",
 			Value:       1,
 			DefaultText: "1 -- i.e. do not use musig2 at all",
-			Category:    CATEGORY_SIGNER,
 		},
 		&cli.StringSliceFlag{
 			Name:   "musig-pubkey",
@@ -63,25 +77,17 @@ example:
 			Hidden: true,
 		},
 		// ~~~
-		&cli.UintFlag{
-			Name:     "pow",
-			Usage:    "nip13 difficulty to target when doing hash work on the event id",
-			Category: CATEGORY_EXTRAS,
-		},
 		&cli.BoolFlag{
 			Name:  "envelope",
 			Usage: "print the event enveloped in a [\"EVENT\", ...] message ready to be sent to a relay",
-			Category: CATEGORY_EXTRAS,
 		},
 		&cli.BoolFlag{
 			Name:  "auth",
-			Usage:    "always perform nip42 \"AUTH\" when facing an \"auth-required: \" rejection and try again",
+			Usage: "always perform NIP-42 \"AUTH\" when facing an \"auth-required: \" rejection and try again",
-			Category: CATEGORY_EXTRAS,
 		},
 		&cli.BoolFlag{
 			Name:  "nevent",
 			Usage: "print the nevent code (to stderr) after the event is published",
-			Category: CATEGORY_EXTRAS,
 		},
 		&cli.UintFlag{
 			Name:        "kind",
@@ -94,7 +100,7 @@ example:
 		&cli.StringFlag{
 			Name:        "content",
 			Aliases:     []string{"c"},
-			Usage:       "event content (if it starts with an '@' will read from a file)",
+			Usage:       "event content",
 			DefaultText: "hello from the nostr army knife",
 			Value:       "",
 			Category:    CATEGORY_EVENT_FIELDS,
@@ -102,7 +108,7 @@ example:
 		&cli.StringSliceFlag{
 			Name:     "tag",
 			Aliases:  []string{"t"},
-			Usage:    "sets a tag field on the event, takes a value like -t e=<id> or -t sometag=\"value one;value two;value three\"",
+			Usage:    "sets a tag field on the event, takes a value like -t e=<id>",
 			Category: CATEGORY_EVENT_FIELDS,
 		},
 		&cli.StringSliceFlag{
@@ -128,45 +134,47 @@ example:
 			Value:       nostr.Now(),
 			Category:    CATEGORY_EVENT_FIELDS,
 		},
-	),
+	},
 	ArgsUsage: "[relay...]",
 	Action: func(ctx context.Context, c *cli.Command) error {
 		// try to connect to the relays here
 		var relays []*nostr.Relay
 		if relayUrls := c.Args().Slice(); len(relayUrls) > 0 {
-			relays = connectToAllRelays(ctx, relayUrls, false)
+			_, relays = connectToAllRelays(ctx, relayUrls, false)
 			if len(relays) == 0 {
 				log("failed to connect to any of the given relays.\n")
 				os.Exit(3)
 			}
 		}
+
 		defer func() {
 			for _, relay := range relays {
 				relay.Close()
 			}
 		}()
 
-		kr, sec, err := gatherKeyerFromArguments(ctx, c)
+		sec, bunker, err := gatherSecretKeyOrBunkerFromArguments(ctx, c)
 		if err != nil {
 			return err
 		}
 
 		doAuth := c.Bool("auth")
 
-		// then process input and generate events:
+		// then process input and generate events
+		for stdinEvent := range getStdinLinesOrBlank() {
+			evt := nostr.Event{
+				Tags: make(nostr.Tags, 0, 3),
+			}
 
-		// will reuse this
+			kindWasSupplied := false
-		var evt nostr.Event
-
-		// this is called when we have a valid json from stdin
-		handleEvent := func(stdinEvent string) error {
-			evt.Content = ""
-
-			kindWasSupplied := strings.Contains(stdinEvent, `"kind"`)
 			mustRehashAndResign := false
 
+			if stdinEvent != "" {
 				if err := easyjson.Unmarshal([]byte(stdinEvent), &evt); err != nil {
-				return fmt.Errorf("invalid event received from stdin: %s", err)
+					ctx = lineProcessingError(ctx, "invalid event received from stdin: %s", err)
+					continue
+				}
+				kindWasSupplied = strings.Contains(stdinEvent, `"kind"`)
 			}
 
 			if kind := c.Uint("kind"); slices.Contains(c.FlagNames(), "kind") {
@@ -177,26 +185,16 @@ example:
 				mustRehashAndResign = true
 			}
 
-			if c.IsSet("content") {
+			if content := c.String("content"); content != "" {
-				content := c.String("content")
-				if strings.HasPrefix(content, "@") {
-					filedata, err := os.ReadFile(content[1:])
-					if err != nil {
-						return fmt.Errorf("failed to read file '%s' for content: %w", content[1:], err)
-					}
-					evt.Content = string(filedata)
-				} else {
 				evt.Content = content
-				}
 				mustRehashAndResign = true
 			} else if evt.Content == "" && evt.Kind == 1 {
 				evt.Content = "hello from the nostr army knife"
 				mustRehashAndResign = true
 			}
 
-			tagFlags := c.StringSlice("tag")
+			tags := make(nostr.Tags, 0, 5)
-			tags := make(nostr.Tags, 0, len(tagFlags)+2)
+			for _, tagFlag := range c.StringSlice("tag") {
-			for _, tagFlag := range tagFlags {
 				// tags are in the format key=value
 				tagName, tagValue, found := strings.Cut(tagFlag, "=")
 				tag := []string{tagName}
@@ -205,17 +203,20 @@ example:
 					tagValues := strings.Split(tagValue, ";")
 					tag = append(tag, tagValues...)
 				}
-				tags = append(tags, tag)
+				tags = tags.AppendUnique(tag)
 			}
 
 			for _, etag := range c.StringSlice("e") {
 				tags = tags.AppendUnique([]string{"e", etag})
+				mustRehashAndResign = true
 			}
 			for _, ptag := range c.StringSlice("p") {
 				tags = tags.AppendUnique([]string{"p", ptag})
+				mustRehashAndResign = true
 			}
 			for _, dtag := range c.StringSlice("d") {
 				tags = tags.AppendUnique([]string{"d", dtag})
+				mustRehashAndResign = true
 			}
 			if len(tags) > 0 {
 				for _, tag := range tags {
@@ -232,35 +233,12 @@ example:
 				mustRehashAndResign = true
 			}
 
-			if c.IsSet("musig") || c.IsSet("sec") || c.IsSet("prompt-sec") {
-				mustRehashAndResign = true
-			}
-
-			if difficulty := c.Uint("pow"); difficulty > 0 {
-				// before doing pow we need the pubkey
-				if numSigners := c.Uint("musig"); numSigners > 1 {
-					pubkeys := c.StringSlice("musig-pubkey")
-					if int(numSigners) != len(pubkeys) {
-						return fmt.Errorf("when doing a pow with musig we must know all signer pubkeys upfront")
-					}
-					evt.PubKey, err = getMusigAggregatedKey(ctx, pubkeys)
-					if err != nil {
-						return err
-					}
-				} else {
-					evt.PubKey, _ = kr.GetPublicKey(ctx)
-				}
-
-				// try to generate work with this difficulty -- runs forever
-				nonceTag, _ := nip13.DoWork(ctx, evt, int(difficulty))
-				evt.Tags = append(evt.Tags, nonceTag)
-
-				mustRehashAndResign = true
-			}
-
 			if evt.Sig == "" || mustRehashAndResign {
-				if numSigners := c.Uint("musig"); numSigners > 1 {
+				if bunker != nil {
-					// must do musig
+					if err := bunker.SignEvent(ctx, &evt); err != nil {
+						return fmt.Errorf("failed to sign with bunker: %w", err)
+					}
+				} else if numSigners := c.Uint("musig"); numSigners > 1 && sec != "" {
 					pubkeys := c.StringSlice("musig-pubkey")
 					secNonce := c.String("musig-nonce-secret")
 					pubNonces := c.StringSlice("musig-nonce")
@@ -275,7 +253,7 @@ example:
 						// instructions for what to do should have been printed by the performMusig() function
 						return nil
 					}
-				} else if err := kr.SignEvent(ctx, &evt); err != nil {
+				} else if err := evt.Sign(sec); err != nil {
 					return fmt.Errorf("error signing with provided key: %w", err)
 				}
 			}
@@ -310,12 +288,23 @@ example:
 					}
 
 					// error publishing
-					if strings.HasPrefix(err.Error(), "msg: auth-required:") && kr != nil && doAuth {
+					if strings.HasPrefix(err.Error(), "msg: auth-required:") && (sec != "" || bunker != nil) && doAuth {
 						// if the relay is requesting auth and we can auth, let's do it
-						pk, _ := kr.GetPublicKey(ctx)
+						var pk string
+						if bunker != nil {
+							pk, err = bunker.GetPublicKey(ctx)
+							if err != nil {
+								return fmt.Errorf("failed to get public key from bunker: %w", err)
+							}
+						} else {
+							pk, _ = nostr.GetPublicKey(sec)
+						}
 						log("performing auth as %s... ", pk)
-						if err := relay.Auth(ctx, func(authEvent *nostr.Event) error {
+						if err := relay.Auth(ctx, func(evt *nostr.Event) error {
-							return kr.SignEvent(ctx, authEvent)
+							if bunker != nil {
+								return bunker.SignEvent(ctx, evt)
+							}
+							return evt.Sign(sec)
 						}); err == nil {
 							// try to publish again, but this time don't try to auth again
 							doAuth = false
@@ -331,14 +320,6 @@ example:
 					log(nevent + "\n")
 				}
 			}
-
-			return nil
-		}
-
-		for stdinEvent := range getJsonsOrBlank() {
-			if err := handleEvent(stdinEvent); err != nil {
-				ctx = lineProcessingError(ctx, err.Error())
-			}
 		}
 
 		exitIfLineProcessingError(ctx)

example_test.go

@@ -67,20 +67,6 @@ func ExampleDecode() {
 	// }
 }
 
-func ExampleDecodePubkey() {
-	app.Run(ctx, []string{"nak", "decode", "-p", "npub10xlxvlhemja6c4dqv22uapctqupfhlxm9h8z3k2e72q4k9hcz7vqpkge6d", "npub1ccz8l9zpa47k6vz9gphftsrumpw80rjt3nhnefat4symjhrsnmjs38mnyd"})
-	// Output:
-	// 79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798
-	// c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5
-}
-
-func ExampleDecodeEventId() {
-	app.Run(ctx, []string{"nak", "decode", "-e", "nevent1qyd8wumn8ghj7urewfsk66ty9enxjct5dfskvtnrdakj7qgmwaehxw309aex2mrp0yh8wetnw3jhymnzw33jucm0d5hszxthwden5te0wfjkccte9eekummjwsh8xmmrd9skctcpzamhxue69uhkzarvv9ejumn0wd68ytnvv9hxgtcqyqllp5v5j0nxr74fptqxkhvfv0h3uj870qpk3ln8a58agyxl3fka296ewr8", "nevent1qqswh48lurxs8u0pll9qj2rzctvjncwhstpzlstq59rdtzlty79awns5hl5uf"})
-	// Output:
-	// 3ff0d19493e661faa90ac06b5d8963ef1e48fe780368fe67ed0fd410df8a6dd5
-	// ebd4ffe0cd03f1e1ffca092862c2d929e1d782c22fc160a146d58beb278bd74e
-}
-
 func ExampleReq() {
 	app.Run(ctx, []string{"nak", "req", "-k", "1", "-l", "18", "-a", "2fa2104d6b38d11b0230010559879124e42ab8dfeff5ff29dc9cdadd4ecacc3f", "-e", "aec4de6d051a7c2b6ca2d087903d42051a31e07fb742f1240970084822de10a6"})
 	// Output:
@@ -130,9 +116,3 @@ func ExampleReqWithFlagsAfter3() {
 	// Output:
 	// {"kind":1,"id":"101572c80ebdc963dab8440f6307387a3023b6d90f7e495d6c5ee1ef77045a67","pubkey":"3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24","created_at":1720987305,"tags":[["e","ceacdc29fa7a0b51640b30d2424e188215460617db5ba5bb52d3fbf0094eebb3","","root"],["e","9f3c1121c96edf17d84b9194f74d66d012b28c4e25b3ef190582c76b8546a188","","reply"],["p","3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24"],["p","6b96c3eb36c6cd457d906bbaafe7b36cacfb8bcc4ab235be6eab3b71c6669251"]],"content":"Nope. I grew up playing in the woods. Never once saw a bear in the woods. If I did, I'd probably shiy my pants, then scream at it like I was a crazy person with my arms above my head to make me seem huge.","sig":"b098820b4a5635865cada9f9a5813be2bc6dd7180e16e590cf30e07916d8ed6ed98ab38b64f3bfba12d88d37335f229f7ef8c084bc48132e936c664a54d3e650"}
 }
-
-func ExampleNaturalTimestamps() {
-	app.Run(ctx, []string{"nak", "event", "-t", "plu=pla", "-e", "3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24", "--ts", "May 19 2018 03:37:19", "-c", "nn"})
-	// Output:
-	// {"kind":0,"id":"b10da0095f96aa2accd99fa3d93bf29a76f51d2594cf5a0a52f8e961aecd0b67","pubkey":"79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798","created_at":1526711839,"tags":[["plu","pla"],["e","3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24"]],"content":"nn","sig":"988442c97064a041ba5e2bfbd64e84d3f819b2169e865511d9d53e74667949ff165325942acaa2ca233c8b529adedf12cf44088cf04081b56d098c5f4d52dd8f"}
-}

fetch.go

@@ -2,33 +2,33 @@ package main
 
 import (
 	"context"
-	"fmt"
 
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip05"
 	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/nbd-wtf/go-nostr/sdk/hints"
+	sdk "github.com/nbd-wtf/nostr-sdk"
 )
 
 var fetch = &cli.Command{
 	Name:  "fetch",
-	Usage: "fetches events related to the given nip19 or nip05 code from the included relay hints or the author's outbox relays.",
+	Usage: "fetches events related to the given nip19 code from the included relay hints or the author's NIP-65 relays.",
 	Description: `example usage:
         nak fetch nevent1qqsxrwm0hd3s3fddh4jc2574z3xzufq6qwuyz2rvv3n087zvym3dpaqprpmhxue69uhhqatzd35kxtnjv4kxz7tfdenju6t0xpnej4
         echo npub1h8spmtw9m2huyv6v2j2qd5zv956z2zdugl6mgx02f2upffwpm3nqv0j4ps | nak fetch --relay wss://relay.nostr.band`,
 	DisableSliceFlagSeparator: true,
-	Flags: append(reqFilterFlags,
+	Flags: []cli.Flag{
 		&cli.StringSliceFlag{
 			Name:    "relay",
 			Aliases: []string{"r"},
 			Usage:   "also use these relays to fetch from",
 		},
-	),
+	},
-	ArgsUsage: "[nip05_or_nip19_code]",
+	ArgsUsage: "[nip19code]",
 	Action: func(ctx context.Context, c *cli.Command) error {
+		pool := nostr.NewSimplePool(ctx)
+
 		defer func() {
-			sys.Pool.Relays.Range(func(_ string, relay *nostr.Relay) bool {
+			pool.Relays.Range(func(_ string, relay *nostr.Relay) bool {
 				relay.Close()
 				return true
 			})
@@ -36,28 +36,18 @@ var fetch = &cli.Command{
 
 		for code := range getStdinLinesOrArguments(c.Args()) {
 			filter := nostr.Filter{}
-			var authorHint string
-			relays := c.StringSlice("relay")
 
-			if nip05.IsValidIdentifier(code) {
-				pp, err := nip05.QueryIdentifier(ctx, code)
-				if err != nil {
-					ctx = lineProcessingError(ctx, "failed to fetch nip05: %s", err)
-					continue
-				}
-				authorHint = pp.PublicKey
-				relays = append(relays, pp.Relays...)
-				filter.Authors = append(filter.Authors, pp.PublicKey)
-			} else {
 			prefix, value, err := nip19.Decode(code)
 			if err != nil {
 				ctx = lineProcessingError(ctx, "failed to decode: %s", err)
 				continue
 			}
 
+			relays := c.StringSlice("relay")
 			if err := normalizeAndValidateRelayURLs(relays); err != nil {
 				return err
 			}
+			var authorHint string
 
 			switch prefix {
 			case "nevent":
@@ -67,45 +57,35 @@ var fetch = &cli.Command{
 					authorHint = v.Author
 				}
 				relays = append(relays, v.Relays...)
-				case "note":
-					filter.IDs = append(filter.IDs, value.(string))
 			case "naddr":
 				v := value.(nostr.EntityPointer)
-					filter.Kinds = []int{v.Kind}
 				filter.Tags = nostr.TagMap{"d": []string{v.Identifier}}
+				filter.Kinds = append(filter.Kinds, v.Kind)
 				filter.Authors = append(filter.Authors, v.PublicKey)
 				authorHint = v.PublicKey
 				relays = append(relays, v.Relays...)
 			case "nprofile":
 				v := value.(nostr.ProfilePointer)
 				filter.Authors = append(filter.Authors, v.PublicKey)
+				filter.Kinds = append(filter.Kinds, 0)
 				authorHint = v.PublicKey
 				relays = append(relays, v.Relays...)
 			case "npub":
 				v := value.(string)
 				filter.Authors = append(filter.Authors, v)
+				filter.Kinds = append(filter.Kinds, 0)
 				authorHint = v
-				default:
-					return fmt.Errorf("unexpected prefix %s", prefix)
-				}
 			}
 
 			if authorHint != "" {
-				for _, url := range relays {
+				relayList := sdk.FetchRelaysForPubkey(ctx, pool, authorHint,
-					sys.Hints.Save(authorHint, nostr.NormalizeURL(url), hints.LastInHint, nostr.Now())
+					"wss://purplepag.es", "wss://relay.damus.io", "wss://relay.noswhere.com",
-				}
+					"wss://nos.lol", "wss://public.relaying.io", "wss://relay.nostr.band")
-
+				for _, relayListItem := range relayList {
-				for _, url := range sys.FetchOutboxRelays(ctx, authorHint, 3) {
+					if relayListItem.Outbox {
-					relays = append(relays, url)
+						relays = append(relays, relayListItem.URL)
 					}
 				}
-
-			if err := applyFlagsToFilter(c, &filter); err != nil {
-				return err
-			}
-
-			if len(filter.Authors) > 0 && len(filter.Kinds) == 0 {
-				filter.Kinds = append(filter.Kinds, 0)
 			}
 
 			if len(relays) == 0 {
@@ -113,7 +93,7 @@ var fetch = &cli.Command{
 				continue
 			}
 
-			for ie := range sys.Pool.FetchMany(ctx, relays, filter) {
+			for ie := range pool.SubManyEose(ctx, relays, nostr.Filters{filter}) {
 				stdout(ie.Event)
 			}
 		}

flags.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 	"github.com/markusmobius/go-dateparser"
 	"github.com/nbd-wtf/go-nostr"
 )

fs.go

@@ -1,89 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"os/signal"
-	"syscall"
-	"time"
-
-	"github.com/fatih/color"
-	"github.com/fiatjaf/nak/nostrfs"
-	"github.com/hanwen/go-fuse/v2/fs"
-	"github.com/hanwen/go-fuse/v2/fuse"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/keyer"
-	"github.com/urfave/cli/v3"
-)
-
-var fsCmd = &cli.Command{
-	Name:        "fs",
-	Usage:       "mount a FUSE filesystem that exposes Nostr events as files.",
-	Description: `(experimental)`,
-	ArgsUsage:   "<mountpoint>",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "pubkey",
-			Usage: "public key from where to to prepopulate directories",
-			Validator: func(pk string) error {
-				if nostr.IsValidPublicKey(pk) {
-					return nil
-				}
-				return fmt.Errorf("invalid public key '%s'", pk)
-			},
-		},
-	},
-	DisableSliceFlagSeparator: true,
-	Action: func(ctx context.Context, c *cli.Command) error {
-		mountpoint := c.Args().First()
-		if mountpoint == "" {
-			return fmt.Errorf("must be called with a directory path to serve as the mountpoint as an argument")
-		}
-
-		root := nostrfs.NewNostrRoot(
-			ctx,
-			sys,
-			keyer.NewReadOnlyUser(c.String("pubkey")),
-			mountpoint,
-		)
-
-		// create the server
-		log("- mounting at %s... ", color.HiCyanString(mountpoint))
-		timeout := time.Second * 120
-		server, err := fs.Mount(mountpoint, root, &fs.Options{
-			MountOptions: fuse.MountOptions{
-				Debug:  isVerbose,
-				Name:   "nak",
-				FsName: "nak",
-			},
-			AttrTimeout:  &timeout,
-			EntryTimeout: &timeout,
-			Logger:       nostr.DebugLogger,
-		})
-		if err != nil {
-			return fmt.Errorf("mount failed: %w", err)
-		}
-		log("ok\n")
-
-		// setup signal handling for clean unmount
-		ch := make(chan os.Signal, 1)
-		chErr := make(chan error)
-		signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
-		go func() {
-			<-ch
-			log("- unmounting... ")
-			err := server.Unmount()
-			if err != nil {
-				chErr <- fmt.Errorf("unmount failed: %w", err)
-			} else {
-				log("ok\n")
-				chErr <- nil
-			}
-		}()
-
-		// serve the filesystem until unmounted
-		server.Wait()
-		return <-chErr
-	},
-}

go.mod

@@ -1,78 +1,56 @@
 module github.com/fiatjaf/nak
 
-go 1.23.3
+go 1.22
 
-toolchain go1.23.4
+toolchain go1.22.4
 
 require (
-	github.com/bep/debounce v1.2.1
+	github.com/btcsuite/btcd/btcec/v2 v2.3.3
-	github.com/btcsuite/btcd/btcec/v2 v2.3.4
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
 	github.com/fatih/color v1.16.0
-	github.com/fiatjaf/eventstore v0.15.0
+	github.com/fiatjaf/cli/v3 v3.0.0-20240723181502-e7dd498b16ae
-	github.com/fiatjaf/khatru v0.16.0
+	github.com/fiatjaf/eventstore v0.7.1
-	github.com/hanwen/go-fuse/v2 v2.7.2
+	github.com/fiatjaf/khatru v0.7.5
-	github.com/json-iterator/go v1.1.12
+	github.com/mailru/easyjson v0.7.7
-	github.com/mailru/easyjson v0.9.0
-	github.com/mark3labs/mcp-go v0.8.3
 	github.com/markusmobius/go-dateparser v1.2.3
-	github.com/nbd-wtf/go-nostr v0.51.0
+	github.com/nbd-wtf/go-nostr v0.34.5
-	github.com/urfave/cli/v3 v3.0.0-beta1
+	github.com/nbd-wtf/nostr-sdk v0.0.5
-	golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac
+	golang.org/x/exp v0.0.0-20240707233637-46b078467d37
 )
 
 require (
-	fiatjaf.com/lib v0.2.0 // indirect
+	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/ImVexed/fasturl v0.0.0-20230304231329-4e41488060f3 // indirect
+	github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
-	github.com/andybalholm/brotli v1.1.1 // indirect
-	github.com/btcsuite/btcd v0.24.2 // indirect
-	github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
-	github.com/bytedance/sonic v1.13.1 // indirect
-	github.com/bytedance/sonic/loader v0.2.4 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chzyer/logex v1.1.10 // indirect
 	github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
-	github.com/cloudwego/base64x v0.1.5 // indirect
+	github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
-	github.com/coder/websocket v1.8.12 // indirect
-	github.com/decred/dcrd/crypto/blake256 v1.1.0 // indirect
-	github.com/dgraph-io/ristretto v1.0.0 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/elliotchance/pie/v2 v2.7.0 // indirect
-	github.com/elnosh/gonuts v0.3.1-0.20250123162555-7c0381a585e3 // indirect
+	github.com/fasthttp/websocket v1.5.7 // indirect
-	github.com/fasthttp/websocket v1.5.12 // indirect
+	github.com/gobwas/httphead v0.1.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/gobwas/ws v1.4.0 // indirect
-	github.com/graph-gophers/dataloader/v7 v7.1.0 // indirect
 	github.com/hablullah/go-hijri v1.0.2 // indirect
 	github.com/hablullah/go-juliandays v1.0.0 // indirect
 	github.com/jalaali/go-jalaali v0.0.0-20210801064154-80525e88d958 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/compress v1.17.8 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
-	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/magefile/mage v1.14.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.1.0 // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/rs/cors v1.7.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.5.0 // indirect
+	github.com/tetratelabs/wazero v1.2.1 // indirect
-	github.com/rs/cors v1.11.1 // indirect
+	github.com/tidwall/gjson v1.17.1 // indirect
-	github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38 // indirect
-	github.com/tetratelabs/wazero v1.8.0 // indirect
-	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasthttp v1.58.0 // indirect
+	github.com/valyala/fasthttp v1.51.0 // indirect
 	github.com/wasilibs/go-re2 v1.3.0 // indirect
-	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/arch v0.15.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
 )

go.sum

@@ -1,25 +1,17 @@
-fiatjaf.com/lib v0.2.0 h1:TgIJESbbND6GjOgGHxF5jsO6EMjuAxIzZHPo5DXYexs=
-fiatjaf.com/lib v0.2.0/go.mod h1:Ycqq3+mJ9jAWu7XjbQI1cVr+OFgnHn79dQR5oTII47g=
-github.com/ImVexed/fasturl v0.0.0-20230304231329-4e41488060f3 h1:ClzzXMDDuUbWfNNZqGeYq4PnYOlwlOVIvSyNaIy0ykg=
-github.com/ImVexed/fasturl v0.0.0-20230304231329-4e41488060f3/go.mod h1:we0YA5CsBbH5+/NUzC/AlMmxaDtWlXeNsqrwXjTzmzA=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
-github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
+github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
-github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
+github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY=
-github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
-github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
+github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
-github.com/btcsuite/btcd v0.24.2 h1:aLmxPguqxza+4ag8R1I2nnJjSu2iFn/kqtHTIImswcY=
-github.com/btcsuite/btcd v0.24.2/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
 github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
-github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=
+github.com/btcsuite/btcd/btcec/v2 v2.3.3 h1:6+iXlDKE8RMtKsvK0gshlXIuPbyWM/h84Ensb7o3sC0=
-github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
+github.com/btcsuite/btcd/btcec/v2 v2.3.3/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
 github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
 github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
-github.com/btcsuite/btcd/btcutil v1.1.5 h1:+wER79R5670vs/ZusMTF1yTcRYE5GUsFbdjdisflzM8=
+github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ=
-github.com/btcsuite/btcd/btcutil v1.1.5/go.mod h1:PSZZ4UitpLBWzxGd5VGOrLnmOjtPP/a6HaFo12zMs00=
+github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ=
@@ -33,58 +25,43 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku
 github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
-github.com/bytedance/sonic v1.13.1 h1:Jyd5CIvdFnkOWuKXr+wm4Nyk2h0yAFsr8ucJgEasO3g=
-github.com/bytedance/sonic v1.13.1/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
-github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
-github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
-github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
-github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
-github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
-github.com/decred/dcrd/crypto/blake256 v1.1.0 h1:zPMNGQCm0g4QTY27fOCorQW7EryeQ/U0x++OzVrdms8=
+github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y=
-github.com/decred/dcrd/crypto/blake256 v1.1.0/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
+github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnNEcHYvcCuK6dPZSg=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
 github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
-github.com/dgraph-io/ristretto v1.0.0 h1:SYG07bONKMlFDUYu5pEu3DGAh8c2OFNzKm6G9J4Si84=
-github.com/dgraph-io/ristretto v1.0.0/go.mod h1:jTi2FiYEhQ1NsMmA7DeBykizjOuY88NhKBkepyu1jPc=
-github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
-github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw=
 github.com/elliotchance/pie/v2 v2.7.0 h1:FqoIKg4uj0G/CrLGuMS9ejnFKa92lxE1dEgBD3pShXg=
 github.com/elliotchance/pie/v2 v2.7.0/go.mod h1:18t0dgGFH006g4eVdDtWfgFZPQEgl10IoEO8YWEq3Og=
-github.com/elnosh/gonuts v0.3.1-0.20250123162555-7c0381a585e3 h1:k7evIqJ2BtFn191DgY/b03N2bMYA/iQwzr4f/uHYn20=
+github.com/fasthttp/websocket v1.5.7 h1:0a6o2OfeATvtGgoMKleURhLT6JqWPg7fYfWnH4KHau4=
-github.com/elnosh/gonuts v0.3.1-0.20250123162555-7c0381a585e3/go.mod h1:vgZomh4YQk7R3w4ltZc0sHwCmndfHkuX6V4sga/8oNs=
+github.com/fasthttp/websocket v1.5.7/go.mod h1:bC4fxSono9czeXHQUVKxsC0sNjbm7lPJR04GDFqClfU=
-github.com/fasthttp/websocket v1.5.12 h1:e4RGPpWW2HTbL3zV0Y/t7g0ub294LkiuXXUuTOUInlE=
-github.com/fasthttp/websocket v1.5.12/go.mod h1:I+liyL7/4moHojiOgUOIKEWm9EIxHqxZChS+aMFltyg=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
-github.com/fiatjaf/eventstore v0.15.0 h1:5UXe0+vIb30/cYcOWipks8nR3g+X8W224TFy5yPzivk=
+github.com/fiatjaf/cli/v3 v3.0.0-20240723181502-e7dd498b16ae h1:0B/1dU3YECIbPoBIRTQ4c0scZCNz9TVHtQpiODGrTTo=
-github.com/fiatjaf/eventstore v0.15.0/go.mod h1:KAsld5BhkmSck48aF11Txu8X+OGNmoabw4TlYVWqInc=
+github.com/fiatjaf/cli/v3 v3.0.0-20240723181502-e7dd498b16ae/go.mod h1:aAWPO4bixZZxPtOnH6K3q4GbQ0jftUNDW9Oa861IRew=
-github.com/fiatjaf/khatru v0.16.0 h1:xgGwnnOqE3989wEWm7c/z6Y6g4X92BFe/Xp1UWQ3Zmc=
+github.com/fiatjaf/eventstore v0.7.1 h1:5f2yvEtYvsvMBNttysmXhSSum5M1qwvPzjEQ/BFue7Q=
-github.com/fiatjaf/khatru v0.16.0/go.mod h1:TLcMgPy3IAPh40VGYq6m+gxEMpDKHj+sumqcuvbSogc=
+github.com/fiatjaf/eventstore v0.7.1/go.mod h1:ek/yWbanKVG767fK51Q3+6Mvi5oEHYSsdPym40nZexw=
+github.com/fiatjaf/khatru v0.7.5 h1:UFo+cdbqHDn1W4Q4h03y3vzh1BiU+6fLYK48oWU2K34=
+github.com/fiatjaf/khatru v0.7.5/go.mod h1:WVqij7X9Vr9UAMIwafQbKVFKxc42Np37vyficwUr/nQ=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
+github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
-github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
+github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
+github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
+github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
+github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -96,18 +73,10 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/graph-gophers/dataloader/v7 v7.1.0 h1:Wn8HGF/q7MNXcvfaBnLEPEFJttVHR8zuEqP1obys/oc=
-github.com/graph-gophers/dataloader/v7 v7.1.0/go.mod h1:1bKE0Dm6OUcTB/OAuYVOZctgIz7Q3d0XrYtlIzTgg6Q=
 github.com/hablullah/go-hijri v1.0.2 h1:drT/MZpSZJQXo7jftf5fthArShcaMtsal0Zf/dnmp6k=
 github.com/hablullah/go-hijri v1.0.2/go.mod h1:OS5qyYLDjORXzK4O1adFw9Q5WfhOcMdAKglDkcTxgWQ=
 github.com/hablullah/go-juliandays v1.0.0 h1:A8YM7wIj16SzlKT0SRJc9CD29iiaUzpBLzh5hr0/5p0=
 github.com/hablullah/go-juliandays v1.0.0/go.mod h1:0JOYq4oFOuDja+oospuc61YoX+uNEn7Z6uHYTbBzdGc=
-github.com/hanwen/go-fuse/v2 v2.7.2 h1:SbJP1sUP+n1UF8NXBA14BuojmTez+mDgOk0bC057HQw=
-github.com/hanwen/go-fuse/v2 v2.7.2/go.mod h1:ugNaD/iv5JYyS1Rcvi57Wz7/vrLQJo10mmketmoef48=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/jalaali/go-jalaali v0.0.0-20210801064154-80525e88d958 h1:qxLoi6CAcXVzjfvu+KXIXJOAsQB62LXjsfbOaErsVzE=
 github.com/jalaali/go-jalaali v0.0.0-20210801064154-80525e88d958/go.mod h1:Wqfu7mjUHj9WDzSSPI5KfBclTTEnLveRUFr/ujWnTgE=
@@ -116,23 +85,13 @@ github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJS
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
-github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
-github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
-github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo=
 github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
-github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mark3labs/mcp-go v0.8.3 h1:IzlyN8BaP4YwUMUDqxOGJhGdZXEDQiAPX43dNPgnzrg=
-github.com/mark3labs/mcp-go v0.8.3/go.mod h1:cjMlBU0cv/cj9kjlgmRhoJ5JREdS7YX83xeIG9Ko/jE=
 github.com/markusmobius/go-dateparser v1.2.3 h1:TvrsIvr5uk+3v6poDjaicnAFJ5IgtFHgLiuMY2Eb7Nw=
 github.com/markusmobius/go-dateparser v1.2.3/go.mod h1:cMwQRrBUQlK1UI5TIFHEcvpsMbkWrQLXuaPNMFzuYLk=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
@@ -140,15 +99,10 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
+github.com/nbd-wtf/go-nostr v0.34.5 h1:vti8WqvGWbVoWAPniaz7li2TpCyC+7ZS62Gmy7ib/z0=
-github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
+github.com/nbd-wtf/go-nostr v0.34.5/go.mod h1:NZQkxl96ggbO8rvDpVjcsojJqKTPwqhP4i82O7K5DJs=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/nbd-wtf/nostr-sdk v0.0.5 h1:rec+FcDizDVO0W25PX0lgYMXvP7zNNOgI3Fu9UCm4BY=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/nbd-wtf/nostr-sdk v0.0.5/go.mod h1:iJJsikesCGLNFZ9dLqhLPDzdt924EagUmdQxT3w2Lmk=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/nbd-wtf/go-nostr v0.51.0 h1:Z6gir3lQmlbQGYkccEPbvHlfCydMWXD6bIqukR4DZqU=
-github.com/nbd-wtf/go-nostr v0.51.0/go.mod h1:9PcGOZ+e1VOaLvcK0peT4dbip+/eS+eTWXR3HuexQrA=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -158,69 +112,50 @@ github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/puzpuzpuz/xsync/v3 v3.5.0 h1:i+cMcpEDY1BkNm7lPDkCtE4oElsYLn+EKF8kAu2vXT4=
+github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4=
-github.com/puzpuzpuz/xsync/v3 v3.5.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.1.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
-github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
+github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
-github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
-github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38 h1:D0vL7YNisV2yqE55+q0lFuGse6U8lxlg7fYTctlT5Gc=
+github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee h1:8Iv5m6xEo1NR1AvpV+7XmhI4r39LGNzwUL4YpMuL5vk=
-github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38/go.mod h1:sM7Mt7uEoCeFSCBM+qBrqvEo+/9vdmj19wzp3yzUhmg=
+github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee/go.mod h1:qwtSXrKuJh/zsFQ12yEE89xfCrGKK63Rr7ctU/uCo4g=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
-github.com/tetratelabs/wazero v1.8.0 h1:iEKu0d4c2Pd+QSRieYbnQC9yiFlMS9D+Jr0LsRmcF4g=
+github.com/tetratelabs/wazero v1.2.1 h1:J4X2hrGzJvt+wqltuvcSjHQ7ujQxA9gb6PeMs4qlUWs=
-github.com/tetratelabs/wazero v1.8.0/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
+github.com/tetratelabs/wazero v1.2.1/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ=
-github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
+github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=
-github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
 github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
-github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/urfave/cli/v3 v3.0.0-beta1 h1:6DTaaUarcM0wX7qj5Hcvs+5Dm3dyUTBbEwIWAjcw9Zg=
-github.com/urfave/cli/v3 v3.0.0-beta1/go.mod h1:FnIeEMYu+ko8zP1F9Ypr3xkZMIDqW3DR92yUtY39q1Y=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.58.0 h1:GGB2dWxSbEprU9j0iMJHgdKYJVDyjrOwF9RE59PbRuE=
+github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA=
-github.com/valyala/fasthttp v1.58.0/go.mod h1:SYXvHHaFp7QZHGKSHmoMipInhrI5StHrhDTYVEjK/Kw=
+github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g=
 github.com/wasilibs/go-re2 v1.3.0 h1:LFhBNzoStM3wMie6rN2slD1cuYH2CGiHpvNL3UtcsMw=
 github.com/wasilibs/go-re2 v1.3.0/go.mod h1:AafrCXVvGRJJOImMajgJ2M7rVmWyisVK7sFshbxnVrg=
 github.com/wasilibs/nottinygc v0.4.0 h1:h1TJMihMC4neN6Zq+WKpLxgd9xCFMw7O9ETLwY2exJQ=
 github.com/wasilibs/nottinygc v0.4.0/go.mod h1:oDcIotskuYNMpqMF23l7Z8uzD4TC0WXHK8jetlB3HIo=
-github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
-github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
-github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
-github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
-golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw=
-golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo7yrN4mVcnkHDYz5vvs=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w=
-golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -233,13 +168,13 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -258,4 +193,3 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=

helpers.go

@@ -3,121 +3,90 @@ package main
 import (
 	"bufio"
 	"context"
+	"encoding/hex"
 	"fmt"
-	"iter"
 	"math/rand"
-	"net/http"
-	"net/textproto"
 	"net/url"
 	"os"
-	"slices"
 	"strings"
 	"time"
 
+	"github.com/chzyer/readline"
 	"github.com/fatih/color"
-	jsoniter "github.com/json-iterator/go"
+	"github.com/fiatjaf/cli/v3"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/sdk"
+	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/urfave/cli/v3"
+	"github.com/nbd-wtf/go-nostr/nip46"
+	"github.com/nbd-wtf/go-nostr/nip49"
 )
 
-var sys *sdk.System
-
-var (
-	hintsFilePath   string
-	hintsFileExists bool
-)
-
-var json = jsoniter.ConfigFastest
-
 const (
 	LINE_PROCESSING_ERROR = iota
 )
 
-var (
+var log = func(msg string, args ...any) {
-	log        = func(msg string, args ...any) { fmt.Fprintf(color.Error, msg, args...) }
+	fmt.Fprintf(color.Error, msg, args...)
-	logverbose = func(msg string, args ...any) {} // by default do nothing
+}
-	stdout     = fmt.Println
+
-)
+var stdout = fmt.Println
 
 func isPiped() bool {
 	stat, _ := os.Stdin.Stat()
 	return stat.Mode()&os.ModeCharDevice == 0
 }
 
-func getJsonsOrBlank() iter.Seq[string] {
+func getStdinLinesOrBlank() chan string {
-	var curr strings.Builder
+	multi := make(chan string)
-
+	if hasStdinLines := writeStdinLinesOrNothing(multi); !hasStdinLines {
-	return func(yield func(string) bool) {
+		single := make(chan string, 1)
-		hasStdin := writeStdinLinesOrNothing(func(stdinLine string) bool {
+		single <- ""
-			// we're look for an event, but it may be in multiple lines, so if json parsing fails
+		close(single)
-			// we'll try the next line until we're successful
+		return single
-			curr.WriteString(stdinLine)
+	} else {
-			stdinEvent := curr.String()
+		return multi
-
-			var dummy any
-			if err := json.Unmarshal([]byte(stdinEvent), &dummy); err != nil {
-				return true
-			}
-
-			if !yield(stdinEvent) {
-				return false
-			}
-
-			curr.Reset()
-			return true
-		})
-
-		if !hasStdin {
-			yield("{}")
-		}
 	}
 }
 
-func getStdinLinesOrBlank() iter.Seq[string] {
+func getStdinLinesOrArguments(args cli.Args) chan string {
-	return func(yield func(string) bool) {
-		hasStdin := writeStdinLinesOrNothing(func(stdinLine string) bool {
-			if !yield(stdinLine) {
-				return false
-			}
-			return true
-		})
-
-		if !hasStdin {
-			yield("")
-		}
-	}
-}
-
-func getStdinLinesOrArguments(args cli.Args) iter.Seq[string] {
 	return getStdinLinesOrArgumentsFromSlice(args.Slice())
 }
 
-func getStdinLinesOrArgumentsFromSlice(args []string) iter.Seq[string] {
+func getStdinLinesOrArgumentsFromSlice(args []string) chan string {
 	// try the first argument
 	if len(args) > 0 {
-		return slices.Values(args)
+		argsCh := make(chan string, 1)
+		go func() {
+			for _, arg := range args {
+				argsCh <- arg
+			}
+			close(argsCh)
+		}()
+		return argsCh
 	}
 
 	// try the stdin
-	return func(yield func(string) bool) {
+	multi := make(chan string)
-		writeStdinLinesOrNothing(yield)
+	writeStdinLinesOrNothing(multi)
-	}
+	return multi
 }
 
-func writeStdinLinesOrNothing(yield func(string) bool) (hasStdinLines bool) {
+func writeStdinLinesOrNothing(ch chan string) (hasStdinLines bool) {
 	if isPiped() {
 		// piped
+		go func() {
 			scanner := bufio.NewScanner(os.Stdin)
 			scanner.Buffer(make([]byte, 16*1024*1024), 256*1024*1024)
 			hasEmittedAtLeastOne := false
 			for scanner.Scan() {
-			if !yield(strings.TrimSpace(scanner.Text())) {
+				ch <- strings.TrimSpace(scanner.Text())
-				return
-			}
 				hasEmittedAtLeastOne = true
 			}
-		return hasEmittedAtLeastOne
+			if !hasEmittedAtLeastOne {
+				ch <- ""
+			}
+			close(ch)
+		}()
+		return true
 	} else {
 		// not piped
 		return false
@@ -151,22 +120,13 @@ func connectToAllRelays(
 	relayUrls []string,
 	forcePreAuth bool,
 	opts ...nostr.PoolOption,
-) []*nostr.Relay {
+) (*nostr.SimplePool, []*nostr.Relay) {
-	sys.Pool = nostr.NewSimplePool(context.Background(),
-		append(opts,
-			nostr.WithEventMiddleware(sys.TrackEventHints),
-			nostr.WithPenaltyBox(),
-			nostr.WithRelayOptions(
-				nostr.WithRequestHeader(http.Header{textproto.CanonicalMIMEHeaderKey("user-agent"): {"nak/s"}}),
-			),
-		)...,
-	)
-
 	relays := make([]*nostr.Relay, 0, len(relayUrls))
+	pool := nostr.NewSimplePool(ctx, opts...)
 relayLoop:
 	for _, url := range relayUrls {
 		log("connecting to %s... ", url)
-		if relay, err := sys.Pool.EnsureRelay(url); err == nil {
+		if relay, err := pool.EnsureRelay(url); err == nil {
 			if forcePreAuth {
 				log("waiting for auth challenge... ")
 				signer := opts[0].(nostr.WithAuthHandler)
@@ -180,7 +140,7 @@ relayLoop:
 						if (*challengeTag)[1] == "" {
 							return fmt.Errorf("auth not received yet *****")
 						}
-						return signer(ctx, nostr.RelayEvent{Event: authEvent, Relay: relay})
+						return signer(authEvent)
 					}); err == nil {
 						// auth succeeded
 						break challengeWaitLoop
@@ -206,7 +166,7 @@ relayLoop:
 			log(err.Error() + "\n")
 		}
 	}
-	return relays
+	return pool, relays
 }
 
 func lineProcessingError(ctx context.Context, msg string, args ...any) context.Context {
@@ -220,6 +180,106 @@ func exitIfLineProcessingError(ctx context.Context) {
 	}
 }
 
+func gatherSecretKeyOrBunkerFromArguments(ctx context.Context, c *cli.Command) (string, *nip46.BunkerClient, error) {
+	var err error
+
+	if bunkerURL := c.String("connect"); bunkerURL != "" {
+		clientKey := c.String("connect-as")
+		if clientKey != "" {
+			clientKey = strings.Repeat("0", 64-len(clientKey)) + clientKey
+		} else {
+			clientKey = nostr.GeneratePrivateKey()
+		}
+		bunker, err := nip46.ConnectBunker(ctx, clientKey, bunkerURL, nil, func(s string) {
+			fmt.Fprintf(color.Error, color.CyanString("[nip46]: open the following URL: %s"), s)
+		})
+		return "", bunker, err
+	}
+
+	sec := c.String("sec")
+
+	// check in the environment for the secret key
+	if sec == "" {
+		if key, ok := os.LookupEnv("NOSTR_PRIVATE_KEY"); ok {
+			sec = key
+		}
+	}
+
+	if c.Bool("prompt-sec") {
+		if isPiped() {
+			return "", nil, fmt.Errorf("can't prompt for a secret key when processing data from a pipe, try again without --prompt-sec")
+		}
+		sec, err = askPassword("type your secret key as ncryptsec, nsec or hex: ", nil)
+		if err != nil {
+			return "", nil, fmt.Errorf("failed to get secret key: %w", err)
+		}
+	}
+	if strings.HasPrefix(sec, "ncryptsec1") {
+		sec, err = promptDecrypt(sec)
+		if err != nil {
+			return "", nil, fmt.Errorf("failed to decrypt: %w", err)
+		}
+	} else if bsec, err := hex.DecodeString(leftPadKey(sec)); err == nil {
+		sec = hex.EncodeToString(bsec)
+	} else if prefix, hexvalue, err := nip19.Decode(sec); err != nil {
+		return "", nil, fmt.Errorf("invalid nsec: %w", err)
+	} else if prefix == "nsec" {
+		sec = hexvalue.(string)
+	}
+
+	if ok := nostr.IsValid32ByteHex(sec); !ok {
+		return "", nil, fmt.Errorf("invalid secret key")
+	}
+	return sec, nil, nil
+}
+
+func promptDecrypt(ncryptsec string) (string, error) {
+	for i := 1; i < 4; i++ {
+		var attemptStr string
+		if i > 1 {
+			attemptStr = fmt.Sprintf(" [%d/3]", i)
+		}
+		password, err := askPassword("type the password to decrypt your secret key"+attemptStr+": ", nil)
+		if err != nil {
+			return "", err
+		}
+		sec, err := nip49.Decrypt(ncryptsec, password)
+		if err != nil {
+			continue
+		}
+		return sec, nil
+	}
+	return "", fmt.Errorf("couldn't decrypt private key")
+}
+
+func askPassword(msg string, shouldAskAgain func(answer string) bool) (string, error) {
+	config := &readline.Config{
+		Stdout:                 color.Error,
+		Prompt:                 color.YellowString(msg),
+		InterruptPrompt:        "^C",
+		DisableAutoSaveHistory: true,
+		EnableMask:             true,
+		MaskRune:               '*',
+	}
+
+	rl, err := readline.NewEx(config)
+	if err != nil {
+		return "", err
+	}
+
+	for {
+		answer, err := rl.Readline()
+		if err != nil {
+			return "", err
+		}
+		answer = strings.TrimSpace(answer)
+		if shouldAskAgain != nil && shouldAskAgain(answer) {
+			continue
+		}
+		return answer, err
+	}
+}
+
 const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
 func randString(n int) string {
@@ -233,17 +293,3 @@ func randString(n int) string {
 func leftPadKey(k string) string {
 	return strings.Repeat("0", 64-len(k)) + k
 }
-
-var colors = struct {
-	reset   func(...any) (int, error)
-	italic  func(...any) string
-	italicf func(string, ...any) string
-	bold    func(...any) string
-	boldf   func(string, ...any) string
-}{
-	color.New(color.Reset).Print,
-	color.New(color.Italic).Sprint,
-	color.New(color.Italic).Sprintf,
-	color.New(color.Bold).Sprint,
-	color.New(color.Bold).Sprintf,
-}

helpers_key.go

@@ -1,161 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/hex"
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/chzyer/readline"
-	"github.com/fatih/color"
-	"github.com/urfave/cli/v3"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/keyer"
-	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/nbd-wtf/go-nostr/nip46"
-	"github.com/nbd-wtf/go-nostr/nip49"
-)
-
-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",
-		DefaultText: "the key '1'",
-		Aliases:     []string{"connect"},
-		Category:    CATEGORY_SIGNER,
-	},
-	&cli.BoolFlag{
-		Name:     "prompt-sec",
-		Usage:    "prompt the user to paste a hex or nsec with which to sign the event",
-		Category: CATEGORY_SIGNER,
-	},
-	&cli.StringFlag{
-		Name:        "connect-as",
-		Usage:       "private key to use when communicating with nip46 bunkers",
-		DefaultText: "a random key",
-		Category:    CATEGORY_SIGNER,
-		Sources:     cli.EnvVars("NOSTR_CLIENT_KEY"),
-	},
-}
-
-func gatherKeyerFromArguments(ctx context.Context, c *cli.Command) (nostr.Keyer, string, error) {
-	key, bunker, err := gatherSecretKeyOrBunkerFromArguments(ctx, c)
-	if err != nil {
-		return nil, "", err
-	}
-
-	var kr nostr.Keyer
-	if bunker != nil {
-		kr = keyer.NewBunkerSignerFromBunkerClient(bunker)
-	} else {
-		kr, err = keyer.NewPlainKeySigner(key)
-	}
-
-	return kr, key, err
-}
-
-func gatherSecretKeyOrBunkerFromArguments(ctx context.Context, c *cli.Command) (string, *nip46.BunkerClient, error) {
-	var err error
-
-	sec := c.String("sec")
-	if strings.HasPrefix(sec, "bunker://") {
-		// it's a bunker
-		bunkerURL := sec
-		clientKey := c.String("connect-as")
-		if clientKey != "" {
-			clientKey = strings.Repeat("0", 64-len(clientKey)) + clientKey
-		} else {
-			clientKey = nostr.GeneratePrivateKey()
-		}
-		bunker, err := nip46.ConnectBunker(ctx, clientKey, bunkerURL, nil, func(s string) {
-			log(color.CyanString("[nip46]: open the following URL: %s"), s)
-		})
-		return "", 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") {
-		if isPiped() {
-			return "", nil, fmt.Errorf("can't prompt for a secret key when processing data from a pipe, try again without --prompt-sec")
-		}
-		sec, err = askPassword("type your secret key as ncryptsec, nsec or hex: ", nil)
-		if err != nil {
-			return "", nil, fmt.Errorf("failed to get secret key: %w", err)
-		}
-	}
-
-	if strings.HasPrefix(sec, "ncryptsec1") {
-		sec, err = promptDecrypt(sec)
-		if err != nil {
-			return "", nil, fmt.Errorf("failed to decrypt: %w", err)
-		}
-	} else if bsec, err := hex.DecodeString(leftPadKey(sec)); err == nil {
-		sec = hex.EncodeToString(bsec)
-	} else if prefix, hexvalue, err := nip19.Decode(sec); err != nil {
-		return "", nil, fmt.Errorf("invalid nsec: %w", err)
-	} else if prefix == "nsec" {
-		sec = hexvalue.(string)
-	}
-
-	if ok := nostr.IsValid32ByteHex(sec); !ok {
-		return "", nil, fmt.Errorf("invalid secret key")
-	}
-
-	return sec, nil, nil
-}
-
-func promptDecrypt(ncryptsec string) (string, error) {
-	for i := 1; i < 4; i++ {
-		var attemptStr string
-		if i > 1 {
-			attemptStr = fmt.Sprintf(" [%d/3]", i)
-		}
-		password, err := askPassword("type the password to decrypt your secret key"+attemptStr+": ", nil)
-		if err != nil {
-			return "", err
-		}
-		sec, err := nip49.Decrypt(ncryptsec, password)
-		if err != nil {
-			continue
-		}
-		return sec, nil
-	}
-	return "", fmt.Errorf("couldn't decrypt private key")
-}
-
-func askPassword(msg string, shouldAskAgain func(answer string) bool) (string, error) {
-	config := &readline.Config{
-		Stdout:                 color.Error,
-		Prompt:                 color.YellowString(msg),
-		InterruptPrompt:        "^C",
-		DisableAutoSaveHistory: true,
-		EnableMask:             true,
-		MaskRune:               '*',
-	}
-
-	rl, err := readline.NewEx(config)
-	if err != nil {
-		return "", err
-	}
-
-	for {
-		answer, err := rl.Readline()
-		if err != nil {
-			return "", err
-		}
-		answer = strings.TrimSpace(answer)
-		if shouldAskAgain != nil && shouldAskAgain(answer) {
-			continue
-		}
-		return answer, err
-	}
-}

key.go

@@ -3,13 +3,15 @@ package main
 import (
 	"context"
 	"encoding/hex"
+	"encoding/json"
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcec/v2/schnorr/musig2"
 	"github.com/decred/dcrd/dcrec/secp256k1/v4"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
 	"github.com/nbd-wtf/go-nostr/nip49"
@@ -17,14 +19,14 @@ import (
 
 var key = &cli.Command{
 	Name:                      "key",
-	Usage:                     "operations on secret keys: generate, derive, encrypt, decrypt",
+	Usage:                     "operations on secret keys: generate, derive, encrypt, decrypt.",
 	Description:               ``,
 	DisableSliceFlagSeparator: true,
 	Commands: []*cli.Command{
 		generate,
 		public,
-		encryptKey,
+		encrypt,
-		decryptKey,
+		decrypt,
 		combine,
 	},
 }
@@ -47,31 +49,23 @@ var public = &cli.Command{
 	Description:               ``,
 	ArgsUsage:                 "[secret]",
 	DisableSliceFlagSeparator: true,
-	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "with-parity",
-			Usage: "output 33 bytes instead of 32, the first one being either '02' or '03', a prefix indicating whether this pubkey is even or odd.",
-		},
-	},
 	Action: func(ctx context.Context, c *cli.Command) error {
 		for sec := range getSecretKeysFromStdinLinesOrSlice(ctx, c, c.Args().Slice()) {
-			b, _ := hex.DecodeString(sec)
+			pubkey, err := nostr.GetPublicKey(sec)
-			_, pk := btcec.PrivKeyFromBytes(b)
+			if err != nil {
-
+				ctx = lineProcessingError(ctx, "failed to derive public key: %s", err)
-			if c.Bool("with-parity") {
+				continue
-				stdout(hex.EncodeToString(pk.SerializeCompressed()))
-			} else {
-				stdout(hex.EncodeToString(pk.SerializeCompressed()[1:]))
 			}
+			stdout(pubkey)
 		}
 		return nil
 	},
 }
 
-var encryptKey = &cli.Command{
+var encrypt = &cli.Command{
 	Name:                      "encrypt",
 	Usage:                     "encrypts a secret key and prints an ncryptsec code",
-	Description:               `uses the nip49 standard.`,
+	Description:               `uses the NIP-49 standard.`,
 	ArgsUsage:                 "<secret> <password>",
 	DisableSliceFlagSeparator: true,
 	Flags: []cli.Flag{
@@ -107,10 +101,10 @@ var encryptKey = &cli.Command{
 	},
 }
 
-var decryptKey = &cli.Command{
+var decrypt = &cli.Command{
 	Name:                      "decrypt",
 	Usage:                     "takes an ncrypsec and a password and decrypts it into an nsec",
-	Description:               `uses the nip49 standard.`,
+	Description:               `uses the NIP-49 standard.`,
 	ArgsUsage:                 "<ncryptsec-code> <password>",
 	DisableSliceFlagSeparator: true,
 	Action: func(ctx context.Context, c *cli.Command) error {
@@ -194,7 +188,7 @@ However, if the intent is to check if two existing Nostr pubkeys match a given c
 				for i, prefix := range []byte{0x02, 0x03} {
 					pubk, err := btcec.ParsePubKey(append([]byte{prefix}, keyb...))
 					if err != nil {
-						log("error parsing key %s: %s", keyhex, err)
+						fmt.Fprintf(os.Stderr, "error parsing key %s: %s", keyhex, err)
 						continue
 					}
 					group[i] = pubk
@@ -235,7 +229,7 @@ However, if the intent is to check if two existing Nostr pubkeys match a given c
 
 				agg, _, _, err := musig2.AggregateKeys(combining, true)
 				if err != nil {
-					log("error aggregating: %s", err)
+					fmt.Fprintf(os.Stderr, "error aggregating: %s", err)
 					return
 				}
 
@@ -258,13 +252,13 @@ However, if the intent is to check if two existing Nostr pubkeys match a given c
 		}
 
 		res, _ := json.MarshalIndent(result, "", "  ")
-		stdout(string(res))
+		fmt.Println(string(res))
 
 		return nil
 	},
 }
 
-func getSecretKeysFromStdinLinesOrSlice(ctx context.Context, _ *cli.Command, keys []string) chan string {
+func getSecretKeysFromStdinLinesOrSlice(ctx context.Context, c *cli.Command, keys []string) chan string {
 	ch := make(chan string)
 	go func() {
 		for sec := range getStdinLinesOrArgumentsFromSlice(keys) {

main.go

@@ -2,161 +2,53 @@ package main
 
 import (
 	"context"
-	"net/http"
-	"net/textproto"
 	"os"
-	"path/filepath"
 
-	"github.com/nbd-wtf/go-nostr"
+	"github.com/fiatjaf/cli/v3"
-	"github.com/nbd-wtf/go-nostr/sdk"
-	"github.com/nbd-wtf/go-nostr/sdk/hints/memoryh"
-	"github.com/urfave/cli/v3"
-)
-
-var (
-	version   string = "debug"
-	isVerbose bool   = false
 )
 
 var app = &cli.Command{
 	Name:                      "nak",
 	Suggest:                   true,
 	UseShortOptionHandling:    true,
+	AllowFlagsAfterArguments:  true,
 	Usage:                     "the nostr army knife command-line tool",
 	DisableSliceFlagSeparator: true,
 	Commands: []*cli.Command{
-		event,
 		req,
-		fetch,
 		count,
+		fetch,
+		event,
 		decode,
 		encode,
 		key,
 		verify,
 		relay,
 		bunker,
-		serve,
-		blossomCmd,
-		encrypt,
-		decrypt,
-		outbox,
-		wallet,
-		mcpServer,
-		curl,
-		dvm,
-		fsCmd,
 	},
-	Version: version,
 	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:   "config-path",
-			Hidden: true,
-		},
 		&cli.BoolFlag{
 			Name:       "quiet",
 			Usage:      "do not print logs and info messages to stderr, use -qq to also not print anything to stdout",
 			Aliases:    []string{"q"},
+			Persistent: true,
 			Action: func(ctx context.Context, c *cli.Command, b bool) error {
 				q := c.Count("quiet")
 				if q >= 1 {
 					log = func(msg string, args ...any) {}
 					if q >= 2 {
-						stdout = func(_ ...any) (int, error) { return 0, nil }
+						stdout = func(a ...any) (int, error) { return 0, nil }
 					}
 				}
 				return nil
 			},
 		},
-		&cli.BoolFlag{
-			Name:    "verbose",
-			Usage:   "print more stuff than normally",
-			Aliases: []string{"v"},
-			Action: func(ctx context.Context, c *cli.Command, b bool) error {
-				v := c.Count("verbose")
-				if v >= 1 {
-					logverbose = log
-					isVerbose = true
-				}
-				return nil
-			},
-		},
-	},
-	Before: func(ctx context.Context, c *cli.Command) (context.Context, error) {
-		configPath := c.String("config-path")
-		if configPath == "" {
-			if home, err := os.UserHomeDir(); err == nil {
-				configPath = filepath.Join(home, ".config/nak")
-			}
-		}
-		if configPath != "" {
-			hintsFilePath = filepath.Join(configPath, "outbox/hints.db")
-		}
-		if hintsFilePath != "" {
-			if _, err := os.Stat(hintsFilePath); !os.IsNotExist(err) {
-				hintsFileExists = true
-			}
-		}
-
-		if hintsFilePath != "" {
-			if data, err := os.ReadFile(hintsFilePath); err == nil {
-				hintsdb := memoryh.NewHintDB()
-				if err := json.Unmarshal(data, &hintsdb); err == nil {
-					sys = sdk.NewSystem(
-						sdk.WithHintsDB(hintsdb),
-					)
-					goto systemOperational
-				}
-			}
-		}
-
-		sys = sdk.NewSystem()
-
-	systemOperational:
-		sys.Pool = nostr.NewSimplePool(context.Background(),
-			nostr.WithAuthorKindQueryMiddleware(sys.TrackQueryAttempts),
-			nostr.WithEventMiddleware(sys.TrackEventHints),
-			nostr.WithRelayOptions(
-				nostr.WithRequestHeader(http.Header{textproto.CanonicalMIMEHeaderKey("user-agent"): {"nak/b"}}),
-			),
-		)
-
-		return ctx, nil
-	},
-	After: func(ctx context.Context, c *cli.Command) error {
-		// save hints database on exit
-		if hintsFileExists {
-			data, err := json.Marshal(sys.Hints)
-			if err != nil {
-				return err
-			}
-			return os.WriteFile(hintsFilePath, data, 0644)
-		}
-
-		return nil
 	},
 }
 
 func main() {
-	defer colors.reset()
-
-	cli.VersionFlag = &cli.BoolFlag{
-		Name:  "version",
-		Usage: "prints the version",
-	}
-
-	// a megahack to enable this curl command proxy
-	if len(os.Args) > 2 && os.Args[1] == "curl" {
-		if err := realCurl(); err != nil {
-			stdout(err)
-			colors.reset()
-			os.Exit(1)
-		}
-		return
-	}
-
 	if err := app.Run(context.Background(), os.Args); err != nil {
 		stdout(err)
-		colors.reset()
 		os.Exit(1)
 	}
 }

mcp.go

@@ -1,244 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/mark3labs/mcp-go/mcp"
-	"github.com/mark3labs/mcp-go/server"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/nbd-wtf/go-nostr/sdk"
-	"github.com/urfave/cli/v3"
-)
-
-var mcpServer = &cli.Command{
-	Name:                      "mcp",
-	Usage:                     "pander to the AI gods",
-	Description:               ``,
-	DisableSliceFlagSeparator: true,
-	Flags:                     []cli.Flag{},
-	Action: func(ctx context.Context, c *cli.Command) error {
-		s := server.NewMCPServer(
-			"nak",
-			version,
-		)
-
-		s.AddTool(mcp.NewTool("publish_note",
-			mcp.WithDescription("Publish a short note event to Nostr with the given text content"),
-			mcp.WithString("relay",
-				mcp.Description("Relay to publish the note to"),
-			),
-			mcp.WithString("content",
-				mcp.Required(),
-				mcp.Description("Arbitrary string to be published"),
-			),
-			mcp.WithString("mention",
-				mcp.Required(),
-				mcp.Description("Nostr user's public key to be mentioned"),
-			),
-		), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-			content, _ := request.Params.Arguments["content"].(string)
-			mention, _ := request.Params.Arguments["mention"].(string)
-			relayI, ok := request.Params.Arguments["relay"]
-			var relay string
-			if ok {
-				relay, _ = relayI.(string)
-			}
-
-			if mention != "" && !nostr.IsValidPublicKey(mention) {
-				return mcp.NewToolResultError("the given mention isn't a valid public key, it must be 32 bytes hex, like the ones returned by search_profile"), nil
-			}
-
-			sk := os.Getenv("NOSTR_SECRET_KEY")
-			if sk == "" {
-				sk = "0000000000000000000000000000000000000000000000000000000000000001"
-			}
-			var relays []string
-
-			evt := nostr.Event{
-				Kind:      1,
-				Tags:      nostr.Tags{{"client", "goose/nak"}},
-				Content:   content,
-				CreatedAt: nostr.Now(),
-			}
-
-			if mention != "" {
-				evt.Tags = append(evt.Tags, nostr.Tag{"p", mention})
-				// their inbox relays
-				relays = sys.FetchInboxRelays(ctx, mention, 3)
-			}
-
-			evt.Sign(sk)
-
-			// our write relays
-			relays = append(relays, sys.FetchOutboxRelays(ctx, evt.PubKey, 3)...)
-
-			if len(relays) == 0 {
-				relays = []string{"nos.lol", "relay.damus.io"}
-			}
-
-			// extra relay specified
-			relays = append(relays, relay)
-
-			result := strings.Builder{}
-			result.WriteString(
-				fmt.Sprintf("the event we generated has id '%s', kind '%d' and is signed by pubkey '%s'. ",
-					evt.ID,
-					evt.Kind,
-					evt.PubKey,
-				),
-			)
-
-			for res := range sys.Pool.PublishMany(ctx, relays, evt) {
-				if res.Error != nil {
-					result.WriteString(
-						fmt.Sprintf("there was an error publishing the event to the relay %s. ",
-							res.RelayURL),
-					)
-				} else {
-					result.WriteString(
-						fmt.Sprintf("the event was successfully published to the relay %s. ",
-							res.RelayURL),
-					)
-				}
-			}
-
-			return mcp.NewToolResultText(result.String()), nil
-		})
-
-		s.AddTool(mcp.NewTool("resolve_nostr_uri",
-			mcp.WithDescription("Resolve URIs prefixed with nostr:, including nostr:nevent1..., nostr:npub1..., nostr:nprofile1... and nostr:naddr1..."),
-			mcp.WithString("uri",
-				mcp.Required(),
-				mcp.Description("URI to be resolved"),
-			),
-		), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-			uri, _ := request.Params.Arguments["uri"].(string)
-			if strings.HasPrefix(uri, "nostr:") {
-				uri = uri[6:]
-			}
-
-			prefix, data, err := nip19.Decode(uri)
-			if err != nil {
-				return mcp.NewToolResultError("this Nostr uri is invalid"), nil
-			}
-
-			switch prefix {
-			case "npub":
-				pm := sys.FetchProfileMetadata(ctx, data.(string))
-				return mcp.NewToolResultText(
-					fmt.Sprintf("this is a Nostr profile named '%s', their public key is '%s'",
-						pm.ShortName(), pm.PubKey),
-				), nil
-			case "nprofile":
-				pm, _ := sys.FetchProfileFromInput(ctx, uri)
-				return mcp.NewToolResultText(
-					fmt.Sprintf("this is a Nostr profile named '%s', their public key is '%s'",
-						pm.ShortName(), pm.PubKey),
-				), nil
-			case "nevent":
-				event, _, err := sys.FetchSpecificEventFromInput(ctx, uri, sdk.FetchSpecificEventParameters{
-					WithRelays: false,
-				})
-				if err != nil {
-					return mcp.NewToolResultError("Couldn't find this event anywhere"), nil
-				}
-
-				return mcp.NewToolResultText(
-					fmt.Sprintf("this is a Nostr event: %s", event),
-				), nil
-			case "naddr":
-				return mcp.NewToolResultError("For now we can't handle this kind of Nostr uri"), nil
-			default:
-				return mcp.NewToolResultError("We don't know how to handle this Nostr uri"), nil
-			}
-		})
-
-		s.AddTool(mcp.NewTool("search_profile",
-			mcp.WithDescription("Search for the public key of a Nostr user given their name"),
-			mcp.WithString("name",
-				mcp.Required(),
-				mcp.Description("Name to be searched"),
-			),
-		), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-			name, _ := request.Params.Arguments["name"].(string)
-			re := sys.Pool.QuerySingle(ctx, []string{"relay.nostr.band", "nostr.wine"}, nostr.Filter{Search: name, Kinds: []int{0}})
-			if re == nil {
-				return mcp.NewToolResultError("couldn't find anyone with that name"), nil
-			}
-
-			return mcp.NewToolResultText(re.PubKey), nil
-		})
-
-		s.AddTool(mcp.NewTool("get_outbox_relay_for_pubkey",
-			mcp.WithDescription("Get the best relay from where to read notes from a specific Nostr user"),
-			mcp.WithString("pubkey",
-				mcp.Required(),
-				mcp.Description("Public key of Nostr user we want to know the relay from where to read"),
-			),
-		), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-			pubkey, _ := request.Params.Arguments["pubkey"].(string)
-			res := sys.FetchOutboxRelays(ctx, pubkey, 1)
-			return mcp.NewToolResultText(res[0]), nil
-		})
-
-		s.AddTool(mcp.NewTool("read_events_from_relay",
-			mcp.WithDescription("Makes a REQ query to one relay using the specified parameters, this can be used to fetch notes from a profile"),
-			mcp.WithNumber("kind",
-				mcp.Required(),
-				mcp.Description("event kind number to include in the 'kinds' field"),
-			),
-			mcp.WithString("pubkey",
-				mcp.Description("pubkey to include in the 'authors' field"),
-			),
-			mcp.WithNumber("limit",
-				mcp.Required(),
-				mcp.Description("maximum number of events to query"),
-			),
-			mcp.WithString("relay",
-				mcp.Required(),
-				mcp.Description("relay URL to send the query to"),
-			),
-		), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-			relay, _ := request.Params.Arguments["relay"].(string)
-			limit, _ := request.Params.Arguments["limit"].(int)
-			kind, _ := request.Params.Arguments["kind"].(int)
-			pubkeyI, ok := request.Params.Arguments["pubkey"]
-			var pubkey string
-			if ok {
-				pubkey, _ = pubkeyI.(string)
-			}
-
-			if pubkey != "" && !nostr.IsValidPublicKey(pubkey) {
-				return mcp.NewToolResultError("the given pubkey isn't a valid public key, it must be 32 bytes hex, like the ones returned by search_profile"), nil
-			}
-
-			filter := nostr.Filter{
-				Limit: limit,
-				Kinds: []int{kind},
-			}
-			if pubkey != "" {
-				filter.Authors = []string{pubkey}
-			}
-
-			events := sys.Pool.FetchMany(ctx, []string{relay}, filter)
-
-			result := strings.Builder{}
-			for ie := range events {
-				result.WriteString("author public key: ")
-				result.WriteString(ie.PubKey)
-				result.WriteString("content: '")
-				result.WriteString(ie.Content)
-				result.WriteString("'")
-				result.WriteString("\n---\n")
-			}
-
-			return mcp.NewToolResultText(result.String()), nil
-		})
-
-		return server.ServeStdio(s)
-	},
-}

musig2.go

@@ -6,6 +6,7 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
+	"os"
 	"strconv"
 	"strings"
 
@@ -14,31 +15,6 @@ import (
 	"github.com/nbd-wtf/go-nostr"
 )
 
-func getMusigAggregatedKey(_ context.Context, keys []string) (string, error) {
-	knownSigners := make([]*btcec.PublicKey, len(keys))
-	for i, spk := range keys {
-		bpk, err := hex.DecodeString(spk)
-		if err != nil {
-			return "", fmt.Errorf("'%s' is invalid hex: %w", spk, err)
-		}
-		if len(bpk) == 32 {
-			return "", fmt.Errorf("'%s' is missing the leading parity byte", spk)
-		}
-		pk, err := btcec.ParsePubKey(bpk)
-		if err != nil {
-			return "", fmt.Errorf("'%s' is not a valid pubkey: %w", spk, err)
-		}
-		knownSigners[i] = pk
-	}
-
-	aggpk, _, _, err := musig2.AggregateKeys(knownSigners, true)
-	if err != nil {
-		return "", fmt.Errorf("aggregation failed: %w", err)
-	}
-
-	return hex.EncodeToString(aggpk.FinalKey.SerializeCompressed()[1:]), nil
-}
-
 func performMusig(
 	_ context.Context,
 	sec string,
@@ -134,8 +110,8 @@ func performMusig(
 		if err != nil {
 			return false, err
 		}
-		log("the following code should be saved secretly until the next step an included with --musig-nonce-secret:\n")
+		fmt.Fprintf(os.Stderr, "the following code should be saved secretly until the next step an included with --musig-nonce-secret:\n")
-		log("%s\n\n", base64.StdEncoding.EncodeToString(nonce.SecNonce[:]))
+		fmt.Fprintf(os.Stderr, "%s\n\n", base64.StdEncoding.EncodeToString(nonce.SecNonce[:]))
 
 		knownNonces = append(knownNonces, nonce.PubNonce)
 		printPublicCommandForNextPeer(evt, numSigners, knownSigners, knownNonces, nil, false)
@@ -148,7 +124,7 @@ func performMusig(
 	} else {
 		evt.PubKey = hex.EncodeToString(comb.SerializeCompressed()[1:])
 		evt.ID = evt.GetID()
-		log("combined key: %x\n\n", comb.SerializeCompressed())
+		fmt.Fprintf(os.Stderr, "combined key: %x\n\n", comb.SerializeCompressed())
 	}
 
 	// we have all the signers, which means we must also have all the nonces
@@ -243,7 +219,7 @@ func printPublicCommandForNextPeer(
 		maybeNonceSecret = " --musig-nonce-secret '<insert-nonce-secret>'"
 	}
 
-	log("the next signer and they should call this on their side:\nnak event --sec <insert-secret-key> --musig %d %s%s%s%s%s\n",
+	fmt.Fprintf(os.Stderr, "the next signer and they should call this on their side:\nnak event --sec <insert-secret-key> --musig %d %s%s%s%s%s\n",
 		numSigners,
 		eventToCliArgs(evt),
 		signersToCliArgs(knownSigners),

nostrfs/asyncfile.go

@@ -1,56 +0,0 @@
-package nostrfs
-
-import (
-	"context"
-	"sync/atomic"
-	"syscall"
-
-	"github.com/hanwen/go-fuse/v2/fs"
-	"github.com/hanwen/go-fuse/v2/fuse"
-	"github.com/nbd-wtf/go-nostr"
-)
-
-type AsyncFile struct {
-	fs.Inode
-	ctx     context.Context
-	fetched atomic.Bool
-	data    []byte
-	ts      nostr.Timestamp
-	load    func() ([]byte, nostr.Timestamp)
-}
-
-var (
-	_ = (fs.NodeOpener)((*AsyncFile)(nil))
-	_ = (fs.NodeGetattrer)((*AsyncFile)(nil))
-)
-
-func (af *AsyncFile) Getattr(ctx context.Context, f fs.FileHandle, out *fuse.AttrOut) syscall.Errno {
-	if af.fetched.CompareAndSwap(false, true) {
-		af.data, af.ts = af.load()
-	}
-
-	out.Size = uint64(len(af.data))
-	out.Mtime = uint64(af.ts)
-	return fs.OK
-}
-
-func (af *AsyncFile) Open(ctx context.Context, flags uint32) (fs.FileHandle, uint32, syscall.Errno) {
-	if af.fetched.CompareAndSwap(false, true) {
-		af.data, af.ts = af.load()
-	}
-
-	return nil, fuse.FOPEN_KEEP_CACHE, 0
-}
-
-func (af *AsyncFile) Read(
-	ctx context.Context,
-	f fs.FileHandle,
-	dest []byte,
-	off int64,
-) (fuse.ReadResult, syscall.Errno) {
-	end := int(off) + len(dest)
-	if end > len(af.data) {
-		end = len(af.data)
-	}
-	return fuse.ReadResultData(af.data[off:end]), 0
-}

nostrfs/eventdir.go

@@ -1,241 +0,0 @@
-package nostrfs
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"path/filepath"
-	"syscall"
-	"time"
-
-	"github.com/hanwen/go-fuse/v2/fs"
-	"github.com/hanwen/go-fuse/v2/fuse"
-	"github.com/mailru/easyjson"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip10"
-	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/nbd-wtf/go-nostr/nip22"
-	"github.com/nbd-wtf/go-nostr/nip27"
-	"github.com/nbd-wtf/go-nostr/nip92"
-	sdk "github.com/nbd-wtf/go-nostr/sdk"
-)
-
-type EventDir struct {
-	fs.Inode
-	ctx context.Context
-	wd  string
-	evt *nostr.Event
-}
-
-var _ = (fs.NodeGetattrer)((*EventDir)(nil))
-
-func (e *EventDir) Getattr(ctx context.Context, f fs.FileHandle, out *fuse.AttrOut) syscall.Errno {
-	out.Mtime = uint64(e.evt.CreatedAt)
-	return fs.OK
-}
-
-func FetchAndCreateEventDir(
-	ctx context.Context,
-	parent fs.InodeEmbedder,
-	wd string,
-	sys *sdk.System,
-	pointer nostr.EventPointer,
-) (*fs.Inode, error) {
-	event, _, err := sys.FetchSpecificEvent(ctx, pointer, sdk.FetchSpecificEventParameters{
-		WithRelays: false,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch: %w", err)
-	}
-
-	return CreateEventDir(ctx, parent, wd, event), nil
-}
-
-func CreateEventDir(
-	ctx context.Context,
-	parent fs.InodeEmbedder,
-	wd string,
-	event *nostr.Event,
-) *fs.Inode {
-	h := parent.EmbeddedInode().NewPersistentInode(
-		ctx,
-		&EventDir{ctx: ctx, wd: wd, evt: event},
-		fs.StableAttr{Mode: syscall.S_IFDIR, Ino: hexToUint64(event.ID)},
-	)
-
-	npub, _ := nip19.EncodePublicKey(event.PubKey)
-	h.AddChild("@author", h.NewPersistentInode(
-		ctx,
-		&fs.MemSymlink{
-			Data: []byte(wd + "/" + npub),
-		},
-		fs.StableAttr{Mode: syscall.S_IFLNK},
-	), true)
-
-	eventj, _ := easyjson.Marshal(event)
-	h.AddChild("event.json", h.NewPersistentInode(
-		ctx,
-		&fs.MemRegularFile{
-			Data: eventj,
-			Attr: fuse.Attr{
-				Mode:  0444,
-				Ctime: uint64(event.CreatedAt),
-				Mtime: uint64(event.CreatedAt),
-				Size:  uint64(len(event.Content)),
-			},
-		},
-		fs.StableAttr{},
-	), true)
-
-	h.AddChild("id", h.NewPersistentInode(
-		ctx,
-		&fs.MemRegularFile{
-			Data: []byte(event.ID),
-			Attr: fuse.Attr{
-				Mode:  0444,
-				Ctime: uint64(event.CreatedAt),
-				Mtime: uint64(event.CreatedAt),
-				Size:  uint64(len(event.Content)),
-			},
-		},
-		fs.StableAttr{},
-	), true)
-
-	h.AddChild("content.txt", h.NewPersistentInode(
-		ctx,
-		&fs.MemRegularFile{
-			Data: []byte(event.Content),
-			Attr: fuse.Attr{
-				Mode:  0444,
-				Ctime: uint64(event.CreatedAt),
-				Mtime: uint64(event.CreatedAt),
-				Size:  uint64(len(event.Content)),
-			},
-		},
-		fs.StableAttr{},
-	), true)
-
-	var refsdir *fs.Inode
-	i := 0
-	for ref := range nip27.ParseReferences(*event) {
-		i++
-		if refsdir == nil {
-			refsdir = h.NewPersistentInode(ctx, &fs.Inode{}, fs.StableAttr{Mode: syscall.S_IFDIR})
-			h.AddChild("references", refsdir, true)
-		}
-		refsdir.AddChild(fmt.Sprintf("ref_%02d", i), refsdir.NewPersistentInode(
-			ctx,
-			&fs.MemSymlink{
-				Data: []byte(wd + "/" + nip19.EncodePointer(ref.Pointer)),
-			},
-			fs.StableAttr{Mode: syscall.S_IFLNK},
-		), true)
-	}
-
-	var imagesdir *fs.Inode
-	images := nip92.ParseTags(event.Tags)
-	for _, imeta := range images {
-		if imeta.URL == "" {
-			continue
-		}
-		if imagesdir == nil {
-			in := &fs.Inode{}
-			imagesdir = h.NewPersistentInode(ctx, in, fs.StableAttr{Mode: syscall.S_IFDIR})
-			h.AddChild("images", imagesdir, true)
-		}
-		imagesdir.AddChild(filepath.Base(imeta.URL), imagesdir.NewPersistentInode(
-			ctx,
-			&AsyncFile{
-				ctx: ctx,
-				load: func() ([]byte, nostr.Timestamp) {
-					ctx, cancel := context.WithTimeout(ctx, time.Second*20)
-					defer cancel()
-					r, err := http.NewRequestWithContext(ctx, "GET", imeta.URL, nil)
-					if err != nil {
-						return nil, 0
-					}
-					resp, err := http.DefaultClient.Do(r)
-					if err != nil {
-						return nil, 0
-					}
-					defer resp.Body.Close()
-					if resp.StatusCode >= 300 {
-						return nil, 0
-					}
-					w := &bytes.Buffer{}
-					io.Copy(w, resp.Body)
-					return w.Bytes(), 0
-				},
-			},
-			fs.StableAttr{},
-		), true)
-	}
-
-	if event.Kind == 1 {
-		if pointer := nip10.GetThreadRoot(event.Tags); pointer != nil {
-			nevent := nip19.EncodePointer(*pointer)
-			h.AddChild("@root", h.NewPersistentInode(
-				ctx,
-				&fs.MemSymlink{
-					Data: []byte(wd + "/" + nevent),
-				},
-				fs.StableAttr{Mode: syscall.S_IFLNK},
-			), true)
-		}
-		if pointer := nip10.GetImmediateParent(event.Tags); pointer != nil {
-			nevent := nip19.EncodePointer(*pointer)
-			h.AddChild("@parent", h.NewPersistentInode(
-				ctx,
-				&fs.MemSymlink{
-					Data: []byte(wd + "/" + nevent),
-				},
-				fs.StableAttr{Mode: syscall.S_IFLNK},
-			), true)
-		}
-	} else if event.Kind == 1111 {
-		if pointer := nip22.GetThreadRoot(event.Tags); pointer != nil {
-			if xp, ok := pointer.(nostr.ExternalPointer); ok {
-				h.AddChild("@root", h.NewPersistentInode(
-					ctx,
-					&fs.MemRegularFile{
-						Data: []byte(`<!doctype html><meta http-equiv="refresh" content="0; url=` + xp.Thing + `" />`),
-					},
-					fs.StableAttr{},
-				), true)
-			} else {
-				nevent := nip19.EncodePointer(pointer)
-				h.AddChild("@parent", h.NewPersistentInode(
-					ctx,
-					&fs.MemSymlink{
-						Data: []byte(wd + "/" + nevent),
-					},
-					fs.StableAttr{Mode: syscall.S_IFLNK},
-				), true)
-			}
-		}
-		if pointer := nip22.GetImmediateParent(event.Tags); pointer != nil {
-			if xp, ok := pointer.(nostr.ExternalPointer); ok {
-				h.AddChild("@parent", h.NewPersistentInode(
-					ctx,
-					&fs.MemRegularFile{
-						Data: []byte(`<!doctype html><meta http-equiv="refresh" content="0; url=` + xp.Thing + `" />`),
-					},
-					fs.StableAttr{},
-				), true)
-			} else {
-				nevent := nip19.EncodePointer(pointer)
-				h.AddChild("@parent", h.NewPersistentInode(
-					ctx,
-					&fs.MemSymlink{
-						Data: []byte(wd + "/" + nevent),
-					},
-					fs.StableAttr{Mode: syscall.S_IFLNK},
-				), true)
-			}
-		}
-	}
-
-	return h
-}

nostrfs/helpers.go

@@ -1,8 +0,0 @@
-package nostrfs
-
-import "strconv"
-
-func hexToUint64(hexStr string) uint64 {
-	v, _ := strconv.ParseUint(hexStr[16:32], 16, 64)
-	return v
-}

nostrfs/npubdir.go

@@ -1,162 +0,0 @@
-package nostrfs
-
-import (
-	"context"
-	"encoding/json"
-	"sync/atomic"
-	"syscall"
-
-	"github.com/hanwen/go-fuse/v2/fs"
-	"github.com/hanwen/go-fuse/v2/fuse"
-	"github.com/nbd-wtf/go-nostr"
-	sdk "github.com/nbd-wtf/go-nostr/sdk"
-)
-
-type NpubDir struct {
-	sys *sdk.System
-	fs.Inode
-	pointer nostr.ProfilePointer
-	ctx     context.Context
-	fetched atomic.Bool
-}
-
-func CreateNpubDir(
-	ctx context.Context,
-	sys *sdk.System,
-	parent fs.InodeEmbedder,
-	wd string,
-	pointer nostr.ProfilePointer,
-) *fs.Inode {
-	npubdir := &NpubDir{ctx: ctx, sys: sys, pointer: pointer}
-	h := parent.EmbeddedInode().NewPersistentInode(
-		ctx,
-		npubdir,
-		fs.StableAttr{Mode: syscall.S_IFDIR, Ino: hexToUint64(pointer.PublicKey)},
-	)
-
-	relays := sys.FetchOutboxRelays(ctx, pointer.PublicKey, 2)
-
-	h.AddChild("pubkey", h.NewPersistentInode(
-		ctx,
-		&fs.MemRegularFile{Data: []byte(pointer.PublicKey + "\n"), Attr: fuse.Attr{Mode: 0444}},
-		fs.StableAttr{},
-	), true)
-
-	h.AddChild(
-		"notes",
-		h.NewPersistentInode(
-			ctx,
-			&ViewDir{
-				ctx: ctx,
-				sys: sys,
-				wd:  wd,
-				filter: nostr.Filter{
-					Kinds:   []int{1},
-					Authors: []string{pointer.PublicKey},
-				},
-				relays: relays,
-			},
-			fs.StableAttr{Mode: syscall.S_IFDIR},
-		),
-		true,
-	)
-
-	h.AddChild(
-		"comments",
-		h.NewPersistentInode(
-			ctx,
-			&ViewDir{
-				ctx: ctx,
-				sys: sys,
-				wd:  wd,
-				filter: nostr.Filter{
-					Kinds:   []int{1111},
-					Authors: []string{pointer.PublicKey},
-				},
-				relays: relays,
-			},
-			fs.StableAttr{Mode: syscall.S_IFDIR},
-		),
-		true,
-	)
-
-	h.AddChild(
-		"pictures",
-		h.NewPersistentInode(
-			ctx,
-			&ViewDir{
-				ctx: ctx,
-				sys: sys,
-				wd:  wd,
-				filter: nostr.Filter{
-					Kinds:   []int{20},
-					Authors: []string{pointer.PublicKey},
-				},
-				relays: relays,
-			},
-			fs.StableAttr{Mode: syscall.S_IFDIR},
-		),
-		true,
-	)
-
-	h.AddChild(
-		"videos",
-		h.NewPersistentInode(
-			ctx,
-			&ViewDir{
-				ctx: ctx,
-				sys: sys,
-				wd:  wd,
-				filter: nostr.Filter{
-					Kinds:   []int{21, 22},
-					Authors: []string{pointer.PublicKey},
-				},
-				relays: relays,
-			},
-			fs.StableAttr{Mode: syscall.S_IFDIR},
-		),
-		true,
-	)
-
-	h.AddChild(
-		"highlights",
-		h.NewPersistentInode(
-			ctx,
-			&ViewDir{
-				ctx: ctx,
-				sys: sys,
-				wd:  wd,
-				filter: nostr.Filter{
-					Kinds:   []int{9802},
-					Authors: []string{pointer.PublicKey},
-				},
-				relays: relays,
-			},
-			fs.StableAttr{Mode: syscall.S_IFDIR},
-		),
-		true,
-	)
-
-	h.AddChild(
-		"metadata.json",
-		h.NewPersistentInode(
-			ctx,
-			&AsyncFile{
-				ctx: ctx,
-				load: func() ([]byte, nostr.Timestamp) {
-					pm := sys.FetchProfileMetadata(ctx, pointer.PublicKey)
-					jsonb, _ := json.MarshalIndent(pm.Event, "", "  ")
-					var ts nostr.Timestamp
-					if pm.Event != nil {
-						ts = pm.Event.CreatedAt
-					}
-					return jsonb, ts
-				},
-			},
-			fs.StableAttr{},
-		),
-		true,
-	)
-
-	return h
-}

nostrfs/root.go

@@ -1,110 +0,0 @@
-package nostrfs
-
-import (
-	"context"
-	"path/filepath"
-	"syscall"
-	"time"
-
-	"github.com/hanwen/go-fuse/v2/fs"
-	"github.com/hanwen/go-fuse/v2/fuse"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip05"
-	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/nbd-wtf/go-nostr/sdk"
-)
-
-type NostrRoot struct {
-	fs.Inode
-
-	ctx        context.Context
-	wd         string
-	sys        *sdk.System
-	rootPubKey string
-	signer     nostr.Signer
-}
-
-var _ = (fs.NodeOnAdder)((*NostrRoot)(nil))
-
-func NewNostrRoot(ctx context.Context, sys *sdk.System, user nostr.User, mountpoint string) *NostrRoot {
-	pubkey, _ := user.GetPublicKey(ctx)
-	signer, _ := user.(nostr.Signer)
-	abs, _ := filepath.Abs(mountpoint)
-
-	return &NostrRoot{
-		ctx:        ctx,
-		sys:        sys,
-		rootPubKey: pubkey,
-		signer:     signer,
-		wd:         abs,
-	}
-}
-
-func (r *NostrRoot) OnAdd(context.Context) {
-	if r.rootPubKey == "" {
-		return
-	}
-
-	// add our contacts
-	fl := r.sys.FetchFollowList(r.ctx, r.rootPubKey)
-	for _, f := range fl.Items {
-		pointer := nostr.ProfilePointer{PublicKey: f.Pubkey, Relays: []string{f.Relay}}
-		npub, _ := nip19.EncodePublicKey(f.Pubkey)
-		r.AddChild(
-			npub,
-			CreateNpubDir(r.ctx, r.sys, r, r.wd, pointer),
-			true,
-		)
-	}
-
-	// add ourselves
-	npub, _ := nip19.EncodePublicKey(r.rootPubKey)
-	if r.GetChild(npub) == nil {
-		pointer := nostr.ProfilePointer{PublicKey: r.rootPubKey}
-		r.AddChild(
-			npub,
-			CreateNpubDir(r.ctx, r.sys, r, r.wd, pointer),
-			true,
-		)
-	}
-
-	// add a link to ourselves
-	r.AddChild("@me", r.NewPersistentInode(
-		r.ctx,
-		&fs.MemSymlink{Data: []byte(r.wd + "/" + npub)},
-		fs.StableAttr{Mode: syscall.S_IFLNK},
-	), true)
-}
-
-func (r *NostrRoot) Lookup(ctx context.Context, name string, out *fuse.EntryOut) (*fs.Inode, syscall.Errno) {
-	out.SetEntryTimeout(time.Minute * 5)
-
-	child := r.GetChild(name)
-	if child != nil {
-		return child, fs.OK
-	}
-
-	if pp, err := nip05.QueryIdentifier(ctx, name); err == nil {
-		npubdir := CreateNpubDir(ctx, r.sys, r, r.wd, *pp)
-		return npubdir, fs.OK
-	}
-
-	pointer, err := nip19.ToPointer(name)
-	if err != nil {
-		return nil, syscall.ENOENT
-	}
-
-	switch p := pointer.(type) {
-	case nostr.ProfilePointer:
-		npubdir := CreateNpubDir(ctx, r.sys, r, r.wd, p)
-		return npubdir, fs.OK
-	case nostr.EventPointer:
-		eventdir, err := FetchAndCreateEventDir(ctx, r, r.wd, r.sys, p)
-		if err != nil {
-			return nil, syscall.ENOENT
-		}
-		return eventdir, fs.OK
-	default:
-		return nil, syscall.ENOENT
-	}
-}

nostrfs/viewdir.go

@@ -1,72 +0,0 @@
-package nostrfs
-
-import (
-	"context"
-	"sync/atomic"
-	"syscall"
-
-	"github.com/hanwen/go-fuse/v2/fs"
-	"github.com/hanwen/go-fuse/v2/fuse"
-	"github.com/nbd-wtf/go-nostr"
-	sdk "github.com/nbd-wtf/go-nostr/sdk"
-)
-
-type ViewDir struct {
-	fs.Inode
-	ctx     context.Context
-	sys     *sdk.System
-	wd      string
-	fetched atomic.Bool
-	filter  nostr.Filter
-	relays  []string
-}
-
-var (
-	_ = (fs.NodeOpendirer)((*ViewDir)(nil))
-	_ = (fs.NodeGetattrer)((*ViewDir)(nil))
-)
-
-func (n *ViewDir) Getattr(ctx context.Context, f fs.FileHandle, out *fuse.AttrOut) syscall.Errno {
-	now := nostr.Now()
-	if n.filter.Until != nil {
-		now = *n.filter.Until
-	}
-	aMonthAgo := now - 30*24*60*60
-	out.Mtime = uint64(aMonthAgo)
-	return fs.OK
-}
-
-func (n *ViewDir) Opendir(ctx context.Context) syscall.Errno {
-	if n.fetched.CompareAndSwap(true, true) {
-		return fs.OK
-	}
-
-	now := nostr.Now()
-	if n.filter.Until != nil {
-		now = *n.filter.Until
-	}
-	aMonthAgo := now - 30*24*60*60
-	n.filter.Since = &aMonthAgo
-
-	for ie := range n.sys.Pool.FetchMany(ctx, n.relays, n.filter, nostr.WithLabel("nakfs")) {
-		e := CreateEventDir(ctx, n, n.wd, ie.Event)
-		n.AddChild(ie.Event.ID, e, true)
-	}
-
-	filter := n.filter
-	filter.Until = &aMonthAgo
-
-	n.AddChild("@previous", n.NewPersistentInode(
-		ctx,
-		&ViewDir{
-			ctx:    n.ctx,
-			sys:    n.sys,
-			filter: filter,
-			wd:     n.wd,
-			relays: n.relays,
-		},
-		fs.StableAttr{Mode: syscall.S_IFDIR},
-	), true)
-
-	return fs.OK
-}

outbox.go

@@ -1,68 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/urfave/cli/v3"
-	"github.com/nbd-wtf/go-nostr"
-)
-
-var outbox = &cli.Command{
-	Name:                      "outbox",
-	Usage:                     "manage outbox relay hints database",
-	DisableSliceFlagSeparator: true,
-	Commands: []*cli.Command{
-		{
-			Name:                      "init",
-			Usage:                     "initialize the outbox hints database",
-			DisableSliceFlagSeparator: true,
-			Action: func(ctx context.Context, c *cli.Command) error {
-				if hintsFileExists {
-					return nil
-				}
-				if hintsFilePath == "" {
-					return fmt.Errorf("couldn't find a place to store the hints, pass --config-path to fix.")
-				}
-
-				if err := os.MkdirAll(filepath.Dir(hintsFilePath), 0777); err == nil {
-					if err := os.WriteFile(hintsFilePath, []byte("{}"), 0644); err != nil {
-						return fmt.Errorf("failed to create hints database: %w", err)
-					}
-				}
-
-				log("initialized hints database at %s\n", hintsFilePath)
-				return nil
-			},
-		},
-		{
-			Name:                      "list",
-			Usage:                     "list outbox relays for a given pubkey",
-			ArgsUsage:                 "<pubkey>",
-			DisableSliceFlagSeparator: true,
-			Action: func(ctx context.Context, c *cli.Command) error {
-				if !hintsFileExists {
-					log("running with temporary fragile data.\n")
-					log("call `nak outbox init` to setup persistence.\n")
-				}
-
-				if c.Args().Len() != 1 {
-					return fmt.Errorf("expected exactly one argument (pubkey)")
-				}
-
-				pubkey := c.Args().First()
-				if !nostr.IsValidPublicKey(pubkey) {
-					return fmt.Errorf("invalid public key: %s", pubkey)
-				}
-
-				for _, relay := range sys.FetchOutboxRelays(ctx, pubkey, 6) {
-					stdout(relay)
-				}
-
-				return nil
-			},
-		},
-	},
-}

paginate.go

@@ -0,0 +1,73 @@
+package main
+
+import (
+	"context"
+	"math"
+	"slices"
+	"time"
+
+	"github.com/nbd-wtf/go-nostr"
+)
+
+func paginateWithPoolAndParams(pool *nostr.SimplePool, interval time.Duration, globalLimit uint64) func(ctx context.Context, urls []string, filters nostr.Filters) chan nostr.IncomingEvent {
+	return func(ctx context.Context, urls []string, filters nostr.Filters) chan nostr.IncomingEvent {
+		// filters will always be just one
+		filter := filters[0]
+
+		nextUntil := nostr.Now()
+		if filter.Until != nil {
+			nextUntil = *filter.Until
+		}
+
+		if globalLimit == 0 {
+			globalLimit = uint64(filter.Limit)
+			if globalLimit == 0 && !filter.LimitZero {
+				globalLimit = math.MaxUint64
+			}
+		}
+		var globalCount uint64 = 0
+		globalCh := make(chan nostr.IncomingEvent)
+
+		repeatedCache := make([]string, 0, 300)
+		nextRepeatedCache := make([]string, 0, 300)
+
+		go func() {
+			defer close(globalCh)
+
+			for {
+				filter.Until = &nextUntil
+				time.Sleep(interval)
+
+				keepGoing := false
+				for evt := range pool.SubManyEose(ctx, urls, nostr.Filters{filter}) {
+					if slices.Contains(repeatedCache, evt.ID) {
+						continue
+					}
+
+					keepGoing = true // if we get one that isn't repeated, then keep trying to get more
+					nextRepeatedCache = append(nextRepeatedCache, evt.ID)
+
+					globalCh <- evt
+
+					globalCount++
+					if globalCount >= globalLimit {
+						return
+					}
+
+					if evt.CreatedAt < *filter.Until {
+						nextUntil = evt.CreatedAt
+					}
+				}
+
+				if !keepGoing {
+					return
+				}
+
+				repeatedCache = nextRepeatedCache
+				nextRepeatedCache = nextRepeatedCache[:0]
+			}
+		}()
+
+		return globalCh
+	}
+}

relay.go

@@ -6,25 +6,22 @@ import (
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/hex"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 
+	"github.com/fiatjaf/cli/v3"
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip11"
 	"github.com/nbd-wtf/go-nostr/nip86"
-	"github.com/urfave/cli/v3"
 )
 
 var relay = &cli.Command{
 	Name:  "relay",
-	Usage: "gets the relay information document for the given relay, as JSON -- or allows usage of the relay management API.",
+	Usage: "gets the relay information document for the given relay, as JSON",
-	Description: `examples:
+	Description: `example:
-	fetching relay information:
+		nak relay nostr.wine`,
-		nak relay nostr.wine
-
-	managing a relay
-		nak relay nostr.wine banevent --sec 1234 --id 037eb3751073770ff17483b1b1ff125866cd5147668271975ef0a8a8e7ee184a --reason "I don't like it"`,
 	ArgsUsage:                 "<relay-url>",
 	DisableSliceFlagSeparator: true,
 	Action: func(ctx context.Context, c *cli.Command) error {
@@ -45,7 +42,9 @@ var relay = &cli.Command{
 		return nil
 	},
 	Commands: (func() []*cli.Command {
-		methods := []struct {
+		commands := make([]*cli.Command, 0, 12)
+
+		for _, def := range []struct {
 			method string
 			args   []string
 		}{
@@ -67,10 +66,7 @@ var relay = &cli.Command{
 			{"blockip", []string{"ip", "reason"}},
 			{"unblockip", []string{"ip", "reason"}},
 			{"listblockedips", nil},
-		}
+		} {
-
-		commands := make([]*cli.Command, 0, len(methods))
-		for _, def := range methods {
 			def := def
 
 			flags := make([]cli.Flag, len(def.args), len(def.args)+4)
@@ -78,15 +74,33 @@ var relay = &cli.Command{
 				flags[i] = declareFlag(argName)
 			}
 
-			flags = append(flags, defaultKeyFlags...)
+			flags = append(flags,
+				&cli.StringFlag{
+					Name:        "sec",
+					Usage:       "secret key to sign the event, as nsec, ncryptsec or hex",
+					DefaultText: "the key '1'",
+					Value:       "0000000000000000000000000000000000000000000000000000000000000001",
+				},
+				&cli.BoolFlag{
+					Name:  "prompt-sec",
+					Usage: "prompt the user to paste a hex or nsec with which to sign the event",
+				},
+				&cli.StringFlag{
+					Name:  "connect",
+					Usage: "sign event using NIP-46, expects a bunker://... URL",
+				},
+				&cli.StringFlag{
+					Name:        "connect-as",
+					Usage:       "private key to when communicating with the bunker given on --connect",
+					DefaultText: "a random key",
+				},
+			)
 
 			cmd := &cli.Command{
 				Name:  def.method,
 				Usage: fmt.Sprintf(`the "%s" relay management RPC call`, def.method),
 				Description: fmt.Sprintf(
 					`the "%s" management RPC call, see https://nips.nostr.com/86 for more information`, def.method),
-				Flags:                     flags,
-				DisableSliceFlagSeparator: true,
 				Action: func(ctx context.Context, c *cli.Command) error {
 					params := make([]any, len(def.args))
 					for i, argName := range def.args {
@@ -101,7 +115,7 @@ var relay = &cli.Command{
 						return nil
 					}
 
-					kr, _, err := gatherKeyerFromArguments(ctx, c)
+					sec, bunker, err := gatherSecretKeyOrBunkerFromArguments(ctx, c)
 					if err != nil {
 						return err
 					}
@@ -118,7 +132,7 @@ var relay = &cli.Command{
 
 						// Authorization
 						payloadHash := sha256.Sum256(reqj)
-						tokenEvent := nostr.Event{
+						authEvent := nostr.Event{
 							Kind:      27235,
 							CreatedAt: nostr.Now(),
 							Tags: nostr.Tags{
@@ -127,10 +141,14 @@ var relay = &cli.Command{
 								{"payload", hex.EncodeToString(payloadHash[:])},
 							},
 						}
-						if err := kr.SignEvent(ctx, &tokenEvent); err != nil {
+						if bunker != nil {
-							return fmt.Errorf("failed to sign token event: %w", err)
+							if err := bunker.SignEvent(ctx, &authEvent); err != nil {
+								return fmt.Errorf("failed to sign with bunker: %w", err)
 							}
-						evtj, _ := json.Marshal(tokenEvent)
+						} else if err := authEvent.Sign(sec); err != nil {
+							return fmt.Errorf("error signing with provided key: %w", err)
+						}
+						evtj, _ := json.Marshal(authEvent)
 						req.Header.Set("Authorization", "Nostr "+base64.StdEncoding.EncodeToString(evtj))
 
 						// Content-Type
@@ -176,6 +194,7 @@ var relay = &cli.Command{
 
 					return nil
 				},
+				Flags: flags,
 			}
 
 			commands = append(commands, cmd)

req.go

@@ -2,25 +2,22 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"os"
 	"strings"
 
+	"github.com/fiatjaf/cli/v3"
 	"github.com/mailru/easyjson"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip77"
-	"github.com/urfave/cli/v3"
 )
 
-const (
+const CATEGORY_FILTER_ATTRIBUTES = "FILTER ATTRIBUTES"
-	CATEGORY_FILTER_ATTRIBUTES = "FILTER ATTRIBUTES"
-	// CATEGORY_SIGNER            = "SIGNER OPTIONS" -- defined at event.go as the same (yes, I know)
-)
 
 var req = &cli.Command{
 	Name:  "req",
 	Usage: "generates encoded REQ messages and optionally use them to talk to relays",
-	Description: `outputs a nip01 Nostr filter. when a relay is not given, will print the filter, otherwise will connect to the given relay and send the filter.
+	Description: `outputs a NIP-01 Nostr filter. when a relay is not given, will print the filter, otherwise will connect to the given relay and send the filter.
 
 example:
 		nak req -k 1 -l 15 wss://nostr.wine wss://nostr-pub.wellorder.net
@@ -31,158 +28,7 @@ it can also take a filter from stdin, optionally modify it with flags and send i
 example:
 		echo '{"kinds": [1], "#t": ["test"]}' | nak req -l 5 -k 4549 --tag t=spam wss://nostr-pub.wellorder.net`,
 	DisableSliceFlagSeparator: true,
-	Flags: append(defaultKeyFlags,
+	Flags: []cli.Flag{
-		append(reqFilterFlags,
-			&cli.BoolFlag{
-				Name:  "ids-only",
-				Usage: "use nip77 to fetch just a list of ids",
-			},
-			&cli.BoolFlag{
-				Name:        "stream",
-				Usage:       "keep the subscription open, printing all events as they are returned",
-				DefaultText: "false, will close on EOSE",
-			},
-			&cli.BoolFlag{
-				Name:        "paginate",
-				Usage:       "make multiple REQs to the relay decreasing the value of 'until' until 'limit' or 'since' conditions are met",
-				DefaultText: "false",
-			},
-			&cli.DurationFlag{
-				Name:  "paginate-interval",
-				Usage: "time between queries when using --paginate",
-			},
-			&cli.UintFlag{
-				Name:        "paginate-global-limit",
-				Usage:       "global limit at which --paginate should stop",
-				DefaultText: "uses the value given by --limit/-l or infinite",
-			},
-			&cli.BoolFlag{
-				Name:  "bare",
-				Usage: "when printing the filter, print just the filter, not enveloped in a [\"REQ\", ...] array",
-			},
-			&cli.BoolFlag{
-				Name:  "auth",
-				Usage: "always perform nip42 \"AUTH\" when facing an \"auth-required: \" rejection and try again",
-			},
-			&cli.BoolFlag{
-				Name:     "force-pre-auth",
-				Aliases:  []string{"fpa"},
-				Usage:    "after connecting, for a nip42 \"AUTH\" message to be received, act on it and only then send the \"REQ\"",
-				Category: CATEGORY_SIGNER,
-			},
-		)...,
-	),
-	ArgsUsage: "[relay...]",
-	Action: func(ctx context.Context, c *cli.Command) error {
-		relayUrls := c.Args().Slice()
-		if len(relayUrls) > 0 {
-			relays := connectToAllRelays(ctx,
-				relayUrls,
-				c.Bool("force-pre-auth"),
-				nostr.WithAuthHandler(
-					func(ctx context.Context, authEvent nostr.RelayEvent) (err error) {
-						defer func() {
-							if err != nil {
-								log("auth to %s failed: %s\n",
-									(*authEvent.Tags.GetFirst([]string{"relay", ""}))[1],
-									err,
-								)
-							}
-						}()
-
-						if !c.Bool("auth") && !c.Bool("force-pre-auth") {
-							return fmt.Errorf("auth not authorized")
-						}
-						kr, _, err := gatherKeyerFromArguments(ctx, c)
-						if err != nil {
-							return err
-						}
-
-						pk, _ := kr.GetPublicKey(ctx)
-						log("performing auth as %s... ", pk)
-
-						return kr.SignEvent(ctx, authEvent.Event)
-					},
-				),
-			)
-			if len(relays) == 0 {
-				log("failed to connect to any of the given relays.\n")
-				os.Exit(3)
-			}
-			relayUrls = make([]string, len(relays))
-			for i, relay := range relays {
-				relayUrls[i] = relay.URL
-			}
-
-			defer func() {
-				for _, relay := range relays {
-					relay.Close()
-				}
-			}()
-		}
-
-		for stdinFilter := range getJsonsOrBlank() {
-			filter := nostr.Filter{}
-			if stdinFilter != "" {
-				if err := easyjson.Unmarshal([]byte(stdinFilter), &filter); err != nil {
-					ctx = lineProcessingError(ctx, "invalid filter '%s' received from stdin: %s", stdinFilter, err)
-					continue
-				}
-			}
-
-			if err := applyFlagsToFilter(c, &filter); err != nil {
-				return err
-			}
-
-			if len(relayUrls) > 0 {
-				if c.Bool("ids-only") {
-					seen := make(map[string]struct{}, max(500, filter.Limit))
-					for _, url := range relayUrls {
-						ch, err := nip77.FetchIDsOnly(ctx, url, filter)
-						if err != nil {
-							log("negentropy call to %s failed: %s", url, err)
-							continue
-						}
-						for id := range ch {
-							if _, ok := seen[id]; ok {
-								continue
-							}
-							seen[id] = struct{}{}
-							stdout(id)
-						}
-					}
-				} else {
-					fn := sys.Pool.FetchMany
-					if c.Bool("paginate") {
-						fn = sys.Pool.PaginatorWithInterval(c.Duration("paginate-interval"))
-					} else if c.Bool("stream") {
-						fn = sys.Pool.SubscribeMany
-					}
-
-					for ie := range fn(ctx, relayUrls, filter) {
-						stdout(ie.Event)
-					}
-				}
-			} else {
-				// no relays given, will just print the filter
-				var result string
-				if c.Bool("bare") {
-					result = filter.String()
-				} else {
-					j, _ := json.Marshal(nostr.ReqEnvelope{SubscriptionID: "nak", Filters: nostr.Filters{filter}})
-					result = string(j)
-				}
-
-				stdout(result)
-			}
-		}
-
-		exitIfLineProcessingError(ctx)
-		return nil
-	},
-}
-
-var reqFilterFlags = []cli.Flag{
 		&cli.StringSliceFlag{
 			Name:     "author",
 			Aliases:  []string{"a"},
@@ -242,12 +88,119 @@ var reqFilterFlags = []cli.Flag{
 		},
 		&cli.StringFlag{
 			Name:     "search",
-		Usage:    "a nip50 search query, use it only with relays that explicitly support it",
+			Usage:    "a NIP-50 search query, use it only with relays that explicitly support it",
 			Category: CATEGORY_FILTER_ATTRIBUTES,
 		},
-}
+		&cli.BoolFlag{
+			Name:        "stream",
+			Usage:       "keep the subscription open, printing all events as they are returned",
+			DefaultText: "false, will close on EOSE",
+		},
+		&cli.BoolFlag{
+			Name:        "paginate",
+			Usage:       "make multiple REQs to the relay decreasing the value of 'until' until 'limit' or 'since' conditions are met",
+			DefaultText: "false",
+		},
+		&cli.DurationFlag{
+			Name:  "paginate-interval",
+			Usage: "time between queries when using --paginate",
+		},
+		&cli.UintFlag{
+			Name:        "paginate-global-limit",
+			Usage:       "global limit at which --paginate should stop",
+			DefaultText: "uses the value given by --limit/-l or infinite",
+		},
+		&cli.BoolFlag{
+			Name:  "bare",
+			Usage: "when printing the filter, print just the filter, not enveloped in a [\"REQ\", ...] array",
+		},
+		&cli.BoolFlag{
+			Name:  "auth",
+			Usage: "always perform NIP-42 \"AUTH\" when facing an \"auth-required: \" rejection and try again",
+		},
+		&cli.BoolFlag{
+			Name:    "force-pre-auth",
+			Aliases: []string{"fpa"},
+			Usage:   "after connecting, for a NIP-42 \"AUTH\" message to be received, act on it and only then send the \"REQ\"",
+		},
+		&cli.StringFlag{
+			Name:        "sec",
+			Usage:       "secret key to sign the AUTH challenge, as hex or nsec",
+			DefaultText: "the key '1'",
+			Value:       "0000000000000000000000000000000000000000000000000000000000000001",
+		},
+		&cli.BoolFlag{
+			Name:  "prompt-sec",
+			Usage: "prompt the user to paste a hex or nsec with which to sign the AUTH challenge",
+		},
+		&cli.StringFlag{
+			Name:  "connect",
+			Usage: "sign AUTH using NIP-46, expects a bunker://... URL",
+		},
+		&cli.StringFlag{
+			Name:        "connect-as",
+			Usage:       "private key to when communicating with the bunker given on --connect",
+			DefaultText: "a random key",
+		},
+	},
+	ArgsUsage: "[relay...]",
+	Action: func(ctx context.Context, c *cli.Command) error {
+		var pool *nostr.SimplePool
+
+		relayUrls := c.Args().Slice()
+		if len(relayUrls) > 0 {
+			var relays []*nostr.Relay
+			pool, relays = connectToAllRelays(ctx, relayUrls, c.Bool("force-pre-auth"), nostr.WithAuthHandler(func(evt *nostr.Event) error {
+				if !c.Bool("auth") && !c.Bool("force-pre-auth") {
+					return fmt.Errorf("auth not authorized")
+				}
+				sec, bunker, err := gatherSecretKeyOrBunkerFromArguments(ctx, c)
+				if err != nil {
+					return err
+				}
+
+				var pk string
+				if bunker != nil {
+					pk, err = bunker.GetPublicKey(ctx)
+					if err != nil {
+						return fmt.Errorf("failed to get public key from bunker: %w", err)
+					}
+				} else {
+					pk, _ = nostr.GetPublicKey(sec)
+				}
+				log("performing auth as %s... ", pk)
+
+				if bunker != nil {
+					return bunker.SignEvent(ctx, evt)
+				} else {
+					return evt.Sign(sec)
+				}
+			}))
+			if len(relays) == 0 {
+				log("failed to connect to any of the given relays.\n")
+				os.Exit(3)
+			}
+			relayUrls = make([]string, len(relays))
+			for i, relay := range relays {
+				relayUrls[i] = relay.URL
+			}
+
+			defer func() {
+				for _, relay := range relays {
+					relay.Close()
+				}
+			}()
+		}
+
+		for stdinFilter := range getStdinLinesOrBlank() {
+			filter := nostr.Filter{}
+			if stdinFilter != "" {
+				if err := easyjson.Unmarshal([]byte(stdinFilter), &filter); err != nil {
+					ctx = lineProcessingError(ctx, "invalid filter '%s' received from stdin: %s", stdinFilter, err)
+					continue
+				}
+			}
 
-func applyFlagsToFilter(c *cli.Command, filter *nostr.Filter) error {
 			if authors := c.StringSlice("author"); len(authors) > 0 {
 				filter.Authors = append(filter.Authors, authors...)
 			}
@@ -262,8 +215,8 @@ func applyFlagsToFilter(c *cli.Command, filter *nostr.Filter) error {
 			}
 			tags := make([][]string, 0, 5)
 			for _, tagFlag := range c.StringSlice("tag") {
-		spl := strings.SplitN(tagFlag, "=", 2)
+				spl := strings.Split(tagFlag, "=")
-		if len(spl) == 2 {
+				if len(spl) == 2 && len(spl[0]) == 1 {
 					tags = append(tags, spl)
 				} else {
 					return fmt.Errorf("invalid --tag '%s'", tagFlag)
@@ -306,5 +259,32 @@ func applyFlagsToFilter(c *cli.Command, filter *nostr.Filter) error {
 				filter.LimitZero = true
 			}
 
+			if len(relayUrls) > 0 {
+				fn := pool.SubManyEose
+				if c.Bool("paginate") {
+					fn = paginateWithPoolAndParams(pool, c.Duration("paginate-interval"), c.Uint("paginate-global-limit"))
+				} else if c.Bool("stream") {
+					fn = pool.SubMany
+				}
+
+				for ie := range fn(ctx, relayUrls, nostr.Filters{filter}) {
+					stdout(ie.Event)
+				}
+			} else {
+				// no relays given, will just print the filter
+				var result string
+				if c.Bool("bare") {
+					result = filter.String()
+				} else {
+					j, _ := json.Marshal(nostr.ReqEnvelope{SubscriptionID: "nak", Filters: nostr.Filters{filter}})
+					result = string(j)
+				}
+
+				stdout(result)
+			}
+		}
+
+		exitIfLineProcessingError(ctx)
 		return nil
+	},
 }

serve.go

@@ -1,19 +1,14 @@
 package main
 
 import (
-	"bufio"
 	"context"
 	"fmt"
-	"math"
 	"os"
-	"time"
 
-	"github.com/bep/debounce"
 	"github.com/fatih/color"
+	"github.com/fiatjaf/cli/v3"
 	"github.com/fiatjaf/eventstore/slicestore"
 	"github.com/fiatjaf/khatru"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/urfave/cli/v3"
 )
 
 var serve = &cli.Command{
@@ -21,15 +16,9 @@ var serve = &cli.Command{
 	Usage:                     "starts an in-memory relay for testing purposes",
 	DisableSliceFlagSeparator: true,
 	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "hostname",
-			Usage: "hostname where to listen for connections",
-			Value: "localhost",
-		},
 		&cli.UintFlag{
 			Name:  "port",
 			Usage: "port where to listen for connections",
-			Value: 10547,
 		},
 		&cli.StringFlag{
 			Name:        "events",
@@ -38,91 +27,38 @@ var serve = &cli.Command{
 		},
 	},
 	Action: func(ctx context.Context, c *cli.Command) error {
-		db := slicestore.SliceStore{MaxLimit: math.MaxInt}
+		db := slicestore.SliceStore{}
 
-		var scanner *bufio.Scanner
+        reader :=
 		if path := c.String("events"); path != "" {
 			f, err := os.Open(path)
 			if err != nil {
 				return fmt.Errorf("failed to file at '%s': %w", path, err)
 			}
-			scanner = bufio.NewScanner(f)
 		} else if isPiped() {
-			scanner = bufio.NewScanner(os.Stdin)
-		}
-
-		if scanner != nil {
-			scanner.Buffer(make([]byte, 16*1024*1024), 256*1024*1024)
-			i := 0
-			for scanner.Scan() {
-				var evt nostr.Event
-				if err := json.Unmarshal(scanner.Bytes(), &evt); err != nil {
-					return fmt.Errorf("invalid event received at line %d: %s (`%s`)", i, err, scanner.Text())
-				}
-				db.SaveEvent(ctx, &evt)
-				i++
-			}
 		}
 
 		rl := khatru.NewRelay()
-
-		rl.Info.Name = "nak serve"
-		rl.Info.Description = "a local relay for testing, debugging and development."
-		rl.Info.Software = "https://github.com/fiatjaf/nak"
-		rl.Info.Version = version
-
 		rl.QueryEvents = append(rl.QueryEvents, db.QueryEvents)
 		rl.CountEvents = append(rl.CountEvents, db.CountEvents)
 		rl.DeleteEvent = append(rl.DeleteEvent, db.DeleteEvent)
 		rl.StoreEvent = append(rl.StoreEvent, db.SaveEvent)
 
 		started := make(chan bool)
-		exited := make(chan error)
+		exited := make(chan bool)
-
-		hostname := c.String("hostname")
-		port := int(c.Uint("port"))
 
 		go func() {
-			err := rl.Start(hostname, port, started)
+			err := rl.Start("127.0.0.1", int(c.Uint("port")), started)
-			exited <- err
+			if err != nil {
+				log("error: %s", err)
+			}
+			exited <- true
 		}()
 
-		var printStatus func()
+		bold := color.New(color.Bold).Sprint
-
+		italic := color.New(color.Italic).Sprint
-		// relay logging
-		rl.RejectFilter = append(rl.RejectFilter, func(ctx context.Context, filter nostr.Filter) (reject bool, msg string) {
-			log("    got %s %v\n", color.HiYellowString("request"), colors.italic(filter))
-			printStatus()
-			return false, ""
-		})
-		rl.RejectCountFilter = append(rl.RejectCountFilter, func(ctx context.Context, filter nostr.Filter) (reject bool, msg string) {
-			log("    got %s %v\n", color.HiCyanString("count request"), colors.italic(filter))
-			printStatus()
-			return false, ""
-		})
-		rl.RejectEvent = append(rl.RejectEvent, func(ctx context.Context, event *nostr.Event) (reject bool, msg string) {
-			log("    got %s %v\n", color.BlueString("event"), colors.italic(event))
-			printStatus()
-			return false, ""
-		})
-
-		d := debounce.New(time.Second * 2)
-		printStatus = func() {
-			d(func() {
-				totalEvents := 0
-				ch, _ := db.QueryEvents(ctx, nostr.Filter{})
-				for range ch {
-					totalEvents++
-				}
-				subs := rl.GetListeningFilters()
-
-				log("  %s events stored: %s, subscriptions opened: %s\n", color.HiMagentaString("•"), color.HiMagentaString("%d", totalEvents), color.HiMagentaString("%d", len(subs)))
-			})
-		}
 
 		<-started
-		log("%s relay running at %s\n", color.HiRedString(">"), colors.boldf("ws://%s:%d", hostname, port))
+		log()
-
-		return <-exited
 	},
 }

verify.go

@@ -2,8 +2,9 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 	"github.com/nbd-wtf/go-nostr"
 )
 
@@ -31,7 +32,7 @@ it outputs nothing if the verification is successful.`,
 			}
 
 			if ok, err := evt.CheckSignature(); !ok {
-				ctx = lineProcessingError(ctx, "invalid signature: %v", err)
+				ctx = lineProcessingError(ctx, "invalid signature: %s", err)
 				continue
 			}
 		}

wallet.go

@@ -1,490 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip60"
-	"github.com/nbd-wtf/go-nostr/nip61"
-	"github.com/nbd-wtf/go-nostr/sdk"
-	"github.com/urfave/cli/v3"
-)
-
-func prepareWallet(ctx context.Context, c *cli.Command) (*nip60.Wallet, func(), error) {
-	kr, _, err := gatherKeyerFromArguments(ctx, c)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	pk, err := kr.GetPublicKey(ctx)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	relays := sys.FetchOutboxRelays(ctx, pk, 3)
-	w := nip60.LoadWallet(ctx, kr, sys.Pool, relays)
-	if w == nil {
-		return nil, nil, fmt.Errorf("error loading walle")
-	}
-
-	w.Processed = func(evt *nostr.Event, err error) {
-		if err == nil {
-			logverbose("processed event %s\n", evt)
-		} else {
-			log("error processing event %s: %s\n", evt, err)
-		}
-	}
-
-	w.PublishUpdate = func(event nostr.Event, deleted, received, change *nip60.Token, isHistory bool) {
-		desc := "wallet"
-		if received != nil {
-			mint, _ := strings.CutPrefix(received.Mint, "https://")
-			desc = fmt.Sprintf("received from %s with %d proofs totalling %d",
-				mint, len(received.Proofs), received.Proofs.Amount())
-		} else if change != nil {
-			mint, _ := strings.CutPrefix(change.Mint, "https://")
-			desc = fmt.Sprintf("change from %s with %d proofs totalling %d",
-				mint, len(change.Proofs), change.Proofs.Amount())
-		} else if deleted != nil {
-			mint, _ := strings.CutPrefix(deleted.Mint, "https://")
-			desc = fmt.Sprintf("deleting a used token from %s with %d proofs totalling %d",
-				mint, len(deleted.Proofs), deleted.Proofs.Amount())
-		} else if isHistory {
-			desc = "history entry"
-		}
-
-		log("- saving kind:%d event (%s)... ", event.Kind, desc)
-		first := true
-		for res := range sys.Pool.PublishMany(ctx, relays, event) {
-			cleanUrl, ok := strings.CutPrefix(res.RelayURL, "wss://")
-			if !ok {
-				cleanUrl = res.RelayURL
-			}
-
-			if !first {
-				log(", ")
-			}
-			first = false
-
-			if res.Error != nil {
-				log("%s: %s", color.RedString(cleanUrl), res.Error)
-			} else {
-				log("%s: ok", color.GreenString(cleanUrl))
-			}
-		}
-		log("\n")
-	}
-
-	<-w.Stable
-
-	return w, func() {
-		w.Close()
-	}, nil
-}
-
-var wallet = &cli.Command{
-	Name:                      "wallet",
-	Usage:                     "displays the current wallet balance",
-	Description:               "all wallet data is stored on Nostr relays, signed and encrypted with the given key, and reloaded again from relays on every call.\n\nthe same data can be accessed by other compatible nip60 clients.",
-	DisableSliceFlagSeparator: true,
-	Flags:                     defaultKeyFlags,
-	Action: func(ctx context.Context, c *cli.Command) error {
-		w, closew, err := prepareWallet(ctx, c)
-		if err != nil {
-			return err
-		}
-
-		stdout(w.Balance())
-
-		closew()
-		return nil
-	},
-	Commands: []*cli.Command{
-		{
-			Name:                      "mints",
-			Usage:                     "lists, adds or remove default mints from the wallet",
-			DisableSliceFlagSeparator: true,
-			Action: func(ctx context.Context, c *cli.Command) error {
-				w, closew, err := prepareWallet(ctx, c)
-				if err != nil {
-					return err
-				}
-
-				for _, url := range w.Mints {
-					stdout(strings.Split(url, "://")[1])
-				}
-
-				closew()
-				return nil
-			},
-			Commands: []*cli.Command{
-				{
-					Name:                      "add",
-					DisableSliceFlagSeparator: true,
-					ArgsUsage:                 "<mint>...",
-					Action: func(ctx context.Context, c *cli.Command) error {
-						w, closew, err := prepareWallet(ctx, c)
-						if err != nil {
-							return err
-						}
-
-						if err := w.AddMint(ctx, c.Args().Slice()...); err != nil {
-							return err
-						}
-
-						closew()
-						return nil
-					},
-				},
-				{
-					Name:                      "remove",
-					DisableSliceFlagSeparator: true,
-					ArgsUsage:                 "<mint>...",
-					Action: func(ctx context.Context, c *cli.Command) error {
-						w, closew, err := prepareWallet(ctx, c)
-						if err != nil {
-							return err
-						}
-
-						if err := w.RemoveMint(ctx, c.Args().Slice()...); err != nil {
-							return err
-						}
-
-						closew()
-						return nil
-					},
-				},
-			},
-		},
-		{
-			Name:                      "tokens",
-			Usage:                     "lists existing tokens with their mints and aggregated amounts",
-			DisableSliceFlagSeparator: true,
-			Action: func(ctx context.Context, c *cli.Command) error {
-				w, closew, err := prepareWallet(ctx, c)
-				if err != nil {
-					return err
-				}
-
-				for _, token := range w.Tokens {
-					stdout(token.ID(), token.Proofs.Amount(), strings.Split(token.Mint, "://")[1])
-				}
-
-				closew()
-				return nil
-			},
-		},
-		{
-			Name:                      "receive",
-			Usage:                     "takes a cashu token string as an argument and adds it to the wallet",
-			ArgsUsage:                 "<token>",
-			DisableSliceFlagSeparator: true,
-			Flags: []cli.Flag{
-				&cli.StringSliceFlag{
-					Name:  "mint",
-					Usage: "mint to swap the token into",
-				},
-			},
-			Action: func(ctx context.Context, c *cli.Command) error {
-				args := c.Args().Slice()
-				if len(args) != 1 {
-					return fmt.Errorf("must be called as `nak wallet receive <token>")
-				}
-
-				w, closew, err := prepareWallet(ctx, c)
-				if err != nil {
-					return err
-				}
-
-				proofs, mint, err := nip60.GetProofsAndMint(args[0])
-				if err != nil {
-					return err
-				}
-
-				opts := make([]nip60.ReceiveOption, 0, 1)
-				for _, url := range c.StringSlice("mint") {
-					opts = append(opts, nip60.WithMintDestination(url))
-				}
-
-				if err := w.Receive(ctx, proofs, mint, opts...); err != nil {
-					return err
-				}
-
-				closew()
-				return nil
-			},
-		},
-		{
-			Name:                      "send",
-			Usage:                     "prints a cashu token with the given amount for sending to someone else",
-			ArgsUsage:                 "<amount>",
-			DisableSliceFlagSeparator: true,
-			Flags: []cli.Flag{
-				&cli.StringFlag{
-					Name:  "mint",
-					Usage: "send from a specific mint",
-				},
-			},
-			Action: func(ctx context.Context, c *cli.Command) error {
-				args := c.Args().Slice()
-				if len(args) != 1 {
-					return fmt.Errorf("must be called as `nak wallet send <amount>")
-				}
-				amount, err := strconv.ParseUint(args[0], 10, 64)
-				if err != nil {
-					return fmt.Errorf("amount '%s' is invalid", args[0])
-				}
-
-				w, closew, err := prepareWallet(ctx, c)
-				if err != nil {
-					return err
-				}
-
-				opts := make([]nip60.SendOption, 0, 1)
-				if mint := c.String("mint"); mint != "" {
-					mint = "http" + nostr.NormalizeURL(mint)[2:]
-					opts = append(opts, nip60.WithMint(mint))
-				}
-				proofs, mint, err := w.Send(ctx, amount, opts...)
-				if err != nil {
-					return err
-				}
-
-				stdout(nip60.MakeTokenString(proofs, mint))
-
-				closew()
-				return nil
-			},
-		},
-		{
-			Name:                      "pay",
-			Usage:                     "pays a bolt11 lightning invoice and outputs the preimage",
-			ArgsUsage:                 "<invoice>",
-			DisableSliceFlagSeparator: true,
-			Flags: []cli.Flag{
-				&cli.StringFlag{
-					Name:  "mint",
-					Usage: "pay from a specific mint",
-				},
-			},
-			Action: func(ctx context.Context, c *cli.Command) error {
-				args := c.Args().Slice()
-				if len(args) != 1 {
-					return fmt.Errorf("must be called as `nak wallet pay <invoice>")
-				}
-
-				w, closew, err := prepareWallet(ctx, c)
-				if err != nil {
-					return err
-				}
-
-				opts := make([]nip60.SendOption, 0, 1)
-				if mint := c.String("mint"); mint != "" {
-					mint = "http" + nostr.NormalizeURL(mint)[2:]
-					opts = append(opts, nip60.WithMint(mint))
-				}
-
-				preimage, err := w.PayBolt11(ctx, args[0], opts...)
-				if err != nil {
-					return err
-				}
-
-				stdout(preimage)
-
-				closew()
-				return nil
-			},
-		},
-		{
-			Name:                      "nutzap",
-			Usage:                     "sends a nip61 nutzap to one or more Nostr profiles and/or events",
-			ArgsUsage:                 "<amount> <target>",
-			Description:               "<amount> is in satoshis, <target> can be an npub, nprofile, nevent or hex pubkey.",
-			DisableSliceFlagSeparator: true,
-			Flags: []cli.Flag{
-				&cli.StringFlag{
-					Name:  "mint",
-					Usage: "send from a specific mint",
-				},
-				&cli.StringFlag{
-					Name:  "message",
-					Usage: "attach a message to the nutzap",
-				},
-			},
-			Action: func(ctx context.Context, c *cli.Command) error {
-				args := c.Args().Slice()
-				if len(args) < 2 {
-					return fmt.Errorf("must be called as `nak wallet nutzap <amount> <target>...")
-				}
-
-				w, closew, err := prepareWallet(ctx, c)
-				if err != nil {
-					return err
-				}
-
-				amount := c.Uint("amount")
-				target := c.String("target")
-
-				var evt *nostr.Event
-				var eventId string
-
-				if strings.HasPrefix(target, "nevent1") {
-					evt, _, err = sys.FetchSpecificEventFromInput(ctx, target, sdk.FetchSpecificEventParameters{
-						WithRelays: false,
-					})
-					if err != nil {
-						return err
-					}
-					eventId = evt.ID
-					target = evt.PubKey
-				}
-
-				pm, err := sys.FetchProfileFromInput(ctx, target)
-				if err != nil {
-					return err
-				}
-
-				log("sending %d sat to '%s' (%s)", amount, pm.ShortName(), pm.Npub())
-
-				opts := make([]nip60.SendOption, 0, 1)
-				if mint := c.String("mint"); mint != "" {
-					mint = "http" + nostr.NormalizeURL(mint)[2:]
-					opts = append(opts, nip60.WithMint(mint))
-				}
-
-				kr, _, _ := gatherKeyerFromArguments(ctx, c)
-				results, err := nip61.SendNutzap(
-					ctx,
-					kr,
-					w,
-					sys.Pool,
-					pm.PubKey,
-					sys.FetchInboxRelays,
-					sys.FetchOutboxRelays(ctx, pm.PubKey, 3),
-					eventId,
-					amount,
-					c.String("message"),
-				)
-				if err != nil {
-					return err
-				}
-
-				log("- publishing nutzap... ")
-				first := true
-				for res := range results {
-					cleanUrl, ok := strings.CutPrefix(res.RelayURL, "wss://")
-					if !ok {
-						cleanUrl = res.RelayURL
-					}
-
-					if !first {
-						log(", ")
-					}
-					first = false
-					if res.Error != nil {
-						log("%s: %s", color.RedString(cleanUrl), res.Error)
-					} else {
-						log("%s: ok", color.GreenString(cleanUrl))
-					}
-				}
-
-				closew()
-				return nil
-			},
-			Commands: []*cli.Command{
-				{
-					Name:                      "setup",
-					Usage:                     "setup your wallet private key and kind:10019 event for receiving nutzaps",
-					DisableSliceFlagSeparator: true,
-					Flags: []cli.Flag{
-						&cli.StringSliceFlag{
-							Name:  "mint",
-							Usage: "mints to receive nutzaps in",
-						},
-						&cli.StringFlag{
-							Name:  "private-key",
-							Usage: "private key used for receiving nutzaps",
-						},
-						&cli.BoolFlag{
-							Name:    "force",
-							Aliases: []string{"f"},
-							Usage:   "forces replacement of private-key",
-						},
-					},
-					Action: func(ctx context.Context, c *cli.Command) error {
-						w, closew, err := prepareWallet(ctx, c)
-						if err != nil {
-							return err
-						}
-
-						if w.PrivateKey == nil {
-							if sk := c.String("private-key"); sk != "" {
-								if err := w.SetPrivateKey(ctx, sk); err != nil {
-									return err
-								}
-							} else {
-								return fmt.Errorf("missing --private-key")
-							}
-						} else if sk := c.String("private-key"); sk != "" && !c.Bool("force") {
-							return fmt.Errorf("refusing to replace existing private key, use the --force flag")
-						}
-
-						kr, _, _ := gatherKeyerFromArguments(ctx, c)
-						pk, _ := kr.GetPublicKey(ctx)
-						relays := sys.FetchWriteRelays(ctx, pk, 6)
-
-						info := nip61.Info{}
-						ie := sys.Pool.QuerySingle(ctx, relays, nostr.Filter{
-							Kinds:   []int{10019},
-							Authors: []string{pk},
-							Limit:   1,
-						})
-						if ie != nil {
-							info.ParseEvent(ie.Event)
-						}
-
-						if mints := c.StringSlice("mints"); len(mints) == 0 && len(info.Mints) == 0 {
-							info.Mints = w.Mints
-						}
-						if len(info.Mints) == 0 {
-							return fmt.Errorf("missing --mint")
-						}
-
-						evt := nostr.Event{}
-						if err := info.ToEvent(ctx, kr, &evt); err != nil {
-							return err
-						}
-
-						stdout(evt)
-						log("- saving kind:10019 event... ")
-						first := true
-						for res := range sys.Pool.PublishMany(ctx, relays, evt) {
-							cleanUrl, ok := strings.CutPrefix(res.RelayURL, "wss://")
-							if !ok {
-								cleanUrl = res.RelayURL
-							}
-
-							if !first {
-								log(", ")
-							}
-							first = false
-
-							if res.Error != nil {
-								log("%s: %s", color.RedString(cleanUrl), res.Error)
-							} else {
-								log("%s: ok", color.GreenString(cleanUrl))
-							}
-						}
-
-						closew()
-						return nil
-					},
-				},
-			},
-		},
-	},
-}

zapstore.yaml

@@ -1,14 +0,0 @@
-nak:
-  cli:
-    name: nak
-    summary: a command line tool for doing all things nostr
-    repository: https://github.com/fiatjaf/nak
-    artifacts:
-      nak-v%v-darwin-arm64:
-        platforms: [darwin-arm64]
-      nak-v%v-darwin-amd64:
-        platforms: [darwin-x86_64]
-      nak-v%v-linux-arm64:
-        platforms: [linux-aarch64]
-      nak-v%v-linux-amd64:
-        platforms: [linux-x86_64]