use xhex everywhere.

eventstore/bluge/helpers.go

@@ -1,9 +1,8 @@
 package bluge
 
 import (
-	"encoding/hex"
-
 	"fiatjaf.com/nostr"
+	"github.com/templexxx/xhex"
 )
 
 const (
@@ -23,6 +22,6 @@ func (id eventIdentifier) Field() string {
 
 func (id eventIdentifier) Term() []byte {
 	idhex := make([]byte, 64)
-	hex.Encode(idhex, id[:])
+	xhex.Encode(idhex, id[:])
 	return idhex
 }

eventstore/boltdb/count.go

@@ -3,13 +3,13 @@ package boltdb
 import (
 	"bytes"
 	"encoding/binary"
-	"encoding/hex"
 	"slices"
 
 	"fiatjaf.com/nostr"
 	"fiatjaf.com/nostr/eventstore/codec/betterbinary"
 	"fiatjaf.com/nostr/nip45"
 	"fiatjaf.com/nostr/nip45/hyperloglog"
+	"github.com/templexxx/xhex"
 	"go.etcd.io/bbolt"
 )
 
@@ -174,11 +174,11 @@ func (b *BoltBackend) countEventsHLLCached(filter nostr.Filter) (uint32, *hyperl
 	binary.BigEndian.PutUint16(cacheKey[0:2], uint16(filter.Kinds[0]))
 	switch filter.Kinds[0] {
 	case 3:
-		hex.Decode(cacheKey[2:2+8], []byte(filter.Tags["p"][0][0:8*2]))
+		xhex.Decode(cacheKey[2:2+8], []byte(filter.Tags["p"][0][0:8*2]))
 	case 7:
-		hex.Decode(cacheKey[2:2+8], []byte(filter.Tags["e"][0][0:8*2]))
+		xhex.Decode(cacheKey[2:2+8], []byte(filter.Tags["e"][0][0:8*2]))
 	case 1111:
-		hex.Decode(cacheKey[2:2+8], []byte(filter.Tags["E"][0][0:8*2]))
+		xhex.Decode(cacheKey[2:2+8], []byte(filter.Tags["E"][0][0:8*2]))
 	}
 
 	var count uint32
@@ -204,7 +204,7 @@ func (b *BoltBackend) updateHyperLogLogCachedValues(txn *bbolt.Tx, evt nostr.Eve
 
 	for ref, offset := range nip45.HyperLogLogEventPubkeyOffsetsAndReferencesForEvent(evt) {
 		// setup cache key (reusing buffer)
-		hex.Decode(cacheKey[2:2+8], []byte(ref[0:8*2]))
+		xhex.Decode(cacheKey[2:2+8], []byte(ref[0:8*2]))
 
 		// fetch hll value from cache db
 		hll := hyperloglog.New(offset)

eventstore/boltdb/helpers.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"crypto/md5"
 	"encoding/binary"
-	"encoding/hex"
 	"fmt"
 	"iter"
 	"slices"
@@ -12,6 +11,7 @@ import (
 	"strings"
 
 	"fiatjaf.com/nostr"
+	"github.com/templexxx/xhex"
 	"go.etcd.io/bbolt"
 )
 
@@ -284,7 +284,7 @@ func (b *BoltBackend) getTagIndexPrefix(tagName string, tagValue string) (bucket
 	if len(tagValue) == 64 {
 		// but we actually only use the first 8 bytes, with letter (tag name) prefix
 		k = make([]byte, 1+8+4+8)
-		if _, err := hex.Decode(k[1:1+8], []byte(tagValue[0:8*2])); err == nil {
+		if err := xhex.Decode(k[1:1+8], []byte(tagValue[0:8*2])); err == nil {
 			k[0] = letterPrefix
 			return indexTag32, k
 		}
@@ -294,7 +294,7 @@ func (b *BoltBackend) getTagIndexPrefix(tagName string, tagValue string) (bucket
 	spl := strings.Split(tagValue, ":")
 	if len(spl) == 3 && len(spl[1]) == 64 {
 		k = make([]byte, 1+2+8+30+4+8)
-		if _, err := hex.Decode(k[1+2:1+2+8], []byte(spl[1][0:8*2])); err == nil {
+		if err := xhex.Decode(k[1+2:1+2+8], []byte(spl[1][0:8*2])); err == nil {
 			if kind, err := strconv.ParseUint(spl[0], 10, 16); err == nil {
 				k[0] = letterPrefix
 				k[1] = byte(kind >> 8)

eventstore/lmdb/count.go

@@ -3,7 +3,6 @@ package lmdb
 import (
 	"bytes"
 	"encoding/binary"
-	"encoding/hex"
 	"slices"
 
 	"fiatjaf.com/nostr"
@@ -11,6 +10,7 @@ import (
 	"fiatjaf.com/nostr/nip45"
 	"fiatjaf.com/nostr/nip45/hyperloglog"
 	"github.com/PowerDNS/lmdb-go/lmdb"
+	"github.com/templexxx/xhex"
 )
 
 func (b *LMDBBackend) CountEvents(filter nostr.Filter) (uint32, error) {
@@ -185,11 +185,11 @@ func (b *LMDBBackend) countEventsHLLCached(filter nostr.Filter) (uint32, *hyperl
 	binary.BigEndian.PutUint16(cacheKey[0:2], uint16(filter.Kinds[0]))
 	switch filter.Kinds[0] {
 	case 3:
-		hex.Decode(cacheKey[2:2+8], []byte(filter.Tags["p"][0][0:8*2]))
+		xhex.Decode(cacheKey[2:2+8], []byte(filter.Tags["p"][0][0:8*2]))
 	case 7:
-		hex.Decode(cacheKey[2:2+8], []byte(filter.Tags["e"][0][0:8*2]))
+		xhex.Decode(cacheKey[2:2+8], []byte(filter.Tags["e"][0][0:8*2]))
 	case 1111:
-		hex.Decode(cacheKey[2:2+8], []byte(filter.Tags["E"][0][0:8*2]))
+		xhex.Decode(cacheKey[2:2+8], []byte(filter.Tags["E"][0][0:8*2]))
 	}
 
 	var count uint32
@@ -217,7 +217,7 @@ func (b *LMDBBackend) updateHyperLogLogCachedValues(txn *lmdb.Txn, evt nostr.Eve
 
 	for ref, offset := range nip45.HyperLogLogEventPubkeyOffsetsAndReferencesForEvent(evt) {
 		// setup cache key (reusing buffer)
-		hex.Decode(cacheKey[2:2+8], []byte(ref[0:8*2]))
+		xhex.Decode(cacheKey[2:2+8], []byte(ref[0:8*2]))
 
 		// fetch hll value from cache db
 		hll := hyperloglog.New(offset)

eventstore/lmdb/helpers.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"crypto/md5"
 	"encoding/binary"
-	"encoding/hex"
 	"fmt"
 	"iter"
 	"slices"
@@ -13,6 +12,7 @@ import (
 
 	"fiatjaf.com/nostr"
 	"github.com/PowerDNS/lmdb-go/lmdb"
+	"github.com/templexxx/xhex"
 )
 
 type iterator struct {
@@ -244,7 +244,7 @@ func (b *LMDBBackend) getIndexKeysForEvent(evt nostr.Event) iter.Seq[key] {
 			// now the p-tag+kind+date
 			if dbi == b.indexTag32 && tag[0] == "p" {
 				k := make([]byte, 8+2+4)
-				hex.Decode(k[0:8], []byte(tag[1][0:8*2]))
+				xhex.Decode(k[0:8], []byte(tag[1][0:8*2]))
 				binary.BigEndian.PutUint16(k[8:8+2], uint16(evt.Kind))
 				binary.BigEndian.PutUint32(k[8+2:8+2+4], uint32(evt.CreatedAt))
 				dbi := b.indexPTagKind
@@ -276,7 +276,7 @@ func (b *LMDBBackend) getTagIndexPrefix(tagName string, tagValue string) (lmdb.D
 	if len(tagValue) == 64 {
 		// but we actually only use the first 8 bytes, with letter (tag name) prefix
 		k = make([]byte, 1+8+4)
-		if _, err := hex.Decode(k[1:1+8], []byte(tagValue[0:8*2])); err == nil {
+		if err := xhex.Decode(k[1:1+8], []byte(tagValue[0:8*2])); err == nil {
 			k[0] = letterPrefix
 			offset = 1 + 8
 			dbi = b.indexTag32
@@ -288,7 +288,7 @@ func (b *LMDBBackend) getTagIndexPrefix(tagName string, tagValue string) (lmdb.D
 	spl := strings.Split(tagValue, ":")
 	if len(spl) == 3 && len(spl[1]) == 64 {
 		k = make([]byte, 1+2+8+30+4)
-		if _, err := hex.Decode(k[1+2:1+2+8], []byte(spl[1][0:8*2])); err == nil {
+		if err := xhex.Decode(k[1+2:1+2+8], []byte(spl[1][0:8*2])); err == nil {
 			if kind, err := strconv.ParseUint(spl[0], 10, 16); err == nil {
 				k[0] = letterPrefix
 				k[1] = byte(kind >> 8)

eventstore/lmdb/query_planner.go

@@ -2,12 +2,12 @@ package lmdb
 
 import (
 	"encoding/binary"
-	"encoding/hex"
 	"fmt"
 
 	"fiatjaf.com/nostr"
 	"fiatjaf.com/nostr/eventstore/internal"
 	"github.com/PowerDNS/lmdb-go/lmdb"
+	"github.com/templexxx/xhex"
 )
 
 type query struct {
@@ -76,7 +76,7 @@ func (b *LMDBBackend) prepareQueries(filter nostr.Filter) (
 
 					for _, kind := range filter.Kinds {
 						k := make([]byte, 8+2)
-						if _, err := hex.Decode(k[0:8], []byte(value[0:8*2])); err != nil {
+						if err := xhex.Decode(k[0:8], []byte(value[0:8*2])); err != nil {
 							return nil, nil, nil, "", nil, 0, fmt.Errorf("invalid 'p' tag '%s'", value)
 						}
 						binary.BigEndian.PutUint16(k[8:8+2], uint16(kind))
@@ -93,7 +93,7 @@ func (b *LMDBBackend) prepareQueries(filter nostr.Filter) (
 					}
 
 					k := make([]byte, 8)
-					if _, err := hex.Decode(k[0:8], []byte(value[0:8*2])); err != nil {
+					if err := xhex.Decode(k[0:8], []byte(value[0:8*2])); err != nil {
 						return nil, nil, nil, "", nil, 0, fmt.Errorf("invalid 'p' tag '%s'", value)
 					}
 					queries[i] = query{i: i, dbi: b.indexPTagKind, prefix: k[0:8], keySize: 8 + 2 + 4}

eventstore/mmm/helpers.go

@@ -3,7 +3,6 @@ package mmm
 import (
 	"bytes"
 	"encoding/binary"
-	"encoding/hex"
 	"iter"
 	"slices"
 	"strconv"
@@ -11,6 +10,7 @@ import (
 
 	"fiatjaf.com/nostr"
 	"github.com/PowerDNS/lmdb-go/lmdb"
+	"github.com/templexxx/xhex"
 )
 
 type iterator struct {
@@ -229,7 +229,7 @@ func (il *IndexingLayer) getIndexKeysForEvent(evt nostr.Event) iter.Seq[key] {
 			// now the p-tag+kind+date
 			if dbi == il.indexTag32 && tag[0] == "p" {
 				k := make([]byte, 8+2+4)
-				hex.Decode(k[0:8], []byte(tag[1][0:8*2]))
+				xhex.Decode(k[0:8], []byte(tag[1][0:8*2]))
 				binary.BigEndian.PutUint16(k[8:8+2], uint16(evt.Kind))
 				binary.BigEndian.PutUint32(k[8+2:8+2+4], uint32(evt.CreatedAt))
 				dbi := il.indexPTagKind
@@ -261,7 +261,7 @@ func (il *IndexingLayer) getTagIndexPrefix(tagName string, tagValue string) (lmd
 	if len(tagValue) == 64 {
 		// but we actually only use the first 8 bytes, with letter (tag name) prefix
 		k = make([]byte, 1+8+4)
-		if _, err := hex.Decode(k[1:1+8], []byte(tagValue[0:8*2])); err == nil {
+		if err := xhex.Decode(k[1:1+8], []byte(tagValue[0:8*2])); err == nil {
 			k[0] = letterPrefix
 			offset = 1 + 8
 			dbi = il.indexTag32
@@ -273,7 +273,7 @@ func (il *IndexingLayer) getTagIndexPrefix(tagName string, tagValue string) (lmd
 	spl := strings.Split(tagValue, ":")
 	if len(spl) == 3 && len(spl[1]) == 64 {
 		k = make([]byte, 1+2+8+30+4)
-		if _, err := hex.Decode(k[1+2:1+2+8], []byte(spl[1][0:8*2])); err == nil {
+		if err := xhex.Decode(k[1+2:1+2+8], []byte(spl[1][0:8*2])); err == nil {
 			if kind, err := strconv.ParseUint(spl[0], 10, 16); err == nil {
 				k[0] = letterPrefix
 				k[1] = byte(kind >> 8)

eventstore/mmm/query_planner.go

@@ -2,12 +2,12 @@ package mmm
 
 import (
 	"encoding/binary"
-	"encoding/hex"
 	"fmt"
 
 	"fiatjaf.com/nostr"
 	"fiatjaf.com/nostr/eventstore/internal"
 	"github.com/PowerDNS/lmdb-go/lmdb"
+	"github.com/templexxx/xhex"
 )
 
 type query struct {
@@ -77,7 +77,7 @@ func (il *IndexingLayer) prepareQueries(filter nostr.Filter) (
 
 					for _, kind := range filter.Kinds {
 						k := make([]byte, 8+2)
-						if _, err := hex.Decode(k[0:8], []byte(value[0:8*2])); err != nil {
+						if err := xhex.Decode(k[0:8], []byte(value[0:8*2])); err != nil {
 							return nil, nil, nil, "", nil, 0, fmt.Errorf("invalid 'p' tag '%s'", value)
 						}
 						binary.BigEndian.PutUint16(k[8:8+2], uint16(kind))
@@ -94,7 +94,7 @@ func (il *IndexingLayer) prepareQueries(filter nostr.Filter) (
 					}
 
 					k := make([]byte, 8)
-					if _, err := hex.Decode(k[0:8], []byte(value[0:8*2])); err != nil {
+					if err := xhex.Decode(k[0:8], []byte(value[0:8*2])); err != nil {
 						return nil, nil, nil, "", nil, 0, fmt.Errorf("invalid 'p' tag '%s'", value)
 					}
 					queries[i] = query{i: i, dbi: il.indexPTagKind, prefix: k[0:8], keySize: 8 + 2 + 4, timestampSize: 4}

eventstore/test/benchmark_test.go

@@ -2,7 +2,6 @@ package test
 
 import (
 	"encoding/binary"
-	"encoding/hex"
 	"fmt"
 	"os"
 	"testing"
@@ -42,7 +41,7 @@ func runBenchmarkOn(b *testing.B, db eventstore.Store) {
 			Content:   fmt.Sprintf("hello %d", i),
 			Tags: nostr.Tags{
 				{"t", fmt.Sprintf("t%d", i)},
-				{"e", hex.EncodeToString(eTag)},
+				{"e", nostr.HexEncodeToString(eTag)},
 				{"p", ref.Hex()},
 			},
 			Kind: nostr.Kind(i % 10),
@@ -70,7 +69,7 @@ func runBenchmarkOn(b *testing.B, db eventstore.Store) {
 	for i := 0; i < 20; i++ {
 		eTag := make([]byte, 32)
 		binary.BigEndian.PutUint16(eTag, uint16(i))
-		eTags[i] = hex.EncodeToString(eTag)
+		eTags[i] = nostr.HexEncodeToString(eTag)
 	}
 	filters = append(filters, nostr.Filter{Kinds: []nostr.Kind{9}, Tags: nostr.TagMap{"e": eTags}})
 	filters = append(filters, nostr.Filter{Kinds: []nostr.Kind{5}, Tags: nostr.TagMap{"e": eTags, "t": []string{"t5"}}})

eventstore/test/second_test.go

@@ -2,7 +2,6 @@ package test
 
 import (
 	"encoding/binary"
-	"encoding/hex"
 	"fmt"
 	"slices"
 	"testing"
@@ -29,7 +28,7 @@ func runSecondTestOn(t *testing.T, db eventstore.Store) {
 			Content:   fmt.Sprintf("hello %d", i),
 			Tags: nostr.Tags{
 				{"t", fmt.Sprintf("t%d", i)},
-				{"e", hex.EncodeToString(eTag)},
+				{"e", nostr.HexEncodeToString(eTag)},
 				{"p", ref.Hex()},
 			},
 			Kind: nostr.Kind(i % 10),
@@ -49,7 +48,7 @@ func runSecondTestOn(t *testing.T, db eventstore.Store) {
 	for i := 0; i < 20; i++ {
 		eTag := make([]byte, 32)
 		binary.BigEndian.PutUint16(eTag, uint16(i))
-		eTags[i] = hex.EncodeToString(eTag)
+		eTags[i] = nostr.HexEncodeToString(eTag)
 	}
 
 	filters := []nostr.Filter{