wip

README.md

@@ -180,26 +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"}
-```
-
 ## contributing to this repository
 
 Use NIP-34 to send your patches to `naddr1qqpkucttqy28wumn8ghj7un9d3shjtnwdaehgu3wvfnsz9nhwden5te0wfjkccte9ehx7um5wghxyctwvsq3gamnwvaz7tmjv4kxz7fwv3sk6atn9e5k7q3q80cvv07tjdrrgpa0j7j7tmnyl2yr6yr7l8j4s3evf6u64th6gkwsxpqqqpmej2wctpn`.

bunker.go

@@ -85,8 +85,8 @@ var bunker = &cli.Command{
 			return err
 		}
 		npub, _ := nip19.EncodePublicKey(pubkey)
-		bold := color.New(color.Bold).Sprintf
-		italic := color.New(color.Italic).Sprintf
+		bold := color.New(color.Bold).Sprint
+		italic := color.New(color.Italic).Sprint
 
 		// this function will be called every now and then
 		printBunkerInfo := func() {
@@ -132,7 +132,7 @@ 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",
-				bold("%v", relayURLs),
+				bold(relayURLs),
 				bold(pubkey),
 				bold(npub),
 				authorizedKeysStr,

event.go

@@ -11,16 +11,11 @@ import (
 	"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"
 	"golang.org/x/exp/slices"
 )
 
-const (
-	CATEGORY_EVENT_FIELDS = "EVENT FIELDS"
-	CATEGORY_SIGNER       = "SIGNER OPTIONS"
-	CATEGORY_EXTRAS       = "EXTRAS"
-)
+const CATEGORY_EVENT_FIELDS = "EVENT FIELDS"
 
 var event = &cli.Command{
 	Name:  "event",
@@ -43,23 +38,19 @@ example:
 			Usage:       "secret key to sign the event, as nsec, ncryptsec or hex",
 			DefaultText: "the key '1'",
 			Value:       "0000000000000000000000000000000000000000000000000000000000000001",
-			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,
+			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",
-			Category: CATEGORY_SIGNER,
+			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",
-			Category:    CATEGORY_SIGNER,
 		},
 		// ~ these args are only for the convoluted musig2 signing process
 		// they will be generally copy-shared-pasted across some manual coordination method between participants
@@ -68,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",
@@ -87,25 +77,17 @@ example:
 			Hidden: true,
 		},
 		// ~~~
-		&cli.UintFlag{
-			Name:     "pow",
-			Usage:    "NIP-13 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",
 		},
 		&cli.BoolFlag{
-			Name:     "envelope",
-			Usage:    "print the event enveloped in a [\"EVENT\", ...] message ready to be sent to a relay",
-			Category: CATEGORY_EXTRAS,
+			Name:  "auth",
+			Usage: "always perform NIP-42 \"AUTH\" when facing an \"auth-required: \" rejection and try again",
 		},
 		&cli.BoolFlag{
-			Name:     "auth",
-			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,
+			Name:  "nevent",
+			Usage: "print the nevent code (to stderr) after the event is published",
 		},
 		&cli.UintFlag{
 			Name:        "kind",
@@ -211,9 +193,8 @@ example:
 				mustRehashAndResign = true
 			}
 
-			tagFlags := c.StringSlice("tag")
-			tags := make(nostr.Tags, 0, len(tagFlags)+2)
-			for _, tagFlag := range tagFlags {
+			tags := make(nostr.Tags, 0, 5)
+			for _, tagFlag := range c.StringSlice("tag") {
 				// tags are in the format key=value
 				tagName, tagValue, found := strings.Cut(tagFlag, "=")
 				tag := []string{tagName}
@@ -222,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 {
@@ -249,31 +233,6 @@ example:
 				mustRehashAndResign = true
 			}
 
-			if difficulty := c.Uint("pow"); difficulty > 0 {
-				// before doing pow we need the pubkey
-				if bunker != nil {
-					evt.PubKey, err = bunker.GetPublicKey(ctx)
-					if err != nil {
-						return fmt.Errorf("can't pow: failed to get public key from bunker: %w", err)
-					}
-				} else if numSigners := c.Uint("musig"); numSigners > 1 && sec != "" {
-					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, _ = nostr.GetPublicKey(sec)
-				}
-
-				// try to generate work with this difficulty -- essentially forever
-				nip13.Generate(&evt, int(difficulty), time.Hour*24*365)
-				mustRehashAndResign = true
-			}
-
 			if evt.Sig == "" || mustRehashAndResign {
 				if bunker != nil {
 					if err := bunker.SignEvent(ctx, &evt); err != nil {

example_test.go

@@ -116,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", "2018-05-19 03:37:19", "-c", "nn"})
-	// Output:
-	// {"kind":1,"id":"0000d199127d5e15046b0a3f2885d464ee18f70968303665ef76326a7d828312","pubkey":"79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798","created_at":1724160467,"tags":[["plu","pla"],["e","3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24"],["nonce","24783","16"]],"content":"nn","sig":"99471b43ce82ca01fb9b61f36b45ca542870854b2466a9d3884891598f7d7baef36d07f4b02bb194f2f6f781973f24c3d946f702c82321c6cb0c564e76cf43db"}
-}

fetch.go

@@ -5,31 +5,30 @@ import (
 
 	"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"
 	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 NIP-65 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 {
-		sys := sdk.NewSystem()
+		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
 			})
@@ -37,68 +36,56 @@ var fetch = &cli.Command{
 
 		for code := range getStdinLinesOrArguments(c.Args()) {
 			filter := nostr.Filter{}
-			var authorHint string
+
+			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
 
-			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
-				}
-
-				if err := normalizeAndValidateRelayURLs(relays); err != nil {
-					return err
-				}
-
-				switch prefix {
-				case "nevent":
-					v := value.(nostr.EventPointer)
-					filter.IDs = append(filter.IDs, v.ID)
-					if v.Author != "" {
-						authorHint = v.Author
-					}
-					relays = append(relays, v.Relays...)
-				case "naddr":
-					v := value.(nostr.EntityPointer)
-					filter.Tags = nostr.TagMap{"d": []string{v.Identifier}}
-					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)
-					authorHint = v.PublicKey
-					relays = append(relays, v.Relays...)
-				case "npub":
-					v := value.(string)
-					filter.Authors = append(filter.Authors, v)
-					authorHint = v
+			switch prefix {
+			case "nevent":
+				v := value.(nostr.EventPointer)
+				filter.IDs = append(filter.IDs, v.ID)
+				if v.Author != "" {
+					authorHint = v.Author
 				}
+				relays = append(relays, v.Relays...)
+			case "naddr":
+				v := value.(nostr.EntityPointer)
+				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
 			}
 
 			if authorHint != "" {
-				relays := sys.FetchOutboxRelays(ctx, authorHint, 3)
-				for _, url := range relays {
-					relays = append(relays, url)
+				relayList := sdk.FetchRelaysForPubkey(ctx, pool, authorHint,
+					"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 {
+					if relayListItem.Outbox {
+						relays = append(relays, relayListItem.URL)
+					}
 				}
-
-				if len(filter.Kinds) == 0 {
-					filter.Kinds = append(filter.Kinds, 0)
-				}
-			}
-
-			if err := applyFlagsToFilter(c, &filter); err != nil {
-				return err
 			}
 
 			if len(relays) == 0 {
@@ -106,7 +93,7 @@ var fetch = &cli.Command{
 				continue
 			}
 
-			for ie := range sys.Pool.SubManyEose(ctx, relays, nostr.Filters{filter}) {
+			for ie := range pool.SubManyEose(ctx, relays, nostr.Filters{filter}) {
 				stdout(ie.Event)
 			}
 		}

go.mod

@@ -5,7 +5,6 @@ go 1.22
 toolchain go1.22.4
 
 require (
-	github.com/bep/debounce v1.2.1
 	github.com/btcsuite/btcd/btcec/v2 v2.3.3
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
@@ -15,8 +14,8 @@ require (
 	github.com/fiatjaf/khatru v0.7.5
 	github.com/mailru/easyjson v0.7.7
 	github.com/markusmobius/go-dateparser v1.2.3
-	github.com/nbd-wtf/go-nostr v0.34.8
-	github.com/nbd-wtf/nostr-sdk v0.5.0
+	github.com/nbd-wtf/go-nostr v0.34.5
+	github.com/nbd-wtf/nostr-sdk v0.0.5
 	golang.org/x/exp v0.0.0-20240707233637-46b078467d37
 )
 
@@ -24,19 +23,14 @@ require (
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chzyer/logex v1.1.10 // indirect
 	github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
 	github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/elliotchance/pie/v2 v2.7.0 // indirect
 	github.com/fasthttp/websocket v1.5.7 // indirect
-	github.com/fiatjaf/generic-ristretto v0.0.1 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
-	github.com/golang/glog v1.1.2 // 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
@@ -45,7 +39,6 @@ require (
 	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/pkg/errors v0.9.1 // indirect
 	github.com/puzpuzpuz/xsync/v3 v3.1.0 // indirect
 	github.com/rs/cors v1.7.0 // indirect
 	github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect

go.sum

@@ -1,8 +1,6 @@
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
 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.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
@@ -27,8 +25,6 @@ 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/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.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=
@@ -46,10 +42,6 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeC
 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/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
-github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/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/elliotchance/pie/v2 v2.7.0 h1:FqoIKg4uj0G/CrLGuMS9ejnFKa92lxE1dEgBD3pShXg=
 github.com/elliotchance/pie/v2 v2.7.0/go.mod h1:18t0dgGFH006g4eVdDtWfgFZPQEgl10IoEO8YWEq3Og=
 github.com/fasthttp/websocket v1.5.7 h1:0a6o2OfeATvtGgoMKleURhLT6JqWPg7fYfWnH4KHau4=
@@ -60,8 +52,6 @@ github.com/fiatjaf/cli/v3 v3.0.0-20240723181502-e7dd498b16ae h1:0B/1dU3YECIbPoBI
 github.com/fiatjaf/cli/v3 v3.0.0-20240723181502-e7dd498b16ae/go.mod h1:aAWPO4bixZZxPtOnH6K3q4GbQ0jftUNDW9Oa861IRew=
 github.com/fiatjaf/eventstore v0.7.1 h1:5f2yvEtYvsvMBNttysmXhSSum5M1qwvPzjEQ/BFue7Q=
 github.com/fiatjaf/eventstore v0.7.1/go.mod h1:ek/yWbanKVG767fK51Q3+6Mvi5oEHYSsdPym40nZexw=
-github.com/fiatjaf/generic-ristretto v0.0.1 h1:LUJSU87X/QWFsBXTwnH3moFe4N8AjUxT+Rfa0+bo6YM=
-github.com/fiatjaf/generic-ristretto v0.0.1/go.mod h1:cvV6ANHDA/GrfzVrig7N7i6l8CWnkVZvtQ2/wk9DPVE=
 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=
@@ -72,8 +62,6 @@ 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/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
-github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 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=
@@ -85,8 +73,6 @@ 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/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=
@@ -113,10 +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/nbd-wtf/go-nostr v0.34.8 h1:wExcoeaFX5DZKzZruQlrEYVd59Z6GmRyPCltTuoyn9g=
-github.com/nbd-wtf/go-nostr v0.34.8/go.mod h1:NZQkxl96ggbO8rvDpVjcsojJqKTPwqhP4i82O7K5DJs=
-github.com/nbd-wtf/nostr-sdk v0.5.0 h1:zrMxcvMSxkw29RyfXEdF3XW5rUWLuT5Q9oBAhd5dyew=
-github.com/nbd-wtf/nostr-sdk v0.5.0/go.mod h1:MJ7gYv3XiZKU6MHSM0N7oHqQAQhbvpgGQk4Q+XUdIUs=
+github.com/nbd-wtf/go-nostr v0.34.5 h1:vti8WqvGWbVoWAPniaz7li2TpCyC+7ZS62Gmy7ib/z0=
+github.com/nbd-wtf/go-nostr v0.34.5/go.mod h1:NZQkxl96ggbO8rvDpVjcsojJqKTPwqhP4i82O7K5DJs=
+github.com/nbd-wtf/nostr-sdk v0.0.5 h1:rec+FcDizDVO0W25PX0lgYMXvP7zNNOgI3Fu9UCm4BY=
+github.com/nbd-wtf/nostr-sdk v0.0.5/go.mod h1:iJJsikesCGLNFZ9dLqhLPDzdt924EagUmdQxT3w2Lmk=
 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=
@@ -126,8 +112,6 @@ 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.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4=

main.go

@@ -25,7 +25,6 @@ var app = &cli.Command{
 		verify,
 		relay,
 		bunker,
-		serve,
 	},
 	Flags: []cli.Flag{
 		&cli.BoolFlag{
@@ -38,7 +37,7 @@ var app = &cli.Command{
 				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

musig2.go

@@ -15,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,

req.go

@@ -12,10 +12,7 @@ import (
 	"github.com/nbd-wtf/go-nostr"
 )
 
-const (
-	CATEGORY_FILTER_ATTRIBUTES = "FILTER ATTRIBUTES"
-	// CATEGORY_SIGNER            = "SIGNER OPTIONS" -- defined at event.go as the same (yes, I know)
-)
+const CATEGORY_FILTER_ATTRIBUTES = "FILTER ATTRIBUTES"
 
 var req = &cli.Command{
 	Name:  "req",
@@ -31,7 +28,69 @@ 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(reqFilterFlags,
+	Flags: []cli.Flag{
+		&cli.StringSliceFlag{
+			Name:     "author",
+			Aliases:  []string{"a"},
+			Usage:    "only accept events from these authors (pubkey as hex)",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.StringSliceFlag{
+			Name:     "id",
+			Aliases:  []string{"i"},
+			Usage:    "only accept events with these ids (hex)",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.IntSliceFlag{
+			Name:     "kind",
+			Aliases:  []string{"k"},
+			Usage:    "only accept events with these kind numbers",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.StringSliceFlag{
+			Name:     "tag",
+			Aliases:  []string{"t"},
+			Usage:    "takes a tag like -t e=<id>, only accept events with these tags",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.StringSliceFlag{
+			Name:     "e",
+			Usage:    "shortcut for --tag e=<value>",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.StringSliceFlag{
+			Name:     "p",
+			Usage:    "shortcut for --tag p=<value>",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.StringSliceFlag{
+			Name:     "d",
+			Usage:    "shortcut for --tag d=<value>",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&NaturalTimeFlag{
+			Name:     "since",
+			Aliases:  []string{"s"},
+			Usage:    "only accept events newer than this (unix timestamp)",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&NaturalTimeFlag{
+			Name:     "until",
+			Aliases:  []string{"u"},
+			Usage:    "only accept events older than this (unix timestamp)",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.UintFlag{
+			Name:     "limit",
+			Aliases:  []string{"l"},
+			Usage:    "only accept up to this number of events",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.StringFlag{
+			Name:     "search",
+			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",
@@ -60,35 +119,30 @@ example:
 			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\"",
-			Category: CATEGORY_SIGNER,
+			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",
-			Category:    CATEGORY_SIGNER,
 		},
 		&cli.BoolFlag{
-			Name:     "prompt-sec",
-			Usage:    "prompt the user to paste a hex or nsec with which to sign the AUTH challenge",
-			Category: CATEGORY_SIGNER,
+			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",
-			Category: CATEGORY_SIGNER,
+			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",
-			Category:    CATEGORY_SIGNER,
 		},
-	),
+	},
 	ArgsUsage: "[relay...]",
 	Action: func(ctx context.Context, c *cli.Command) error {
 		var pool *nostr.SimplePool
@@ -147,8 +201,62 @@ example:
 				}
 			}
 
-			if err := applyFlagsToFilter(c, &filter); err != nil {
-				return err
+			if authors := c.StringSlice("author"); len(authors) > 0 {
+				filter.Authors = append(filter.Authors, authors...)
+			}
+			if ids := c.StringSlice("id"); len(ids) > 0 {
+				filter.IDs = append(filter.IDs, ids...)
+			}
+			for _, kind64 := range c.IntSlice("kind") {
+				filter.Kinds = append(filter.Kinds, int(kind64))
+			}
+			if search := c.String("search"); search != "" {
+				filter.Search = search
+			}
+			tags := make([][]string, 0, 5)
+			for _, tagFlag := range c.StringSlice("tag") {
+				spl := strings.Split(tagFlag, "=")
+				if len(spl) == 2 && len(spl[0]) == 1 {
+					tags = append(tags, spl)
+				} else {
+					return fmt.Errorf("invalid --tag '%s'", tagFlag)
+				}
+			}
+			for _, etag := range c.StringSlice("e") {
+				tags = append(tags, []string{"e", etag})
+			}
+			for _, ptag := range c.StringSlice("p") {
+				tags = append(tags, []string{"p", ptag})
+			}
+			for _, dtag := range c.StringSlice("d") {
+				tags = append(tags, []string{"d", dtag})
+			}
+
+			if len(tags) > 0 && filter.Tags == nil {
+				filter.Tags = make(nostr.TagMap)
+			}
+
+			for _, tag := range tags {
+				if _, ok := filter.Tags[tag[0]]; !ok {
+					filter.Tags[tag[0]] = make([]string, 0, 3)
+				}
+				filter.Tags[tag[0]] = append(filter.Tags[tag[0]], tag[1])
+			}
+
+			if c.IsSet("since") {
+				nts := getNaturalDate(c, "since")
+				filter.Since = &nts
+			}
+
+			if c.IsSet("until") {
+				nts := getNaturalDate(c, "until")
+				filter.Until = &nts
+			}
+
+			if limit := c.Uint("limit"); limit != 0 {
+				filter.Limit = int(limit)
+			} else if c.IsSet("limit") {
+				filter.LimitZero = true
 			}
 
 			if len(relayUrls) > 0 {
@@ -180,130 +288,3 @@ example:
 		return nil
 	},
 }
-
-var reqFilterFlags = []cli.Flag{
-	&cli.StringSliceFlag{
-		Name:     "author",
-		Aliases:  []string{"a"},
-		Usage:    "only accept events from these authors (pubkey as hex)",
-		Category: CATEGORY_FILTER_ATTRIBUTES,
-	},
-	&cli.StringSliceFlag{
-		Name:     "id",
-		Aliases:  []string{"i"},
-		Usage:    "only accept events with these ids (hex)",
-		Category: CATEGORY_FILTER_ATTRIBUTES,
-	},
-	&cli.IntSliceFlag{
-		Name:     "kind",
-		Aliases:  []string{"k"},
-		Usage:    "only accept events with these kind numbers",
-		Category: CATEGORY_FILTER_ATTRIBUTES,
-	},
-	&cli.StringSliceFlag{
-		Name:     "tag",
-		Aliases:  []string{"t"},
-		Usage:    "takes a tag like -t e=<id>, only accept events with these tags",
-		Category: CATEGORY_FILTER_ATTRIBUTES,
-	},
-	&cli.StringSliceFlag{
-		Name:     "e",
-		Usage:    "shortcut for --tag e=<value>",
-		Category: CATEGORY_FILTER_ATTRIBUTES,
-	},
-	&cli.StringSliceFlag{
-		Name:     "p",
-		Usage:    "shortcut for --tag p=<value>",
-		Category: CATEGORY_FILTER_ATTRIBUTES,
-	},
-	&cli.StringSliceFlag{
-		Name:     "d",
-		Usage:    "shortcut for --tag d=<value>",
-		Category: CATEGORY_FILTER_ATTRIBUTES,
-	},
-	&NaturalTimeFlag{
-		Name:     "since",
-		Aliases:  []string{"s"},
-		Usage:    "only accept events newer than this (unix timestamp)",
-		Category: CATEGORY_FILTER_ATTRIBUTES,
-	},
-	&NaturalTimeFlag{
-		Name:     "until",
-		Aliases:  []string{"u"},
-		Usage:    "only accept events older than this (unix timestamp)",
-		Category: CATEGORY_FILTER_ATTRIBUTES,
-	},
-	&cli.UintFlag{
-		Name:     "limit",
-		Aliases:  []string{"l"},
-		Usage:    "only accept up to this number of events",
-		Category: CATEGORY_FILTER_ATTRIBUTES,
-	},
-	&cli.StringFlag{
-		Name:     "search",
-		Usage:    "a NIP-50 search query, use it only with relays that explicitly support it",
-		Category: CATEGORY_FILTER_ATTRIBUTES,
-	},
-}
-
-func applyFlagsToFilter(c *cli.Command, filter *nostr.Filter) error {
-	if authors := c.StringSlice("author"); len(authors) > 0 {
-		filter.Authors = append(filter.Authors, authors...)
-	}
-	if ids := c.StringSlice("id"); len(ids) > 0 {
-		filter.IDs = append(filter.IDs, ids...)
-	}
-	for _, kind64 := range c.IntSlice("kind") {
-		filter.Kinds = append(filter.Kinds, int(kind64))
-	}
-	if search := c.String("search"); search != "" {
-		filter.Search = search
-	}
-	tags := make([][]string, 0, 5)
-	for _, tagFlag := range c.StringSlice("tag") {
-		spl := strings.Split(tagFlag, "=")
-		if len(spl) == 2 && len(spl[0]) == 1 {
-			tags = append(tags, spl)
-		} else {
-			return fmt.Errorf("invalid --tag '%s'", tagFlag)
-		}
-	}
-	for _, etag := range c.StringSlice("e") {
-		tags = append(tags, []string{"e", etag})
-	}
-	for _, ptag := range c.StringSlice("p") {
-		tags = append(tags, []string{"p", ptag})
-	}
-	for _, dtag := range c.StringSlice("d") {
-		tags = append(tags, []string{"d", dtag})
-	}
-
-	if len(tags) > 0 && filter.Tags == nil {
-		filter.Tags = make(nostr.TagMap)
-	}
-
-	for _, tag := range tags {
-		if _, ok := filter.Tags[tag[0]]; !ok {
-			filter.Tags[tag[0]] = make([]string, 0, 3)
-		}
-		filter.Tags[tag[0]] = append(filter.Tags[tag[0]], tag[1])
-	}
-
-	if c.IsSet("since") {
-		nts := getNaturalDate(c, "since")
-		filter.Since = &nts
-	}
-
-	if c.IsSet("until") {
-		nts := getNaturalDate(c, "until")
-		filter.Until = &nts
-	}
-
-	if limit := c.Uint("limit"); limit != 0 {
-		filter.Limit = int(limit)
-	} else if c.IsSet("limit") {
-		filter.LimitZero = true
-	}
-
-	return nil
-}

serve.go

@@ -1,20 +1,14 @@
 package main
 
 import (
-	"bufio"
 	"context"
-	"encoding/json"
 	"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"
 )
 
 var serve = &cli.Command{
@@ -22,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",
@@ -39,30 +27,15 @@ 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()
@@ -72,55 +45,20 @@ var serve = &cli.Command{
 		rl.StoreEvent = append(rl.StoreEvent, db.SaveEvent)
 
 		started := make(chan bool)
-		exited := make(chan error)
-
-		hostname := c.String("hostname")
-		port := int(c.Uint("port"))
+		exited := make(chan bool)
 
 		go func() {
-			err := rl.Start(hostname, port, started)
-			exited <- err
+			err := rl.Start("127.0.0.1", int(c.Uint("port")), started)
+			if err != nil {
+				log("error: %s", err)
+			}
+			exited <- true
 		}()
 
-		bold := color.New(color.Bold).Sprintf
+		bold := color.New(color.Bold).Sprint
 		italic := color.New(color.Italic).Sprint
 
-		var printStatus func()
-
-		// 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"), 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"), 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"), 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(">"), bold("ws://%s:%d", hostname, port))
-
-		return <-exited
+		log()
 	},
 }