Merge branch 'master' into lash/ssh-4

.env.example

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

.gitignore

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

README.md

@@ -1,91 +1,8 @@
-# URDT USSD service
+# ussd
 
-This is a USSD service built using the [go-vise](https://github.com/nolash/go-vise) engine.
+> USSD
 
-## Prerequisites
+USSD service.
-### 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,13 +1,9 @@
 package main
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
 	"flag"
 	"fmt"
-	"io"
-	"log"
 	"net/http"
 	"os"
 	"os/signal"
@@ -29,8 +25,8 @@ import (
 )
 
 var (
-	logg        = logging.NewVanilla()
+	logg      = logging.NewVanilla()
-	scriptDir   = path.Join("services", "registration")
+	scriptDir = path.Join("services", "registration")
 )
 
 func init() {
@@ -42,30 +38,9 @@ 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)
 	}
 
@@ -181,13 +156,9 @@ 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: mux,
+		Handler: sh,
 	}
 	s.RegisterOnShutdown(sh.Shutdown)
 

cmd/ssh/README.md

@@ -0,0 +1,34 @@
+# URDT-USSD SSH server
+
+An SSH server entry point for the vise engine.
+
+
+## Adding public keys for access
+
+Map your (client) public key to a session identifier (e.g. phone number)
+
+```
+go run -v -tags logtrace ./cmd/ssh/sshkey/main.go -i <session_id> [--dbdir <dbpath>] <client_publickey_filepath>
+```
+
+
+## Create a private key for the server
+
+```
+ssh-keygen -N "" -f <server_privatekey_filepath>
+```
+
+
+## Run the server
+
+
+```
+go run -v -tags logtrace ./cmd/ssh/main.go -h <host> -p <port> [--dbdir <dbpath>] <server_privatekey_filepath>
+```
+
+
+## Connect to the server
+
+```
+ssh [-v] -T -p <port> -i <client_publickey_filepath> <host>
+```

cmd/ssh/main.go

@@ -0,0 +1,115 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"path"
+	"os"
+	"os/signal"
+	"sync"
+	"syscall"
+
+	"git.defalsify.org/vise.git/db"
+	"git.defalsify.org/vise.git/engine"
+	"git.defalsify.org/vise.git/logging"
+
+	"git.grassecon.net/urdt/ussd/internal/ssh"
+)
+
+var (
+	wg sync.WaitGroup
+	keyStore db.Db
+	logg      = logging.NewVanilla()
+	scriptDir = path.Join("services", "registration")
+)
+
+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)
+	}
+
+	ctx := context.Background()
+	logg.WarnCtxf(ctx, "!!!!! WARNING WARNING WARNING")
+	logg.WarnCtxf(ctx, "!!!!! =======================")
+	logg.WarnCtxf(ctx, "!!!!! This is not a production ready server!")
+	logg.WarnCtxf(ctx, "!!!!! Do not expose to internet and only use with tunnel!")
+	logg.WarnCtxf(ctx, "!!!!! (See ssh -L <...>)")
+
+	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size, "keyfile", sshKeyFile, "host", host, "port", port)
+
+	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
+	}
+
+	authKeyStore, err := ssh.NewSshKeyStore(ctx, dbDir)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "keystore file open error: %v", err)
+		os.Exit(1)
+	}
+	defer func () {
+		logg.TraceCtxf(ctx, "shutdown auth key store reached")
+		err = authKeyStore.Close()
+		if err != nil {
+			logg.ErrorCtxf(ctx, "keystore close error", "err", err)
+		}
+	}()
+
+	cint := make(chan os.Signal)
+	cterm := make(chan os.Signal)
+	signal.Notify(cint, os.Interrupt, syscall.SIGINT)
+	signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
+
+	runner := &ssh.SshRunner{
+		Cfg: cfg,
+		Debug: engineDebug,
+		FlagFile: pfp,
+		DbDir: dbDir,
+		ResourceDir: resourceDir,
+		SrvKeyFile: sshKeyFile,
+		Host: host,
+		Port: port,
+	}
+	go func() {
+		select {
+		case _ = <-cint:
+		case _ = <-cterm:
+		}
+		logg.TraceCtxf(ctx, "shutdown runner reached")
+		err := runner.Stop()
+		if err != nil {
+			logg.ErrorCtxf(ctx, "runner stop error", "err", err)
+		}
+		
+	}()
+	runner.Run(ctx, authKeyStore)
+}

cmd/ssh/sshkey/main.go

@@ -0,0 +1,44 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"git.grassecon.net/urdt/ussd/internal/ssh"
+)
+
+func main() {
+	var dbDir string
+	var sessionId string
+	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
+	flag.StringVar(&sessionId, "i", "", "session id")
+	flag.Parse()
+
+	if sessionId == "" {
+		fmt.Fprintf(os.Stderr, "empty session id\n")
+		os.Exit(1)
+	}
+
+	ctx := context.Background()
+
+	sshKeyFile := flag.Arg(0)
+	if sshKeyFile == "" {
+		fmt.Fprintf(os.Stderr, "missing key file argument\n")
+		os.Exit(1)
+	}
+
+	store, err := ssh.NewSshKeyStore(ctx, dbDir)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		os.Exit(1)
+	}
+	defer store.Close()
+
+	err = store.AddFromFile(ctx, sshKeyFile, sessionId)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		os.Exit(1)
+	}
+}

common/db.go

@@ -2,7 +2,6 @@ package common
 
 import (
 	"encoding/binary"
-	"errors"
 
 	"git.defalsify.org/vise.git/logging"
 )
@@ -49,23 +48,3 @@ 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/tokens.go

@@ -1,81 +0,0 @@
-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

@@ -1,129 +0,0 @@
-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/vouchers.go

@@ -3,7 +3,6 @@ package common
 import (
 	"context"
 	"fmt"
-	"math/big"
 	"strings"
 
 	"git.grassecon.net/urdt/ussd/internal/storage"
@@ -25,11 +24,7 @@ func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
 
 	for i, h := range holdings {
 		symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, h.TokenSymbol))
-
+		balances = append(balances, fmt.Sprintf("%d:%s", i+1, h.Balance))
-		// Scale down the balance
-		scaledBalance := ScaleDownBalance(h.Balance, h.TokenDecimals)
-
-		balances = append(balances, fmt.Sprintf("%d:%s", i+1, scaledBalance))
 		decimals = append(decimals, fmt.Sprintf("%d:%s", i+1, h.TokenDecimals))
 		addresses = append(addresses, fmt.Sprintf("%d:%s", i+1, h.ContractAddress))
 	}
@@ -42,25 +37,14 @@ func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
 	return data
 }
 
-func ScaleDownBalance(balance, decimals string) string {
+//func StoreVouchers(db storage.PrefixDb, data VoucherMetadata) {
-	// Convert balance and decimals to big.Float
+//		value, err := db.Put(ctx, []byte(key))
-	bal := new(big.Float)
+//		if err != nil {
-	bal.SetString(balance)
+//			return nil, fmt.Errorf("failed to get %s: %v", key, err)
-
+//		}
-	dec, ok := new(big.Int).SetString(decimals, 10)
+//		data[key] = string(value)
-	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) {
@@ -100,7 +84,7 @@ func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol,
 	decList := strings.Split(decimals, "\n")
 	addrList := strings.Split(addresses, "\n")
 
-	logg.Tracef("found", "symlist", symList, "syms", symbols, "input", input)
+	logg.Tracef("found" , "symlist", symList, "syms", symbols, "input", input)
 	for i, sym := range symList {
 		parts := strings.SplitN(sym, ":", 2)
 
@@ -151,7 +135,7 @@ func GetTemporaryVoucherData(ctx context.Context, store DataStore, sessionId str
 	return data, nil
 }
 
-// UpdateVoucherData sets the active voucher data in the DataStore.
+// UpdateVoucherData sets the active voucher data and clears the temporary 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

common/vouchers_test.go

@@ -59,13 +59,13 @@ func TestMatchVoucher(t *testing.T) {
 
 func TestProcessVouchers(t *testing.T) {
 	holdings := []dataserviceapi.TokenHoldings{
-		{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100000000"},
+		{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100"},
-		{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200000000"},
+		{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200"},
 	}
 
 	expectedResult := VoucherMetadata{
 		Symbols:   "1:SRF\n2:MILO",
-		Balances:  "1:100\n2:20000",
+		Balances:  "1:100\n2:200",
 		Decimals:  "1:6\n2:4",
 		Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa",
 	}

config/config.go

@@ -7,31 +7,30 @@ import (
 )
 
 const (
-	createAccountPath          = "/api/v2/account/create"
+	createAccountPath = "/api/v2/account/create"
-	trackStatusPath            = "/api/track"
+	trackStatusPath = "/api/track"
-	balancePathPrefix          = "/api/account"
+	balancePathPrefix = "/api/account"
-	trackPath                  = "/api/v2/account/status"
+	trackPath = "/api/v2/account/status"
-	tokenTransferPrefix        = "/api/v2/token/transfer"
+	voucherHoldingsPathPrefix = "/api/v1/holdings"
-	voucherHoldingsPathPrefix  = "/api/v1/holdings"
 	voucherTransfersPathPrefix = "/api/v1/transfers/last10"
-	voucherDataPathPrefix      = "/api/v1/token"
+	voucherDataPathPrefix = "/api/v1/token"
 )
 
 var (
 	custodialURLBase string
-	dataURLBase      string
+	dataURLBase string
-	BearerToken      string
+	CustodialAPIKey string
+	DataAPIKey string
 )
 
 var (
-	CreateAccountURL    string
+	CreateAccountURL string
-	TrackStatusURL      string
+	TrackStatusURL   string
-	BalanceURL          string
+	BalanceURL	string
-	TrackURL            string
+	TrackURL         string
-	TokenTransferURL    string
+	VoucherHoldingsURL	string
-	VoucherHoldingsURL  string
+	VoucherTransfersURL	string
-	VoucherTransfersURL string
+	VoucherDataURL	string
-	VoucherDataURL      string
 )
 
 func setBase() error {
@@ -39,7 +38,8 @@ func setBase() error {
 
 	custodialURLBase = initializers.GetEnv("CUSTODIAL_URL_BASE", "http://localhost:5003")
 	dataURLBase = initializers.GetEnv("DATA_URL_BASE", "http://localhost:5006")
-	BearerToken = initializers.GetEnv("BEARER_TOKEN", "")
+	CustodialAPIKey = initializers.GetEnv("CUSTODIAL_API_KEY", "xd")
+	DataAPIKey = initializers.GetEnv("DATA_API_KEY", "xd")
 
 	_, err = url.JoinPath(custodialURLBase, "/foo")
 	if err != nil {
@@ -58,11 +58,10 @@ func LoadConfig() error {
 	if err != nil {
 		return err
 	}
-	CreateAccountURL, _ = url.JoinPath(custodialURLBase, createAccountPath)
+	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)

internal/handlers/handlerservice.go

@@ -80,7 +80,6 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceIn
 	ls.DbRs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
 	ls.DbRs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
 	ls.DbRs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
-	ls.DbRs.AddLocalFunc("invite_valid_recipient", ussdHandlers.InviteValidRecipient)
 	ls.DbRs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
 	ls.DbRs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
 	ls.DbRs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
@@ -109,7 +108,6 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceIn
 	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)
@@ -117,7 +115,6 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceIn
 	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)
 
 	return ussdHandlers, nil
 }

internal/handlers/ussd/menuhandler.go

@@ -161,7 +161,6 @@ func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (r
 
 	languageSetFlag, err := h.flagManager.GetFlag("flag_language_set")
 	if err != nil {
-		logg.ErrorCtxf(ctx, "Error setting the languageSetFlag", "error", err)
 		return res, err
 	}
 	res.FlagSet = append(res.FlagSet, languageSetFlag)
@@ -199,6 +198,7 @@ func (h *Handlers) createAccountNoExist(ctx context.Context, sessionId string, r
 	}
 	res.FlagSet = append(res.FlagSet, flag_account_created)
 	return nil
+
 }
 
 // CreateAccount checks if any account exists on the JSON data file, and if not
@@ -215,15 +215,13 @@ func (h *Handlers) CreateAccount(ctx context.Context, sym string, input []byte)
 	_, err = store.ReadEntry(ctx, sessionId, common.DATA_ACCOUNT_CREATED)
 	if err != nil {
 		if db.IsNotFound(err) {
-			logg.InfoCtxf(ctx, "Creating an account because it doesn't exist")
+			logg.Printf(logging.LVL_INFO, "Creating an account because it doesn't exist")
 			err = h.createAccountNoExist(ctx, sessionId, &res)
 			if err != nil {
-				logg.ErrorCtxf(ctx, "failed on createAccountNoExist", "error", err)
 				return res, err
 			}
 		}
 	}
-
 	return res, nil
 }
 
@@ -237,12 +235,10 @@ func (h *Handlers) CheckPinMisMatch(ctx context.Context, sym string, input []byt
 	store := h.userdataStore
 	blockedNumber, err := store.ReadEntry(ctx, sessionId, common.DATA_BLOCKED_NUMBER)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read blockedNumber entry with", "key", common.DATA_BLOCKED_NUMBER, "error", err)
 		return res, err
 	}
 	temporaryPin, err := store.ReadEntry(ctx, string(blockedNumber), common.DATA_TEMPORARY_VALUE)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read temporaryPin entry with", "key", common.DATA_TEMPORARY_VALUE, "error", err)
 		return res, err
 	}
 	if bytes.Equal(temporaryPin, input) {
@@ -295,7 +291,6 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
 	store := h.userdataStore
 	err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(accountPIN))
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write temporaryAccountPIN entry with", "key", common.DATA_TEMPORARY_VALUE, "value", accountPIN, "error", err)
 		return res, err
 	}
 
@@ -313,14 +308,12 @@ func (h *Handlers) SaveOthersTemporaryPin(ctx context.Context, sym string, input
 	}
 	temporaryPin := string(input)
 	blockedNumber, err := store.ReadEntry(ctx, sessionId, common.DATA_BLOCKED_NUMBER)
+
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read blockedNumber entry with", "key", common.DATA_BLOCKED_NUMBER, "error", err)
 		return res, err
 	}
-
 	err = store.WriteEntry(ctx, string(blockedNumber), common.DATA_TEMPORARY_VALUE, []byte(temporaryPin))
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write temporaryPin entry with", "key", common.DATA_TEMPORARY_VALUE, "value", temporaryPin, "error", err)
 		return res, err
 	}
 
@@ -338,7 +331,6 @@ func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byt
 	store := h.userdataStore
 	temporaryPin, err := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read temporaryPin entry with", "key", common.DATA_TEMPORARY_VALUE, "error", err)
 		return res, err
 	}
 	if bytes.Equal(temporaryPin, input) {
@@ -348,7 +340,6 @@ func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byt
 	}
 	err = store.WriteEntry(ctx, sessionId, common.DATA_ACCOUNT_PIN, []byte(temporaryPin))
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write temporaryPin entry with", "key", common.DATA_ACCOUNT_PIN, "value", temporaryPin, "error", err)
 		return res, err
 	}
 	return res, nil
@@ -371,7 +362,6 @@ func (h *Handlers) VerifyCreatePin(ctx context.Context, sym string, input []byte
 	store := h.userdataStore
 	temporaryPin, err := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read temporaryPin entry with", "key", common.DATA_TEMPORARY_VALUE, "error", err)
 		return res, err
 	}
 	if bytes.Equal(input, temporaryPin) {
@@ -384,7 +374,6 @@ func (h *Handlers) VerifyCreatePin(ctx context.Context, sym string, input []byte
 
 	err = store.WriteEntry(ctx, sessionId, common.DATA_ACCOUNT_PIN, []byte(temporaryPin))
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write temporaryPin entry with", "key", common.DATA_ACCOUNT_PIN, "value", temporaryPin, "error", err)
 		return res, err
 	}
 
@@ -417,13 +406,11 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
 		temporaryFirstName, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_FIRST_NAME, []byte(temporaryFirstName))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write firstName entry with", "key", common.DATA_FIRST_NAME, "value", temporaryFirstName, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(firstName))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write temporaryFirstName entry with", "key", common.DATA_TEMPORARY_VALUE, "value", firstName, "error", err)
 			return res, err
 		}
 	}
@@ -450,17 +437,14 @@ func (h *Handlers) SaveFamilyname(ctx context.Context, sym string, input []byte)
 		temporaryFamilyName, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_FAMILY_NAME, []byte(temporaryFamilyName))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write familyName entry with", "key", common.DATA_FAMILY_NAME, "value", temporaryFamilyName, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(familyName))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write temporaryFamilyName entry with", "key", common.DATA_TEMPORARY_VALUE, "value", familyName, "error", err)
 			return res, err
 		}
 	}
-
 	return res, nil
 }
 
@@ -481,13 +465,11 @@ func (h *Handlers) SaveYob(ctx context.Context, sym string, input []byte) (resou
 		temporaryYob, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_YOB, []byte(temporaryYob))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write yob entry with", "key", common.DATA_TEMPORARY_VALUE, "value", temporaryYob, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(yob))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write temporaryYob entry with", "key", common.DATA_TEMPORARY_VALUE, "value", yob, "error", err)
 			return res, err
 		}
 	}
@@ -513,13 +495,11 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (
 		temporaryLocation, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_LOCATION, []byte(temporaryLocation))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write location entry with", "key", common.DATA_LOCATION, "value", temporaryLocation, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(location))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write temporaryLocation entry with", "key", common.DATA_TEMPORARY_VALUE, "value", location, "error", err)
 			return res, err
 		}
 	}
@@ -545,13 +525,11 @@ func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (re
 		temporaryGender, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_GENDER, []byte(temporaryGender))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write gender entry with", "key", common.DATA_GENDER, "value", gender, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(gender))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write temporaryGender entry with", "key", common.DATA_TEMPORARY_VALUE, "value", gender, "error", err)
 			return res, err
 		}
 	}
@@ -578,13 +556,11 @@ func (h *Handlers) SaveOfferings(ctx context.Context, sym string, input []byte)
 		temporaryOfferings, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_OFFERINGS, []byte(temporaryOfferings))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write offerings entry with", "key", common.DATA_TEMPORARY_VALUE, "value", offerings, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(offerings))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write temporaryOfferings entry with", "key", common.DATA_TEMPORARY_VALUE, "value", offerings, "error", err)
 			return res, err
 		}
 	}
@@ -595,7 +571,9 @@ func (h *Handlers) SaveOfferings(ctx context.Context, sym string, input []byte)
 // ResetAllowUpdate resets the allowupdate flag that allows a user to update  profile data.
 func (h *Handlers) ResetAllowUpdate(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+
 	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+
 	res.FlagReset = append(res.FlagReset, flag_allow_update)
 	return res, nil
 }
@@ -612,6 +590,7 @@ func (h *Handlers) ResetValidPin(ctx context.Context, sym string, input []byte)
 func (h *Handlers) ResetAccountAuthorized(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
+
 	res.FlagReset = append(res.FlagReset, flag_account_authorized)
 	return res, nil
 }
@@ -647,7 +626,6 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
 	store := h.userdataStore
 	AccountPin, err := store.ReadEntry(ctx, sessionId, common.DATA_ACCOUNT_PIN)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read AccountPin entry with", "key", common.DATA_ACCOUNT_PIN, "error", err)
 		return res, err
 	}
 	if len(input) == 4 {
@@ -695,19 +673,18 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 	store := h.userdataStore
 	publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
 		return res, err
 	}
-
 	r, err := h.accountService.TrackAccountStatus(ctx, string(publicKey))
+
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_api_error)
-		logg.ErrorCtxf(ctx, "failed on TrackAccountStatus", "error", err)
 		return res, err
 	}
-
 	res.FlagReset = append(res.FlagReset, flag_api_error)
-
+	if !ok {
+		return res, err
+	}
 	if r.Active {
 		res.FlagSet = append(res.FlagSet, flag_account_success)
 		res.FlagReset = append(res.FlagReset, flag_account_pending)
@@ -715,7 +692,6 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 		res.FlagReset = append(res.FlagReset, flag_account_success)
 		res.FlagSet = append(res.FlagSet, flag_account_pending)
 	}
-
 	return res, nil
 }
 
@@ -807,13 +783,11 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 			return res, nil
 		}
 
-		logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", common.DATA_ACTIVE_SYM, "error", err)
 		return res, err
 	}
 
 	activeBal, err := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_BAL)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", common.DATA_ACTIVE_BAL, "error", err)
 		return res, err
 	}
 
@@ -837,7 +811,6 @@ func (h *Handlers) FetchCustodialBalances(ctx context.Context, sym string, input
 	store := h.userdataStore
 	publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
 		return res, err
 	}
 
@@ -870,19 +843,16 @@ func (h *Handlers) ResetOthersPin(ctx context.Context, sym string, input []byte)
 	}
 	blockedPhonenumber, err := store.ReadEntry(ctx, sessionId, common.DATA_BLOCKED_NUMBER)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read blockedPhonenumber entry with", "key", common.DATA_BLOCKED_NUMBER, "error", err)
 		return res, err
 	}
 	temporaryPin, err := store.ReadEntry(ctx, string(blockedPhonenumber), common.DATA_TEMPORARY_VALUE)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read temporaryPin entry with", "key", common.DATA_TEMPORARY_VALUE, "error", err)
 		return res, err
 	}
 	err = store.WriteEntry(ctx, string(blockedPhonenumber), common.DATA_ACCOUNT_PIN, []byte(temporaryPin))
 	if err != nil {
 		return res, nil
 	}
-
 	return res, nil
 }
 
@@ -911,11 +881,10 @@ func (h *Handlers) ValidateBlockedNumber(ctx context.Context, sym string, input
 	}
 	if err != nil {
 		if db.IsNotFound(err) {
-			logg.InfoCtxf(ctx, "Invalid or unregistered number")
+			logg.Printf(logging.LVL_INFO, "Invalid or unregistered number")
 			res.FlagSet = append(res.FlagSet, flag_unregistered_number)
 			return res, nil
 		} else {
-			logg.ErrorCtxf(ctx, "Error on ValidateBlockedNumber", "error", err)
 			return res, err
 		}
 	}
@@ -930,7 +899,6 @@ func (h *Handlers) ValidateBlockedNumber(ctx context.Context, sym string, input
 func (h *Handlers) ValidateRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	var err error
-	store := h.userdataStore
 
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
@@ -940,41 +908,18 @@ func (h *Handlers) ValidateRecipient(ctx context.Context, sym string, input []by
 	recipient := string(input)
 
 	flag_invalid_recipient, _ := h.flagManager.GetFlag("flag_invalid_recipient")
-	flag_invalid_recipient_with_invite, _ := h.flagManager.GetFlag("flag_invalid_recipient_with_invite")
 
 	if recipient != "0" {
-		if !isValidPhoneNumber(recipient) {
+		// mimic invalid number check
+		if recipient == "000" {
 			res.FlagSet = append(res.FlagSet, flag_invalid_recipient)
 			res.Content = recipient
 
 			return res, nil
 		}
-
+		store := h.userdataStore
-		// save the recipient as the temporaryRecipient
+		err = store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, []byte(recipient))
-		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(recipient))
 		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write temporaryRecipient entry with", "key", common.DATA_TEMPORARY_VALUE, "value", recipient, "error", err)
-			return res, err
-		}
-
-		publicKey, err := store.ReadEntry(ctx, recipient, common.DATA_PUBLIC_KEY)
-		if err != nil {
-			if db.IsNotFound(err) {
-				logg.InfoCtxf(ctx, "Unregistered number")
-
-				res.FlagSet = append(res.FlagSet, flag_invalid_recipient_with_invite)
-				res.Content = recipient
-
-				return res, nil
-			}
-
-			logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
-			return res, err
-		}
-
-		err = store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, publicKey)
-		if err != nil {
-			logg.ErrorCtxf(ctx, "failed to write recipient entry with", "key", common.DATA_RECIPIENT, "value", string(publicKey), "error", err)
 			return res, nil
 		}
 	}
@@ -1011,31 +956,6 @@ func (h *Handlers) TransactionReset(ctx context.Context, sym string, input []byt
 	return res, nil
 }
 
-// InviteValidRecipient sends an invitation to the valid phone number.
-func (h *Handlers) InviteValidRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	store := h.userdataStore
-
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	code := codeFromCtx(ctx)
-	l := gotext.NewLocale(translationDir, code)
-	l.AddDomain("default")
-
-	recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
-
-	// TODO
-	// send an invitation SMS
-	// if successful
-	// res.Content = l.Get("Your invitation to %s to join Sarafu Network has been sent.",  string(recipient))
-
-	res.Content = l.Get("Your invite request for %s to Sarafu Network failed. Please try again later.", string(recipient))
-	return res, nil
-}
-
 // ResetTransactionAmount resets the transaction amount and invalid flag
 func (h *Handlers) ResetTransactionAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -1072,7 +992,6 @@ func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (res
 
 	activeBal, err := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_BAL)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", common.DATA_ACTIVE_BAL, "error", err)
 		return res, err
 	}
 
@@ -1098,12 +1017,10 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
 	// retrieve the active balance
 	activeBal, err := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_BAL)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", common.DATA_ACTIVE_BAL, "error", err)
 		return res, err
 	}
 	balanceValue, err = strconv.ParseFloat(string(activeBal), 64)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "Failed to convert the activeBal to a float", "error", err)
 		return res, err
 	}
 
@@ -1126,15 +1043,14 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
 	formattedAmount := fmt.Sprintf("%.2f", inputAmount)
 	err = store.WriteEntry(ctx, sessionId, common.DATA_AMOUNT, []byte(formattedAmount))
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write amount entry with", "key", common.DATA_AMOUNT, "value", formattedAmount, "error", err)
 		return res, err
 	}
 
-	res.Content = formattedAmount
+	res.Content = fmt.Sprintf("%s", formattedAmount)
 	return res, nil
 }
 
-// GetRecipient returns the transaction recipient phone number from the gdbm.
+// GetRecipient returns the transaction recipient from the gdbm.
 func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 
@@ -1143,7 +1059,7 @@ func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
-	recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
+	recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_RECIPIENT)
 
 	res.Content = string(recipient)
 
@@ -1175,7 +1091,7 @@ func (h *Handlers) GetSender(ctx context.Context, sym string, input []byte) (res
 		return res, fmt.Errorf("missing session")
 	}
 
-	res.Content = sessionId
+	res.Content = string(sessionId)
 
 	return res, nil
 }
@@ -1193,7 +1109,6 @@ func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (res
 	// retrieve the active symbol
 	activeSym, err := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_SYM)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", common.DATA_ACTIVE_SYM, "error", err)
 		return res, err
 	}
 
@@ -1204,7 +1119,8 @@ func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (res
 	return res, nil
 }
 
-// InitiateTransaction calls the TokenTransfer and returns a confirmation based on the result
+// InitiateTransaction returns a confirmation and resets the transaction data
+// on the gdbm store.
 func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	var err error
@@ -1213,139 +1129,27 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 		return res, fmt.Errorf("missing session")
 	}
 
-	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
-
 	code := codeFromCtx(ctx)
 	l := gotext.NewLocale(translationDir, code)
 	l.AddDomain("default")
-
+	// TODO
-	data, err := common.ReadTransactionData(ctx, h.userdataStore, sessionId)
+	// Use the amount, recipient and sender to call the API and initialize the transaction
-	if err != nil {
-		return res, err
-	}
-
-	finalAmountStr, err := common.ParseAndScaleAmount(data.Amount, data.ActiveDecimal)
-	if err != nil {
-		return res, err
-	}
-
-	// Call TokenTransfer
-	r, err := h.accountService.TokenTransfer(ctx, finalAmountStr, data.PublicKey, data.Recipient, data.ActiveAddress)
-	if err != nil {
-		flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		res.Content = l.Get("Your request failed. Please try again later.")
-		logg.ErrorCtxf(ctx, "failed on TokenTransfer", "error", err)
-		return res, nil
-	}
-
-	trackingId := r.TrackingId
-	logg.InfoCtxf(ctx, "TokenTransfer", "trackingId", trackingId)
-
-	res.Content = l.Get(
-		"Your request has been sent. %s will receive %s %s from %s.",
-		data.TemporaryValue,
-		data.Amount,
-		data.ActiveSym,
-		sessionId,
-	)
-
-	res.FlagReset = append(res.FlagReset, flag_account_authorized)
-	return res, nil
-}
-
-func (h *Handlers) GetCurrentProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	var profileInfo []byte
-	var err error
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-	sm, _ := h.st.Where()
-	parts := strings.SplitN(sm, "_", 2)
-	filename := parts[1]
-	dbKeyStr := "DATA_" + strings.ToUpper(filename)
-	dbKey, err := common.StringToDataTyp(dbKeyStr)
-
-	if err != nil {
-		return res, err
-	}
 	store := h.userdataStore
 
-	switch dbKey {
+	amount, _ := store.ReadEntry(ctx, sessionId, common.DATA_AMOUNT)
-	case common.DATA_FIRST_NAME:
-		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_FIRST_NAME)
-		if err != nil {
-			if db.IsNotFound(err) {
-				res.Content = "Not provided"
-				break
-			}
-			logg.ErrorCtxf(ctx, "Failed to read first name entry with", "key", "error", common.DATA_FIRST_NAME, err)
-			return res, err
-		}
-		res.Content = string(profileInfo)
-	case common.DATA_FAMILY_NAME:
-		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_FAMILY_NAME)
-		if err != nil {
-			if db.IsNotFound(err) {
-				res.Content = "Not provided"
-				break
-			}
-			logg.ErrorCtxf(ctx, "Failed to read family name entry with", "key", "error", common.DATA_FAMILY_NAME, err)
-			return res, err
-		}
-		res.Content = string(profileInfo)
 
-	case common.DATA_GENDER:
+	recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_RECIPIENT)
-		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_GENDER)
-		if err != nil {
-			if db.IsNotFound(err) {
-				res.Content = "Not provided"
-				break
-			}
-			logg.ErrorCtxf(ctx, "Failed to read gender entry with", "key", "error", common.DATA_GENDER, err)
-			return res, err
-		}
-		res.Content = string(profileInfo)
-	case common.DATA_YOB:
-		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_YOB)
-		if err != nil {
-			if db.IsNotFound(err) {
-				res.Content = "Not provided"
-				break
-			}
-			logg.ErrorCtxf(ctx, "Failed to read year of birth(yob) entry with", "key", "error", common.DATA_YOB, err)
-			return res, err
-		}
-		res.Content = string(profileInfo)
 
-	case common.DATA_LOCATION:
+	activeSym, _ := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_SYM)
-		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_LOCATION)
+
-		if err != nil {
+	res.Content = l.Get("Your request has been sent. %s will receive %s %s from %s.", string(recipient), string(amount), string(activeSym), string(sessionId))
-			if db.IsNotFound(err) {
+
-				res.Content = "Not provided"
+	account_authorized_flag, err := h.flagManager.GetFlag("flag_account_authorized")
-				break
+	if err != nil {
-			}
+		return res, err
-			logg.ErrorCtxf(ctx, "Failed to read location entry with", "key", "error", common.DATA_LOCATION, err)
-			return res, err
-		}
-		res.Content = string(profileInfo)
-	case common.DATA_OFFERINGS:
-		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_OFFERINGS)
-		if err != nil {
-			if db.IsNotFound(err) {
-				res.Content = "Not provided"
-				break
-			}
-			logg.ErrorCtxf(ctx, "Failed to read offerings entry with", "key", "error", common.DATA_OFFERINGS, err)
-			return res, err
-		}
-		res.Content = string(profileInfo)
-	default:
-		break
 	}
 
+	res.FlagReset = append(res.FlagReset, account_authorized_flag)
 	return res, nil
 }
 
@@ -1444,15 +1248,13 @@ func (h *Handlers) SetDefaultVoucher(ctx context.Context, sym string, input []by
 		if db.IsNotFound(err) {
 			publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
 			if err != nil {
-				logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
 				return res, err
 			}
 
 			// Fetch vouchers from the API using the public key
 			vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey))
 			if err != nil {
-				res.FlagSet = append(res.FlagSet, flag_no_active_voucher)
+				return res, err
-				return res, nil
 			}
 
 			// Return if there is no voucher
@@ -1465,41 +1267,21 @@ func (h *Handlers) SetDefaultVoucher(ctx context.Context, sym string, input []by
 			firstVoucher := vouchersResp[0]
 			defaultSym := firstVoucher.TokenSymbol
 			defaultBal := firstVoucher.Balance
-			defaultDec := firstVoucher.TokenDecimals
-			defaultAddr := firstVoucher.ContractAddress
-
-			// Scale down the balance
-			scaledBalance := common.ScaleDownBalance(defaultBal, defaultDec)
 
 			// set the active symbol
 			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_SYM, []byte(defaultSym))
 			if err != nil {
-				logg.ErrorCtxf(ctx, "failed to write defaultSym entry with", "key", common.DATA_ACTIVE_SYM, "value", defaultSym, "error", err)
 				return res, err
 			}
 			// set the active balance
-			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_BAL, []byte(scaledBalance))
+			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_BAL, []byte(defaultBal))
 			if err != nil {
-				logg.ErrorCtxf(ctx, "failed to write defaultBal entry with", "key", common.DATA_ACTIVE_BAL, "value", scaledBalance, "error", err)
-				return res, err
-			}
-			// set the active decimals
-			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_DECIMAL, []byte(defaultDec))
-			if err != nil {
-				logg.ErrorCtxf(ctx, "failed to write defaultDec entry with", "key", common.DATA_ACTIVE_DECIMAL, "value", defaultDec, "error", err)
-				return res, err
-			}
-			// set the active contract address
-			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_ADDRESS, []byte(defaultAddr))
-			if err != nil {
-				logg.ErrorCtxf(ctx, "failed to write defaultAddr entry with", "key", common.DATA_ACTIVE_ADDRESS, "value", defaultAddr, "error", err)
 				return res, err
 			}
 
 			return res, nil
 		}
 
-		logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", common.DATA_ACTIVE_SYM, "error", err)
 		return res, err
 	}
 
@@ -1520,8 +1302,7 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte)
 	store := h.userdataStore
 	publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
+		return res, nil
-		return res, err
 	}
 
 	// Fetch vouchers from the API using the public key
@@ -1556,7 +1337,6 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte)
 	// Read vouchers from the store
 	voucherData, err := h.prefixDb.Get(ctx, []byte("sym"))
 	if err != nil {
-		logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err)
 		return res, err
 	}
 
@@ -1566,7 +1346,6 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte)
 }
 
 // ViewVoucher retrieves the token holding and balance from the subprefixDB
-// and displays it to the user for them to select it
 func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -1593,7 +1372,6 @@ func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (r
 	}
 
 	if err := common.StoreTemporaryVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil {
-		logg.ErrorCtxf(ctx, "failed on StoreTemporaryVoucher", "error", err)
 		return res, err
 	}
 
@@ -1615,49 +1393,14 @@ func (h *Handlers) SetVoucher(ctx context.Context, sym string, input []byte) (re
 	// Get temporary data
 	tempData, err := common.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed on GetTemporaryVoucherData", "error", err)
 		return res, err
 	}
 
 	// Set as active and clear temporary data
 	if err := common.UpdateVoucherData(ctx, h.userdataStore, sessionId, tempData); err != nil {
-		logg.ErrorCtxf(ctx, "failed on UpdateVoucherData", "error", err)
 		return res, err
 	}
 
 	res.Content = tempData.TokenSymbol
 	return res, nil
 }
-
-// GetVoucherDetails retrieves the voucher details
-func (h *Handlers) GetVoucherDetails(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	store := h.userdataStore
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
-
-	// get the active address
-	activeAddress, err := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_ADDRESS)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read activeAddress entry with", "key", common.DATA_ACTIVE_ADDRESS, "error", err)
-		return res, err
-	}
-
-	// use the voucher contract address to get the data from the API
-	voucherData, err := h.accountService.VoucherData(ctx, string(activeAddress))
-	if err != nil {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		return res, nil
-	}
-
-	tokenSymbol := voucherData.TokenSymbol
-	tokenName := voucherData.TokenName
-
-	res.Content = fmt.Sprintf("%s %s", tokenSymbol, tokenName)
-
-	return res, nil
-}

internal/handlers/ussd/menuhandler_test.go

@@ -586,9 +586,9 @@ func TestGetRecipient(t *testing.T) {
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
-	recepient := "0712345678"
+	recepient := "0xcasgatweksalw1018221"
 
-	err := store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(recepient))
+	err := store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, []byte(recepient))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1226,53 +1226,28 @@ func TestInitiateTransaction(t *testing.T) {
 	}
 
 	tests := []struct {
-		name             string
+		name           string
-		TemporaryValue   []byte
+		input          []byte
-		ActiveSym        []byte
+		Recipient      []byte
-		StoredAmount     []byte
+		Amount         []byte
-		TransferAmount   string
+		ActiveSym      []byte
-		PublicKey        []byte
+		status         string
-		Recipient        []byte
+		expectedResult resource.Result
-		ActiveDecimal    []byte
-		ActiveAddress    []byte
-		TransferResponse *models.TokenTransferResponse
-		expectedResult   resource.Result
 	}{
 		{
-			name:           "Test initiate transaction",
+			name:      "Test initiate transaction",
-			TemporaryValue: []byte("0711223344"),
+			Amount:    []byte("0.002"),
-			ActiveSym:      []byte("SRF"),
+			ActiveSym: []byte("SRF"),
-			StoredAmount:   []byte("1.00"),
+			Recipient: []byte("0x12415ass27192"),
-			TransferAmount: "1000000",
-			PublicKey:      []byte("0X13242618721"),
-			Recipient:      []byte("0x12415ass27192"),
-			ActiveDecimal:  []byte("6"),
-			ActiveAddress:  []byte("0xd4c288865Ce"),
-			TransferResponse: &models.TokenTransferResponse{
-				TrackingId: "1234567890",
-			},
 			expectedResult: resource.Result{
 				FlagReset: []uint32{account_authorized_flag},
-				Content:   "Your request has been sent. 0711223344 will receive 1.00 SRF from 254712345678.",
+				Content:   "Your request has been sent. 0x12415ass27192 will receive 0.002 SRF from 254712345678.",
 			},
 		},
 	}
-
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(tt.TemporaryValue))
+			err := store.WriteEntry(ctx, sessionId, common.DATA_AMOUNT, []byte(tt.Amount))
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_SYM, []byte(tt.ActiveSym))
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = store.WriteEntry(ctx, sessionId, common.DATA_AMOUNT, []byte(tt.StoredAmount))
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = store.WriteEntry(ctx, sessionId, common.DATA_PUBLIC_KEY, []byte(tt.PublicKey))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -1280,19 +1255,13 @@ func TestInitiateTransaction(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_DECIMAL, []byte(tt.ActiveDecimal))
+			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_SYM, []byte(tt.ActiveSym))
 			if err != nil {
 				t.Fatal(err)
 			}
-			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_ADDRESS, []byte(tt.ActiveAddress))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			mockAccountService.On("TokenTransfer").Return(tt.TransferResponse, nil)
 
 			// Call the method under test
-			res, _ := h.InitiateTransaction(ctx, "transaction_reset_amount", []byte(""))
+			res, _ := h.InitiateTransaction(ctx, "transaction_reset_amount", tt.input)
 
 			// Assert that no errors occurred
 			assert.NoError(t, err)
@@ -1484,12 +1453,10 @@ func TestValidateRecipient(t *testing.T) {
 	}
 
 	sessionId := "session123"
-	publicKey := "0X13242618721"
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
 	flag_invalid_recipient, _ := fm.parser.GetFlag("flag_invalid_recipient")
-	flag_invalid_recipient_with_invite, _ := fm.parser.GetFlag("flag_invalid_recipient_with_invite")
 
 	// Define test cases
 	tests := []struct {
@@ -1499,33 +1466,19 @@ func TestValidateRecipient(t *testing.T) {
 	}{
 		{
 			name:  "Test with invalid recepient",
-			input: []byte("9234adf5"),
+			input: []byte("000"),
 			expectedResult: resource.Result{
 				FlagSet: []uint32{flag_invalid_recipient},
-				Content: "9234adf5",
+				Content: "000",
 			},
 		},
 		{
-			name:  "Test with valid unregistered recepient",
+			name:           "Test with valid recepient",
-			input: []byte("0712345678"),
+			input:          []byte("0705X2"),
-			expectedResult: resource.Result{
-				FlagSet: []uint32{flag_invalid_recipient_with_invite},
-				Content: "0712345678",
-			},
-		},
-		{
-			name:           "Test with valid registered recepient",
-			input:          []byte("0711223344"),
 			expectedResult: resource.Result{},
 		},
 	}
 
-	// store a public key for the valid recipient
-	err = store.WriteEntry(ctx, "0711223344", common.DATA_PUBLIC_KEY, []byte(publicKey))
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create the Handlers instance
@@ -2034,7 +1987,7 @@ func TestSetVoucher(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	res, err := h.SetVoucher(ctx, "set_voucher", []byte(""))
+	res, err := h.SetVoucher(ctx, "set_voucher", []byte{})
 
 	assert.NoError(t, err)
 

internal/ssh/keystore.go

@@ -0,0 +1,64 @@
+package ssh
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path"
+
+	"golang.org/x/crypto/ssh"
+
+	"git.defalsify.org/vise.git/db"
+
+	"git.grassecon.net/urdt/ussd/internal/storage"
+)
+
+type SshKeyStore struct {
+	store db.Db
+}
+
+func NewSshKeyStore(ctx context.Context, dbDir string) (*SshKeyStore, error) {
+	keyStore := &SshKeyStore{}
+	keyStoreFile := path.Join(dbDir, "ssh_authorized_keys.gdbm")
+	keyStore.store = storage.NewThreadGdbmDb()
+	err := keyStore.store.Connect(ctx, keyStoreFile)
+	if err != nil {
+		return nil, err
+	}
+	return keyStore, nil
+}
+
+func(s *SshKeyStore) AddFromFile(ctx context.Context, fp string, sessionId string) error {
+	_, err := os.Stat(fp)
+	if err != nil {
+		return fmt.Errorf("cannot open ssh server public key file: %v\n", err)
+	}
+
+	publicBytes, err := os.ReadFile(fp)
+	if err != nil {
+		return fmt.Errorf("Failed to load public key: %v", err)
+	}
+	pubKey, _, _, _, err := ssh.ParseAuthorizedKey(publicBytes)
+	if err != nil {
+		return fmt.Errorf("Failed to parse public key: %v", err)
+	}
+	k := append([]byte{0x01}, pubKey.Marshal()...)
+	s.store.SetPrefix(storage.DATATYPE_EXTEND)
+	logg.Infof("Added key", "sessionId", sessionId, "public key", string(publicBytes))
+	return s.store.Put(ctx, k, []byte(sessionId))
+}
+
+func(s *SshKeyStore) Get(ctx context.Context, pubKey ssh.PublicKey) (string, error) {
+	s.store.SetLanguage(nil)
+	s.store.SetPrefix(storage.DATATYPE_EXTEND)
+	k := append([]byte{0x01}, pubKey.Marshal()...)
+	v, err := s.store.Get(ctx, k)
+	if err != nil {
+		return "", err
+	}
+	return string(v), nil
+}
+
+func(s *SshKeyStore) Close() error {
+	return s.store.Close()
+}

internal/ssh/ssh.go

@@ -0,0 +1,284 @@
+package ssh
+
+import (
+	"context"
+	"encoding/hex"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"net"
+	"os"
+	"sync"
+
+	"golang.org/x/crypto/ssh"
+
+	"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 (
+	logg = logging.NewVanilla().WithDomain("ssh")
+)
+
+type auther struct {
+	Ctx context.Context
+	keyStore *SshKeyStore
+	auth map[string]string
+}
+
+func NewAuther(ctx context.Context, keyStore *SshKeyStore) *auther {
+	return &auther{
+		Ctx: ctx,
+		keyStore: keyStore,
+		auth: make(map[string]string),
+	}
+}
+
+func(a *auther) Check(conn ssh.ConnMetadata, pubKey ssh.PublicKey) (*ssh.Permissions, error) {
+	va, err := a.keyStore.Get(a.Ctx, pubKey)
+	if err != nil {
+		return nil, err
+	}
+	ka := hex.EncodeToString(conn.SessionID())
+	a.auth[ka] = va 
+	fmt.Fprintf(os.Stderr, "connect: %s -> %s\n", ka, va)
+	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(s *SshRunner) 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()
+	s.wg.Add(1)
+	go func(reqIn <-chan *ssh.Request) {
+		defer s.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
+	SrvKeyFile string
+	Host string
+	Port uint
+	wg sync.WaitGroup
+	lst net.Listener
+}
+
+func(s *SshRunner) Stop() error {
+	return s.lst.Close()
+}
+
+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, keyStore *SshKeyStore) {
+	running := true
+
+	// TODO: waitgroup should probably not be global
+	defer s.wg.Wait()
+
+	auth := NewAuther(ctx, keyStore)
+	cfg := ssh.ServerConfig{
+		PublicKeyCallback: auth.Check,
+	}
+
+	privateBytes, err := os.ReadFile(s.SrvKeyFile)
+	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)
+	}
+	srvPub := private.PublicKey()
+	srvPubStr := base64.StdEncoding.EncodeToString(srvPub.Marshal())
+	logg.InfoCtxf(ctx, "have server key", "type", srvPub.Type(), "public", srvPubStr)
+	cfg.AddHostKey(private)
+
+	s.lst, err = net.Listen("tcp", fmt.Sprintf("%s:%d", s.Host, s.Port))
+	if err != nil {
+		panic(err)
+	}
+
+	for running {
+		conn, err := s.lst.Accept()
+		if err != nil {
+			logg.ErrorCtxf(ctx, "ssh accept error", "err", err)
+			running = false
+			continue
+		}
+
+		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)
+
+				s.wg.Add(1)
+				go func() {
+					ssh.DiscardRequests(rC)
+					s.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 = s.serve(ctx, sessionId, ch, en)
+					logg.ErrorCtxf(ctx, "ssh server finish", "err", err)
+				}
+			}
+		}(conn)
+	}
+}

internal/storage/storage.go

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

internal/testutil/mocks/servicemock.go

@@ -28,6 +28,7 @@ func (m *MockAccountService) TrackAccountStatus(ctx context.Context, 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)
@@ -38,12 +39,7 @@ func (m *MockAccountService) FetchTransactions(ctx context.Context, publicKey st
 	return args.Get(0).([]dataserviceapi.Last10TxResponse), args.Error(1)
 }
 
-func (m *MockAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
+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

@@ -12,14 +12,14 @@ type TestAccountService struct {
 }
 
 func (tas *TestAccountService) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
-	return &models.AccountResult{
+	return &models.AccountResult {
 		TrackingId: "075ccc86-f6ef-4d33-97d5-e91cfb37aa0d",
-		PublicKey:  "0x623EFAFa8868df4B934dd12a8B26CB3Dd75A7AdD",
+		PublicKey: "0x623EFAFa8868df4B934dd12a8B26CB3Dd75A7AdD",
 	}, nil
 }
 
 func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
-	balanceResponse := &models.BalanceResult{
+	balanceResponse := &models.BalanceResult {
 		Balance: "0.003 CELO",
 		Nonce:   json.Number("0"),
 	}
@@ -27,7 +27,7 @@ func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey strin
 }
 
 func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
-	return &models.TrackStatusResult{
+	return &models.TrackStatusResult {
 		Active: true,
 	}, nil
 }
@@ -40,19 +40,13 @@ func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey stri
 			TokenDecimals:   "6",
 			Balance:         "2745987",
 		},
-	}, nil
+	}, 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) {
+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
-}

menutraversal_test/group_test.json

@@ -54,7 +54,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -95,7 +95,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -141,7 +141,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
                 },
                 {
                     "input": "1",

menutraversal_test/test_setup.json

@@ -23,7 +23,7 @@
                     },
                     {
                         "input": "1111",
-                        "expectedContent": "The PIN is not a match. Try again\n1:Retry\n9:Quit"
+                        "expectedContent": "The PIN is not a match. Try again\n1:retry\n9:Quit"
                     },
                     {
                         "input": "1",
@@ -53,7 +53,7 @@
                 ]
             },
             {
-                "name": "send_with_invite",
+                "name": "send_with_invalid_inputs",
                 "steps": [
                     {
                         "input": "",
@@ -65,19 +65,39 @@
                     },
                     {
                         "input": "000",
-                        "expectedContent": "000 is invalid, please try again:\n1:Retry\n9:Quit"
+                        "expectedContent": "000 is not registered or invalid, please try again:\n1:retry\n9:Quit"
                     },
                     {
                         "input": "1",
                         "expectedContent": "Enter recipient's phone number:\n0:Back"
                     },
                     {
-                        "input": "0712345678",
+                        "input": "065656",
-                        "expectedContent": "0712345678 is not registered, please try again:\n1:Retry\n2:Invite to Sarafu Network\n9:Quit"
+                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
                     },
                     {
-                        "input": "2",
+                        "input": "10000000",
-                        "expectedContent": "Your invite request for 0712345678 to Sarafu Network failed. Please try again later."
+                        "expectedContent": "Amount 10000000 is invalid, please try again:\n1:retry\n9:Quit"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
+                    },
+                    {
+                        "input": "1.00",
+                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
+                    },
+                    {
+                        "input": "1222",
+                        "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Your request has been sent. 065656 will receive {send_amount} from {session_id}."
                     }
                 ]
             },
@@ -120,7 +140,7 @@
                     },
                     {
                         "input": "6",
-                        "expectedContent": "Address: {public_key}\n0:Back\n9:Quit"
+                        "expectedContent": "Address: {public_key}\n9:Quit"
                     },
                     {
                         "input": "9",

models/accountresponse.go

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

models/balanceresponse.go

@@ -2,6 +2,7 @@ package models
 
 import "encoding/json"
 
+
 type BalanceResult struct {
 	Balance string      `json:"balance"`
 	Nonce   json.Number `json:"nonce"`

models/token_transfer_response.go

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

models/tokenresponse.go

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

models/trackstatusresponse.go

@@ -14,5 +14,5 @@ type Transaction struct {
 }
 
 type TrackStatusResult struct {
-	Active bool `json:"active"`
+	Active	bool `json:"active"`
 }

models/voucher_data_result.go

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

models/vouchersresponse.go

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

remote/accountservice.go

@@ -1,19 +1,20 @@
 package remote
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
 	"io"
-	"log"
 	"net/http"
 	"net/url"
 
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+	"github.com/grassrootseconomics/eth-custodial/pkg/api"
 	"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"
+
+var (
 )
 
 type AccountServiceInterface interface {
@@ -23,7 +24,6 @@ type AccountServiceInterface interface {
 	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 {
@@ -51,7 +51,7 @@ func (as *AccountService) TrackAccountStatus(ctx context.Context, publicKey stri
 		return nil, err
 	}
 
-	_, err = doRequest(ctx, req, &r)
+	_, err =  doCustodialRequest(ctx, req, &r)
 	if err != nil {
 		return nil, err
 	}
@@ -75,10 +75,11 @@ func (as *AccountService) CheckBalance(ctx context.Context, publicKey string) (*
 		return nil, err
 	}
 
-	_, err = doRequest(ctx, req, &balanceResult)
+	_, err = doCustodialRequest(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.
@@ -92,7 +93,8 @@ func (as *AccountService) CreateAccount(ctx context.Context) (*models.AccountRes
 	if err != nil {
 		return nil, err
 	}
-	_, err = doRequest(ctx, req, &r)
+
+	_, err =  doCustodialRequest(ctx, req, &r)
 	if err != nil {
 		return nil, err
 	}
@@ -104,9 +106,7 @@ func (as *AccountService) CreateAccount(ctx context.Context) (*models.AccountRes
 // Parameters:
 //   - publicKey: The public key associated with the account.
 func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
-	var r struct {
+	var r []dataserviceapi.TokenHoldings
-		Holdings []dataserviceapi.TokenHoldings `json:"holdings"`
-	}
 
 	ep, err := url.JoinPath(config.VoucherHoldingsURL, publicKey)
 	if err != nil {
@@ -118,21 +118,20 @@ func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) (
 		return nil, err
 	}
 
-	_, err = doRequest(ctx, req, &r)
+	_, err =  doDataRequest(ctx, req, r)
 	if err != nil {
 		return nil, err
 	}
 
-	return r.Holdings, nil
+	return r, 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 {
+	var r []dataserviceapi.Last10TxResponse
-		Transfers []dataserviceapi.Last10TxResponse `json:"transfers"`
-	}
 
 	ep, err := url.JoinPath(config.VoucherTransfersURL, publicKey)
 	if err != nil {
@@ -144,21 +143,20 @@ func (as *AccountService) FetchTransactions(ctx context.Context, publicKey strin
 		return nil, err
 	}
 
-	_, err = doRequest(ctx, req, &r)
+	_, err =  doDataRequest(ctx, req, r)
 	if err != nil {
 		return nil, err
 	}
 
-	return r.Transfers, nil
+	return r, 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 {
+	var voucherDataResult models.VoucherDataResult
-		TokenDetails models.VoucherDataResult `json:"tokenDetails"`
-	}
 
 	ep, err := url.JoinPath(config.VoucherDataURL, address)
 	if err != nil {
@@ -170,63 +168,22 @@ func (as *AccountService) VoucherData(ctx context.Context, address string) (*mod
 		return nil, err
 	}
 
-	_, err = doRequest(ctx, req, &r)
+	_, err = doCustodialRequest(ctx, req, &voucherDataResult)
-	return &r.TokenDetails, err
+	return &voucherDataResult, 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 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
@@ -245,6 +202,7 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
 	if len(okResponse.Result) == 0 {
 		return nil, errors.New("Empty api result")
 	}
+	return &okResponse, nil
 
 	v, err := json.Marshal(okResponse.Result)
 	if err != nil {
@@ -255,19 +213,12 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
 	return &okResponse, err
 }
 
-func logRequestDetails(req *http.Request) {
+func doCustodialRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
-	var bodyBytes []byte
+	req.Header.Set("X-GE-KEY", config.CustodialAPIKey)
-	contentType := req.Header.Get("Content-Type")
+	return doRequest(ctx, req, rcpt)
-	if req.Body != nil {
+}
-		bodyBytes, err := io.ReadAll(req.Body)
+
-		if err != nil {
+func doDataRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
-			log.Printf("Error reading request body: %s", err)
+	req.Header.Set("X-GE-KEY", config.DataAPIKey)
-			return
+	return doRequest(ctx, req, rcpt)
-		}
-		req.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
-	} else {
-		bodyBytes = []byte("-")
-	}
-
-	log.Printf("URL: %s | Content-Type: %s | Method: %s| Request Body: %s", req.URL, contentType, req.Method, string(bodyBytes))
 }

services/registration/address.vis

@@ -1,8 +1,6 @@
 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

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

services/registration/amount.vis

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

services/registration/api_failure.vis

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

services/registration/confirm_others_new_pin_swa

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

services/registration/edit_family_name

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

services/registration/edit_family_name_swa

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

services/registration/edit_first_name

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

services/registration/edit_first_name_swa

@@ -1,2 +0,0 @@
-Jina la kwanza la sasa {{.get_current_profile_info}}
-Weka majina yako ya kwanza:

services/registration/edit_location

@@ -1,2 +0,0 @@
-Current location: {{.get_current_profile_info}}
-Enter your location:

services/registration/edit_location_swa

@@ -1,2 +0,0 @@
-Eneo la sasa {{.get_current_profile_info}}
-Weka eneo:

services/registration/edit_offerings

@@ -1,2 +0,0 @@
-Current offerings: {{.get_current_profile_info}}
-Enter the services or goods you offer: 

services/registration/edit_offerings_swa

@@ -1,2 +0,0 @@
-Unachouza kwa sasa: {{.get_current_profile_info}}
-Weka unachouza

services/registration/edit_profile.vis

@@ -2,8 +2,8 @@ LOAD reset_account_authorized 16
 RELOAD reset_account_authorized
 LOAD reset_allow_update 0
 RELOAD reset_allow_update
-MOUT edit_first_name 1
+MOUT edit_name 1
-MOUT edit_family_name 2
+MOUT edit_familyname 2
 MOUT edit_gender 3
 MOUT edit_yob 4
 MOUT edit_location 5
@@ -12,10 +12,10 @@ MOUT view 7
 MOUT back 0
 HALT
 INCMP my_account 0
-INCMP edit_first_name 1
+INCMP enter_name 1
-INCMP edit_family_name 2
+INCMP enter_familyname 2
 INCMP select_gender 3
-INCMP edit_yob 4
+INCMP enter_yob 4
-INCMP edit_location 5
+INCMP enter_location 5
-INCMP edit_offerings 6
+INCMP enter_offerings 6
 INCMP view_profile 7

services/registration/edit_yob

@@ -1,2 +0,0 @@
-Current year of birth: {{.get_current_profile_info}}
-Enter your year of birth

services/registration/edit_yob_swa

@@ -1,2 +0,0 @@
-Mwaka wa sasa wa kuzaliwa {{.get_current_profile_info}}
-Weka mwaka wa kuzaliwa

services/registration/enter_familyname

@@ -0,0 +1 @@
+Enter family name:

services/registration/enter_familyname.vis

@@ -1,7 +1,5 @@
 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

services/registration/enter_familyname_swa

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

services/registration/enter_location

@@ -0,0 +1 @@
+Enter your location:

services/registration/enter_location.vis

@@ -1,7 +1,5 @@
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_location flag_allow_update 1
-LOAD get_current_profile_info 0
-RELOAD get_current_profile_info
 MOUT back 0
 HALT
 LOAD save_location 0

services/registration/enter_location_swa

@@ -0,0 +1 @@
+Weka eneo:

services/registration/enter_name

@@ -0,0 +1 @@
+Enter your first names:

services/registration/enter_name.vis

@@ -1,8 +1,5 @@
 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

services/registration/enter_name_swa

@@ -0,0 +1 @@
+Weka majina yako ya kwanza:

services/registration/enter_offerings

@@ -0,0 +1 @@
+Enter the services or goods you offer: 

services/registration/enter_offerings.vis

@@ -1,7 +1,5 @@
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_offerings flag_allow_update 1
-LOAD get_current_profile_info 0
-RELOAD get_current_profile_info
 LOAD save_offerings 0
 MOUT back 0
 HALT

services/registration/enter_offerings_swa

@@ -0,0 +1 @@
+Weka unachouza

services/registration/enter_other_number_swa

@@ -1 +0,0 @@
-Weka nambari ya simu ili kutuma ombi la kubadilisha nambari ya siri:

services/registration/enter_others_new_pin_swa

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

services/registration/enter_yob

@@ -0,0 +1 @@
+Enter your year of birth

services/registration/enter_yob.vis

@@ -1,12 +1,8 @@
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_yob 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 verify_yob 6
+LOAD verify_yob 0
-RELOAD verify_yob
 CATCH incorrect_date_format flag_incorrect_date_format 1
 LOAD save_yob 0
 RELOAD save_yob

services/registration/enter_yob_swa

@@ -0,0 +1 @@
+Weka mwaka wa kuzaliwa

services/registration/incorrect_date_format.vis

@@ -2,5 +2,5 @@ LOAD reset_incorrect_date_format 8
 MOUT retry 1
 MOUT quit 9
 HALT
-INCMP _ 1
+INCMP enter_yob 1
 INCMP quit 9

services/registration/invalid_recipient

@@ -1 +1 @@
-{{.validate_recipient}} is invalid, please try again:
+{{.validate_recipient}} is not registered or invalid, please try again:

services/registration/invalid_recipient_swa

@@ -1 +1 @@
-{{.validate_recipient}} sio sahihi, tafadhali weka tena:
+{{.validate_recipient}} haijasajiliwa au sio sahihi, tafadhali weka tena:

services/registration/invite_menu

@@ -1 +0,0 @@
-Invite to Sarafu Network

services/registration/invite_menu_swa

@@ -1 +0,0 @@
-Karibisha kwa matandao wa Sarafu

services/registration/invite_recipient

@@ -1 +0,0 @@
-{{.validate_recipient}} is not registered, please try again:

services/registration/invite_recipient.vis

@@ -1,8 +0,0 @@
-MAP validate_recipient
-MOUT retry 1
-MOUT invite 2
-MOUT quit 9
-HALT
-INCMP _ 1
-INCMP invite_result 2
-INCMP quit 9

services/registration/invite_recipient_swa

@@ -1 +0,0 @@
-{{.validate_recipient}} haijasajiliwa, tafadhali weka tena:

services/registration/invite_result.vis

@@ -1,2 +0,0 @@
-LOAD invite_valid_recipient 0
-HALT

services/registration/locale/swa/default.po

@@ -12,12 +12,3 @@ msgstr "Kwa usaidizi zaidi,piga: 0757628885"
 
 msgid "Balance: %s\n"
 msgstr "Salio: %s\n"
-
-msid "Your invite request for %s to Sarafu Network failed. Please try again later."
-msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu halikufaulu. Tafadhali jaribu tena baadaye."
-
-msgid "Your invitation to %s to join Sarafu Network has been sent."
-msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu limetumwa."
-
-msgid "Your request failed. Please try again later."
-msgstr "Ombi lako halikufaulu. Tafadhali jaribu tena baadaye."

services/registration/my_vouchers.vis

@@ -6,4 +6,3 @@ MOUT back 0
 HALT
 INCMP _ 0
 INCMP select_voucher 1
-INCMP voucher_details 2

services/registration/no_admin_privilege_swa

@@ -1 +0,0 @@
-Huna mapendeleo ya kufanya kitendo hiki

services/registration/no_voucher

@@ -1 +1 @@
-You need a voucher to proceed
+You need a voucher to send

services/registration/no_voucher_swa

@@ -1 +1 @@
-Unahitaji sarafu kuendelea
+Unahitaji sarafu kutuma

services/registration/others_pin_mismatch_swa

@@ -1 +0,0 @@
-PIN uliyoweka hailingani.Jaribu tena.

services/registration/pin_reset_mismatch_swa

@@ -1 +0,0 @@
-PIN uliyoweka hailingani.Jaribu tena.

services/registration/pin_reset_result_swa

@@ -1 +0,0 @@
-Ombi la kuweka upya PIN ya {{.retrieve_blocked_number}} limefanikiwa

services/registration/retry_menu

@@ -1 +0,0 @@
-Retry

services/registration/retry_menu_swa

@@ -1 +0,0 @@
-Jaribu tena

services/registration/select_gender

@@ -1,2 +1 @@
-Current gender: {{.get_current_profile_info}}
 Select gender: 

services/registration/select_gender.vis

@@ -1,7 +1,5 @@
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH profile_update_success flag_allow_update 1
-LOAD get_current_profile_info 0
-RELOAD get_current_profile_info
 MOUT male 1
 MOUT female 2
 MOUT unspecified 3
@@ -11,3 +9,7 @@ INCMP _ 0
 INCMP set_male 1
 INCMP set_female 2
 INCMP set_unspecified 3
+
+
+
+

services/registration/select_gender_swa

@@ -1,2 +1 @@
-Jinsia ya sasa {{.get_current_profile_info}}
 Chagua jinsia

services/registration/select_voucher.vis

@@ -1,4 +1,3 @@
-CATCH no_voucher flag_no_active_voucher 1
 LOAD get_vouchers 0
 MAP get_vouchers
 MOUT back 0

services/registration/select_voucher_menu_swa

@@ -1 +0,0 @@
-Chagua Sarafu

services/registration/send.vis

@@ -1,11 +1,9 @@
 LOAD transaction_reset 0
-RELOAD transaction_reset
 CATCH no_voucher flag_no_active_voucher 1
 MOUT back 0
 HALT
 LOAD validate_recipient 20
 RELOAD validate_recipient
 CATCH invalid_recipient flag_invalid_recipient 1
-CATCH invite_recipient flag_invalid_recipient_with_invite 1
 INCMP _ 0
 INCMP amount *

services/registration/unregistered_number_swa

@@ -1 +0,0 @@
-Nambari uliyoingiza haijasajiliwa na Sarafu au sio sahihi.

services/registration/voucher_details

@@ -1 +0,0 @@
-{{.get_voucher_details}}

services/registration/voucher_details.vis

@@ -1,6 +0,0 @@
-CATCH no_voucher flag_no_active_voucher 1
-LOAD get_voucher_details 0
-MAP get_voucher_details
-MOUT back 0
-HALT
-INCMP _ 0

services/registration/voucher_details_menu_swa

@@ -1 +0,0 @@
-Maelezo ya Sarafu

services/registration/voucher_details_swa

@@ -1 +0,0 @@
-{{.get_voucher_details}}