add dev api logs

Reviewed-on: #6

config/config.go

@@ -71,4 +71,3 @@ func LoadConfig() error {
 	CheckAliasURL, _ = url.JoinPath(dataURLBase, AliasPrefix)
 	return nil
 }
-

dev/api.go

@@ -202,10 +202,13 @@ func (das *DevAccountService) loadItem(ctx context.Context, k []byte, v []byte)
 	}
 	if ss[0] == "account" {
 		err = das.loadAccount(ctx, ss[1], v)
+		logg.ErrorCtxf(ctx, "loading saved account failed", "error_load_account", err)
 	} else if ss[0] == "tx" {
 		err = das.loadTx(ctx, ss[1], v)
+		logg.ErrorCtxf(ctx, "loading transactions failed", "error_load_txs", err)
 	} else if ss[0] == "alias" {
 		err = das.loadAlias(ctx, ss[1], k)
+		logg.ErrorCtxf(ctx, "loading aliases failed", "error_load_aliases", err)
 	} else {
 		logg.ErrorCtxf(ctx, "unknown double underscore key", "key", ss[0])
 	}
@@ -346,17 +349,13 @@ func (das *DevAccountService) saveAlias(ctx context.Context, alias map[string]st
 	if das.db == nil {
 		return fmt.Errorf("Db cannot be nil")
 	}
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return fmt.Errorf("unresolved session id")
-	}
 	for k, v := range alias {
 		k_ := das.prefixKeyFor("alias", k)
 		v_, err := json.Marshal(v)
 		if err != nil {
 			return err
 		}
-		das.db.SetSession(sessionId)
+		das.db.SetSession("")
 		das.db.SetPrefix(db.DATATYPE_USERDATA)
 		return das.db.Put(ctx, []byte(k_), v_)
 	}
@@ -578,10 +577,12 @@ func (das *DevAccountService) TokenTransfer(ctx context.Context, amount, from, t
 func (das *DevAccountService) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
 	addr, ok := das.accountsAlias[alias]
 	if !ok {
+		logg.ErrorCtxf(ctx, "alias check failed", "alias", alias)
 		return nil, fmt.Errorf("alias %s not found", alias)
 	}
 	acc, ok := das.accounts[addr]
 	if !ok {
+		logg.ErrorCtxf(ctx, "failed to resolve alias", "alias", alias)
 		return nil, fmt.Errorf("alias %s found but does not resolve", alias)
 	}
 	return &models.AliasAddress{
@@ -604,6 +605,7 @@ func (das *DevAccountService) RequestAlias(ctx context.Context, publicKey string
 	var alias string
 	uid, err := uuid.NewV4()
 	if !aliasRegex.MatchString(hint) {
+		logg.ErrorCtxf(ctx, "alias hint does not match", "key", publicKey, "hint", hint)
 		return nil, fmt.Errorf("alias hint does not match: %s", publicKey)
 	}
 	acc, ok := das.accounts[publicKey]
@@ -615,6 +617,7 @@ func (das *DevAccountService) RequestAlias(ctx context.Context, publicKey string
 		}
 		err = das.saveAccount(ctx, acc)
 		if err != nil {
+			logg.ErrorCtxf(ctx, "account save failed with", "account", acc, "account_save_error", err)
 			return nil, err
 		}
 		das.accounts[publicKey] = acc
@@ -622,6 +625,7 @@ func (das *DevAccountService) RequestAlias(ctx context.Context, publicKey string
 	alias = hint
 	isPhone, err := das.applyPhoneAlias(ctx, publicKey, alias)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to apply phone alias", "public key", publicKey, "alias", alias, "error", err)
 		return nil, fmt.Errorf("phone parser error: %v", err)
 	}
 	if !isPhone {
@@ -640,6 +644,7 @@ func (das *DevAccountService) RequestAlias(ctx context.Context, publicKey string
 		das.accountsAlias[alias] = publicKey
 		err := das.saveAlias(ctx, map[string]string{alias: publicKey})
 		if err != nil {
+			logg.ErrorCtxf(ctx, "account save error", "public key", publicKey, "alias", alias, "alias_save_error", err)
 			return nil, fmt.Errorf("Failed to save the account alias with error:  %s", err.Error())
 		}
 	}

event/msg.go

@@ -8,12 +8,12 @@ import (
 const (
 	// TODO: integrate with sarafu-vise-events
 	EventTokenTransferTag = "TOKEN_TRANSFER"
-	EventTokenMintTag = "TOKEN_MINT"
+	EventTokenMintTag     = "TOKEN_MINT"
-	EventRegistrationTag = "CUSTODIAL_REGISTRATION"
+	EventRegistrationTag  = "CUSTODIAL_REGISTRATION"
 )
 
 type Msg struct {
-	Typ string
+	Typ  string
 	Item any
 }
 
@@ -26,17 +26,17 @@ type EventCustodialRegistration struct {
 
 // fields used for handling token transfer event.
 type EventTokenTransfer struct {
-	To string
+	To             string
-	Value int
+	Value          int
 	VoucherAddress string
-	TxHash string
+	TxHash         string
-	From string
+	From           string
 }
 
 type EventTokenMint struct {
-	To string
+	To             string
-	Value int
+	Value          int
-	TxHash string
+	TxHash         string
 	VoucherAddress string
 }
 

go.mod

@@ -3,9 +3,9 @@ module git.grassecon.net/grassrootseconomics/sarafu-api
 go 1.23.4
 
 require (
-	git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b
+	git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9
-	git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05
+	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
-	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63
+	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/grassrootseconomics/eth-custodial v1.3.0-beta
 	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta

go.sum

@@ -1,9 +1,9 @@
-git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b h1:rwWXMtNSn7aqhb4p1oVZkCA1vC7pVdohwW61QQM8fUs=
+git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 h1:sPcqXQcywxA8W3W+9qQncLPmsrgqTIlec7vmD4/7vyA=
-git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05 h1:BenzGx6aDHKDwE23/mWIFD2InYIXyzHroZWV3MF5WUk=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63 h1:bX7klKZpX+ZZu1LKbtOXDAhV/KK0YwExehiIi0jusAM=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2 h1:ON77G5K0JNuwPb5JT/hRfF6G6+xstlBQgEIEzWydnhg=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63/go.mod h1:Syw9TZyigPAM7t9FvicOm36iUnidt45f0SxzT2JniQ8=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2/go.mod h1:pjKp9L/ZsWW3kMB0UoIl1yv9TBIuU33mn9Aghxp7vGk=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=

remote/http/service.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io"
 	"log"
 	"net/http"
@@ -14,7 +15,7 @@ import (
 	"git.grassecon.net/grassrootseconomics/sarafu-api/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/dev"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
-	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 	"github.com/grassrootseconomics/eth-custodial/pkg/api"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
@@ -24,6 +25,8 @@ var (
 )
 
 type HTTPAccountService struct {
+	SS     storage.StorageService
+	UseApi bool
 }
 
 // Parameters:
@@ -210,26 +213,38 @@ func (as *HTTPAccountService) TokenTransfer(ctx context.Context, amount, from, t
 // Parameters:
 //   - alias: The alias of the user.
 func (as *HTTPAccountService) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
+	if as.SS == nil {
+		return nil, fmt.Errorf("The storage service cannot be nil")
+	}
+	svc := dev.NewDevAccountService(ctx, as.SS)
+	if as.UseApi {
+		return resolveAliasAddress(ctx, alias)
+	} else {
+		return svc.CheckAliasAddress(ctx, alias)
+	}
+}
+
+func resolveAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
 	var r models.AliasAddress
 
 	ep, err := url.JoinPath(config.CheckAliasURL, alias)
 	if err != nil {
 		return nil, err
 	}
-
 	req, err := http.NewRequest("GET", ep, nil)
 	if err != nil {
 		return nil, err
 	}
-
 	_, err = doRequest(ctx, req, &r)
 	return &r, err
 }
 
 // TODO: Use actual custodial api to request available alias
 func (as *HTTPAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
-	storageService := mocks.NewMemStorageService(ctx)
+	if as.SS == nil {
-	svc := dev.NewDevAccountService(ctx, storageService)
+		return nil, fmt.Errorf("The storage service cannot be nil")
+	}
+	svc := dev.NewDevAccountService(ctx, as.SS)
 	return svc.RequestAlias(ctx, publicKey, hint)
 }
 

testutil/mocks/api_mock.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"git.defalsify.org/vise.git/logging"
-	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
 var (
@@ -14,52 +14,50 @@ var (
 
 const (
 	AliceChecksum = "0xeae046BF396e91f5A8D74f863dC57c107c8a4a70"
-	BobChecksum = "0xB3117202371853e24B725d4169D87616A7dDb127"
+	BobChecksum   = "0xB3117202371853e24B725d4169D87616A7dDb127"
-	AliceSession = "5553425"
+	AliceSession  = "5553425"
 )
 
 type MockApi struct {
 	TransactionsContent []dataserviceapi.Last10TxResponse
-	VouchersContent []dataserviceapi.TokenHoldings
+	VouchersContent     []dataserviceapi.TokenHoldings
-	VoucherDataContent *models.VoucherDataResult
+	VoucherDataContent  *models.VoucherDataResult
 }
 
-func(m MockApi) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
+func (m MockApi) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
 	return nil, nil
 }
 
-func(m MockApi) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
+func (m MockApi) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
 	return nil, nil
 }
 
-func(m MockApi) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
+func (m MockApi) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
 	return nil, nil
 }
 
-func(m MockApi) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
+func (m MockApi) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
 	logg.DebugCtxf(ctx, "mockapi fetchvouchers", "key", publicKey)
 	return m.VouchersContent, nil
 }
 
-func(m MockApi) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
+func (m MockApi) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
 	logg.DebugCtxf(ctx, "mockapi fetchtransactions", "key", publicKey)
 	return m.TransactionsContent, nil
 }
 
-func(m MockApi) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
+func (m MockApi) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
 	return m.VoucherDataContent, nil
 }
 
-func(m MockApi) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
+func (m MockApi) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
 	return nil, nil
 }
 
-func(m MockApi) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
+func (m MockApi) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
 	return nil, nil
 }
 
-func(m MockApi) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
+func (m MockApi) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
 	return nil, nil
 }
-
-

testutil/mocks/service_mock.go

@@ -53,7 +53,7 @@ func (m *MockAccountService) CheckAliasAddress(ctx context.Context, alias string
 	return args.Get(0).(*models.AliasAddress), args.Error(1)
 }
 
-func(m MockAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
+func (m MockAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
 	args := m.Called(publicKey, hint)
 	return args.Get(0).(*models.RequestAliasResult), args.Error(1)
 }