Merge pull request 'account-statement' (#126) from account-statement into master

Reviewed-on: #126

.dockerignore

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

.env.example

@@ -0,0 +1,20 @@
+#Serve Http
+PORT=7123
+HOST=127.0.0.1
+
+#AfricasTalking USSD POST endpoint
+AT_ENDPOINT=/ussd/africastalking
+
+#PostgreSQL
+DB_HOST=localhost
+DB_USER=postgres
+DB_PASSWORD=strongpass
+DB_NAME=urdt_ussd
+DB_PORT=5432
+DB_SSLMODE=disable
+DB_TIMEZONE=Africa/Nairobi
+
+#External API Calls
+CUSTODIAL_URL_BASE=http://localhost:5003
+BEARER_TOKEN=eyJeSIsInRcCI6IkpXVCJ.yJwdWJsaWNLZXkiOiIwrrrrrr
+DATA_URL_BASE=http://localhost:5006

.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

@@ -4,3 +4,6 @@ go.work*
 **/*/*.bin
 **/*/.state/
 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,13 @@
 package main
 
 import (
+	"bytes"
 	"context"
+	"encoding/json"
 	"flag"
 	"fmt"
+	"io"
+	"log"
 	"net/http"
 	"os"
 	"os/signal"
@@ -16,24 +20,54 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 
+	"git.grassecon.net/urdt/ussd/config"
+	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	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() {
+	initializers.LoadEnvVariables()
+}
+
 type atRequestParser struct{}
 
 func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
 	rqv, ok := rq.(*http.Request)
 	if !ok {
+		log.Println("got an invalid request:", rq)
 		return "", handlers.ErrInvalidRequest
 	}
+
+	// Capture body (if any) for logging
+	body, err := io.ReadAll(rqv.Body)
+	if err != nil {
+		log.Println("failed to read request body:", 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 {
+		log.Println("failed to marshal request body:", err)
+	} else {
+		log.Println("Received request:", string(logBytes))
+	}
+
 	if err := rqv.ParseForm(); err != nil {
+		log.Println("failed to parse form data: %v", err)
 		return "", fmt.Errorf("failed to parse form data: %v", err)
 	}
 
@@ -65,35 +99,36 @@ func (arp *atRequestParser) GetInput(rq any) ([]byte, error) {
 }
 
 func main() {
+	config.LoadConfig()
+
 	var dbDir string
 	var resourceDir string
 	var size uint
+	var database string
 	var engineDebug bool
-	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.StringVar(&database, "db", "gdbm", "database to be used")
-	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
-	flag.StringVar(&host, "h", "127.0.0.1", "http host")
+	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
-	flag.UintVar(&port, "p", 7123, "http port")
+	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)
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(16),
+		FlagCount:  uint32(128),
-	}
-	if stateDebug {
-		cfg.StateDebug = true
 	}
+
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
@@ -123,7 +158,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 {
@@ -131,7 +170,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	hl, err := lhs.GetHandler()
+	accountService := remote.AccountService{}
+	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -147,9 +187,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

@@ -13,8 +13,11 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 
+	"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/storage"
+	"git.grassecon.net/urdt/ussd/remote"
 )
 
 var (
@@ -22,6 +25,10 @@ var (
 	scriptDir = path.Join("services", "registration")
 )
 
+func init() {
+	initializers.LoadEnvVariables()
+}
+
 type asyncRequestParser struct {
 	sessionId string
 	input     []byte
@@ -36,37 +43,38 @@ func (p *asyncRequestParser) GetInput(r any) ([]byte, error) {
 }
 
 func main() {
+	config.LoadConfig()
+
 	var sessionId string
 	var dbDir string
 	var resourceDir string
 	var size uint
+	var database string
 	var engineDebug bool
-	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.StringVar(&database, "db", "gdbm", "database to be used")
-	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
-	flag.StringVar(&host, "h", "127.0.0.1", "http host")
+	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
-	flag.UintVar(&port, "p", 7123, "http port")
+	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
 	flag.Parse()
 
 	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId)
 
 	ctx := context.Background()
+	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(16),
+		FlagCount:  uint32(128),
-	}
-	if stateDebug {
-		cfg.StateDebug = true
 	}
+
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
@@ -96,10 +104,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)
 	lhs.SetDataStore(&userdataStore)
+	accountService := remote.AccountService{}
 
-	hl, err := lhs.GetHandler()
+	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -138,22 +147,26 @@ func main() {
 	for true {
 		rqs, err = sh.Process(rqs)
 		if err != nil {
+			logg.ErrorCtxf(ctx, "error in process: %v", "err", err)
 			fmt.Errorf("error in process: %v", err)
 			os.Exit(1)
 		}
 		rqs, err = sh.Output(rqs)
 		if err != nil {
+			logg.ErrorCtxf(ctx, "error in output: %v", "err", err)
 			fmt.Errorf("error in output: %v", err)
 			os.Exit(1)
 		}
 		rqs, err = sh.Reset(rqs)
 		if err != nil {
+			logg.ErrorCtxf(ctx, "error in reset: %v", "err", err)
 			fmt.Errorf("error in reset: %v", err)
 			os.Exit(1)
 		}
 		fmt.Println("")
 		_, err = fmt.Scanln(&rqs.Input)
 		if err != nil {
+			logg.ErrorCtxf(ctx, "error in input", "err", err)
 			fmt.Errorf("error in input: %v", err)
 			os.Exit(1)
 		}

cmd/http/main.go

@@ -15,9 +15,12 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 
+	"git.grassecon.net/urdt/ussd/config"
+	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 	"git.grassecon.net/urdt/ussd/internal/storage"
+	"git.grassecon.net/urdt/ussd/remote"
 )
 
 var (
@@ -25,36 +28,41 @@ var (
 	scriptDir = path.Join("services", "registration")
 )
 
+func init() {
+	initializers.LoadEnvVariables()
+}
+
 func main() {
+	config.LoadConfig()
+
 	var dbDir string
 	var resourceDir string
 	var size uint
+	var database string
 	var engineDebug bool
-	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.StringVar(&database, "db", "gdbm", "database to be used")
-	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
-	flag.StringVar(&host, "h", "127.0.0.1", "http host")
+	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
-	flag.UintVar(&port, "p", 7123, "http port")
+	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
 	flag.Parse()
 
 	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
 
 	ctx := context.Background()
+	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(16),
+		FlagCount:  uint32(128),
-	}
-	if stateDebug {
-		cfg.StateDebug = true
 	}
+
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
@@ -84,7 +92,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)
 
 	if err != nil {
@@ -92,7 +100,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	hl, err := lhs.GetHandler()
+	accountService := remote.AccountService{}
+	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)

cmd/main.go

@@ -10,8 +10,11 @@ import (
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
+	"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/storage"
+	"git.grassecon.net/urdt/ussd/remote"
 )
 
 var (
@@ -19,14 +22,22 @@ var (
 	scriptDir = path.Join("services", "registration")
 )
 
+func init() {
+	initializers.LoadEnvVariables()
+}
+
 func main() {
+	config.LoadConfig()
+
 	var dbDir string
 	var size uint
 	var sessionId string
-	var debug bool
+	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(&debug, "d", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.Parse()
 
@@ -34,13 +45,14 @@ func main() {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
+	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
 		Root:       "root",
 		SessionId:  sessionId,
 		OutputSize: uint32(size),
-		FlagCount:  uint32(16),
+		FlagCount:  uint32(128),
 	}
 
 	resourceDir := scriptDir
@@ -76,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)
 
@@ -85,7 +97,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	hl, err := lhs.GetHandler()
+	accountService := remote.AccountService{}
+	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -93,7 +106,7 @@ func main() {
 
 	en := lhs.GetEngine()
 	en = en.WithFirst(hl.Init)
-	if debug {
+	if engineDebug {
 		en = en.WithDebug(nil)
 	}
 

cmd/ssh/main.go

@@ -1,359 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/hex"
-	"errors"
-	"flag"
-	"fmt"
-	"net"
-	"path"
-	"os"
-	"sync"
-
-	"golang.org/x/crypto/ssh"
-
-	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
-	"git.defalsify.org/vise.git/resource"
-	"git.defalsify.org/vise.git/state"
-
-	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/storage"
-)
-
-var (
-	wg sync.WaitGroup
-	keyStore db.Db
-	logg      = logging.NewVanilla()
-	scriptDir = path.Join("services", "registration")
-)
-
-type auther struct {
-	Ctx context.Context
-	auth map[string]string
-}
-
-func NewAuther(ctx context.Context) *auther {
-	return &auther{
-		Ctx: ctx,
-		auth: make(map[string]string),
-	}
-}
-
-func(a *auther) Check(conn ssh.ConnMetadata, pubKey ssh.PublicKey) (*ssh.Permissions, error) {
-	keyStore.SetLanguage(nil)
-	keyStore.SetPrefix(storage.DATATYPE_CUSTOM)
-	k := append([]byte{0x01}, pubKey.Marshal()...)
-	v, err := keyStore.Get(a.Ctx, k)
-	if err != nil {
-		return nil, err
-	}
-	ka := hex.EncodeToString(conn.SessionID())
-	va := string(v)
-	a.auth[ka] = va 
-	fmt.Fprintf(os.Stderr, "connect: %s -> %s\n", ka, v)
-	return nil, nil
-}
-
-func(a *auther) FromConn(c *ssh.ServerConn) (string, error) {
-	if c == nil {
-		return "", errors.New("nil server conn")
-	}
-	if c.Conn == nil {
-		return "", errors.New("nil underlying conn")
-	}
-	return a.Get(c.Conn.SessionID())
-}
-
-
-func(a *auther) Get(k []byte) (string, error) {
-	ka := hex.EncodeToString(k)
-	v, ok := a.auth[ka]
-	if !ok {
-		return "", errors.New("not found")
-	}
-	return v, nil
-}
-
-//func serve(ctx context.Context, sessionId string, ch ssh.NewChannel, mss *storage.MenuStorageService, lhs *handlers.LocalHandlerService) error {
-func serve(ctx context.Context, sessionId string, ch ssh.NewChannel, en engine.Engine) error {
-	if ch == nil {
-		return errors.New("nil channel")
-	}
-	if ch.ChannelType() != "session" {
-		ch.Reject(ssh.UnknownChannelType, "that is not the channel you are looking for")
-		return errors.New("not a session")
-	}
-	channel, requests, err := ch.Accept()
-	if err != nil {
-		panic(err)
-	}
-	defer channel.Close()
-	wg.Add(1)
-	go func(reqIn <-chan *ssh.Request) {
-		defer wg.Done()
-		for req := range reqIn {
-			req.Reply(req.Type == "shell", nil)	
-		}
-		_ = requests
-	}(requests)
-
-	cont, err := en.Exec(ctx, []byte{})
-	if err != nil {
-		return fmt.Errorf("initial engine exec err: %v", err)
-	}
-
-	var input [state.INPUT_LIMIT]byte
-	for cont {
-		c, err := en.Flush(ctx, channel)
-		if err != nil {
-			return fmt.Errorf("flush err: %v", err)
-		}
-		_, err = channel.Write([]byte{0x0a})
-		if err != nil {
-			return fmt.Errorf("newline err: %v", err)
-		}
-		c, err = channel.Read(input[:])
-		if err != nil {
-			return fmt.Errorf("read input fail: %v", err)
-		}
-		logg.TraceCtxf(ctx, "input read", "c", c, "input", input[:c-1])
-		cont, err = en.Exec(ctx, input[:c-1])
-		if err != nil {
-			return fmt.Errorf("engine exec err: %v", err)
-		}
-		logg.TraceCtxf(ctx, "exec cont", "cont", cont, "en", en)
-		_ = c
-	}
-	c, err := en.Flush(ctx, channel)
-	if err != nil {
-		return fmt.Errorf("last flush err: %v", err)
-	}
-	_ = c
-	return nil
-}
-
-type sshRunner struct {
-	Ctx context.Context
-	Cfg engine.Config
-	FlagFile string
-	DbDir string
-	ResourceDir string
-	Debug bool
-	KeyFile string
-	Host string
-	Port uint
-}
-
-func(s *sshRunner) GetEngine(sessionId string) (engine.Engine, func(), error) {
-	ctx := s.Ctx
-	menuStorageService := storage.NewMenuStorageService(s.DbDir, s.ResourceDir)
-
-	err := menuStorageService.EnsureDbDir()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	rs, err := menuStorageService.GetResource(ctx)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	pe, err := menuStorageService.GetPersister(ctx)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	userdatastore, err := menuStorageService.GetUserdataDb(ctx)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	dbResource, ok := rs.(*resource.DbResource)
-	if !ok {
-		return nil, nil, err
-	}
-
-	lhs, err := handlers.NewLocalHandlerService(s.FlagFile, true, dbResource, s.Cfg, rs)
-	lhs.SetDataStore(&userdatastore)
-	lhs.SetPersister(pe)
-	lhs.Cfg.SessionId = sessionId
-
-	if err != nil {
-		return nil, nil, err
-	}
-
-	hl, err := lhs.GetHandler()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	en := lhs.GetEngine()
-	en = en.WithFirst(hl.Init)
-	if s.Debug {
-		en = en.WithDebug(nil)
-	}
-	// TODO: this is getting very hacky!
-	closer := func() {
-		err := menuStorageService.Close()
-		if err != nil {
-			logg.ErrorCtxf(ctx, "menu storage service cleanup fail", "err", err)
-		}
-	}
-	return en, closer, nil
-}
-
-// adapted example from crypto/ssh package, NewServerConn doc
-func(s *sshRunner) Run(ctx context.Context) {
-	running := true
-
-	// TODO: waitgroup should probably not be global
-	defer wg.Wait()
-
-	auth := NewAuther(ctx)
-	cfg := ssh.ServerConfig{
-		PublicKeyCallback: auth.Check,
-	}
-
-	privateBytes, err := os.ReadFile(s.KeyFile)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "Failed to load private key", "err", err)
-	}
-	private, err := ssh.ParsePrivateKey(privateBytes)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "Failed to parse private key", "err", err)
-	}
-	cfg.AddHostKey(private)
-
-	lst, err := net.Listen("tcp", fmt.Sprintf("%s:%d", s.Host, s.Port))
-	if err != nil {
-		panic(err)
-	}
-
-	for running {
-		conn, err := lst.Accept()
-		if err != nil {
-			panic(err)
-		}
-
-
-		go func(conn net.Conn) {
-			defer conn.Close()
-			for true {
-				srvConn, nC, rC, err := ssh.NewServerConn(conn, &cfg)
-				if err != nil {
-					logg.InfoCtxf(ctx, "rejected client", "err", err)
-					return
-				}
-				logg.DebugCtxf(ctx, "ssh client connected", "conn", srvConn)
-
-				wg.Add(1)
-				go func() {
-					ssh.DiscardRequests(rC)
-					wg.Done()
-				}()
-				
-				sessionId, err := auth.FromConn(srvConn)
-				if err != nil {
-					logg.ErrorCtxf(ctx, "Cannot find authentication")
-					return
-				}
-				en, closer, err := s.GetEngine(sessionId)
-				if err != nil {
-					logg.ErrorCtxf(ctx, "engine won't start", "err", err)
-					return
-				}
-				defer func() {
-					err := en.Finish()
-					if err != nil {
-						logg.ErrorCtxf(ctx, "engine won't stop", "err", err)
-					}
-					closer()
-				}()
-				for ch := range nC {
-					err = serve(ctx, sessionId, ch, en)
-					logg.ErrorCtxf(ctx, "ssh server finish", "err", err)
-				}
-			}
-		}(conn)
-	}
-}
-
-// TODO: This is test code, move to external tool for adding and removing keys
-func sshLoadKeys(ctx context.Context, dbDir string) error {
-	keyStoreFile := path.Join(dbDir, "ssh_authorized_keys.gdbm")
-	keyStore = storage.NewThreadGdbmDb()
-	err := keyStore.Connect(ctx, keyStoreFile)
-	if err != nil {
-		return err
-	}
-	pubKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte("ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCu5rYCxMBsVAL1TEkMQgmElAYEZj5zYDdyHjUxZ6qzHBOZD9GAzdxx9GyQDx2vdYm3329tLH/69ky1YA3nUz8SnJGBD6hC5XrqwN6zo9R9oOHAKTwiPGhey2NTVmheP+9XNHukBnOlkkWOQlpDDvMbWOztaZOWDaA8OIeP0t6qzFqLyelyg65lxzM3BKd7bCmmfzl/64BcP1MotAmB9DUxmY0Wb4Q2hYZfNYBx50Z4xthTgKV+Xoo8CbTduKotIz6hluQGvWdtxlCJQEiZ2f4RYY87JSA6/BAH2fhxuLHMXRpzocJNqARqCWpdcTGSg7bzxbKvTFH9OU4wZtr9ie40OR4zsc1lOBZL0rnp8GLkG8ZmeBQrgEDlmR9TTlz4okgtL+c5TCS37rjZYVjmtGwihws0EL9+wyv2dSQibirklC4wK5eWHKXl5vab19qzw/qRLdoRBK40DxbRKggxA7gqSsKrmrf+z7CuLIz/kxF+169FBLbh1MfBOGdx1awm6aU= lash@furioso"))
-	if err != nil {
-		return err
-	}
-	k := append([]byte{0x01}, pubKey.Marshal()...)
-	keyStore.SetPrefix(storage.DATATYPE_CUSTOM)
-	return keyStore.Put(ctx, k, []byte("+25113243546"))
-}
-
-func main() {
-	var dbDir string
-	var resourceDir string
-	var size uint
-	var engineDebug bool
-	var stateDebug bool
-	var host string
-	var port uint
-	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
-	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
-	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
-	flag.UintVar(&size, "s", 160, "max size of output")
-	flag.StringVar(&host, "h", "127.0.0.1", "http host")
-	flag.UintVar(&port, "p", 7122, "http port")
-	flag.Parse()
-
-	sshKeyFile := flag.Arg(0)
-	_, err := os.Stat(sshKeyFile)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cannot open ssh server private key file: %v\n", err)
-		os.Exit(1)
-	}
-
-	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size, "keyfile", sshKeyFile, "host", host, "port", port)
-
-	ctx := context.Background()
-	pfp := path.Join(scriptDir, "pp.csv")
-
-	cfg := engine.Config{
-		Root:       "root",
-		OutputSize: uint32(size),
-		FlagCount:  uint32(16),
-	}
-	if stateDebug {
-		cfg.StateDebug = true
-	}
-	if engineDebug {
-		cfg.EngineDebug = true
-	}
-	
-	err = sshLoadKeys(ctx, dbDir)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	runner := &sshRunner{
-		Cfg: cfg,
-		Debug: engineDebug,
-		FlagFile: pfp,
-		DbDir: dbDir,
-		ResourceDir: resourceDir,
-		KeyFile: sshKeyFile,
-		Host: host,
-		Port: port,
-	}
-	runner.Run(ctx)
-}

common/db.go

@@ -0,0 +1,71 @@
+package common
+
+import (
+	"encoding/binary"
+	"errors"
+
+	"git.defalsify.org/vise.git/logging"
+)
+
+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_FIRST_NAME
+	DATA_FAMILY_NAME
+	DATA_YOB
+	DATA_LOCATION
+	DATA_GENDER
+	DATA_OFFERINGS
+	DATA_RECIPIENT
+	DATA_AMOUNT
+	DATA_TEMPORARY_VALUE
+	DATA_ACTIVE_SYM
+	DATA_ACTIVE_BAL
+	DATA_BLOCKED_NUMBER
+	DATA_PUBLIC_KEY_REVERSE
+	DATA_ACTIVE_DECIMAL
+	DATA_ACTIVE_ADDRESS
+	DATA_TRANSACTIONS
+)
+
+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")
+	}
+}

common/hex.go

@@ -0,0 +1,31 @@
+package common
+
+import (
+	"encoding/hex"
+	"strings"
+)
+
+func NormalizeHex(s string) (string, error) {
+	if len(s) >= 2 {
+		if s[:2] == "0x" {
+			s = s[2:]
+		}
+	}
+	r, err := hex.DecodeString(s)
+	if err != nil {
+		return "", err
+	}
+	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/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 := []string{"txfrom", "txto", "txval", "txaddr", "txhash", "txdate", "txsym"}
+	data := make(map[string]string)
+
+	for _, key := range keys {
+		value, err := db.Get(ctx, []byte(key))
+		if err != nil {
+			return "", fmt.Errorf("failed to get %s: %v", key, err)
+		}
+		data[key] = string(value)
+	}
+
+	// Split the data
+	senders := strings.Split(string(data["txfrom"]), "\n")
+	recipients := strings.Split(string(data["txto"]), "\n")
+	values := strings.Split(string(data["txval"]), "\n")
+	addresses := strings.Split(string(data["txaddr"]), "\n")
+	hashes := strings.Split(string(data["txhash"]), "\n")
+	dates := strings.Split(string(data["txdate"]), "\n")
+	syms := strings.Split(string(data["txsym"]), "\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,7 +16,7 @@ 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)
@@ -24,6 +24,8 @@ func (store *UserDataStore) ReadEntry(ctx context.Context, sessionId string, 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)

common/vouchers.go

@@ -0,0 +1,173 @@
+package common
+
+import (
+	"context"
+	"fmt"
+	"math/big"
+	"strings"
+
+	"git.grassecon.net/urdt/ussd/internal/storage"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+)
+
+// VoucherMetadata helps organize data fields
+type VoucherMetadata struct {
+	Symbols   string
+	Balances  string
+	Decimals  string
+	Addresses string
+}
+
+// ProcessVouchers converts holdings into formatted strings
+func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
+	var data VoucherMetadata
+	var symbols, balances, decimals, addresses []string
+
+	for i, h := range holdings {
+		symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, h.TokenSymbol))
+
+		// 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))
+	}
+
+	data.Symbols = strings.Join(symbols, "\n")
+	data.Balances = strings.Join(balances, "\n")
+	data.Decimals = strings.Join(decimals, "\n")
+	data.Addresses = strings.Join(addresses, "\n")
+
+	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"}
+	data := make(map[string]string)
+
+	for _, key := range keys {
+		value, err := db.Get(ctx, []byte(key))
+		if err != nil {
+			return nil, fmt.Errorf("failed to get %s: %v", key, err)
+		}
+		data[key] = string(value)
+	}
+
+	symbol, balance, decimal, address := MatchVoucher(input,
+		data["sym"],
+		data["bal"],
+		data["deci"],
+		data["addr"])
+
+	if symbol == "" {
+		return nil, nil
+	}
+
+	return &dataserviceapi.TokenHoldings{
+		TokenSymbol:     string(symbol),
+		Balance:         string(balance),
+		TokenDecimals:   string(decimal),
+		ContractAddress: string(address),
+	}, nil
+}
+
+// MatchVoucher finds the matching voucher symbol, balance, decimals and contract address based on the input.
+func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol, balance, decimal, address string) {
+	symList := strings.Split(symbols, "\n")
+	balList := strings.Split(balances, "\n")
+	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) {
+				balance = strings.SplitN(balList[i], ":", 2)[1]
+			}
+			if i < len(decList) {
+				decimal = strings.SplitN(decList[i], ":", 2)[1]
+			}
+			if i < len(addrList) {
+				address = strings.SplitN(addrList[i], ":", 2)[1]
+			}
+			break
+		}
+	}
+	return
+}
+
+// StoreTemporaryVoucher saves voucher metadata as temporary entries in the DataStore.
+func StoreTemporaryVoucher(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
+	tempData := fmt.Sprintf("%s,%s,%s,%s", data.TokenSymbol, data.Balance, data.TokenDecimals, data.ContractAddress)
+
+	if err := store.WriteEntry(ctx, sessionId, DATA_TEMPORARY_VALUE, []byte(tempData)); 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) {
+	temp_data, err := store.ReadEntry(ctx, sessionId, DATA_TEMPORARY_VALUE)
+	if err != nil {
+		return nil, err
+	}
+
+	values := strings.SplitN(string(temp_data), ",", 4)
+
+	data := &dataserviceapi.TokenHoldings{}
+
+	data.TokenSymbol = values[0]
+	data.Balance = values[1]
+	data.TokenDecimals = values[2]
+	data.ContractAddress = values[3]
+
+	return data, nil
+}
+
+// UpdateVoucherData sets 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),
+		DATA_ACTIVE_BAL:     []byte(data.Balance),
+		DATA_ACTIVE_DECIMAL: []byte(data.TokenDecimals),
+		DATA_ACTIVE_ADDRESS: []byte(data.ContractAddress),
+	}
+
+	// Write active data
+	for key, value := range activeEntries {
+		if err := store.WriteEntry(ctx, sessionId, key, value); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

common/vouchers_test.go

@@ -0,0 +1,197 @@
+package common
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/alecthomas/assert/v2"
+	"github.com/stretchr/testify/require"
+
+	"git.grassecon.net/urdt/ussd/internal/storage"
+	memdb "git.defalsify.org/vise.git/db/mem"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+)
+
+// InitializeTestDb sets up and returns an in-memory database and store.
+func InitializeTestDb(t *testing.T) (context.Context, *UserDataStore) {
+	ctx := context.Background()
+
+	// Initialize memDb
+	db := memdb.NewMemDb()
+	err := db.Connect(ctx, "")
+	require.NoError(t, err, "Failed to connect to memDb")
+
+	// Create UserDataStore with memDb
+	store := &UserDataStore{Db: db}
+
+	t.Cleanup(func() {
+		db.Close() // Ensure the DB is closed after each test
+	})
+
+	return ctx, store
+}
+
+func TestMatchVoucher(t *testing.T) {
+	symbols := "1:SRF\n2:MILO"
+	balances := "1:100\n2:200"
+	decimals := "1:6\n2:4"
+	addresses := "1:0xd4c288865Ce\n2:0x41c188d63Qa"
+
+	// Test for valid voucher
+	symbol, balance, decimal, address := MatchVoucher("2", symbols, balances, decimals, addresses)
+
+	// Assertions for valid voucher
+	assert.Equal(t, "MILO", symbol)
+	assert.Equal(t, "200", balance)
+	assert.Equal(t, "4", decimal)
+	assert.Equal(t, "0x41c188d63Qa", address)
+
+	// Test for non-existent voucher
+	symbol, balance, decimal, address = MatchVoucher("3", symbols, balances, decimals, addresses)
+
+	// Assertions for non-match
+	assert.Equal(t, "", symbol)
+	assert.Equal(t, "", balance)
+	assert.Equal(t, "", decimal)
+	assert.Equal(t, "", address)
+}
+
+func TestProcessVouchers(t *testing.T) {
+	holdings := []dataserviceapi.TokenHoldings{
+		{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100000000"},
+		{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200000000"},
+	}
+
+	expectedResult := VoucherMetadata{
+		Symbols:   "1:SRF\n2:MILO",
+		Balances:  "1:100\n2:20000",
+		Decimals:  "1:6\n2:4",
+		Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa",
+	}
+
+	result := ProcessVouchers(holdings)
+
+	assert.Equal(t, expectedResult, result)
+}
+
+func TestGetVoucherData(t *testing.T) {
+	ctx := context.Background()
+
+	db := memdb.NewMemDb()
+	err := db.Connect(ctx, "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	spdb := storage.NewSubPrefixDb(db, []byte("vouchers"))
+
+	// Test voucher data
+	mockData := map[string][]byte{
+		"sym":  []byte("1:SRF\n2:MILO"),
+		"bal":  []byte("1:100\n2:200"),
+		"deci": []byte("1:6\n2:4"),
+		"addr": []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
+	}
+
+	// Put the data
+	for key, value := range mockData {
+		err = spdb.Put(ctx, []byte(key), []byte(value))
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	result, err := GetVoucherData(ctx, spdb, "1")
+
+	assert.NoError(t, err)
+	assert.Equal(t, "SRF", result.TokenSymbol)
+	assert.Equal(t, "100", result.Balance)
+	assert.Equal(t, "6", result.TokenDecimals)
+	assert.Equal(t, "0xd4c288865Ce", result.ContractAddress)
+}
+
+func TestStoreTemporaryVoucher(t *testing.T) {
+	ctx, store := InitializeTestDb(t)
+	sessionId := "session123"
+
+	// Test data
+	voucherData := &dataserviceapi.TokenHoldings{
+		TokenSymbol:     "SRF",
+		Balance:         "200",
+		TokenDecimals:   "6",
+		ContractAddress: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
+	}
+
+	// Execute the function being tested
+	err := StoreTemporaryVoucher(ctx, store, sessionId, voucherData)
+	require.NoError(t, err)
+
+	// Verify stored data
+	expectedData := fmt.Sprintf("%s,%s,%s,%s", "SRF", "200", "6", "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9")
+
+	storedValue, err := store.ReadEntry(ctx, sessionId, DATA_TEMPORARY_VALUE)
+	require.NoError(t, err)
+	require.Equal(t, expectedData, string(storedValue), "Mismatch for key %v", DATA_TEMPORARY_VALUE)
+}
+
+func TestGetTemporaryVoucherData(t *testing.T) {
+	ctx, store := InitializeTestDb(t)
+	sessionId := "session123"
+
+	// Test voucher data
+	tempData := &dataserviceapi.TokenHoldings{
+		TokenSymbol:     "SRF",
+		Balance:         "200",
+		TokenDecimals:   "6",
+		ContractAddress: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
+	}
+
+	// Store the data
+	err := StoreTemporaryVoucher(ctx, store, sessionId, tempData)
+	require.NoError(t, err)
+
+	// Execute the function being tested
+	data, err := GetTemporaryVoucherData(ctx, store, sessionId)
+	require.NoError(t, err)
+	require.Equal(t, tempData, data)
+}
+
+func TestUpdateVoucherData(t *testing.T) {
+	ctx, store := InitializeTestDb(t)
+	sessionId := "session123"
+
+	// New voucher data
+	newData := &dataserviceapi.TokenHoldings{
+		TokenSymbol:     "SRF",
+		Balance:         "200",
+		TokenDecimals:   "6",
+		ContractAddress: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
+	}
+
+	// Old temporary data
+	tempData := &dataserviceapi.TokenHoldings{
+		TokenSymbol:     "OLD",
+		Balance:         "100",
+		TokenDecimals:   "8",
+		ContractAddress: "0xold",
+	}
+	require.NoError(t, StoreTemporaryVoucher(ctx, store, sessionId, tempData))
+
+	// Execute update
+	err := UpdateVoucherData(ctx, store, sessionId, newData)
+	require.NoError(t, err)
+
+	// Verify active data was stored correctly
+	activeEntries := map[DataTyp][]byte{
+		DATA_ACTIVE_SYM:     []byte(newData.TokenSymbol),
+		DATA_ACTIVE_BAL:     []byte(newData.Balance),
+		DATA_ACTIVE_DECIMAL: []byte(newData.TokenDecimals),
+		DATA_ACTIVE_ADDRESS: []byte(newData.ContractAddress),
+	}
+
+	for key, expectedValue := range activeEntries {
+		storedValue, err := store.ReadEntry(ctx, sessionId, key)
+		require.NoError(t, err)
+		require.Equal(t, expectedValue, storedValue, "Active data mismatch for key %v", key)
+	}
+}

config/config.go

@@ -1,10 +1,71 @@
 package config
 
+import (
+	"net/url"
 
-
+	"git.grassecon.net/urdt/ussd/initializers"
-const (
-    CreateAccountURL = "https://custodial.sarafu.africa/api/account/create"
-    TrackStatusURL   = "https://custodial.sarafu.africa/api/track/"
-    BalanceURL       = "https://custodial.sarafu.africa/api/account/status/"
 )
 
+const (
+	createAccountPath          = "/api/v2/account/create"
+	trackStatusPath            = "/api/track"
+	balancePathPrefix          = "/api/account"
+	trackPath                  = "/api/v2/account/status"
+	tokenTransferPrefix        = "/api/v2/token/transfer"
+	voucherHoldingsPathPrefix  = "/api/v1/holdings"
+	voucherTransfersPathPrefix = "/api/v1/transfers/last10"
+	voucherDataPathPrefix      = "/api/v1/token"
+)
+
+var (
+	custodialURLBase string
+	dataURLBase      string
+	BearerToken      string
+)
+
+var (
+	CreateAccountURL    string
+	TrackStatusURL      string
+	BalanceURL          string
+	TrackURL            string
+	TokenTransferURL    string
+	VoucherHoldingsURL  string
+	VoucherTransfersURL string
+	VoucherDataURL      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)
+
+	return nil
+}

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)
+	}
+
+}

go.mod

@@ -1,24 +1,43 @@
 module git.grassecon.net/urdt/ussd
 
-go 1.22.6
+go 1.23.0
+
+toolchain go1.23.2
 
 require (
-	git.defalsify.org/vise.git v0.1.0-rc.3.0.20240920144308-b2d2c5f18f38
+	git.defalsify.org/vise.git v0.2.1-0.20241017112704-307fa6fcdc6b
 	github.com/alecthomas/assert/v2 v2.2.2
+	github.com/grassrootseconomics/eth-custodial v1.3.0-beta
 	github.com/peteole/testdata-loader v0.3.0
 	gopkg.in/leonelquinteros/gotext.v1 v1.3.1
 )
 
+require github.com/grassrootseconomics/ussd-data-service v0.0.0-20241003123429-4904b4438a3a // indirect
+
+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/rogpeppe/go-internal v1.13.1 // 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
+)
+
 require (
 	github.com/alecthomas/participle/v2 v2.0.0 // indirect
 	github.com/alecthomas/repr v0.2.0 // indirect
 	github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect
-	github.com/davecgh/go-spew v1.1.1 // 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/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/stretchr/testify v1.9.0
 	github.com/x448/float16 v0.8.4 // indirect

go.sum

@@ -1,9 +1,5 @@
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911231817-0d23e0dbb57f h1:CuJvG3NyMoRtHUim4aZdrfjjJBg2AId7z0yp7Q97bRM=
+git.defalsify.org/vise.git v0.2.1-0.20241017112704-307fa6fcdc6b h1:dxBplsIlzJHV+5EH+gzB+w08Blt7IJbb2jeRe1OEjLU=
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911231817-0d23e0dbb57f/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
+git.defalsify.org/vise.git v0.2.1-0.20241017112704-307fa6fcdc6b/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240914163514-577f56f43bea h1:6ZYT+dIjd/f5vn9y5AJDZ7SQQckA6w5ZfUoKygyI11o=
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240914163514-577f56f43bea/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240920144308-b2d2c5f18f38 h1:4aAZijIcq33ixnZ+U48ckDIkwSfZL3St/CqoXZcC5K8=
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240920144308-b2d2c5f18f38/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
 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=
@@ -12,29 +8,67 @@ github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk
 github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
 github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
+github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
+github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/grassrootseconomics/eth-custodial v1.3.0-beta h1:twrMBhl89GqDUL9PlkzQxMP/6OST1BByrNDj+rqXDmU=
+github.com/grassrootseconomics/eth-custodial v1.3.0-beta/go.mod h1:7uhRcdnJplX4t6GKCEFkbeDhhjlcaGJeJqevbcvGLZo=
+github.com/grassrootseconomics/ussd-data-service v0.0.0-20241003123429-4904b4438a3a h1:q/YH7nE2j8epNmFnTu0tU1vwtCxtQ6nH+d7hRVV5krU=
+github.com/grassrootseconomics/ussd-data-service v0.0.0-20241003123429-4904b4438a3a/go.mod h1:hdKaKwqiW6/kphK4j/BhmuRlZDLo1+DYo3gYw5O0siw=
 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=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
+github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs=
+github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA=
+github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
+github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a h1:0Q3H0YXzMHiciXtRcM+j0jiCe8WKPQHoRgQiRTnfcLY=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a/go.mod h1:CdTTBOYzS5E4mWS1N8NWP6AHI19MP0A2B18n3hLzRMk=
+github.com/pashagolub/pgxmock/v4 v4.3.0 h1:DqT7fk0OCK6H0GvqtcMsLpv8cIwWqdxWgfZNLeHCb/s=
+github.com/pashagolub/pgxmock/v4 v4.3.0/go.mod h1:9VoVHXwS3XR/yPtKGzwQvwZX1kzGB9sM8SviDcHDa3A=
 github.com/peteole/testdata-loader v0.3.0 h1:8jckE9KcyNHgyv/VPoaljvKZE0Rqr8+dPVYH6rfNr9I=
 github.com/peteole/testdata-loader v0.3.0/go.mod h1:Mt0ZbRtb56u8SLJpNP+BnQbENljMorYBpqlvt3cS83U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1/go.mod h1:X1WlGDeAFIYsW6GjgMm4VwUwZ2XjI7Zan2InxSUQWrU=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

initializers/load.go

@@ -0,0 +1,34 @@
+package initializers
+
+import (
+	"log"
+	"os"
+	"strconv"
+
+	"github.com/joho/godotenv"
+)
+
+func LoadEnvVariables() {
+	err := godotenv.Load()
+	if err != nil {
+		log.Fatal("Error loading .env file")
+	}
+}
+
+// Helper to get environment variables with a default fallback
+func GetEnv(key, defaultVal string) string {
+  if value, exists := os.LookupEnv(key); exists {
+   	return value
+	}
+  return defaultVal
+}
+
+// Helper to safely convert environment variables to uint
+func GetEnvUint(key string, defaultVal uint) uint {
+	if value, exists := os.LookupEnv(key); exists {
+		if parsed, err := strconv.Atoi(value); err == nil && parsed >= 0 {
+			return uint(parsed)
+		}
+	}
+	return defaultVal
+}

internal/handlers/base.go

@@ -46,7 +46,7 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 	var err error
 	var ok bool
 	
-	logg.InfoCtxf(rqs.Ctx, "new request",  rqs)
+	logg.InfoCtxf(rqs.Ctx, "new request", "data", rqs)
 
 	rqs.Storage, err = f.provider.Get(rqs.Config.SessionId)
 	if err != nil {

internal/handlers/handlerservice.go

@@ -1,12 +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/ussd"
+	"git.grassecon.net/urdt/ussd/internal/utils"
+	"git.grassecon.net/urdt/ussd/remote"
 )
 
 type HandlerService interface {
@@ -27,18 +32,24 @@ 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,
 		DbRs:       dbResource,
+		AdminStore: adminstore,
 		Cfg:        cfg,
 		Rs:         rs,
 	}, nil
@@ -52,16 +63,16 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 	ls.UserdataStore = db
 }
 
-func (ls *LocalHandlerService) GetHandler() (*ussd.Handlers, error) {
+func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceInterface) (*ussd.Handlers, error) {
-	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore)
+	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore, ls.AdminStore, accountService)
 	if err != nil {
 		return nil, err
 	}
 	ussdHandlers = ussdHandlers.WithPersister(ls.Pe)
 	ls.DbRs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	ls.DbRs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
-	ls.DbRs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
+	ls.DbRs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
-	ls.DbRs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
+	ls.DbRs.AddLocalFunc("verify_create_pin", ussdHandlers.VerifyCreatePin)
 	ls.DbRs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
 	ls.DbRs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
 	ls.DbRs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
@@ -69,6 +80,7 @@ func (ls *LocalHandlerService) GetHandler() (*ussd.Handlers, error) {
 	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)
@@ -82,18 +94,33 @@ func (ls *LocalHandlerService) GetHandler() (*ussd.Handlers, error) {
 	ls.DbRs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
 	ls.DbRs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
 	ls.DbRs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
-	ls.DbRs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
 	ls.DbRs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
 	ls.DbRs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
 	ls.DbRs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
 	ls.DbRs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
 	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
-	ls.DbRs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	ls.DbRs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
-	ls.DbRs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
 	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_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)
 
 	return ussdHandlers, nil
 }

internal/handlers/server/accountservice.go

@@ -1,112 +0,0 @@
-package server
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/internal/models"
-)
-
-type AccountServiceInterface interface {
-	CheckBalance(publicKey string) (string, error)
-	CreateAccount() (*models.AccountResponse, error)
-	CheckAccountStatus(trackingId string) (string, error)
-}
-
-type AccountService struct {
-}
-
-
-
-// CheckAccountStatus retrieves the status of an account transaction based on the provided tracking ID.
-//
-// 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(trackingId string) (string, error) {
-	resp, err := http.Get(config.TrackStatusURL + trackingId)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
-
-	var trackResp models.TrackStatusResponse
-	err = json.Unmarshal(body, &trackResp)
-	if err != nil {
-		return "", err
-	}
-
-	status := trackResp.Result.Transaction.Status
-
-	return status, 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(publicKey string) (string, error) {
-
-	resp, err := http.Get(config.BalanceURL + publicKey)
-	if err != nil {
-		return "0.0", err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "0.0", err
-	}
-
-	var balanceResp models.BalanceResponse
-	err = json.Unmarshal(body, &balanceResp)
-	if err != nil {
-		return "0.0", err
-	}
-
-	balance := balanceResp.Result.Balance
-	return balance, 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() (*models.AccountResponse, error) {
-	resp, err := http.Post(config.CreateAccountURL, "application/json", nil)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	var accountResp models.AccountResponse
-	err = json.Unmarshal(body, &accountResp)
-	if err != nil {
-		return nil, err
-	}
-
-	return &accountResp, nil
-}

internal/http/http_test.go

@@ -13,7 +13,7 @@ import (
 
 	"git.defalsify.org/vise.git/engine"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/mocks/httpmocks"
+	"git.grassecon.net/urdt/ussd/internal/testutil/mocks/httpmocks"
 )
 
 // invalidRequestType is a custom type to test invalid request scenarios

internal/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/mocks/servicemock.go

@@ -1,26 +0,0 @@
-package mocks
-
-import (
-	"git.grassecon.net/urdt/ussd/internal/models"
-	"github.com/stretchr/testify/mock"
-)
-
-// MockAccountService implements AccountServiceInterface for testing
-type MockAccountService struct {
-	mock.Mock
-}
-
-func (m *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
-	args := m.Called()
-	return args.Get(0).(*models.AccountResponse), args.Error(1)
-}
-
-func (m *MockAccountService) CheckBalance(publicKey string) (string, error) {
-	args := m.Called(publicKey)
-	return args.String(0), args.Error(1)
-}
-
-func (m *MockAccountService) CheckAccountStatus(trackingId string) (string, error) {
-	args := m.Called(trackingId)
-	return args.String(0), args.Error(1)
-}

internal/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/models/accountresponse.go

@@ -1,15 +0,0 @@
-package models
-
-import (
-	"encoding/json"
-
-)
-
-type AccountResponse struct {
-	Ok     bool `json:"ok"`
-	Result struct {
-		CustodialId json.Number `json:"custodialId"`
-		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/trackstatusresponse.go

@@ -1,20 +0,0 @@
-package models
-
-import (
-	"encoding/json"
-	"time"
-)
-
-
-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/storage/db.go

@@ -0,0 +1,47 @@
+package storage
+
+import (
+	"context"
+
+	"git.defalsify.org/vise.git/db"
+)
+
+const (
+	DATATYPE_USERSUB = 64
+)
+
+// PrefixDb interface abstracts the database operations.
+type PrefixDb interface {
+	Get(ctx context.Context, key []byte) ([]byte, error)
+	Put(ctx context.Context, key []byte, val []byte) error
+}
+
+var _ PrefixDb = (*SubPrefixDb)(nil)
+
+type SubPrefixDb struct {
+	store db.Db
+	pfx   []byte
+}
+
+func NewSubPrefixDb(store db.Db, pfx []byte) *SubPrefixDb {
+	return &SubPrefixDb{
+		store: store,
+		pfx:   pfx,
+	}
+}
+
+func (s *SubPrefixDb) toKey(k []byte) []byte {
+	return append(s.pfx, k...)
+}
+
+func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
+	s.store.SetPrefix(DATATYPE_USERSUB)
+	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)
+	key = s.toKey(key)
+	return s.store.Put(ctx, key, val)
+}

internal/storage/db_test.go

@@ -0,0 +1,54 @@
+package storage
+
+import (
+	"bytes"
+	"context"
+	"testing"
+
+	memdb "git.defalsify.org/vise.git/db/mem"
+)
+
+func TestSubPrefix(t *testing.T) {
+	ctx := context.Background()
+	db := memdb.NewMemDb()
+	err := db.Connect(ctx, "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	sdba := NewSubPrefixDb(db, []byte("tinkywinky"))
+	err = sdba.Put(ctx, []byte("foo"), []byte("dipsy"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := sdba.Get(ctx, []byte("foo"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(r, []byte("dipsy")) {
+		t.Fatalf("expected 'dipsy', got %s", r)
+	}
+
+	sdbb := NewSubPrefixDb(db, []byte("lala"))
+	r, err = sdbb.Get(ctx, []byte("foo"))
+	if err == nil {
+		t.Fatal("expected not found")
+	}
+
+	err = sdbb.Put(ctx, []byte("foo"), []byte("pu"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	r, err = sdbb.Get(ctx, []byte("foo"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(r, []byte("pu")) {
+		t.Fatalf("expected 'pu', got %s", r)
+	}
+
+	r, err = sdba.Get(ctx, []byte("foo"))
+	if !bytes.Equal(r, []byte("dipsy")) {
+		t.Fatalf("expected 'dipsy', got %s", r)
+	}
+}

internal/storage/gdbm.go

@@ -14,7 +14,6 @@ var (
 
 type ThreadGdbmDb struct {
 	db db.Db
-	registered bool
 	connStr string
 }
 
@@ -30,6 +29,7 @@ func(tdb *ThreadGdbmDb) Connect(ctx context.Context, connStr string) error {
 	_, ok = dbC[connStr]
 	if ok {
 		logg.WarnCtxf(ctx, "already registered thread gdbm, skipping", "connStr", connStr)
+		return nil
 	}
 	gdb := gdbmdb.NewGdbmDb()
 	err := gdb.Connect(ctx, connStr)
@@ -39,7 +39,6 @@ func(tdb *ThreadGdbmDb) Connect(ctx context.Context, connStr string) error {
 	dbC[connStr] = make(chan db.Db, 1)
 	dbC[connStr]<- gdb
 	tdb.connStr = connStr
-	tdb.registered = true
 	return nil
 }
 
@@ -110,6 +109,7 @@ func(tdb *ThreadGdbmDb) Get(ctx context.Context, key []byte) ([]byte, error) {
 func(tdb *ThreadGdbmDb) Close() error {
 	tdb.reserve()
 	close(dbC[tdb.connStr])
+	delete(dbC, tdb.connStr)
 	err := tdb.db.Close()
 	tdb.db = nil
 	return err

internal/storage/storage.go

@@ -5,10 +5,6 @@ import (
 	"git.defalsify.org/vise.git/persist"
 )
 
-const (
-	DATATYPE_CUSTOM = 128 
-)
-
 type Storage struct {
 	Persister *persist.Persister
 	UserdataDb db.Db	

internal/storage/storageservice.go

@@ -8,9 +8,11 @@ import (
 
 	"git.defalsify.org/vise.git/db"
 	fsdb "git.defalsify.org/vise.git/db/fs"
+	"git.defalsify.org/vise.git/db/postgres"
+	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
-	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/urdt/ussd/initializers"
 )
 
 var (
@@ -24,7 +26,7 @@ type StorageService interface {
 	EnsureDbDir() error
 }
 
-type MenuStorageService struct{
+type MenuStorageService struct {
 	dbDir         string
 	resourceDir   string
 	resourceStore db.Db
@@ -32,6 +34,22 @@ type MenuStorageService struct{
 	userDataStore db.Db
 }
 
+func buildConnStr() string {
+	host := initializers.GetEnv("DB_HOST", "localhost")
+	user := initializers.GetEnv("DB_USER", "postgres")
+	password := initializers.GetEnv("DB_PASSWORD", "")
+	dbName := initializers.GetEnv("DB_NAME", "")
+	port := initializers.GetEnv("DB_PORT", "5432")
+
+	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 {
 	return &MenuStorageService{
 		dbDir:       dbDir,
@@ -39,25 +57,58 @@ func NewMenuStorageService(dbDir string, resourceDir string) *MenuStorageService
 	}
 }
 
-func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persister, error) {
+func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, existingDb db.Db, fileName string) (db.Db, error) {
-	ms.stateStore = NewThreadGdbmDb()
+	database, ok := ctx.Value("Database").(string)
-	storeFile := path.Join(ms.dbDir, "state.gdbm")
+	if !ok {
-	err := ms.stateStore.Connect(ctx, storeFile)
+		return nil, fmt.Errorf("failed to select the database")
+	}
+
+	if existingDb != nil {
+		return existingDb, nil
+	}
+
+	var newDb db.Db
+	var err error
+
+	if database == "postgres" {
+		newDb = postgres.NewPgDb()
+		connStr := buildConnStr()
+		err = newDb.Connect(ctx, connStr)
+	} else {
+		newDb = NewThreadGdbmDb()
+		storeFile := path.Join(ms.dbDir, fileName)
+		err = newDb.Connect(ctx, storeFile)
+	}
+
 	if err != nil {
 		return nil, err
 	}
-	pr := persist.NewPersister(ms.stateStore)
+
-	logg.TraceCtxf(ctx, "menu storage service", "persist", pr, "store", ms.stateStore)
+	return newDb, nil
+}
+
+func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persister, error) {
+	stateStore, err := ms.GetStateStore(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	pr := persist.NewPersister(stateStore)
+	logg.TraceCtxf(ctx, "menu storage service", "persist", pr, "store", stateStore)
 	return pr, nil
 }
 
 func (ms *MenuStorageService) GetUserdataDb(ctx context.Context) (db.Db, error) {
-	ms.userDataStore = NewThreadGdbmDb()
+	if ms.userDataStore != nil {
-	storeFile := path.Join(ms.dbDir, "userdata.gdbm")
+		return ms.userDataStore, nil
-	err := ms.userDataStore.Connect(ctx, storeFile)
+	}
+
+	userDataStore, err := ms.getOrCreateDb(ctx, ms.userDataStore, "userdata.gdbm")
 	if err != nil {
 		return nil, err
 	}
+
+	ms.userDataStore = userDataStore
 	return ms.userDataStore, nil
 }
 
@@ -73,14 +124,15 @@ func (ms *MenuStorageService) GetResource(ctx context.Context) (resource.Resourc
 
 func (ms *MenuStorageService) GetStateStore(ctx context.Context) (db.Db, error) {
 	if ms.stateStore != nil {
-		panic("set up store when already exists")
+		return ms.stateStore, nil
 	}
-	ms.stateStore = NewThreadGdbmDb()
+
-	storeFile := path.Join(ms.dbDir, "state.gdbm")
+	stateStore, err := ms.getOrCreateDb(ctx, ms.stateStore, "state.gdbm")
-	err := ms.stateStore.Connect(ctx, storeFile)
 	if err != nil {
 		return nil, err
 	}
+
+	ms.stateStore = stateStore
 	return ms.stateStore, nil
 }
 

internal/testutil/TestEngine.go

@@ -0,0 +1,124 @@
+package testutil
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path"
+	"time"
+
+	"git.defalsify.org/vise.git/engine"
+	"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/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 (
+	baseDir   = testdataloader.GetBasePath()
+	logg      = logging.NewVanilla()
+	scriptDir = path.Join(baseDir, "services", "registration")
+)
+
+func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
+	ctx := context.Background()
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
+	ctx = context.WithValue(ctx, "Database", "gdbm")
+	pfp := path.Join(scriptDir, "pp.csv")
+
+	var eventChannel = make(chan bool)
+
+	cfg := engine.Config{
+		Root:       "root",
+		SessionId:  sessionId,
+		OutputSize: uint32(160),
+		FlagCount:  uint32(128),
+	}
+
+	dbDir := ".test_state"
+	resourceDir := scriptDir
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
+
+	err := menuStorageService.EnsureDbDir()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	rs, err := menuStorageService.GetResource(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	pe, err := menuStorageService.GetPersister(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	userDataStore, err := menuStorageService.GetUserdataDb(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	dbResource, ok := rs.(*resource.DbResource)
+	if !ok {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
+	lhs.SetDataStore(&userDataStore)
+	lhs.SetPersister(pe)
+
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	if testtag.AccountService == nil {
+		testtag.AccountService = &remote.AccountService{}
+	}
+
+	switch testtag.AccountService.(type) {
+	case *testservice.TestAccountService:
+		go func() {
+			eventChannel <- false
+		}()
+	case *remote.AccountService:
+		go func() {
+			time.Sleep(5 * time.Second) // Wait for 5 seconds
+			eventChannel <- true
+		}()
+	default:
+		panic("Unknown account service type")
+	}
+
+	hl, err := lhs.GetHandler(testtag.AccountService)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	en := lhs.GetEngine()
+	en = en.WithFirst(hl.Init)
+	cleanFn := func() {
+		err := en.Finish()
+		if err != nil {
+			logg.Errorf(err.Error())
+		}
+
+		err = menuStorageService.Close()
+		if err != nil {
+			logg.Errorf(err.Error())
+		}
+		logg.Infof("testengine storage closed")
+	}
+	return en, cleanFn, eventChannel
+}

internal/testutil/driver/groupdriver.go

@@ -0,0 +1,111 @@
+package driver
+
+import (
+	"encoding/json"
+	"log"
+	"os"
+	"regexp"
+)
+
+type Step struct {
+	Input           string `json:"input"`
+	ExpectedContent string `json:"expectedContent"`
+}
+
+func (s *Step) MatchesExpectedContent(content []byte) (bool, error) {
+	pattern := regexp.QuoteMeta(s.ExpectedContent)
+	re, err := regexp.Compile(pattern)
+	if err != nil {
+		return false, err
+	}
+	if re.Match([]byte(content)) {
+		return true, nil
+	}
+	return false, nil
+}
+
+// Group represents a group of steps
+type Group struct {
+	Name  string `json:"name"`
+	Steps []Step `json:"steps"`
+}
+
+type TestCase struct {
+	Name            string
+	Input           string
+	ExpectedContent string
+}
+
+func (s *TestCase) MatchesExpectedContent(content []byte) (bool, error) {
+	pattern := regexp.QuoteMeta(s.ExpectedContent)
+	re, err := regexp.Compile(pattern)
+	if err != nil {
+		return false, err
+	}
+	// Check if the content matches the regex pattern
+	if re.Match(content) {
+		return true, nil
+	}
+	return false, nil
+}
+
+// DataGroup represents the overall structure of the JSON.
+type DataGroup struct {
+	Groups []Group `json:"groups"`
+}
+
+type Session struct {
+	Name   string  `json:"name"`
+	Groups []Group `json:"groups"`
+}
+
+func ReadData() []Session {
+	data, err := os.ReadFile("test_setup.json")
+	if err != nil {
+		log.Fatalf("Failed to read file: %v", err)
+	}
+	// Unmarshal JSON data
+	var sessions []Session
+	err = json.Unmarshal(data, &sessions)
+	if err != nil {
+		log.Fatalf("Failed to unmarshal JSON: %v", err)
+	}
+
+	return sessions
+}
+
+func FilterGroupsByName(groups []Group, name string) []Group {
+	var filteredGroups []Group
+	for _, group := range groups {
+		if group.Name == name {
+			filteredGroups = append(filteredGroups, group)
+		}
+	}
+	return filteredGroups
+}
+
+func LoadTestGroups(filePath string) (DataGroup, error) {
+	var sessionsData DataGroup
+	data, err := os.ReadFile(filePath)
+	if err != nil {
+		return sessionsData, err
+	}
+	err = json.Unmarshal(data, &sessionsData)
+	return sessionsData, err
+}
+
+func CreateTestCases(group DataGroup) []TestCase {
+	var tests []TestCase
+	for _, group := range group.Groups {
+		for _, step := range group.Steps {
+			// Create a test case for each group
+			tests = append(tests, TestCase{
+				Name:            group.Name,
+				Input:           step.Input,
+				ExpectedContent: step.ExpectedContent,
+			})
+		}
+	}
+
+	return tests
+}

internal/testutil/mocks/servicemock.go

@@ -0,0 +1,49 @@
+package mocks
+
+import (
+	"context"
+
+	"git.grassecon.net/urdt/ussd/models"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+	"github.com/stretchr/testify/mock"
+)
+
+// MockAccountService implements AccountServiceInterface for testing
+type MockAccountService struct {
+	mock.Mock
+}
+
+func (m *MockAccountService) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
+	args := m.Called()
+	return args.Get(0).(*models.AccountResult), args.Error(1)
+}
+
+func (m *MockAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
+	args := m.Called(publicKey)
+	return args.Get(0).(*models.BalanceResult), args.Error(1)
+}
+
+func (m *MockAccountService) TrackAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error) {
+	args := m.Called(trackingId)
+	return args.Get(0).(*models.TrackStatusResult), args.Error(1)
+}
+
+func (m *MockAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
+	args := m.Called(publicKey)
+	return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
+}
+
+func (m *MockAccountService) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
+	args := m.Called(publicKey)
+	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)
+}

internal/testutil/testservice/TestAccountService.go

@@ -0,0 +1,58 @@
+package testservice
+
+import (
+	"context"
+	"encoding/json"
+
+	"git.grassecon.net/urdt/ussd/models"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+)
+
+type TestAccountService struct {
+}
+
+func (tas *TestAccountService) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
+	return &models.AccountResult{
+		TrackingId: "075ccc86-f6ef-4d33-97d5-e91cfb37aa0d",
+		PublicKey:  "0x623EFAFa8868df4B934dd12a8B26CB3Dd75A7AdD",
+	}, nil
+}
+
+func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
+	balanceResponse := &models.BalanceResult{
+		Balance: "0.003 CELO",
+		Nonce:   json.Number("0"),
+	}
+	return balanceResponse, nil
+}
+
+func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
+	return &models.TrackStatusResult{
+		Active: true,
+	}, nil
+}
+
+func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
+	return []dataserviceapi.TokenHoldings {
+		dataserviceapi.TokenHoldings {
+			ContractAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
+			TokenSymbol:     "SRF",
+			TokenDecimals:   "6",
+			Balance:         "2745987",
+		},
+	}, nil
+}
+
+func (tas *TestAccountService) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
+	return []dataserviceapi.Last10TxResponse{}, nil
+}
+
+func (m TestAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
+	return &models.VoucherDataResult{}, nil
+}
+
+func (tas *TestAccountService) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
+	return &models.TokenTransferResponse{
+		TrackingId: "e034d147-747d-42ea-928d-b5a7cb3426af",
+	}, nil
+}

internal/testutil/testtag/offlinetest.go

@@ -0,0 +1,12 @@
+// +build !online
+
+package testtag
+
+import (
+	"git.grassecon.net/urdt/ussd/remote"
+	accountservice "git.grassecon.net/urdt/ussd/internal/testutil/testservice"
+)
+
+var (
+	AccountService remote.AccountServiceInterface = &accountservice.TestAccountService{}
+)

internal/testutil/testtag/onlinetest.go

@@ -0,0 +1,9 @@
+// +build online
+
+package testtag
+
+import "git.grassecon.net/urdt/ussd/remote"
+
+var (
+	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/db.go

@@ -1,37 +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_FIRST_NAME
-	DATA_FAMILY_NAME
-	DATA_YOB
-	DATA_LOCATION
-	DATA_GENDER
-	DATA_OFFERINGS
-	DATA_RECIPIENT
-	DATA_AMOUNT
-	DATA_TEMPORARY_PIN
-)
-
-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/isocode.go

@@ -0,0 +1,11 @@
+package utils
+
+var isoCodes = map[string]bool{
+	"eng": true, // English
+	"swa": true, // Swahili
+
+}
+
+func IsValidISO639(code string) bool {
+	return isoCodes[code]
+}

menutraversal_test/group_test.json

@@ -0,0 +1,460 @@
+{
+    "groups": [
+        {
+            "name": "my_account_change_pin",
+            "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": "5",
+                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Enter your old PIN\n\n0:Back"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "Enter a new four number PIN:\n\n0:Back"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "Confirm your new PIN:\n\n0:Back"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "Your PIN change request has been successful\n\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                }
+            ]
+        },
+        {
+            "name": "menu_my_account_language_change",
+            "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": "2",
+                    "expectedContent": "Please enter your PIN:"
+                },
+                {
+                    "input": "1235",
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Please enter your PIN:"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "Select language:\n0:english\n1:kiswahili"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "Your language change request was successful.\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                }
+            ]
+        },
+        {
+            "name": "menu_my_account_check_my_balance",
+            "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": "3",
+                    "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Please enter your PIN:"
+                },
+                {
+                    "input": "1235",
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Please enter your PIN:"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "Balance: {balance}\n\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "0",
+                     "expectedContent": "Balances:\n1:My balance\n2:Community balance\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"
+                }
+            ]
+        },
+        {
+            "name": "menu_my_account_check_community_balance",
+            "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": "3",
+                    "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
+                },
+                {
+                    "input": "2",
+                    "expectedContent": "Please enter your PIN:"
+                },
+                {
+                    "input": "1235",
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Please enter your PIN:"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "{balance}\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "0",
+                     "expectedContent": "Balances:\n1:My balance\n2:Community balance\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"
+                }
+            ]
+        },
+        {
+            "name": "menu_my_account_edit_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": "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": "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"
+                }
+            ]
+        },
+        {
+            "name": "menu_my_account_edit_familyname",
+            "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": "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": "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"
+                }
+               
+            ]
+        },
+        {
+            "name": "menu_my_account_edit_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": "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": "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"
+                }
+            ]
+        },
+        {
+            "name": "menu_my_account_edit_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": "1945",
+                    "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": "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"
+                }
+            ]
+        },
+        {
+            "name": "menu_my_account_edit_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": "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": "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"
+                }
+            ]
+        },
+        {
+            "name": "menu_my_account_edit_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": "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"
+                }
+            ]
+        },
+        {
+            "name": "menu_my_account_view_profile",
+            "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": "7",
+                    "expectedContent": "Please enter your PIN:"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 79\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

@@ -0,0 +1,380 @@
+package menutraversaltest
+
+import (
+	"bytes"
+	"context"
+	"log"
+	"math/rand"
+	"os"
+	"regexp"
+	"testing"
+
+	"git.grassecon.net/urdt/ussd/internal/testutil"
+	"git.grassecon.net/urdt/ussd/internal/testutil/driver"
+	"github.com/gofrs/uuid"
+)
+
+var (
+	testData      = driver.ReadData()
+	testStore     = ".test_state"
+	groupTestFile = "group_test.json"
+	sessionID     string
+	src           = rand.NewSource(42)
+	g             = rand.New(src)
+)
+
+func GenerateSessionId() string {
+	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
+	v, err := uu.NewV4()
+	if err != nil {
+		panic(err)
+	}
+	return v.String()
+}
+
+// Extract the public key from the engine response
+func extractPublicKey(response []byte) string {
+	// Regex pattern to match the public key starting with 0x and 40 characters
+	re := regexp.MustCompile(`0x[a-fA-F0-9]{40}`)
+	match := re.Find(response)
+	if match != nil {
+		return string(match)
+	}
+	return ""
+}
+
+// Extracts the balance value from the engine response.
+func extractBalance(response []byte) string {
+	// Regex to match "Balance: <amount> <symbol>" followed by a newline
+	re := regexp.MustCompile(`(?m)^Balance:\s+(\d+(\.\d+)?)\s+([A-Z]+)`)
+	match := re.FindSubmatch(response)
+	if match != nil {
+		return string(match[1]) + " " + string(match[3]) // "<amount> <symbol>"
+	}
+	return ""
+}
+
+// Extracts the Maximum amount value from the engine response.
+func extractMaxAmount(response []byte) string {
+	// Regex to match "Maximum amount: <amount>" followed by a newline
+	re := regexp.MustCompile(`(?m)^Maximum amount:\s+(\d+(\.\d+)?)`)
+	match := re.FindSubmatch(response)
+	if match != nil {
+		return string(match[1]) // "<amount>"
+	}
+	return ""
+}
+
+// Extracts the send amount value from the engine response.
+func extractSendAmount(response []byte) string {
+	// Regex to match the pattern "will receive X.XX SYM from"
+	re := regexp.MustCompile(`will receive (\d+\.\d{2}\s+[A-Z]+) from`)
+	match := re.FindSubmatch(response)
+	if match != nil {
+		return string(match[1]) // Returns "X.XX SYM"
+	}
+	return ""
+}
+
+func TestMain(m *testing.M) {
+	sessionID = GenerateSessionId()
+	defer func() {
+		if err := os.RemoveAll(testStore); err != nil {
+			log.Fatalf("Failed to delete state store %s: %v", testStore, err)
+		}
+	}()
+	m.Run()
+}
+
+func TestAccountCreationSuccessful(t *testing.T) {
+	en, fn, eventChannel := testutil.TestEngine(sessionID)
+	defer fn()
+	ctx := context.Background()
+	sessions := testData
+	for _, session := range sessions {
+		groups := driver.FilterGroupsByName(session.Groups, "account_creation_successful")
+		for _, group := range groups {
+			for _, step := range group.Steps {
+				cont, err := en.Exec(ctx, []byte(step.Input))
+				if err != nil {
+					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
+				}
+				if !cont {
+					break
+				}
+				w := bytes.NewBuffer(nil)
+				_, err = en.Flush(ctx, w)
+				if err != nil {
+					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
+				}
+				b := w.Bytes()
+				match, err := step.MatchesExpectedContent(b)
+				if err != nil {
+					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
+				}
+				if !match {
+					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
+				}
+			}
+		}
+	}
+	<-eventChannel
+
+}
+
+func TestAccountRegistrationRejectTerms(t *testing.T) {
+	// Generate a new UUID for this edge case test
+	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
+	v, err := uu.NewV4()
+	if err != nil {
+		t.Fail()
+	}
+	edgeCaseSessionID := v.String()
+	en, fn, _ := testutil.TestEngine(edgeCaseSessionID)
+	defer fn()
+	ctx := context.Background()
+	sessions := testData
+	for _, session := range sessions {
+		groups := driver.FilterGroupsByName(session.Groups, "account_creation_reject_terms")
+		for _, group := range groups {
+			for _, step := range group.Steps {
+				cont, err := en.Exec(ctx, []byte(step.Input))
+				if err != nil {
+					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
+					return
+				}
+				if !cont {
+					break
+				}
+				w := bytes.NewBuffer(nil)
+				if _, err := en.Flush(ctx, w); err != nil {
+					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
+				}
+
+				b := w.Bytes()
+				match, err := step.MatchesExpectedContent(b)
+				if err != nil {
+					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
+				}
+				if !match {
+					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
+				}
+			}
+		}
+	}
+}
+
+func TestMainMenuHelp(t *testing.T) {
+	en, fn, _ := testutil.TestEngine(sessionID)
+	defer fn()
+	ctx := context.Background()
+	sessions := testData
+	for _, session := range sessions {
+		groups := driver.FilterGroupsByName(session.Groups, "main_menu_help")
+		for _, group := range groups {
+			for _, step := range group.Steps {
+				cont, err := en.Exec(ctx, []byte(step.Input))
+				if err != nil {
+					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
+					return
+				}
+				if !cont {
+					break
+				}
+				w := bytes.NewBuffer(nil)
+				if _, err := en.Flush(ctx, w); err != nil {
+					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
+				}
+
+				b := w.Bytes()
+				balance := extractBalance(b)
+
+				expectedContent := []byte(step.ExpectedContent)
+				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
+
+				step.ExpectedContent = string(expectedContent)
+				match, err := step.MatchesExpectedContent(b)
+				if err != nil {
+					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
+				}
+				if !match {
+					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
+				}
+			}
+		}
+	}
+}
+
+func TestMainMenuQuit(t *testing.T) {
+	en, fn, _ := testutil.TestEngine(sessionID)
+	defer fn()
+	ctx := context.Background()
+	sessions := testData
+	for _, session := range sessions {
+		groups := driver.FilterGroupsByName(session.Groups, "main_menu_quit")
+		for _, group := range groups {
+			for _, step := range group.Steps {
+				cont, err := en.Exec(ctx, []byte(step.Input))
+				if err != nil {
+					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
+					return
+				}
+				if !cont {
+					break
+				}
+				w := bytes.NewBuffer(nil)
+				if _, err := en.Flush(ctx, w); err != nil {
+					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
+				}
+
+				b := w.Bytes()
+				balance := extractBalance(b)
+
+				expectedContent := []byte(step.ExpectedContent)
+				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
+
+				step.ExpectedContent = string(expectedContent)
+				match, err := step.MatchesExpectedContent(b)
+				if err != nil {
+					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
+				}
+				if !match {
+					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
+				}
+			}
+		}
+	}
+}
+
+func TestMyAccount_MyAddress(t *testing.T) {
+	en, fn, _ := testutil.TestEngine(sessionID)
+	defer fn()
+	ctx := context.Background()
+	sessions := testData
+	for _, session := range sessions {
+		groups := driver.FilterGroupsByName(session.Groups, "menu_my_account_my_address")
+		for _, group := range groups {
+			for index, step := range group.Steps {
+				t.Logf("step %v with input %v", index, step.Input)
+				cont, err := en.Exec(ctx, []byte(step.Input))
+				if err != nil {
+					t.Errorf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
+					return
+				}
+				if !cont {
+					break
+				}
+				w := bytes.NewBuffer(nil)
+				if _, err := en.Flush(ctx, w); err != nil {
+					t.Errorf("Test case '%s' failed during Flush: %v", group.Name, err)
+				}
+				b := w.Bytes()
+
+				balance := extractBalance(b)
+				publicKey := extractPublicKey(b)
+
+				expectedContent := []byte(step.ExpectedContent)
+				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
+				expectedContent = bytes.Replace(expectedContent, []byte("{public_key}"), []byte(publicKey), -1)
+
+				step.ExpectedContent = string(expectedContent)
+				match, err := step.MatchesExpectedContent(b)
+				if err != nil {
+					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
+				}
+				if !match {
+					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", expectedContent, b)
+				}
+			}
+		}
+	}
+}
+
+func TestMainMenuSend(t *testing.T) {
+	en, fn, _ := testutil.TestEngine(sessionID)
+	defer fn()
+	ctx := context.Background()
+	sessions := testData
+	for _, session := range sessions {
+		groups := driver.FilterGroupsByName(session.Groups, "send_with_invalid_inputs")
+		for _, group := range groups {
+			for _, step := range group.Steps {
+				cont, err := en.Exec(ctx, []byte(step.Input))
+				if err != nil {
+					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
+					return
+				}
+				if !cont {
+					break
+				}
+				w := bytes.NewBuffer(nil)
+				if _, err := en.Flush(ctx, w); err != nil {
+					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
+				}
+
+				b := w.Bytes()
+				balance := extractBalance(b)
+				max_amount := extractMaxAmount(b)
+				send_amount := extractSendAmount(b)
+
+				expectedContent := []byte(step.ExpectedContent)
+				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
+				expectedContent = bytes.Replace(expectedContent, []byte("{max_amount}"), []byte(max_amount), -1)
+				expectedContent = bytes.Replace(expectedContent, []byte("{send_amount}"), []byte(send_amount), -1)
+				expectedContent = bytes.Replace(expectedContent, []byte("{session_id}"), []byte(sessionID), -1)
+
+				step.ExpectedContent = string(expectedContent)
+				match, err := step.MatchesExpectedContent(b)
+				if err != nil {
+					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
+				}
+				if !match {
+					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
+				}
+			}
+		}
+	}
+}
+
+func TestGroups(t *testing.T) {
+	groups, err := driver.LoadTestGroups(groupTestFile)
+	if err != nil {
+		log.Fatalf("Failed to load test groups: %v", err)
+	}
+	en, fn, _ := testutil.TestEngine(sessionID)
+	defer fn()
+	ctx := context.Background()
+	// Create test cases from loaded groups
+	tests := driver.CreateTestCases(groups)
+	for _, tt := range tests {
+		t.Run(tt.Name, func(t *testing.T) {
+			cont, err := en.Exec(ctx, []byte(tt.Input))
+			if err != nil {
+				t.Errorf("Test case '%s' failed at input '%s': %v", tt.Name, tt.Input, err)
+				return
+			}
+			if !cont {
+				return
+			}
+			w := bytes.NewBuffer(nil)
+			if _, err := en.Flush(ctx, w); err != nil {
+				t.Errorf("Test case '%s' failed during Flush: %v", tt.Name, err)
+			}
+			b := w.Bytes()
+			balance := extractBalance(b)
+
+			expectedContent := []byte(tt.ExpectedContent)
+			expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
+
+			tt.ExpectedContent = string(expectedContent)
+
+			match, err := tt.MatchesExpectedContent(b)
+			if err != nil {
+				t.Fatalf("Error compiling regex for step '%s': %v", tt.Input, err)
+			}
+			if !match {
+				t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", tt.ExpectedContent, b)
+			}
+		})
+	}
+}

menutraversal_test/test_setup.json

@@ -0,0 +1,133 @@
+[
+    {
+        "name": "session one",
+        "groups": [
+            {
+                "name": "account_creation_successful",
+                "steps": [
+                    {
+                        "input": "",
+                        "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"
+                    },
+                    {
+                        "input": "0",
+                        "expectedContent": "Please enter a new four number PIN for your account:\n0:Exit"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Enter your four number PIN again:"
+                    },
+                    {
+                        "input": "1111",
+                        "expectedContent": "The PIN is not a match. Try again\n1:Retry\n9:Quit"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "Enter your four number PIN again:"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Your account is being created...Thank you for using Sarafu. Goodbye!"
+                    }
+                ]
+            },
+            {
+                "name": "account_creation_reject_terms",
+                "steps": [
+                    {
+                        "input": "",
+                        "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"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "Thank you for using Sarafu. Goodbye!"
+                    }
+                ]
+            },
+            {
+                "name": "send_with_invite",
+                "steps": [
+                    {
+                        "input": "",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "Enter recipient's phone number:\n0:Back"
+                    },
+                    {
+                        "input": "000",
+                        "expectedContent": "000 is invalid, please try again:\n1:Retry\n9:Quit"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "Enter recipient's phone number:\n0:Back"
+                    },
+                    {
+                        "input": "0712345678",
+                        "expectedContent": "0712345678 is not registered, please try again:\n1:Retry\n2:Invite to Sarafu Network\n9:Quit"
+                    },
+                    {
+                        "input": "2",
+                        "expectedContent": "Your invite request for 0712345678 to Sarafu Network failed. Please try again later."
+                    }
+                ]
+            },
+            {
+                "name": "main_menu_help",
+                "steps": [
+                    {
+                        "input": "",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    },
+                    {
+                        "input": "4",
+                        "expectedContent": "For more help,please call: 0757628885"
+                    }
+                ]
+            },
+            {
+                "name": "main_menu_quit",
+                "steps": [
+                    {
+                        "input": "",
+                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    },
+                    {
+                        "input": "9",
+                        "expectedContent": "Thank you for using Sarafu. Goodbye!"
+                    }
+                ]
+            },
+            {
+                "name": "menu_my_account_my_address",
+                "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": "6",
+                        "expectedContent": "Address: {public_key}\n0:Back\n9:Quit"
+                    },
+                    {
+                        "input": "9",
+                        "expectedContent": "Thank you for using Sarafu. Goodbye!"
+                    }
+                ]
+            }
+        ]
+    }
+]

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/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,8 @@
+package models
+
+type VoucherDataResult struct {
+	TokenName     string `json:"tokenName"`
+	TokenSymbol   string `json:"tokenSymbol"`
+	TokenDecimals int    `json:"tokenDecimals"`
+	SinkAddress   string `json:"sinkAddress"`
+}

remote/accountservice.go

@@ -0,0 +1,273 @@
+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)
+}
+
+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
+}
+
+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))
+}

sample_tokens.json

@@ -0,0 +1,44 @@
+{
+    "ok": true,
+    "description": "Token holdings with current balances",
+    "result": {
+      "holdings": [
+        {
+          "contractAddress": "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
+          "tokenSymbol": "FSPTST",
+          "tokenDecimals": "6",
+          "balance": "8869964242"
+        },
+        {
+          "contractAddress": "0x724F2910D790B54A39a7638282a45B1D83564fFA",
+          "tokenSymbol": "GEO",
+          "tokenDecimals": "6",
+          "balance": "9884"
+        },
+        {
+          "contractAddress": "0x2105a206B7bec31E2F90acF7385cc8F7F5f9D273",
+          "tokenSymbol": "MFNK",
+          "tokenDecimals": "6",
+          "balance": "19788697"
+        },
+        {
+          "contractAddress": "0x63DE2Ac8D1008351Cc69Fb8aCb94Ba47728a7E83",
+          "tokenSymbol": "MILO",
+          "tokenDecimals": "6",
+          "balance": "75"
+        },
+        {
+          "contractAddress": "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
+          "tokenSymbol": "SOHAIL",
+          "tokenDecimals": "6",
+          "balance": "27874115"
+        },
+        {
+          "contractAddress": "0x45d747172e77d55575c197CbA9451bC2CD8F4958",
+          "tokenSymbol": "SRF",
+          "tokenDecimals": "6",
+          "balance": "2745987"
+        }
+      ]
+    }
+  }

services/registration/_catch

@@ -0,0 +1 @@
+Something went wrong.Please try again

services/registration/_catch.vis

@@ -0,0 +1 @@
+HALT

services/registration/account_creation.vis

@@ -1,4 +1,4 @@
-RELOAD verify_pin
+RELOAD verify_create_pin
 CATCH create_pin_mismatch flag_pin_mismatch 1
 LOAD quit 0
 HALT

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

@@ -1,12 +1,15 @@
 LOAD reset_transaction_amount 0
 LOAD max_amount 10
+RELOAD max_amount
 MAP max_amount
 MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
+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

@@ -0,0 +1 @@
+Failed to connect to the custodial service.Please try again.

services/registration/api_failure.vis

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

services/registration/balances.vis

@@ -1,4 +1,5 @@
 LOAD reset_account_authorized 0
+RELOAD reset_account_authorized
 MOUT my_balance 1
 MOUT community_balance 2
 MOUT back 0

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 @@
-Your community balance is: 0.00SRF
+{{.fetch_community_balance}}

services/registration/community_balance.vis

@@ -1,5 +1,11 @@
-LOAD reset_incorrect 0
+LOAD reset_incorrect 6
+LOAD fetch_community_balance 0
+CATCH api_failure  flag_api_call_error  1
+MAP fetch_community_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
-LOAD quit_with_balance 0
+MOUT back 0
+MOUT quit 9
 HALT
+INCMP _ 0
+INCMP quit 9

services/registration/confirm_create_pin.vis

@@ -1,4 +1,4 @@
-LOAD save_pin 0
+LOAD save_temporary_pin 6
 HALT
-LOAD verify_pin 8
+LOAD verify_create_pin 8
 INCMP account_creation *

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/create_pin.vis

@@ -2,8 +2,8 @@ LOAD create_account 0
 CATCH account_creation_failed flag_account_creation_failed 1
 MOUT exit 0
 HALT
-LOAD save_pin 0
+LOAD save_temporary_pin 6
-RELOAD save_pin
+RELOAD save_temporary_pin
 CATCH . flag_incorrect_pin 1
 INCMP quit 0
 INCMP confirm_create_pin *

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,10 @@
+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
+MOUT back 0
+HALT
+LOAD save_familyname 0
+RELOAD save_familyname
+INCMP _ 0
+INCMP pin_entry *

services/registration/edit_family_name_menu

@@ -0,0 +1 @@
+Edit family name

services/registration/edit_family_name_menu_swa

@@ -0,0 +1 @@
+Weka jina la familia

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:

services/registration/edit_first_name.vis

@@ -0,0 +1,11 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_firstname flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
+MAP get_current_profile_info
+MOUT back 0
+HALT
+LOAD save_firstname 0
+RELOAD save_firstname
+INCMP _ 0
+INCMP pin_entry *