config/config.go

@@ -16,14 +16,12 @@ const (
 	voucherTransfersPathPrefix = "/api/v1/transfers/last10"
 	voucherDataPathPrefix      = "/api/v1/token"
 	AliasPrefix                = "api/v1/alias"
-	AliasEnsPrefix             = "/api/v1/bypass"
 )
 
 var (
 	custodialURLBase string
 	dataURLBase      string
 	BearerToken      string
-	aliasEnsURLBase  string
 )
 
 var (
@@ -36,7 +34,6 @@ var (
 	VoucherTransfersURL string
 	VoucherDataURL      string
 	CheckAliasURL       string
-	AliasEnsURL         string
 )
 
 func setBase() error {
@@ -44,7 +41,6 @@ func setBase() error {
 
 	custodialURLBase = env.GetEnv("CUSTODIAL_URL_BASE", "http://localhost:5003")
 	dataURLBase = env.GetEnv("DATA_URL_BASE", "http://localhost:5006")
-	aliasEnsURLBase = env.GetEnv("ALIAS_ENS_BASE", "http://localhost:5015")
 	BearerToken = env.GetEnv("BEARER_TOKEN", "")
 
 	_, err = url.Parse(custodialURLBase)
@@ -73,6 +69,6 @@ func LoadConfig() error {
 	VoucherTransfersURL, _ = url.JoinPath(dataURLBase, voucherTransfersPathPrefix)
 	VoucherDataURL, _ = url.JoinPath(dataURLBase, voucherDataPathPrefix)
 	CheckAliasURL, _ = url.JoinPath(dataURLBase, AliasPrefix)
-	AliasEnsURL, _ = url.JoinPath(aliasEnsURLBase, AliasEnsPrefix)
 	return nil
 }
+

dev/api.go

@@ -202,13 +202,10 @@ 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])
 	}
@@ -349,13 +346,17 @@ 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("")
+		das.db.SetSession(sessionId)
 		das.db.SetPrefix(db.DATATYPE_USERDATA)
 		return das.db.Put(ctx, []byte(k_), v_)
 	}
@@ -577,12 +578,10 @@ 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{
@@ -605,7 +604,6 @@ 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]
@@ -617,7 +615,6 @@ 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
@@ -625,7 +622,6 @@ 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 {
@@ -644,7 +640,6 @@ 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())
 		}
 	}

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.20250120121301-10739fb4a8c9
+	git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b
-	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
+	git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05
-	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2
+	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63
 	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.20250120121301-10739fb4a8c9 h1:sPcqXQcywxA8W3W+9qQncLPmsrgqTIlec7vmD4/7vyA=
+git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b h1:rwWXMtNSn7aqhb4p1oVZkCA1vC7pVdohwW61QQM8fUs=
-git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-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 h1:BenzGx6aDHKDwE23/mWIFD2InYIXyzHroZWV3MF5WUk=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-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 h1:bX7klKZpX+ZZu1LKbtOXDAhV/KK0YwExehiIi0jusAM=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2/go.mod h1:pjKp9L/ZsWW3kMB0UoIl1yv9TBIuU33mn9Aghxp7vGk=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63/go.mod h1:Syw9TZyigPAM7t9FvicOm36iUnidt45f0SxzT2JniQ8=
 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=

models/alias_response.go

@@ -7,13 +7,3 @@ type RequestAliasResult struct {
 type AliasAddress struct {
 	Address string
 }
-
-type AliasEnsResult struct {
-	Address    string `json:"address"`
-	AutoChoose bool   `json:"autoChoose"`
-	Name       string `json:"name"`
-}
-
-type AliasEnsAddressResult struct {
-	Address string `json:"address"`
-}

remote/http/service.go

@@ -5,31 +5,25 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io"
 	"log"
 	"net/http"
 	"net/url"
 	"regexp"
-	"strings"
 
-	"git.defalsify.org/vise.git/logging"
 	"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/storage"
+	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks"
 	"github.com/grassrootseconomics/eth-custodial/pkg/api"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
 var (
 	aliasRegex = regexp.MustCompile("^\\+?[a-zA-Z0-9\\-_]+$")
-	logg       = logging.NewVanilla().WithDomain("sarafu-api.devapi")
 )
 
 type HTTPAccountService struct {
-	SS     storage.StorageService
-	UseApi bool
 }
 
 // Parameters:
@@ -62,10 +56,6 @@ func (as *HTTPAccountService) TrackAccountStatus(ctx context.Context, publicKey
 	return &r, nil
 }
 
-func (as *HTTPAccountService) ToFqdn(alias string) string {
-	return alias + ".sarafu.eth"
-}
-
 // CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
 // Parameters:
 //   - publicKey: The public key associated with the account whose balance needs to be checked.
@@ -220,97 +210,27 @@ 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 {
+	var r models.AliasAddress
-		return nil, fmt.Errorf("The storage service cannot be nil")
-	}
-	logg.InfoCtxf(ctx, "resolving alias before formatting", "alias", alias)
-	svc := dev.NewDevAccountService(ctx, as.SS)
-	if as.UseApi {
-		logg.InfoCtxf(ctx, "resolving alias to address", "alias", alias)
-		return resolveAliasAddress(ctx, alias)
-	} else {
-		return svc.CheckAliasAddress(ctx, alias)
-	}
-}
 
-func resolveAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
+	ep, err := url.JoinPath(config.CheckAliasURL, alias)
-	var (
-		aliasEnsResult models.AliasEnsAddressResult
-	)
-
-	ep, err := url.JoinPath(config.AliasEnsURL, "/resolve")
 	if err != nil {
 		return nil, err
 	}
 
-	u, err := url.Parse(ep)
+	req, err := http.NewRequest("GET", ep, nil)
 	if err != nil {
 		return nil, err
 	}
 
-	query := u.Query()
-	query.Set("name", alias)
-	u.RawQuery = query.Encode()
-
-	req, err := http.NewRequest("GET", u.String(), nil)
-	if err != nil {
-		return nil, err
-	}
-	_, err = doRequest(ctx, req, &aliasEnsResult)
-	if err != nil {
-		return nil, err
-	}
-	return &models.AliasAddress{Address: aliasEnsResult.Address}, err
-}
-
-func (as *HTTPAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
-	if as.SS == nil {
-		return nil, fmt.Errorf("The storage service cannot be nil")
-	}
-	if as.UseApi {
-		if !strings.Contains(hint, ".") {
-			hint = as.ToFqdn(hint)
-		}
-		enr, err := requestEnsAlias(ctx, publicKey, hint)
-		if err != nil {
-			return nil, err
-		}
-		return &models.RequestAliasResult{Alias: enr.Name}, nil
-	} else {
-		svc := dev.NewDevAccountService(ctx, as.SS)
-		return svc.RequestAlias(ctx, publicKey, hint)
-	}
-}
-
-func requestEnsAlias(ctx context.Context, publicKey string, hint string) (*models.AliasEnsResult, error) {
-	var r models.AliasEnsResult
-
-	ep, err := url.JoinPath(config.AliasEnsURL, "/register")
-	if err != nil {
-		return nil, err
-	}
-	logg.InfoCtxf(ctx, "requesting alias", "endpoint", ep, "hint", hint)
-	//Payload with the address and hint to derive an ENS name
-	payload := map[string]string{
-		"address": publicKey,
-		"hint":    hint,
-	}
-	payloadBytes, err := json.Marshal(payload)
-	if err != nil {
-		return nil, err
-	}
-	req, err := http.NewRequest("POST", ep, bytes.NewBuffer(payloadBytes))
-	if err != nil {
-		return nil, err
-	}
-	// Log the request body
-	logg.InfoCtxf(ctx, "request body", "payload", string(payloadBytes))
 	_, err = doRequest(ctx, req, &r)
-	if err != nil {
+	return &r, err
-		return nil, err
 }
-	logg.InfoCtxf(ctx, "alias successfully assigned", "alias", r.Name)
+
-	return &r, nil
+// 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)
+	svc := dev.NewDevAccountService(ctx, storageService)
+	return svc.RequestAlias(ctx, publicKey, hint)
 }
 
 // TODO: remove eth-custodial api dependency

testutil/mocks/api_mock.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
 )
 
 var (
@@ -61,3 +61,5 @@ func (m MockApi) RequestAlias(ctx context.Context, publicKey string, hint string
 func(m MockApi) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
 	return nil, nil
 }
+
+