Update deps, rehabilitate token mint handling

cmd/main.go

@@ -12,6 +12,8 @@ import (
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/event/nats"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/lookup"
+	viseevent "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
 )
 
 var (
@@ -41,7 +43,9 @@ func main() {
 
 	menuStorageService := storage.NewMenuStorageService(connData, "")
 
-	n := nats.NewNatsSubscription(menuStorageService)
+	eu := viseevent.NewEventsUpdater(lookup.Api, menuStorageService)
+	eh := eu.ToEventsHandler()
+	n := nats.NewNatsSubscription(eh)
 	err = n.Connect(ctx, config.JetstreamURL)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Stream connect err: %v", err)

event/custodial_registration.go

@@ -1,29 +1,19 @@
 package event
 
 import (
-	"context"
-
 	geEvent "github.com/grassrootseconomics/eth-tracker/pkg/event"
-
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
-	"git.defalsify.org/vise.git/persist"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/lookup"
 )
 
 const (
-	evReg = "CUSTODIAL_REGISTRATION"
+	evReg = apievent.EventRegistrationTag
-	accountCreatedFlag = 9
+	//accountCreatedFlag = 9
 )
 
-// fields used for handling custodial registration event.
-type eventCustodialRegistration struct {
-	Account string
-}
-
 // attempt to coerce event as custodial registration.
-func asCustodialRegistrationEvent(gev *geEvent.Event) (*eventCustodialRegistration, bool) {
+func asCustodialRegistrationEvent(gev *geEvent.Event) (*apievent.EventCustodialRegistration, bool) {
 	var ok bool
-	var ev eventCustodialRegistration
+	var ev apievent.EventCustodialRegistration
 	if gev.TxType != evReg {
 		return nil, false
 	}
@@ -35,22 +25,3 @@ func asCustodialRegistrationEvent(gev *geEvent.Event) (*eventCustodialRegistrati
 	logg.Debugf("parsed ev", "pl", pl, "ev", ev)
 	return &ev, true
 }
-
-// handle custodial registration.
-//
-// TODO: implement account created in userstore instead, so that
-// the need for persister and state use here is eliminated (it
-// introduces concurrency risks)
-func handleCustodialRegistration(ctx context.Context, userStore *store.UserDataStore, pr *persist.Persister, ev *eventCustodialRegistration) error {
-	identity, err := lookup.IdentityFromAddress(ctx, userStore, ev.Account)
-	if err != nil {
-		return err
-	}
-	err = pr.Load(identity.SessionId)
-	if err != nil {
-		return err
-	}
-	st := pr.GetState()
-	st.SetFlag(accountCreatedFlag)
-	return pr.Save(identity.SessionId)
-}

event/custodial_test.go

@@ -4,18 +4,20 @@ import (
 	"context"
 	"testing"
 
-	memdb "git.defalsify.org/vise.git/db/mem"
 	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/state"
 	"git.defalsify.org/vise.git/cache"
+	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
 	"git.grassecon.net/grassrootseconomics/common/hex"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/internal/testutil"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	viseevent "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
 )
 
+
 func TestCustodialRegistration(t *testing.T) {
 	err := config.LoadConfig()
 	if err != nil {
@@ -23,11 +25,8 @@ func TestCustodialRegistration(t *testing.T) {
 	}
 
 	ctx := context.Background()
-	userDb := memdb.NewMemDb()
+	storageService := mocks.NewMemStorageService(ctx)
-	err = userDb.Connect(ctx, "")
+	userDb := storageService.Db
-	if err != nil {
-		panic(err)
-	}
 
 	alice, err := hex.NormalizeHex(testutil.AliceChecksum)
 	if err != nil {
@@ -40,23 +39,24 @@ func TestCustodialRegistration(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	store := store.UserDataStore{
-		Db: userDb,
-	}
 
 	st := state.NewState(248)
 	ca := cache.NewCache()
-	pr := persist.NewPersister(userDb)
+	pr, _ := storageService.GetPersister(ctx)
 	pr = pr.WithContent(st, ca)
 	err = pr.Save(testutil.AliceSession)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	ev := &eventCustodialRegistration{
+	ev := &apievent.EventCustodialRegistration{
 		Account: testutil.AliceChecksum,
 	}
-	err = handleCustodialRegistration(ctx, &store, pr, ev)
+
+	// Use dev service or mock service instead
+	eu := viseevent.NewEventsUpdater(&http.HTTPAccountService{}, storageService)
+	eh := eu.ToEventsHandler()
+	err = eh.Handle(ctx, apievent.EventRegistrationTag, ev)
 	if err != nil {
 		t.Fatal(err)
 	}

event/nats/nats.go

@@ -9,9 +9,9 @@ import (
 	"github.com/nats-io/nats.go/jetstream"
 	geEvent "github.com/grassrootseconomics/eth-tracker/pkg/event"
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/event"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 )
 
 var (
@@ -22,7 +22,7 @@ var (
 //
 // Extends Router.
 type NatsSubscription struct {
-	event.Router
+	*event.Router
 	ctx context.Context
 	conn *nats.Conn
 	js jetstream.JetStream
@@ -31,11 +31,9 @@ type NatsSubscription struct {
 }
 
 // NewNatsSubscription creates a new NatsSubscription with the given user store.
-func NewNatsSubscription(store storage.StorageService) *NatsSubscription {
+func NewNatsSubscription(handler *apievent.EventsHandler) *NatsSubscription {
 	return &NatsSubscription{
-		Router: event.Router{
+		Router: event.NewRouter(handler),
-			Store: store,
-		},
 	}
 }
 
@@ -48,6 +46,8 @@ func NewNatsSubscription(store storage.StorageService) *NatsSubscription {
 func(n *NatsSubscription) Connect(ctx context.Context, connStr string) error {
 	var err error
 
+	// enables set ctx in test, even if the connstr is invalid (js msg handler doesnt take context)
+	n.ctx = ctx
 	n.conn, err = nats.Connect(connStr)
 	if err != nil {
 		return err
@@ -69,7 +69,6 @@ func(n *NatsSubscription) Connect(ctx context.Context, connStr string) error {
 
 	serverInfo := toServerInfo(n.conn)
 	logg.DebugCtxf(ctx, "nats connected, starting consumer", "status", n.conn.Status(), "server", serverInfo)
-	n.ctx = ctx
 	n.cctx, err = n.cs.Consume(n.handleEvent)
 	if err != nil {
 		return err		

event/nats/nats_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/nats-io/nats.go/jetstream"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 	"git.defalsify.org/vise.git/db"
-	memdb "git.defalsify.org/vise.git/db/mem"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
@@ -22,6 +21,8 @@ import (
 	"git.grassecon.net/grassrootseconomics/common/hex"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/internal/testutil"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
+	viseevent "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
+	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks"
 )
 
 const (
@@ -125,13 +126,10 @@ func TestHandleMsg(t *testing.T) {
 		},
 	}
 	lookup.Api = api
-
 	ctx := context.Background()
-	userDb := memdb.NewMemDb()
+	storageService := mocks.NewMemStorageService(ctx)
-	err = userDb.Connect(ctx, "")
+	eu := viseevent.NewEventsUpdater(api, storageService)
-	if err != nil {
+	userDb := storageService.Db
-		panic(err)
-	}
 
 	alice, err := hex.NormalizeHex(testutil.AliceChecksum)
 	if err != nil {
@@ -145,10 +143,9 @@ func TestHandleMsg(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	storageService := &testutil.TestStorageService{
+	eh := eu.ToEventsHandler()
-		Store: userDb,
+	sub := NewNatsSubscription(eh)
-	}
+	_ = sub.Connect(ctx, "")
-	sub := NewNatsSubscription(storageService)
 
 	data := fmt.Sprintf(`{
 	"block": %d,

event/route.go

@@ -7,8 +7,7 @@ import (
 	geEvent "github.com/grassrootseconomics/eth-tracker/pkg/event"
 
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 )
 
 var (
@@ -17,7 +16,13 @@ var (
 
 // Router is responsible for invoking handlers corresponding to events.
 type Router struct {
-	Store storage.StorageService
+	handler *apievent.EventsHandler
+}
+
+func NewRouter(handler *apievent.EventsHandler) *Router {
+	return &Router{
+		handler: handler,
+	}
 }
 
 // Route parses an event from the event stream, and resolves the handler
@@ -27,24 +32,13 @@ type Router struct {
 // handler fails to successfully execute.
 func(r *Router) Route(ctx context.Context, gev *geEvent.Event) error {
 	logg.DebugCtxf(ctx, "have event", "ev", gev)
-	userDb, err := r.Store.GetUserdataDb(ctx)
-	if err != nil {
-		return err
-	}
-	userStore := &store.UserDataStore{
-		Db: userDb,
-	}
 	evCC, ok := asCustodialRegistrationEvent(gev)
 	if ok {
-		pr, err := r.Store.GetPersister(ctx)
+		return r.handler.Handle(ctx, apievent.EventRegistrationTag, evCC)
-		if err != nil {
-			return err
-		}
-		return handleCustodialRegistration(ctx, userStore, pr, evCC)
 	}
 	evTT, ok := asTokenTransferEvent(gev)
 	if ok {
-		return handleTokenTransfer(ctx, userStore, evTT)
+		return r.handler.Handle(ctx, apievent.EventTokenTransferTag, evTT)
 	}
 
 	return fmt.Errorf("unexpected message")

event/token.go

@@ -3,172 +3,48 @@ package event
 import (
 	"context"
 	"fmt"
-	"strings"
 	"strconv"
 
 	geEvent "github.com/grassrootseconomics/eth-tracker/pkg/event"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 
-	"git.defalsify.org/vise.git/db"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	"git.grassecon.net/grassrootseconomics/common/hex"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/lookup"
 )
 
 const (
-	evTokenTransfer = "TOKEN_TRANSFER"
+	evTokenTransfer = apievent.EventTokenTransferTag
 	// TODO: export from visedriver storage package
-	DATATYPE_USERSUB = 64
+	//DATATYPE_USERSUB = 64
 )
 
-// fields used for handling token transfer event.
-type eventTokenTransfer struct {
-	To string
-	Value int
-	VoucherAddress string
-	TxHash string
-	From string
-}
-
-type eventTokenMint struct {
-	To string
-	Value int
-	TxHash string
-	VoucherAddress string
-}
-
-
 // formatter for transaction data
 //
 // TODO: current formatting is a placeholder.
-func formatTransaction(idx int, tx dataserviceapi.Last10TxResponse) string {
+func formatTransaction(tag string, idx int, item any) string {
+	if tag == apievent.EventTokenTransferTag {
+		tx, ok := item.(dataserviceapi.Last10TxResponse)
+		if !ok {
+			logg.Errorf("invalid formatting object", "tag", tag)
+			return ""
+		}
 		return fmt.Sprintf("%d %s %s", idx, tx.DateBlock, tx.TxHash[:10])
+	}
+	logg.Warnf("unhandled formatting object", "tag", tag)
+	return ""
 }
 
-// refresh and store transaction history.
-func updateTokenTransferList(ctx context.Context, userStore *store.UserDataStore, identity lookup.Identity) error {
-	var r []string
-
-	txs, err := lookup.Api.FetchTransactions(ctx, identity.ChecksumAddress)
-	if err != nil {
-		return err
-	}
-
-	for i, tx := range(txs) {
-		r = append(r, formatTransaction(i, tx))
-	}
-
-	s := strings.Join(r, "\n")
-
-	return userStore.WriteEntry(ctx, identity.SessionId, storedb.DATA_TRANSACTIONS, []byte(s))
-}
-
-// refresh and store token list.
-func updateTokenList(ctx context.Context, userStore *store.UserDataStore, identity lookup.Identity) error {
-	holdings, err := lookup.Api.FetchVouchers(ctx, identity.ChecksumAddress)
-	if err != nil {
-		return err
-	}
-	metadata := store.ProcessVouchers(holdings)
-	_ = metadata
-
-	// TODO: make sure subprefixdb is thread safe when using gdbm
-	// TODO: why is address session here unless explicitly set
-	pfxDb := toPrefixDb(userStore, identity.SessionId)
-
-	typ := storedb.ToBytes(storedb.DATA_VOUCHER_SYMBOLS)
-	err = pfxDb.Put(ctx, typ, []byte(metadata.Symbols))
-	if err != nil {
-		return err
-	}
-
-	typ = storedb.ToBytes(storedb.DATA_VOUCHER_BALANCES)
-	err = pfxDb.Put(ctx, typ, []byte(metadata.Balances))
-	if err != nil {
-		return err
-	}
-
-	typ = storedb.ToBytes(storedb.DATA_VOUCHER_DECIMALS)
-	err = pfxDb.Put(ctx, typ, []byte(metadata.Decimals))
-	if err != nil {
-		return err
-	}
-
-	typ = storedb.ToBytes(storedb.DATA_VOUCHER_ADDRESSES)
-	err = pfxDb.Put(ctx, typ, []byte(metadata.Addresses))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// set default token to given symbol.
-func updateDefaultToken(ctx context.Context, userStore *store.UserDataStore, identity lookup.Identity, activeSym string) error {
-	pfxDb := toPrefixDb(userStore, identity.SessionId)
-	// TODO: the activeSym input should instead be newline separated list?
-	tokenData, err := store.GetVoucherData(ctx, pfxDb, activeSym)
-	if err != nil {
-		return err
-	}
-	return store.UpdateVoucherData(ctx, userStore, identity.SessionId, tokenData)
-}
 
 // waiter to check whether object is available on dependency endpoints.
 func updateWait(ctx context.Context) error {
 	return nil
 }
 
-// use api to resolve address to token symbol.
-func toSym(ctx context.Context, address string) ([]byte, error) {
-	voucherData, err := lookup.Api.VoucherData(ctx, address)
-	if err != nil {
-		return nil, err
-	}
-	return []byte(voucherData.TokenSymbol), nil
-}
-
-// execute all 
-func updateToken(ctx context.Context, userStore *store.UserDataStore, identity lookup.Identity, tokenAddress string) error {
-	err := updateTokenList(ctx, userStore, identity)
-	if err != nil {
-		return err
-	}
-
-	userStore.Db.SetSession(identity.SessionId)
-	activeSym, err := userStore.ReadEntry(ctx, identity.SessionId, storedb.DATA_ACTIVE_SYM)
-	if err == nil {
-		return nil
-	}
-	if !db.IsNotFound(err) {
-		return err
-	}
-	if activeSym == nil {
-		activeSym, err = toSym(ctx, tokenAddress)
-		if err != nil {
-			return err
-		}
-	}
-
-	err = updateDefaultToken(ctx, userStore, identity, string(activeSym))
-	if err != nil {
-		return err
-	}
-
-	err = updateTokenTransferList(ctx, userStore, identity)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // attempt to coerce event as token transfer event.
-func asTokenTransferEvent(gev *geEvent.Event) (*eventTokenTransfer, bool) {
+func asTokenTransferEvent(gev *geEvent.Event) (*apievent.EventTokenTransfer, bool) {
 	var err error
 	var ok bool
-	var ev eventTokenTransfer
+	var ev apievent.EventTokenTransfer
 
 	if gev.TxType != evTokenTransfer {
 		return nil, false
@@ -204,58 +80,3 @@ func asTokenTransferEvent(gev *geEvent.Event) (*eventTokenTransfer, bool) {
 
 	return &ev, true
 }
-
-// handle token transfer.
-//
-// if from and to are NOT the same, handle code will be executed once for each side of the transfer.
-func handleTokenTransfer(ctx context.Context, userStore *store.UserDataStore, ev *eventTokenTransfer) error {
-	identity, err := lookup.IdentityFromAddress(ctx, userStore, ev.From)
-	if err != nil {
-		if !db.IsNotFound(err) {
-			return err
-		}
-	} else {
-		err = updateToken(ctx, userStore, identity, ev.VoucherAddress)
-		if err != nil {
-			return err
-		}
-	}
-
-	if strings.Compare(ev.To, ev.From) != 0 {
-		identity, err = lookup.IdentityFromAddress(ctx, userStore, ev.To)
-		if err != nil {
-			if !db.IsNotFound(err) {
-				return err
-			}
-		} else {
-			err = updateToken(ctx, userStore, identity, ev.VoucherAddress)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-// handle token mint.
-func handleTokenMint(ctx context.Context, userStore *store.UserDataStore, ev *eventTokenMint) error {
-	identity, err := lookup.IdentityFromAddress(ctx, userStore, ev.To)
-	if err != nil {
-		if !db.IsNotFound(err) {
-			return err
-		}
-	} else {
-		err = updateToken(ctx, userStore, identity, ev.VoucherAddress)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func toPrefixDb(userStore *store.UserDataStore, sessionId string) storedb.PrefixDb {
-	userStore.Db.SetSession(sessionId)
-	prefix := storedb.ToBytes(db.DATATYPE_USERDATA)
-	return store.StoreToPrefixDb(userStore, prefix)
-}

event/token_test.go

@@ -11,7 +11,6 @@ import (
 
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 	"git.defalsify.org/vise.git/db"
-	memdb "git.defalsify.org/vise.git/db/mem"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
@@ -20,6 +19,9 @@ import (
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/lookup"
 	"git.grassecon.net/grassrootseconomics/common/hex"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/internal/testutil"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	viseevent "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
+	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks"
 )
 
 const (
@@ -74,11 +76,9 @@ func TestTokenTransfer(t *testing.T) {
 	lookup.Api = api
 
 	ctx := context.Background()
-	userDb := memdb.NewMemDb()
+	storageService := mocks.NewMemStorageService(ctx)
-	err = userDb.Connect(ctx, "")
+	eu := viseevent.NewEventsUpdater(api, storageService)
-	if err != nil {
+	userDb := storageService.Db
-		panic(err)
-	}
 
 	alice, err := hex.NormalizeHex(testutil.AliceChecksum)
 	if err != nil {
@@ -96,12 +96,14 @@ func TestTokenTransfer(t *testing.T) {
 		Db: userDb,
 	}
 
-	ev := &eventTokenTransfer{
+	ev := &apievent.EventTokenTransfer{
 		From: testutil.BobChecksum,
 		To: testutil.AliceChecksum,
 		Value: txValue,
 	}
-	err = handleTokenTransfer(ctx, &userStore, ev)
+
+	eh := eu.ToEventsHandler()
+	err = eh.Handle(ctx, apievent.EventTokenTransferTag, ev)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -184,12 +186,11 @@ func TestTokenMint(t *testing.T) {
 	}
 	lookup.Api = api
 
+
 	ctx := context.Background()
-	userDb := memdb.NewMemDb()
+	storageService := mocks.NewMemStorageService(ctx)
-	err = userDb.Connect(ctx, "")
+	eu := viseevent.NewEventsUpdater(api, storageService)
-	if err != nil {
+	userDb := storageService.Db
-		panic(err)
-	}
 
 	alice, err := hex.NormalizeHex(testutil.AliceChecksum)
 	if err != nil {
@@ -206,11 +207,13 @@ func TestTokenMint(t *testing.T) {
 		Db: userDb,
 	}
 
-	ev := &eventTokenMint{
+	ev := &apievent.EventTokenMint{
 		To: testutil.AliceChecksum,
 		Value: txValue,
 	}
-	err = handleTokenMint(ctx, &userStore, ev)
+
+	eh := eu.ToEventsHandler()
+	err = eh.Handle(ctx, apievent.EventTokenMintTag, ev)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -242,7 +245,6 @@ func TestTokenMint(t *testing.T) {
 		t.Fatal("no transaction data")
 	}
 
-
 	mh, err := application.NewMenuHandlers(nil, userStore, nil, nil, testutil.ReplaceSeparatorFunc)
 	if err != nil {
 		t.Fatal(err)

go.mod

@@ -4,10 +4,10 @@ go 1.23.4
 
 require (
 	git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d
-	git.grassecon.net/grassrootseconomics/common v0.0.0-20250112155828-b55686e830fd
+	git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113085238-f65abf625d34
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113213645-7c697394b5e7
-	git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250113103240-5e02d62a1296
+	git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250114070250-ce9a263b40a3
-	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113103142-5bf0a0e85893
+	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113213325-5228aef0889b
 	github.com/grassrootseconomics/eth-tracker v1.3.0-rc
 	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta
 	github.com/nats-io/nats.go v1.37.0

go.sum

@@ -1,13 +1,13 @@
 git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d h1:bPAOVZOX4frSGhfOdcj7kc555f8dc9DmMd2YAyC2AMw=
 git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250112155828-b55686e830fd h1:OG20aG/sC5yNaU2/rzoAKYp2f0u4lmGP5/Qax8UQD5c=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05 h1:BenzGx6aDHKDwE23/mWIFD2InYIXyzHroZWV3MF5WUk=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250112155828-b55686e830fd/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113085238-f65abf625d34 h1:Pl4OFKTeSehSTMMRUFosZUIDyUZRdXqm6CFn0+5+4qs=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113213645-7c697394b5e7 h1:P+Bi5jcQbnCrLnKNC5k8XDTBsocyZTVifqDyZY6d0w8=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113085238-f65abf625d34/go.mod h1:PEjJnAH5gYcjb4RRevaPCswa5VGGNqHSuyapZvIVR6w=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113213645-7c697394b5e7/go.mod h1:X9aQF93xw3vcW2QftJfzLewvbotRM0U00DRtdmFw294=
-git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250113103240-5e02d62a1296 h1:AvmADSvQ3UprqcT5q+3YRaSWb7DuIA2sl4SmWfCz8B4=
+git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250114070250-ce9a263b40a3 h1:E4TKaXKJbPKbN6UtbqaJbB90aSo64FzwgOhZV9n3XKI=
-git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250113103240-5e02d62a1296/go.mod h1:jqzGG4ehnh0/KrgCDbOhyyZgGILHiSp1vSf4J6cB9cE=
+git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250114070250-ce9a263b40a3/go.mod h1:1WryKcUnFI1J4Jl3wZJ4DX/7lnew+0PDY8xWvqc46UI=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113103142-5bf0a0e85893 h1:MyDINzwY1sjfXkIFoc+6T5lXF/1xdFV6yjHrpSNZzWM=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113213325-5228aef0889b h1:6SieNUSEKbkjzquuwazs/lVG56zdEWF10zQQEMRJfMs=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113103142-5bf0a0e85893/go.mod h1:E6W7ZOa7ZvVr0Bc5ot0LNSwpSPYq4hXlAIvEPy3AJ7U=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113213325-5228aef0889b/go.mod h1:E6W7ZOa7ZvVr0Bc5ot0LNSwpSPYq4hXlAIvEPy3AJ7U=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
 github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
 github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=

internal/testutil/service.go

@@ -1,35 +0,0 @@
-package testutil
-
-import (
-	"context"
-	"errors"
-
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
-	"git.defalsify.org/vise.git/db"
-)
-
-// TestStorageService wraps db for nats subscription.
-type TestStorageService struct {
-	Store  db.Db
-}
-
-// GetUserdataDb implements grassrootseconomics/visedriver/storage.StorageService.
-func(ss *TestStorageService) GetUserdataDb(ctx context.Context) (db.Db, error) {
-	return ss.Store, nil
-}
-
-// GetPersister implements grassrootseconomics/visedriver/storage.StorageService.
-func(ts *TestStorageService) GetPersister(ctx context.Context) (*persist.Persister, error) {
-	return persist.NewPersister(ts.Store), nil
-}
-
-// GetResource implements grassrootseconomics/visedriver/storage.StorageService.
-func(ts *TestStorageService) GetResource(ctx context.Context) (resource.Resource, error) {
-	return nil, errors.New("not implemented")
-}
-
-// EnsureDbDir implements grassrootseconomics/visedriver/storage.StorageService.
-func(ss *TestStorageService) EnsureDbDir() error {
-	return nil
-}

lookup/db.go

@@ -1,57 +0,0 @@
-package lookup
-
-import (
-	"context"
-
-	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-	"git.grassecon.net/grassrootseconomics/common/hex"
-)
-
-var (
-	logg = logging.NewVanilla().WithDomain("term-lookup")
-)
-
-// Identity contains all flavors of identifiers used across stream, api and
-// client for a single agent.
-type Identity struct {
-	NormalAddress string
-	ChecksumAddress string
-	SessionId string
-}
-
-// IdentityFromAddress fully populates and Identity object from a given
-// checksum address.
-//
-// It is the caller's responsibility to ensure that a valid checksum address
-// is passed.
-func IdentityFromAddress(ctx context.Context, userStore *store.UserDataStore, address string) (Identity, error) {
-	var err error
-	var ident Identity
-
-	ident.ChecksumAddress = address
-	ident.NormalAddress, err = hex.NormalizeHex(ident.ChecksumAddress)
-	if err != nil {
-		return ident, err
-	}
-	ident.SessionId, err = getSessionIdByAddress(ctx, userStore, ident.NormalAddress)
-	if err != nil {
-		return ident, err
-	}
-	return ident, nil
-}
-
-// load matching session from address from db store.
-func getSessionIdByAddress(ctx context.Context, userStore *store.UserDataStore, address string) (string, error) {
-	// TODO: replace with userdatastore when double sessionid issue fixed
-	//r, err := store.ReadEntry(ctx, address, common.DATA_PUBLIC_KEY_REVERSE)
-	userStore.Db.SetPrefix(db.DATATYPE_USERDATA)
-	userStore.Db.SetSession(address)
-	r, err := userStore.Db.Get(ctx, storedb.PackKey(storedb.DATA_PUBLIC_KEY_REVERSE, []byte{}))
-	if err != nil {
-		return "", err
-	}
-	return string(r), nil
-}