call memory's pop to free cache's current level

Reviewed-on: #38

Dockerfile

@@ -21,8 +21,7 @@ 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 logtrace,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
-RUN go build -tags logtrace,online -o sarafu-ssh -ldflags="-X main.build=${BUILD} -s -w" cmd/ssh/main.go
+RUN go build -tags logwarn,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
 
 FROM debian:bookworm-slim
 
@@ -37,7 +36,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 WORKDIR /service
 
 COPY --from=build /build/sarafu-vise/sarafu-at .
-COPY --from=build /build/sarafu-vise/sarafu-ssh .
 COPY --from=build /build/sarafu-vise/LICENSE .
 COPY --from=build /build/sarafu-vise/README.md .
 COPY --from=build /build/sarafu-vise/services ./services
@@ -45,6 +43,5 @@ COPY --from=build /build/sarafu-vise/.env.example .
 RUN mv .env.example .env
 
 EXPOSE 7123
-EXPOSE 7122
 
 CMD ["./sarafu-at"]

devtools/admin/main.go

@@ -8,6 +8,7 @@ import (
 	"path"
 
 	"git.defalsify.org/vise.git/logging"
+	"git.defalsify.org/vise.git/engine"
 
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
@@ -18,6 +19,7 @@ import (
 var (
 	logg      = logging.NewVanilla().WithContextKey("SessionId")
 	scriptDir = path.Join("services", "registration")
+	menuSeparator = ": "
 )
 
 func main() {
@@ -25,6 +27,8 @@ func main() {
 
 	override := config.NewOverride()
 	var sessionId string
+	var size uint
+	var engineDebug bool
 
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
@@ -32,6 +36,8 @@ func main() {
 
 	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.Parse()
 
 	config.Apply(override)
@@ -50,7 +56,18 @@ func main() {
 		os.Exit(1)
 	}
 
+	cfg := engine.Config{
+		Root:              "root",
+		SessionId:         sessionId,
+		OutputSize:        uint32(size),
+		FlagCount:         uint32(128),
+		MenuSeparator:     menuSeparator,
+		EngineDebug:       engineDebug,
+		ResetOnEmptyInput: true,
+	}
+
 	x := cmd.NewCmd(sessionId, flagParser)
+	x = x.WithEngine(cfg)
 	err = x.Parse(flag.Args())
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "cmd parse fail: %v\n", err)

go.mod

@@ -3,10 +3,10 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise
 go 1.23.4
 
 require (
-	git.defalsify.org/vise.git v0.2.3-0.20250205173834-d1f6647211ac
+	git.defalsify.org/vise.git v0.3.2-0.20250326034808-b9c2294cbf1a
 	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250206112944-31eb30de0f69
-	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.1.0.20250204132347-1eb0b1555244
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b
+	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2
 	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/gofrs/uuid v4.4.0+incompatible

go.sum

@@ -1,11 +1,11 @@
-git.defalsify.org/vise.git v0.2.3-0.20250205173834-d1f6647211ac h1:f/E0ZTclVfMEnD/3Alrzzbg+dOm138zGydV42jT0JPw=
-git.defalsify.org/vise.git v0.2.3-0.20250205173834-d1f6647211ac/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.3.2-0.20250326034808-b9c2294cbf1a h1:5uLBUZC6armYgBPkuNEsQPtqT3qZxRfNP4HUdkhjm4I=
+git.defalsify.org/vise.git v0.3.2-0.20250326034808-b9c2294cbf1a/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
 git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
 git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250206112944-31eb30de0f69 h1:cbBpm9uNJak58MpFpNXJuvgCmz+A8kquXr9har4expg=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250206112944-31eb30de0f69/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.1.0.20250204132347-1eb0b1555244 h1:BXotWSKg04U97sf/xeWJuUTSVgKk2aEK+5BtBrnafXQ=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.1.0.20250204132347-1eb0b1555244/go.mod h1:6B6ByxXOiRY0NR7K02Bf3fEu7z+2c/6q8PFVNjC5G8w=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b h1:xiTpaqWWoF5qcnarY/9ZkT6aVdnKwqztb2gzIahJn4w=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b/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=

handlers/application/menuhandler.go

@@ -8,6 +8,7 @@ import (
 	"path"
 	"strconv"
 	"strings"
+	"unicode"
 
 	"gopkg.in/leonelquinteros/gotext.v1"
 
@@ -193,8 +194,9 @@ func (h *MenuHandlers) createAccountNoExist(ctx context.Context, sessionId strin
 	publicKey := r.PublicKey
 
 	data := map[storedb.DataTyp]string{
-		storedb.DATA_TRACKING_ID: trackingId,
-		storedb.DATA_PUBLIC_KEY:  publicKey,
+		storedb.DATA_TRACKING_ID:   trackingId,
+		storedb.DATA_PUBLIC_KEY:    publicKey,
+		storedb.DATA_ACCOUNT_ALIAS: "",
 	}
 	store := h.userdataStore
 	for key, value := range data {
@@ -241,6 +243,28 @@ func (h *MenuHandlers) CreateAccount(ctx context.Context, sym string, input []by
 	return res, nil
 }
 
+func (h *MenuHandlers) CheckAccountCreated(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	flag_account_created, _ := h.flagManager.GetFlag("flag_account_created")
+
+	store := h.userdataStore
+
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	_, err := store.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
+	if err != nil {
+		if !db.IsNotFound(err) {
+			return res, err
+		}
+		return res, nil
+	}
+	res.FlagSet = append(res.FlagSet, flag_account_created)
+	return res, nil
+}
+
 // ResetValidPin resets the flag_valid_pin flag.
 func (h *MenuHandlers) ResetValidPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -1120,7 +1144,12 @@ func (h *MenuHandlers) GetCurrentProfileInfo(ctx context.Context, sym string, in
 			logg.ErrorCtxf(ctx, "Failed to read account alias entry with", "key", "error", storedb.DATA_ACCOUNT_ALIAS, err)
 			return res, err
 		}
-		res.Content = string(profileInfo)
+		alias := string(profileInfo)
+		if alias == "" {
+			res.Content = defaultValue
+		} else {
+			res.Content = alias
+		}
 	default:
 		break
 	}
@@ -1164,8 +1193,10 @@ func (h *MenuHandlers) GetProfileInfo(ctx context.Context, sym string, input []b
 	offerings := getEntryOrDefault(store.ReadEntry(ctx, sessionId, storedb.DATA_OFFERINGS))
 	alias := getEntryOrDefault(store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS))
 
-	if alias != defaultValue {
+	if alias != defaultValue && alias != "" {
 		alias = strings.Split(alias, ".")[0]
+	} else {
+		alias = defaultValue
 	}
 
 	// Construct the full name
@@ -1246,20 +1277,10 @@ func (h *MenuHandlers) UpdateAllProfileItems(ctx context.Context, sym string, in
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	flag_alias_set, _ := h.flagManager.GetFlag("flag_alias_set")
-	aliasSet := h.st.MatchFlag(flag_alias_set, true)
-
 	err := h.insertProfileItems(ctx, sessionId, &res)
 	if err != nil {
 		return res, err
 	}
-	//Only request an alias if it has not been set yet:
-	if !aliasSet {
-		err = h.constructAccountAlias(ctx)
-		if err != nil {
-			return res, err
-		}
-	}
 	return res, nil
 }
 
@@ -1460,7 +1481,7 @@ func loadUserContent(ctx context.Context, activeSym string, balance string, alia
 	if alias != "" {
 		content = l.Get("%s balance: %s\n", alias, balStr)
 	} else {
-		content = l.Get("balance: %s\n", balStr)
+		content = l.Get("Balance: %s\n", balStr)
 	}
 	return content, nil
 }
@@ -1468,7 +1489,6 @@ func loadUserContent(ctx context.Context, activeSym string, balance string, alia
 // CheckBalance retrieves the balance of the active voucher and sets
 // the balance as the result content.
 func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-
 	var (
 		res     resource.Result
 		err     error
@@ -1483,19 +1503,10 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
 
 	store := h.userdataStore
 
-	accAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
-	if err != nil {
-		if !db.IsNotFound(err) {
-			logg.ErrorCtxf(ctx, "failed to read account alias entry with", "key", storedb.DATA_ACCOUNT_ALIAS, "error", err)
-			return res, err
-		}
-	} else {
-		alias = strings.Split(string(accAlias), ".")[0]
-	}
-
 	// get the active sym and active balance
 	activeSym, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
 	if err != nil {
+		logg.InfoCtxf(ctx, "could not find the activeSym in checkBalance:", "err", err)
 		if !db.IsNotFound(err) {
 			logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", storedb.DATA_ACTIVE_SYM, "error", err)
 			return res, err
@@ -1508,7 +1519,16 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
 			logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", storedb.DATA_ACTIVE_BAL, "error", err)
 			return res, err
 		}
+	}
 
+	accAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
+	if err != nil {
+		if !db.IsNotFound(err) {
+			logg.ErrorCtxf(ctx, "failed to read account alias entry with", "key", storedb.DATA_ACCOUNT_ALIAS, "error", err)
+			return res, err
+		}
+	} else {
+		alias = strings.Split(string(accAlias), ".")[0]
 	}
 
 	content, err = loadUserContent(ctx, string(activeSym), string(activeBal), alias)
@@ -1619,6 +1639,7 @@ func (h *MenuHandlers) ValidateRecipient(ctx context.Context, sym string, input
 				//Perform a search for each search domain,break on first match
 				for _, domain := range config.SearchDomains() {
 					fqdn := fmt.Sprintf("%s.%s", recipient, domain)
+					logg.InfoCtxf(ctx, "Resolving with fqdn alias", "alias", fqdn)
 					AliasAddress, err = h.accountService.CheckAliasAddress(ctx, fqdn)
 					if err == nil {
 						AliasAddressResult = AliasAddress.Address
@@ -1929,7 +1950,6 @@ func (h *MenuHandlers) InitiateTransaction(ctx context.Context, sym string, inpu
 // and sets the first as the default voucher, if no active voucher is set.
 func (h *MenuHandlers) SetDefaultVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-	var err error
 	userStore := h.userdataStore
 
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -1940,8 +1960,7 @@ func (h *MenuHandlers) SetDefaultVoucher(ctx context.Context, sym string, input
 	flag_no_active_voucher, _ := h.flagManager.GetFlag("flag_no_active_voucher")
 
 	// check if the user has an active sym
-	_, err = userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
-
+	_, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
 	if err != nil {
 		if db.IsNotFound(err) {
 			publicKey, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
@@ -2033,6 +2052,8 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by
 		return res, nil
 	}
 
+	logg.InfoCtxf(ctx, "fetched user vouchers", "public_key", string(publicKey), "vouchers", vouchersResp)
+
 	// check the current active sym and update the data
 	activeSym, _ := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
 	if activeSym != nil {
@@ -2065,6 +2086,11 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by
 		}
 	}
 
+	activeBal, _ := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_BAL)
+	activeAddr, _ := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_ADDRESS)
+
+	logg.InfoCtxf(ctx, "The active data in CheckVouchers:", "activeSym", string(activeSym), string(activeBal), string(activeAddr))
+
 	data := store.ProcessVouchers(vouchersResp)
 
 	// Store all voucher data
@@ -2075,9 +2101,12 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by
 		storedb.DATA_VOUCHER_ADDRESSES: data.Addresses,
 	}
 
+	// Write data entries
 	for key, value := range dataMap {
-		if err := h.prefixDb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value)); err != nil {
-			return res, nil
+		logg.InfoCtxf(ctx, "Writing data entry for sessionId: %s", sessionId, "key", key, "value", value)
+		if err := userStore.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
+			logg.ErrorCtxf(ctx, "Failed to write data entry for sessionId: %s", sessionId, "key", key, "error", err)
+			continue
 		}
 	}
 
@@ -2087,16 +2116,25 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by
 // GetVoucherList fetches the list of vouchers and formats them.
 func (h *MenuHandlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	userStore := h.userdataStore
 
 	// Read vouchers from the store
-	voucherData, err := h.prefixDb.Get(ctx, storedb.ToBytes(storedb.DATA_VOUCHER_SYMBOLS))
+	voucherData, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_VOUCHER_SYMBOLS)
+	logg.InfoCtxf(ctx, "reading GetVoucherList entries for sessionId: %s", sessionId, "key", storedb.DATA_VOUCHER_SYMBOLS, "voucherData", voucherData)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err)
+		logg.ErrorCtxf(ctx, "failed to read voucherData entires with", "key", storedb.DATA_VOUCHER_SYMBOLS, "error", err)
 		return res, err
 	}
 
 	formattedData := h.ReplaceSeparatorFunc(string(voucherData))
 
+	logg.InfoCtxf(ctx, "final output for sessionId: %s", sessionId, "key", storedb.DATA_VOUCHER_SYMBOLS, "formattedData", formattedData)
+
 	res.Content = string(formattedData)
 
 	return res, nil
@@ -2123,7 +2161,7 @@ func (h *MenuHandlers) ViewVoucher(ctx context.Context, sym string, input []byte
 		return res, nil
 	}
 
-	metadata, err := store.GetVoucherData(ctx, h.prefixDb, inputStr)
+	metadata, err := store.GetVoucherData(ctx, h.userdataStore, sessionId, inputStr)
 	if err != nil {
 		return res, fmt.Errorf("failed to retrieve voucher data: %v", err)
 	}
@@ -2459,6 +2497,10 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+	if string(input) == "0" {
+		return res, nil
+	}
+
 	store := h.userdataStore
 	aliasHint, err := store.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE)
 	if err != nil {
@@ -2479,7 +2521,8 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input
 				return res, nil
 			}
 		}
-		aliasResult, err := h.accountService.RequestAlias(ctx, string(pubKey), string(input))
+		sanitizedInput := sanitizeAliasHint(string(input))
+		aliasResult, err := h.accountService.RequestAlias(ctx, string(pubKey), sanitizedInput)
 		if err != nil {
 			logg.ErrorCtxf(ctx, "failed to retrieve alias", "alias", string(aliasHint), "error_alias_request", err)
 			return res, fmt.Errorf("Failed to retrieve alias: %s", err.Error())
@@ -2496,6 +2539,17 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input
 	return res, nil
 }
 
+func sanitizeAliasHint(input string) string {
+	for i, r := range input {
+		// Check if the character is a special character (non-alphanumeric)
+		if !unicode.IsLetter(r) && !unicode.IsNumber(r) {
+			return input[:i]
+		}
+	}
+	// If no special character is found, return the whole input
+	return input
+}
+
 // GetSuggestedAlias loads and displays the suggested alias name from the temporary value
 func (h *MenuHandlers) GetSuggestedAlias(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result

handlers/application/menuhandler_test.go

@@ -1727,7 +1727,7 @@ func TestCheckBalance(t *testing.T) {
 			publicKey:      "0X98765432109",
 			activeSym:      "ETH",
 			activeBal:      "1.5",
-			expectedResult: resource.Result{Content: "balance: 1.50 ETH\n"},
+			expectedResult: resource.Result{Content: "Balance: 1.50 ETH\n"},
 			expectError:    false,
 		},
 	}
@@ -2067,12 +2067,10 @@ func TestCheckVouchers(t *testing.T) {
 
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	spdb := InitializeTestSubPrefixDb(t, ctx)
 
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		prefixDb:       spdb,
 	}
 
 	err := store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(publicKey))
@@ -2104,7 +2102,7 @@ func TestCheckVouchers(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Read voucher sym data from the store
-	voucherData, err := spdb.Get(ctx, storedb.ToBytes(storedb.DATA_VOUCHER_SYMBOLS))
+	voucherData, err := store.ReadEntry(ctx, sessionId, storedb.DATA_VOUCHER_SYMBOLS)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2126,20 +2124,19 @@ func TestCheckVouchers(t *testing.T) {
 func TestGetVoucherList(t *testing.T) {
 	sessionId := "session123"
 
-	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
-
-	spdb := InitializeTestSubPrefixDb(t, ctx)
+	ctx, store := InitializeTestStore(t)
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
 	// Initialize MenuHandlers
 	h := &MenuHandlers{
-		prefixDb:             spdb,
+		userdataStore:        store,
 		ReplaceSeparatorFunc: mockReplaceSeparator,
 	}
 
 	mockSyms := []byte("1:SRF\n2:MILO")
 
 	// Put voucher sym data from the store
-	err := spdb.Put(ctx, storedb.ToBytes(storedb.DATA_VOUCHER_SYMBOLS), mockSyms)
+	err := store.WriteEntry(ctx, sessionId, storedb.DATA_VOUCHER_SYMBOLS, mockSyms)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2159,15 +2156,11 @@ func TestViewVoucher(t *testing.T) {
 	}
 	ctx, store := InitializeTestStore(t)
 	sessionId := "session123"
-
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
-	spdb := InitializeTestSubPrefixDb(t, ctx)
-
 	h := &MenuHandlers{
 		userdataStore: store,
 		flagManager:   fm,
-		prefixDb:      spdb,
 	}
 
 	// Define mock voucher data
@@ -2180,7 +2173,7 @@ func TestViewVoucher(t *testing.T) {
 
 	// Put the data
 	for key, value := range mockData {
-		err = spdb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value))
+		err := store.WriteEntry(ctx, sessionId, key, []byte(value))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -3476,15 +3469,6 @@ func TestUpdateAllProfileItems(t *testing.T) {
 	err = store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(publicKey))
 	require.NoError(t, err)
 
-	aliasInput := fmt.Sprintf("%s%s", profileItems[0], profileItems[1])
-
-	// Mock the account alias response
-	mockAccountService.On(
-		"RequestAlias",
-		publicKey,
-		aliasInput,
-	).Return(&models.RequestAliasResult{Alias: "JohnDoe"}, nil)
-
 	// Call the function under test
 	res, err := h.UpdateAllProfileItems(ctx, "symbol", nil)
 	assert.NoError(t, err)
@@ -3496,10 +3480,6 @@ func TestUpdateAllProfileItems(t *testing.T) {
 		assert.Equal(t, profileItems[i], string(storedValue))
 	}
 
-	// Validate alias storage
-	storedAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
-	assert.NoError(t, err)
-	assert.Equal(t, "JohnDoe", string(storedAlias))
 	assert.Equal(t, expectedResult, res)
 }
 

handlers/event/token.go

@@ -49,9 +49,8 @@ func (eu *EventsUpdater) updateToken(ctx context.Context, identity identity.Iden
 
 // 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, pfxDb, activeSym)
+	tokenData, err := store.GetVoucherData(ctx, userStore, identity.SessionId, activeSym)
 	if err != nil {
 		return err
 	}

handlers/local.go

@@ -128,6 +128,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	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
 

internal/cmd/cmd.go

@@ -5,21 +5,32 @@ import (
 	"fmt"
 
 	"git.defalsify.org/vise.git/logging"
+	"git.defalsify.org/vise.git/engine"
+	"git.defalsify.org/vise.git/persist"
+	"git.defalsify.org/vise.git/resource"
+	"git.defalsify.org/vise.git/state"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
+var argc map[string]int = map[string]int{
+	"reset": 0,
+	"admin": 1,
+}
+
 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
+	sessionId    string
+	conn         storage.ConnData
+	flagParser   *application.FlagManager
+	cmd          int
+	enable       bool
+	exec         func(ctx context.Context, ss storage.StorageService) error
+	engineConfig *engine.Config
+	st           *state.State
 }
 
 func NewCmd(sessionId string, flagParser *application.FlagManager) *Cmd {
@@ -29,10 +40,74 @@ func NewCmd(sessionId string, flagParser *application.FlagManager) *Cmd {
 	}
 }
 
+func (c *Cmd) WithEngine(engineConfig engine.Config) *Cmd {
+	c.engineConfig = &engineConfig
+	return c
+}
+
 func (c *Cmd) Exec(ctx context.Context, ss storage.StorageService) error {
 	return c.exec(ctx, ss)
 }
 
+func (c *Cmd) engine(ctx context.Context, rs resource.Resource, pe *persist.Persister) (engine.Engine, error) {
+	if c.engineConfig == nil {
+		return nil, fmt.Errorf("engine config missing")
+	}
+	en := engine.NewEngine(*c.engineConfig, rs)
+
+	st := pe.GetState()
+	if st == nil {
+		return nil, fmt.Errorf("persister state fail")
+	}
+	en = en.WithState(st)
+	st.UseDebug()
+	ca := pe.GetMemory()
+	if ca == nil {
+		return nil, fmt.Errorf("persister cache fail")
+	}
+	en = en.WithMemory(ca)
+	logg.DebugCtxf(ctx, "state loaded", "state", st)
+	return en, nil
+}
+
+func (c *Cmd) execReset(ctx context.Context, ss storage.StorageService) error {
+	pe, err := ss.GetPersister(ctx)
+	if err != nil {
+		return fmt.Errorf("get persister error: %v", err)
+	}
+	rs, err := ss.GetResource(ctx)
+	if err != nil {
+		return fmt.Errorf("get resource error: %v", err)
+	}
+	dbResource, ok := rs.(*resource.DbResource)
+	if !ok {
+		return fmt.Errorf("get dbresource error: %v", err)
+	}
+	err = pe.Load(c.engineConfig.SessionId)
+	if err != nil {
+		return fmt.Errorf("persister load error: %v", err)
+	}
+	en, err := c.engine(ctx, dbResource, pe)
+	if err != nil {
+		return err
+	}
+	ca := pe.GetMemory()
+	ca.Pop()
+
+	_, err = en.(*engine.DefaultEngine).Reset(ctx, false)
+	if err != nil {
+		return err
+	}
+	st := pe.GetState()
+	logg.DebugCtxf(ctx, "state after reset", "state", st)
+
+	err = pe.Save(c.engineConfig.SessionId)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func (c *Cmd) execAdmin(ctx context.Context, ss storage.StorageService) error {
 	pe, err := ss.GetPersister(ctx)
 	if err != nil {
@@ -76,13 +151,33 @@ func (c *Cmd) parseCmdAdmin(cmd string, param string, more []string) (bool, erro
 	return false, nil
 }
 
+func (c *Cmd) parseCmdReset(cmd string, param string, more []string) (bool, error) {
+	if cmd == "reset" {
+		c.enable = false
+		c.exec = c.execReset
+		return true, nil
+	}
+	return false, nil
+}
+
 func (c *Cmd) Parse(args []string) error {
-	if len(args) < 2 {
+	var param string
+	if len(args) < 1 {
 		return fmt.Errorf("Wrong number of arguments: %v", args)
 	}
 	cmd := args[0]
-	param := args[1]
-	args = args[2:]
+
+	n, ok := argc[cmd]
+	if !ok {
+		return fmt.Errorf("invalid command: %v", cmd)
+	}
+	if n > 0 {
+		if len(args) < n+1 {
+			return fmt.Errorf("Wrong number of arguments, need: %d", n)
+		}
+		param = args[1]
+		args = args[2:]
+	}
 
 	r, err := c.parseCmdAdmin(cmd, param, args)
 	if err != nil {
@@ -92,5 +187,13 @@ func (c *Cmd) Parse(args []string) error {
 		return nil
 	}
 
+	r, err = c.parseCmdReset(cmd, param, args)
+	if err != nil {
+		return err
+	}
+	if r {
+		return nil
+	}
+
 	return fmt.Errorf("unknown subcommand: %s", cmd)
 }

services/registration/amount.vis

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

services/registration/locale/swa/default.po

@@ -30,3 +30,7 @@ msgstr "Salio la Kikundi: 0.00"
 
 msgid "Symbol: %s\nBalance: %s"
 msgstr "Sarafu: %s\nSalio: %s"
+
+
+msgid "%s balance: %s\n"
+msgstr "%s salio: %s\n"

services/registration/my_account_alias

@@ -1,2 +1,2 @@
 Current alias: {{.get_current_profile_info}}
-Edit my alias:
+Enter your preferred alias::

services/registration/my_account_alias_swa

@@ -1,2 +1,2 @@
 Lakabu ya sasa: {{.get_current_profile_info}}
-Badilisha Lakabu yangu:
+Weka lakabu unalopendelea::

services/registration/root.vis

@@ -1,5 +1,7 @@
 LOAD check_blocked_status 1
 RELOAD check_blocked_status
+LOAD check_account_created 2
+RELOAD check_account_created
 CATCH blocked_account flag_account_blocked 1
 CATCH select_language flag_language_set 0
 CATCH terms flag_account_created 0

store/db/sub_prefix_db.go

@@ -33,11 +33,14 @@ func (s *SubPrefixDb) toKey(k []byte) []byte {
 func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
 	s.store.SetPrefix(db.DATATYPE_USERDATA)
 	key = s.toKey(key)
+	logg.InfoCtxf(ctx, "SubPrefixDb Get log", "key", string(key))
+
 	return s.store.Get(ctx, key)
 }
 
 func (s *SubPrefixDb) Put(ctx context.Context, key []byte, val []byte) error {
 	s.store.SetPrefix(db.DATATYPE_USERDATA)
 	key = s.toKey(key)
+	logg.InfoCtxf(ctx, "SubPrefixDb Put log", "key", string(key))
 	return s.store.Put(ctx, key, val)
 }

store/vouchers.go

@@ -68,7 +68,7 @@ func ScaleDownBalance(balance, decimals string) string {
 }
 
 // GetVoucherData retrieves and matches voucher data
-func GetVoucherData(ctx context.Context, db storedb.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
+func GetVoucherData(ctx context.Context, store DataStore, sessionId string, input string) (*dataserviceapi.TokenHoldings, error) {
 	keys := []storedb.DataTyp{
 		storedb.DATA_VOUCHER_SYMBOLS,
 		storedb.DATA_VOUCHER_BALANCES,
@@ -78,9 +78,9 @@ func GetVoucherData(ctx context.Context, db storedb.PrefixDb, input string) (*da
 	data := make(map[storedb.DataTyp]string)
 
 	for _, key := range keys {
-		value, err := db.Get(ctx, storedb.ToBytes(key))
+		value, err := store.ReadEntry(ctx, sessionId, key)
 		if err != nil {
-			return nil, fmt.Errorf("failed to get prefix key %x: %v", storedb.ToBytes(key), err)
+			return nil, fmt.Errorf("failed to get data key %x: %v", key, err)
 		}
 		data[key] = string(value)
 	}

store/vouchers_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/alecthomas/assert/v2"
 	"github.com/stretchr/testify/require"
 
-	visedb "git.defalsify.org/vise.git/db"
 	memdb "git.defalsify.org/vise.git/db/mem"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
@@ -77,16 +76,8 @@ func TestProcessVouchers(t *testing.T) {
 }
 
 func TestGetVoucherData(t *testing.T) {
-	ctx := context.Background()
-
-	db := memdb.NewMemDb()
-	err := db.Connect(ctx, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	prefix := storedb.ToBytes(visedb.DATATYPE_USERDATA)
-	spdb := storedb.NewSubPrefixDb(db, prefix)
+	ctx, store := InitializeTestDb(t)
+	sessionId := "session123"
 
 	// Test voucher data
 	mockData := map[storedb.DataTyp][]byte{
@@ -98,13 +89,13 @@ func TestGetVoucherData(t *testing.T) {
 
 	// Put the data
 	for key, value := range mockData {
-		err = spdb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value))
+		err := store.WriteEntry(ctx, sessionId, key, []byte(value))
 		if err != nil {
 			t.Fatal(err)
 		}
 	}
 
-	result, err := GetVoucherData(ctx, spdb, "1")
+	result, err := GetVoucherData(ctx, store, sessionId, "1")
 
 	assert.NoError(t, err)
 	assert.Equal(t, "SRF", result.TokenSymbol)