go mod tidy works now at least.

eventstore/bluge/lib.go

@@ -1,12 +1,14 @@
 package bluge
 
 import (
+	"errors"
 	"fmt"
 	"sync"
 
+	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore"
 	"github.com/blugelabs/bluge"
 	"github.com/blugelabs/bluge/analysis/token"
-	"fiatjaf.com/nostr/eventstore"
 	"golang.org/x/text/unicode/norm"
 )
 
@@ -50,3 +52,7 @@ func (b *BlugeBackend) Init() error {
 
 	return nil
 }
+
+func (b *BlugeBackend) CountEvents(nostr.Filter) (int64, error) {
+	return 0, errors.New("not supported")
+}

eventstore/bluge/replace.go

@@ -1,7 +1,6 @@
 package bluge
 
 import (
-	"context"
 	"fmt"
 
 	"fiatjaf.com/nostr"
@@ -9,7 +8,7 @@ import (
 	"fiatjaf.com/nostr/eventstore/internal"
 )
 
-func (b *BlugeBackend) ReplaceEvent(ctx context.Context, evt nostr.Event) error {
+func (b *BlugeBackend) ReplaceEvent(evt nostr.Event) error {
 	b.Lock()
 	defer b.Unlock()
 
@@ -30,7 +29,7 @@ func (b *BlugeBackend) ReplaceEvent(ctx context.Context, evt nostr.Event) error
 	}
 
 	if shouldStore {
-		if err := b.SaveEvent(ctx, evt); err != nil && err != eventstore.ErrDupEvent {
+		if err := b.SaveEvent(evt); err != nil && err != eventstore.ErrDupEvent {
 			return fmt.Errorf("failed to save: %w", err)
 		}
 	}

eventstore/cmd/eventstore/helpers.go

@@ -28,16 +28,6 @@ func detect(dir string) (string, error) {
 		return "", err
 	}
 	if !f.IsDir() {
-		f, err := os.Open(dir)
-		if err != nil {
-			return "", err
-		}
-		buf := make([]byte, 15)
-		f.Read(buf)
-		if string(buf) == "SQLite format 3" {
-			return "sqlite", nil
-		}
-
 		return "", fmt.Errorf("unknown db format")
 	}
 

eventstore/cmd/eventstore/main.go

@@ -9,16 +9,11 @@ import (
 	"os"
 	"strings"
 
+	"fiatjaf.com/nostr"
 	"fiatjaf.com/nostr/eventstore"
 	"fiatjaf.com/nostr/eventstore/badger"
-	"fiatjaf.com/nostr/eventstore/elasticsearch"
 	"fiatjaf.com/nostr/eventstore/lmdb"
-	"fiatjaf.com/nostr/eventstore/mysql"
-	"fiatjaf.com/nostr/eventstore/postgresql"
 	"fiatjaf.com/nostr/eventstore/slicestore"
-	"fiatjaf.com/nostr/eventstore/sqlite3"
-	"fiatjaf.com/nostr/eventstore/strfry"
-	"fiatjaf.com/nostr"
 	"github.com/urfave/cli/v3"
 )
 
@@ -38,7 +33,7 @@ var app = &cli.Command{
 		&cli.StringFlag{
 			Name:    "type",
 			Aliases: []string{"t"},
-			Usage:   "store type ('sqlite', 'lmdb', 'badger', 'postgres', 'mysql', 'elasticsearch', 'mmm')",
+			Usage:   "store type ('lmdb', 'badger', 'mmm')",
 		},
 	},
 	Before: func(ctx context.Context, c *cli.Command) (context.Context, error) {
@@ -57,8 +52,6 @@ var app = &cli.Command{
 			case strings.HasPrefix(path, "https://"):
 				// if we ever add something else that uses URLs we'll have to modify this
 				typ = "elasticsearch"
-			case strings.HasSuffix(path, ".conf"):
-				typ = "strfry"
 			case strings.HasSuffix(path, ".jsonl"):
 				typ = "file"
 			default:
@@ -76,15 +69,6 @@ var app = &cli.Command{
 		}
 
 		switch typ {
-		case "sqlite":
-			db = &sqlite3.SQLite3Backend{
-				DatabaseURL:       path,
-				QueryLimit:        1_000_000,
-				QueryAuthorsLimit: 1_000_000,
-				QueryKindsLimit:   1_000_000,
-				QueryIDsLimit:     1_000_000,
-				QueryTagsLimit:    1_000_000,
-			}
 		case "lmdb":
 			db = &lmdb.LMDBBackend{Path: path, MaxLimit: 1_000_000}
 		case "badger":
@@ -94,28 +78,6 @@ var app = &cli.Command{
 			if db, err = doMmmInit(path); err != nil {
 				return ctx, err
 			}
-		case "postgres", "postgresql":
-			db = &postgresql.PostgresBackend{
-				DatabaseURL:       path,
-				QueryLimit:        1_000_000,
-				QueryAuthorsLimit: 1_000_000,
-				QueryKindsLimit:   1_000_000,
-				QueryIDsLimit:     1_000_000,
-				QueryTagsLimit:    1_000_000,
-			}
-		case "mysql":
-			db = &mysql.MySQLBackend{
-				DatabaseURL:       path,
-				QueryLimit:        1_000_000,
-				QueryAuthorsLimit: 1_000_000,
-				QueryKindsLimit:   1_000_000,
-				QueryIDsLimit:     1_000_000,
-				QueryTagsLimit:    1_000_000,
-			}
-		case "elasticsearch":
-			db = &elasticsearch.ElasticsearchStorage{URL: path}
-		case "strfry":
-			db = &strfry.StrfryBackend{ConfigPath: path}
 		case "file":
 			db = &slicestore.SliceStore{}
 

eventstore/internal/checks/interface.go

@@ -5,13 +5,13 @@ import (
 	"fiatjaf.com/nostr/eventstore/badger"
 	"fiatjaf.com/nostr/eventstore/bluge"
 	"fiatjaf.com/nostr/eventstore/lmdb"
-	"fiatjaf.com/nostr/eventstore/strfry"
+	"fiatjaf.com/nostr/eventstore/mmm"
 )
 
 // compile-time checks to ensure all backends implement Store
 var (
 	_ eventstore.Store = (*badger.BadgerBackend)(nil)
 	_ eventstore.Store = (*lmdb.LMDBBackend)(nil)
-	_ eventstore.Store = (*strfry.StrfryBackend)(nil)
+	_ eventstore.Store = (*mmm.IndexingLayer)(nil)
 	_ eventstore.Store = (*bluge.BlugeBackend)(nil)
 )

eventstore/lmdb/save.go

@@ -6,7 +6,7 @@ import (
 
 	"fiatjaf.com/nostr"
 	"fiatjaf.com/nostr/eventstore"
-	bin "fiatjaf.com/nostr/eventstore/internal/binary"
+	"fiatjaf.com/nostr/eventstore/codec/betterbinary"
 	"github.com/PowerDNS/lmdb-go/lmdb"
 )
 
@@ -45,14 +45,14 @@ func (b *LMDBBackend) SaveEvent(evt nostr.Event) error {
 
 func (b *LMDBBackend) save(txn *lmdb.Txn, evt nostr.Event) error {
 	// encode to binary form so we'll save it
-	bin, err := bin.Marshal(evt)
+	buf := make([]byte, betterbinary.Measure(evt))
-	if err != nil {
+	if err := betterbinary.Marshal(evt, buf); err != nil {
 		return err
 	}
 
 	idx := b.Serial()
 	// raw event store
-	if err := txn.Put(b.rawEventStore, idx, bin, 0); err != nil {
+	if err := txn.Put(b.rawEventStore, idx, buf, 0); err != nil {
 		return err
 	}
 

eventstore/mmm/count.go

@@ -2,16 +2,15 @@ package mmm
 
 import (
 	"bytes"
-	"context"
 	"encoding/binary"
 	"slices"
 
-	"github.com/PowerDNS/lmdb-go/lmdb"
-	"fiatjaf.com/nostr/eventstore/mmm/betterbinary"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore/codec/betterbinary"
+	"github.com/PowerDNS/lmdb-go/lmdb"
 )
 
-func (il *IndexingLayer) CountEvents(ctx context.Context, filter nostr.Filter) (int64, error) {
+func (il *IndexingLayer) CountEvents(filter nostr.Filter) (int64, error) {
 	var count int64 = 0
 
 	queries, extraAuthors, extraKinds, extraTagKey, extraTagValues, since, err := il.prepareQueries(filter)

eventstore/mmm/delete.go

@@ -1,39 +1,39 @@
 package mmm
 
 import (
-	"context"
 	"encoding/binary"
-	"encoding/hex"
 	"fmt"
 	"slices"
 
-	"github.com/PowerDNS/lmdb-go/lmdb"
 	"fiatjaf.com/nostr"
+	"github.com/PowerDNS/lmdb-go/lmdb"
 )
 
-func (il *IndexingLayer) DeleteEvent(ctx context.Context, evt *nostr.Event) error {
+func (il *IndexingLayer) DeleteEvent(id nostr.ID) error {
+	il.mmmm.writeMutex.Lock()
+	defer il.mmmm.writeMutex.Unlock()
+
 	return il.mmmm.lmdbEnv.Update(func(mmmtxn *lmdb.Txn) error {
 		return il.lmdbEnv.Update(func(iltxn *lmdb.Txn) error {
-			return il.delete(mmmtxn, iltxn, evt)
+			return il.delete(mmmtxn, iltxn, id)
 		})
 	})
 }
 
-func (il *IndexingLayer) delete(mmmtxn *lmdb.Txn, iltxn *lmdb.Txn, evt *nostr.Event) error {
+func (il *IndexingLayer) delete(mmmtxn *lmdb.Txn, iltxn *lmdb.Txn, id nostr.ID) error {
 	zeroRefs := false
 	b := il.mmmm
 
 	b.Logger.Debug().Str("layer", il.name).Uint16("il", il.id).Msg("deleting")
 
 	// first in the mmmm txn we check if we have the event still
-	idPrefix8, _ := hex.DecodeString(evt.ID[0 : 8*2])
+	val, err := mmmtxn.Get(b.indexId, id[0:8])
-	val, err := mmmtxn.Get(b.indexId, idPrefix8)
 	if err != nil {
 		if lmdb.IsNotFound(err) {
 			// we already do not have this anywhere
 			return nil
 		}
-		return fmt.Errorf("failed to check if we have the event %x: %w", idPrefix8, err)
+		return fmt.Errorf("failed to check if we have the event %x: %w", id, err)
 	}
 
 	// we have this, but do we have it in the current layer?
@@ -49,8 +49,8 @@ func (il *IndexingLayer) delete(mmmtxn *lmdb.Txn, iltxn *lmdb.Txn, evt *nostr.Ev
 			copy(nextval, val[0:i])
 			copy(nextval[i:], val[i+2:])
 
-			if err := mmmtxn.Put(b.indexId, idPrefix8, nextval, 0); err != nil {
+			if err := mmmtxn.Put(b.indexId, id[0:8], nextval, 0); err != nil {
-				return fmt.Errorf("failed to update references for %x: %w", idPrefix8, err)
+				return fmt.Errorf("failed to update references for %x: %w", id[:], err)
 			}
 
 			// if there are no more layers we will delete everything later
@@ -60,6 +60,12 @@ func (il *IndexingLayer) delete(mmmtxn *lmdb.Txn, iltxn *lmdb.Txn, evt *nostr.Ev
 		}
 	}
 
+	// load the event so we can compute the indexes
+	var evt nostr.Event
+	if err := il.mmmm.loadEvent(pos, &evt); err != nil {
+		return fmt.Errorf("failed to load event %x when deleting: %w", id[:], err)
+	}
+
 	// calculate all index keys we have for this event and delete them
 	for k := range il.getIndexKeysForEvent(evt) {
 		if err := iltxn.Del(k.dbi, k.key, val[0:12]); err != nil && !lmdb.IsNotFound(err) {
@@ -69,7 +75,7 @@ func (il *IndexingLayer) delete(mmmtxn *lmdb.Txn, iltxn *lmdb.Txn, evt *nostr.Ev
 
 	// if there are no more refs we delete the event from the id index and mmap
 	if zeroRefs {
-		if err := b.purge(mmmtxn, idPrefix8, pos); err != nil {
+		if err := b.purge(mmmtxn, id[0:8], pos); err != nil {
 			panic(err)
 		}
 	}

eventstore/mmm/helpers.go

@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/PowerDNS/lmdb-go/lmdb"
 	"fiatjaf.com/nostr"
+	"github.com/PowerDNS/lmdb-go/lmdb"
 )
 
 // this iterator always goes backwards
@@ -46,7 +46,7 @@ type key struct {
 	key []byte
 }
 
-func (il *IndexingLayer) getIndexKeysForEvent(evt *nostr.Event) iter.Seq[key] {
+func (il *IndexingLayer) getIndexKeysForEvent(evt nostr.Event) iter.Seq[key] {
 	return func(yield func(key) bool) {
 		{
 			// ~ by pubkey+date

eventstore/mmm/indexinglayer.go

@@ -1,15 +1,11 @@
 package mmm
 
 import (
-	"context"
-	"encoding/binary"
-	"fmt"
 	"os"
 	"path/filepath"
 
-	"github.com/PowerDNS/lmdb-go/lmdb"
 	"fiatjaf.com/nostr/eventstore"
-	"fiatjaf.com/nostr"
+	"github.com/PowerDNS/lmdb-go/lmdb"
 )
 
 var _ eventstore.Store = (*IndexingLayer)(nil)
@@ -18,10 +14,8 @@ type IndexingLayer struct {
 	isInitialized bool
 	name          string
 
-	ShouldIndex func(context.Context, *nostr.Event) bool
+	MaxLimit int
-	MaxLimit    int
+	mmmm     *MultiMmapManager
-
-	mmmm *MultiMmapManager
 
 	// this is stored in the knownLayers db as a value, and used to keep track of which layer owns each event
 	id uint16
@@ -136,65 +130,6 @@ func (il *IndexingLayer) Init() error {
 
 func (il *IndexingLayer) Name() string { return il.name }
 
-func (il *IndexingLayer) runThroughEvents(txn *lmdb.Txn) error {
-	ctx := context.Background()
-	b := il.mmmm
-
-	// run through all events we have and see if this new index wants them
-	cursor, err := txn.OpenCursor(b.indexId)
-	if err != nil {
-		return fmt.Errorf("when opening cursor on %v: %w", b.indexId, err)
-	}
-	defer cursor.Close()
-
-	for {
-		idPrefix8, val, err := cursor.Get(nil, nil, lmdb.Next)
-		if lmdb.IsNotFound(err) {
-			break
-		}
-		if err != nil {
-			return fmt.Errorf("when moving the cursor: %w", err)
-		}
-
-		update := false
-
-		posb := val[0:12]
-		pos := positionFromBytes(posb)
-		evt := &nostr.Event{}
-		if err := b.loadEvent(pos, evt); err != nil {
-			return fmt.Errorf("when loading event from mmap: %w", err)
-		}
-
-		if il.ShouldIndex != nil && il.ShouldIndex(ctx, evt) {
-			// add the current reference
-			val = binary.BigEndian.AppendUint16(val, il.id)
-
-			// if we were already updating to remove the reference
-			// now that we've added the reference back we don't really have to update
-			update = !update
-
-			// actually index
-			if err := il.lmdbEnv.Update(func(iltxn *lmdb.Txn) error {
-				for k := range il.getIndexKeysForEvent(evt) {
-					if err := iltxn.Put(k.dbi, k.key, posb, 0); err != nil {
-						return err
-					}
-				}
-				return nil
-			}); err != nil {
-				return fmt.Errorf("failed to index: %w", err)
-			}
-		}
-
-		if update {
-			if err := txn.Put(b.indexId, idPrefix8, val, 0); err != nil {
-				return fmt.Errorf("failed to put updated index+refs: %w", err)
-			}
-		}
-	}
-	return nil
-}
-
 func (il *IndexingLayer) Close() {
 	il.lmdbEnv.Close()
 }

eventstore/mmm/mmmm.go

@@ -10,9 +10,9 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/PowerDNS/lmdb-go/lmdb"
-	"fiatjaf.com/nostr/eventstore/mmm/betterbinary"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore/codec/betterbinary"
+	"github.com/PowerDNS/lmdb-go/lmdb"
 	"github.com/rs/zerolog"
 )
 
@@ -30,14 +30,14 @@ type MultiMmapManager struct {
 	mmapf     mmap
 	mmapfEnd  uint64
 
+	writeMutex sync.Mutex
+
 	lmdbEnv     *lmdb.Env
 	stuff       lmdb.DBI
 	knownLayers lmdb.DBI
 	indexId     lmdb.DBI
 
 	freeRanges []position
-
-	mutex sync.Mutex
 }
 
 func (b *MultiMmapManager) String() string {
@@ -147,8 +147,8 @@ func (b *MultiMmapManager) Init() error {
 }
 
 func (b *MultiMmapManager) EnsureLayer(name string, il *IndexingLayer) error {
-	b.mutex.Lock()
+	b.writeMutex.Lock()
-	defer b.mutex.Unlock()
+	defer b.writeMutex.Unlock()
 
 	il.mmmm = b
 	il.name = name
@@ -168,9 +168,6 @@ func (b *MultiMmapManager) EnsureLayer(name string, il *IndexingLayer) error {
 				return fmt.Errorf("failed to init new layer %s: %w", name, err)
 			}
 
-			if err := il.runThroughEvents(txn); err != nil {
-				return fmt.Errorf("failed to run %s through events: %w", name, err)
-			}
 			return txn.Put(b.knownLayers, []byte(name), binary.BigEndian.AppendUint16(nil, il.id), 0)
 		} else if err == nil {
 			il.id = binary.BigEndian.Uint16(idv)
@@ -193,8 +190,8 @@ func (b *MultiMmapManager) EnsureLayer(name string, il *IndexingLayer) error {
 }
 
 func (b *MultiMmapManager) DropLayer(name string) error {
-	b.mutex.Lock()
+	b.writeMutex.Lock()
-	defer b.mutex.Unlock()
+	defer b.writeMutex.Unlock()
 
 	// get layer reference
 	idx := slices.IndexFunc(b.layers, func(il *IndexingLayer) bool { return il.name == name })

eventstore/mmm/query.go

@@ -2,42 +2,46 @@ package mmm
 
 import (
 	"bytes"
-	"context"
 	"encoding/binary"
-	"encoding/hex"
 	"fmt"
+	"iter"
 	"log"
 	"slices"
 
-	"github.com/PowerDNS/lmdb-go/lmdb"
-	"fiatjaf.com/nostr/eventstore/internal"
-	"fiatjaf.com/nostr/eventstore/mmm/betterbinary"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore/codec/betterbinary"
+	"fiatjaf.com/nostr/eventstore/internal"
+	"github.com/PowerDNS/lmdb-go/lmdb"
 )
 
 // GetByID returns the event -- if found in this mmm -- and all the IndexingLayers it belongs to.
-func (b *MultiMmapManager) GetByID(id string) (*nostr.Event, IndexingLayers) {
+func (b *MultiMmapManager) GetByID(id nostr.ID) (*nostr.Event, IndexingLayers) {
-	events := make(chan *nostr.Event)
 	presence := make(chan []uint16)
-	b.queryByIDs(events, []string{id}, presence)
+
-	for evt := range events {
+	var event *nostr.Event
+	b.queryByIDs(func(evt nostr.Event) bool {
+		event = &evt
+		return false
+	}, []nostr.ID{id}, presence)
+
+	if event != nil {
 		p := <-presence
 		present := make([]*IndexingLayer, len(p))
 		for i, id := range p {
 			present[i] = b.layers.ByID(id)
 		}
-		return evt, present
+		return event, present
 	}
+
 	return nil, nil
 }
 
 // queryByIDs emits the events of the given id to the given channel if they exist anywhere in this mmm.
 // if presence is given it will also be used to emit slices of the ids of the IndexingLayers this event is stored in.
 // it closes the channels when it ends.
-func (b *MultiMmapManager) queryByIDs(ch chan *nostr.Event, ids []string, presence chan []uint16) {
+func (b *MultiMmapManager) queryByIDs(yield func(nostr.Event) bool, ids []nostr.ID, presence chan []uint16) {
-	go b.lmdbEnv.View(func(txn *lmdb.Txn) error {
+	b.lmdbEnv.View(func(txn *lmdb.Txn) error {
 		txn.RawRead = true
-		defer close(ch)
 		if presence != nil {
 			defer close(presence)
 		}
@@ -47,15 +51,17 @@ func (b *MultiMmapManager) queryByIDs(ch chan *nostr.Event, ids []string, presen
 				continue
 			}
 
-			idPrefix8, _ := hex.DecodeString(id[0 : 8*2])
+			val, err := txn.Get(b.indexId, id[0:8])
-			val, err := txn.Get(b.indexId, idPrefix8)
 			if err == nil {
 				pos := positionFromBytes(val[0:12])
-				evt := &nostr.Event{}
+				evt := nostr.Event{}
-				if err := b.loadEvent(pos, evt); err != nil {
+				if err := b.loadEvent(pos, &evt); err != nil {
 					panic(fmt.Errorf("failed to decode event from %v: %w", pos, err))
 				}
-				ch <- evt
+
+				if !yield(evt) {
+					return nil
+				}
 
 				if presence != nil {
 					layers := make([]uint16, 0, (len(val)-12)/2)
@@ -71,45 +77,42 @@ func (b *MultiMmapManager) queryByIDs(ch chan *nostr.Event, ids []string, presen
 	})
 }
 
-func (il *IndexingLayer) QueryEvents(ctx context.Context, filter nostr.Filter) (chan *nostr.Event, error) {
+func (il *IndexingLayer) QueryEvents(filter nostr.Filter) iter.Seq[nostr.Event] {
-	ch := make(chan *nostr.Event)
+	return func(yield func(nostr.Event) bool) {
-
+		if len(filter.IDs) > 0 {
-	if len(filter.IDs) > 0 {
+			il.mmmm.queryByIDs(yield, filter.IDs, nil)
-		il.mmmm.queryByIDs(ch, filter.IDs, nil)
+			return
-		return ch, nil
-	}
-
-	if filter.Search != "" {
-		close(ch)
-		return ch, nil
-	}
-
-	// max number of events we'll return
-	limit := il.MaxLimit / 4
-	if filter.Limit > 0 && filter.Limit < il.MaxLimit {
-		limit = filter.Limit
-	}
-	if tlimit := nostr.GetTheoreticalLimit(filter); tlimit == 0 {
-		close(ch)
-		return ch, nil
-	} else if tlimit > 0 {
-		limit = tlimit
-	}
-
-	go il.lmdbEnv.View(func(txn *lmdb.Txn) error {
-		txn.RawRead = true
-		defer close(ch)
-
-		results, err := il.query(txn, filter, limit)
-
-		for _, ie := range results {
-			ch <- ie.Event
 		}
 
-		return err
+		if filter.Search != "" {
-	})
+			return
+		}
 
-	return ch, nil
+		// max number of events we'll return
+		limit := il.MaxLimit / 4
+		if filter.Limit > 0 && filter.Limit < il.MaxLimit {
+			limit = filter.Limit
+		}
+		if tlimit := nostr.GetTheoreticalLimit(filter); tlimit == 0 {
+			return
+		} else if tlimit > 0 {
+			limit = tlimit
+		}
+
+		il.lmdbEnv.View(func(txn *lmdb.Txn) error {
+			txn.RawRead = true
+
+			results, err := il.query(txn, filter, limit)
+
+			for _, ie := range results {
+				if !yield(ie.Event) {
+					break
+				}
+			}
+
+			return err
+		})
+	}
 }
 
 func (il *IndexingLayer) query(txn *lmdb.Txn, filter nostr.Filter, limit int) ([]internal.IterEvent, error) {
@@ -128,16 +131,16 @@ func (il *IndexingLayer) query(txn *lmdb.Txn, filter nostr.Filter, limit int) ([
 	// we will continue to pull from it as soon as some other iterator takes the position
 	oldest := internal.IterEvent{Q: -1}
 
-	secondPhase := false // after we have gathered enough events we will change the way we iterate
+	sndPhase := false // after we have gathered enough events we will change the way we iterate
 	secondBatch := make([][]internal.IterEvent, 0, len(queries)+1)
-	secondPhaseParticipants := make([]int, 0, len(queries)+1)
+	sndPhaseParticipants := make([]int, 0, len(queries)+1)
 
 	// while merging results in the second phase we will alternate between these two lists
 	//   to avoid having to create new lists all the time
-	var secondPhaseResultsA []internal.IterEvent
+	var sndPhaseResultsA []internal.IterEvent
-	var secondPhaseResultsB []internal.IterEvent
+	var sndPhaseResultsB []internal.IterEvent
-	var secondPhaseResultsToggle bool // this is just a dummy thing we use to keep track of the alternating
+	var sndPhaseResultsToggle bool // this is just a dummy thing we use to keep track of the alternating
-	var secondPhaseHasResultsPending bool
+	var sndPhaseHasResultsPending bool
 
 	remainingUnexhausted := len(queries) // when all queries are exhausted we can finally end this thing
 	batchSizePerQuery := internal.BatchSizePerNumberOfQueries(limit, remainingUnexhausted)
@@ -221,8 +224,8 @@ func (il *IndexingLayer) query(txn *lmdb.Txn, filter nostr.Filter, limit int) ([
 				}
 
 				// decode the entire thing (TODO: do a conditional decode while also checking the extra tag)
-				event := &nostr.Event{}
+				event := nostr.Event{}
-				if err := betterbinary.Unmarshal(bin, event); err != nil {
+				if err := betterbinary.Unmarshal(bin, &event); err != nil {
 					log.Printf("mmm: value read error (id %x) on query prefix %x sp %x dbi %d: %s\n",
 						bin[0:32], query.prefix, query.startingPoint, query.dbi, err)
 					return nil, fmt.Errorf("event read error: %w", err)
@@ -240,18 +243,18 @@ func (il *IndexingLayer) query(txn *lmdb.Txn, filter nostr.Filter, limit int) ([
 				evt := internal.IterEvent{Event: event, Q: q}
 				//
 				//
-				if secondPhase {
+				if sndPhase {
 					// do the process described below at HIWAWVRTP.
 					// if we've reached here this means we've already passed the `since` check.
 					// now we have to eliminate the event currently at the `since` threshold.
 					nextThreshold := firstPhaseResults[len(firstPhaseResults)-2]
-					if oldest.Event == nil {
+					if oldest.Event.ID == nostr.ZeroID {
 						// fmt.Println("          b1", evt.ID[0:8])
 						// BRANCH WHEN WE DON'T HAVE THE OLDEST EVENT (BWWDHTOE)
 						// when we don't have the oldest set, we will keep the results
 						//   and not change the cutting point -- it's bad, but hopefully not that bad.
 						results[q] = append(results[q], evt)
-						secondPhaseHasResultsPending = true
+						sndPhaseHasResultsPending = true
 					} else if nextThreshold.CreatedAt > oldest.CreatedAt {
 						// fmt.Println("          b2", nextThreshold.CreatedAt, ">", oldest.CreatedAt, evt.ID[0:8])
 						// one of the events we have stored is the actual next threshold
@@ -268,7 +271,7 @@ func (il *IndexingLayer) query(txn *lmdb.Txn, filter nostr.Filter, limit int) ([
 						// finally
 						// add this to the results to be merged later
 						results[q] = append(results[q], evt)
-						secondPhaseHasResultsPending = true
+						sndPhaseHasResultsPending = true
 					} else if nextThreshold.CreatedAt < evt.CreatedAt {
 						// the next last event in the firstPhaseResults is the next threshold
 						// fmt.Println("          b3", nextThreshold.CreatedAt, "<", oldest.CreatedAt, evt.ID[0:8])
@@ -278,7 +281,7 @@ func (il *IndexingLayer) query(txn *lmdb.Txn, filter nostr.Filter, limit int) ([
 						// fmt.Println("            new since", since)
 						// add this to the results to be merged later
 						results[q] = append(results[q], evt)
-						secondPhaseHasResultsPending = true
+						sndPhaseHasResultsPending = true
 						// update the oldest event
 						if evt.CreatedAt < oldest.CreatedAt {
 							oldest = evt
@@ -297,7 +300,7 @@ func (il *IndexingLayer) query(txn *lmdb.Txn, filter nostr.Filter, limit int) ([
 					firstPhaseTotalPulled++
 
 					// update the oldest event
-					if oldest.Event == nil || evt.CreatedAt < oldest.CreatedAt {
+					if oldest.Event.ID == nostr.ZeroID || evt.CreatedAt < oldest.CreatedAt {
 						oldest = evt
 					}
 				}
@@ -323,20 +326,20 @@ func (il *IndexingLayer) query(txn *lmdb.Txn, filter nostr.Filter, limit int) ([
 
 		// we will do this check if we don't accumulated the requested number of events yet
 		// fmt.Println("oldest", oldest.Event, "from iter", oldest.Q)
-		if secondPhase && secondPhaseHasResultsPending && (oldest.Event == nil || remainingUnexhausted == 0) {
+		if sndPhase && sndPhaseHasResultsPending && (oldest.Event.ID == nostr.ZeroID || remainingUnexhausted == 0) {
 			// fmt.Println("second phase aggregation!")
 			// when we are in the second phase we will aggressively aggregate results on every iteration
 			//
 			secondBatch = secondBatch[:0]
-			for s := 0; s < len(secondPhaseParticipants); s++ {
+			for s := 0; s < len(sndPhaseParticipants); s++ {
-				q := secondPhaseParticipants[s]
+				q := sndPhaseParticipants[s]
 
 				if len(results[q]) > 0 {
 					secondBatch = append(secondBatch, results[q])
 				}
 
 				if exhausted[q] {
-					secondPhaseParticipants = internal.SwapDelete(secondPhaseParticipants, s)
+					sndPhaseParticipants = internal.SwapDelete(sndPhaseParticipants, s)
 					s--
 				}
 			}
@@ -344,29 +347,29 @@ func (il *IndexingLayer) query(txn *lmdb.Txn, filter nostr.Filter, limit int) ([
 			// every time we get here we will alternate between these A and B lists
 			//   combining everything we have into a new partial results list.
 			// after we've done that we can again set the oldest.
-			// fmt.Println("  xxx", secondPhaseResultsToggle)
+			// fmt.Println("  xxx", sndPhaseResultsToggle)
-			if secondPhaseResultsToggle {
+			if sndPhaseResultsToggle {
-				secondBatch = append(secondBatch, secondPhaseResultsB)
+				secondBatch = append(secondBatch, sndPhaseResultsB)
-				secondPhaseResultsA = internal.MergeSortMultiple(secondBatch, limit, secondPhaseResultsA)
+				sndPhaseResultsA = internal.MergeSortMultiple(secondBatch, limit, sndPhaseResultsA)
-				oldest = secondPhaseResultsA[len(secondPhaseResultsA)-1]
+				oldest = sndPhaseResultsA[len(sndPhaseResultsA)-1]
-				// fmt.Println("  new aggregated a", len(secondPhaseResultsB))
+				// fmt.Println("  new aggregated a", len(sndPhaseResultsB))
 			} else {
-				secondBatch = append(secondBatch, secondPhaseResultsA)
+				secondBatch = append(secondBatch, sndPhaseResultsA)
-				secondPhaseResultsB = internal.MergeSortMultiple(secondBatch, limit, secondPhaseResultsB)
+				sndPhaseResultsB = internal.MergeSortMultiple(secondBatch, limit, sndPhaseResultsB)
-				oldest = secondPhaseResultsB[len(secondPhaseResultsB)-1]
+				oldest = sndPhaseResultsB[len(sndPhaseResultsB)-1]
-				// fmt.Println("  new aggregated b", len(secondPhaseResultsB))
+				// fmt.Println("  new aggregated b", len(sndPhaseResultsB))
 			}
-			secondPhaseResultsToggle = !secondPhaseResultsToggle
+			sndPhaseResultsToggle = !sndPhaseResultsToggle
 
 			since = uint32(oldest.CreatedAt)
 			// fmt.Println("  new since", since)
 
 			// reset the `results` list so we can keep using it
 			results = results[:len(queries)]
-			for _, q := range secondPhaseParticipants {
+			for _, q := range sndPhaseParticipants {
 				results[q] = results[q][:0]
 			}
-		} else if !secondPhase && firstPhaseTotalPulled >= limit && remainingUnexhausted > 0 {
+		} else if !sndPhase && firstPhaseTotalPulled >= limit && remainingUnexhausted > 0 {
 			// fmt.Println("have enough!", firstPhaseTotalPulled, "/", limit, "remaining", remainingUnexhausted)
 
 			// we will exclude this oldest number as it is not relevant anymore
@@ -410,16 +413,16 @@ func (il *IndexingLayer) query(txn *lmdb.Txn, filter nostr.Filter, limit int) ([
 				results[q] = results[q][:0]
 
 				// build this index of indexes with everybody who remains
-				secondPhaseParticipants = append(secondPhaseParticipants, q)
+				sndPhaseParticipants = append(sndPhaseParticipants, q)
 			}
 
 			// we create these two lists and alternate between them so we don't have to create a
 			//   a new one every time
-			secondPhaseResultsA = make([]internal.IterEvent, 0, limit*2)
+			sndPhaseResultsA = make([]internal.IterEvent, 0, limit*2)
-			secondPhaseResultsB = make([]internal.IterEvent, 0, limit*2)
+			sndPhaseResultsB = make([]internal.IterEvent, 0, limit*2)
 
 			// from now on we won't run this block anymore
-			secondPhase = true
+			sndPhase = true
 		}
 
 		// fmt.Println("remaining", remainingUnexhausted)
@@ -428,27 +431,27 @@ func (il *IndexingLayer) query(txn *lmdb.Txn, filter nostr.Filter, limit int) ([
 		}
 	}
 
-	// fmt.Println("is secondPhase?", secondPhase)
+	// fmt.Println("is sndPhase?", sndPhase)
 
 	var combinedResults []internal.IterEvent
 
-	if secondPhase {
+	if sndPhase {
 		// fmt.Println("ending second phase")
-		// when we reach this point either secondPhaseResultsA or secondPhaseResultsB will be full of stuff,
+		// when we reach this point either sndPhaseResultsA or sndPhaseResultsB will be full of stuff,
 		//   the other will be empty
-		var secondPhaseResults []internal.IterEvent
+		var sndPhaseResults []internal.IterEvent
-		// fmt.Println("xxx", secondPhaseResultsToggle, len(secondPhaseResultsA), len(secondPhaseResultsB))
+		// fmt.Println("xxx", sndPhaseResultsToggle, len(sndPhaseResultsA), len(sndPhaseResultsB))
-		if secondPhaseResultsToggle {
+		if sndPhaseResultsToggle {
-			secondPhaseResults = secondPhaseResultsB
+			sndPhaseResults = sndPhaseResultsB
-			combinedResults = secondPhaseResultsA[0:limit] // reuse this
+			combinedResults = sndPhaseResultsA[0:limit] // reuse this
-			// fmt.Println("  using b", len(secondPhaseResultsA))
+			// fmt.Println("  using b", len(sndPhaseResultsA))
 		} else {
-			secondPhaseResults = secondPhaseResultsA
+			sndPhaseResults = sndPhaseResultsA
-			combinedResults = secondPhaseResultsB[0:limit] // reuse this
+			combinedResults = sndPhaseResultsB[0:limit] // reuse this
-			// fmt.Println("  using a", len(secondPhaseResultsA))
+			// fmt.Println("  using a", len(sndPhaseResultsA))
 		}
 
-		all := [][]internal.IterEvent{firstPhaseResults, secondPhaseResults}
+		all := [][]internal.IterEvent{firstPhaseResults, sndPhaseResults}
 		combinedResults = internal.MergeSortMultiple(all, limit, combinedResults)
 		// fmt.Println("final combinedResults", len(combinedResults), cap(combinedResults), limit)
 	} else {

eventstore/mmm/query_planner.go

@@ -5,9 +5,9 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"github.com/PowerDNS/lmdb-go/lmdb"
-	"fiatjaf.com/nostr/eventstore/internal"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore/internal"
+	"github.com/PowerDNS/lmdb-go/lmdb"
 )
 
 type query struct {
@@ -127,7 +127,7 @@ func (il *IndexingLayer) prepareQueries(filter nostr.Filter) (
 		if filter.Authors != nil {
 			extraAuthors = make([][32]byte, len(filter.Authors))
 			for i, pk := range filter.Authors {
-				hex.Decode(extraAuthors[i][:], []byte(pk))
+				copy(extraAuthors[i][:], pk[:])
 			}
 		}
 

eventstore/mmm/replace.go

@@ -1,22 +1,28 @@
 package mmm
 
 import (
-	"context"
 	"fmt"
 	"math"
+	"runtime"
 
-	"github.com/PowerDNS/lmdb-go/lmdb"
-	"fiatjaf.com/nostr/eventstore/internal"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore/internal"
+	"github.com/PowerDNS/lmdb-go/lmdb"
 )
 
-func (il *IndexingLayer) ReplaceEvent(ctx context.Context, evt *nostr.Event) error {
+func (il *IndexingLayer) ReplaceEvent(evt nostr.Event) error {
 	// sanity checking
 	if evt.CreatedAt > math.MaxUint32 || evt.Kind > math.MaxUint16 {
 		return fmt.Errorf("event with values out of expected boundaries")
 	}
 
-	filter := nostr.Filter{Limit: 1, Kinds: []int{evt.Kind}, Authors: []string{evt.PubKey}}
+	il.mmmm.writeMutex.Lock()
+	defer il.mmmm.writeMutex.Unlock()
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	filter := nostr.Filter{Limit: 1, Kinds: []uint16{evt.Kind}, Authors: []nostr.PubKey{evt.PubKey}}
 	if nostr.IsAddressableKind(evt.Kind) {
 		// when addressable, add the "d" tag to the filter
 		filter.Tags = nostr.TagMap{"d": []string{evt.Tags.GetD()}}
@@ -35,7 +41,7 @@ func (il *IndexingLayer) ReplaceEvent(ctx context.Context, evt *nostr.Event) err
 			shouldStore := true
 			for _, previous := range prevResults {
 				if internal.IsOlder(previous.Event, evt) {
-					if err := il.delete(mmmtxn, iltxn, previous.Event); err != nil {
+					if err := il.delete(mmmtxn, iltxn, previous.Event.ID); err != nil {
 						return fmt.Errorf("failed to delete event %s for replacing: %w", previous.Event.ID, err)
 					}
 				} else {

eventstore/mmm/save.go

@@ -1,9 +1,7 @@
 package mmm
 
 import (
-	"context"
 	"encoding/binary"
-	"encoding/hex"
 	"fmt"
 	"os"
 	"runtime"
@@ -11,73 +9,15 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/PowerDNS/lmdb-go/lmdb"
-	"fiatjaf.com/nostr/eventstore/mmm/betterbinary"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore/codec/betterbinary"
+	"github.com/PowerDNS/lmdb-go/lmdb"
 )
 
-func (b *MultiMmapManager) StoreGlobal(ctx context.Context, evt *nostr.Event) (stored bool, err error) {
+func (il *IndexingLayer) SaveEvent(evt nostr.Event) error {
-	someoneWantsIt := false
+	il.mmmm.writeMutex.Lock()
+	defer il.mmmm.writeMutex.Unlock()
 
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
-	runtime.LockOSThread()
-	defer runtime.UnlockOSThread()
-
-	// do this just so it's cleaner, we're already locking the thread and the mutex anyway
-	mmmtxn, err := b.lmdbEnv.BeginTxn(nil, 0)
-	if err != nil {
-		return false, fmt.Errorf("failed to begin global transaction: %w", err)
-	}
-	mmmtxn.RawRead = true
-
-	iltxns := make([]*lmdb.Txn, 0, len(b.layers))
-	ils := make([]*IndexingLayer, 0, len(b.layers))
-
-	// ask if any of the indexing layers want this
-	for _, il := range b.layers {
-		if il.ShouldIndex != nil && il.ShouldIndex(ctx, evt) {
-			someoneWantsIt = true
-
-			iltxn, err := il.lmdbEnv.BeginTxn(nil, 0)
-			if err != nil {
-				mmmtxn.Abort()
-				for _, txn := range iltxns {
-					txn.Abort()
-				}
-				return false, fmt.Errorf("failed to start txn on %s: %w", il.name, err)
-			}
-
-			ils = append(ils, il)
-			iltxns = append(iltxns, iltxn)
-		}
-	}
-
-	if !someoneWantsIt {
-		// no one wants it
-		mmmtxn.Abort()
-		return false, fmt.Errorf("not wanted")
-	}
-
-	stored, err = b.storeOn(mmmtxn, ils, iltxns, evt)
-	if stored {
-		mmmtxn.Commit()
-		for _, txn := range iltxns {
-			txn.Commit()
-		}
-	} else {
-		mmmtxn.Abort()
-		for _, txn := range iltxns {
-			txn.Abort()
-		}
-	}
-
-	return stored, err
-}
-
-func (il *IndexingLayer) SaveEvent(ctx context.Context, evt *nostr.Event) error {
-	il.mmmm.mutex.Lock()
-	defer il.mmmm.mutex.Unlock()
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
@@ -111,7 +51,7 @@ func (b *MultiMmapManager) storeOn(
 	mmmtxn *lmdb.Txn,
 	ils []*IndexingLayer,
 	iltxns []*lmdb.Txn,
-	evt *nostr.Event,
+	evt nostr.Event,
 ) (stored bool, err error) {
 	// sanity checking
 	if evt.CreatedAt > maxuint32 || evt.Kind > maxuint16 {
@@ -119,8 +59,7 @@ func (b *MultiMmapManager) storeOn(
 	}
 
 	// check if we already have this id
-	idPrefix8, _ := hex.DecodeString(evt.ID[0 : 8*2])
+	val, err := mmmtxn.Get(b.indexId, evt.ID[0:8])
-	val, err := mmmtxn.Get(b.indexId, idPrefix8)
 	if err == nil {
 		// we found the event, now check if it is already indexed by the layers that want to store it
 		for i := len(ils) - 1; i >= 0; i-- {
@@ -149,7 +88,7 @@ func (b *MultiMmapManager) storeOn(
 
 	// get event binary size
 	pos := position{
-		size: uint32(betterbinary.Measure(*evt)),
+		size: uint32(betterbinary.Measure(evt)),
 	}
 	if pos.size >= 1<<16 {
 		return false, fmt.Errorf("event too large to store, max %d, got %d", 1<<16, pos.size)
@@ -193,7 +132,7 @@ func (b *MultiMmapManager) storeOn(
 	}
 
 	// write to the mmap
-	if err := betterbinary.Marshal(*evt, b.mmapf[pos.start:]); err != nil {
+	if err := betterbinary.Marshal(evt, b.mmapf[pos.start:]); err != nil {
 		return false, fmt.Errorf("error marshaling to %d: %w", pos.start, err)
 	}
 
@@ -219,8 +158,8 @@ func (b *MultiMmapManager) storeOn(
 	}
 
 	// store the id index with the refcounts
-	if err := mmmtxn.Put(b.indexId, idPrefix8, val, 0); err != nil {
+	if err := mmmtxn.Put(b.indexId, evt.ID[0:8], val, 0); err != nil {
-		panic(fmt.Errorf("failed to store %x by id: %w", idPrefix8, err))
+		panic(fmt.Errorf("failed to store %x by id: %w", evt.ID[:], err))
 	}
 
 	// msync

eventstore/relay_interface.go

@@ -11,8 +11,6 @@ type RelayWrapper struct {
 	Store
 }
 
-var _ nostr.RelayStore = (*RelayWrapper)(nil)
-
 func (w RelayWrapper) Publish(ctx context.Context, evt nostr.Event) error {
 	if nostr.IsEphemeralKind(evt.Kind) {
 		// do not store ephemeral events
@@ -24,33 +22,14 @@ func (w RelayWrapper) Publish(ctx context.Context, evt nostr.Event) error {
 
 	if nostr.IsRegularKind(evt.Kind) {
 		// regular events are just saved directly
-		if err := w.SaveEvent(ctx, &evt); err != nil && err != ErrDupEvent {
+		if err := w.SaveEvent(evt); err != nil && err != ErrDupEvent {
 			return fmt.Errorf("failed to save: %w", err)
 		}
 		return nil
 	}
 
 	// others are replaced
-	w.Store.ReplaceEvent(ctx, &evt)
+	w.Store.ReplaceEvent(evt)
 
 	return nil
 }
-
-func (w RelayWrapper) QuerySync(ctx context.Context, filter nostr.Filter) ([]*nostr.Event, error) {
-	ch, err := w.Store.QueryEvents(ctx, filter)
-	if err != nil {
-		return nil, fmt.Errorf("failed to query: %w", err)
-	}
-
-	n := filter.Limit
-	if n == 0 {
-		n = 500
-	}
-
-	results := make([]*nostr.Event, 0, n)
-	for evt := range ch {
-		results = append(results, evt)
-	}
-
-	return results, nil
-}

eventstore/strfry/lib.go

@@ -1,164 +0,0 @@
-package strfry
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-
-	"fiatjaf.com/nostr/eventstore"
-	"github.com/mailru/easyjson"
-	"fiatjaf.com/nostr"
-)
-
-var _ eventstore.Store = (*StrfryBackend)(nil)
-
-type StrfryBackend struct {
-	ConfigPath     string
-	ExecutablePath string
-}
-
-func (s *StrfryBackend) Init() error {
-	if s.ExecutablePath == "" {
-		configPath := filepath.Dir(s.ConfigPath)
-		os.Setenv("PATH", configPath+":"+os.Getenv("PATH"))
-		exe, err := exec.LookPath("strfry")
-		if err != nil {
-			return fmt.Errorf("failed to find strfry executable: %w (better provide it manually)", err)
-		}
-		s.ExecutablePath = exe
-	}
-
-	return nil
-}
-
-func (_ StrfryBackend) Close() {}
-
-func (s StrfryBackend) QueryEvents(ctx context.Context, filter nostr.Filter) (chan *nostr.Event, error) {
-	stdout, err := s.baseStrfryScan(ctx, filter)
-	if err != nil {
-		return nil, err
-	}
-
-	ch := make(chan *nostr.Event)
-	go func() {
-		defer close(ch)
-		for {
-			line, err := stdout.ReadBytes('\n')
-			if err != nil {
-				break
-			}
-
-			evt := &nostr.Event{}
-			easyjson.Unmarshal(line, evt)
-			if evt.ID == "" {
-				continue
-			}
-
-			ch <- evt
-		}
-	}()
-
-	return ch, nil
-}
-
-func (s *StrfryBackend) ReplaceEvent(ctx context.Context, evt *nostr.Event) error {
-	return s.SaveEvent(ctx, evt)
-}
-
-func (s StrfryBackend) SaveEvent(ctx context.Context, evt *nostr.Event) error {
-	args := make([]string, 0, 4)
-	if s.ConfigPath != "" {
-		args = append(args, "--config="+s.ConfigPath)
-	}
-	args = append(args, "import")
-	args = append(args, "--show-rejected")
-	args = append(args, "--no-verify")
-
-	cmd := exec.CommandContext(ctx, s.ExecutablePath, args...)
-	var stderr bytes.Buffer
-	cmd.Stderr = &stderr
-
-	// event is sent on stdin
-	j, _ := easyjson.Marshal(evt)
-	cmd.Stdin = bytes.NewBuffer(j)
-
-	err := cmd.Run()
-	if err != nil {
-		return fmt.Errorf(
-			"%s %s failed: %w, (%s)",
-			s.ExecutablePath, strings.Join(args, " "), err, stderr.String(),
-		)
-	}
-
-	return nil
-}
-
-func (s StrfryBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error {
-	args := make([]string, 0, 3)
-	if s.ConfigPath != "" {
-		args = append(args, "--config="+s.ConfigPath)
-	}
-	args = append(args, "delete")
-	args = append(args, "--filter={\"ids\":[\""+evt.ID+"\"]}")
-
-	cmd := exec.CommandContext(ctx, s.ExecutablePath, args...)
-	var stderr bytes.Buffer
-	cmd.Stderr = &stderr
-
-	err := cmd.Run()
-	if err != nil {
-		return fmt.Errorf(
-			"%s %s failed: %w, (%s)",
-			s.ExecutablePath, strings.Join(args, " "), err, stderr.String(),
-		)
-	}
-
-	return nil
-}
-
-func (s StrfryBackend) CountEvents(ctx context.Context, filter nostr.Filter) (int64, error) {
-	stdout, err := s.baseStrfryScan(ctx, filter)
-	if err != nil {
-		return 0, err
-	}
-
-	var count int64
-	for {
-		_, err := stdout.ReadBytes('\n')
-		if err != nil {
-			break
-		}
-		count++
-	}
-
-	return count, nil
-}
-
-func (s StrfryBackend) baseStrfryScan(ctx context.Context, filter nostr.Filter) (*bytes.Buffer, error) {
-	args := make([]string, 0, 3)
-	if s.ConfigPath != "" {
-		args = append(args, "--config="+s.ConfigPath)
-	}
-	args = append(args, "scan")
-	args = append(args, filter.String())
-
-	cmd := exec.CommandContext(ctx, s.ExecutablePath, args...)
-	var stdout bytes.Buffer
-	cmd.Stdout = &stdout
-	var stderr bytes.Buffer
-	cmd.Stderr = &stderr
-
-	err := cmd.Run()
-	if err != nil {
-		return nil, fmt.Errorf(
-			"%s %s failed: %w, (%s)",
-			s.ExecutablePath, strings.Join(args, " "), err, stderr.String(),
-		)
-	}
-
-	return &stdout, nil
-}

eventstore/test/benchmark_test.go

@@ -7,12 +7,11 @@ import (
 	"os"
 	"testing"
 
+	"fiatjaf.com/nostr"
 	"fiatjaf.com/nostr/eventstore"
 	"fiatjaf.com/nostr/eventstore/badger"
 	"fiatjaf.com/nostr/eventstore/lmdb"
 	"fiatjaf.com/nostr/eventstore/slicestore"
-	"fiatjaf.com/nostr/eventstore/sqlite3"
-	"fiatjaf.com/nostr"
 )
 
 func BenchmarkSliceStore(b *testing.B) {
@@ -35,61 +34,53 @@ func BenchmarkBadger(b *testing.B) {
 	runBenchmarkOn(b, d)
 }
 
-func BenchmarkSQLite(b *testing.B) {
-	os.RemoveAll(dbpath + "sqlite")
-	q := &sqlite3.SQLite3Backend{DatabaseURL: dbpath + "sqlite", QueryTagsLimit: 50}
-	q.Init()
-
-	runBenchmarkOn(b, q)
-}
-
 func runBenchmarkOn(b *testing.B, db eventstore.Store) {
 	for i := 0; i < 10000; i++ {
 		eTag := make([]byte, 32)
 		binary.BigEndian.PutUint16(eTag, uint16(i))
 
-		ref, _ := nostr.GetPublicKey(sk3)
+		ref := nostr.GetPublicKey(sk3)
 		if i%3 == 0 {
-			ref, _ = nostr.GetPublicKey(sk4)
+			ref = nostr.GetPublicKey(sk4)
 		}
 
-		evt := &nostr.Event{
+		evt := nostr.Event{
 			CreatedAt: nostr.Timestamp(i*10 + 2),
 			Content:   fmt.Sprintf("hello %d", i),
 			Tags: nostr.Tags{
 				{"t", fmt.Sprintf("t%d", i)},
 				{"e", hex.EncodeToString(eTag)},
-				{"p", ref},
+				{"p", ref.Hex()},
 			},
-			Kind: i % 10,
+			Kind: uint16(i % 10),
 		}
 		sk := sk3
 		if i%3 == 0 {
 			sk = sk4
 		}
 		evt.Sign(sk)
-		db.SaveEvent(ctx, evt)
+		db.SaveEvent(evt)
 	}
 
 	filters := make([]nostr.Filter, 0, 10)
-	filters = append(filters, nostr.Filter{Kinds: []int{1, 4, 8, 16}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{1, 4, 8, 16}})
-	pk3, _ := nostr.GetPublicKey(sk3)
+	pk3 := nostr.GetPublicKey(sk3)
-	filters = append(filters, nostr.Filter{Authors: []string{pk3, nostr.GeneratePrivateKey()}})
+	filters = append(filters, nostr.Filter{Authors: []nostr.PubKey{pk3, nostr.Generate().Public()}})
-	filters = append(filters, nostr.Filter{Authors: []string{pk3, nostr.GeneratePrivateKey()}, Kinds: []int{3, 4}})
+	filters = append(filters, nostr.Filter{Authors: []nostr.PubKey{pk3, nostr.Generate().Public()}, Kinds: []uint16{3, 4}})
 	filters = append(filters, nostr.Filter{})
 	filters = append(filters, nostr.Filter{Limit: 20})
-	filters = append(filters, nostr.Filter{Kinds: []int{8, 9}, Tags: nostr.TagMap{"p": []string{pk3}}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{8, 9}, Tags: nostr.TagMap{"p": []string{pk3.Hex()}}})
-	pk4, _ := nostr.GetPublicKey(sk4)
+	pk4 := nostr.GetPublicKey(sk4)
-	filters = append(filters, nostr.Filter{Kinds: []int{8, 9}, Tags: nostr.TagMap{"p": []string{pk3, pk4}}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{8, 9}, Tags: nostr.TagMap{"p": []string{pk3.Hex(), pk4.Hex()}}})
-	filters = append(filters, nostr.Filter{Kinds: []int{8, 9}, Tags: nostr.TagMap{"p": []string{pk3, pk4}}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{8, 9}, Tags: nostr.TagMap{"p": []string{pk3.Hex(), pk4.Hex()}}})
 	eTags := make([]string, 20)
 	for i := 0; i < 20; i++ {
 		eTag := make([]byte, 32)
 		binary.BigEndian.PutUint16(eTag, uint16(i))
 		eTags[i] = hex.EncodeToString(eTag)
 	}
-	filters = append(filters, nostr.Filter{Kinds: []int{9}, Tags: nostr.TagMap{"e": eTags}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{9}, Tags: nostr.TagMap{"e": eTags}})
-	filters = append(filters, nostr.Filter{Kinds: []int{5}, Tags: nostr.TagMap{"e": eTags, "t": []string{"t5"}}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{5}, Tags: nostr.TagMap{"e": eTags, "t": []string{"t5"}}})
 	filters = append(filters, nostr.Filter{Tags: nostr.TagMap{"e": eTags}})
 	filters = append(filters, nostr.Filter{Tags: nostr.TagMap{"e": eTags}, Limit: 50})
 
@@ -97,17 +88,17 @@ func runBenchmarkOn(b *testing.B, db eventstore.Store) {
 		for q, filter := range filters {
 			b.Run(fmt.Sprintf("q-%d", q), func(b *testing.B) {
 				for i := 0; i < b.N; i++ {
-					_, _ = db.QueryEvents(ctx, filter)
+					_ = db.QueryEvents(filter)
 				}
 			})
 		}
 	})
 
 	b.Run("insert", func(b *testing.B) {
-		evt := &nostr.Event{Kind: 788, CreatedAt: nostr.Now(), Content: "blergh", Tags: nostr.Tags{{"t", "spam"}}}
+		evt := nostr.Event{Kind: 788, CreatedAt: nostr.Now(), Content: "blergh", Tags: nostr.Tags{{"t", "spam"}}}
 		evt.Sign(sk4)
 		for i := 0; i < b.N; i++ {
-			db.SaveEvent(ctx, evt)
+			db.SaveEvent(evt)
 		}
 	})
 }

eventstore/test/db_test.go

@@ -5,16 +5,17 @@ import (
 	"os"
 	"testing"
 
+	"fiatjaf.com/nostr"
 	"fiatjaf.com/nostr/eventstore"
 	"fiatjaf.com/nostr/eventstore/badger"
 	"fiatjaf.com/nostr/eventstore/lmdb"
 	"fiatjaf.com/nostr/eventstore/slicestore"
 )
 
-const (
+var (
 	dbpath = "/tmp/eventstore-test"
-	sk3    = "0000000000000000000000000000000000000000000000000000000000000003"
+	sk3    = nostr.MustSecretKeyFromHex("0000000000000000000000000000000000000000000000000000000000000003")
-	sk4    = "0000000000000000000000000000000000000000000000000000000000000004"
+	sk4    = nostr.MustSecretKeyFromHex("0000000000000000000000000000000000000000000000000000000000000004")
 )
 
 var ctx = context.Background()

eventstore/test/first_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"fiatjaf.com/nostr/eventstore"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore"
 	"github.com/stretchr/testify/require"
 )
 
@@ -16,11 +16,11 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
 	err := db.Init()
 	require.NoError(t, err)
 
-	allEvents := make([]*nostr.Event, 0, 10)
+	allEvents := make([]nostr.Event, 0, 10)
 
 	// insert
 	for i := 0; i < 10; i++ {
-		evt := &nostr.Event{
+		evt := nostr.Event{
 			CreatedAt: nostr.Timestamp(i*10 + 2),
 			Content:   fmt.Sprintf("hello %d", i),
 			Tags: nostr.Tags{
@@ -38,7 +38,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
 		}
 		evt.Sign(sk)
 		allEvents = append(allEvents, evt)
-		err = db.SaveEvent(ctx, evt)
+		err = db.SaveEvent(evt)
 		require.NoError(t, err)
 	}
 
@@ -67,60 +67,61 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
 	}
 
 	{
-		results, err := w.QuerySync(ctx, nostr.Filter{IDs: []string{allEvents[7].ID, allEvents[9].ID}})
+		results, err := w.QuerySync(ctx, nostr.Filter{IDs: []nostr.ID{allEvents[7].ID, allEvents[9].ID}})
 		require.NoError(t, err)
 		require.Len(t, results, 2)
 		require.ElementsMatch(t,
-			[]*nostr.Event{allEvents[7], allEvents[9]},
+			[]nostr.Event{allEvents[7], allEvents[9]},
 			results,
 			"id query error")
 	}
 
 	{
-		results, err := w.QuerySync(ctx, nostr.Filter{Kinds: []int{1}})
+		results, err := w.QuerySync(ctx, nostr.Filter{Kinds: []uint16{1}})
 		require.NoError(t, err)
 		require.ElementsMatch(t,
-			[]*nostr.Event{allEvents[1], allEvents[3], allEvents[5], allEvents[7], allEvents[9]},
+			[]nostr.Event{allEvents[1], allEvents[3], allEvents[5], allEvents[7], allEvents[9]},
 			results,
 			"kind query error")
 	}
 
 	{
-		results, err := w.QuerySync(ctx, nostr.Filter{Kinds: []int{9}})
+		results, err := w.QuerySync(ctx, nostr.Filter{Kinds: []uint16{9}})
 		require.NoError(t, err)
 		require.ElementsMatch(t,
-			[]*nostr.Event{allEvents[0], allEvents[2], allEvents[4], allEvents[6], allEvents[8]},
+			[]nostr.Event{allEvents[0], allEvents[2], allEvents[4], allEvents[6], allEvents[8]},
 			results,
 			"second kind query error")
 	}
 
 	{
-		pk4, _ := nostr.GetPublicKey(sk4)
+		pk4 := nostr.GetPublicKey(sk4)
-		results, err := w.QuerySync(ctx, nostr.Filter{Authors: []string{pk4}})
+		results, err := w.QuerySync(ctx, nostr.Filter{Authors: []nostr.PubKey{pk4}})
 		require.NoError(t, err)
 		require.ElementsMatch(t,
-			[]*nostr.Event{allEvents[0], allEvents[3], allEvents[6], allEvents[9]},
+			[]nostr.Event{allEvents[0], allEvents[3], allEvents[6], allEvents[9]},
 			results,
 			"pubkey query error")
 	}
 
 	{
-		pk3, _ := nostr.GetPublicKey(sk3)
+		pk3 := nostr.GetPublicKey(sk3)
-		results, err := w.QuerySync(ctx, nostr.Filter{Kinds: []int{9}, Authors: []string{pk3}})
+		results, err := w.QuerySync(ctx, nostr.Filter{Kinds: []uint16{9}, Authors: []nostr.PubKey{pk3}})
 		require.NoError(t, err)
 		require.ElementsMatch(t,
-			[]*nostr.Event{allEvents[2], allEvents[4], allEvents[8]},
+			[]nostr.Event{allEvents[2], allEvents[4], allEvents[8]},
 			results,
 			"pubkey kind query error")
 	}
 
 	{
-		pk3, _ := nostr.GetPublicKey(sk3)
+		pk3 := nostr.GetPublicKey(sk3)
-		pk4, _ := nostr.GetPublicKey(sk4)
+		pk4 := nostr.GetPublicKey(sk4)
-		results, err := w.QuerySync(ctx, nostr.Filter{Kinds: []int{9, 5, 7}, Authors: []string{pk3, pk4, pk4[1:] + "a"}})
+		pk4[1] = 'a'
+		results, err := w.QuerySync(ctx, nostr.Filter{Kinds: []uint16{9, 5, 7}, Authors: []nostr.PubKey{pk3, pk4}})
 		require.NoError(t, err)
 		require.ElementsMatch(t,
-			[]*nostr.Event{allEvents[0], allEvents[2], allEvents[4], allEvents[6], allEvents[8]},
+			[]nostr.Event{allEvents[0], allEvents[2], allEvents[4], allEvents[6], allEvents[8]},
 			results,
 			"2 pubkeys and kind query error")
 	}
@@ -129,14 +130,14 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
 		results, err := w.QuerySync(ctx, nostr.Filter{Tags: nostr.TagMap{"t": []string{"2", "4", "6"}}})
 		require.NoError(t, err)
 		require.ElementsMatch(t,
-			[]*nostr.Event{allEvents[2], allEvents[4], allEvents[6]},
+			[]nostr.Event{allEvents[2], allEvents[4], allEvents[6]},
 			results,
 			"tag query error")
 	}
 
 	// delete
-	require.NoError(t, db.DeleteEvent(ctx, allEvents[4]), "delete 1 error")
+	require.NoError(t, db.DeleteEvent(allEvents[4].ID), "delete 1 error")
-	require.NoError(t, db.DeleteEvent(ctx, allEvents[5]), "delete 2 error")
+	require.NoError(t, db.DeleteEvent(allEvents[5].ID), "delete 2 error")
 
 	// query again
 	{
@@ -152,7 +153,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
 		results, err := w.QuerySync(ctx, nostr.Filter{Tags: nostr.TagMap{"t": []string{"2", "6"}}})
 		require.NoError(t, err)
 		require.ElementsMatch(t,
-			[]*nostr.Event{allEvents[2], allEvents[6]},
+			[]nostr.Event{allEvents[2], allEvents[6]},
 			results,
 			"second tag query error")
 	}
@@ -161,7 +162,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
 		results, err := w.QuerySync(ctx, nostr.Filter{Tags: nostr.TagMap{"e": []string{allEvents[3].Tags[1][1]}}})
 		require.NoError(t, err)
 		require.ElementsMatch(t,
-			[]*nostr.Event{allEvents[3]},
+			[]nostr.Event{allEvents[3]},
 			results,
 			"'e' tag query error")
 	}
@@ -184,7 +185,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
 		p := "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
 		p2 := "2eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
 
-		newEvents := []*nostr.Event{
+		newEvents := []nostr.Event{
 			{Tags: nostr.Tags{nostr.Tag{"p", p}}, Kind: 1984, CreatedAt: nostr.Timestamp(100), Content: "first"},
 			{Tags: nostr.Tags{nostr.Tag{"p", p}, nostr.Tag{"t", "x"}}, Kind: 1984, CreatedAt: nostr.Timestamp(101), Content: "middle"},
 			{Tags: nostr.Tags{nostr.Tag{"p", p}}, Kind: 1984, CreatedAt: nostr.Timestamp(102), Content: "last"},
@@ -195,21 +196,21 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
 			{Tags: nostr.Tags{nostr.Tag{"p", p}, nostr.Tag{"p", p2}}, Kind: 1, CreatedAt: nostr.Timestamp(104), Content: "trololo"},
 		}
 
-		sk := nostr.GeneratePrivateKey()
+		sk := nostr.Generate()
 		for _, newEvent := range newEvents {
 			newEvent.Sign(sk)
-			require.NoError(t, db.SaveEvent(ctx, newEvent))
+			require.NoError(t, db.SaveEvent(newEvent))
 		}
 
 		{
 			results, err := w.QuerySync(ctx, nostr.Filter{
 				Tags:  nostr.TagMap{"p": []string{p}},
-				Kinds: []int{1984},
+				Kinds: []uint16{1984},
 				Limit: 2,
 			})
 			require.NoError(t, err)
 			require.ElementsMatch(t,
-				[]*nostr.Event{newEvents[2], newEvents[1]},
+				[]nostr.Event{newEvents[2], newEvents[1]},
 				results,
 				"'p' tag 1 query error")
 		}
@@ -222,7 +223,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
 			require.NoError(t, err)
 			require.ElementsMatch(t,
 				// the results won't be in canonical time order because this query is too awful, needs a kind
-				[]*nostr.Event{newEvents[1]},
+				[]nostr.Event{newEvents[1]},
 				results,
 				"'p' tag 2 query error")
 		}
@@ -230,7 +231,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
 		{
 			results, err := w.QuerySync(ctx, nostr.Filter{
 				Tags:  nostr.TagMap{"p": []string{p, p2}},
-				Kinds: []int{1},
+				Kinds: []uint16{1},
 				Limit: 4,
 			})
 			require.NoError(t, err)

eventstore/test/manyauthors_test.go

@@ -2,13 +2,12 @@ package test
 
 import (
 	"encoding/binary"
-	"encoding/hex"
 	"fmt"
 	"slices"
 	"testing"
 
-	"fiatjaf.com/nostr/eventstore"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore"
 	"github.com/stretchr/testify/require"
 )
 
@@ -18,35 +17,35 @@ func manyAuthorsTest(t *testing.T, db eventstore.Store) {
 	const total = 10000
 	const limit = 500
 	const authors = 1700
-	kinds := []int{6, 7, 8}
+	kinds := []uint16{6, 7, 8}
 
 	bigfilter := nostr.Filter{
-		Authors: make([]string, authors),
+		Authors: make([]nostr.PubKey, authors),
 		Kinds:   kinds,
 		Limit:   limit,
 	}
 	for i := 0; i < authors; i++ {
 		sk := make([]byte, 32)
 		binary.BigEndian.PutUint32(sk, uint32(i%(total/5))+1)
-		pk, _ := nostr.GetPublicKey(hex.EncodeToString(sk))
+		pk := nostr.GetPublicKey([32]byte(sk))
 		bigfilter.Authors[i] = pk
 	}
 
-	ordered := make([]*nostr.Event, 0, total)
+	ordered := make([]nostr.Event, 0, total)
 	for i := 0; i < total; i++ {
 		sk := make([]byte, 32)
 		binary.BigEndian.PutUint32(sk, uint32(i%(total/5))+1)
 
-		evt := &nostr.Event{
+		evt := nostr.Event{
 			CreatedAt: nostr.Timestamp(i*i) / 4,
 			Content:   fmt.Sprintf("lots of stuff %d", i),
 			Tags:      nostr.Tags{},
-			Kind:      i % 10,
+			Kind:      uint16(i % 10),
 		}
-		err := evt.Sign(hex.EncodeToString(sk))
+		err := evt.Sign([32]byte(sk))
 		require.NoError(t, err)
 
-		err = db.SaveEvent(ctx, evt)
+		err = db.SaveEvent(evt)
 		require.NoError(t, err)
 
 		if bigfilter.Matches(evt) {
@@ -56,12 +55,11 @@ func manyAuthorsTest(t *testing.T, db eventstore.Store) {
 
 	w := eventstore.RelayWrapper{Store: db}
 
-	res, err := w.QuerySync(ctx, bigfilter)
+	res := slices.Collect(w.QueryEvents(bigfilter))
 
-	require.NoError(t, err)
 	require.Len(t, res, limit)
-	require.True(t, slices.IsSortedFunc(res, nostr.CompareEventPtrReverse))
+	require.True(t, slices.IsSortedFunc(res, nostr.CompareEventReverse))
-	slices.SortFunc(ordered, nostr.CompareEventPtrReverse)
+	slices.SortFunc(ordered, nostr.CompareEventReverse)
 	require.Equal(t, ordered[0], res[0])
 	require.Equal(t, ordered[limit-1], res[limit-1])
 	require.Equal(t, ordered[0:limit], res)

eventstore/test/relaywrapper_test.go

@@ -2,16 +2,17 @@ package test
 
 import (
 	"context"
+	"slices"
 	"testing"
 	"time"
 
+	"fiatjaf.com/nostr"
 	"fiatjaf.com/nostr/eventstore"
 	"fiatjaf.com/nostr/eventstore/slicestore"
-	"fiatjaf.com/nostr"
 	"github.com/stretchr/testify/require"
 )
 
-var sk = "486d5f6d4891f4ce3cd5f4d6b62d184ec8ea10db455830ab7918ca43d4d7ad24"
+var sk = nostr.MustSecretKeyFromHex("486d5f6d4891f4ce3cd5f4d6b62d184ec8ea10db455830ab7918ca43d4d7ad24")
 
 func TestRelayWrapper(t *testing.T) {
 	ctx := context.Background()
@@ -44,6 +45,6 @@ func TestRelayWrapper(t *testing.T) {
 	}
 	time.Sleep(time.Millisecond * 200)
 
-	evts, _ := w.QuerySync(ctx, nostr.Filter{Kinds: []int{3}})
+	evts := slices.Collect(w.QueryEvents(nostr.Filter{Kinds: []uint16{3}}))
 	require.Len(t, evts, 1)
 }

eventstore/test/second_test.go

@@ -4,10 +4,11 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
+	"slices"
 	"testing"
 
-	"fiatjaf.com/nostr/eventstore"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore"
 	"github.com/stretchr/testify/require"
 )
 
@@ -18,33 +19,33 @@ func runSecondTestOn(t *testing.T, db eventstore.Store) {
 		eTag := make([]byte, 32)
 		binary.BigEndian.PutUint16(eTag, uint16(i))
 
-		ref, _ := nostr.GetPublicKey(sk3)
+		ref := nostr.GetPublicKey(sk3)
 		if i%3 == 0 {
-			ref, _ = nostr.GetPublicKey(sk4)
+			ref = nostr.GetPublicKey(sk4)
 		}
 
-		evt := &nostr.Event{
+		evt := nostr.Event{
 			CreatedAt: nostr.Timestamp(i*10 + 2),
 			Content:   fmt.Sprintf("hello %d", i),
 			Tags: nostr.Tags{
 				{"t", fmt.Sprintf("t%d", i)},
 				{"e", hex.EncodeToString(eTag)},
-				{"p", ref},
+				{"p", ref.Hex()},
 			},
-			Kind: i % 10,
+			Kind: uint16(i % 10),
 		}
 		sk := sk3
 		if i%3 == 0 {
 			sk = sk4
 		}
 		evt.Sign(sk)
-		err := db.SaveEvent(ctx, evt)
+		err := db.SaveEvent(evt)
 		require.NoError(t, err)
 	}
 
 	w := eventstore.RelayWrapper{Store: db}
-	pk3, _ := nostr.GetPublicKey(sk3)
+	pk3 := nostr.GetPublicKey(sk3)
-	pk4, _ := nostr.GetPublicKey(sk4)
+	pk4 := nostr.GetPublicKey(sk4)
 	eTags := make([]string, 20)
 	for i := 0; i < 20; i++ {
 		eTag := make([]byte, 32)
@@ -53,16 +54,16 @@ func runSecondTestOn(t *testing.T, db eventstore.Store) {
 	}
 
 	filters := make([]nostr.Filter, 0, 10)
-	filters = append(filters, nostr.Filter{Kinds: []int{1, 4, 8, 16}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{1, 4, 8, 16}})
-	filters = append(filters, nostr.Filter{Authors: []string{pk3, nostr.GeneratePrivateKey()}})
+	filters = append(filters, nostr.Filter{Authors: []nostr.PubKey{pk3, nostr.Generate().Public()}})
-	filters = append(filters, nostr.Filter{Authors: []string{pk3, nostr.GeneratePrivateKey()}, Kinds: []int{3, 4}})
+	filters = append(filters, nostr.Filter{Authors: []nostr.PubKey{pk3, nostr.Generate().Public()}, Kinds: []uint16{3, 4}})
 	filters = append(filters, nostr.Filter{})
 	filters = append(filters, nostr.Filter{Limit: 20})
-	filters = append(filters, nostr.Filter{Kinds: []int{8, 9}, Tags: nostr.TagMap{"p": []string{pk3}}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{8, 9}, Tags: nostr.TagMap{"p": []string{pk3.Hex()}}})
-	filters = append(filters, nostr.Filter{Kinds: []int{8, 9}, Tags: nostr.TagMap{"p": []string{pk3, pk4}}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{8, 9}, Tags: nostr.TagMap{"p": []string{pk3.Hex(), pk4.Hex()}}})
-	filters = append(filters, nostr.Filter{Kinds: []int{8, 9}, Tags: nostr.TagMap{"p": []string{pk3, pk4}}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{8, 9}, Tags: nostr.TagMap{"p": []string{pk3.Hex(), pk4.Hex()}}})
-	filters = append(filters, nostr.Filter{Kinds: []int{9}, Tags: nostr.TagMap{"e": eTags}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{9}, Tags: nostr.TagMap{"e": eTags}})
-	filters = append(filters, nostr.Filter{Kinds: []int{5}, Tags: nostr.TagMap{"e": eTags, "t": []string{"t5"}}})
+	filters = append(filters, nostr.Filter{Kinds: []uint16{5}, Tags: nostr.TagMap{"e": eTags, "t": []string{"t5"}}})
 	filters = append(filters, nostr.Filter{Tags: nostr.TagMap{"e": eTags}})
 	filters = append(filters, nostr.Filter{Tags: nostr.TagMap{"e": eTags}, Limit: 50})
 
@@ -73,8 +74,7 @@ func runSecondTestOn(t *testing.T, db eventstore.Store) {
 			label := fmt.Sprintf("filter %d: %s", q, filter)
 
 			t.Run(fmt.Sprintf("q-%d", q), func(t *testing.T) {
-				results, err := w.QuerySync(ctx, filter)
+				results := slices.Collect(w.QueryEvents(filter))
-				require.NoError(t, err, filter)
 				require.NotEmpty(t, results, label)
 			})
 		}

eventstore/test/unbalanced_test.go

@@ -2,13 +2,12 @@ package test
 
 import (
 	"encoding/binary"
-	"encoding/hex"
 	"fmt"
 	"slices"
 	"testing"
 
-	"fiatjaf.com/nostr/eventstore"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore"
 	"github.com/stretchr/testify/require"
 )
 
@@ -21,33 +20,33 @@ func unbalancedTest(t *testing.T, db eventstore.Store) {
 	const authors = 1400
 
 	bigfilter := nostr.Filter{
-		Authors: make([]string, authors),
+		Authors: make([]nostr.PubKey, authors),
 		Limit:   limit,
 	}
 	for i := 0; i < authors; i++ {
 		sk := make([]byte, 32)
 		binary.BigEndian.PutUint32(sk, uint32(i%(authors*2))+1)
-		pk, _ := nostr.GetPublicKey(hex.EncodeToString(sk))
+		pk := nostr.GetPublicKey([32]byte(sk))
 		bigfilter.Authors[i] = pk
 	}
 	// fmt.Println("filter", bigfilter)
 
-	expected := make([]*nostr.Event, 0, total)
+	expected := make([]nostr.Event, 0, total)
 	for i := 0; i < total; i++ {
 		skseed := uint32(i%(authors*2)) + 1
 		sk := make([]byte, 32)
 		binary.BigEndian.PutUint32(sk, skseed)
 
-		evt := &nostr.Event{
+		evt := nostr.Event{
 			CreatedAt: nostr.Timestamp(skseed)*1000 + nostr.Timestamp(i),
 			Content:   fmt.Sprintf("unbalanced %d", i),
 			Tags:      nostr.Tags{},
 			Kind:      1,
 		}
-		err := evt.Sign(hex.EncodeToString(sk))
+		err := evt.Sign([32]byte(sk))
 		require.NoError(t, err)
 
-		err = db.SaveEvent(ctx, evt)
+		err = db.SaveEvent(evt)
 		require.NoError(t, err)
 
 		if bigfilter.Matches(evt) {
@@ -55,7 +54,7 @@ func unbalancedTest(t *testing.T, db eventstore.Store) {
 		}
 	}
 
-	slices.SortFunc(expected, nostr.CompareEventPtrReverse)
+	slices.SortFunc(expected, nostr.CompareEventReverse)
 	if len(expected) > limit {
 		expected = expected[0:limit]
 	}
@@ -63,11 +62,10 @@ func unbalancedTest(t *testing.T, db eventstore.Store) {
 
 	w := eventstore.RelayWrapper{Store: db}
 
-	res, err := w.QuerySync(ctx, bigfilter)
+	res := slices.Collect(w.QueryEvents(bigfilter))
 
-	require.NoError(t, err)
 	require.Equal(t, limit, len(res))
-	require.True(t, slices.IsSortedFunc(res, nostr.CompareEventPtrReverse))
+	require.True(t, slices.IsSortedFunc(res, nostr.CompareEventReverse))
 	require.Equal(t, expected[0], res[0])
 
 	// fmt.Println(" expected   result")

go.mod

@@ -3,10 +3,13 @@ module fiatjaf.com/nostr
 go 1.24.1
 
 require (
+	fiatjaf.com/lib v0.2.0
 	github.com/FastFilter/xorfilter v0.2.1
 	github.com/ImVexed/fasturl v0.0.0-20230304231329-4e41488060f3
 	github.com/PowerDNS/lmdb-go v1.9.3
+	github.com/bep/debounce v1.2.1
 	github.com/bluekeyes/go-gitdiff v0.7.1
+	github.com/blugelabs/bluge v0.2.2
 	github.com/btcsuite/btcd/btcec/v2 v2.3.4
 	github.com/btcsuite/btcd/btcutil v1.1.5
 	github.com/bytedance/sonic v1.13.1
@@ -15,69 +18,77 @@ require (
 	github.com/dgraph-io/badger/v4 v4.5.0
 	github.com/dgraph-io/ristretto v1.0.0
 	github.com/elnosh/gonuts v0.3.1-0.20250123162555-7c0381a585e3
+	github.com/fasthttp/websocket v1.5.12
 	github.com/fiatjaf/eventstore v0.16.2
 	github.com/fiatjaf/khatru v0.17.4
 	github.com/gomarkdown/markdown v0.0.0-20241205020045-f7e15b2f3e62
-	github.com/jmoiron/sqlx v1.4.0
 	github.com/json-iterator/go v1.1.12
+	github.com/kr/pretty v0.3.1
+	github.com/liamg/magic v0.0.1
 	github.com/mailru/easyjson v0.9.0
-	github.com/mattn/go-sqlite3 v1.14.24
 	github.com/microcosm-cc/bluemonday v1.0.27
-	github.com/ncruces/go-sqlite3 v0.18.3
 	github.com/puzpuzpuz/xsync/v3 v3.5.1
+	github.com/rs/cors v1.11.1
+	github.com/rs/zerolog v1.33.0
 	github.com/stretchr/testify v1.10.0
 	github.com/tidwall/gjson v1.18.0
-	github.com/tursodatabase/go-libsql v0.0.0-20240916111504-922dfa87e1e6
 	github.com/tyler-smith/go-bip32 v1.0.0
 	github.com/tyler-smith/go-bip39 v1.1.0
+	github.com/urfave/cli/v3 v3.0.0-beta1
 	github.com/valyala/fasthttp v1.59.0
 	golang.org/x/crypto v0.36.0
 	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
 	golang.org/x/net v0.37.0
 	golang.org/x/sync v0.12.0
 	golang.org/x/text v0.23.0
-	modernc.org/sqlite v1.33.1
 )
 
 require (
-	fiatjaf.com/lib v0.2.0 // indirect
 	github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e // indirect
 	github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect
+	github.com/RoaringBitmap/roaring v1.9.4 // indirect
 	github.com/andybalholm/brotli v1.1.1 // indirect
-	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
+	github.com/axiomhq/hyperloglog v0.2.0 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
-	github.com/bep/debounce v1.2.1 // indirect
+	github.com/bits-and-blooms/bitset v1.17.0 // indirect
+	github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
+	github.com/blevesearch/mmap-go v1.0.4 // indirect
+	github.com/blevesearch/segment v0.9.1 // indirect
+	github.com/blevesearch/snowballstem v0.9.0 // indirect
+	github.com/blevesearch/vellum v1.0.11 // indirect
+	github.com/blugelabs/bluge_segment_api v0.2.0 // indirect
+	github.com/blugelabs/ice v1.0.0 // indirect
+	github.com/blugelabs/ice/v2 v2.0.1 // indirect
 	github.com/btcsuite/btcd v0.24.2 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
 	github.com/bytedance/sonic/loader v0.2.4 // indirect
+	github.com/caio/go-tdigest v3.1.0+incompatible // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/crypto/blake256 v1.1.0 // indirect
 	github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect
+	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/fasthttp/websocket v1.5.12 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/flatbuffers v24.12.23+incompatible // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
-	github.com/libsql/sqlite-antlr4-parser v0.0.0-20240327125255-dbf53b6cbf06 // indirect
+	github.com/kr/text v0.2.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/modern-go/reflect2 v1.0.2 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/mschoch/smat v0.2.0 // indirect
-	github.com/ncruces/julianday v1.0.0 // indirect
+	github.com/nbd-wtf/go-nostr v0.51.4 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/rs/cors v1.11.1 // indirect
 	github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38 // indirect
-	github.com/tetratelabs/wazero v1.8.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
@@ -88,10 +99,4 @@ require (
 	golang.org/x/sys v0.31.0 // indirect
 	google.golang.org/protobuf v1.36.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
-	modernc.org/libc v1.55.3 // indirect
-	modernc.org/mathutil v1.6.0 // indirect
-	modernc.org/memory v1.8.0 // indirect
-	modernc.org/strutil v1.2.0 // indirect
-	modernc.org/token v1.1.0 // indirect
 )

go.sum

@@ -1,8 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 fiatjaf.com/lib v0.2.0 h1:TgIJESbbND6GjOgGHxF5jsO6EMjuAxIzZHPo5DXYexs=
 fiatjaf.com/lib v0.2.0/go.mod h1:Ycqq3+mJ9jAWu7XjbQI1cVr+OFgnHn79dQR5oTII47g=
-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e h1:ahyvB3q25YnZWly5Gq1ekg6jcmWaGj/vG/MhF4aisoc=
 github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e/go.mod h1:kGUqhHd//musdITWjFvNTHn90WG9bMLBEPQZ17Cmlpw=
@@ -12,19 +10,56 @@ github.com/FastFilter/xorfilter v0.2.1 h1:lbdeLG9BdpquK64ZsleBS8B4xO/QW1IM0gMzF7
 github.com/FastFilter/xorfilter v0.2.1/go.mod h1:aumvdkhscz6YBZF9ZA/6O4fIoNod4YR50kIVGGZ7l9I=
 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/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/PowerDNS/lmdb-go v1.9.3 h1:AUMY2pZT8WRpkEv39I9Id3MuoHd+NZbTVpNhruVkPTg=
 github.com/PowerDNS/lmdb-go v1.9.3/go.mod h1:TE0l+EZK8Z1B4dx070ZxkWTlp8RG1mjN0/+FkFRQMtU=
+github.com/RoaringBitmap/gocroaring v0.4.0/go.mod h1:NieMwz7ZqwU2DD73/vvYwv7r4eWBKuPVSXZIpsaMwCI=
+github.com/RoaringBitmap/real-roaring-datasets v0.0.0-20190726190000-eb7c87156f76/go.mod h1:oM0MHmQ3nDsq609SS36p+oYbRi16+oVvU2Bw4Ipv0SE=
+github.com/RoaringBitmap/roaring v0.9.1/go.mod h1:h1B7iIUOmnAeb5ytYMvnHJwxMc6LUrwBnzXWRuqTQUc=
+github.com/RoaringBitmap/roaring v0.9.4/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA=
+github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ=
+github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
+github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
 github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
-github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
+github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f/go.mod h1:2stgcRjl6QmW+gU2h5E7BQXg4HU0gzxKWDuT5HviN9s=
+github.com/axiomhq/hyperloglog v0.2.0 h1:u1XT3yyY1rjzlWuP6NQIrV4bRYHOaqZaovqjcBEvZJo=
+github.com/axiomhq/hyperloglog v0.2.0/go.mod h1:GcgMjz9gaDKZ3G0UMS6Fq/VkZ4l7uGgcJyxA7M+omIM=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY=
 github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
+github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
+github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/bits-and-blooms/bitset v1.17.0 h1:1X2TS7aHz1ELcC0yU1y2stUs/0ig5oMU6STFZGrhvHI=
+github.com/bits-and-blooms/bitset v1.17.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo=
+github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M=
+github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA=
+github.com/blevesearch/mmap-go v1.0.3/go.mod h1:pYvKl/grLQrBxuaRYgoTssa4rVujYYeenDp++2E+yvs=
+github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc=
+github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs=
+github.com/blevesearch/segment v0.9.0/go.mod h1:9PfHYUdQCgHktBgvtUOF4x+pc4/l8rdH0u5spnW85UQ=
+github.com/blevesearch/segment v0.9.1 h1:+dThDy+Lvgj5JMxhmOVlgFfkUtZV2kw49xax4+jTfSU=
+github.com/blevesearch/segment v0.9.1/go.mod h1:zN21iLm7+GnBHWTao9I+Au/7MBiL8pPFtJBJTsk6kQw=
+github.com/blevesearch/snowballstem v0.9.0 h1:lMQ189YspGP6sXvZQ4WZ+MLawfV8wOmPoD/iWeNXm8s=
+github.com/blevesearch/snowballstem v0.9.0/go.mod h1:PivSj3JMc8WuaFkTSRDW2SlrulNWPl4ABg1tC/hlgLs=
+github.com/blevesearch/vellum v1.0.5/go.mod h1:atE0EH3fvk43zzS7t1YNdNC7DbmcC3uz+eMD5xZ2OyQ=
+github.com/blevesearch/vellum v1.0.7/go.mod h1:doBZpmRhwTsASB4QdUZANlJvqVAUdUyX0ZK7QJCTeBE=
+github.com/blevesearch/vellum v1.0.11 h1:SJI97toEFTtA9WsDZxkyGTaBWFdWl1n2LEDCXLCq/AU=
+github.com/blevesearch/vellum v1.0.11/go.mod h1:QgwWryE8ThtNPxtgWJof5ndPfx0/YMBh+W2weHKPw8Y=
 github.com/bluekeyes/go-gitdiff v0.7.1 h1:graP4ElLRshr8ecu0UtqfNTCHrtSyZd3DABQm/DWesQ=
 github.com/bluekeyes/go-gitdiff v0.7.1/go.mod h1:QpfYYO1E0fTVHVZAZKiRjtSGY9823iCdvGXBcEzHGbM=
+github.com/blugelabs/bluge v0.2.2 h1:gat8CqE6P6tOgeX30XGLOVNTC26cpM2RWVcreXWtYcM=
+github.com/blugelabs/bluge v0.2.2/go.mod h1:am1LU9jS8dZgWkRzkGLQN3757EgMs3upWrU2fdN9foE=
+github.com/blugelabs/bluge_segment_api v0.2.0 h1:cCX1Y2y8v0LZ7+EEJ6gH7dW6TtVTW4RhG0vp3R+N2Lo=
+github.com/blugelabs/bluge_segment_api v0.2.0/go.mod h1:95XA+ZXfRj/IXADm7gZ+iTcWOJPg5jQTY1EReIzl3LA=
+github.com/blugelabs/ice v1.0.0 h1:um7wf9e6jbkTVCrOyQq3tKK43fBMOvLUYxbj3Qtc4eo=
+github.com/blugelabs/ice v1.0.0/go.mod h1:gNfFPk5zM+yxJROhthxhVQYjpBO9amuxWXJQ2Lo+IbQ=
+github.com/blugelabs/ice/v2 v2.0.1 h1:mzHbntLjk2v7eDRgoXCgzOsPKN1Tenu9Svo6l9cTLS4=
+github.com/blugelabs/ice/v2 v2.0.1/go.mod h1:QxAWSPNwZwsIqS25c3lbIPFQrVvT1sphf5x5DfMLH5M=
 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=
@@ -56,6 +91,8 @@ github.com/bytedance/sonic v1.13.1/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1
 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/caio/go-tdigest v3.1.0+incompatible h1:uoVMJ3Q5lXmVLCCqaMGHLBWnbGoN6Lpu7OAUPR60cds=
+github.com/caio/go-tdigest v3.1.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8q9GjDajLC5T7ydxE3JHI=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -70,6 +107,12 @@ github.com/cmars/basen v0.0.0-20150613233007-fe3947df716e/go.mod h1:P13beTBKr5Q1
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
 github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 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=
@@ -89,6 +132,9 @@ github.com/dgraph-io/ristretto/v2 v2.1.0 h1:59LjpOJLNDULHh8MC4UaegN52lC4JnO2dITs
 github.com/dgraph-io/ristretto/v2 v2.1.0/go.mod h1:uejeqfYXpUomfse0+lO+13ATz4TypQYLJZzBSAemuB4=
 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/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
+github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 h1:y7y0Oa6UawqTFPCDw9JG6pdKt4F9pAhHv0B7FMGaGD0=
+github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
 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=
@@ -104,12 +150,13 @@ github.com/fiatjaf/eventstore v0.16.2 h1:h4rHwSwPcqAKqWUsAbYWUhDeSgm2Kp+PBkJc3Fg
 github.com/fiatjaf/eventstore v0.16.2/go.mod h1:0gU8fzYO/bG+NQAVlHtJWOlt3JKKFefh5Xjj2d1dLIs=
 github.com/fiatjaf/khatru v0.17.4 h1:VzcLUyBKMlP/CAG4iHJbDJmnZgzhbGLKLxJAUuLRogg=
 github.com/fiatjaf/khatru v0.17.4/go.mod h1:VYQ7ZNhs3C1+E4gBnx+DtEgU0BrPdrl3XYF3H+mq6fg=
+github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 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/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
-github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
@@ -125,6 +172,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomarkdown/markdown v0.0.0-20241205020045-f7e15b2f3e62 h1:pbAFUZisjG4s6sxvRJvf2N7vhpCvx2Oxb3PmS6pDO1g=
 github.com/gomarkdown/markdown v0.0.0-20241205020045-f7e15b2f3e62/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
@@ -139,57 +188,60 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo=
-github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-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/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
 github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/influxdata/influxdb v1.7.6/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
-github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
 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/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
+github.com/klauspost/compress v1.15.2/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 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/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/libsql/sqlite-antlr4-parser v0.0.0-20240327125255-dbf53b6cbf06 h1:JLvn7D+wXjH9g4Jsjo+VqmzTUpl/LX7vfr6VOfSWTdM=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/libsql/sqlite-antlr4-parser v0.0.0-20240327125255-dbf53b6cbf06/go.mod h1:FUkZ5OHjlGPjnM2UyGJz9TypXQFgYqw6AFNO1UiROTM=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4=
+github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U=
+github.com/liamg/magic v0.0.1 h1:Ru22ElY+sCh6RvRTWjQzKKCxsEco8hE0co8n1qe7TBM=
+github.com/liamg/magic v0.0.1/go.mod h1:yQkOmZZI52EA+SQ2xyHpVw8fNvTBruF873Y+Vt6S+fk=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
 github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 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/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
-github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
 github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 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/ncruces/go-sqlite3 v0.18.3 h1:tyMa75uh7LcINcfo0WrzOvcTkfz8Hqu0TEPX+KVyes4=
+github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
-github.com/ncruces/go-sqlite3 v0.18.3/go.mod h1:HAwOtA+cyEX3iN6YmkpQwfT4vMMgCB7rQRFUdOgEFik=
+github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
-github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
+github.com/nbd-wtf/go-nostr v0.51.4 h1:L4kteLUu/U9P1v1i1CP9wXR+n7D7V4aSCWs4hPFdwp0=
-github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/nbd-wtf/go-nostr v0.51.4/go.mod h1:raIUNOilCdhiVIqgwe+9enCtdXu1iuPjbLh1hO7wTqI=
-github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M=
-github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
 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=
@@ -199,6 +251,8 @@ 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/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 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=
@@ -206,17 +260,31 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg=
 github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
+github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
 github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
+github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38 h1:D0vL7YNisV2yqE55+q0lFuGse6U8lxlg7fYTctlT5Gc=
 github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38/go.mod h1:sM7Mt7uEoCeFSCBM+qBrqvEo+/9vdmj19wzp3yzUhmg=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 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.1.5-0.20170601210322-f6abca593680/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 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=
@@ -225,8 +293,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 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.8.0/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
 github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
 github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
@@ -234,20 +300,22 @@ github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JT
 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/tursodatabase/go-libsql v0.0.0-20240916111504-922dfa87e1e6 h1:bFxO2fsY5mHZRrVvhmrAo/O8Agi9HDAIMmmOClZMrkQ=
-github.com/tursodatabase/go-libsql v0.0.0-20240916111504-922dfa87e1e6/go.mod h1:TjsB2miB8RW2Sse8sdxzVTdeGlx74GloD5zJYUC38d8=
 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/tyler-smith/go-bip32 v1.0.0 h1:sDR9juArbUgX+bO/iblgZnMPeWY1KZMUC2AFUJdv5KE=
 github.com/tyler-smith/go-bip32 v1.0.0/go.mod h1:onot+eHknzV4BVPwrzqY5OoVpyCvnwD7lMawL5aQupE=
 github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
 github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+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.59.0 h1:Qu0qYHfXvPk1mSLNqcFtEk6DpxgA26hy6bmydotDpRI=
 github.com/valyala/fasthttp v1.59.0/go.mod h1:GTxNb9Bc6r2a9D0TWNSPwDz78UxnTGBViY3xZNEqyYU=
 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/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
@@ -256,18 +324,21 @@ 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-20170613210332-850760c427c5/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/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.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
 golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
 golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
+golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -288,8 +359,11 @@ golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
 golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -297,7 +371,10 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+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.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
 golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -305,15 +382,20 @@ 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.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
 golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
-golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
 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=
+gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
+gonum.org/v1/gonum v0.7.0 h1:Hdks0L0hgznZLG9nzXb8vZ0rRvqNvAcgAp84y7Mwkgw=
+gonum.org/v1/gonum v0.7.0/go.mod h1:L02bwd0sqlsvRv41G7wGWFCsVNZFv/k1xzGIxeANHGM=
+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
+gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -335,11 +417,13 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
 google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 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=
@@ -351,30 +435,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54=
 launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM=
-modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ=
-modernc.org/cc/v4 v4.21.4/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
-modernc.org/ccgo/v4 v4.19.2 h1:lwQZgvboKD0jBwdaeVCTouxhxAyN6iawF3STraAal8Y=
-modernc.org/ccgo/v4 v4.19.2/go.mod h1:ysS3mxiMV38XGRTTcgo0DQTeTmAO4oCmJl1nX9VFI3s=
-modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
-modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
-modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw=
-modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
-modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI=
-modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
-modernc.org/libc v1.55.3 h1:AzcW1mhlPNrRtjS5sS+eW2ISCgSOLLNyFzRh/V3Qj/U=
-modernc.org/libc v1.55.3/go.mod h1:qFXepLhz+JjFThQ4kzwzOjA/y/artDeg+pcYnY+Q83w=
-modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
-modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
-modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
-modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
-modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
-modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
-modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
-modernc.org/sqlite v1.33.1 h1:trb6Z3YYoeM9eDL1O8do81kP+0ejv+YzgyFo+Gwy0nM=
-modernc.org/sqlite v1.33.1/go.mod h1:pXV2xHxhzXZsgT/RtTFAPY6JJDEvOTcTdwADQCCWD4k=
-modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
-modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
-modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
-modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

keys.go

@@ -2,27 +2,97 @@ package nostr
 
 import (
 	"crypto/rand"
+	"encoding/hex"
 	"fmt"
 	"io"
+	"unsafe"
 
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcec/v2/schnorr"
 )
 
-func GeneratePrivateKey() [32]byte {
+func Generate() SecretKey {
-	var sk [32]byte
+	var sk SecretKey
 	if _, err := io.ReadFull(rand.Reader, sk[:]); err != nil {
 		panic(fmt.Errorf("failed to read random bytes when generating private key"))
 	}
 	return sk
 }
 
+type SecretKey [32]byte
+
+func (sk SecretKey) String() string { return hex.EncodeToString(sk[:]) }
+func (sk SecretKey) Hex() string    { return hex.EncodeToString(sk[:]) }
+func (sk SecretKey) Public() PubKey { return GetPublicKey(sk) }
+
+func SecretKeyFromHex(idh string) (SecretKey, error) {
+	id := SecretKey{}
+
+	if len(idh) != 64 {
+		return id, fmt.Errorf("pubkey should be 64-char hex, got '%s'", idh)
+	}
+	if _, err := hex.Decode(id[:], unsafe.Slice(unsafe.StringData(idh), 64)); err != nil {
+		return id, fmt.Errorf("'%s' is not valid hex: %w", idh, err)
+	}
+
+	return id, nil
+}
+
+func MustSecretKeyFromHex(idh string) SecretKey {
+	id := SecretKey{}
+	hex.Decode(id[:], unsafe.Slice(unsafe.StringData(idh), 64))
+	return id
+}
+
 func GetPublicKey(sk [32]byte) PubKey {
 	_, pk := btcec.PrivKeyFromBytes(sk[:])
 	return [32]byte(pk.SerializeCompressed()[1:])
 }
 
-func IsValidPublicKey(pk [32]byte) bool {
+var ZeroPK = [32]byte{}
-	_, err := schnorr.ParsePubKey(pk[:])
+
-	return err == nil
+type PubKey [32]byte
+
+func (pk PubKey) String() string { return hex.EncodeToString(pk[:]) }
+func (pk PubKey) Hex() string    { return hex.EncodeToString(pk[:]) }
+
+func PubKeyFromHex(pkh string) (PubKey, error) {
+	pk := PubKey{}
+	if len(pkh) != 64 {
+		return pk, fmt.Errorf("pubkey should be 64-char hex, got '%s'", pkh)
+	}
+	if _, err := hex.Decode(pk[:], unsafe.Slice(unsafe.StringData(pkh), 64)); err != nil {
+		return pk, fmt.Errorf("'%s' is not valid hex: %w", pkh, err)
+	}
+	if _, err := schnorr.ParsePubKey(pk[:]); err != nil {
+		return pk, fmt.Errorf("'%s' is not a valid pubkey", pkh)
+	}
+	return pk, nil
+}
+
+func PubKeyFromHexCheap(pkh string) (PubKey, error) {
+	pk := PubKey{}
+	if len(pkh) != 64 {
+		return pk, fmt.Errorf("pubkey should be 64-char hex, got '%s'", pkh)
+	}
+	if _, err := hex.Decode(pk[:], unsafe.Slice(unsafe.StringData(pkh), 64)); err != nil {
+		return pk, fmt.Errorf("'%s' is not valid hex: %w", pkh, err)
+	}
+
+	return pk, nil
+}
+
+func MustPubKeyFromHex(pkh string) PubKey {
+	pk := PubKey{}
+	hex.Decode(pk[:], unsafe.Slice(unsafe.StringData(pkh), 64))
+	return pk
+}
+
+func ContainsPubKey(haystack []PubKey, needle PubKey) bool {
+	for _, cand := range haystack {
+		if cand == needle {
+			return true
+		}
+	}
+	return false
 }

khatru/examples/routing/main.go

@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"slices"
 
-	"fiatjaf.com/nostr/eventstore/slicestore"
-	"fiatjaf.com/nostr/eventstore/sqlite3"
-	"fiatjaf.com/nostr/khatru"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore/badger"
+	"fiatjaf.com/nostr/eventstore/slicestore"
+	"fiatjaf.com/nostr/khatru"
 )
 
 func main() {
@@ -20,7 +20,7 @@ func main() {
 	r1.CountEvents = append(r1.CountEvents, db1.CountEvents)
 	r1.DeleteEvent = append(r1.DeleteEvent, db1.DeleteEvent)
 
-	db2 := sqlite3.SQLite3Backend{DatabaseURL: "/tmp/t"}
+	db2 := badger.BadgerBackend{DatabaseURL: "/tmp/t"}
 	db2.Init()
 	r2 := khatru.NewRelay()
 	r2.StoreEvent = append(r2.StoreEvent, db2.SaveEvent)

nip46/client.go

@@ -68,9 +68,6 @@ func ConnectBunker(
 		// otherwise fail here
 		return nil, fmt.Errorf("wrong scheme '%s', must be bunker://", parsed.Scheme)
 	}
-	if !nostr.IsValidPublicKey(targetPublicKey) {
-		return nil, fmt.Errorf("'%s' is not a valid public key hex", targetPublicKey)
-	}
 
 	bunker := NewBunker(
 		ctx,

nip61/info.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"slices"
 
-	"github.com/elnosh/gonuts/cashu"
 	"fiatjaf.com/nostr"
+	"github.com/elnosh/gonuts/cashu"
 )
 
 type Info struct {
-	PublicKey string
+	PublicKey nostr.PubKey
 	Mints     []string
 	Relays    []string
 }
@@ -25,8 +25,8 @@ func (zi *Info) ToEvent(ctx context.Context, kr nostr.Keyer, evt *nostr.Event) e
 	for _, url := range zi.Relays {
 		evt.Tags = append(evt.Tags, nostr.Tag{"relay", url})
 	}
-	if zi.PublicKey != "" {
+	if zi.PublicKey != nostr.ZeroPK {
-		evt.Tags = append(evt.Tags, nostr.Tag{"pubkey", zi.PublicKey})
+		evt.Tags = append(evt.Tags, nostr.Tag{"pubkey", zi.PublicKey.Hex()})
 	}
 
 	if err := kr.SignEvent(ctx, evt); err != nil {
@@ -52,8 +52,8 @@ func (zi *Info) ParseEvent(evt *nostr.Event) error {
 		case "relay":
 			zi.Relays = append(zi.Relays, tag[1])
 		case "pubkey":
-			if nostr.IsValidPublicKey(tag[1]) {
+			if pk, err := nostr.PubKeyFromHex(tag[1]); err == nil {
-				zi.PublicKey = tag[1]
+				zi.PublicKey = pk
 			}
 		}
 	}

nipb0/blossom/list.go

@@ -11,7 +11,7 @@ import (
 // List retrieves a list of blobs from a specific pubkey
 func (c *Client) List(ctx context.Context) ([]BlobDescriptor, error) {
 	pubkey, err := c.signer.GetPublicKey(ctx)
-	if !nostr.IsValidPublicKey(pubkey) {
+	if err != nil {
 		return nil, fmt.Errorf("pubkey %s is not valid", pubkey)
 	}
 

paginator.go

@@ -3,14 +3,13 @@ package nostr
 import (
 	"context"
 	"math"
-	"slices"
 	"time"
 )
 
 func (pool *Pool) PaginatorWithInterval(
 	interval time.Duration,
-) func(ctx context.Context, urls []string, filter Filter, opts ...SubscriptionOption) chan RelayEvent {
+) func(ctx context.Context, urls []string, filter Filter, opts SubscriptionOptions) chan RelayEvent {
-	return func(ctx context.Context, urls []string, filter Filter, opts ...SubscriptionOption) chan RelayEvent {
+	return func(ctx context.Context, urls []string, filter Filter, opts SubscriptionOptions) chan RelayEvent {
 		nextUntil := Now()
 		if filter.Until != nil {
 			nextUntil = *filter.Until
@@ -23,8 +22,8 @@ func (pool *Pool) PaginatorWithInterval(
 		var globalCount uint64 = 0
 		globalCh := make(chan RelayEvent)
 
-		repeatedCache := make([]string, 0, 300)
+		repeatedCache := make([]ID, 0, 300)
-		nextRepeatedCache := make([]string, 0, 300)
+		nextRepeatedCache := make([]ID, 0, 300)
 
 		go func() {
 			defer close(globalCh)
@@ -34,8 +33,8 @@ func (pool *Pool) PaginatorWithInterval(
 				time.Sleep(interval)
 
 				keepGoing := false
-				for evt := range pool.FetchMany(ctx, urls, filter, opts...) {
+				for evt := range pool.FetchMany(ctx, urls, filter, opts) {
-					if slices.Contains(repeatedCache, evt.ID) {
+					if ContainsID(repeatedCache, evt.ID) {
 						continue
 					}
 

sdk/hints/test/libsql_test.go

@@ -1,28 +0,0 @@
-//go:build !js && !sqlite_math_functions
-
-package test
-
-import (
-	"database/sql"
-	"os"
-	"testing"
-
-	"fiatjaf.com/nostr/sdk/hints/sqlh"
-	"github.com/stretchr/testify/require"
-	_ "github.com/tursodatabase/go-libsql"
-)
-
-func TestSQLiteHintsLibsql(t *testing.T) {
-	path := "/tmp/tmpsdkhintssqlite"
-	os.RemoveAll(path)
-
-	db, err := sql.Open("libsql", "file://"+path)
-
-	require.NoError(t, err, "failed to create sqlitehints db")
-	db.SetMaxOpenConns(1)
-
-	sh, err := sqlh.NewSQLHints(db, "sqlite3")
-	require.NoError(t, err, "failed to setup sqlitehints db")
-
-	runTestWith(t, sh)
-}

sdk/hints/test/mattnsqlite_test.go

@@ -1,28 +0,0 @@
-//go:build sqlite_math_functions
-
-package test
-
-import (
-	"database/sql"
-	"os"
-	"testing"
-
-	_ "github.com/mattn/go-sqlite3"
-	"fiatjaf.com/nostr/sdk/hints/sqlh"
-	"github.com/stretchr/testify/require"
-)
-
-func TestSQLiteHintsMattn(t *testing.T) {
-	path := "/tmp/tmpsdkhintssqlite"
-	os.RemoveAll(path)
-
-	db, err := sql.Open("sqlite3", path)
-
-	require.NoError(t, err, "failed to create sqlitehints db")
-	db.SetMaxOpenConns(1)
-
-	sh, err := sqlh.NewSQLHints(db, "sqlite3")
-	require.NoError(t, err, "failed to setup sqlitehints db")
-
-	runTestWith(t, sh)
-}

sdk/hints/test/moderncsqlite_test.go

@@ -1,28 +0,0 @@
-//go:build !js
-
-package test
-
-import (
-	"database/sql"
-	"os"
-	"testing"
-
-	"fiatjaf.com/nostr/sdk/hints/sqlh"
-	"github.com/stretchr/testify/require"
-	_ "modernc.org/sqlite"
-)
-
-func TestSQLiteHintsModernC(t *testing.T) {
-	path := "/tmp/tmpsdkhintssqlite"
-	os.RemoveAll(path)
-
-	db, err := sql.Open("sqlite", path)
-
-	require.NoError(t, err, "failed to create sqlitehints db")
-	db.SetMaxOpenConns(1)
-
-	sh, err := sqlh.NewSQLHints(db, "sqlite3")
-	require.NoError(t, err, "failed to setup sqlitehints db")
-
-	runTestWith(t, sh)
-}

sdk/hints/test/wasmsqlite_test.go

@@ -1,29 +0,0 @@
-//go:build !js && !sqlite_math_functions
-
-package test
-
-import (
-	"database/sql"
-	"os"
-	"testing"
-
-	"fiatjaf.com/nostr/sdk/hints/sqlh"
-	_ "github.com/ncruces/go-sqlite3/driver"
-	_ "github.com/ncruces/go-sqlite3/embed"
-	"github.com/stretchr/testify/require"
-)
-
-func TestSQLiteHintsNcruces(t *testing.T) {
-	path := "/tmp/tmpsdkhintssqlite"
-	os.RemoveAll(path)
-
-	db, err := sql.Open("sqlite3", path)
-
-	require.NoError(t, err, "failed to create sqlitehints db")
-	db.SetMaxOpenConns(1)
-
-	sh, err := sqlh.NewSQLHints(db, "sqlite3")
-	require.NoError(t, err, "failed to setup sqlitehints db")
-
-	runTestWith(t, sh)
-}

types.go

@@ -12,59 +12,9 @@ type RelayEvent struct {
 	Relay *Relay
 }
 
-var (
+var ZeroID = [32]byte{}
-	ZeroID = [32]byte{}
-	ZeroPK = [32]byte{}
-)
-
-type PubKey [32]byte
-
-func (pk PubKey) String() string { return hex.EncodeToString(pk[:]) }
-func (pk PubKey) Hex() string    { return hex.EncodeToString(pk[:]) }
-
-func PubKeyFromHex(pkh string) (PubKey, error) {
-	pk := PubKey{}
-	if len(pkh) != 64 {
-		return pk, fmt.Errorf("pubkey should be 64-char hex, got '%s'", pkh)
-	}
-	if _, err := hex.Decode(pk[:], unsafe.Slice(unsafe.StringData(pkh), 64)); err != nil {
-		return pk, fmt.Errorf("'%s' is not valid hex: %w", pkh, err)
-	}
-
-	if !IsValidPublicKey(pk) {
-		return pk, fmt.Errorf("'%s' is not a valid pubkey", pkh)
-	}
-
-	return pk, nil
-}
-
-func PubKeyFromHexCheap(pkh string) (PubKey, error) {
-	pk := PubKey{}
-	if len(pkh) != 64 {
-		return pk, fmt.Errorf("pubkey should be 64-char hex, got '%s'", pkh)
-	}
-	if _, err := hex.Decode(pk[:], unsafe.Slice(unsafe.StringData(pkh), 64)); err != nil {
-		return pk, fmt.Errorf("'%s' is not valid hex: %w", pkh, err)
-	}
-
-	return pk, nil
-}
-
-func MustPubKeyFromHex(pkh string) PubKey {
-	pk := PubKey{}
-	hex.Decode(pk[:], unsafe.Slice(unsafe.StringData(pkh), 64))
-	return pk
-}
-
-func ContainsPubKey(haystack []PubKey, needle PubKey) bool {
-	for _, cand := range haystack {
-		if cand == needle {
-			return true
-		}
-	}
-	return false
-}
 
+// ID represents an event id
 type ID [32]byte
 
 func (id ID) String() string { return hex.EncodeToString(id[:]) }
@@ -88,3 +38,12 @@ func MustIDFromHex(idh string) ID {
 	hex.Decode(id[:], unsafe.Slice(unsafe.StringData(idh), 64))
 	return id
 }
+
+func ContainsID(haystack []ID, needle ID) bool {
+	for _, cand := range haystack {
+		if cand == needle {
+			return true
+		}
+	}
+	return false
+}