Merge branch 'master' into lash/stalecache

.dockerignore

@@ -0,0 +1,13 @@
+/**
+!/cmd/africastalking
+!/common
+!/config
+!/initializers
+!/internal
+!/models
+!/remote
+!/services
+!/LICENSE
+!/README.md
+!/go.*
+!/.env.example

.env.example

@@ -2,6 +2,9 @@
 PORT=7123
 HOST=127.0.0.1
 
+#AfricasTalking USSD POST endpoint
+AT_ENDPOINT=/ussd/africastalking
+
 #PostgreSQL
 DB_HOST=localhost
 DB_USER=postgres
@@ -12,7 +15,6 @@ DB_SSLMODE=disable
 DB_TIMEZONE=Africa/Nairobi
 
 #External API Calls
-CREATE_ACCOUNT_URL=http://localhost:5003/api/v2/account/create
+CUSTODIAL_URL_BASE=http://localhost:5003
-TRACK_STATUS_URL=https://custodial.sarafu.africa/api/track/
+BEARER_TOKEN=eyJeSIsInRcCI6IkpXVCJ.yJwdWJsaWNLZXkiOiIwrrrrrr
-BALANCE_URL=https://custodial.sarafu.africa/api/account/status/
+DATA_URL_BASE=http://localhost:5006
-TRACK_URL=http://localhost:5003/api/v2/account/status

.github/workflows/docker.yaml

@@ -0,0 +1,56 @@
+name: release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Check out repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to GHCR Docker registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set outputs
+        run: |
+          echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV \
+          && echo "RELEASE_SHORT_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+
+      - name: Build and push image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./
+          file: ./Dockerfile
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            BUILD=${{ env.RELEASE_SHORT_COMMIT }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          tags: |
+            ghcr.io/grassrootseconomics/urdt-ussd:latest
+            ghcr.io/grassrootseconomics/urdt-ussd:${{ env.RELEASE_TAG }}

.gitignore

@@ -6,3 +6,4 @@ go.work*
 cmd/.state/
 id_*
 *.gdbm
+*.log

Dockerfile

@@ -0,0 +1,41 @@
+FROM golang:1.23.0-bookworm AS build
+
+ENV CGO_ENABLED=1
+
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM
+ARG BUILD=dev
+
+WORKDIR /build
+COPY . .
+RUN apt update && apt install libgdbm-dev
+RUN git clone https://git.defalsify.org/vise.git go-vise
+
+WORKDIR /build/services/registration
+RUN echo "Compiling go-vise files"
+RUN make VISE_PATH=/build/go-vise -B
+
+WORKDIR /build
+RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
+RUN go mod download
+RUN go build -tags logtrace -o ussd-africastalking -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
+
+FROM debian:bookworm-slim
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && apt install libgdbm-dev ca-certificates -y
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /service
+
+COPY --from=build /build/ussd-africastalking .
+COPY --from=build /build/LICENSE .
+COPY --from=build /build/README.md .
+COPY --from=build /build/services ./services
+COPY --from=build /build/.env.example .
+RUN mv .env.example .env
+
+EXPOSE 7123
+
+CMD ["./ussd-africastalking"]

README.md

@@ -1,8 +1,91 @@
-# ussd
+# URDT USSD service
 
-> USSD
+This is a USSD service built using the [go-vise](https://github.com/nolash/go-vise) engine.
 
-USSD service.
+## Prerequisites
+### 1. [go-vise](https://github.com/nolash/go-vise)
+
+Set up `go-vise` by cloning the repository into a separate directory. The main upstream repository is hosted at: `https://git.defalsify.org/vise.git`
+```
+git clone https://git.defalsify.org/vise.git
+```
+
+## Setup
+1. Clone the ussd repo in its own directory
+
+    ```
+    git clone https://git.grassecon.net/urdt/ussd.git
+    ```
+
+2. Navigate to the project directory.
+3. Enter the `services/registration` subfolder:
+    ```
+    cd services/registration
+    ```
+4. make the .bin files from the .vis files
+    ```
+    make VISE_PATH=/var/path/to/your/go-vise -B
+    ```
+5. Return to the project root (`cd ../..`)
+6. Run the USSD menu 
+    ```
+    go run cmd/main.go -session-id=0712345678
+    ```
+## Running the different binaries
+1. ### CLI: 
+    ```
+    go run cmd/main.go -session-id=0712345678
+    ```
+2. ### Africastalking: 
+    ```
+    go run cmd/africastalking/main.go
+    ```
+3. ### Async: 
+    ```
+    go run cmd/async/main.go
+    ```
+4. ### Http: 
+    ```
+    go run cmd/http/main.go
+    ```
+    
+## Flags
+Below are the supported flags:
+
+1. `-session-id`: 
+    
+    Specifies the session ID. (CLI only). 
+    
+    Default: `075xx2123`.
+
+    Example:
+    ```
+    go run cmd/main.go -session-id=0712345678
+    ```
+
+2. `-d`: 
+
+    Enables engine debug output. 
+    
+    Default: `false`.
+
+    Example:
+    ```
+    go run cmd/main.go -session-id=0712345678 -d
+    ```
+
+3. `-db`: 
+
+    Specifies the database type.
+    
+    Default: `gdbm`.
+
+    Example:
+    ```
+    go run cmd/main.go -session-id=0712345678 -d -db=postgres
+    ```
+
+    >Note: If using `-db=postgres`, ensure PostgreSQL is running with the connection details specified in your `.env` file.
 
 ## License
 

cmd/africastalking/main.go

@@ -1,9 +1,12 @@
 package main
 
 import (
+	"bytes"
 	"context"
+	"encoding/json"
 	"flag"
 	"fmt"
+	"io"
 	"net/http"
 	"os"
 	"os/signal"
@@ -16,17 +19,20 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 
+	"git.grassecon.net/urdt/ussd/common"
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 	"git.grassecon.net/urdt/ussd/internal/storage"
+	"git.grassecon.net/urdt/ussd/remote"
 )
 
 var (
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
+
+	build = "dev"
 )
 
 func init() {
@@ -38,9 +44,30 @@ type atRequestParser struct{}
 func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
 	rqv, ok := rq.(*http.Request)
 	if !ok {
+		logg.Warnf("got an invalid request", "req", rq)
 		return "", handlers.ErrInvalidRequest
 	}
+
+	// Capture body (if any) for logging
+	body, err := io.ReadAll(rqv.Body)
+	if err != nil {
+		logg.Warnf("failed to read request body", "err", err)
+		return "", fmt.Errorf("failed to read request body: %v", err)
+	}
+	// Reset the body for further reading
+	rqv.Body = io.NopCloser(bytes.NewReader(body))
+
+	// Log the body as JSON
+	bodyLog := map[string]string{"body": string(body)}
+	logBytes, err := json.Marshal(bodyLog)
+	if err != nil {
+		logg.Warnf("failed to marshal request body", "err", err)
+	} else {
+		logg.Debugf("received request", "bytes", logBytes)
+	}
+
 	if err := rqv.ParseForm(); err != nil {
+		logg.Warnf("failed to parse form data", "err", err)
 		return "", fmt.Errorf("failed to parse form data: %v", err)
 	}
 
@@ -49,7 +76,13 @@ func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
 		return "", fmt.Errorf("no phone number found")
 	}
 
-	return phoneNumber, nil
+	formattedNumber, err := common.FormatPhoneNumber(phoneNumber)
+	if err != nil {
+		logg.Warnf("failed to format phone number", "err", err)
+		return "", fmt.Errorf("failed to format number")
+	}
+
+	return formattedNumber, nil
 }
 
 func (arp *atRequestParser) GetInput(rq any) ([]byte, error) {
@@ -90,7 +123,7 @@ func main() {
 	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
 	flag.Parse()
 
-	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
+	logg.Infof("start command", "build", build, "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "Database", database)
@@ -131,7 +164,11 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
 	lhs.SetDataStore(&userdataStore)
 
 	if err != nil {
@@ -139,7 +176,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := server.AccountService{}
+	accountService := remote.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@@ -156,9 +193,13 @@ func main() {
 	rp := &atRequestParser{}
 	bsh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
 	sh := httpserver.NewATSessionHandler(bsh)
+
+	mux := http.NewServeMux()
+	mux.Handle(initializers.GetEnv("AT_ENDPOINT", "/"), sh)
+
 	s := &http.Server{
 		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
-		Handler: sh,
+		Handler: mux,
 	}
 	s.RegisterOnShutdown(sh.Shutdown)
 

cmd/async/main.go

@@ -16,8 +16,8 @@ import (
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/storage"
+	"git.grassecon.net/urdt/ussd/remote"
 )
 
 var (
@@ -104,9 +104,9 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
-	accountService := server.AccountService{}
+	accountService := remote.AccountService{}
 
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {

cmd/http/main.go

@@ -18,9 +18,9 @@ import (
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 	"git.grassecon.net/urdt/ussd/internal/storage"
+	"git.grassecon.net/urdt/ussd/remote"
 )
 
 var (
@@ -92,14 +92,15 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
 
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	accountService := server.AccountService{}
+
+	accountService := remote.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())

cmd/main.go

@@ -13,8 +13,8 @@ import (
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/storage"
+	"git.grassecon.net/urdt/ussd/remote"
 )
 
 var (
@@ -88,7 +88,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdatastore)
 	lhs.SetPersister(pe)
 
@@ -97,7 +97,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := server.AccountService{}
+	accountService := remote.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())

common/db.go

@@ -0,0 +1,130 @@
+package common
+
+import (
+	"encoding/binary"
+	"errors"
+
+	"git.defalsify.org/vise.git/logging"
+)
+
+// DataType is a subprefix value used in association with vise/db.DATATYPE_USERDATA. 
+//
+// All keys are used only within the context of a single account. Unless otherwise specified, the user context is the session id.
+//
+// * The first byte is vise/db.DATATYPE_USERDATA
+// * The last 2 bytes are the DataTyp value, big-endian.
+// * The intermediate bytes are the id of the user context.
+//
+// All values are strings
+type DataTyp uint16
+
+const (
+	// API Tracking id to follow status of account creation
+	DATA_TRACKING_ID = iota
+	// EVM address returned from API on account creation
+	DATA_PUBLIC_KEY
+	// Currently active PIN used to authenticate ussd state change requests
+	DATA_ACCOUNT_PIN
+	// The first name of the user
+	DATA_FIRST_NAME
+	// The last name of the user
+	DATA_FAMILY_NAME
+	// The year-of-birth of the user
+	DATA_YOB
+	// The location of the user
+	DATA_LOCATION
+	// The gender of the user
+	DATA_GENDER
+	// The offerings description of the user
+	DATA_OFFERINGS
+	// The ethereum address of the recipient of an ongoing send request
+	DATA_RECIPIENT
+	// The voucher value amount of an ongoing send request
+	DATA_AMOUNT
+	// A general swap field for temporary values
+	DATA_TEMPORARY_VALUE
+	// Currently active voucher symbol of user
+	DATA_ACTIVE_SYM
+	// Voucher balance of user's currently active voucher
+	DATA_ACTIVE_BAL
+	// String boolean indicating whether use of PIN is blocked
+	DATA_BLOCKED_NUMBER
+	// Reverse mapping of a user's evm address to a session id.
+	DATA_PUBLIC_KEY_REVERSE
+	// Decimal count of the currently active voucher
+	DATA_ACTIVE_DECIMAL
+	// EVM address of the currently active voucher
+	DATA_ACTIVE_ADDRESS
+)
+
+const (
+	// List of valid voucher symbols in the user context.
+	DATA_VOUCHER_SYMBOLS DataTyp = 256 + iota
+	// List of voucher balances for vouchers valid in the user context.
+	DATA_VOUCHER_BALANCES
+	// List of voucher decimal counts for vouchers valid in the user context.
+	DATA_VOUCHER_DECIMALS
+	// List of voucher EVM addresses for vouchers valid in the user context.
+	DATA_VOUCHER_ADDRESSES
+	// List of senders for valid transactions in the user context.
+)
+
+const (
+	DATA_TX_SENDERS = 512 + iota
+	// List of recipients for valid transactions in the user context.
+	DATA_TX_RECIPIENTS
+	// List of voucher values for valid transactions in the user context.
+	DATA_TX_VALUES
+	// List of voucher EVM addresses for valid transactions in the user context.
+	DATA_TX_ADDRESSES
+	// List of valid transaction hashes in the user context.
+	DATA_TX_HASHES
+	// List of transaction dates for valid transactions in the user context.
+	DATA_TX_DATES
+	// List of voucher symbols for valid transactions in the user context.
+	DATA_TX_SYMBOLS
+	// List of voucher decimal counts for valid transactions in the user context.
+	DATA_TX_DECIMALS
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("urdt-common")
+)
+
+func typToBytes(typ DataTyp) []byte {
+	var b [2]byte
+	binary.BigEndian.PutUint16(b[:], uint16(typ))
+	return b[:]
+}
+
+func PackKey(typ DataTyp, data []byte) []byte {
+	v := typToBytes(typ)
+	return append(v, data...)
+}
+
+func StringToDataTyp(str string) (DataTyp, error) {
+	switch str {
+	case "DATA_FIRST_NAME":
+		return DATA_FIRST_NAME, nil
+	case "DATA_FAMILY_NAME":
+		return DATA_FAMILY_NAME, nil
+	case "DATA_YOB":
+		return DATA_YOB, nil
+	case "DATA_LOCATION":
+		return DATA_LOCATION, nil
+	case "DATA_GENDER":
+		return DATA_GENDER, nil
+	case "DATA_OFFERINGS":
+		return DATA_OFFERINGS, nil
+
+	default:
+		return 0, errors.New("invalid DataTyp string")
+	}
+}
+
+// ToBytes converts DataTyp or int to a byte slice
+func ToBytes[T ~uint16 | int](value T) []byte {
+	bytes := make([]byte, 2)
+	binary.BigEndian.PutUint16(bytes, uint16(value))
+	return bytes
+}

common/hex.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"encoding/hex"
+	"strings"
 )
 
 func NormalizeHex(s string) (string, error) {
@@ -16,3 +17,15 @@ func NormalizeHex(s string) (string, error) {
 	}
 	return hex.EncodeToString(r), nil
 }
+
+func IsSameHex(left string, right string) bool {
+	bl, err := NormalizeHex(left)
+	if err != nil {
+		return false
+	}
+	br, err := NormalizeHex(left)
+	if err != nil {
+		return false
+	}
+	return strings.Compare(bl, br) == 0
+}

common/recipient.go

@@ -0,0 +1,73 @@
+package common
+
+import (
+	"errors"
+	"fmt"
+	"regexp"
+	"strings"
+)
+
+// Define the regex patterns as constants
+const (
+	phoneRegex   = `^(?:\+254|254|0)?((?:7[0-9]{8})|(?:1[01][0-9]{7}))$`
+	addressRegex = `^0x[a-fA-F0-9]{40}$`
+	aliasRegex   = `^[a-zA-Z0-9]+$`
+)
+
+// IsValidPhoneNumber checks if the given number is a valid phone number
+func IsValidPhoneNumber(phonenumber string) bool {
+	match, _ := regexp.MatchString(phoneRegex, phonenumber)
+	return match
+}
+
+// IsValidAddress checks if the given address is a valid Ethereum address
+func IsValidAddress(address string) bool {
+	match, _ := regexp.MatchString(addressRegex, address)
+	return match
+}
+
+// IsValidAlias checks if the alias is a valid alias format
+func IsValidAlias(alias string) bool {
+	match, _ := regexp.MatchString(aliasRegex, alias)
+	return match
+}
+
+// CheckRecipient validates the recipient format based on the criteria
+func CheckRecipient(recipient string) (string, error) {
+	if IsValidPhoneNumber(recipient) {
+		return "phone number", nil
+	}
+
+	if IsValidAddress(recipient) {
+		return "address", nil
+	}
+
+	if IsValidAlias(recipient) {
+		return "alias", nil
+	}
+
+	return "", fmt.Errorf("invalid recipient: must be a phone number, address or alias")
+}
+
+// FormatPhoneNumber formats a Kenyan phone number to "+254xxxxxxxx".
+func FormatPhoneNumber(phone string) (string, error) {
+	if !IsValidPhoneNumber(phone) {
+		return "", errors.New("invalid phone number")
+	}
+
+	// Remove any leading "+" and spaces
+	phone = strings.TrimPrefix(phone, "+")
+	phone = strings.ReplaceAll(phone, " ", "")
+
+	// Replace leading "0" with "254" if present
+	if strings.HasPrefix(phone, "0") {
+		phone = "254" + phone[1:]
+	}
+
+	// Add "+" if not already present
+	if !strings.HasPrefix(phone, "254") {
+		return "", errors.New("unexpected format")
+	}
+
+	return "+" + phone, nil
+}

common/storage.go

@@ -0,0 +1,52 @@
+package common
+
+import (
+	"context"
+	"errors"
+
+	"git.defalsify.org/vise.git/db"
+	"git.defalsify.org/vise.git/resource"
+	"git.defalsify.org/vise.git/persist"
+	"git.grassecon.net/urdt/ussd/internal/storage"
+)
+
+func StoreToDb(store *UserDataStore) db.Db {
+	return store.Db
+}
+
+func StoreToPrefixDb(store *UserDataStore, pfx []byte) storage.PrefixDb {
+	return storage.NewSubPrefixDb(store.Db, pfx)	
+}
+
+type StorageServices interface {
+	GetPersister(ctx context.Context) (*persist.Persister, error)
+	GetUserdataDb(ctx context.Context) (db.Db, error)
+	GetResource(ctx context.Context) (resource.Resource, error)
+	EnsureDbDir() error
+}
+
+type StorageService struct {
+	svc *storage.MenuStorageService
+}
+
+func NewStorageService(dbDir string) *StorageService {
+	return &StorageService{
+		svc: storage.NewMenuStorageService(dbDir, ""),
+	}
+}
+
+func(ss *StorageService) GetPersister(ctx context.Context) (*persist.Persister, error) {
+	return ss.svc.GetPersister(ctx)
+}
+	
+func(ss *StorageService) GetUserdataDb(ctx context.Context) (db.Db, error) {
+	return ss.svc.GetUserdataDb(ctx)
+}
+
+func(ss *StorageService) GetResource(ctx context.Context) (resource.Resource, error) {
+	return nil, errors.New("not implemented")
+}
+
+func(ss *StorageService) EnsureDbDir() error {
+	return ss.svc.EnsureDbDir()
+}

common/tokens.go

@@ -0,0 +1,81 @@
+package common
+
+import (
+	"context"
+	"errors"
+	"math/big"
+	"reflect"
+	"strconv"
+)
+
+type TransactionData struct {
+	TemporaryValue string
+	ActiveSym      string
+	Amount         string
+	PublicKey      string
+	Recipient      string
+	ActiveDecimal  string
+	ActiveAddress  string
+}
+
+func ParseAndScaleAmount(storedAmount, activeDecimal string) (string, error) {
+	// Parse token decimal
+	tokenDecimal, err := strconv.Atoi(activeDecimal)
+	if err != nil {
+
+		return "", err
+	}
+
+	// Parse amount
+	amount, _, err := big.ParseFloat(storedAmount, 10, 0, big.ToZero)
+	if err != nil {
+		return "", err
+	}
+
+	// Scale the amount
+	multiplier := new(big.Float).SetInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(tokenDecimal)), nil))
+	finalAmount := new(big.Float).Mul(amount, multiplier)
+
+	// Convert finalAmount to a string
+	finalAmountStr := new(big.Int)
+	finalAmount.Int(finalAmountStr)
+
+	return finalAmountStr.String(), nil
+}
+
+func ReadTransactionData(ctx context.Context, store DataStore, sessionId string) (TransactionData, error) {
+	data := TransactionData{}
+	fieldToKey := map[string]DataTyp{
+		"TemporaryValue": DATA_TEMPORARY_VALUE,
+		"ActiveSym":      DATA_ACTIVE_SYM,
+		"Amount":         DATA_AMOUNT,
+		"PublicKey":      DATA_PUBLIC_KEY,
+		"Recipient":      DATA_RECIPIENT,
+		"ActiveDecimal":  DATA_ACTIVE_DECIMAL,
+		"ActiveAddress":  DATA_ACTIVE_ADDRESS,
+	}
+
+	v := reflect.ValueOf(&data).Elem()
+	for fieldName, key := range fieldToKey {
+		field := v.FieldByName(fieldName)
+		if !field.IsValid() || !field.CanSet() {
+			return data, errors.New("invalid struct field: " + fieldName)
+		}
+
+		value, err := readStringEntry(ctx, store, sessionId, key)
+		if err != nil {
+			return data, err
+		}
+		field.SetString(value)
+	}
+
+	return data, nil
+}
+
+func readStringEntry(ctx context.Context, store DataStore, sessionId string, key DataTyp) (string, error) {
+	entry, err := store.ReadEntry(ctx, sessionId, key)
+	if err != nil {
+		return "", err
+	}
+	return string(entry), nil
+}

common/tokens_test.go

@@ -0,0 +1,129 @@
+package common
+
+import (
+	"testing"
+
+	"github.com/alecthomas/assert/v2"
+)
+
+func TestParseAndScaleAmount(t *testing.T) {
+	tests := []struct {
+		name        string
+		amount      string
+		decimals    string
+		want        string
+		expectError bool
+	}{
+		{
+			name:        "whole number",
+			amount:      "123",
+			decimals:    "2",
+			want:        "12300",
+			expectError: false,
+		},
+		{
+			name:        "decimal number",
+			amount:      "123.45",
+			decimals:    "2",
+			want:        "12345",
+			expectError: false,
+		},
+		{
+			name:        "zero decimals",
+			amount:      "123.45",
+			decimals:    "0",
+			want:        "123",
+			expectError: false,
+		},
+		{
+			name:        "large number",
+			amount:      "1000000.01",
+			decimals:    "6",
+			want:        "1000000010000",
+			expectError: false,
+		},
+		{
+			name:        "invalid amount",
+			amount:      "abc",
+			decimals:    "2",
+			want:        "",
+			expectError: true,
+		},
+		{
+			name:        "invalid decimals",
+			amount:      "123.45",
+			decimals:    "abc",
+			want:        "",
+			expectError: true,
+		},
+		{
+			name:        "zero amount",
+			amount:      "0",
+			decimals:    "2",
+			want:        "0",
+			expectError: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := ParseAndScaleAmount(tt.amount, tt.decimals)
+
+			// Check error cases
+			if tt.expectError {
+				if err == nil {
+					t.Errorf("ParseAndScaleAmount(%q, %q) expected error, got nil", tt.amount, tt.decimals)
+				}
+				return
+			}
+
+			if err != nil {
+				t.Errorf("ParseAndScaleAmount(%q, %q) unexpected error: %v", tt.amount, tt.decimals, err)
+				return
+			}
+
+			if got != tt.want {
+				t.Errorf("ParseAndScaleAmount(%q, %q) = %v, want %v", tt.amount, tt.decimals, got, tt.want)
+			}
+		})
+	}
+}
+
+func TestReadTransactionData(t *testing.T) {
+	sessionId := "session123"
+	publicKey := "0X13242618721"
+	ctx, store := InitializeTestDb(t)
+
+	// Test transaction data
+	transactionData := map[DataTyp]string{
+		DATA_TEMPORARY_VALUE: "0712345678",
+		DATA_ACTIVE_SYM:      "SRF",
+		DATA_AMOUNT:          "1000000",
+		DATA_PUBLIC_KEY:      publicKey,
+		DATA_RECIPIENT:       "0x41c188d63Qa",
+		DATA_ACTIVE_DECIMAL:  "6",
+		DATA_ACTIVE_ADDRESS:  "0xd4c288865Ce",
+	}
+
+	// Store the data
+	for key, value := range transactionData {
+		if err := store.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	expectedResult := TransactionData{
+		TemporaryValue: "0712345678",
+		ActiveSym:      "SRF",
+		Amount:         "1000000",
+		PublicKey:      publicKey,
+		Recipient:      "0x41c188d63Qa",
+		ActiveDecimal:  "6",
+		ActiveAddress:  "0xd4c288865Ce",
+	}
+
+	data, err := ReadTransactionData(ctx, store, sessionId)
+
+	assert.NoError(t, err)
+	assert.Equal(t, expectedResult, data)
+}

common/transfer_statements.go

@@ -0,0 +1,119 @@
+package common
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"git.grassecon.net/urdt/ussd/internal/storage"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+)
+
+// TransferMetadata helps organize data fields
+type TransferMetadata struct {
+	Senders        string
+	Recipients     string
+	TransferValues string
+	Addresses      string
+	TxHashes       string
+	Dates          string
+	Symbols        string
+	Decimals       string
+}
+
+// ProcessTransfers converts transfers into formatted strings
+func ProcessTransfers(transfers []dataserviceapi.Last10TxResponse) TransferMetadata {
+	var data TransferMetadata
+	var senders, recipients, transferValues, addresses, txHashes, dates, symbols, decimals []string
+
+	for _, t := range transfers {
+		senders = append(senders, t.Sender)
+		recipients = append(recipients, t.Recipient)
+
+		// Scale down the amount
+		scaledBalance := ScaleDownBalance(t.TransferValue, t.TokenDecimals)
+		transferValues = append(transferValues, scaledBalance)
+
+		addresses = append(addresses, t.ContractAddress)
+		txHashes = append(txHashes, t.TxHash)
+		dates = append(dates, fmt.Sprintf("%s", t.DateBlock))
+		symbols = append(symbols, t.TokenSymbol)
+		decimals = append(decimals, t.TokenDecimals)
+	}
+
+	data.Senders = strings.Join(senders, "\n")
+	data.Recipients = strings.Join(recipients, "\n")
+	data.TransferValues = strings.Join(transferValues, "\n")
+	data.Addresses = strings.Join(addresses, "\n")
+	data.TxHashes = strings.Join(txHashes, "\n")
+	data.Dates = strings.Join(dates, "\n")
+	data.Symbols = strings.Join(symbols, "\n")
+	data.Decimals = strings.Join(decimals, "\n")
+
+	return data
+}
+
+// GetTransferData retrieves and matches transfer data
+// returns a formatted string of the full transaction/statement
+func GetTransferData(ctx context.Context, db storage.PrefixDb, publicKey string, index int) (string, error) {
+	keys := []DataTyp{DATA_TX_SENDERS, DATA_TX_RECIPIENTS, DATA_TX_VALUES, DATA_TX_ADDRESSES, DATA_TX_HASHES, DATA_TX_DATES, DATA_TX_SYMBOLS}
+	data := make(map[DataTyp]string)
+
+	for _, key := range keys {
+		value, err := db.Get(ctx, ToBytes(key))
+		if err != nil {
+			return "", fmt.Errorf("failed to get %s: %v", ToBytes(key), err)
+		}
+		data[key] = string(value)
+	}
+
+	// Split the data
+	senders := strings.Split(string(data[DATA_TX_SENDERS]), "\n")
+	recipients := strings.Split(string(data[DATA_TX_RECIPIENTS]), "\n")
+	values := strings.Split(string(data[DATA_TX_VALUES]), "\n")
+	addresses := strings.Split(string(data[DATA_TX_ADDRESSES]), "\n")
+	hashes := strings.Split(string(data[DATA_TX_HASHES]), "\n")
+	dates := strings.Split(string(data[DATA_TX_DATES]), "\n")
+	syms := strings.Split(string(data[DATA_TX_SYMBOLS]), "\n")
+
+	// Check if index is within range
+	if index < 1 || index > len(senders) {
+		return "", fmt.Errorf("transaction not found: index %d out of range", index)
+	}
+
+	// Adjust for 0-based indexing
+	i := index - 1
+	transactionType := "received"
+	party := fmt.Sprintf("from: %s", strings.TrimSpace(senders[i]))
+	if strings.TrimSpace(senders[i]) == publicKey {
+		transactionType = "sent"
+		party = fmt.Sprintf("to: %s", strings.TrimSpace(recipients[i]))
+	}
+
+	formattedDate := formatDate(strings.TrimSpace(dates[i]))
+
+	// Build the full transaction detail
+	detail := fmt.Sprintf(
+		"%s %s %s\n%s\ncontract address: %s\ntxhash: %s\ndate: %s",
+		transactionType,
+		strings.TrimSpace(values[i]),
+		strings.TrimSpace(syms[i]),
+		party,
+		strings.TrimSpace(addresses[i]),
+		strings.TrimSpace(hashes[i]),
+		formattedDate,
+	)
+
+	return detail, nil
+}
+
+// Helper function to format date in desired output
+func formatDate(dateStr string) string {
+	parsedDate, err := time.Parse("2006-01-02 15:04:05 -0700 MST", dateStr)
+	if err != nil {
+		fmt.Println("Error parsing date:", err)
+		return ""
+	}
+	return parsedDate.Format("2006-01-02 03:04:05 PM")
+}

common/user_store.go

@@ -1,4 +1,4 @@
-package utils
+package common
 
 import (
 	"context"
@@ -16,17 +16,19 @@ type UserDataStore struct {
 	db.Db
 }
 
-// ReadEntry retrieves an entry from the store based on the provided parameters.
+// ReadEntry retrieves an entry to the userdata store.
 func (store *UserDataStore) ReadEntry(ctx context.Context, sessionId string, typ DataTyp) ([]byte, error) {
 	store.SetPrefix(db.DATATYPE_USERDATA)
 	store.SetSession(sessionId)
-	k := PackKey(typ, []byte(sessionId))
+	k := ToBytes(typ)
 	return store.Get(ctx, k)
 }
 
+// WriteEntry adds an entry to the userdata store.
+// BUG: this uses sessionId twice
 func (store *UserDataStore) WriteEntry(ctx context.Context, sessionId string, typ DataTyp, value []byte) error {
 	store.SetPrefix(db.DATATYPE_USERDATA)
 	store.SetSession(sessionId)
-	k := PackKey(typ, []byte(sessionId))
+	k := ToBytes(typ)
 	return store.Put(ctx, k, value)
 }

common/vouchers.go

@@ -1,8 +1,9 @@
-package utils
+package common
 
 import (
 	"context"
 	"fmt"
+	"math/big"
 	"strings"
 
 	"git.grassecon.net/urdt/ussd/internal/storage"
@@ -24,7 +25,11 @@ func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
 
 	for i, h := range holdings {
 		symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, h.TokenSymbol))
-		balances = append(balances, fmt.Sprintf("%d:%s", i+1, h.Balance))
+
+		// Scale down the balance
+		scaledBalance := ScaleDownBalance(h.Balance, h.TokenDecimals)
+
+		balances = append(balances, fmt.Sprintf("%d:%s", i+1, scaledBalance))
 		decimals = append(decimals, fmt.Sprintf("%d:%s", i+1, h.TokenDecimals))
 		addresses = append(addresses, fmt.Sprintf("%d:%s", i+1, h.ContractAddress))
 	}
@@ -37,24 +42,45 @@ func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
 	return data
 }
 
+func ScaleDownBalance(balance, decimals string) string {
+	// Convert balance and decimals to big.Float
+	bal := new(big.Float)
+	bal.SetString(balance)
+
+	dec, ok := new(big.Int).SetString(decimals, 10)
+	if !ok {
+		dec = big.NewInt(0) // Default to 0 decimals in case of conversion failure
+	}
+
+	divisor := new(big.Float).SetInt(new(big.Int).Exp(big.NewInt(10), dec, nil))
+	scaledBalance := new(big.Float).Quo(bal, divisor)
+
+	// Return the scaled balance without trailing decimals if it's an integer
+	if scaledBalance.IsInt() {
+		return scaledBalance.Text('f', 0)
+	}
+	return scaledBalance.Text('f', -1)
+}
+
 // GetVoucherData retrieves and matches voucher data
 func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
-	keys := []string{"sym", "bal", "deci", "addr"}
+	keys := []DataTyp{DATA_VOUCHER_SYMBOLS, DATA_VOUCHER_BALANCES, DATA_VOUCHER_DECIMALS, DATA_VOUCHER_ADDRESSES}
-	data := make(map[string]string)
+	data := make(map[DataTyp]string)
 
 	for _, key := range keys {
-		value, err := db.Get(ctx, []byte(key))
+		value, err := db.Get(ctx, ToBytes(key))
 		if err != nil {
-			return nil, fmt.Errorf("failed to get %s: %v", key, err)
+			return nil, fmt.Errorf("failed to get %s: %v", ToBytes(key), err)
 		}
 		data[key] = string(value)
 	}
 
 	symbol, balance, decimal, address := MatchVoucher(input,
-		data["sym"],
+		data[DATA_VOUCHER_SYMBOLS],
-		data["bal"],
+		data[DATA_VOUCHER_BALANCES],
-		data["deci"],
+		data[DATA_VOUCHER_DECIMALS],
-		data["addr"])
+		data[DATA_VOUCHER_ADDRESSES],
+	)
 
 	if symbol == "" {
 		return nil, nil
@@ -75,9 +101,10 @@ func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol,
 	decList := strings.Split(decimals, "\n")
 	addrList := strings.Split(addresses, "\n")
 
+	logg.Tracef("found", "symlist", symList, "syms", symbols, "input", input)
 	for i, sym := range symList {
 		parts := strings.SplitN(sym, ":", 2)
-	
+
 		if input == parts[0] || strings.EqualFold(input, parts[1]) {
 			symbol = parts[1]
 			if i < len(balList) {
@@ -97,51 +124,37 @@ func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol,
 
 // StoreTemporaryVoucher saves voucher metadata as temporary entries in the DataStore.
 func StoreTemporaryVoucher(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
-	entries := map[DataTyp][]byte{
+	tempData := fmt.Sprintf("%s,%s,%s,%s", data.TokenSymbol, data.Balance, data.TokenDecimals, data.ContractAddress)
-		DATA_TEMPORARY_SYM:     []byte(data.TokenSymbol),
+
-		DATA_TEMPORARY_BAL:     []byte(data.Balance),
+	if err := store.WriteEntry(ctx, sessionId, DATA_TEMPORARY_VALUE, []byte(tempData)); err != nil {
-		DATA_TEMPORARY_DECIMAL: []byte(data.TokenDecimals),
+		return err
-		DATA_TEMPORARY_ADDRESS: []byte(data.ContractAddress),
 	}
 
-	for key, value := range entries {
-		if err := store.WriteEntry(ctx, sessionId, key, value); err != nil {
-			return err
-		}
-	}
 	return nil
 }
 
 // GetTemporaryVoucherData retrieves temporary voucher metadata from the DataStore.
 func GetTemporaryVoucherData(ctx context.Context, store DataStore, sessionId string) (*dataserviceapi.TokenHoldings, error) {
-	keys := []DataTyp{
+	temp_data, err := store.ReadEntry(ctx, sessionId, DATA_TEMPORARY_VALUE)
-		DATA_TEMPORARY_SYM,
+	if err != nil {
-		DATA_TEMPORARY_BAL,
+		return nil, err
-		DATA_TEMPORARY_DECIMAL,
-		DATA_TEMPORARY_ADDRESS,
 	}
 
+	values := strings.SplitN(string(temp_data), ",", 4)
+
 	data := &dataserviceapi.TokenHoldings{}
-	values := make([][]byte, len(keys))
 
-	for i, key := range keys {
+	data.TokenSymbol = values[0]
-		value, err := store.ReadEntry(ctx, sessionId, key)
+	data.Balance = values[1]
-		if err != nil {
+	data.TokenDecimals = values[2]
-			return nil, err
+	data.ContractAddress = values[3]
-		}
-		values[i] = value
-	}
-
-	data.TokenSymbol = string(values[0])
-	data.Balance = string(values[1])
-	data.TokenDecimals = string(values[2])
-	data.ContractAddress = string(values[3])
 
 	return data, nil
 }
 
-// UpdateVoucherData sets the active voucher data in the DataStore.
+// UpdateVoucherData updates the active voucher data in the DataStore.
 func UpdateVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
+	logg.TraceCtxf(ctx, "dtal", "data", data)
 	// Active voucher data entries
 	activeEntries := map[DataTyp][]byte{
 		DATA_ACTIVE_SYM:     []byte(data.TokenSymbol),

common/vouchers_test.go

@@ -1,14 +1,16 @@
-package utils
+package common
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
-	"git.grassecon.net/urdt/ussd/internal/storage"
 	"github.com/alecthomas/assert/v2"
 	"github.com/stretchr/testify/require"
 
+	visedb "git.defalsify.org/vise.git/db"
 	memdb "git.defalsify.org/vise.git/db/mem"
+	"git.grassecon.net/urdt/ussd/internal/storage"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
@@ -58,13 +60,13 @@ func TestMatchVoucher(t *testing.T) {
 
 func TestProcessVouchers(t *testing.T) {
 	holdings := []dataserviceapi.TokenHoldings{
-		{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100"},
+		{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100000000"},
-		{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200"},
+		{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200000000"},
 	}
 
 	expectedResult := VoucherMetadata{
 		Symbols:   "1:SRF\n2:MILO",
-		Balances:  "1:100\n2:200",
+		Balances:  "1:100\n2:20000",
 		Decimals:  "1:6\n2:4",
 		Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa",
 	}
@@ -82,19 +84,21 @@ func TestGetVoucherData(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	spdb := storage.NewSubPrefixDb(db, []byte("vouchers"))
+
+	prefix := ToBytes(visedb.DATATYPE_USERDATA)
+	spdb := storage.NewSubPrefixDb(db, prefix)
 
 	// Test voucher data
-	mockData := map[string][]byte{
+	mockData := map[DataTyp][]byte{
-		"sym":  []byte("1:SRF\n2:MILO"),
+		DATA_VOUCHER_SYMBOLS:   []byte("1:SRF\n2:MILO"),
-		"bal":  []byte("1:100\n2:200"),
+		DATA_VOUCHER_BALANCES:  []byte("1:100\n2:200"),
-		"deci": []byte("1:6\n2:4"),
+		DATA_VOUCHER_DECIMALS:  []byte("1:6\n2:4"),
-		"addr": []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
+		DATA_VOUCHER_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
 	}
 
 	// Put the data
 	for key, value := range mockData {
-		err = spdb.Put(ctx, []byte(key), []byte(value))
+		err = spdb.Put(ctx, []byte(ToBytes(key)), []byte(value))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -126,18 +130,11 @@ func TestStoreTemporaryVoucher(t *testing.T) {
 	require.NoError(t, err)
 
 	// Verify stored data
-	expectedEntries := map[DataTyp][]byte{
+	expectedData := fmt.Sprintf("%s,%s,%s,%s", "SRF", "200", "6", "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9")
-		DATA_TEMPORARY_SYM:     []byte("SRF"),
-		DATA_TEMPORARY_BAL:     []byte("200"),
-		DATA_TEMPORARY_DECIMAL: []byte("6"),
-		DATA_TEMPORARY_ADDRESS: []byte("0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9"),
-	}
 
-	for key, expectedValue := range expectedEntries {
+	storedValue, err := store.ReadEntry(ctx, sessionId, DATA_TEMPORARY_VALUE)
-		storedValue, err := store.ReadEntry(ctx, sessionId, key)
+	require.NoError(t, err)
-		require.NoError(t, err)
+	require.Equal(t, expectedData, string(storedValue), "Mismatch for key %v", DATA_TEMPORARY_VALUE)
-		require.Equal(t, expectedValue, storedValue, "Mismatch for key %v", key)
-	}
 }
 
 func TestGetTemporaryVoucherData(t *testing.T) {

config/config.go

@@ -1,18 +1,74 @@
 package config
 
-import "git.grassecon.net/urdt/ussd/initializers"
+import (
+	"net/url"
 
-var (
+	"git.grassecon.net/urdt/ussd/initializers"
-	CreateAccountURL string
-	TrackStatusURL   string
-	BalanceURL       string
-    TrackURL         string
 )
 
-// LoadConfig initializes the configuration values after environment variables are loaded.
+const (
-func LoadConfig() {
+	createAccountPath          = "/api/v2/account/create"
-	CreateAccountURL = initializers.GetEnv("CREATE_ACCOUNT_URL", "http://localhost:5003/api/v2/account/create")
+	trackStatusPath            = "/api/track"
-	TrackStatusURL = initializers.GetEnv("TRACK_STATUS_URL", "https://custodial.sarafu.africa/api/track/")
+	balancePathPrefix          = "/api/account"
-	BalanceURL = initializers.GetEnv("BALANCE_URL", "https://custodial.sarafu.africa/api/account/status/")
+	trackPath                  = "/api/v2/account/status"
-    TrackURL = initializers.GetEnv("TRACK_URL", "http://localhost:5003/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"
+)
+
+var (
+	custodialURLBase string
+	dataURLBase      string
+	BearerToken      string
+)
+
+var (
+	CreateAccountURL    string
+	TrackStatusURL      string
+	BalanceURL          string
+	TrackURL            string
+	TokenTransferURL    string
+	VoucherHoldingsURL  string
+	VoucherTransfersURL string
+	VoucherDataURL      string
+	CheckAliasURL       string
+)
+
+func setBase() error {
+	var err error
+
+	custodialURLBase = initializers.GetEnv("CUSTODIAL_URL_BASE", "http://localhost:5003")
+	dataURLBase = initializers.GetEnv("DATA_URL_BASE", "http://localhost:5006")
+	BearerToken = initializers.GetEnv("BEARER_TOKEN", "")
+
+	_, err = url.JoinPath(custodialURLBase, "/foo")
+	if err != nil {
+		return err
+	}
+	_, err = url.JoinPath(dataURLBase, "/bar")
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// LoadConfig initializes the configuration values after environment variables are loaded.
+func LoadConfig() error {
+	err := setBase()
+	if err != nil {
+		return err
+	}
+	CreateAccountURL, _ = url.JoinPath(custodialURLBase, createAccountPath)
+	TrackStatusURL, _ = url.JoinPath(custodialURLBase, trackStatusPath)
+	BalanceURL, _ = url.JoinPath(custodialURLBase, balancePathPrefix)
+	TrackURL, _ = url.JoinPath(custodialURLBase, trackPath)
+	TokenTransferURL, _ = url.JoinPath(custodialURLBase, tokenTransferPrefix)
+	VoucherHoldingsURL, _ = url.JoinPath(dataURLBase, voucherHoldingsPathPrefix)
+	VoucherTransfersURL, _ = url.JoinPath(dataURLBase, voucherTransfersPathPrefix)
+	VoucherDataURL, _ = url.JoinPath(dataURLBase, voucherDataPathPrefix)
+	CheckAliasURL, _ = url.JoinPath(dataURLBase, AliasPrefix)
+
+	return nil
 }

debug/cap.go

@@ -0,0 +1,5 @@
+package debug
+
+var (
+	DebugCap uint32
+)

debug/db.go

@@ -0,0 +1,84 @@
+package debug
+
+import (
+	"fmt"
+	"encoding/binary"
+
+	"git.grassecon.net/urdt/ussd/common"
+	"git.defalsify.org/vise.git/db"
+)
+
+var (
+	dbTypStr map[common.DataTyp]string = make(map[common.DataTyp]string)
+)
+
+type KeyInfo struct {
+	SessionId string
+	Typ uint8
+	SubTyp common.DataTyp
+	Label string
+	Description string
+}
+
+func (k KeyInfo) String() string {
+	v := uint16(k.SubTyp)
+	s := subTypToString(k.SubTyp)
+	if s == "" {
+		v = uint16(k.Typ)
+		s = typToString(k.Typ)
+	}
+	return fmt.Sprintf("Session Id: %s\nTyp: %s (%d)\n", k.SessionId, s, v)
+}
+
+func ToKeyInfo(k []byte, sessionId string) (KeyInfo, error) {
+	o := KeyInfo{}
+	b := []byte(sessionId)
+
+	if len(k) <= len(b) {
+		return o, fmt.Errorf("storage key missing")
+	}
+
+	o.SessionId = sessionId
+
+	o.Typ = uint8(k[0])
+	k = k[1:]
+	o.SessionId = string(k[:len(b)])
+	k = k[len(b):]
+
+	if o.Typ == db.DATATYPE_USERDATA {
+		if len(k) == 0 {
+			return o, fmt.Errorf("missing subtype key")
+		}
+		v := binary.BigEndian.Uint16(k[:2])
+		o.SubTyp = common.DataTyp(v)
+		o.Label = subTypToString(o.SubTyp)
+		k = k[2:]
+	} else {
+		o.Label = typToString(o.Typ)
+	}
+
+	if len(k) != 0 {
+		return o, fmt.Errorf("excess key information")
+	}
+
+	return o, nil
+}
+
+func FromKey(k []byte) (KeyInfo, error) {
+	o := KeyInfo{}
+
+	if len(k) < 4 {
+		return o, fmt.Errorf("insufficient key length")
+	}
+
+	sessionIdBytes := k[1:len(k)-2]
+	return ToKeyInfo(k, string(sessionIdBytes))
+}
+
+func subTypToString(v common.DataTyp) string {
+	return dbTypStr[v + db.DATATYPE_USERDATA + 1]
+}
+
+func typToString(v uint8) string {
+	return dbTypStr[common.DataTyp(uint16(v))]
+}

debug/db_debug.go

@@ -0,0 +1,48 @@
+// +build debugdb
+
+package debug
+
+import (
+	"git.defalsify.org/vise.git/db"
+
+	"git.grassecon.net/urdt/ussd/common"
+)
+
+func init() {
+	DebugCap |= 1
+	dbTypStr[db.DATATYPE_STATE] = "internal state"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT] = "account"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT_CREATED] = "account created"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TRACKING_ID] = "tracking id"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_PUBLIC_KEY] = "public key"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_CUSTODIAL_ID] = "custodial id"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT_PIN] = "account pin"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT_STATUS] = "account status"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_FIRST_NAME] = "first name"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_FAMILY_NAME] = "family name"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_YOB] = "year of birth"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_LOCATION] = "location"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_GENDER] = "gender"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_OFFERINGS] = "offerings"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_RECIPIENT] = "recipient"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_AMOUNT] = "amount"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TEMPORARY_VALUE] = "temporary value"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACTIVE_SYM] = "active sym"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACTIVE_BAL] = "active bal"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_BLOCKED_NUMBER] = "blocked number"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_PUBLIC_KEY_REVERSE] = "public_key_reverse"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACTIVE_DECIMAL] = "active decimal"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACTIVE_ADDRESS] = "active address"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_VOUCHER_SYMBOLS] = "voucher symbols"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_VOUCHER_BALANCES] = "voucher balances"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_VOUCHER_DECIMALS] = "voucher decimals"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_VOUCHER_ADDRESSES] = "voucher addresses"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_SENDERS] = "tx senders"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_RECIPIENTS] = "tx recipients"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_VALUES] = "tx values"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_ADDRESSES] = "tx addresses"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_HASHES] = "tx hashes"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_DATES] = "tx dates"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_SYMBOLS] = "tx symbols"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_DECIMALS] = "tx decimals"
+}

debug/db_test.go

@@ -0,0 +1,78 @@
+package debug
+
+import (
+	"testing"
+
+	"git.grassecon.net/urdt/ussd/common"
+	"git.defalsify.org/vise.git/db"
+)
+
+func TestDebugDbSubKeyInfo(t *testing.T) {
+	s := "foo"
+	b := []byte{0x20}
+	b = append(b, []byte(s)...)
+	b = append(b, []byte{0x00, 0x02}...)
+	r, err := ToKeyInfo(b, s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if r.SessionId != s {
+		t.Fatalf("expected %s, got %s", s, r.SessionId)
+	}
+	if r.Typ != 32 {
+		t.Fatalf("expected 64, got %d", r.Typ)
+	}
+	if r.SubTyp != 2 {
+		t.Fatalf("expected 2, got %d", r.SubTyp)
+	}
+	if DebugCap & 1 > 0 {
+		if r.Label != "tracking id" {
+			t.Fatalf("expected 'tracking id', got '%s'", r.Label)
+		}
+	}
+}
+
+func TestDebugDbKeyInfo(t *testing.T) {
+	s := "bar"
+	b := []byte{0x10}
+	b = append(b, []byte(s)...)
+	r, err := ToKeyInfo(b, s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if r.SessionId != s {
+		t.Fatalf("expected %s, got %s", s, r.SessionId)
+	}
+	if r.Typ != 16 {
+		t.Fatalf("expected 16, got %d", r.Typ)
+	}
+	if DebugCap & 1 > 0 {
+		if r.Label != "internal state" {
+			t.Fatalf("expected 'internal_state', got '%s'", r.Label)
+		}
+	}
+}
+
+func TestDebugDbKeyInfoRestore(t *testing.T) {
+	s := "bar"
+	b := []byte{db.DATATYPE_USERDATA}
+	b = append(b, []byte(s)...)
+	k := common.ToBytes(common.DATA_ACTIVE_SYM)
+	b = append(b, k...)
+
+	r, err := ToKeyInfo(b, s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if r.SessionId != s {
+		t.Fatalf("expected %s, got %s", s, r.SessionId)
+	}
+	if r.Typ != 32 {
+		t.Fatalf("expected 32, got %d", r.Typ)
+	}
+	if DebugCap & 1 > 0 {
+		if r.Label != "active sym" {
+			t.Fatalf("expected 'active sym', got '%s'", r.Label)
+		}
+	}
+}

dev/dialoguss/sample_user.yaml

@@ -0,0 +1,3 @@
+url: http://localhost:7123
+dial: "*384*96#"
+phoneNumber: +254722123456

dev/docker-compose.yaml

@@ -0,0 +1,21 @@
+services:
+  ussd-pg-store:
+    image: postgres:17-alpine
+    restart: unless-stopped
+    user: postgres
+    environment:
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_USER=postgres
+    volumes:
+      - ./init_db.sql:/docker-entrypoint-initdb.d/init_db.sql
+      - ussd-pg:/var/lib/postgresql/data
+    ports:
+      - "127.0.0.1:5432:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+volumes:
+  ussd-pg:
+    driver: local

dev/init_db.sql

@@ -0,0 +1 @@
+CREATE DATABASE urdt_ussd;

devtools/admin/admin_numbers.json

@@ -0,0 +1,7 @@
+{
+  "admins": [
+    {
+      "phonenumber" : "<replace with any admin number to test with >"
+    }
+   ]
+}

devtools/admin/commands/seed.go

@@ -0,0 +1,47 @@
+package commands
+
+import (
+	"context"
+	"encoding/json"
+	"os"
+
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/urdt/ussd/internal/utils"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("adminstore")
+)
+
+type Admin struct {
+	PhoneNumber string `json:"phonenumber"`
+}
+
+type Config struct {
+	Admins []Admin `json:"admins"`
+}
+
+func Seed(ctx context.Context) error {
+	var config Config
+	adminstore, err := utils.NewAdminStore(ctx, "../admin_numbers")
+	store := adminstore.FsStore
+	if err != nil {
+		return err
+	}
+	defer store.Close()
+	data, err := os.ReadFile("admin_numbers.json")
+	if err != nil {
+		return err
+	}
+	if err := json.Unmarshal(data, &config); err != nil {
+		return err
+	}
+	for _, admin := range config.Admins {
+		err := store.Put(ctx, []byte(admin.PhoneNumber), []byte("1"))
+		if err != nil {
+			logg.Printf(logging.LVL_DEBUG, "Failed to insert admin number", admin.PhoneNumber)
+			return err
+		}
+	}
+	return nil
+}

devtools/admin/main.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"context"
+	"log"
+
+	"git.grassecon.net/urdt/ussd/devtools/admin/commands"
+)
+
+func main() {
+	ctx := context.Background()
+	err := commands.Seed(ctx)
+	if err != nil {
+		log.Fatalf("Failed to initialize a list of admins with error %s", err)
+	}
+
+}

devtools/gen/main.go

@@ -0,0 +1,79 @@
+package main
+
+import (
+	"context"
+	"crypto/sha1"
+	"flag"
+	"fmt"
+	"os"
+	"path"
+
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/urdt/ussd/config"
+	"git.grassecon.net/urdt/ussd/internal/storage"
+	"git.grassecon.net/urdt/ussd/initializers"
+	"git.grassecon.net/urdt/ussd/common"
+)
+
+var (
+	logg      = logging.NewVanilla()
+	scriptDir = path.Join("services", "registration")
+)
+
+func init() {
+	initializers.LoadEnvVariables()
+}
+
+
+func main() {
+	config.LoadConfig()
+
+	var dbDir string
+	var sessionId string
+	var database string
+	var engineDebug bool
+
+	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
+	flag.StringVar(&database, "db", "gdbm", "database to be used")
+	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
+	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.Parse()
+
+	ctx := context.Background()
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
+	ctx = context.WithValue(ctx, "Database", database)
+
+	resourceDir := scriptDir
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
+
+	store, err := menuStorageService.GetUserdataDb(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+	userStore := common.UserDataStore{store}
+
+	h := sha1.New()
+	h.Write([]byte(sessionId))
+	address := h.Sum(nil)
+	addressString := fmt.Sprintf("%x", address)
+
+	err = userStore.WriteEntry(ctx, sessionId, common.DATA_PUBLIC_KEY, []byte(addressString))
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	err = userStore.WriteEntry(ctx, addressString, common.DATA_PUBLIC_KEY_REVERSE, []byte(sessionId))
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	err = store.Close()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+	
+}

devtools/store/main.go

@@ -0,0 +1,78 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"path"
+
+	"git.grassecon.net/urdt/ussd/config"
+	"git.grassecon.net/urdt/ussd/initializers"
+	"git.grassecon.net/urdt/ussd/internal/storage"
+	"git.grassecon.net/urdt/ussd/debug"
+	"git.defalsify.org/vise.git/logging"
+)
+
+var (
+	logg      = logging.NewVanilla()
+	scriptDir = path.Join("services", "registration")
+)
+
+func init() {
+	initializers.LoadEnvVariables()
+}
+
+
+func main() {
+	config.LoadConfig()
+
+	var dbDir string
+	var sessionId string
+	var database string
+	var engineDebug bool
+
+	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
+	flag.StringVar(&database, "db", "gdbm", "database to be used")
+	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
+	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.Parse()
+
+	ctx := context.Background()
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
+	ctx = context.WithValue(ctx, "Database", database)
+
+	resourceDir := scriptDir
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
+
+	store, err := menuStorageService.GetUserdataDb(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	d, err := store.Dump(ctx, []byte(sessionId))
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	for true {
+		k, v := d.Next(ctx)
+		if k == nil {
+			break
+		}
+		o, err := debug.FromKey(k)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, err.Error())
+			os.Exit(1)
+		}
+		fmt.Printf("%vValue: %v\n\n", o, v)
+	}
+
+	err = store.Close()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+}

doc/data.md

@@ -0,0 +1,28 @@
+# Internals
+
+## Version
+
+This document describes component versions:
+
+* `urdt-ussd` `v0.5.0-beta`
+* `go-vise` `v0.2.2`
+
+
+## User profile data
+
+All user profile items are stored under keys matching the user's session id, prefixed with the 8-bit value `git.defalsify.org/vise.git/db.DATATYPE_USERDATA` (32), and followed with a 16-big big-endian value subprefix.
+
+For example, given the sessionId `+254123` and the key `git.grassecon.net/urdt-ussd/common.DATA_PUBLIC_KEY` (2) will be stored under the key:
+
+```
+0x322b3235343132330002
+
+prefix   sessionid       subprefix
+32       2b323534313233  0002
+```
+
+### Sub-prefixes
+
+All sub-prefixes are defined as constants in the `git.grassecon.net/urdt-ussd/common` package. The constant names have the prefix `DATA_`
+
+Please refer to inline godoc documentation for the `git.grassecon.net/urdt-ussd/common` package for details on each data item.

go.mod

@@ -2,29 +2,16 @@ module git.grassecon.net/urdt/ussd
 
 go 1.23.0
 
-toolchain go1.23.2
-
 require (
-	git.defalsify.org/vise.git v0.2.1-0.20241031204035-b588301738ed
+	git.defalsify.org/vise.git v0.2.1-0.20241212145627-683015d4df80
 	github.com/alecthomas/assert/v2 v2.2.2
+	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/grassrootseconomics/eth-custodial v1.3.0-beta
-	github.com/peteole/testdata-loader v0.3.0
+	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta
-	gopkg.in/leonelquinteros/gotext.v1 v1.3.1
-)
-
-require github.com/grassrootseconomics/ussd-data-service v0.0.0-20241003123429-4904b4438a3a
-
-require (
-	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/puddle/v2 v2.2.2 // indirect
 	github.com/joho/godotenv v1.5.1
-	github.com/kr/text v0.2.0 // indirect
+	github.com/peteole/testdata-loader v0.3.0
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
+	github.com/stretchr/testify v1.9.0
-	golang.org/x/crypto v0.27.0 // indirect
+	gopkg.in/leonelquinteros/gotext.v1 v1.3.1
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
 )
 
 require (
@@ -33,13 +20,20 @@ require (
 	github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
-	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // 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/puddle/v2 v2.2.2 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // 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/testify v1.9.0
 	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,5 +1,5 @@
-git.defalsify.org/vise.git v0.2.1-0.20241031204035-b588301738ed h1:4TrsfbK7NKgsa7KjMPlnV/tjYTkAAXP5PWAZzUfzCdI=
+git.defalsify.org/vise.git v0.2.1-0.20241212145627-683015d4df80 h1:GYUVXRUtMpA40T4COeAduoay6CIgXjD5cfDYZOTFIKw=
-git.defalsify.org/vise.git v0.2.1-0.20241031204035-b588301738ed/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.2.1-0.20241212145627-683015d4df80/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
 github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
 github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=
@@ -18,8 +18,8 @@ github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1
 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 v0.0.0-20241003123429-4904b4438a3a h1:q/YH7nE2j8epNmFnTu0tU1vwtCxtQ6nH+d7hRVV5krU=
+github.com/grassrootseconomics/ussd-data-service v1.2.0-beta h1:fn1gwbWIwHVEBtUC2zi5OqTlfI/5gU1SMk0fgGixIXk=
-github.com/grassrootseconomics/ussd-data-service v0.0.0-20241003123429-4904b4438a3a/go.mod h1:hdKaKwqiW6/kphK4j/BhmuRlZDLo1+DYo3gYw5O0siw=
+github.com/grassrootseconomics/ussd-data-service v1.2.0-beta/go.mod h1:omfI0QtUwIdpu9gMcUqLMCG8O1XWjqJGBx1qUMiGWC0=
 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/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=

internal/handlers/base.go

@@ -55,6 +55,9 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 	}
 
 	f.hn = f.hn.WithPersister(rqs.Storage.Persister)
+	defer func() {
+		f.hn.Exit()
+	}()
 	eni := f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
 	en, ok := eni.(*engine.DefaultEngine)
 	if !ok {

internal/handlers/handlerservice.go

@@ -1,13 +1,17 @@
 package handlers
 
 import (
+	"context"
+
 	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
+
 	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
+	"git.grassecon.net/urdt/ussd/internal/utils"
+	"git.grassecon.net/urdt/ussd/remote"
 )
 
 type HandlerService interface {
@@ -28,20 +32,26 @@ type LocalHandlerService struct {
 	DbRs          *resource.DbResource
 	Pe            *persist.Persister
 	UserdataStore *db.Db
+	AdminStore    *utils.AdminStore
 	Cfg           engine.Config
 	Rs            resource.Resource
 }
 
-func NewLocalHandlerService(fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
+func NewLocalHandlerService(ctx context.Context, fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
 	parser, err := getParser(fp, debug)
 	if err != nil {
 		return nil, err
 	}
+	adminstore, err := utils.NewAdminStore(ctx, "admin_numbers")
+	if err != nil {
+		return nil, err
+	}
 	return &LocalHandlerService{
-		Parser: parser,
+		Parser:     parser,
-		DbRs:   dbResource,
+		DbRs:       dbResource,
-		Cfg:    cfg,
+		AdminStore: adminstore,
-		Rs:     rs,
+		Cfg:        cfg,
+		Rs:         rs,
 	}, nil
 }
 
@@ -53,8 +63,8 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 	ls.UserdataStore = db
 }
 
-func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceInterface) (*ussd.Handlers, error) {
+func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceInterface) (*ussd.Handlers, error) {
-	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore,accountService)
+	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore, ls.AdminStore, accountService)
 	if err != nil {
 		return nil, err
 	}
@@ -70,6 +80,7 @@ func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceIn
 	ls.DbRs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
 	ls.DbRs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
 	ls.DbRs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
+	ls.DbRs.AddLocalFunc("invite_valid_recipient", ussdHandlers.InviteValidRecipient)
 	ls.DbRs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
 	ls.DbRs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
 	ls.DbRs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
@@ -92,12 +103,26 @@ func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceIn
 	ls.DbRs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
 	ls.DbRs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
 	ls.DbRs.AddLocalFunc("quit_with_help", ussdHandlers.QuitWithHelp)
-	ls.DbRs.AddLocalFunc("fetch_custodial_balances", ussdHandlers.FetchCustodialBalances)
+	ls.DbRs.AddLocalFunc("fetch_community_balance", ussdHandlers.FetchCommunityBalance)
 	ls.DbRs.AddLocalFunc("set_default_voucher", ussdHandlers.SetDefaultVoucher)
 	ls.DbRs.AddLocalFunc("check_vouchers", ussdHandlers.CheckVouchers)
 	ls.DbRs.AddLocalFunc("get_vouchers", ussdHandlers.GetVoucherList)
 	ls.DbRs.AddLocalFunc("view_voucher", ussdHandlers.ViewVoucher)
 	ls.DbRs.AddLocalFunc("set_voucher", ussdHandlers.SetVoucher)
+	ls.DbRs.AddLocalFunc("get_voucher_details", ussdHandlers.GetVoucherDetails)
+	ls.DbRs.AddLocalFunc("reset_valid_pin", ussdHandlers.ResetValidPin)
+	ls.DbRs.AddLocalFunc("check_pin_mismatch", ussdHandlers.CheckPinMisMatch)
+	ls.DbRs.AddLocalFunc("validate_blocked_number", ussdHandlers.ValidateBlockedNumber)
+	ls.DbRs.AddLocalFunc("retrieve_blocked_number", ussdHandlers.RetrieveBlockedNumber)
+	ls.DbRs.AddLocalFunc("reset_unregistered_number", ussdHandlers.ResetUnregisteredNumber)
+	ls.DbRs.AddLocalFunc("reset_others_pin", ussdHandlers.ResetOthersPin)
+	ls.DbRs.AddLocalFunc("save_others_temporary_pin", ussdHandlers.SaveOthersTemporaryPin)
+	ls.DbRs.AddLocalFunc("get_current_profile_info", ussdHandlers.GetCurrentProfileInfo)
+	ls.DbRs.AddLocalFunc("check_transactions", ussdHandlers.CheckTransactions)
+	ls.DbRs.AddLocalFunc("get_transactions", ussdHandlers.GetTransactionsList)
+	ls.DbRs.AddLocalFunc("view_statement", ussdHandlers.ViewTransactionStatement)
+	ls.DbRs.AddLocalFunc("update_all_profile_items", ussdHandlers.UpdateAllProfileItems)
+	ls.DbRs.AddLocalFunc("set_back", ussdHandlers.SetBack)
 
 	return ussdHandlers, nil
 }

internal/handlers/server/accountservice.go

@@ -1,185 +0,0 @@
-package server
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/internal/models"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
-)
-
-var (
-	okResponse  api.OKResponse
-	errResponse api.ErrResponse
-)
-
-type AccountServiceInterface interface {
-	CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error)
-	CreateAccount(ctx context.Context) (*api.OKResponse, error)
-	CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error)
-	TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error)
-	FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error)
-}
-
-type AccountService struct {
-}
-
-// 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
-//     AccountResponse struct can be used here to check the account status during a transaction.
-//
-// Returns:
-//   - string: The status of the transaction as a string. If there is an error during the request or processing, this will be an empty string.
-//   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
-//     If no error occurs, this will be nil
-func (as *AccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
-	resp, err := http.Get(config.BalanceURL + trackingId)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	var trackResp models.TrackStatusResponse
-	err = json.Unmarshal(body, &trackResp)
-	if err != nil {
-		return nil, err
-	}
-	return &trackResp, nil
-
-}
-
-func (as *AccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error) {
-	var err error
-	// Construct the URL with the path parameter
-	url := fmt.Sprintf("%s/%s", config.TrackURL, publicKey)
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-GE-KEY", "xd")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		errResponse.Description = err.Error()
-		return nil, err
-	}
-	if resp.StatusCode >= http.StatusBadRequest {
-		err := json.Unmarshal([]byte(body), &errResponse)
-		if err != nil {
-			return nil, err
-		}
-		return nil, errors.New(errResponse.Description)
-	}
-	err = json.Unmarshal([]byte(body), &okResponse)
-	if err != nil {
-		return nil, err
-	}
-	if len(okResponse.Result) == 0 {
-		return nil, errors.New("Empty api result")
-	}
-	return &okResponse, nil
-
-}
-
-// 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.
-func (as *AccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error) {
-	resp, err := http.Get(config.BalanceURL + publicKey)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	var balanceResp models.BalanceResponse
-	err = json.Unmarshal(body, &balanceResp)
-	if err != nil {
-		return nil, err
-	}
-	return &balanceResp, nil
-}
-
-// CreateAccount creates a new account in the custodial system.
-// Returns:
-//   - *models.AccountResponse: A pointer to an AccountResponse struct containing the details of the created account.
-//     If there is an error during the request or processing, this will be nil.
-//   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
-//     If no error occurs, this will be nil.
-func (as *AccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
-	var err error
-
-	// Create a new request
-	req, err := http.NewRequest("POST", config.CreateAccountURL, nil)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-GE-KEY", "xd")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		errResponse.Description = err.Error()
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	if resp.StatusCode >= http.StatusBadRequest {
-		err := json.Unmarshal([]byte(body), &errResponse)
-		if err != nil {
-			return nil, err
-		}
-		return nil, errors.New(errResponse.Description)
-	}
-	err = json.Unmarshal([]byte(body), &okResponse)
-	if err != nil {
-		return nil, err
-	}
-	if len(okResponse.Result) == 0 {
-		return nil, errors.New("Empty api result")
-	}
-	return &okResponse, nil
-}
-
-// FetchVouchers retrieves the token holdings for a given public key from the custodial holdings API endpoint
-// Parameters:
-//   - publicKey: The public key associated with the account.
-func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
-	file, err := os.Open("sample_tokens.json")
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-	var holdings models.VoucherHoldingResponse
-
-	if err := json.NewDecoder(file).Decode(&holdings); err != nil {
-		return nil, err
-	}
-	return &holdings, nil
-}

internal/models/accountresponse.go

@@ -1,10 +0,0 @@
-package models
-
-type AccountResponse struct {
-	Ok          bool   `json:"ok"`
-	Description string `json:"description"` // Include the description field
-	Result      struct {
-		PublicKey  string `json:"publicKey"`
-		TrackingId string `json:"trackingId"`
-	} `json:"result"`
-}

internal/models/balanceresponse.go

@@ -1,12 +0,0 @@
-package models
-
-import "encoding/json"
-
-
-type BalanceResponse struct {
-	Ok     bool `json:"ok"`
-	Result struct {
-		Balance string      `json:"balance"`
-		Nonce   json.Number `json:"nonce"`
-	} `json:"result"`
-}

internal/models/tokenresponse.go

@@ -1,18 +0,0 @@
-package models
-
-type ApiResponse struct {
-	OK          bool   `json:"ok"`
-	Description string `json:"description"`
-	Result      Result `json:"result"`
-}
-
-type Result struct {
-	Holdings []Holding `json:"holdings"`
-}
-
-type Holding struct {
-	ContractAddress string `json:"contractAddress"`
-	TokenSymbol     string `json:"tokenSymbol"`
-	TokenDecimals   string `json:"tokenDecimals"`
-	Balance         string `json:"balance"`
-}

internal/models/trackstatusresponse.go

@@ -1,26 +0,0 @@
-package models
-
-import (
-	"encoding/json"
-	"time"
-)
-type Transaction struct {
-	CreatedAt     time.Time   `json:"createdAt"`
-	Status        string      `json:"status"`
-	TransferValue json.Number `json:"transferValue"`
-	TxHash        string      `json:"txHash"`
-	TxType        string      `json:"txType"`
-}
-
-type TrackStatusResponse struct {
-	Ok     bool `json:"ok"`
-	Result struct {
-		Transaction struct {
-			CreatedAt     time.Time   `json:"createdAt"`
-			Status        string      `json:"status"`
-			TransferValue json.Number `json:"transferValue"`
-			TxHash        string      `json:"txHash"`
-			TxType        string      `json:"txType"`
-		}
-	} `json:"result"`
-}

internal/models/vouchersresponse.go

@@ -1,14 +0,0 @@
-package models
-
-import dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
-
-type VoucherHoldingResponse struct {
-	Ok          bool          `json:"ok"`
-	Description string        `json:"description"`
-	Result      VoucherResult `json:"result"`
-}
-
-// VoucherResult holds the list of token holdings
-type VoucherResult struct {
-	Holdings []dataserviceapi.TokenHoldings `json:"holdings"`
-}

internal/storage/gdbm.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/lang"
 	gdbmdb "git.defalsify.org/vise.git/db/gdbm"
+	"git.defalsify.org/vise.git/lang"
 )
 
 var (
@@ -115,3 +115,9 @@ func(tdb *ThreadGdbmDb) Close() error {
 	tdb.db = nil
 	return err
 }
+
+func(tdb *ThreadGdbmDb) Dump(ctx context.Context, key []byte) (*db.Dumper, error) {
+	tdb.reserve()
+	defer tdb.release()
+	return tdb.db.Dump(ctx, key)
+}

internal/storage/storageservice.go

@@ -41,10 +41,13 @@ func buildConnStr() string {
 	dbName := initializers.GetEnv("DB_NAME", "")
 	port := initializers.GetEnv("DB_PORT", "5432")
 
-	return fmt.Sprintf(
+	connString := fmt.Sprintf(
 		"postgres://%s:%s@%s:%s/%s",
 		user, password, host, port, dbName,
 	)
+	logg.Debugf("pg conn string", "conn", connString)
+
+	return connString
 }
 
 func NewMenuStorageService(dbDir string, resourceDir string) *MenuStorageService {

internal/storage/sub_prefix_db.go

@@ -8,9 +8,6 @@ import (
 
 const (
 	DATATYPE_USERSUB = 64
-)
-
-const (
 	SUBPREFIX_TIME = uint16(1)
 )
 
@@ -43,13 +40,13 @@ func(s *SubPrefixDb) toKey(k []byte) []byte {
 }
 
 func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
-	s.store.SetPrefix(DATATYPE_USERSUB)
+	s.store.SetPrefix(db.DATATYPE_USERDATA)
 	key = s.toKey(key)
 	return s.store.Get(ctx, key)
 }
 
 func (s *SubPrefixDb) Put(ctx context.Context, key []byte, val []byte) error {
-	s.store.SetPrefix(DATATYPE_USERSUB)
+	s.store.SetPrefix(db.DATATYPE_USERDATA)
 	key = s.toKey(key)
 	return s.store.Put(ctx, key, val)
 }

internal/testutil/TestEngine.go

@@ -11,11 +11,11 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 	"git.grassecon.net/urdt/ussd/internal/testutil/testservice"
 	"git.grassecon.net/urdt/ussd/internal/testutil/testtag"
 	testdataloader "github.com/peteole/testdata-loader"
+	"git.grassecon.net/urdt/ussd/remote"
 )
 
 var (
@@ -73,7 +73,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userDataStore)
 	lhs.SetPersister(pe)
 
@@ -83,7 +83,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 	}
 
 	if testtag.AccountService == nil {
-		testtag.AccountService = &server.AccountService{}
+		testtag.AccountService = &remote.AccountService{}
 	}
 
 	switch testtag.AccountService.(type) {
@@ -91,7 +91,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		go func() {
 			eventChannel <- false
 		}()
-	case *server.AccountService:
+	case *remote.AccountService:
 		go func() {
 			time.Sleep(5 * time.Second) // Wait for 5 seconds
 			eventChannel <- true

internal/testutil/mocks/dbmock.go

@@ -1,59 +0,0 @@
-package mocks
-
-import (
-	"context"
-
-	"git.defalsify.org/vise.git/lang"
-	"github.com/stretchr/testify/mock"
-)
-
-type MockDb struct {
-	mock.Mock
-}
-
-func (m *MockDb) SetPrefix(prefix uint8) {
-	m.Called(prefix)
-}
-
-func (m *MockDb) Prefix() uint8 {
-	args := m.Called()
-	return args.Get(0).(uint8)
-}
-
-func (m *MockDb) Safe() bool {
-	args := m.Called()
-	return args.Get(0).(bool)
-}
-
-func (m *MockDb) SetLanguage(language *lang.Language) {
-	m.Called(language)
-}
-
-func (m *MockDb) SetLock(uint8, bool) error {
-	args := m.Called()
-	return args.Error(0)
-}
-
-func (m *MockDb) Connect(ctx context.Context, connectionStr string) error {
-	args := m.Called(ctx, connectionStr)
-	return args.Error(0)
-}
-
-func (m *MockDb) SetSession(sessionId string) {
-	m.Called(sessionId)
-}
-
-func (m *MockDb) Put(ctx context.Context, key, value []byte) error {
-	args := m.Called(ctx, key, value)
-	return args.Error(0)
-}
-
-func (m *MockDb) Get(ctx context.Context, key []byte) ([]byte, error) {
-	args := m.Called(ctx, key)
-	return nil, args.Error(0)
-}
-
-func (m *MockDb) Close() error {
-	args := m.Called(nil)
-	return args.Error(0)
-}

internal/testutil/mocks/servicemock.go

@@ -3,8 +3,8 @@ package mocks
 import (
 	"context"
 
-	"git.grassecon.net/urdt/ussd/internal/models"
+	"git.grassecon.net/urdt/ussd/models"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 	"github.com/stretchr/testify/mock"
 )
 
@@ -13,28 +13,42 @@ type MockAccountService struct {
 	mock.Mock
 }
 
-func (m *MockAccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
+func (m *MockAccountService) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
 	args := m.Called()
-	return args.Get(0).(*api.OKResponse), args.Error(1)
+	return args.Get(0).(*models.AccountResult), args.Error(1)
 }
 
-func (m *MockAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error) {
+func (m *MockAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
 	args := m.Called(publicKey)
-	return args.Get(0).(*models.BalanceResponse), args.Error(1)
+	return args.Get(0).(*models.BalanceResult), args.Error(1)
 }
 
-func (m *MockAccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
+func (m *MockAccountService) TrackAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error) {
 	args := m.Called(trackingId)
-	return args.Get(0).(*models.TrackStatusResponse), args.Error(1)
+	return args.Get(0).(*models.TrackStatusResult), args.Error(1)
 }
 
-func (m *MockAccountService) TrackAccountStatus(ctx context.Context,publicKey string) (*api.OKResponse, error) {
+func (m *MockAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
 	args := m.Called(publicKey)
-	return args.Get(0).(*api.OKResponse), args.Error(1)
+	return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
 }
 
-
+func (m *MockAccountService) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
-func (m *MockAccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
 	args := m.Called(publicKey)
-	return args.Get(0).(*models.VoucherHoldingResponse), args.Error(1)
+	return args.Get(0).([]dataserviceapi.Last10TxResponse), args.Error(1)
+}
+
+func (m *MockAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
+	args := m.Called(address)
+	return args.Get(0).(*models.VoucherDataResult), args.Error(1)
+}
+
+func (m *MockAccountService) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
+	args := m.Called()
+	return args.Get(0).(*models.TokenTransferResponse), args.Error(1)
+}
+
+func (m *MockAccountService) CheckAliasAddress(ctx context.Context, alias string) (*dataserviceapi.AliasAddress, error) {
+	args := m.Called(alias)
+	return args.Get(0).(*dataserviceapi.AliasAddress), args.Error(1)
 }

internal/testutil/mocks/subprefixdbmock.go

@@ -1,21 +0,0 @@
-package mocks
-
-import (
-	"context"
-
-	"github.com/stretchr/testify/mock"
-)
-
-type MockSubPrefixDb struct {
-	mock.Mock
-}
-
-func (m *MockSubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
-	args := m.Called(ctx, key)
-	return args.Get(0).([]byte), args.Error(1)
-}
-
-func (m *MockSubPrefixDb) Put(ctx context.Context, key, val []byte) error {
-	args := m.Called(ctx, key, val)
-	return args.Error(0)
-}

internal/testutil/mocks/userdbmock.go

@@ -1,24 +0,0 @@
-package mocks
-
-import (
-	"context"
-
-	"git.defalsify.org/vise.git/db"
-	"git.grassecon.net/urdt/ussd/internal/utils"
-	"github.com/stretchr/testify/mock"
-)
-
-type MockUserDataStore struct {
-	db.Db
-	mock.Mock
-}
-
-func (m *MockUserDataStore) ReadEntry(ctx context.Context, sessionId string, typ utils.DataTyp) ([]byte, error) {
-	args := m.Called(ctx, sessionId, typ)
-	return args.Get(0).([]byte), args.Error(1)
-}
-
-func (m *MockUserDataStore) WriteEntry(ctx context.Context, sessionId string, typ utils.DataTyp, value []byte) error {
-	args := m.Called(ctx, sessionId, typ, value)
-	return args.Error(0)
-}

internal/testutil/testservice/TestAccountService.go

@@ -3,88 +3,60 @@ package testservice
 import (
 	"context"
 	"encoding/json"
-	"time"
 
-	"git.grassecon.net/urdt/ussd/internal/models"
+	"git.grassecon.net/urdt/ussd/models"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
 type TestAccountService struct {
 }
 
-func (tas *TestAccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
+func (tas *TestAccountService) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
-	return &api.OKResponse{
+	return &models.AccountResult{
-		Ok:          true,
+		TrackingId: "075ccc86-f6ef-4d33-97d5-e91cfb37aa0d",
-		Description: "Account creation succeeded",
+		PublicKey:  "0x623EFAFa8868df4B934dd12a8B26CB3Dd75A7AdD",
-		Result: map[string]any{
-			"trackingId": "075ccc86-f6ef-4d33-97d5-e91cfb37aa0d",
-			"publicKey":  "0x623EFAFa8868df4B934dd12a8B26CB3Dd75A7AdD",
-		},
 	}, nil
 }
 
-func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error) {
+func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
-	balanceResponse := &models.BalanceResponse{
+	balanceResponse := &models.BalanceResult{
-		Ok: true,
+		Balance: "0.003 CELO",
-		Result: struct {
+		Nonce:   json.Number("0"),
-			Balance string      `json:"balance"`
-			Nonce   json.Number `json:"nonce"`
-		}{
-			Balance: "0.003 CELO",
-			Nonce:   json.Number("0"),
-		},
 	}
-
 	return balanceResponse, nil
 }
 
-func (tas *TestAccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
+func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
-	trackResponse := &models.TrackStatusResponse{
+	return &models.TrackStatusResult{
-		Ok: true,
+		Active: true,
-		Result: struct {
+	}, nil
-			Transaction struct {
-				CreatedAt     time.Time   "json:\"createdAt\""
-				Status        string      "json:\"status\""
-				TransferValue json.Number "json:\"transferValue\""
-				TxHash        string      "json:\"txHash\""
-				TxType        string      "json:\"txType\""
-			}
-		}{
-			Transaction: models.Transaction{
-				CreatedAt:     time.Now(),
-				Status:        "SUCCESS",
-				TransferValue: json.Number("0.5"),
-				TxHash:        "0x123abc456def",
-				TxType:        "transfer",
-			},
-		},
-	}
-	return trackResponse, nil
 }
 
-func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error) {
+func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
-	return &api.OKResponse{
+	return []dataserviceapi.TokenHoldings{
-		Ok:          true,
+		dataserviceapi.TokenHoldings{
-		Description: "Account creation succeeded",
+			ContractAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
-		Result: map[string]any{
+			TokenSymbol:     "SRF",
-			"active": true,
+			TokenDecimals:   "6",
+			Balance:         "2745987",
 		},
 	}, nil
 }
 
-func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
+func (tas *TestAccountService) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
-	return &models.VoucherHoldingResponse{
+	return []dataserviceapi.Last10TxResponse{}, nil
-		Ok: true,
+}
-		Result: models.VoucherResult{
+
-			Holdings: []dataserviceapi.TokenHoldings{
+func (m TestAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
-				{
+	return &models.VoucherDataResult{}, nil
-					ContractAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
+}
-					TokenSymbol:     "SRF",
+
-					TokenDecimals:   "6",
+func (tas *TestAccountService) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
-					Balance:         "2745987",
+	return &models.TokenTransferResponse{
-				},
+		TrackingId: "e034d147-747d-42ea-928d-b5a7cb3426af",
-			},
-		},
 	}, nil
 }
+
+func (m TestAccountService) CheckAliasAddress(ctx context.Context, alias string) (*dataserviceapi.AliasAddress, error) {
+	return &dataserviceapi.AliasAddress{}, nil
+}

internal/testutil/testtag/offlinetest.go

@@ -3,10 +3,10 @@
 package testtag
 
 import (
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
+	"git.grassecon.net/urdt/ussd/remote"
 	accountservice "git.grassecon.net/urdt/ussd/internal/testutil/testservice"
 )
 
 var (
-	AccountService server.AccountServiceInterface = &accountservice.TestAccountService{}
+	AccountService remote.AccountServiceInterface = &accountservice.TestAccountService{}
 )

internal/testutil/testtag/onlinetest.go

@@ -2,8 +2,8 @@
 
 package testtag
 
-import "git.grassecon.net/urdt/ussd/internal/handlers/server"
+import "git.grassecon.net/urdt/ussd/remote"
 
 var (
-	AccountService server.AccountServiceInterface
+	AccountService remote.AccountServiceInterface
 )

internal/utils/adminstore.go

@@ -0,0 +1,51 @@
+package utils
+
+import (
+	"context"
+
+	"git.defalsify.org/vise.git/db"
+	fsdb "git.defalsify.org/vise.git/db/fs"
+	"git.defalsify.org/vise.git/logging"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("adminstore")
+)
+
+type AdminStore struct {
+	ctx     context.Context
+	FsStore db.Db
+}
+
+func NewAdminStore(ctx context.Context, fileName string) (*AdminStore, error) {
+	fsStore, err := getFsStore(ctx, fileName)
+	if err != nil {
+		return nil, err
+	}
+	return &AdminStore{ctx: ctx, FsStore: fsStore}, nil
+}
+
+func getFsStore(ctx context.Context, connectStr string) (db.Db, error) {
+	fsStore := fsdb.NewFsDb()
+	err := fsStore.Connect(ctx, connectStr)
+	fsStore.SetPrefix(db.DATATYPE_USERDATA)
+	if err != nil {
+		return nil, err
+	}
+	return fsStore, nil
+}
+
+// Checks if the given sessionId is listed as an admin.
+func (as *AdminStore) IsAdmin(sessionId string) (bool, error) {
+	_, err := as.FsStore.Get(as.ctx, []byte(sessionId))
+	if err != nil {
+		if db.IsNotFound(err) {
+			logg.Printf(logging.LVL_INFO, "Returning false because session id was not found")
+			return false, nil
+		} else {
+			return false, err
+		}
+	}
+
+	return true, nil
+}

internal/utils/age.go

@@ -1,6 +1,9 @@
 package utils
 
-import "time"
+import (
+	"strconv"
+	"time"
+)
 
 // CalculateAge calculates the age based on a given birthdate and the current date in the format dd/mm/yy
 // It adjusts for cases where the current date is before the birthday in the current year.
@@ -25,11 +28,29 @@ func CalculateAge(birthdate, today time.Time) int {
 // It subtracts the YOB from the current year to determine the age.
 //
 // Parameters:
-//   yob: The year of birth as an integer.
+//
+//	yob: The year of birth as an integer.
 //
 // Returns:
-//   The calculated age as an integer.
+//
+//	The calculated age as an integer.
 func CalculateAgeWithYOB(yob int) int {
-    currentYear := time.Now().Year()
+	currentYear := time.Now().Year()
-    return currentYear - yob
+	return currentYear - yob
-}
+}
+
+
+//IsValidYob checks if the provided yob can be considered valid 
+func IsValidYOb(yob string) bool {
+	currentYear := time.Now().Year()
+	yearOfBirth, err := strconv.ParseInt(yob, 10, 64)
+	if err != nil {
+		return false
+	}
+	if yearOfBirth >= 1900 && int(yearOfBirth) <= currentYear {
+		return true
+	} else {
+		return false
+	}
+
+}

internal/utils/db.go

@@ -1,54 +0,0 @@
-package utils
-
-import (
-	"encoding/binary"
-)
-
-type DataTyp uint16
-
-const (
-	DATA_ACCOUNT DataTyp = iota
-	DATA_ACCOUNT_CREATED
-	DATA_TRACKING_ID
-	DATA_PUBLIC_KEY
-	DATA_CUSTODIAL_ID
-	DATA_ACCOUNT_PIN
-	DATA_ACCOUNT_STATUS
-	DATA_TEMPORARY_FIRST_NAME
-	DATA_FIRST_NAME
-	DATA_TEMPORARY_FAMILY_NAME
-	DATA_FAMILY_NAME
-	DATA_TEMPORARY_YOB
-	DATA_YOB
-	DATA_TEMPORARY_LOCATION
-	DATA_LOCATION
-	DATA_TEMPORARY_GENDER
-	DATA_GENDER
-	DATA_TEMPORARY_OFFERINGS
-	DATA_OFFERINGS
-	DATA_RECIPIENT
-	DATA_AMOUNT
-	DATA_TEMPORARY_PIN
-	DATA_VOUCHER_LIST
-	DATA_TEMPORARY_SYM
-	DATA_ACTIVE_SYM
-	DATA_TEMPORARY_BAL
-	DATA_ACTIVE_BAL
-	DATA_PUBLIC_KEY_REVERSE
-	DATA_TEMPORARY_DECIMAL
-	DATA_ACTIVE_DECIMAL
-	DATA_TEMPORARY_ADDRESS
-	DATA_ACTIVE_ADDRESS
-
-)
-
-func typToBytes(typ DataTyp) []byte {
-	var b [2]byte
-	binary.BigEndian.PutUint16(b[:], uint16(typ))
-	return b[:]
-}
-
-func PackKey(typ DataTyp, data []byte) []byte {
-	v := typToBytes(typ)
-	return append(v, data...)
-}

internal/utils/name.go

@@ -0,0 +1,17 @@
+package utils
+
+func ConstructName(firstName, familyName, defaultValue string) string {
+	name := defaultValue
+	if familyName != defaultValue {
+		if firstName != defaultValue {
+			name = firstName + " " + familyName
+		} else {
+			name = familyName
+		}
+	} else {
+		if firstName != defaultValue {
+			name = firstName
+		}
+	}
+	return name
+}

menutraversal_test/group_test.json

@@ -13,7 +13,7 @@
                 },
                 {
                     "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n3:Guard my PIN\n0:Back"
+                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
                 },
                 {
                     "input": "1",
@@ -54,7 +54,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -62,7 +62,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Select language:\n0:english\n1:kiswahili"
+                    "expectedContent": "Select language:\n0:English\n1:Kiswahili"
                 },
                 {
                     "input": "0",
@@ -95,7 +95,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -103,7 +103,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Your balance is 0.003 CELO\n0:Back\n9:Quit"
+                    "expectedContent": "Balance: {balance}\n\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -141,7 +141,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -149,7 +149,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Your community balance is 0.003 CELO\n0:Back\n9:Quit"
+                    "expectedContent": "{balance}\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -167,7 +167,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_firstname",
+            "name": "menu_my_account_edit_all_account_details_starting_from_firstname",
             "steps": [
                 {
                     "input": "",
@@ -187,6 +187,26 @@
                 },
                 {
                     "input": "foo",
+                    "expectedContent": "Enter family name:\n0:Back"
+                },
+                {
+                    "input": "bar",
+                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
+                },
+                {
+                    "input": "1",
+                    "expectedContent":  "Enter your year of birth\n0:Back"
+                },
+                {
+                    "input": "1940",
+                    "expectedContent": "Enter your location:\n0:Back"
+                },
+                {
+                    "input": "Kilifi",
+                    "expectedContent": "Enter the services or goods you offer: \n0:Back"
+                },
+                {
+                    "input": "Bananas",
                     "expectedContent": "Please enter your PIN:"
                 },
                 {
@@ -197,10 +217,6 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -208,7 +224,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_familyname",
+            "name": "menu_my_account_edit_familyname_when_all_account__details_have_been_set",
             "steps": [
                 {
                     "input": "",
@@ -238,10 +254,6 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -250,7 +262,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_gender",
+            "name": "menu_my_account_edit_gender_when_all_account__details_have_been_set",
             "steps": [
                 {
                     "input": "",
@@ -280,10 +292,6 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -291,7 +299,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_yob",
+            "name": "menu_my_account_edit_yob_when_all_account__details_have_been_set",
             "steps": [
                 {
                     "input": "",
@@ -321,10 +329,6 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -332,7 +336,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_location",
+            "name": "menu_my_account_edit_location_when_all_account_details_have_been_set",
             "steps": [
                 {
                     "input": "",
@@ -362,10 +366,6 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -373,7 +373,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_offerings",
+            "name": "menu_my_account_edit_offerings_when_all_account__details_have_been_set",
             "steps": [
                 {
                     "input": "",
@@ -403,10 +403,6 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -434,16 +430,12 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 79\nLocation: Kilifi\nYou provide: Bananas\n\n0:Back"
+                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 84\nLocation: Kilifi\nYou provide: Bananas\n\n0:Back"
                 },
                 {
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"

menutraversal_test/menu_traversal_test.go

@@ -3,6 +3,7 @@ package menutraversaltest
 import (
 	"bytes"
 	"context"
+	"flag"
 	"log"
 	"math/rand"
 	"os"
@@ -15,14 +16,15 @@ import (
 )
 
 var (
-	testData      = driver.ReadData()
+	testData  = driver.ReadData()
-	testStore     = ".test_state"
+	testStore = ".test_state"
-	groupTestFile = "group_test.json"
+	sessionID string
-	sessionID     string
+	src       = rand.NewSource(42)
-	src           = rand.NewSource(42)
+	g         = rand.New(src)
-	g             = rand.New(src)
 )
 
+var groupTestFile = flag.String("test-file", "group_test.json", "The test file to use for running the group tests")
+
 func GenerateSessionId() string {
 	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
 	v, err := uu.NewV4()
@@ -337,7 +339,7 @@ func TestMainMenuSend(t *testing.T) {
 }
 
 func TestGroups(t *testing.T) {
-	groups, err := driver.LoadTestGroups(groupTestFile)
+	groups, err := driver.LoadTestGroups(*groupTestFile)
 	if err != nil {
 		log.Fatalf("Failed to load test groups: %v", err)
 	}

menutraversal_test/profile_edit_start_familyname.json

@@ -0,0 +1,68 @@
+{
+    "groups": [
+        { 
+                "name": "menu_my_account_edit_all_account_details_starting_from_family_name",
+                "steps": [
+                    {
+                        "input": "",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "2",
+                        "expectedContent": "Enter family name:\n0:Back"
+                    },
+                    {
+                        "input": "bar",
+                        "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent":  "Enter your year of birth\n0:Back"
+                    },
+                    {
+                        "input": "1940",
+                        "expectedContent": "Enter your location:\n0:Back"
+                    },
+                    {
+                        "input": "Kilifi",
+                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
+                    },
+                    {
+                        "input": "Bananas",
+                        "expectedContent": "Please enter your PIN:"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    }
+                ]
+            }
+    ]
+}
+      
+        
+       
+        
+    
+
+
+    
+
+
+    

menutraversal_test/profile_edit_start_firstname.json

@@ -0,0 +1,61 @@
+{
+    "groups": [
+        { 
+            "name": "menu_my_account_edit_all_account_details_starting_from_firstname",
+            "steps": [
+                {
+                    "input": "",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                },
+                {
+                    "input": "3",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Enter your first names:\n0:Back"
+                },
+                {
+                    "input": "foo",
+                    "expectedContent": "Enter family name:\n0:Back"
+                },
+                {
+                    "input": "bar",
+                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
+                },
+                {
+                    "input": "1",
+                    "expectedContent":  "Enter your year of birth\n0:Back"
+                },
+                {
+                    "input": "1940",
+                    "expectedContent": "Enter your location:\n0:Back"
+                },
+                {
+                    "input": "Kilifi",
+                    "expectedContent": "Enter the services or goods you offer: \n0:Back"
+                },
+                {
+                    "input": "Bananas",
+                    "expectedContent": "Please enter your PIN:"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                }
+            ]
+        }
+    ]
+}

menutraversal_test/profile_edit_start_gender.json

@@ -0,0 +1,55 @@
+{
+    "groups": [
+        { 
+                "name": "menu_my_account_edit_all_account_details_starting_from_gender",
+                "steps": [
+                    {
+                        "input": "",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent":  "Enter your year of birth\n0:Back"
+                    },
+                    {
+                        "input": "1940",
+                        "expectedContent": "Enter your location:\n0:Back"
+                    },
+                    {
+                        "input": "Kilifi",
+                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
+                    },
+                    {
+                        "input": "Bananas",
+                        "expectedContent": "Please enter your PIN:"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    }
+                ]
+            }
+    ]
+}
+      
+      

menutraversal_test/profile_edit_start_location.json

@@ -0,0 +1,46 @@
+{
+    "groups": [
+        { 
+                "name": "menu_my_account_edit_all_account_details_starting_from_location",
+                "steps": [
+                    {
+                        "input": "",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },  
+                    {
+                        "input": "5",
+                        "expectedContent": "Enter your location:\n0:Back"
+                    },
+                    {
+                        "input": "Kilifi",
+                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
+                    },
+                    {
+                        "input": "Bananas",
+                        "expectedContent": "Please enter your PIN:"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    }
+                ]
+            }
+    ]
+}
+     

menutraversal_test/profile_edit_start_offerings.json

@@ -0,0 +1,42 @@
+{
+    "groups": [
+        { 
+                "name": "menu_my_account_edit_all_account_details_starting_from_offerings",
+                "steps": [
+                    {
+                        "input": "",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "6",
+                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
+                    },
+                    {
+                        "input": "Bananas",
+                        "expectedContent": "Please enter your PIN:"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    }
+                ]
+            }
+    ]
+}
+     

menutraversal_test/profile_edit_start_yob.json

@@ -0,0 +1,50 @@
+{
+    "groups": [
+        { 
+                "name": "menu_my_account_edit_all_account_details_starting_from_yob",
+                "steps": [
+                    {
+                        "input": "",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "4",
+                        "expectedContent":  "Enter your year of birth\n0:Back"
+                    },
+                    {
+                        "input": "1940",
+                        "expectedContent": "Enter your location:\n0:Back"
+                    },
+                    {
+                        "input": "Kilifi",
+                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
+                    },
+                    {
+                        "input": "Bananas",
+                        "expectedContent": "Please enter your PIN:"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    }
+                ]
+            }
+    ]
+}
+     

menutraversal_test/profile_edit_when_adjacent_item_set.json

@@ -0,0 +1,70 @@
+{
+    "groups": [
+        { 
+                "name": "menu_my_account_edit_familyname_when_adjacent_profile_information_set",
+                "steps": [
+                    {
+                        "input": "",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent":  "Enter your year of birth\n0:Back"
+                    },
+                    {
+                        "input": "1940",
+                        "expectedContent": "Enter your location:\n0:Back"
+                    },
+                    {
+                        "input": "Kilifi",
+                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
+                    },
+                    {
+                        "input": "Bananas",
+                        "expectedContent": "Please enter your PIN:"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "2",
+                        "expectedContent": "Enter family name:\n0:Back"
+                    },
+                    {
+                        "input": "foo2",
+                        "expectedContent": "Please enter your PIN:"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    },
+                    {
+                       "input": "0",
+                       "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    }
+                ]
+            }
+    ]
+}
+    

menutraversal_test/test_setup.json

@@ -7,11 +7,11 @@
                 "steps": [
                     {
                         "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili"
+                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili"
                     },
                     {
                         "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
+                        "expectedContent": "Do you agree to terms and conditions?\nhttps://grassecon.org/pages/terms-and-conditions\n\n0:Yes\n1:No"
                     },
                     {
                         "input": "0",
@@ -23,7 +23,7 @@
                     },
                     {
                         "input": "1111",
-                        "expectedContent": "The PIN is not a match. Try again\n1:retry\n9:Quit"
+                        "expectedContent": "The PIN is not a match. Try again\n1:Retry\n9:Quit"
                     },
                     {
                         "input": "1",
@@ -40,11 +40,11 @@
                 "steps": [
                     {
                         "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili"
+                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili"
                     },
                     {
                         "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
+                        "expectedContent": "Do you agree to terms and conditions?\nhttps://grassecon.org/pages/terms-and-conditions\n\n0:Yes\n1:No"
                     },
                     {
                         "input": "1",
@@ -53,7 +53,7 @@
                 ]
             },
             {
-                "name": "send_with_invalid_inputs",
+                "name": "send_with_invite",
                 "steps": [
                     {
                         "input": "",
@@ -61,43 +61,23 @@
                     },
                     {
                         "input": "1",
-                        "expectedContent": "Enter recipient's phone number:\n0:Back"
+                        "expectedContent": "Enter recipient's phone number/address/alias:\n0:Back"
                     },
                     {
                         "input": "000",
-                        "expectedContent": "000 is not registered or invalid, please try again:\n1:retry\n9:Quit"
+                        "expectedContent": "000 is invalid, please try again:\n1:Retry\n9:Quit"
                     },
                     {
                         "input": "1",
-                        "expectedContent": "Enter recipient's phone number:\n0:Back"
+                        "expectedContent": "Enter recipient's phone number/address/alias:\n0:Back"
                     },
                     {
-                        "input": "065656",
+                        "input": "0712345678",
-                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
+                        "expectedContent": "0712345678 is not registered, please try again:\n1:Retry\n2:Invite to Sarafu Network\n9:Quit"
                     },
                     {
-                        "input": "10000000",
+                        "input": "2",
-                        "expectedContent": "Amount 10000000 is invalid, please try again:\n1:retry\n9:Quit"
+                        "expectedContent": "Your invite request for 0712345678 to Sarafu Network failed. Please try again later."
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
-                    },
-                    {
-                        "input": "1.00",
-                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "1222",
-                        "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Your request has been sent. 065656 will receive {send_amount} from {session_id}."
                     }
                 ]
             },
@@ -140,7 +120,7 @@
                     },
                     {
                         "input": "6",
-                        "expectedContent": "Address: {public_key}\n9:Quit"
+                        "expectedContent": "Address: {public_key}\n0:Back\n9:Quit"
                     },
                     {
                         "input": "9",

models/accountresponse.go

@@ -0,0 +1,6 @@
+package models
+
+type AccountResult struct {
+	PublicKey  string `json:"publicKey"`
+	TrackingId string `json:"trackingId"`
+}

models/balanceresponse.go

@@ -0,0 +1,8 @@
+package models
+
+import "encoding/json"
+
+type BalanceResult struct {
+	Balance string      `json:"balance"`
+	Nonce   json.Number `json:"nonce"`
+}

models/profile.go

@@ -0,0 +1,18 @@
+package models
+
+type Profile struct {
+	ProfileItems []string
+	Max          int
+}
+
+func (p *Profile) InsertOrShift(index int, value string) {
+	if index < len(p.ProfileItems) {
+		p.ProfileItems = append(p.ProfileItems[:index], value)
+	} else {
+		for len(p.ProfileItems) < index {
+			p.ProfileItems = append(p.ProfileItems, "0")
+		}
+		p.ProfileItems = append(p.ProfileItems, "0") 
+		p.ProfileItems[index] = value
+	}
+}

models/token_transfer_response.go

@@ -0,0 +1,5 @@
+package models
+
+type TokenTransferResponse struct {
+	TrackingId string `json:"trackingId"`
+}

models/trackstatusresponse.go

@@ -0,0 +1,18 @@
+package models
+
+import (
+	"encoding/json"
+	"time"
+)
+
+type Transaction struct {
+	CreatedAt     time.Time   `json:"createdAt"`
+	Status        string      `json:"status"`
+	TransferValue json.Number `json:"transferValue"`
+	TxHash        string      `json:"txHash"`
+	TxType        string      `json:"txType"`
+}
+
+type TrackStatusResult struct {
+	Active bool `json:"active"`
+}

models/voucher_data_result.go

@@ -0,0 +1,10 @@
+package models
+
+type VoucherDataResult struct {
+	TokenName      string `json:"tokenName"`
+	TokenSymbol    string `json:"tokenSymbol"`
+	TokenDecimals  int    `json:"tokenDecimals"`
+	SinkAddress    string `json:"sinkAddress"`
+	TokenCommodity string `json:"tokenCommodity"`
+	TokenLocation  string `json:"tokenLocation"`
+}

remote/accountservice.go

@@ -0,0 +1,294 @@
+package remote
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"io"
+	"log"
+	"net/http"
+	"net/url"
+
+	"git.grassecon.net/urdt/ussd/config"
+	"git.grassecon.net/urdt/ussd/models"
+	"github.com/grassrootseconomics/eth-custodial/pkg/api"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+)
+
+type AccountServiceInterface interface {
+	CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error)
+	CreateAccount(ctx context.Context) (*models.AccountResult, error)
+	TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error)
+	FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error)
+	FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error)
+	VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error)
+	TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error)
+	CheckAliasAddress(ctx context.Context, alias string) (*dataserviceapi.AliasAddress, error)
+}
+
+type AccountService struct {
+}
+
+// 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
+//     AccountResponse struct can be used here to check the account status during a transaction.
+//
+// Returns:
+//   - string: The status of the transaction as a string. If there is an error during the request or processing, this will be an empty string.
+//   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
+//     If no error occurs, this will be nil
+func (as *AccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
+	var r models.TrackStatusResult
+
+	ep, err := url.JoinPath(config.TrackURL, 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
+}
+
+// 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.
+func (as *AccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
+	var balanceResult models.BalanceResult
+
+	ep, err := url.JoinPath(config.BalanceURL, publicKey)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("GET", ep, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = doRequest(ctx, req, &balanceResult)
+	return &balanceResult, err
+}
+
+// CreateAccount creates a new account in the custodial system.
+// Returns:
+//   - *models.AccountResponse: A pointer to an AccountResponse struct containing the details of the created account.
+//     If there is an error during the request or processing, this will be nil.
+//   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
+//     If no error occurs, this will be nil.
+func (as *AccountService) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
+	var r models.AccountResult
+	// Create a new request
+	req, err := http.NewRequest("POST", config.CreateAccountURL, nil)
+	if err != nil {
+		return nil, err
+	}
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	return &r, nil
+}
+
+// FetchVouchers retrieves the token holdings for a given public key from the data indexer API endpoint
+// Parameters:
+//   - publicKey: The public key associated with the account.
+func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
+	var r struct {
+		Holdings []dataserviceapi.TokenHoldings `json:"holdings"`
+	}
+
+	ep, err := url.JoinPath(config.VoucherHoldingsURL, 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.Holdings, nil
+}
+
+// FetchTransactions retrieves the last 10 transactions for a given public key from the data indexer API endpoint
+// Parameters:
+//   - publicKey: The public key associated with the account.
+func (as *AccountService) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
+	var r struct {
+		Transfers []dataserviceapi.Last10TxResponse `json:"transfers"`
+	}
+
+	ep, err := url.JoinPath(config.VoucherTransfersURL, 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.Transfers, nil
+}
+
+// VoucherData retrieves voucher metadata from the data indexer API endpoint.
+// Parameters:
+//   - address: The voucher address.
+func (as *AccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
+	var r struct {
+		TokenDetails models.VoucherDataResult `json:"tokenDetails"`
+	}
+
+	ep, err := url.JoinPath(config.VoucherDataURL, address)
+	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.TokenDetails, err
+}
+
+// TokenTransfer creates a new token transfer in the custodial system.
+// Returns:
+//   - *models.TokenTransferResponse: A pointer to an TokenTransferResponse struct containing the trackingId.
+//     If there is an error during the request or processing, this will be nil.
+//   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
+//     If no error occurs, this will be nil.
+func (as *AccountService) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
+	var r models.TokenTransferResponse
+
+	// Create request payload
+	payload := map[string]string{
+		"amount":       amount,
+		"from":         from,
+		"to":           to,
+		"tokenAddress": tokenAddress,
+	}
+
+	payloadBytes, err := json.Marshal(payload)
+	if err != nil {
+		return nil, err
+	}
+
+	// Create a new request
+	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
+}
+
+// CheckAliasAddress retrieves the address of an alias from the API endpoint.
+// Parameters:
+//   - alias: The alias of the user.
+func (as *AccountService) CheckAliasAddress(ctx context.Context, alias string) (*dataserviceapi.AliasAddress, error) {
+	var r dataserviceapi.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
+}
+
+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)
+	req.Header.Set("Content-Type", "application/json")
+
+	logRequestDetails(req)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		log.Printf("Failed to make %s request to endpoint: %s with reason: %s", req.Method, req.URL, err.Error())
+		errResponse.Description = err.Error()
+		return nil, err
+	}
+	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"))
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+	if resp.StatusCode >= http.StatusBadRequest {
+		err := json.Unmarshal([]byte(body), &errResponse)
+		if err != nil {
+			return nil, err
+		}
+		return nil, errors.New(errResponse.Description)
+	}
+	err = json.Unmarshal([]byte(body), &okResponse)
+	if err != nil {
+		return nil, err
+	}
+	if len(okResponse.Result) == 0 {
+		return nil, errors.New("Empty api result")
+	}
+
+	v, err := json.Marshal(okResponse.Result)
+	if err != nil {
+		return nil, err
+	}
+
+	err = json.Unmarshal(v, &rcpt)
+	return &okResponse, err
+}
+
+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))
+	} else {
+		bodyBytes = []byte("-")
+	}
+
+	log.Printf("URL: %s | Content-Type: %s | Method: %s| Request Body: %s", req.URL, contentType, req.Method, string(bodyBytes))
+}

services/registration/_catch_swa

@@ -0,0 +1 @@
+Tatizo la kimtambo limetokea,tafadhali jaribu tena baadaye.

services/registration/address.vis

@@ -1,6 +1,8 @@
 LOAD check_identifier 0
 RELOAD check_identifier
 MAP check_identifier
+MOUT back 0
 MOUT quit 9
 HALT
+INCMP _ 0
 INCMP quit 9

services/registration/address_swa

@@ -0,0 +1 @@
+Anwani:{{.check_identifier}}

services/registration/amount.vis

@@ -6,10 +6,10 @@ MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH api_failure  flag_api_call_error  1
+CATCH api_failure flag_api_call_error  1
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
-LOAD get_recipient 12
+LOAD get_recipient 0
 LOAD get_sender 64
 LOAD get_amount 32
 INCMP transaction_pin *

services/registration/api_failure.vis

@@ -1,5 +1,5 @@
-MOUT retry 0
+MOUT retry 1
 MOUT quit 9
 HALT
-INCMP _ 0
+INCMP _ 1
 INCMP quit 9

services/registration/check_statement

@@ -0,0 +1 @@
+Please enter your PIN to view statement:

services/registration/check_statement.vis

@@ -0,0 +1,12 @@
+LOAD check_transactions 0
+RELOAD check_transactions
+CATCH no_transfers flag_no_transfers 1
+LOAD authorize_account 6
+MOUT back 0
+MOUT quit 9
+HALT
+RELOAD authorize_account
+CATCH incorrect_pin flag_incorrect_pin 1
+INCMP _ 0
+INCMP quit 9
+INCMP transactions *

services/registration/check_statement_swa

@@ -0,0 +1 @@
+Tafadhali weka PIN yako kuona taarifa ya matumizi:

services/registration/comminity_balance_swa

@@ -1 +1 @@
-Salio la kikundi
+{{.fetch_community_balance}}

services/registration/community_balance

@@ -1 +1 @@
-{{.fetch_custodial_balances}}
+{{.fetch_community_balance}}

services/registration/community_balance.vis

@@ -1,7 +1,7 @@
 LOAD reset_incorrect 6
-LOAD fetch_custodial_balances 0
+LOAD fetch_community_balance 0
 CATCH api_failure  flag_api_call_error  1
-MAP fetch_custodial_balances
+MAP fetch_community_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 MOUT back 0

services/registration/confirm_others_new_pin

@@ -0,0 +1 @@
+Please confirm new PIN  for:{{.retrieve_blocked_number}}

services/registration/confirm_others_new_pin.vis

@@ -0,0 +1,14 @@
+CATCH pin_entry flag_incorrect_pin 1
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+CATCH invalid_others_pin flag_valid_pin 0
+CATCH pin_reset_result flag_account_authorized 1
+LOAD save_others_temporary_pin 6
+RELOAD save_others_temporary_pin
+MOUT back 0
+HALT 
+INCMP _ 0
+LOAD check_pin_mismatch 0
+RELOAD check_pin_mismatch
+CATCH others_pin_mismatch flag_pin_mismatch 1
+INCMP pin_entry *

services/registration/confirm_others_new_pin_swa

@@ -0,0 +1 @@
+Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}

services/registration/confirm_pin_change.vis

@@ -3,5 +3,3 @@ MOUT back 0
 HALT
 INCMP _ 0
 INCMP * pin_reset_success
-
-

services/registration/edit_family_name

@@ -0,0 +1,2 @@
+Current family name: {{.get_current_profile_info}}
+Enter family name:

services/registration/edit_family_name.vis

@@ -0,0 +1,18 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_familyname flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
+MAP get_current_profile_info
+MOUT back 0
+HALT
+RELOAD set_back 
+CATCH _ flag_back_set 1
+LOAD save_familyname 64
+RELOAD save_familyname
+CATCH pin_entry flag_familyname_set 1
+CATCH select_gender flag_gender_set 0
+CATCH edit_yob flag_yob_set 0
+CATCH edit_location flag_location_set 0
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_familyname_set 0
+INCMP select_gender *

services/registration/edit_family_name_swa

@@ -0,0 +1,2 @@
+Jina la familia la sasa: {{.get_current_profile_info}}
+Weka jina la familia

services/registration/edit_first_name

@@ -0,0 +1,2 @@
+Current name: {{.get_current_profile_info}}
+Enter your first names: