.dockerignore

@@ -1,16 +0,0 @@
-/**
-!/args
-!/cmd/africastalking
-!/cmd/ssh
-!/config
-!/debug
-!/handlers
-!/internal
-!/profile
-!/services
-!/ssh
-!/store
-!/LICENSE
-!/README.md
-!/go.*
-!/.env.example

.env.example

@@ -18,6 +18,3 @@ DATA_URL_BASE=http://localhost:5006
 #Language
 DEFAULT_LANGUAGE=eng
 LANGUAGES=eng, swa
-
-#Alias search domains
-ALIAS_SEARCH_DOMAINS=sarafu.local, sarafu.eth

.github/workflows/docker.yaml

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

Dockerfile

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

args/lang.go

@@ -10,7 +10,7 @@ type LangVar struct {
 	v []lang.Language
 }
 
-func (lv *LangVar) Set(s string) error {
+func(lv *LangVar) Set(s string) error {
 	v, err := lang.LanguageFromCode(s)
 	if err != nil {
 		return err
@@ -19,14 +19,16 @@ func (lv *LangVar) Set(s string) error {
 	return err
 }
 
-func (lv *LangVar) String() string {
+func(lv *LangVar) String() string {
 	var s []string
-	for _, v := range lv.v {
+	for _, v := range(lv.v) {
 		s = append(s, v.Code)
 	}
 	return strings.Join(s, ",")
 }
 
-func (lv *LangVar) Langs() []lang.Language {
+func(lv *LangVar) Langs() []lang.Language {
 	return lv.v
 }
+
+

cmd/africastalking/main.go

@@ -12,18 +12,18 @@ import (
 	"syscall"
 
 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/logging"
+	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/resource"
 
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	
+	at "git.grassecon.net/grassrootseconomics/visedriver-africastalking/africastalking"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
-	at "git.grassecon.net/grassrootseconomics/visedriver-africastalking/africastalking"
 )
 
 var (
@@ -36,7 +36,8 @@ var (
 func main() {
 	config.LoadConfig()
 
-	override := config.NewOverride()
+	var connStr string
+	var resourceDir string
 	var size uint
 	var engineDebug bool
 	var host string
@@ -45,11 +46,10 @@ func main() {
 	var gettextDir string
 	var langs args.LangVar
 
+
+	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
+	flag.StringVar(&connStr, "c", "", "connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.Host(), "http host")
 	flag.UintVar(&port, "p", config.Port(), "http port")
@@ -57,14 +57,16 @@ func main() {
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	config.Apply(override)
+	if connStr == "" {
-	conns, err := config.GetConns()
+		connStr = config.DbConn()
+	}
+	connData, err := storage.ToConnData(connStr)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "build", build, "conn", conns, "outputsize", size)
+	logg.Infof("start command", "build", build, "conn", connData, "resourcedir", resourceDir, "outputsize", size)
 
 	ctx := context.Background()
 	ln, err := lang.LanguageFromCode(config.Language())
@@ -81,14 +83,13 @@ func main() {
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
 		MenuSeparator: menuSeparator,
-		ResetOnEmptyInput: true,
 	}
 
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(conns)
+	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
 	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "menustorageservice: %v\n", err)
@@ -100,6 +101,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "userdatadb: %v\n", err)
 		os.Exit(1)
 	}
+	defer userdataStore.Close()
 
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@@ -118,7 +120,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := services.New(ctx, menuStorageService)
+	accountService := services.New(ctx, menuStorageService, connData)
 	
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
@@ -131,10 +133,10 @@ func main() {
 		fmt.Fprintf(os.Stderr, "getstatestore: %v\n", err)
 		os.Exit(1)
 	}
+	defer stateStore.Close()
 
 	rp := &at.ATRequestParser{}
 	bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
-	bsh = bsh.WithEngineFunc(lhs.GetEngine)
 	sh := at.NewATRequestHandler(bsh)
 
 	mux := http.NewServeMux()
@@ -144,10 +146,7 @@ func main() {
 		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: mux,
 	}
-	shutdownFunc := func() {
+	s.RegisterOnShutdown(sh.Shutdown)
-		sh.Shutdown(ctx)
-	}
-	s.RegisterOnShutdown(shutdownFunc)
 
 	cint := make(chan os.Signal)
 	cterm := make(chan os.Signal)

cmd/async/main.go

@@ -1,15 +1,12 @@
 package main
 
 import (
-	"bufio"
 	"context"
 	"flag"
 	"fmt"
-	"io"
 	"os"
 	"os/signal"
 	"path"
-	"strings"
 	"syscall"
 
 	"git.defalsify.org/vise.git/engine"
@@ -17,12 +14,12 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
-	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )
 
 var (
@@ -47,8 +44,9 @@ func (p *asyncRequestParser) GetInput(r any) ([]byte, error) {
 func main() {
 	config.LoadConfig()
 
-	override := config.NewOverride()
+	var connStr string
 	var sessionId string
+	var resourceDir string
 	var size uint
 	var engineDebug bool
 	var host string
@@ -58,11 +56,8 @@ func main() {
 	var langs args.LangVar
 
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
+	flag.StringVar(&connStr, "c", "", "connection string")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
-
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.Host(), "http host")
@@ -71,14 +66,16 @@ func main() {
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	config.Apply(override)
+	if connStr == "" {
-	conns, err := config.GetConns()
+		connStr = config.DbConn()
+	}
+	connData, err := storage.ToConnData(connStr)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", conns, "outputsize", size, "sessionId", sessionId)
+	logg.Infof("start command", "conn", connData, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId)
 
 	ctx := context.Background()
 
@@ -96,14 +93,13 @@ func main() {
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
 		MenuSeparator: menuSeparator,
-		ResetOnEmptyInput: true,
 	}
 
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(conns)
+	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -120,7 +116,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	//defer userdataStore.Close(ctx)
+	defer userdataStore.Close()
 
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@@ -130,7 +126,8 @@ func main() {
 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
 
-	accountService := services.New(ctx, menuStorageService)
+	accountService := services.New(ctx, menuStorageService, connData)
+
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@@ -142,14 +139,12 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	//defer stateStore.Close(ctx)
+	defer stateStore.Close()
 
 	rp := &asyncRequestParser{
 		sessionId: sessionId,
 	}
 	sh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
-	sh = sh.WithEngineFunc(lhs.GetEngine)
-
 	cfg.SessionId = sessionId
 	rqs := request.RequestSession{
 		Ctx:    ctx,
@@ -166,7 +161,7 @@ func main() {
 		case _ = <-cint:
 		case _ = <-cterm:
 		}
-		sh.Shutdown(ctx)
+		sh.Shutdown()
 	}()
 
 	for true {
@@ -182,26 +177,18 @@ func main() {
 			fmt.Errorf("error in output: %v", err)
 			os.Exit(1)
 		}
-		rqs, err = sh.Reset(ctx, rqs)
+		rqs, err = sh.Reset(rqs)
 		if err != nil {
 			logg.ErrorCtxf(ctx, "error in reset: %v", "err", err)
 			fmt.Errorf("error in reset: %v", err)
 			os.Exit(1)
 		}
 		fmt.Println("")
-		in := bufio.NewReader(os.Stdin)
+		_, err = fmt.Scanln(&rqs.Input)
-		s, err := in.ReadString('\n')
 		if err != nil {
-			if err == io.EOF {
-				logg.DebugCtxf(ctx, "have EOF, bailing")
-				break
-			}
 			logg.ErrorCtxf(ctx, "error in input", "err", err)
 			fmt.Errorf("error in input: %v", err)
 			os.Exit(1)
 		}
-		rqs.Input = []byte{}
-		s = strings.TrimSpace(s)
-		rqs.Input = []byte(s)
 	}
 }

cmd/http/main.go

@@ -17,13 +17,13 @@ import (
 	"git.defalsify.org/vise.git/resource"
 
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	httprequest "git.grassecon.net/grassrootseconomics/visedriver/request/http"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 )
 
 var (
@@ -35,7 +35,8 @@ var (
 func main() {
 	config.LoadConfig()
 
-	override := config.NewOverride()
+	var connStr string
+	var resourceDir string
 	var size uint
 	var engineDebug bool
 	var host string
@@ -44,11 +45,8 @@ func main() {
 	var gettextDir string
 	var langs args.LangVar
 
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(&connStr, "c", "", "connection string")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
-
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.Host(), "http host")
@@ -57,14 +55,16 @@ func main() {
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	config.Apply(override)
+	if connStr == "" {
-	conns, err := config.GetConns()
+		connStr = config.DbConn()
+	}
+	connData, err := storage.ToConnData(connStr)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", conns, "outputsize", size)
+	logg.Infof("start command", "conn", connData, "resourcedir", resourceDir, "outputsize", size)
 
 	ctx := context.Background()
 
@@ -82,14 +82,13 @@ func main() {
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
 		MenuSeparator: menuSeparator,
-		ResetOnEmptyInput: true,
 	}
 
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(conns)
+	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
 
 	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
@@ -102,6 +101,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
+	defer userdataStore.Close()
 
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@@ -116,7 +116,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := services.New(ctx, menuStorageService)
+	accountService := services.New(ctx, menuStorageService, connData)
 	
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
@@ -129,21 +129,18 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
+	defer stateStore.Close()
 
 	//accountService := services.New(ctx, menuStorageService, connData)
 
 	rp := &httprequest.DefaultRequestParser{}
 	bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
-	bsh = bsh.WithEngineFunc(lhs.GetEngine)
 	sh := httprequest.NewHTTPRequestHandler(bsh)
 	s := &http.Server{
 		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: sh,
 	}
-	shutdownFunc := func() {
+	s.RegisterOnShutdown(sh.Shutdown)
-		sh.Shutdown(ctx)
-	}
-	s.RegisterOnShutdown(shutdownFunc)
 
 	cint := make(chan os.Signal)
 	cterm := make(chan os.Signal)

cmd/main.go

@@ -5,19 +5,17 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"os/signal"
 	"path"
-	"syscall"
 
 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
+	"git.defalsify.org/vise.git/lang"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )
 
 var (
@@ -29,39 +27,41 @@ var (
 func main() {
 	config.LoadConfig()
 
-	override := config.NewOverride()
+	var connStr string
 	var size uint
 	var sessionId string
 	var engineDebug bool
+	var resourceDir string
 	var err error
 	var gettextDir string
 	var langs args.LangVar
 
+	flag.StringVar(&resourceDir, "resourcedir", scriptDir, "resource dir")
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(&connStr, "c", "", "connection string")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	config.Apply(override)
+	if connStr == "" {
-	conns, err := config.GetConns()
+		connStr = config.DbConn()
+	}
+	connData, err := storage.ToConnData(connStr)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "connstr err: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", conns, "outputsize", size)
+	logg.Infof("start command", "conn", connData, "outputsize", size)
 
 	if len(langs.Langs()) == 0 {
 		langs.Set(config.Language())
 	}
 
 	ctx := context.Background()
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
 	ln, err := lang.LanguageFromCode(config.Language())
 	if err != nil {
@@ -78,11 +78,9 @@ func main() {
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
 		MenuSeparator: menuSeparator,
-		EngineDebug:       engineDebug,
-		ResetOnEmptyInput: true,
 	}
 
-	menuStorageService := storage.NewMenuStorageService(conns)
+	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "menu storage service error: %v\n", err)
 		os.Exit(1)
@@ -124,28 +122,18 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := services.New(ctx, menuStorageService)
+	accountService := services.New(ctx, menuStorageService, connData)
-	_, err = lhs.GetHandler(accountService)
+	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "get accounts service handler: %v\n", err)
 		os.Exit(1)
 	}
-	en := lhs.GetEngine(cfg, rs, pe)
 
-	cint := make(chan os.Signal)
+	en := lhs.GetEngine()
-	cterm := make(chan os.Signal)
+	en = en.WithFirst(hl.Init)
-	signal.Notify(cint, os.Interrupt, syscall.SIGINT)
+	if engineDebug {
-	signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
+		en = en.WithDebug(nil)
-	go func() {
-		var s os.Signal
-		select {
-		case s = <-cterm:
-		case s = <-cint:
 	}
-		logg.InfoCtxf(ctx, "stopping on signal", "sig", s)
-		en.Finish(ctx)
-		os.Exit(0)
-	}()
 
 	err = engine.Loop(ctx, en, os.Stdin, os.Stdout, nil)
 	if err != nil {

cmd/ssh/main.go

@@ -31,31 +31,34 @@ var (
 func main() {
 	config.LoadConfig()
 
-	override := config.NewOverride()
+	var connStr string
 	var authConnStr string
+	var resourceDir string
 	var size uint
 	var engineDebug bool
 	var stateDebug bool
 	var host string
 	var port uint
-	
+	flag.StringVar(&connStr, "c", "", "connection string")
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(&authConnStr, "authdb", "", "auth connection string")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.HostSSH(), "socket host")
 	flag.UintVar(&port, "p", config.PortSSH(), "socket port")
 	flag.Parse()
 
-	config.Apply(override)
+	if connStr == "" {
-	conns, err := config.GetConns()
+		connStr = config.DbConn()
+	}
+	if authConnStr == "" {
+		authConnStr = connStr
+	}
+	connData, err := storage.ToConnData(connStr)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
 		os.Exit(1)
 	}
-
 	authConnData, err := storage.ToConnData(authConnStr)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "auth connstr err: %v", err)
@@ -76,7 +79,7 @@ func main() {
 	logg.WarnCtxf(ctx, "!!!!! Do not expose to internet and only use with tunnel!")
 	logg.WarnCtxf(ctx, "!!!!! (See ssh -L <...>)")
 
-	logg.Infof("start command", "conn", conns, "authconn", authConnData, "outputsize", size, "keyfile", sshKeyFile, "host", host, "port", port)
+	logg.Infof("start command", "conn", connData, "authconn", authConnData, "resourcedir", resourceDir, "outputsize", size, "keyfile", sshKeyFile, "host", host, "port", port)
 
 	pfp := path.Join(scriptDir, "pp.csv")
 
@@ -84,7 +87,6 @@ func main() {
 		Root:       "root",
 		OutputSize: uint32(size),
 		FlagCount:  uint32(128),
-		ResetOnEmptyInput: true,
 	}
 	if stateDebug {
 		cfg.StateDebug = true
@@ -100,7 +102,7 @@ func main() {
 	}
 	defer func() {
 		logg.TraceCtxf(ctx, "shutdown auth key store reached")
-		err = authKeyStore.Close(ctx)
+		err = authKeyStore.Close()
 		if err != nil {
 			logg.ErrorCtxf(ctx, "keystore close error", "err", err)
 		}
@@ -115,7 +117,8 @@ func main() {
 		Cfg: cfg,
 		Debug: engineDebug,
 		FlagFile: pfp,
-		Conn:       conns,
+		Conn: connData,
+		ResourceDir: resourceDir,
 		SrvKeyFile:  sshKeyFile,
 		Host:        host,
 		Port:        port,

cmd/ssh/sshkey/main.go

@@ -34,7 +34,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
-	defer store.Close(ctx)
+	defer store.Close()
 
 	err = store.AddFromFile(ctx, sshKeyFile, sessionId)
 	if err != nil {

config/args.go

@@ -1,20 +0,0 @@
-package config
-
-import (
-	viseconfig "git.grassecon.net/grassrootseconomics/visedriver/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-)
-
-func NewOverride() *viseconfig.Override {
-	o := &viseconfig.Override{
-		StateConnMode:    storage.DBMODE_TEXT,
-		ResourceConnMode: storage.DBMODE_TEXT,
-		UserConnMode:     storage.DBMODE_BINARY,
-	}
-	return o
-}
-
-func Apply(o *viseconfig.Override) error {
-	viseconfig.ApplyConn(o)
-	return nil
-}

config/config.go

@@ -1,24 +1,13 @@
 package config
 
 import (
-	"strings"
-
-	apiconfig "git.grassecon.net/grassrootseconomics/sarafu-api/config"
-	viseconfig "git.grassecon.net/grassrootseconomics/visedriver/config"
 	"git.grassecon.net/grassrootseconomics/visedriver/env"
+	viseconfig "git.grassecon.net/grassrootseconomics/visedriver/config"
+	apiconfig "git.grassecon.net/grassrootseconomics/sarafu-api/config"
 )
 
-var (
+func init() {
-	GetConns = viseconfig.GetConns
-	EnvPath  string
-)
-
-func loadEnv() {
-	if EnvPath == "" {
 	env.LoadEnvVariables()
-	} else {
-		env.LoadEnvVariablesPath(EnvPath)
-	}
 }
 
 const (
@@ -26,11 +15,10 @@ const (
 	defaultSSHPort uint = 7122
 	defaultHTTPHost string = "127.0.0.1"
 	defaultHTTPPort uint = 7123
-	defaultDomain          = "sarafu.local"
 )
 
+
 func LoadConfig() error {
-	loadEnv()
 	err := viseconfig.LoadConfig()
 	if err != nil {
 		return err
@@ -42,17 +30,10 @@ func LoadConfig() error {
 	return nil
 }
 
-func SearchDomains() []string {
+func DbConn() string {
-	var ParsedDomains []string
+	return viseconfig.DbConn
-	SearchDomains := env.GetEnv("ALIAS_SEARCH_DOMAINS", defaultDomain)
-	SearchDomainList := strings.Split(env.GetEnv("ALIAS_SEARCH_DOMAINS", SearchDomains), ",")
-	for _, domain := range SearchDomainList {
-		ParsedDomains = append(ParsedDomains, strings.ReplaceAll(domain, " ", ""))
-	}
-	return ParsedDomains
 }
 
-
 func Language() string {
 	return viseconfig.DefaultLanguage
 }

debug/db.go

@@ -1,11 +1,11 @@
 package debug
 
 import (
-	"encoding/binary"
 	"fmt"
+	"encoding/binary"
 
-	visedb "git.defalsify.org/vise.git/db"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	visedb "git.defalsify.org/vise.git/db"
 )
 
 var (
@@ -32,10 +32,18 @@ func (k KeyInfo) String() string {
 
 func ToKeyInfo(k []byte, sessionId string) (KeyInfo, error) {
 	o := KeyInfo{}
+	b := []byte(sessionId)
+
+	if len(k) <= len(b) {
+		return o, fmt.Errorf("storage key missing")
+	}
 
 	o.SessionId = sessionId
+
 	o.Typ = uint8(k[0])
 	k = k[1:]
+	o.SessionId = string(k[:len(b)])
+	k = k[len(b):]
 
 	if o.Typ == visedb.DATATYPE_USERDATA {
 		if len(k) == 0 {
@@ -45,19 +53,30 @@ func ToKeyInfo(k []byte, sessionId string) (KeyInfo, error) {
 		o.SubTyp = storedb.DataTyp(v)
 		o.Label = subTypToString(o.SubTyp)
 		k = k[2:]
-		if len(k) != 0 {
-			return o, fmt.Errorf("excess key information: %x", k)
-		}
 	} else {
 		o.Label = typToString(o.Typ)
-		k = k[2:]
+	}
+
+	if len(k) != 0 {
+		return o, fmt.Errorf("excess key information")
 	}
 
 	return o, nil
 }
 
+func FromKey(k []byte) (KeyInfo, error) {
+	o := KeyInfo{}
+
+	if len(k) < 4 {
+		return o, fmt.Errorf("insufficient key length")
+	}
+
+	sessionIdBytes := k[1:len(k)-2]
+	return ToKeyInfo(k, string(sessionIdBytes))
+}
+
 func subTypToString(v storedb.DataTyp) string {
-	return dbTypStr[v+visedb.DATATYPE_USERDATA+1]
+	return dbTypStr[v + visedb.DATATYPE_USERDATA + 1]
 }
 
 func typToString(v uint8) string {

debug/db_debug.go

@@ -1,4 +1,3 @@
-//go:build debugdb
 // +build debugdb
 
 package debug
@@ -12,37 +11,34 @@ import (
 func init() {
 	DebugCap |= 1
 	dbTypStr[db.DATATYPE_STATE] = "internal state"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TRACKING_ID] = "tracking id"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TRACKING_ID] = "tracking id"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_PUBLIC_KEY] = "public key"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_PUBLIC_KEY] = "public key"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACCOUNT_PIN] = "account pin"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACCOUNT_PIN] = "account pin"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_FIRST_NAME] = "first name"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_FIRST_NAME] = "first name"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_FAMILY_NAME] = "family name"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_FAMILY_NAME] = "family name"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_YOB] = "year of birth"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_YOB] = "year of birth"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_LOCATION] = "location"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_LOCATION] = "location"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_GENDER] = "gender"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_GENDER] = "gender"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_OFFERINGS] = "offerings"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_OFFERINGS] = "offerings"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_RECIPIENT] = "recipient"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_RECIPIENT] = "recipient"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_AMOUNT] = "amount"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_AMOUNT] = "amount"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TEMPORARY_VALUE] = "temporary value"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TEMPORARY_VALUE] = "temporary value"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_SYM] = "active sym"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_SYM] = "active sym"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_BAL] = "active bal"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_BAL] = "active bal"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_BLOCKED_NUMBER] = "blocked number"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_BLOCKED_NUMBER] = "blocked number"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_PUBLIC_KEY_REVERSE] = "public_key_reverse"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_PUBLIC_KEY_REVERSE] = "public_key_reverse"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_DECIMAL] = "active decimal"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_DECIMAL] = "active decimal"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_ADDRESS] = "active address"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_ADDRESS] = "active address"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_INCORRECT_PIN_ATTEMPTS] = "incorrect pin attempts"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_SYMBOLS] = "voucher symbols"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_SELECTED_LANGUAGE_CODE] = "selected language"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_BALANCES] = "voucher balances"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_INITIAL_LANGUAGE_CODE] = "initial language"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_DECIMALS] = "voucher decimals"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_SYMBOLS] = "voucher symbols"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_ADDRESSES] = "voucher addresses"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_BALANCES] = "voucher balances"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_SENDERS] = "tx senders"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_DECIMALS] = "voucher decimals"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_RECIPIENTS] = "tx recipients"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_ADDRESSES] = "voucher addresses"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_VALUES] = "tx values"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_SENDERS] = "tx senders"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_ADDRESSES] = "tx addresses"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_RECIPIENTS] = "tx recipients"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_HASHES] = "tx hashes"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_VALUES] = "tx values"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_DATES] = "tx dates"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_ADDRESSES] = "tx addresses"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_SYMBOLS] = "tx symbols"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_HASHES] = "tx hashes"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_DECIMALS] = "tx decimals"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_DATES] = "tx dates"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_SYMBOLS] = "tx symbols"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_DECIMALS] = "tx decimals"
 }

debug/db_test.go

@@ -3,13 +3,14 @@ package debug
 import (
 	"testing"
 
-	visedb "git.defalsify.org/vise.git/db"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	visedb "git.defalsify.org/vise.git/db"
 )
 
 func TestDebugDbSubKeyInfo(t *testing.T) {
 	s := "foo"
 	b := []byte{0x20}
+	b = append(b, []byte(s)...)
 	b = append(b, []byte{0x00, 0x02}...)
 	r, err := ToKeyInfo(b, s)
 	if err != nil {
@@ -24,7 +25,7 @@ func TestDebugDbSubKeyInfo(t *testing.T) {
 	if r.SubTyp != 2 {
 		t.Fatalf("expected 2, got %d", r.SubTyp)
 	}
-	if DebugCap&1 > 0 {
+	if DebugCap & 1 > 0 {
 		if r.Label != "tracking id" {
 			t.Fatalf("expected 'tracking id', got '%s'", r.Label)
 		}
@@ -45,7 +46,7 @@ func TestDebugDbKeyInfo(t *testing.T) {
 	if r.Typ != 16 {
 		t.Fatalf("expected 16, got %d", r.Typ)
 	}
-	if DebugCap&1 > 0 {
+	if DebugCap & 1 > 0 {
 		if r.Label != "internal state" {
 			t.Fatalf("expected 'internal_state', got '%s'", r.Label)
 		}
@@ -55,6 +56,7 @@ func TestDebugDbKeyInfo(t *testing.T) {
 func TestDebugDbKeyInfoRestore(t *testing.T) {
 	s := "bar"
 	b := []byte{visedb.DATATYPE_USERDATA}
+	b = append(b, []byte(s)...)
 	k := storedb.ToBytes(storedb.DATA_ACTIVE_SYM)
 	b = append(b, k...)
 
@@ -68,7 +70,7 @@ func TestDebugDbKeyInfoRestore(t *testing.T) {
 	if r.Typ != 32 {
 		t.Fatalf("expected 32, got %d", r.Typ)
 	}
-	if DebugCap&1 > 0 {
+	if DebugCap & 1 > 0 {
 		if r.Label != "active sym" {
 			t.Fatalf("expected 'active sym', got '%s'", r.Label)
 		}

devtools/admin/admin_numbers.json

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

devtools/admin/commands/seed.go

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

devtools/admin/main.go

@@ -2,73 +2,16 @@ package main
 
 import (
 	"context"
-	"flag"
+	"log"
-	"fmt"
-	"os"
-	"path"
 
-	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/devtools/admin/commands"
-
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/internal/cmd"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-)
-
-var (
-	logg      = logging.NewVanilla().WithContextKey("SessionId")
-	scriptDir = path.Join("services", "registration")
 )
 
 func main() {
-	config.LoadConfig()
-
-	override := config.NewOverride()
-	var sessionId string
-
-	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
-
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
-	flag.Parse()
-
-	config.Apply(override)
-	conns, err := config.GetConns()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
-		os.Exit(1)
-	}
-
 	ctx := context.Background()
-
+	err := commands.Seed(ctx)
-	pfp := path.Join(scriptDir, "pp.csv")
-	flagParser, err := application.NewFlagManager(pfp)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "flagparser fail: %v\n", err)
+		log.Fatalf("Failed to initialize a list of admins with error %s", err)
-		os.Exit(1)
-	}
-
-	x := cmd.NewCmd(sessionId, flagParser)
-	err = x.Parse(flag.Args())
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmd parse fail: %v\n", err)
-		os.Exit(1)
-	}
-
-	logg.Infof("start command", "conn", conns, "subcmd", x)
-
-	menuStorageService := storage.NewMenuStorageService(conns)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "menu storage service error: %v\n", err)
-		os.Exit(1)
-	}
-
-	err = x.Exec(ctx, menuStorageService)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmd exec error: %v\n", err)
-		os.Exit(1)
 	}
 
 }

devtools/lang/main.go

@@ -8,12 +8,13 @@ import (
 	"path"
 	"strings"
 
-	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/logging"
+	"git.defalsify.org/vise.git/lang"
 	"git.grassecon.net/grassrootseconomics/visedriver/config"
 )
 
 const (
+	
 	changeHeadSrc = `LOAD reset_account_authorized 0
 LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
@@ -62,7 +63,7 @@ func main() {
 	}
 	logg.Tracef("using languages", "lang", config.Languages)
 
-	for i, v := range config.Languages {
+	for i, v := range(config.Languages) {
 		ln, err := lang.LanguageFromCode(v)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "error parsing language: %s\n", v)
@@ -75,7 +76,7 @@ func main() {
 		incmps += fmt.Sprintf("INCMP %s %v\n", v, n)
 
 		p := path.Join(srcDir, v)
-		w, err := os.OpenFile(p, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
+		w, err := os.OpenFile(p, os.O_WRONLY | os.O_CREATE | os.O_EXCL, 0600)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "failed open language set template output: %v\n", err)
 			os.Exit(1)
@@ -92,7 +93,7 @@ func main() {
 	src += "INCMP . *\n"
 
 	p := path.Join(srcDir, "select_language.vis")
-	w, err := os.OpenFile(p, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
+	w, err := os.OpenFile(p, os.O_WRONLY | os.O_CREATE | os.O_EXCL, 0600)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed open select language vis output: %v\n", err)
 		os.Exit(1)
@@ -106,7 +107,7 @@ func main() {
 
 	src = changeHeadSrc + src
 	p = path.Join(srcDir, "change_language.vis")
-	w, err = os.OpenFile(p, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
+	w, err = os.OpenFile(p, os.O_WRONLY | os.O_CREATE | os.O_EXCL, 0600)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed open select language vis output: %v\n", err)
 		os.Exit(1)

devtools/store/dump/main.go

@@ -7,11 +7,11 @@ import (
 	"os"
 	"path"
 
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/debug"
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/debug"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
 var (
@@ -19,58 +19,55 @@ var (
 	scriptDir = path.Join("services", "registration")
 )
 
-func formatItem(k []byte, v []byte, sessionId string) (string, error) {
+func formatItem(k []byte, v []byte) (string, error) {
-	o, err := debug.ToKeyInfo(k, sessionId)
+	o, err := debug.FromKey(k)
 	if err != nil {
 		return "", err
 	}
-	s := fmt.Sprintf("%v\t%v\n", o.Label, string(v))
+	s := fmt.Sprintf("%vValue: %v\n\n", o, string(v))
-
 	return s, nil
 }
 
 func main() {
 	config.LoadConfig()
 
-	override := config.NewOverride()
+	var connStr string
 	var sessionId string
 	var database string
 	var engineDebug bool
 	var err error
-	var first bool
 
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(&connStr, "c", ".state", "connection string")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.Parse()
 
-	config.Apply(override)
+	if connStr != "" {
-	conns, err := config.GetConns()
+		connStr = config.DbConn()
+	}
+	connData, err := storage.ToConnData(connStr)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", conns)
+	logg.Infof("start command", "conn", connData)
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 	ctx = context.WithValue(ctx, "Database", database)
 
-	menuStorageService := storage.NewMenuStorageService(conns)
+	resourceDir := scriptDir
+	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
 
 	store, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "get userdata db: %v\n", err.Error())
 		os.Exit(1)
 	}
-	store.SetSession(sessionId)
 	store.SetPrefix(db.DATATYPE_USERDATA)
 
-	d, err := store.Dump(ctx, []byte(""))
+	d, err := store.Dump(ctx, []byte(sessionId))
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "store dump fail: %v\n", err.Error())
 		os.Exit(1)
@@ -81,19 +78,15 @@ func main() {
 		if k == nil {
 			break
 		}
-		if !first {
+		r, err := formatItem(k, v)
-			fmt.Printf("Session ID: %s\n---\n", sessionId)
-			first = true
-		}
-		r, err := formatItem(append([]byte{db.DATATYPE_USERDATA}, k...), v, sessionId)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "format db item error: %v\n", err)
+			fmt.Fprintf(os.Stderr, "format db item error: %v", err)
 			os.Exit(1)
 		}
 		fmt.Printf(r)
 	}
 
-	err = store.Close(ctx)
+	err = store.Close()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)

devtools/store/generate/main.go

@@ -0,0 +1,86 @@
+package main
+
+import (
+	"context"
+	"crypto/sha1"
+	"flag"
+	"fmt"
+	"os"
+	"path"
+
+	testdataloader "github.com/peteole/testdata-loader"
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+)
+
+var (
+	logg      = logging.NewVanilla()
+	baseDir   = testdataloader.GetBasePath()
+	scriptDir = path.Join("services", "registration")
+)
+
+func main() {
+	config.LoadConfig()
+
+	var connStr string
+	var sessionId string
+	var database string
+	var engineDebug bool
+	var err error
+
+	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
+	flag.StringVar(&connStr, "c", "", "connection string")
+	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.Parse()
+
+	if connStr != "" {
+		connStr = config.DbConn()
+	}
+	connData, err := storage.ToConnData(connStr)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
+		os.Exit(1)
+	}
+
+	logg.Infof("start command", "conn", connData)
+
+	ctx := context.Background()
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
+	ctx = context.WithValue(ctx, "Database", database)
+
+	resourceDir := scriptDir
+	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
+	
+	userDb, err := menuStorageService.GetUserdataDb(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+	userStore := store.UserDataStore{userDb}
+
+	h := sha1.New()
+	h.Write([]byte(sessionId))
+	address := h.Sum(nil)
+	addressString := fmt.Sprintf("%x", address)
+
+	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(addressString))
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	err = userStore.WriteEntry(ctx, addressString, storedb.DATA_PUBLIC_KEY_REVERSE, []byte(sessionId))
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	err = userDb.Close()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+}

go.mod

@@ -3,11 +3,11 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise
 go 1.23.4
 
 require (
-	git.defalsify.org/vise.git v0.3.2-0.20250401123711-d481b04a6805
+	git.defalsify.org/vise.git v0.2.3-0.20250115000535-e2d329b3f739
-	git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e
+	git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250411080608-34957e5b6ff8
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250115072214-bca7c5de969f
-	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2
+	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63
-	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694
+	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta

go.sum

@@ -1,25 +1,13 @@
-git.defalsify.org/vise.git v0.3.1 h1:A6FhMcur09ft/JzUPGXR+KpA17fltfeBnasyvLMZmq4=
+git.defalsify.org/vise.git v0.2.3-0.20250115000535-e2d329b3f739 h1:w7pj1oh7jXrfajahVYU7m7AfHst4C6jNVzDVoaqJ7e8=
-git.defalsify.org/vise.git v0.3.1/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.2.3-0.20250115000535-e2d329b3f739/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-git.defalsify.org/vise.git v0.3.2-0.20250401123711-d481b04a6805 h1:FnT39aqXcP5YWhwPDBABopSjCu2SlbPFoOVitSpAVxU=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05 h1:BenzGx6aDHKDwE23/mWIFD2InYIXyzHroZWV3MF5WUk=
-git.defalsify.org/vise.git v0.3.2-0.20250401123711-d481b04a6805/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250115072214-bca7c5de969f h1:FgccQi8vipX6dUt+GRiRDYHMR3UqC+plz73vw7y3fyU=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250115072214-bca7c5de969f/go.mod h1:tbA4whUGMUIDgQVdIW0sxWPuuXOvZRSny5zeku5hX4k=
-git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e h1:DcC9qkNl9ny3hxQmsMK6W81+5R/j4ZwYUbvewMI/rlc=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63 h1:bX7klKZpX+ZZu1LKbtOXDAhV/KK0YwExehiIi0jusAM=
-git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63/go.mod h1:Syw9TZyigPAM7t9FvicOm36iUnidt45f0SxzT2JniQ8=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b h1:xiTpaqWWoF5qcnarY/9ZkT6aVdnKwqztb2gzIahJn4w=
+git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d h1:q/NO1rEgK3pia32D/tCq5hXfEuJp84COZRwceFvy/MM=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d/go.mod h1:AH15xABcvaJr1TCGlih3oGSuwWC0E5IdbHQwuu+E1KI=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401111804-2eed990921c5 h1:DwBZHP4sebfHxK8EU2nlA2CXU81+a7Kj/pnC5vDPcf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401111804-2eed990921c5/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401115503-5b41c8dc6440 h1:eWrBZMM3pBMCFyRl4rO/aaR+OmOMFJxogNyFAFry+EM=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401115503-5b41c8dc6440/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401122510-441e289854ad h1:tYjanaCf6mF+iXRtDx5gckQm5vhZYx9N/JlNIBZj1m0=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401122510-441e289854ad/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250411080608-34957e5b6ff8 h1:Emesd0rybSLhPwZwqdvLsk/P9ZsT+7CQwQV/mrjQp3o=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250411080608-34957e5b6ff8/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2 h1:YFztSsexCUgFo6M0tbngRwYdgJd3LQV3RO/Jw09u3+k=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2/go.mod h1:6B6ByxXOiRY0NR7K02Bf3fEu7z+2c/6q8PFVNjC5G8w=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
 github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
 github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=

handlers/event/custodial.go

@@ -35,6 +35,13 @@ func (eu *EventsUpdater) HandleCustodialRegistration(ctx context.Context, ev *ap
 	if err != nil {
 		return err
 	}
+//	err = pe.Load(identity.SessionId)
+//	if err != nil {
+//		return err
+//	}
+//	st := pe.GetState()
+//	st.SetFlag(accountCreatedFlag)
+//	return pe.Save(identity.SessionId)
 	logg.DebugCtxf(ctx, "received custodial registration event", "identity", identity)
 	return nil
 }

handlers/event/event.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/persist"
-	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 )
 
 var (

handlers/event/token.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 
 	"git.defalsify.org/vise.git/db"
-	"git.grassecon.net/grassrootseconomics/common/identity"
-	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	"git.grassecon.net/grassrootseconomics/common/identity"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 )
 
 // execute all 
@@ -47,16 +47,19 @@ func (eu *EventsUpdater) updateToken(ctx context.Context, identity identity.Iden
 	return nil
 }
 
+
 // set default token to given symbol.
 func (eu *EventsUpdater) updateDefaultToken(ctx context.Context, identity identity.Identity, userStore *store.UserDataStore, activeSym string) error {
+	pfxDb := toPrefixDb(userStore, identity.SessionId)
 	// TODO: the activeSym input should instead be newline separated list?
-	tokenData, err := store.GetVoucherData(ctx, userStore, identity.SessionId, activeSym)
+	tokenData, err := store.GetVoucherData(ctx, pfxDb, activeSym)
 	if err != nil {
 		return err
 	}
 	return store.UpdateVoucherData(ctx, userStore, identity.SessionId, tokenData)
 }
 
+
 // handle token transfer.
 //
 // if from and to are NOT the same, handle code will be executed once for each side of the transfer.
@@ -186,7 +189,7 @@ func (eu *EventsUpdater) updateTokenTransferList(ctx context.Context, identity i
 		return err
 	}
 
-	for i, tx := range txs {
+	for i, tx := range(txs) {
 		r = append(r, eu.formatFunc(apievent.EventTokenTransferTag, i, tx))
 	}
 

handlers/local.go

@@ -4,46 +4,53 @@ import (
 	"context"
 	"strings"
 
+	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 
 	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
-)
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-
-var (
-	logg = logging.NewVanilla().WithDomain("sarafu-vise.engine")
 )
 
 type HandlerService interface {
 	GetHandler() (*application.MenuHandlers, error)
 }
 
-type LocalHandlerService struct {
+func getParser(fp string, debug bool) (*asm.FlagParser, error) {
-	Parser        *application.FlagManager
+	flagParser := asm.NewFlagParser().WithDebug()
-	DbRs          *resource.DbResource
+	_, err := flagParser.Load(fp)
-	Pe            *persist.Persister
-	UserdataStore *db.Db
-	Cfg           engine.Config
-	Rs            resource.Resource
-	first         resource.EntryFunc
-}
-
-func NewLocalHandlerService(ctx context.Context, fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
-	parser, err := application.NewFlagManager(fp)
 	if err != nil {
 		return nil, err
 	}
-	if debug {
+	return flagParser, nil
-		parser.SetDebug()
+}
-	}
 
+type LocalHandlerService struct {
+	Parser        *asm.FlagParser
+	DbRs          *resource.DbResource
+	Pe            *persist.Persister
+	UserdataStore *db.Db
+	AdminStore    *store.AdminStore
+	Cfg           engine.Config
+	Rs            resource.Resource
+}
+
+func NewLocalHandlerService(ctx context.Context, fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
+	parser, err := getParser(fp, debug)
+	if err != nil {
+		return nil, err
+	}
+	adminstore, err := store.NewAdminStore(ctx, "admin_numbers")
+	if err != nil {
+		return nil, err
+	}
 	return &LocalHandlerService{
 		Parser:     parser,
 		DbRs:       dbResource,
+		AdminStore: adminstore,
 		Cfg:        cfg,
 		Rs:         rs,
 	}, nil
@@ -62,12 +69,12 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 		return strings.ReplaceAll(input, ":", ls.Cfg.MenuSeparator)
 	}
 
-	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, accountService, replaceSeparatorFunc)
+	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, ls.AdminStore, accountService, replaceSeparatorFunc)
 	if err != nil {
 		return nil, err
 	}
+	//appHandlers = appHandlers.WithPersister(ls.Pe)
 	appHandlers.SetPersister(ls.Pe)
-	ls.DbRs.AddLocalFunc("check_blocked_status", appHandlers.CheckBlockedStatus)
 	ls.DbRs.AddLocalFunc("set_language", appHandlers.SetLanguage)
 	ls.DbRs.AddLocalFunc("create_account", appHandlers.CreateAccount)
 	ls.DbRs.AddLocalFunc("save_temporary_pin", appHandlers.SaveTemporaryPin)
@@ -99,18 +106,23 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("verify_yob", appHandlers.VerifyYob)
 	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", appHandlers.ResetIncorrectYob)
 	ls.DbRs.AddLocalFunc("initiate_transaction", appHandlers.InitiateTransaction)
+	ls.DbRs.AddLocalFunc("verify_new_pin", appHandlers.VerifyNewPin)
 	ls.DbRs.AddLocalFunc("confirm_pin_change", appHandlers.ConfirmPinChange)
 	ls.DbRs.AddLocalFunc("quit_with_help", appHandlers.QuitWithHelp)
 	ls.DbRs.AddLocalFunc("fetch_community_balance", appHandlers.FetchCommunityBalance)
-	ls.DbRs.AddLocalFunc("manage_vouchers", appHandlers.ManageVouchers)
+	ls.DbRs.AddLocalFunc("set_default_voucher", appHandlers.SetDefaultVoucher)
+	ls.DbRs.AddLocalFunc("check_vouchers", appHandlers.CheckVouchers)
 	ls.DbRs.AddLocalFunc("get_vouchers", appHandlers.GetVoucherList)
 	ls.DbRs.AddLocalFunc("view_voucher", appHandlers.ViewVoucher)
 	ls.DbRs.AddLocalFunc("set_voucher", appHandlers.SetVoucher)
 	ls.DbRs.AddLocalFunc("get_voucher_details", appHandlers.GetVoucherDetails)
+	ls.DbRs.AddLocalFunc("reset_valid_pin", appHandlers.ResetValidPin)
+	ls.DbRs.AddLocalFunc("check_pin_mismatch", appHandlers.CheckBlockedNumPinMisMatch)
 	ls.DbRs.AddLocalFunc("validate_blocked_number", appHandlers.ValidateBlockedNumber)
 	ls.DbRs.AddLocalFunc("retrieve_blocked_number", appHandlers.RetrieveBlockedNumber)
 	ls.DbRs.AddLocalFunc("reset_unregistered_number", appHandlers.ResetUnregisteredNumber)
 	ls.DbRs.AddLocalFunc("reset_others_pin", appHandlers.ResetOthersPin)
+	ls.DbRs.AddLocalFunc("save_others_temporary_pin", appHandlers.SaveOthersTemporaryPin)
 	ls.DbRs.AddLocalFunc("get_current_profile_info", appHandlers.GetCurrentProfileInfo)
 	ls.DbRs.AddLocalFunc("check_transactions", appHandlers.CheckTransactions)
 	ls.DbRs.AddLocalFunc("get_transactions", appHandlers.GetTransactionsList)
@@ -118,26 +130,13 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("update_all_profile_items", appHandlers.UpdateAllProfileItems)
 	ls.DbRs.AddLocalFunc("set_back", appHandlers.SetBack)
 	ls.DbRs.AddLocalFunc("show_blocked_account", appHandlers.ShowBlockedAccount)
-	ls.DbRs.AddLocalFunc("clear_temporary_value", appHandlers.ClearTemporaryValue)
-	ls.DbRs.AddLocalFunc("reset_invalid_pin", appHandlers.ResetInvalidPIN)
-	ls.DbRs.AddLocalFunc("request_custom_alias", appHandlers.RequestCustomAlias)
-	ls.DbRs.AddLocalFunc("get_suggested_alias", appHandlers.GetSuggestedAlias)
-	ls.DbRs.AddLocalFunc("confirm_new_alias", appHandlers.ConfirmNewAlias)
-	ls.DbRs.AddLocalFunc("check_account_created", appHandlers.CheckAccountCreated)
-
-	ls.first = appHandlers.Init
 
 	return appHandlers, nil
 }
 
-func (ls *LocalHandlerService) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine {
+// TODO: enable setting of sessionId on engine init time
-	en := engine.NewEngine(cfg, rs)
+func (ls *LocalHandlerService) GetEngine() *engine.DefaultEngine {
-	if ls.first != nil {
+	en := engine.NewEngine(ls.Cfg, ls.Rs)
-		en = en.WithFirst(ls.first)
+	en = en.WithPersister(ls.Pe)
-	}
-	en = en.WithPersister(pr)
-	if cfg.EngineDebug {
-		en = en.WithDebug(nil)
-	}
 	return en
 }

internal/cmd/cmd.go

@@ -1,96 +0,0 @@
-package cmd
-
-import (
-	"context"
-	"fmt"
-
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-)
-
-var (
-	logg = logging.NewVanilla().WithDomain("cmd").WithContextKey("SessionId")
-)
-
-type Cmd struct {
-	sessionId  string
-	conn       storage.ConnData
-	flagParser *application.FlagManager
-	cmd        int
-	enable     bool
-	exec       func(ctx context.Context, ss storage.StorageService) error
-}
-
-func NewCmd(sessionId string, flagParser *application.FlagManager) *Cmd {
-	return &Cmd{
-		sessionId:  sessionId,
-		flagParser: flagParser,
-	}
-}
-
-func (c *Cmd) Exec(ctx context.Context, ss storage.StorageService) error {
-	return c.exec(ctx, ss)
-}
-
-func (c *Cmd) execAdmin(ctx context.Context, ss storage.StorageService) error {
-	pe, err := ss.GetPersister(ctx)
-	if err != nil {
-		return err
-	}
-	err = pe.Load(c.sessionId)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		err := pe.Save(c.sessionId)
-		if err != nil {
-			logg.ErrorCtxf(ctx, "failed persister save: %v", err)
-		}
-	}()
-
-	st := pe.GetState()
-	flag, err := c.flagParser.GetFlag("flag_admin_privilege")
-	if err != nil {
-		return err
-	}
-	if c.enable {
-		logg.InfoCtxf(ctx, "setting admin flag", "flag", flag)
-		st.SetFlag(flag)
-	} else {
-		st.ResetFlag(flag)
-	}
-	return nil
-}
-
-func (c *Cmd) parseCmdAdmin(cmd string, param string, more []string) (bool, error) {
-	if cmd == "admin" {
-		if param == "1" {
-			c.enable = true
-		} else if param != "0" {
-			return false, fmt.Errorf("invalid parameter: %v", param)
-		}
-		c.exec = c.execAdmin
-		return true, nil
-	}
-	return false, nil
-}
-
-func (c *Cmd) Parse(args []string) error {
-	if len(args) < 2 {
-		return fmt.Errorf("Wrong number of arguments: %v", args)
-	}
-	cmd := args[0]
-	param := args[1]
-	args = args[2:]
-
-	r, err := c.parseCmdAdmin(cmd, param, args)
-	if err != nil {
-		return err
-	}
-	if r {
-		return nil
-	}
-
-	return fmt.Errorf("unknown subcommand: %s", cmd)
-}

menutraversal_test/group_test.json

@@ -1,67 +1,5 @@
 {
     "groups": [
-        {
-            "name": "main_my_vouchers_select_voucher_using_index",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "My vouchers\n1:Select voucher\n2:Voucher details\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
-                },
-                {
-                    "input": "",
-                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Enter PIN to confirm selection:\nSymbol: SRF\nBalance: 2.745987\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Success! SRF is now your active voucher.\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "main_my_vouchers_select_voucher_using_symbol",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "My vouchers\n1:Select voucher\n2:Voucher details\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
-                },
-                {
-                    "input": "SRF",
-                    "expectedContent": "Enter PIN to confirm selection:\nSymbol: SRF\nBalance: 2.745987\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Success! SRF is now your active voucher.\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
         {
             "name": "my_account_change_pin",
             "steps": [
@@ -71,7 +9,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "5",
@@ -108,11 +46,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "2",
@@ -120,7 +54,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -140,105 +74,6 @@
                 }
             ]
         },
-        {
-            "name": "menu_my_account_reset_others_pin_with_unregistered_number",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Enter other's phone number:\n0:Back"
-                },
-                {
-                    "input": "0700000001",
-                    "expectedContent": "The number you have entered is either not registered with Sarafu or is invalid.\n1:Retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Enter other's phone number:\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_reset_others_pin_with_registered_number",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Enter other's phone number:\n0:Back"
-                },
-                {
-                    "input": "0700000000",
-                    "expectedContent": "{secondary_session_id} will get a PIN reset request.\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "PIN reset request for {secondary_session_id} was successful\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_reset_others_pin_with_no_privileges",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "You do not have privileges to perform this action\n\n9:Quit\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
         {
             "name": "menu_my_account_check_my_balance",
             "steps": [
@@ -248,7 +83,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "3",
@@ -260,7 +95,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -268,7 +103,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "{balance}\n\n0:Back\n9:Quit"
+                    "expectedContent": "Balance: {balance}\n\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -276,7 +111,7 @@
                 },
                 {
                     "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "0",
@@ -293,7 +128,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "3",
@@ -305,7 +140,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -321,7 +156,7 @@
                 },
                 {
                     "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "0",
@@ -338,7 +173,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "1",
@@ -395,7 +230,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "1",
@@ -432,7 +267,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "1",
@@ -442,10 +277,6 @@
                     "input": "3",
                     "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
                 },
-                {
-                    "input": "",
-                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
-                },
                 {
                     "input": "1",
                     "expectedContent": "Please enter your PIN:"
@@ -473,7 +304,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "1",
@@ -510,7 +341,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "1",
@@ -547,7 +378,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "1",
@@ -584,7 +415,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "1",
@@ -596,7 +427,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\nYour alias: Not Provided\n\n0:Back\n9:Quit"
+                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\n\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -607,47 +438,6 @@
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                 }
             ]
-        },
-        {
-            "name": "menu_block_account_via_view_profile",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "7",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1254",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1254",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1254",
-                    "expectedContent": "Your account has been locked. For help on how to unblock your account, contact support at: 0757628885"
-                }
-            ]
         }
     ]
 }

menutraversal_test/menu_traversal_test.go

@@ -9,22 +9,22 @@ import (
 	"regexp"
 	"testing"
 
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/testutil"
-	"git.grassecon.net/grassrootseconomics/visedriver/testutil/driver"
 	"github.com/gofrs/uuid"
+	"git.grassecon.net/grassrootseconomics/visedriver/testutil/driver"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/testutil"
 )
 
 var (
-	logg               = logging.NewVanilla().WithDomain("menutraversaltest")
 	testData  = driver.ReadData()
 	sessionID string
 	src       = rand.NewSource(42)
 	g         = rand.New(src)
-	secondarySessionId = "+254700000000"
 )
 
 var groupTestFile = flag.String("test-file", "group_test.json", "The test file to use for running the group tests")
+var database = flag.String("db", "gdbm", "Specify the database (gdbm or postgres)")
+var connStr = flag.String("conn", ".test_state", "connection string")
+var dbSchema = flag.String("schema", "test", "Specify the database schema (default test)")
 
 func GenerateSessionId() string {
 	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
@@ -68,16 +68,6 @@ func extractMaxAmount(response []byte) string {
 	return ""
 }
 
-func extractRemainingAttempts(response []byte) string {
-	// Regex to match "You have: <number> remaining attempt(s)"
-	re := regexp.MustCompile(`(?m)You have:\s+(\d+)\s+remaining attempt\(s\)`)
-	match := re.FindSubmatch(response)
-	if match != nil {
-		return string(match[1]) // "<number>" of remaining attempts
-	}
-	return ""
-}
-
 // Extracts the send amount value from the engine response.
 func extractSendAmount(response []byte) string {
 	// Regex to match the pattern "will receive X.XX SYM from"
@@ -90,7 +80,12 @@ func extractSendAmount(response []byte) string {
 }
 
 func TestMain(m *testing.M) {
+	// Parse the flags
+	flag.Parse()
 	sessionID = GenerateSessionId()
+	// set the db
+	testutil.SetDatabase(*database, *connStr, *dbSchema)
+
 	// Cleanup the db after tests
 	defer testutil.CleanDatabase()
 
@@ -98,51 +93,14 @@ func TestMain(m *testing.M) {
 }
 
 func TestAccountCreationSuccessful(t *testing.T) {
-	en, fn, eventChannel, _, _ := testutil.TestEngine(sessionID)
+	en, fn, eventChannel := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
 	for _, session := range sessions {
 		groups := driver.FilterGroupsByName(session.Groups, "account_creation_successful")
 		for _, group := range groups {
-			for i, step := range group.Steps {
+			for _, step := range group.Steps {
-				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
-				cont, err := en.Exec(ctx, []byte(step.Input))
-				if err != nil {
-					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
-				}
-				if !cont {
-					break
-				}
-				w := bytes.NewBuffer(nil)
-				_, err = en.Flush(ctx, w)
-				if err != nil {
-					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-				b := w.Bytes()
-				match, err := step.MatchesExpectedContent(b)
-				if err != nil {
-					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
-				}
-				if !match {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
-				}
-			}
-		}
-	}
-	<-eventChannel
-}
-
-func TestSecondaryAccount(t *testing.T) {
-	en, fn, eventChannel, _, _ := testutil.TestEngine(secondarySessionId)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "account_creation_successful")
-		for _, group := range groups {
-			for i, step := range group.Steps {
-				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
 				cont, err := en.Exec(ctx, []byte(step.Input))
 				if err != nil {
 					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
@@ -177,15 +135,14 @@ func TestAccountRegistrationRejectTerms(t *testing.T) {
 		t.Fail()
 	}
 	edgeCaseSessionID := v.String()
-	en, fn, _, _, _ := testutil.TestEngine(edgeCaseSessionID)
+	en, fn, _ := testutil.TestEngine(edgeCaseSessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
 	for _, session := range sessions {
 		groups := driver.FilterGroupsByName(session.Groups, "account_creation_reject_terms")
 		for _, group := range groups {
-			for i, step := range group.Steps {
+			for _, step := range group.Steps {
-				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
 				cont, err := en.Exec(ctx, []byte(step.Input))
 				if err != nil {
 					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
@@ -213,15 +170,14 @@ func TestAccountRegistrationRejectTerms(t *testing.T) {
 }
 
 func TestMainMenuHelp(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
 	for _, session := range sessions {
 		groups := driver.FilterGroupsByName(session.Groups, "main_menu_help")
 		for _, group := range groups {
-			for i, step := range group.Steps {
+			for _, step := range group.Steps {
-				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
 				cont, err := en.Exec(ctx, []byte(step.Input))
 				if err != nil {
 					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
@@ -255,7 +211,7 @@ func TestMainMenuHelp(t *testing.T) {
 }
 
 func TestMainMenuQuit(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@@ -296,7 +252,7 @@ func TestMainMenuQuit(t *testing.T) {
 }
 
 func TestMyAccount_MyAddress(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@@ -340,7 +296,7 @@ func TestMyAccount_MyAddress(t *testing.T) {
 }
 
 func TestMainMenuSend(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@@ -391,12 +347,9 @@ func TestGroups(t *testing.T) {
 	if err != nil {
 		log.Fatalf("Failed to load test groups: %v", err)
 	}
-	en, fn, _, pe, flagParser := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
-
-	flag_admin_privilege, _ := flagParser.GetFlag("flag_admin_privilege")
-
 	// Create test cases from loaded groups
 	tests := driver.CreateTestCases(groups)
 	for _, tt := range tests {
@@ -415,21 +368,9 @@ func TestGroups(t *testing.T) {
 			}
 			b := w.Bytes()
 			balance := extractBalance(b)
-			attempts := extractRemainingAttempts(b)
-
-			st := pe.GetState()
-
-			if st != nil {
-				st.SetFlag(flag_admin_privilege)
-				if tt.Name == "menu_my_account_reset_others_pin_with_no_privileges" {
-					st.ResetFlag(flag_admin_privilege)
-				}
-			}
 
 			expectedContent := []byte(tt.ExpectedContent)
 			expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-			expectedContent = bytes.Replace(expectedContent, []byte("{attempts}"), []byte(attempts), -1)
-			expectedContent = bytes.Replace(expectedContent, []byte("{secondary_session_id}"), []byte(secondarySessionId), -1)
 
 			tt.ExpectedContent = string(expectedContent)
 

menutraversal_test/profile_edit_start_familyname.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/profile_edit_start_firstname.json

@@ -9,7 +9,7 @@
                 },
                 {
                     "input": "3",
-                   "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
                 {
                     "input": "1",

menutraversal_test/profile_edit_start_gender.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/profile_edit_start_location.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/profile_edit_start_offerings.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/profile_edit_start_yob.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/profile_edit_when_adjacent_item_set.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/test_setup.json

@@ -116,7 +116,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                     },
                     {
                         "input": "6",

profile/profile_test.go

@@ -1,42 +0,0 @@
-package profile
-
-import (
-	"testing"
-
-	"github.com/alecthomas/assert/v2"
-	"github.com/stretchr/testify/require"
-)
-
-func TestInsertOrShift(t *testing.T) {
-	tests := []struct {
-		name     string
-		profile Profile
-		index   int
-		value   string
-		expected []string
-	}{
-		{
-			name:     "Insert within range",
-			profile:  Profile{ProfileItems: []string{"A", "B", "C"}, Max: 5},
-			index:    1,
-			value:    "X",
-			expected: []string{"A", "X"},
-		},
-		{
-			name:     "Insert beyond range",
-			profile:  Profile{ProfileItems: []string{"A"}, Max: 5},
-			index:    3,
-			value:    "Y",
-			expected: []string{"A", "0", "0", "Y"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			p := tt.profile
-			p.InsertOrShift(tt.index, tt.value)
-			require.NotNil(t, p.ProfileItems)
-			assert.Equal(t, tt.expected, p.ProfileItems)
-		})
-	}
-}

services/local.go

@@ -1,17 +1,16 @@
-//go:build !online
 // +build !online
 
 package services
 
 import (
-	"context"
 	"fmt"
+	"context"
 
-	devremote "git.grassecon.net/grassrootseconomics/sarafu-api/dev"
-	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	devremote "git.grassecon.net/grassrootseconomics/sarafu-api/dev"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
 )
 
 type localEmitter struct {
@@ -38,7 +37,7 @@ func (d *localEmitter) emit(ctx context.Context, msg apievent.Msg) error {
 	return err
 }
 
-func New(ctx context.Context, storageService storage.StorageService) remote.AccountService {
+func New(ctx context.Context, storageService storage.StorageService, conn storage.ConnData) remote.AccountService {
 	svc := devremote.NewDevAccountService(ctx, storageService)
 	svc = svc.WithAutoVoucher(ctx, "FOO", 42)
 	eu := event.NewEventsUpdater(svc, storageService)

services/registration/Makefile

@@ -4,8 +4,8 @@ TXTS = $(wildcard ./*.txt.orig)
 VISE_PATH := ../../go-vise
 
 # Rule to build .bin files from .vis files
-%.vis: buildasm
+%.vis:
-	./vise-asm -f pp.csv $(basename $@).vis > $(basename $@).bin
+	go run  $(VISE_PATH)/dev/asm/main.go -f pp.csv $(basename $@).vis > $(basename $@).bin
 	@echo "Built $(basename $@).bin from $(basename $@).vis"
 
 # Rule to copy .orig files to .txt
@@ -19,10 +19,5 @@ all: $(INPUTS) $(TXTS)
 
 clean: 
 	rm -vf *.bin
-	rm -vf ./vise-asm
-
-buildasm:
-	go build -v -o ./vise-asm $(VISE_PATH)/dev/asm/main.go
-
 
 .PHONY: clean

services/registration/account_pending

@@ -1 +1 @@
-Your account is still being created. For more help, please call: 0757628885
+Your account is still being created.

services/registration/account_pending_swa

@@ -1 +1 @@
-Akaunti yako bado inatengenezwa. Kwa usaidizi zaidi, piga: 0757628885
+Akaunti yako bado inatengenezwa

services/registration/amount.vis

@@ -1,5 +1,5 @@
 LOAD reset_transaction_amount 0
-LOAD max_amount 40
+LOAD max_amount 10
 RELOAD max_amount
 MAP max_amount
 MOUT back 0

services/registration/authorize_reset_others_pin

@@ -1,2 +0,0 @@
-{{.retrieve_blocked_number}} will get a PIN reset request.
-Please enter your PIN to confirm:

services/registration/authorize_reset_others_pin.vis

@@ -1,12 +0,0 @@
-LOAD retrieve_blocked_number 0
-RELOAD retrieve_blocked_number
-MAP retrieve_blocked_number
-MOUT back 0
-MOUT quit 9
-LOAD authorize_account 6
-HALT
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-INCMP _ 0
-INCMP quit 9
-INCMP pin_reset_result *

services/registration/authorize_reset_others_pin_swa

@@ -1,2 +0,0 @@
-{{.retrieve_blocked_number}} atapokea ombi la kuweka upya PIN.
-Tafadhali weka PIN yako kudhibitisha:

services/registration/confirm_create_pin.vis

@@ -1,7 +1,4 @@
-MOUT back 0
+LOAD save_temporary_pin 6
 HALT
-INCMP _ 0
 LOAD verify_create_pin 8
-RELOAD verify_create_pin
-CATCH pin_mismatch flag_pin_mismatch 1
 INCMP account_creation *

services/registration/confirm_new_alias

@@ -1,2 +0,0 @@
-Your full alias will be: {{.get_suggested_alias}}
-Please enter your PIN to confirm: 

services/registration/confirm_new_alias.vis

@@ -1,12 +0,0 @@
-LOAD reset_invalid_pin 6
-RELOAD reset_invalid_pin
-LOAD get_suggested_alias 0
-RELOAD get_suggested_alias
-MAP get_suggested_alias
-MOUT back 0
-HALT
-INCMP _ 0
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH invalid_pin flag_invalid_pin 1
-CATCH update_alias flag_allow_update 1

services/registration/confirm_new_alias_swa

@@ -1,2 +0,0 @@
-Lakabu yako kamili itakuwa: {{.get_suggested_alias}}
-Tafadhali weka PIN yako ili kuthibitisha:

services/registration/confirm_others_new_pin

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

services/registration/confirm_others_new_pin.vis

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

services/registration/confirm_others_new_pin_swa

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

services/registration/confirm_pin_change.vis

@@ -1,7 +1,5 @@
+CATCH invalid_pin flag_valid_pin 0
 MOUT back 0
 HALT
 INCMP _ 0
-LOAD confirm_pin_change 0
+INCMP * pin_reset_success
-RELOAD confirm_pin_change
-CATCH pin_mismatch flag_pin_mismatch 1
-INCMP pin_reset_success *

services/registration/create_pin.vis

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

services/registration/create_pin_mismatch.vis

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

services/registration/enter_other_number.vis

@@ -4,7 +4,4 @@ RELOAD reset_account_authorized
 MOUT back 0
 HALT
 INCMP _ 0
-LOAD validate_blocked_number 6
+INCMP enter_others_new_pin *
-RELOAD validate_blocked_number
-CATCH unregistered_number flag_unregistered_number 1
-INCMP authorize_reset_others_pin *

services/registration/enter_others_new_pin

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

services/registration/enter_others_new_pin.vis

@@ -0,0 +1,12 @@
+LOAD validate_blocked_number 6
+RELOAD validate_blocked_number
+CATCH unregistered_number flag_unregistered_number 1
+LOAD retrieve_blocked_number 0
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+MOUT back 0
+HALT 
+LOAD verify_new_pin 6
+RELOAD verify_new_pin
+INCMP _ 0
+INCMP * confirm_others_new_pin

services/registration/enter_others_new_pin_swa

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

services/registration/incorrect_pin.vis

@@ -7,4 +7,3 @@ MOUT quit 9
 HALT
 INCMP _ 1
 INCMP quit 9
-INCMP . *

services/registration/invalid_others_pin

@@ -0,0 +1 @@
+The PIN you have entered is invalid.Please try a 4 digit number instead.