added the GetMpesaOnrampRates function

Reviewed-on: #16

config/config.go

@@ -7,38 +7,66 @@ import (
 )
 
 const (
-	createAccountPath          = "/api/v2/account/create"
-	trackStatusPath            = "/api/track"
-	balancePathPrefix          = "/api/account"
-	trackPath                  = "/api/v2/account/status"
-	tokenTransferPrefix        = "/api/v2/token/transfer"
-	voucherHoldingsPathPrefix  = "/api/v1/holdings"
-	voucherTransfersPathPrefix = "/api/v1/transfers/last10"
-	voucherDataPathPrefix      = "/api/v1/token"
-	AliasPrefix                = "api/v1/alias"
-	SendSMSPrefix              = "api/v1/external/upsell"
-	AliasEnsPrefix             = "/api/v1/bypass"
+	createAccountPath            = "/api/v2/account/create"
+	trackStatusPath              = "/api/track"
+	balancePathPrefix            = "/api/account"
+	trackPath                    = "/api/v2/account/status"
+	tokenTransferPrefix          = "/api/v2/token/transfer"
+	voucherHoldingsPathPrefix    = "/api/v1/holdings"
+	voucherTransfersPathPrefix   = "/api/v1/transfers/last10"
+	voucherDataPathPrefix        = "/api/v1/token"
+	SendSMSPrefix                = "api/v1/external/upsell"
+	poolDepositPrefix            = "/api/v2/pool/deposit"
+	poolSwapQoutePrefix          = "/api/v2/pool/quote"
+	poolSwapPrefix               = "/api/v2/pool/swap"
+	topPoolsPrefix               = "/api/v1/pool/top"
+	retrievePoolDetailsPrefix    = "/api/v1/pool/reverse"
+	poolSwappableVouchersPrefix  = "/api/v1/pool"
+	AliasRegistrationPrefix      = "/api/v1/internal/register"
+	AliasResolverPrefix          = "/api/v1/resolve"
+	ExternalSMSPrefix            = "/api/v1/external"
+	AliasUpdatePrefix            = "/api/v1/internal/update"
+	CreditSendPrefix             = "/api/v1/credit-send"
+	CreditSendReverseQuotePrefix = "/api/v1/pool/reverse-quote"
+	MpesaOnrampPath              = "/api/v1/trigger-onramp"
+	MpesaOnrampRatesPath         = "/api/v1/rates"
 )
 
 var (
-	custodialURLBase string
-	dataURLBase      string
-	BearerToken      string
-	aliasEnsURLBase  string
+	custodialURLBase       string
+	dataURLBase            string
+	BearerToken            string
+	aliasEnsURLBase        string
+	externalSMSBase        string
+	IncludeStablesParam    string
+	MpesaOnrampBearerToken string
+	mpesaOnrampBase        string
 )
 
 var (
-	CreateAccountURL    string
-	TrackStatusURL      string
-	BalanceURL          string
-	TrackURL            string
-	TokenTransferURL    string
-	VoucherHoldingsURL  string
-	VoucherTransfersURL string
-	VoucherDataURL      string
-	CheckAliasURL       string
-	SendSMSURL          string
-	AliasEnsURL         string
+	CreateAccountURL          string
+	TrackStatusURL            string
+	BalanceURL                string
+	TrackURL                  string
+	TokenTransferURL          string
+	VoucherHoldingsURL        string
+	VoucherTransfersURL       string
+	VoucherDataURL            string
+	PoolDepositURL            string
+	PoolSwapQuoteURL          string
+	PoolSwapURL               string
+	TopPoolsURL               string
+	RetrievePoolDetailsURL    string
+	PoolSwappableVouchersURL  string
+	SendSMSURL                string
+	AliasRegistrationURL      string
+	AliasResolverURL          string
+	ExternalSMSURL            string
+	AliasUpdateURL            string
+	CreditSendURL             string
+	CreditSendReverseQuoteURL string
+	MpesaOnrampURL            string
+	MpresaOnrampRatesURL      string
 )
 
 func setBase() error {
@@ -47,7 +75,11 @@ 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")
+	externalSMSBase = env.GetEnv("EXTERNAL_SMS_BASE", "http://localhost:5035")
 	BearerToken = env.GetEnv("BEARER_TOKEN", "")
+	IncludeStablesParam = env.GetEnv("INCLUDE_STABLES_PARAM", "false")
+	MpesaOnrampBearerToken = env.GetEnv("MPESA_BEARER_TOKEN", "")
+	mpesaOnrampBase = env.GetEnv("MPESA_ONRAMP_BASE", "https://pretium.v1.grassecon.net")
 
 	_, err = url.Parse(custodialURLBase)
 	if err != nil {
@@ -74,8 +106,21 @@ func LoadConfig() error {
 	VoucherHoldingsURL, _ = url.JoinPath(dataURLBase, voucherHoldingsPathPrefix)
 	VoucherTransfersURL, _ = url.JoinPath(dataURLBase, voucherTransfersPathPrefix)
 	VoucherDataURL, _ = url.JoinPath(dataURLBase, voucherDataPathPrefix)
-	CheckAliasURL, _ = url.JoinPath(dataURLBase, AliasPrefix)
 	SendSMSURL, _ = url.JoinPath(dataURLBase, SendSMSPrefix)
-	AliasEnsURL, _ = url.JoinPath(aliasEnsURLBase, AliasEnsPrefix)
+	PoolDepositURL, _ = url.JoinPath(custodialURLBase, poolDepositPrefix)
+	PoolSwapQuoteURL, _ = url.JoinPath(custodialURLBase, poolSwapQoutePrefix)
+	PoolSwapURL, _ = url.JoinPath(custodialURLBase, poolSwapPrefix)
+	TopPoolsURL, _ = url.JoinPath(dataURLBase, topPoolsPrefix)
+	RetrievePoolDetailsURL, _ = url.JoinPath(dataURLBase, retrievePoolDetailsPrefix)
+	PoolSwappableVouchersURL, _ = url.JoinPath(dataURLBase, poolSwappableVouchersPrefix)
+	AliasRegistrationURL, _ = url.JoinPath(aliasEnsURLBase, AliasRegistrationPrefix)
+	AliasResolverURL, _ = url.JoinPath(aliasEnsURLBase, AliasResolverPrefix)
+	ExternalSMSURL, _ = url.JoinPath(externalSMSBase, ExternalSMSPrefix)
+	AliasUpdateURL, _ = url.JoinPath(aliasEnsURLBase, AliasUpdatePrefix)
+	CreditSendURL, _ = url.JoinPath(dataURLBase, CreditSendPrefix)
+	CreditSendReverseQuoteURL, _ = url.JoinPath(dataURLBase, CreditSendReverseQuotePrefix)
+	MpesaOnrampURL, _ = url.JoinPath(mpesaOnrampBase, MpesaOnrampPath)
+	MpresaOnrampRatesURL, _ = url.JoinPath(mpesaOnrampBase, MpesaOnrampRatesPath)
+
 	return nil
 }

dev/api.go

@@ -34,6 +34,9 @@ const (
 	defaultDecimals               = 6
 	zeroAddress           string  = "0x0000000000000000000000000000000000000000"
 	defaultVoucherBalance float64 = 500.00
+	cityPoolAddress       string  = "0x3b517308D858a47458aD5C8E699697C5dc91Da0F"
+	poolName              string  = "citypool"
+	PoolSymbol            string  = "CTY"
 )
 
 type Tx struct {
@@ -91,6 +94,14 @@ type Voucher struct {
 	Location  string `json: "location"`
 }
 
+type Pool struct {
+	Name      string            `json: "name"`
+	Symbol    string            `json: "symbol"`
+	Address   string            `json: "address"`
+	Vouchers  []Voucher         `json: "voucher"`
+	PoolLimit map[string]string `json: "poollimit"`
+}
+
 type DevAccountService struct {
 	db               db.Db
 	accounts         map[string]Account
@@ -106,6 +117,7 @@ type DevAccountService struct {
 	defaultAccount   string
 	emitterFunc      event.EmitterFunc
 	pfx              []byte
+	pools            map[string]Pool
 }
 
 func NewDevAccountService(ctx context.Context, ss storage.StorageService) *DevAccountService {
@@ -118,6 +130,7 @@ func NewDevAccountService(ctx context.Context, ss storage.StorageService) *DevAc
 		txs:              make(map[string]Tx),
 		txsTrack:         make(map[string]string),
 		autoVoucherValue: make(map[string]int),
+		pools:            make(map[string]Pool),
 		defaultAccount:   zeroAddress,
 		pfx:              []byte("__"),
 	}
@@ -171,6 +184,15 @@ func (das *DevAccountService) loadAccount(ctx context.Context, pubKey string, v
 	return nil
 }
 
+func (p *Pool) hasVoucher(voucherAddress string) bool {
+	for _, value := range p.Vouchers {
+		if value.Address == voucherAddress {
+			return true
+		}
+	}
+	return false
+}
+
 func (das *DevAccountService) loadTx(ctx context.Context, hsh string, v []byte) error {
 	var mytx Tx
 
@@ -193,6 +215,17 @@ func (das *DevAccountService) loadAlias(ctx context.Context, alias string, key [
 	return nil
 }
 
+func (das *DevAccountService) loadPoolInfo(ctx context.Context, name string, v []byte) error {
+	var pool Pool
+
+	err := json.Unmarshal(v, &pool)
+	if err != nil {
+		return fmt.Errorf("failed to unmarshall pool info: %v", err)
+	}
+	das.pools[name] = pool
+	return nil
+}
+
 func (das *DevAccountService) loadItem(ctx context.Context, k []byte, v []byte) error {
 	var err error
 	s := string(k)
@@ -209,6 +242,8 @@ func (das *DevAccountService) loadItem(ctx context.Context, k []byte, v []byte)
 	} else if ss[0] == "alias" {
 		err = das.loadAlias(ctx, ss[1], k)
 		logg.ErrorCtxf(ctx, "loading aliases failed", "error_load_aliases", err)
+	} else if ss[0] == "pool" {
+		err = das.loadPoolInfo(ctx, ss[1], v)
 	} else {
 		logg.ErrorCtxf(ctx, "unknown double underscore key", "key", ss[0])
 	}
@@ -224,13 +259,13 @@ func (das *DevAccountService) loadAll(ctx context.Context) error {
 	}
 	for true {
 		k, v := dumper.Next(ctx)
+		logg.InfoCtxf(ctx, "loading all", "key", string(k), "value", string(v))
 		if k == nil {
 			break
 		}
 		if !bytes.HasPrefix(k, das.pfx) {
 			continue
 		}
-
 		err = das.loadItem(ctx, k, v)
 		if err != nil {
 			return err
@@ -265,6 +300,35 @@ func (das *DevAccountService) WithAutoVoucher(ctx context.Context, symbol string
 	return das
 }
 
+func (das *DevAccountService) RegisterPool(ctx context.Context, name string, sm string) error {
+	var seedVouchers []Voucher
+
+	h := sha1.New()
+	h.Write([]byte(sm))
+	z := h.Sum(nil)
+	pooladdr := fmt.Sprintf("0x%x", z)
+
+	p := Pool{
+		Name:      name,
+		Symbol:    sm,
+		Address:   pooladdr,
+		PoolLimit: make(map[string]string),
+	}
+
+	for _, v := range das.vouchers {
+		//pre-load vouchers with vouchers when a pool is registered
+		seedVouchers = append(seedVouchers, v)
+		p.PoolLimit[v.Address] = fmt.Sprintf("%f", defaultVoucherBalance)
+	}
+	p.Vouchers = append(p.Vouchers, seedVouchers...)
+
+	err := das.savePoolInfo(ctx, p)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 // TODO: add persistence for vouchers
 // TODO: set max balance for 0x00 address
 func (das *DevAccountService) AddVoucher(ctx context.Context, symbol string) error {
@@ -345,6 +409,20 @@ func (das *DevAccountService) saveAccount(ctx context.Context, acc Account) erro
 	return das.db.Put(ctx, []byte(k), v)
 }
 
+func (das *DevAccountService) savePoolInfo(ctx context.Context, pool Pool) error {
+	if das.db == nil {
+		return nil
+	}
+	k := das.prefixKeyFor("pool", pool.Address)
+	v, err := json.Marshal(pool)
+	if err != nil {
+		return err
+	}
+	das.db.SetSession("")
+	das.db.SetPrefix(db.DATATYPE_USERDATA)
+	return das.db.Put(ctx, []byte(k), v)
+}
+
 func (das *DevAccountService) saveAlias(ctx context.Context, alias map[string]string) error {
 	if das.db == nil {
 		return fmt.Errorf("Db cannot be nil")
@@ -415,6 +493,80 @@ func (das *DevAccountService) CreateAccount(ctx context.Context) (*models.Accoun
 	}, nil
 }
 
+func (das *DevAccountService) PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error) {
+	_, ok := das.accounts[from]
+	if !ok {
+		return nil, fmt.Errorf("account not found (publickey): %v", from)
+	}
+	sym, ok := das.vouchersAddress[tokenAddress]
+	if !ok {
+		return nil, fmt.Errorf("voucher address %v not found", tokenAddress)
+	}
+	uid, err := uuid.NewV4()
+	if err != nil {
+		return nil, err
+	}
+
+	_, ok = das.vouchers[sym]
+	if !ok {
+		return nil, fmt.Errorf("voucher address %v found but does not resolve", tokenAddress)
+	}
+
+	if err != nil {
+		return nil, err
+	}
+	return &models.PoolDepositResult{
+		TrackingId: uid.String(),
+	}, nil
+}
+
+func (das *DevAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {
+	_, ok := das.accounts[from]
+	if !ok {
+		return nil, fmt.Errorf("account not found (publickey): %v", from)
+	}
+	p, ok := das.pools[poolAddress]
+	if !ok {
+		return nil, fmt.Errorf("pool address %v not found", poolAddress)
+	}
+
+	//resolve the token address you are trying to swap from(fromTokenAddress)
+	ok = p.hasVoucher(fromTokenAddress)
+	if !ok {
+		return nil, fmt.Errorf("voucher with address %v not found in the pool", fromTokenAddress)
+	}
+
+	//Return a a quote that is equal to the amount entered
+	return &models.PoolSwapQuoteResult{IncludesFeesDeduction: false, OutValue: amount}, nil
+}
+
+func (das *DevAccountService) PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error) {
+	uid, err := uuid.NewV4()
+	if err != nil {
+		return nil, err
+	}
+
+	p, ok := das.pools[poolAddress]
+	if !ok {
+		return nil, fmt.Errorf("pool address %v not found", toTokenAddress)
+	}
+	_, ok = das.accounts[from]
+	if !ok {
+		return nil, fmt.Errorf("account not found (publickey): %v", from)
+	}
+	ok = p.hasVoucher(fromTokenAddress)
+	if !ok {
+		return nil, fmt.Errorf("token %v not found in the pool", fromTokenAddress)
+	}
+
+	ok = p.hasVoucher(toTokenAddress)
+	if !ok {
+		return nil, fmt.Errorf("token %v not found in the pool", toTokenAddress)
+	}
+
+	return &models.PoolSwapResult{TrackingId: uid.String()}, nil
+}
+
 func (das *DevAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
 	var ok bool
 	_, ok = das.accounts[publicKey]
@@ -435,10 +587,10 @@ func (das *DevAccountService) FetchVouchers(ctx context.Context, publicKey strin
 	//TODO: Iterate over the account acc.Balances object
 	for _, voucher := range das.vouchers {
 		holdings = append(holdings, dataserviceapi.TokenHoldings{
-			ContractAddress: voucher.Address,
-			TokenSymbol:     voucher.Symbol,
-			TokenDecimals:   strconv.Itoa(voucher.Decimals),
-			Balance:         strconv.Itoa(int(defaultVoucherBalance)),
+			TokenAddress:  voucher.Address,
+			TokenSymbol:   voucher.Symbol,
+			TokenDecimals: strconv.Itoa(voucher.Decimals),
+			Balance:       strconv.Itoa(int(defaultVoucherBalance)),
 		})
 	}
 
@@ -654,9 +806,133 @@ func (das *DevAccountService) RequestAlias(ctx context.Context, publicKey string
 	}, nil
 }
 
+func (das *DevAccountService) UpdateAlias(ctx context.Context, publicKey string, name string) (*models.RequestAliasResult, error) {
+	logg.DebugCtxf(ctx, "Updated the alias", "address", publicKey, "name", name)
+	return &models.RequestAliasResult{
+		Alias: name,
+	}, nil
+}
+
 func (das *DevAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
 	logg.DebugCtxf(ctx, "sent an SMS", "inviterPhone", inviterPhone, "inviteePhone", inviteePhone)
 	return &models.SendSMSResponse{
 		Invitee: inviteePhone,
 	}, nil
 }
+
+func (das *DevAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
+	return fmt.Errorf("unimplemented")
+}
+
+func (das *DevAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
+	return fmt.Errorf("unimplemented")
+}
+
+func (das *DevAccountService) FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error) {
+	var topPools []dataserviceapi.PoolDetails
+	for _, p := range das.pools {
+		topPools = append(topPools, dataserviceapi.PoolDetails{
+			PoolName:            p.Name,
+			PoolSymbol:          p.Symbol,
+			PoolContractAdrress: p.Address,
+		})
+	}
+	return topPools, nil
+}
+
+func (das *DevAccountService) RetrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error) {
+	testPool := &dataserviceapi.PoolDetails{
+		PoolName:            "DevTest",
+		PoolSymbol:          "DEVT",
+		PoolContractAdrress: "0x145F87d6198dEDD45C614FFD8b70E9a2fCCc5cc9",
+		LimiterAddress:      "",
+		VoucherRegistry:     "",
+	}
+
+	return testPool, nil
+}
+
+func (das *DevAccountService) GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
+	var swapFromList []dataserviceapi.TokenHoldings
+
+	p, ok := das.pools[poolAddress]
+	if !ok {
+		return nil, fmt.Errorf("Invalid pool address: %v", poolAddress)
+	}
+	for _, v := range p.Vouchers {
+		swapFromList = append(swapFromList, dataserviceapi.TokenHoldings{
+			TokenAddress:  v.Address,
+			TokenSymbol:   v.Symbol,
+			TokenDecimals: string(defaultDecimals),
+			Balance:       fmt.Sprintf("%f", defaultVoucherBalance),
+		})
+	}
+
+	return swapFromList, nil
+}
+
+func (das *DevAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
+	var swapToList []dataserviceapi.TokenHoldings
+	_, ok := das.pools[poolAddress]
+	if !ok {
+		return nil, fmt.Errorf("Invalid pool address: %v", poolAddress)
+	}
+	for _, voucher := range das.vouchers {
+		swapToList = append(swapToList, dataserviceapi.TokenHoldings{
+			TokenAddress:  voucher.Address,
+			TokenSymbol:   voucher.Symbol,
+			TokenDecimals: strconv.Itoa(voucher.Decimals),
+		})
+	}
+	return swapToList, nil
+}
+
+func (das *DevAccountService) GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) {
+	p, ok := das.pools[poolAddress]
+	if !ok {
+		return nil, fmt.Errorf("Pool address: %v not found ", poolAddress)
+	}
+	limit, ok := p.PoolLimit[fromTokenAddress]
+	if !ok {
+		return nil, fmt.Errorf("Token address: %v not found in the pool", fromTokenAddress)
+	}
+
+	return &models.MaxLimitResult{
+		Max: limit,
+	}, nil
+}
+
+func (das *DevAccountService) CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
+	return &models.TokenInPoolResult{
+		CanSwapFrom: true,
+	}, nil
+}
+
+func (das *DevAccountService) GetCreditSendMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.CreditSendLimitsResult, error) {
+	return &models.CreditSendLimitsResult{
+		MaxRAT: "45599996",
+		MaxSAT: "3507692",
+	}, nil
+}
+
+func (das *DevAccountService) GetCreditSendReverseQuote(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, toTokenAMount string) (*models.CreditSendReverseQouteResult, error) {
+	return &models.CreditSendReverseQouteResult{
+		InputAmount:  "3076923",
+		OutputAmount: "40000000",
+	}, nil
+}
+
+func (das *DevAccountService) MpesaTriggerOnramp(ctx context.Context, address, phoneNumber, asset string, amount int) (*models.MpesaOnrampResponse, error) {
+	return &models.MpesaOnrampResponse{
+		Message:         "Success, kindly accept prompt sent.",
+		Status:          "PENDING",
+		TransactionCode: "ae6fb33b-4653-4f38-a3b6-85dfea7a1e99",
+	}, nil
+}
+
+func (das *DevAccountService) GetMpesaOnrampRates(ctx context.Context) (*models.MpesaOnrampRatesResponse, error) {
+	return &models.MpesaOnrampRatesResponse{
+		Buy:  128.15,
+		Sell: 130.06,
+	}, nil
+}

dev/data/swap_from.json

@@ -0,0 +1,32 @@
+{
+    "ok": true,
+    "description": "Swap from list",
+    "result": {
+        "filtered": [
+            {
+                "contractAddress": "0xc7B78Ac9ACB9E025C8234621FC515bC58179dEAe",
+                "tokenSymbol": "AMANI",
+                "tokenDecimals": "6",
+                "balance": ""
+            },
+            {
+                "contractAddress": "0xF0C3C7581b8b96B59a97daEc8Bd48247cE078674",
+                "tokenSymbol": "AMUA",
+                "tokenDecimals": "6",
+                "balance": ""
+            },
+            {
+                "contractAddress": "0x371455a30fc62736145Bd8429Fcc6481186f235F",
+                "tokenSymbol": "BAHARI",
+                "tokenDecimals": "6",
+                "balance": ""
+            },
+            {
+                "contractAddress": "0x7cA6113b59c24a880F382C7E12d609a6Eb05246b",
+                "tokenSymbol": "BANGLA",
+                "tokenDecimals": "6",
+                "balance": ""
+            }
+        ]
+    }
+}

dev/data/swap_to.json

@@ -0,0 +1,14 @@
+{
+    "ok": true,
+    "description": "Swap to list",
+    "result": {
+        "filtered": [
+            {
+                "contractAddress": "0x765DE816845861e75A25fCA122bb6898B8B1282a",
+                "tokenSymbol": "cUSD",
+                "tokenDecimals": "18",
+                "balance": ""
+            }
+        ]
+    }
+}

dev/data/top_pools.json

@@ -0,0 +1,43 @@
+{
+    "ok": true,
+    "description": "Top 5 pools sorted by swaps",
+    "result": {
+        "topPools": [
+            {
+                "poolName": "Kenya ROLA Pool",
+                "poolSymbol": "ROLA",
+                "poolContractAddress": "0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e",
+                "limiterAddress": "",
+                "voucherRegistry": ""
+            },
+            {
+                "poolName": "Nairobi ROLA Pool",
+                "poolSymbol": "NAIROBI",
+                "poolContractAddress": "0xB0660Ac1Ee3d32ea35bc728D7CA1705Fa5A37528",
+                "limiterAddress": "",
+                "voucherRegistry": ""
+            },
+            {
+                "poolName": "Friends of Kiriba Ecosystem ",
+                "poolSymbol": "FRIENDS",
+                "poolContractAddress": "0xC4848263821FA02baB2181910A2eFb9CECb2c21C",
+                "limiterAddress": "",
+                "voucherRegistry": ""
+            },
+            {
+                "poolName": "Resilient Community Waqfs",
+                "poolSymbol": "REZILIENS",
+                "poolContractAddress": "0x1e40951d7a28147D8B4A554C60c42766C92e2Fc6",
+                "limiterAddress": "",
+                "voucherRegistry": ""
+            },
+            {
+                "poolName": "GrE Tech",
+                "poolSymbol": "GRET",
+                "poolContractAddress": "0xb7B9d0A264eD1a8E2418571B7AC5933C79C9c2B8",
+                "limiterAddress": "",
+                "voucherRegistry": ""
+            }
+        ]
+    }
+}

go.mod

@@ -1,36 +1,38 @@
 module git.grassecon.net/grassrootseconomics/sarafu-api
 
-go 1.23.4
+go 1.24.0
+
+toolchain go1.24.6
 
 require (
-	git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9
-	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
-	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2
+	git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e
+	git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1
+	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2
 	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
-	github.com/stretchr/testify v1.9.0
+	github.com/grassrootseconomics/eth-custodial v1.12.0-rc
+	github.com/grassrootseconomics/ussd-data-service v1.10.1-beta
+	github.com/stretchr/testify v1.11.1
 )
 
 require (
-	github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect
+	github.com/barbashov/iso639-3 v1.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgx/v5 v5.7.1 // indirect
+	github.com/jackc/pgx/v5 v5.7.6 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect
-	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect
+	github.com/pashagolub/pgxmock/v4 v4.7.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rogpeppe/go-internal v1.13.1 // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/stretchr/objx v0.5.3 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
 	gopkg.in/leonelquinteros/gotext.v1 v1.3.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,31 +1,30 @@
-git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 h1:sPcqXQcywxA8W3W+9qQncLPmsrgqTIlec7vmD4/7vyA=
-git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9/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-20250121134736-ba8cbbccea7d/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.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=
+git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e h1:gtB9OdX6x5gQRM3W824dEurXuuf/YPInqgtv2KAp5Zo=
+git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1 h1:eppylYmQ9izyar0HIhb0Qbnat33EJYaH+5bFpp2PSkg=
+git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2 h1:YFztSsexCUgFo6M0tbngRwYdgJd3LQV3RO/Jw09u3+k=
+git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2/go.mod h1:6B6ByxXOiRY0NR7K02Bf3fEu7z+2c/6q8PFVNjC5G8w=
+github.com/barbashov/iso639-3 v1.0.0 h1:qCp1hUzZT8C8yHcdDo4sZQg2jHEaX6LF5H/dF9ba0qs=
+github.com/barbashov/iso639-3 v1.0.0/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
-github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
+github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
+github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
 github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/grassrootseconomics/eth-custodial v1.3.0-beta h1:twrMBhl89GqDUL9PlkzQxMP/6OST1BByrNDj+rqXDmU=
-github.com/grassrootseconomics/eth-custodial v1.3.0-beta/go.mod h1:7uhRcdnJplX4t6GKCEFkbeDhhjlcaGJeJqevbcvGLZo=
-github.com/grassrootseconomics/ussd-data-service v1.2.0-beta h1:fn1gwbWIwHVEBtUC2zi5OqTlfI/5gU1SMk0fgGixIXk=
-github.com/grassrootseconomics/ussd-data-service v1.2.0-beta/go.mod h1:omfI0QtUwIdpu9gMcUqLMCG8O1XWjqJGBx1qUMiGWC0=
+github.com/grassrootseconomics/eth-custodial v1.12.0-rc h1:INkXMfNUISkQ1bgnw3LwfFJn/eCdBawFU8Hx+S7mM/c=
+github.com/grassrootseconomics/eth-custodial v1.12.0-rc/go.mod h1:s/vacSWFiVO7FDv76EID8sQvdT1vq+3GcWZUgU6N618=
+github.com/grassrootseconomics/ussd-data-service v1.10.1-beta h1:ZrRn7gv4MVSg67hmSdiii/Y86PUIvhxtqc2luAjlA7o=
+github.com/grassrootseconomics/ussd-data-service v1.10.1-beta/go.mod h1:Uigrnnwj0vaTz2az3VwHmAG7xpJgQWYTcLudLh6Zc1I=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs=
-github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA=
+github.com/jackc/pgx/v5 v5.7.6 h1:rWQc5FwZSPX58r1OQmkuaNicxdmExaEz5A2DO2hUuTk=
+github.com/jackc/pgx/v5 v5.7.6/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M=
 github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
@@ -36,8 +35,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a h1:0Q3H0YXzMHiciXtRcM+j0jiCe8WKPQHoRgQiRTnfcLY=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a/go.mod h1:CdTTBOYzS5E4mWS1N8NWP6AHI19MP0A2B18n3hLzRMk=
-github.com/pashagolub/pgxmock/v4 v4.3.0 h1:DqT7fk0OCK6H0GvqtcMsLpv8cIwWqdxWgfZNLeHCb/s=
-github.com/pashagolub/pgxmock/v4 v4.3.0/go.mod h1:9VoVHXwS3XR/yPtKGzwQvwZX1kzGB9sM8SviDcHDa3A=
+github.com/pashagolub/pgxmock/v4 v4.7.0 h1:de2ORuFYyjwOQR7NBm57+321RnZxpYiuUjsmqRiqgh8=
+github.com/pashagolub/pgxmock/v4 v4.7.0/go.mod h1:9L57pC193h2aKRHVyiiE817avasIPZnPwPlw3JczWvM=
 github.com/peteole/testdata-loader v0.3.0 h1:8jckE9KcyNHgyv/VPoaljvKZE0Rqr8+dPVYH6rfNr9I=
 github.com/peteole/testdata-loader v0.3.0/go.mod h1:Mt0ZbRtb56u8SLJpNP+BnQbENljMorYBpqlvt3cS83U=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -46,20 +45,20 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=
+github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 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=

models/mpesa_onramp_response.go

@@ -0,0 +1,12 @@
+package models
+
+type MpesaOnrampResponse struct {
+	Message         string `json:"message"`
+	Status          string `json:"status"`
+	TransactionCode string `json:"transactionCode"`
+}
+
+type MpesaOnrampRatesResponse struct {
+	Buy  float64 `json:"buy"`
+	Sell float64 `json:"sell"`
+}

models/pool_swap_response.go

@@ -0,0 +1,32 @@
+package models
+
+type PoolDepositResult struct {
+	TrackingId string `json:"trackingId"`
+}
+
+type PoolSwapQuoteResult struct {
+	IncludesFeesDeduction bool   `json:"includesFeesDeduction"`
+	OutValue              string `json:"outValue"`
+}
+
+type PoolSwapResult struct {
+	TrackingId string `json:"trackingId"`
+}
+
+type MaxLimitResult struct {
+	Max string `json:"max"`
+}
+
+type TokenInPoolResult struct {
+	CanSwapFrom bool `json:"canSwapFrom"`
+}
+
+type CreditSendLimitsResult struct {
+	MaxRAT string `json:"maxRAT"`
+	MaxSAT string `json:"maxSAT"`
+}
+
+type CreditSendReverseQouteResult struct {
+	InputAmount  string `json:"inputAmount"`
+	OutputAmount string `json:"outputAmount"`
+}

remote/account_service.go

@@ -17,5 +17,21 @@ type AccountService interface {
 	TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error)
 	CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error)
 	RequestAlias(ctx context.Context, hint string, publicKey string) (*models.RequestAliasResult, error)
+	UpdateAlias(ctx context.Context, name string, publicKey string) (*models.RequestAliasResult, error)
 	SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error)
+	SendAddressSMS(ctx context.Context, publicKey, originPhone string) error
+	SendPINResetSMS(ctx context.Context, admin, phone string) error
+	PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error)
+	FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error)
+	RetrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error)
+	GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error)
+	GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error)
+	GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error)
+	PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error)
+	GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error)
+	CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error)
+	GetCreditSendMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.CreditSendLimitsResult, error)
+	GetCreditSendReverseQuote(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, toTokenAMount string) (*models.CreditSendReverseQouteResult, error)
+	MpesaTriggerOnramp(ctx context.Context, address, phoneNumber, asset string, amount int) (*models.MpesaOnrampResponse, error)
+	GetMpesaOnrampRates(ctx context.Context) (*models.MpesaOnrampRatesResponse, error)
 }

remote/http/service.go

@@ -10,7 +10,6 @@ import (
 	"log"
 	"net/http"
 	"net/url"
-	"regexp"
 	"strings"
 
 	"git.defalsify.org/vise.git/logging"
@@ -23,15 +22,43 @@ import (
 )
 
 var (
-	aliasRegex = regexp.MustCompile("^\\+?[a-zA-Z0-9\\-_]+$")
 	logg       = logging.NewVanilla().WithDomain("sarafu-api.devapi")
 )
 
+type APIError struct {
+	Code        string
+	Description string
+}
+
+type ctxKey string
+
+const ctxKeyAuthToken ctxKey = "authToken"
+
+func (e *APIError) Error() string {
+	if e.Code != "" {
+		return fmt.Sprintf("[%s] %s", e.Code, e.Description)
+	}
+	return e.Description
+}
+
 type HTTPAccountService struct {
 	SS     storage.StorageService
 	UseApi bool
 }
 
+// symbolReplacements holds mappings of invalid symbols → valid ones
+var symbolReplacements = map[string]string{
+	"USD₮": "USDT",
+}
+
+// sanitizeSymbol replaces known invalid token symbols with normalized ones
+func sanitizeSymbol(symbol string) string {
+	if replacement, ok := symbolReplacements[symbol]; ok {
+		return replacement
+	}
+	return symbol
+}
+
 // Parameters:
 //   - trackingId: A unique identifier for the account.This should be obtained from a previous call to
 //     CreateAccount or a similar function that returns an AccountResponse. The `trackingId` field in the
@@ -130,6 +157,11 @@ func (as *HTTPAccountService) FetchVouchers(ctx context.Context, publicKey strin
 		return nil, err
 	}
 
+	// Normalize symbols before returning
+	for i := range r.Holdings {
+		r.Holdings[i].TokenSymbol = sanitizeSymbol(r.Holdings[i].TokenSymbol)
+	}
+
 	return r.Holdings, nil
 }
 
@@ -156,6 +188,11 @@ func (as *HTTPAccountService) FetchTransactions(ctx context.Context, publicKey s
 		return nil, err
 	}
 
+	// Normalize symbols before returning
+	for i := range r.Transfers {
+		r.Transfers[i].TokenSymbol = sanitizeSymbol(r.Transfers[i].TokenSymbol)
+	}
+
 	return r.Transfers, nil
 }
 
@@ -177,6 +214,9 @@ func (as *HTTPAccountService) VoucherData(ctx context.Context, address string) (
 		return nil, err
 	}
 
+	// Normalize symbols before returning
+	r.TokenDetails.TokenSymbol = sanitizeSymbol(r.TokenDetails.TokenSymbol)
+
 	_, err = doRequest(ctx, req, &r)
 	return &r.TokenDetails, err
 }
@@ -234,35 +274,299 @@ func (as *HTTPAccountService) CheckAliasAddress(ctx context.Context, alias strin
 }
 
 func resolveAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
-	var (
-		aliasEnsResult models.AliasEnsAddressResult
-	)
+	var aliasEnsResult models.AliasEnsAddressResult
 
-	ep, err := url.JoinPath(config.AliasEnsURL, "/resolve")
+	fullURL, err := url.JoinPath(config.AliasResolverURL, alias)
 	if err != nil {
 		return nil, err
 	}
 
-	u, err := url.Parse(ep)
+	req, err := http.NewRequest("GET", fullURL, 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
+
+	return &models.AliasAddress{Address: aliasEnsResult.Address}, nil
 }
 
+func (as *HTTPAccountService) FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error) {
+	svc := dev.NewDevAccountService(ctx, as.SS)
+	if as.UseApi {
+		return fetchCustodialTopPools(ctx)
+	} else {
+		return svc.FetchTopPools(ctx)
+	}
+}
+
+func fetchCustodialTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error) {
+	var r struct {
+		TopPools []dataserviceapi.PoolDetails `json:"topPools"`
+	}
+
+	req, err := http.NewRequest("GET", config.TopPoolsURL, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = doRequest(ctx, req, &r)
+	return r.TopPools, nil
+}
+
+func (as *HTTPAccountService) RetrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error) {
+	if as.UseApi {
+		return retrievePoolDetails(ctx, sym)
+	} else {
+		return nil, nil
+	}
+}
+
+func retrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error) {
+	var r struct {
+		PoolDetails dataserviceapi.PoolDetails `json:"poolDetails"`
+	}
+
+	ep, err := url.JoinPath(config.RetrievePoolDetailsURL, sym)
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequest("GET", ep, nil)
+	if err != nil {
+		return nil, err
+	}
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	return &r.PoolDetails, nil
+}
+
+func (as *HTTPAccountService) PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error) {
+	var r models.PoolDepositResult
+
+	//pool deposit payload
+	payload := map[string]string{
+		"amount":       amount,
+		"from":         from,
+		"poolAddress":  poolAddress,
+		"tokenAddress": tokenAddress,
+	}
+
+	payloadBytes, err := json.Marshal(payload)
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequest("POST", config.TokenTransferURL, bytes.NewBuffer(payloadBytes))
+	if err != nil {
+		return nil, err
+	}
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+	return &r, nil
+}
+
+func (as *HTTPAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {
+	var r models.PoolSwapQuoteResult
+
+	//pool swap quote payload
+	payload := map[string]string{
+		"amount":           amount,
+		"from":             from,
+		"fromTokenAddress": fromTokenAddress,
+		"poolAddress":      poolAddress,
+		"toTokenAddress":   toTokenAddress,
+	}
+
+	payloadBytes, err := json.Marshal(payload)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", config.PoolSwapQuoteURL, bytes.NewBuffer(payloadBytes))
+	if err != nil {
+		return nil, err
+	}
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+	return &r, nil
+}
+
+func (as *HTTPAccountService) GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
+	if as.UseApi {
+		return as.getPoolSwappableFromVouchers(ctx, poolAddress, publicKey)
+	} else {
+		svc := dev.NewDevAccountService(ctx, as.SS)
+		return svc.GetPoolSwappableFromVouchers(ctx, poolAddress, publicKey)
+	}
+}
+
+func (as *HTTPAccountService) getPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
+	var r struct {
+		PoolSwappableVouchers []dataserviceapi.TokenHoldings `json:"filtered"`
+	}
+	ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "from", publicKey)
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequest("GET", ep, nil)
+	if err != nil {
+		return nil, err
+	}
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	// Normalize symbols before returning
+	for i := range r.PoolSwappableVouchers {
+		r.PoolSwappableVouchers[i].TokenSymbol = sanitizeSymbol(r.PoolSwappableVouchers[i].TokenSymbol)
+	}
+
+	return r.PoolSwappableVouchers, nil
+}
+
+func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
+	svc := dev.NewDevAccountService(ctx, as.SS)
+	if as.UseApi {
+		return as.getPoolSwappableVouchers(ctx, poolAddress)
+	} else {
+		return svc.GetPoolSwappableVouchers(ctx, poolAddress)
+	}
+}
+
+func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
+	var r struct {
+		PoolSwappableVouchers []dataserviceapi.TokenHoldings `json:"filtered"`
+	}
+
+	basePath, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "to")
+	if err != nil {
+		return nil, err
+	}
+
+	parsedURL, err := url.Parse(basePath)
+	if err != nil {
+		return nil, err
+	}
+
+	query := parsedURL.Query()
+	if config.IncludeStablesParam != "" {
+		query.Set("stables", config.IncludeStablesParam)
+	}
+	parsedURL.RawQuery = query.Encode()
+
+	req, err := http.NewRequest("GET", parsedURL.String(), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	// Normalize symbols before returning
+	for i := range r.PoolSwappableVouchers {
+		r.PoolSwappableVouchers[i].TokenSymbol = sanitizeSymbol(r.PoolSwappableVouchers[i].TokenSymbol)
+	}
+
+	return r.PoolSwappableVouchers, nil
+}
+
+func (as *HTTPAccountService) PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error) {
+	var r models.PoolSwapResult
+
+	//swap payload
+	payload := map[string]string{
+		"amount":           amount,
+		"from":             from,
+		"fromTokenAddress": fromTokenAddress,
+		"poolAddress":      poolAddress,
+		"toTokenAddress":   toTokenAddress,
+	}
+
+	payloadBytes, err := json.Marshal(payload)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", config.PoolSwapURL, bytes.NewBuffer(payloadBytes))
+	if err != nil {
+		return nil, err
+	}
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+	return &r, nil
+}
+
+func (as *HTTPAccountService) GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) {
+	if as.UseApi {
+		return as.getSwapFromTokenMaxLimit(ctx, poolAddress, fromTokenAddress, toTokenAddress, publicKey)
+	} else {
+		svc := dev.NewDevAccountService(ctx, as.SS)
+		return svc.GetSwapFromTokenMaxLimit(ctx, poolAddress, fromTokenAddress, toTokenAddress, publicKey)
+	}
+}
+
+func (as *HTTPAccountService) getSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) {
+	var r models.MaxLimitResult
+
+	ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "limit", fromTokenAddress, toTokenAddress, publicKey)
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequest("GET", ep, nil)
+	if err != nil {
+		return nil, err
+	}
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	return &r, nil
+}
+
+func (as *HTTPAccountService) CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
+	if as.UseApi {
+		return as.checkTokenInPool(ctx, poolAddress, tokenAddress)
+	} else {
+		svc := dev.NewDevAccountService(ctx, as.SS)
+		return svc.CheckTokenInPool(ctx, poolAddress, tokenAddress)
+	}
+}
+
+func (as *HTTPAccountService) checkTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
+	var r models.TokenInPoolResult
+
+	ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "check", tokenAddress)
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequest("GET", ep, nil)
+	if err != nil {
+		return nil, err
+	}
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	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) {
 	if as.SS == nil {
 		return nil, fmt.Errorf("The storage service cannot be nil")
@@ -285,11 +589,9 @@ func (as *HTTPAccountService) RequestAlias(ctx context.Context, publicKey string
 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)
+	endpoint := config.AliasRegistrationURL
+
+	logg.InfoCtxf(ctx, "requesting alias", "endpoint", endpoint, "hint", hint)
 	//Payload with the address and hint to derive an ENS name
 	payload := map[string]string{
 		"address": publicKey,
@@ -299,7 +601,7 @@ func requestEnsAlias(ctx context.Context, publicKey string, hint string) (*model
 	if err != nil {
 		return nil, err
 	}
-	req, err := http.NewRequest("POST", ep, bytes.NewBuffer(payloadBytes))
+	req, err := http.NewRequest("POST", endpoint, bytes.NewBuffer(payloadBytes))
 	if err != nil {
 		return nil, err
 	}
@@ -313,6 +615,54 @@ func requestEnsAlias(ctx context.Context, publicKey string, hint string) (*model
 	return &r, nil
 }
 
+func (as *HTTPAccountService) UpdateAlias(ctx context.Context, name string, publicKey string) (*models.RequestAliasResult, error) {
+	if as.SS == nil {
+		return nil, fmt.Errorf("The storage service cannot be nil")
+	}
+	if as.UseApi {
+		if !strings.Contains(name, ".") {
+			name = as.ToFqdn(name)
+		}
+		enr, err := updateEnsAlias(ctx, name, publicKey)
+		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, name)
+	}
+}
+
+func updateEnsAlias(ctx context.Context, name string, publicKey string) (*models.AliasEnsResult, error) {
+	var r models.AliasEnsResult
+
+	endpoint := config.AliasUpdateURL
+
+	logg.InfoCtxf(ctx, "updating alias", "endpoint", endpoint, "name", name)
+
+	payload := map[string]string{
+		"name":    name,
+		"address": publicKey,
+	}
+	payloadBytes, err := json.Marshal(payload)
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequest("PUT", endpoint, 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 nil, err
+	}
+	logg.InfoCtxf(ctx, "alias successfully updated", "alias", r.Name)
+	return &r, nil
+}
+
 // SendSMS calls the API to send out an SMS.
 // Parameters:
 //   - inviterPhone: The user initiating the SMS.
@@ -344,14 +694,170 @@ func (as *HTTPAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, i
 	return &r, nil
 }
 
+func (as *HTTPAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
+	ep, err := url.JoinPath(config.ExternalSMSURL, "address")
+	if err != nil {
+		return err
+	}
+	logg.InfoCtxf(ctx, "sending an address sms", "endpoint", ep, "address", publicKey, "origin-phone", originPhone)
+	payload := map[string]string{
+		"address":     publicKey,
+		"originPhone": originPhone,
+	}
+	payloadBytes, err := json.Marshal(payload)
+	if err != nil {
+		return err
+	}
+	req, err := http.NewRequest("POST", ep, bytes.NewBuffer(payloadBytes))
+	if err != nil {
+		return err
+	}
+	_, err = doRequest(ctx, req, nil)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (as *HTTPAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
+	ep, err := url.JoinPath(config.ExternalSMSURL, "pinreset")
+	if err != nil {
+		return err
+	}
+	logg.InfoCtxf(ctx, "sending pin reset sms", "endpoint", ep, "admin", admin, "phone", phone)
+	payload := map[string]string{
+		"admin": admin,
+		"phone": phone,
+	}
+	payloadBytes, err := json.Marshal(payload)
+	if err != nil {
+		return err
+	}
+	req, err := http.NewRequest("POST", ep, bytes.NewBuffer(payloadBytes))
+	if err != nil {
+		return err
+	}
+	_, err = doRequest(ctx, req, nil)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// GetCreditSendMaxLimit calls the API to check credit limits and return the maxRAT and maxSAT
+func (as *HTTPAccountService) GetCreditSendMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.CreditSendLimitsResult, error) {
+	var r models.CreditSendLimitsResult
+
+	ep, err := url.JoinPath(config.CreditSendURL, poolAddress, fromTokenAddress, toTokenAddress, publicKey)
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequest("GET", ep, nil)
+	if err != nil {
+		return nil, err
+	}
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	return &r, nil
+}
+
+// GetCreditSendReverseQuote calls the API to getthe reverse quote for sending RAT amount
+func (as *HTTPAccountService) GetCreditSendReverseQuote(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, toTokenAMount string) (*models.CreditSendReverseQouteResult, error) {
+	var r models.CreditSendReverseQouteResult
+
+	ep, err := url.JoinPath(config.CreditSendReverseQuoteURL, poolAddress, fromTokenAddress, toTokenAddress, toTokenAMount)
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequest("GET", ep, nil)
+	if err != nil {
+		return nil, err
+	}
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	return &r, nil
+}
+
+// MpesaTriggerOnramp calls the API to perform an STK Push.
+// Parameters:
+//   - address: The user's public key.
+//   - phoneNumber: The user's phone number
+//   - asset: the intented USD voucher "USDT | USDC | cUSD"
+//   - amount: The amount in Kenyan shillings
+func (as *HTTPAccountService) MpesaTriggerOnramp(ctx context.Context, address, phoneNumber, asset string, amount int) (*models.MpesaOnrampResponse, error) {
+	var r models.MpesaOnrampResponse
+
+	ctx = context.WithValue(ctx, ctxKeyAuthToken, config.MpesaOnrampBearerToken)
+
+	// Prepare payload
+	payload := struct {
+		Address     string `json:"address"`
+		PhoneNumber string `json:"phoneNumber"`
+		Asset       string `json:"asset"`
+		Amount      int    `json:"amount"`
+	}{
+		Address:     strings.TrimSpace(address),
+		PhoneNumber: strings.TrimSpace(phoneNumber),
+		Asset:       strings.TrimSpace(asset),
+		Amount:      amount,
+	}
+
+	payloadBytes, err := json.Marshal(payload)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal mpesa onramp payload: %w", err)
+	}
+
+	req, err := http.NewRequest("POST", config.MpesaOnrampURL, bytes.NewBuffer(payloadBytes))
+	if err != nil {
+		return nil, err
+	}
+
+	if _, err := doRequest(ctx, req, &r); err != nil {
+		return nil, err
+	}
+
+	return &r, nil
+}
+
+// GetMpesaOnrampRates calls the API to fetch the buying and selling rates for KSH.
+func (as *HTTPAccountService) GetMpesaOnrampRates(ctx context.Context) (*models.MpesaOnrampRatesResponse, error) {
+	var r models.MpesaOnrampRatesResponse
+
+	ctx = context.WithValue(ctx, ctxKeyAuthToken, config.MpesaOnrampBearerToken)
+
+	req, err := http.NewRequest("GET", config.MpresaOnrampRatesURL, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if _, err := doRequest(ctx, req, &r); err != nil {
+		return nil, err
+	}
+
+	return &r, nil
+}
+
 // TODO: remove eth-custodial api dependency
 func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
 	var okResponse api.OKResponse
 	var errResponse api.ErrResponse
 
-	req.Header.Set("Authorization", "Bearer "+config.BearerToken)
+	// Check if a custom Authorization token was provided
+	if token, ok := ctx.Value(ctxKeyAuthToken).(string); ok && token != "" {
+		req.Header.Set("Authorization", "Bearer "+token)
+	} else {
+		req.Header.Set("Authorization", "Bearer "+config.BearerToken)
+	}
+
 	req.Header.Set("Content-Type", "application/json")
 
+	// Log request
 	logRequestDetails(req)
 
 	resp, err := http.DefaultClient.Do(req)
@@ -362,24 +868,32 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
 	}
 	defer resp.Body.Close()
 
-	log.Printf("Received response for %s: Status Code: %d | Content-Type: %s", req.URL, resp.StatusCode, resp.Header.Get("Content-Type"))
+	// Read and log response body
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
+
+	log.Printf("Received response for %s: Status Code: %d | Content-Type: %s | Body: %s",
+		req.URL, resp.StatusCode, resp.Header.Get("Content-Type"), string(body))
+
 	if resp.StatusCode >= http.StatusBadRequest {
-		err := json.Unmarshal([]byte(body), &errResponse)
-		if err != nil {
+		if err := json.Unmarshal(body, &errResponse); err != nil {
 			return nil, err
 		}
-		return nil, errors.New(errResponse.Description)
+
+		return nil, &APIError{
+			Code:        errResponse.ErrCode,
+			Description: errResponse.Description,
+		}
 	}
-	err = json.Unmarshal([]byte(body), &okResponse)
-	if err != nil {
+
+	if err := json.Unmarshal(body, &okResponse); err != nil {
 		return nil, err
 	}
+
 	if len(okResponse.Result) == 0 {
-		return nil, errors.New("Empty api result")
+		return nil, errors.New("empty api result")
 	}
 
 	v, err := json.Marshal(okResponse.Result)
@@ -394,16 +908,14 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
 func logRequestDetails(req *http.Request) {
 	var bodyBytes []byte
 	contentType := req.Header.Get("Content-Type")
+
 	if req.Body != nil {
-		bodyBytes, err := io.ReadAll(req.Body)
-		if err != nil {
-			log.Printf("Error reading request body: %s", err)
-			return
-		}
-		req.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
+		bodyBytes, _ = io.ReadAll(req.Body)
+		req.Body = io.NopCloser(bytes.NewBuffer(bodyBytes)) // Restore body
 	} else {
 		bodyBytes = []byte("-")
 	}
 
-	log.Printf("URL: %s | Content-Type: %s | Method: %s| Request Body: %s", req.URL, contentType, req.Method, string(bodyBytes))
+	log.Printf("Outgoing Request -> URL: %s | Method: %s | Content-Type: %s | Body: %s",
+		req.URL.String(), req.Method, contentType, string(bodyBytes))
 }

testutil/mocks/api_mock.go

@@ -58,6 +58,10 @@ func (m MockApi) RequestAlias(ctx context.Context, publicKey string, hint string
 	return nil, nil
 }
 
+func (m MockApi) UpdateAlias(ctx context.Context, publicKey string, name string) (*models.RequestAliasResult, error) {
+	return nil, nil
+}
+
 func (m MockApi) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
 	return nil, nil
 }

testutil/mocks/service_mock.go

@@ -58,7 +58,85 @@ func (m *MockAccountService) RequestAlias(ctx context.Context, publicKey string,
 	return args.Get(0).(*models.RequestAliasResult), args.Error(1)
 }
 
+func (m *MockAccountService) UpdateAlias(ctx context.Context, publicKey string, name string) (*models.RequestAliasResult, error) {
+	args := m.Called(publicKey, name)
+	return args.Get(0).(*models.RequestAliasResult), args.Error(1)
+}
+
 func (m *MockAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
 	args := m.Called(inviterPhone, inviteePhone)
 	return args.Get(0).(*models.SendSMSResponse), args.Error(1)
 }
+
+func (m *MockAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
+	return nil
+}
+
+func (m *MockAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
+	return nil
+}
+
+func (m MockAccountService) PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error) {
+	args := m.Called(amount, from, poolAddress, tokenAddress)
+	return args.Get(0).(*models.PoolDepositResult), args.Error(1)
+}
+
+func (m MockAccountService) FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error) {
+	args := m.Called()
+	return args.Get(0).([]dataserviceapi.PoolDetails), args.Error(1)
+}
+
+func (m MockAccountService) RetrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error) {
+	args := m.Called()
+	return args.Get(0).(*dataserviceapi.PoolDetails), args.Error(1)
+}
+
+func (m MockAccountService) GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
+	args := m.Called(poolAddress, publicKey)
+	return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
+}
+
+func (m MockAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
+	args := m.Called(poolAddress)
+	return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
+}
+
+func (m MockAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {
+	args := m.Called(amount, from, fromTokenAddress, poolAddress, toTokenAddress)
+	return args.Get(0).(*models.PoolSwapQuoteResult), args.Error(1)
+}
+
+func (m MockAccountService) PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error) {
+	args := m.Called(amount, from, fromTokenAddress, poolAddress, toTokenAddress)
+	return args.Get(0).(*models.PoolSwapResult), args.Error(1)
+}
+
+func (m MockAccountService) GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) {
+	args := m.Called(poolAddress, fromTokenAddress, toTokenAddress, publicKey)
+	return args.Get(0).(*models.MaxLimitResult), args.Error(1)
+}
+
+func (m MockAccountService) CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
+	args := m.Called(poolAddress, tokenAddress)
+	return args.Get(0).(*models.TokenInPoolResult), args.Error(1)
+}
+
+func (m MockAccountService) GetCreditSendMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.CreditSendLimitsResult, error) {
+	args := m.Called(poolAddress, fromTokenAddress, toTokenAddress, publicKey)
+	return args.Get(0).(*models.CreditSendLimitsResult), args.Error(1)
+}
+
+func (m MockAccountService) GetCreditSendReverseQuote(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, toTokenAMount string) (*models.CreditSendReverseQouteResult, error) {
+	args := m.Called(poolAddress, fromTokenAddress, toTokenAddress, toTokenAMount)
+	return args.Get(0).(*models.CreditSendReverseQouteResult), args.Error(1)
+}
+
+func (m MockAccountService) MpesaTriggerOnramp(ctx context.Context, address, phoneNumber, asset string, amount int) (*models.MpesaOnrampResponse, error) {
+	args := m.Called(address, phoneNumber, asset, amount)
+	return args.Get(0).(*models.MpesaOnrampResponse), args.Error(1)
+}
+
+func (m MockAccountService) GetMpesaOnrampRates(ctx context.Context) (*models.MpesaOnrampRatesResponse, error) {
+	args := m.Called()
+	return args.Get(0).(*models.MpesaOnrampRatesResponse), args.Error(1)
+}

testutil/testservice/account_service.go

@@ -8,6 +8,8 @@ import (
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
+// This is used in the menu traversal tests
+
 type TestAccountService struct {
 }
 
@@ -34,11 +36,17 @@ func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey
 
 func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
 	return []dataserviceapi.TokenHoldings{
-		dataserviceapi.TokenHoldings{
-			ContractAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
-			TokenSymbol:     "SRF",
-			TokenDecimals:   "6",
-			Balance:         "2745987",
+		{
+			TokenAddress:  "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
+			TokenSymbol:   "SRF",
+			TokenDecimals: "6",
+			Balance:       "2745987",
+		},
+		{
+			TokenAddress:  "0x3f195a3F68BF4c6D49748eFa033a00C6634fF311",
+			TokenSymbol:   "USD",
+			TokenDecimals: "6",
+			Balance:       "4269100",
 		},
 	}, nil
 }
@@ -57,14 +65,78 @@ func (tas *TestAccountService) TokenTransfer(ctx context.Context, amount, from,
 	}, nil
 }
 
-func (m TestAccountService) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
+func (m TestAccountService) PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error) {
+	return &models.PoolDepositResult{}, nil
+}
+
+func (m *TestAccountService) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
 	return &models.AliasAddress{}, nil
 }
 
-func (m TestAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
+func (m *TestAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
 	return &models.RequestAliasResult{}, nil
 }
 
-func (m TestAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
+func (m *TestAccountService) UpdateAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
+	return &models.RequestAliasResult{}, nil
+}
+
+func (m *TestAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
 	return &models.SendSMSResponse{}, nil
 }
+
+func (m *TestAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
+	return nil
+}
+
+func (m *TestAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
+	return nil
+}
+
+func (m TestAccountService) FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error) {
+	return []dataserviceapi.PoolDetails{}, nil
+}
+
+func (m TestAccountService) RetrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error) {
+	return &dataserviceapi.PoolDetails{}, nil
+}
+
+func (m TestAccountService) GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
+	return []dataserviceapi.TokenHoldings{}, nil
+}
+
+func (m TestAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
+	return []dataserviceapi.TokenHoldings{}, nil
+}
+
+func (m TestAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {
+	return &models.PoolSwapQuoteResult{}, nil
+}
+
+func (m TestAccountService) PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error) {
+	return &models.PoolSwapResult{}, nil
+}
+
+func (m TestAccountService) GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) {
+	return &models.MaxLimitResult{}, nil
+}
+
+func (m TestAccountService) CheckTokenInPool(ctx context.Context, poolAddress, tokenAddress string) (*models.TokenInPoolResult, error) {
+	return &models.TokenInPoolResult{}, nil
+}
+
+func (m TestAccountService) GetCreditSendMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.CreditSendLimitsResult, error) {
+	return &models.CreditSendLimitsResult{}, nil
+}
+
+func (m TestAccountService) GetCreditSendReverseQuote(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, toTokenAMount string) (*models.CreditSendReverseQouteResult, error) {
+	return &models.CreditSendReverseQouteResult{}, nil
+}
+
+func (m TestAccountService) MpesaTriggerOnramp(ctx context.Context, address, phoneNumber, asset string, amount int) (*models.MpesaOnrampResponse, error) {
+	return &models.MpesaOnrampResponse{}, nil
+}
+
+func (m TestAccountService) GetMpesaOnrampRates(ctx context.Context) (*models.MpesaOnrampRatesResponse, error) {
+	return &models.MpesaOnrampRatesResponse{}, nil
+}