cmd/main.go

@@ -26,6 +26,7 @@ const (
 	USERFLAG_ACCOUNT_UNLOCKED
 	invalidRecipient
 	invalidRecipientWithInvite
+	USERFLAG_INCORRECTPIN
 )
 
 const (
@@ -131,8 +132,7 @@ func (fsd *fsData) create_account(ctx context.Context, sym string, input []byte)
 	if err != nil {
 		return res, err
 	}
-
-	res.FlagSet = []uint32{USERFLAG_ACCOUNT_CREATED}
+	res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_CREATED)
 	return res, err
 }
 
@@ -156,15 +156,32 @@ func (fsd *fsData) checkIdentifier(ctx context.Context, sym string, input []byte
 	return res, nil
 }
 
-
-func (fsd *fsData) unlock(ctx context.Context,sym string,input []byte) (resource.Result,error){
+func (fsd *fsData) unLock(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
-	//res.FlagSet = []uint32{USERFLAG_ACCOUNT_UNLOCKED}
+	pin := string(input)
+	if len(input) > 0 {
+		if pin == "0000" {
+			res.FlagSet = append(res.FlagSet, USERFLAG_INCORRECTPIN)
+			res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
+			return res, nil
+		}
 		if fsd.st.MatchFlag(USERFLAG_ACCOUNT_UNLOCKED, false) {
 			res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_UNLOCKED)
 		} else {
 			res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
 		}
+	}
+	return res, nil
+}
+
+func (fsd *fsData) ResetIncorrectPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	res := resource.Result{}
+	isIncorrectPinSet := fsd.st.MatchFlag(USERFLAG_INCORRECTPIN, true)
+	if isIncorrectPinSet {
+		res.FlagReset = append(res.FlagReset, USERFLAG_INCORRECTPIN)
+	} else {
+		res.FlagReset = append(res.FlagReset, USERFLAG_INCORRECTPIN)
+	}
 	return res, nil
 }
 
@@ -192,7 +209,7 @@ func (fsd *fsData) check_account_status(ctx context.Context, sym string, input [
 
 	accountData["Status"] = status
 
-	if status == "SUCCESS" {
+	if status == "REVERTED" {
 		res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_SUCCESS)
 		res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_PENDING)
 	} else {
@@ -200,8 +217,6 @@ func (fsd *fsData) check_account_status(ctx context.Context, sym string, input [
 		res.FlagSet = append(res.FlagReset, USERFLAG_ACCOUNT_PENDING)
 	}
 
-	
-
 	updatedJsonData, err := json.Marshal(accountData)
 	if err != nil {
 		return res, err
@@ -261,15 +276,9 @@ func checkAccountStatus(trackingId string) (string, error) {
 
 func (fsd *fsData) quit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{
-		Content: "",
+		Content: "Your account is being created",
 	}
-	st := fsd.st
-	if(st.MatchFlag(USERFLAG_ACCOUNT_UNLOCKED,true)){
-	     //res.FlagReset = []uint32{USERFLAG_ACCOUNT_UNLOCKED}
-		// res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
-	}else {
 	res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
-	}
 	return res, nil
 }
 
@@ -480,6 +489,44 @@ func (fsd *fsData) get_sender(ctx context.Context, sym string, input []byte) (re
 	return res, nil
 }
 
+
+func (fsd *fsData) quitWithBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	res := resource.Result{
+	}
+	fp := fsd.path + "_data"
+
+	jsonData, err := os.ReadFile(fp)
+	if err != nil {
+		return res, err
+	}
+
+	var accountData map[string]string
+	err = json.Unmarshal(jsonData, &accountData)
+	if err != nil {
+		return res, err
+	}
+	resp, err := http.Get(checkBalanceURL + accountData["PublicKey"])
+	if err != nil {
+		return res, nil
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return res, nil
+	}
+
+	var balanceResp balanceResponse
+	err = json.Unmarshal(body, &balanceResp)
+	if err != nil {
+		return res, nil
+	}
+	balance := balanceResp.Result.Balance
+	res.Content =  fmt.Sprintf("Your account balance is: %s", balance)
+	res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
+	return res, nil
+}
+
 var (
 	scriptDir = path.Join("services", "registration")
 )
@@ -497,12 +544,13 @@ func main() {
 	fmt.Fprintf(os.Stderr, "starting session at symbol '%s' using resource dir: %s\n", root, dir)
 
 	ctx := context.Background()
-	st := state.NewState(7)
+	st := state.NewState(9)
 	st.UseDebug()
 	state.FlagDebugger.Register(USERFLAG_LANGUAGE_SET, "LANGUAGE_CHANGE")
 	state.FlagDebugger.Register(USERFLAG_ACCOUNT_CREATED, "ACCOUNT_CREATED")
 	state.FlagDebugger.Register(USERFLAG_ACCOUNT_SUCCESS, "ACCOUNT_SUCCESS")
 	state.FlagDebugger.Register(USERFLAG_ACCOUNT_PENDING, "ACCOUNT_PENDING")
+	state.FlagDebugger.Register(USERFLAG_INCORRECTPIN, "INCORRECTPIN")
 
 	rfs := resource.NewFsResource(scriptDir)
 	ca := cache.NewCache()
@@ -519,6 +567,7 @@ func main() {
 	}
 	pr := persist.NewFsPersister(dp)
 	en, err := engine.NewPersistedEngine(ctx, cfg, pr, rfs)
+
 	if err != nil {
 		pr = pr.WithContent(&st, ca)
 		err = pr.Save(cfg.SessionId)
@@ -541,7 +590,7 @@ func main() {
 	rfs.AddLocalFunc("create_account", fs.create_account)
 	rfs.AddLocalFunc("check_identifier", fs.checkIdentifier)
 	rfs.AddLocalFunc("check_account_status", fs.check_account_status)
-	rfs.AddLocalFunc("unlock_account", fs.unlock)
+	rfs.AddLocalFunc("unlock_account", fs.unLock)
 	rfs.AddLocalFunc("quit", fs.quit)
 	rfs.AddLocalFunc("check_balance", fs.checkBalance)
 	rfs.AddLocalFunc("validate_recipient", fs.validate_recipient)
@@ -550,8 +599,11 @@ func main() {
 	rfs.AddLocalFunc("validate_amount", fs.validate_amount)
 	rfs.AddLocalFunc("get_recipient", fs.get_recipient)
 	rfs.AddLocalFunc("get_sender", fs.get_sender)
+	rfs.AddLocalFunc("reset_incorrect", fs.ResetIncorrectPin)
+	rfs.AddLocalFunc("quit_with_balance",fs.quitWithBalance)
 
 	cont, err := en.Init(ctx)
+	en.SetDebugger(engine.NewSimpleDebug(nil))
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "engine init exited with error: %v\n", err)
 		os.Exit(1)

services/registration/account_creation.vis

@@ -1,3 +1,4 @@
 LOAD create_account 0
+LOAD quit 0
 HALT
-MOVE quit
+

services/registration/balances.vis

@@ -4,5 +4,5 @@ MOUT back 0
 HALT
 INCMP ^ 0
 INCMP my_balance 1
-INCMP my_community_balance 2
+INCMP community_balance 2
 

services/registration/community_balance.vis

@@ -0,0 +1,6 @@
+LOAD reset_incorrect 0
+CATCH incorrect_pin 15 1
+CATCH pin_entry 12 0
+LOAD quit_with_balance 0
+HALT
+

services/registration/enter_pin.vis

@@ -1,4 +1,4 @@
 MOUT back 0
 HALT
-INCMP ^ 0
+INCMP _ 0
 INCMP display_profile_info *

services/registration/incorrect_pin

@@ -0,0 +1 @@
+Incorrect  pin

services/registration/incorrect_pin.vis

@@ -0,0 +1,7 @@
+LOAD reset_incorrect 0
+RELOAD reset_incorrect
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP _ 1
+INCMP quit 9

services/registration/incorrect_pin_swa

@@ -0,0 +1 @@
+PIN ulioeka sio sahihi

services/registration/my_balance.vis

@@ -1,3 +1,6 @@
+LOAD reset_incorrect 0
+CATCH incorrect_pin 15 1
 CATCH pin_entry 12 0
+LOAD quit_with_balance 0
 HALT
-MOVE quit
+

services/registration/my_community_balance.vis

@@ -1,3 +0,0 @@
-CATCH pin_entry 12 0
-HALT
-MOVE quit