Compare commits
3 Commits
cc6cfc8646
...
47c38bf507
Author | SHA1 | Date | |
---|---|---|---|
47c38bf507 | |||
e521145faa | |||
80ff5c477f |
104
cmd/main.go
104
cmd/main.go
@ -26,6 +26,7 @@ const (
|
|||||||
USERFLAG_ACCOUNT_UNLOCKED
|
USERFLAG_ACCOUNT_UNLOCKED
|
||||||
USERFLAG_INVALID_RECIPIENT
|
USERFLAG_INVALID_RECIPIENT
|
||||||
USERFLAG_INVALID_RECIPIENT_WITH_INVITE
|
USERFLAG_INVALID_RECIPIENT_WITH_INVITE
|
||||||
|
USERFLAG_INCORRECTPIN
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -96,24 +97,12 @@ func (fsd *fsData) create_account(ctx context.Context, sym string, input []byte)
|
|||||||
}
|
}
|
||||||
f.Close()
|
f.Close()
|
||||||
|
|
||||||
// accountResp, err := createAccount()
|
accountResp, err := createAccount()
|
||||||
|
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// fmt.Println("Failed to create account:", err)
|
fmt.Println("Failed to create account:", err)
|
||||||
// return res, err
|
return res, err
|
||||||
// }
|
}
|
||||||
|
|
||||||
accountResp := accountResponse{
|
|
||||||
Ok: true,
|
|
||||||
Result: struct {
|
|
||||||
CustodialId json.Number `json:"custodialId"`
|
|
||||||
PublicKey string `json:"publicKey"`
|
|
||||||
TrackingId string `json:"trackingId"`
|
|
||||||
}{
|
|
||||||
CustodialId: "636",
|
|
||||||
PublicKey: "0x8d86F9D4A4eae41Dc3B68034895EA97BcA90e8c1",
|
|
||||||
TrackingId: "45c67314-7995-4890-89d6-e5af987754ac",
|
|
||||||
}}
|
|
||||||
|
|
||||||
accountData := map[string]string{
|
accountData := map[string]string{
|
||||||
"TrackingId": accountResp.Result.TrackingId,
|
"TrackingId": accountResp.Result.TrackingId,
|
||||||
@ -131,8 +120,7 @@ func (fsd *fsData) create_account(ctx context.Context, sym string, input []byte)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
|
res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_CREATED)
|
||||||
res.FlagSet = []uint32{USERFLAG_ACCOUNT_CREATED}
|
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -156,15 +144,32 @@ func (fsd *fsData) checkIdentifier(ctx context.Context, sym string, input []byte
|
|||||||
return res, nil
|
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 := 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) {
|
if fsd.st.MatchFlag(USERFLAG_ACCOUNT_UNLOCKED, false) {
|
||||||
res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_UNLOCKED)
|
res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_UNLOCKED)
|
||||||
} else {
|
} else {
|
||||||
res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
|
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
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -200,8 +205,6 @@ func (fsd *fsData) check_account_status(ctx context.Context, sym string, input [
|
|||||||
res.FlagSet = append(res.FlagReset, USERFLAG_ACCOUNT_PENDING)
|
res.FlagSet = append(res.FlagReset, USERFLAG_ACCOUNT_PENDING)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
updatedJsonData, err := json.Marshal(accountData)
|
updatedJsonData, err := json.Marshal(accountData)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
@ -261,15 +264,9 @@ func checkAccountStatus(trackingId string) (string, error) {
|
|||||||
|
|
||||||
func (fsd *fsData) quit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
func (fsd *fsData) quit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
res := resource.Result{
|
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)
|
res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
|
||||||
}
|
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -479,6 +476,42 @@ func (fsd *fsData) get_sender(ctx context.Context, sym string, input []byte) (re
|
|||||||
return res, nil
|
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 (
|
var (
|
||||||
scriptDir = path.Join("services", "registration")
|
scriptDir = path.Join("services", "registration")
|
||||||
)
|
)
|
||||||
@ -496,12 +529,13 @@ func main() {
|
|||||||
fmt.Fprintf(os.Stderr, "starting session at symbol '%s' using resource dir: %s\n", root, dir)
|
fmt.Fprintf(os.Stderr, "starting session at symbol '%s' using resource dir: %s\n", root, dir)
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
st := state.NewState(7)
|
st := state.NewState(9)
|
||||||
st.UseDebug()
|
st.UseDebug()
|
||||||
state.FlagDebugger.Register(USERFLAG_LANGUAGE_SET, "LANGUAGE_CHANGE")
|
state.FlagDebugger.Register(USERFLAG_LANGUAGE_SET, "LANGUAGE_CHANGE")
|
||||||
state.FlagDebugger.Register(USERFLAG_ACCOUNT_CREATED, "ACCOUNT_CREATED")
|
state.FlagDebugger.Register(USERFLAG_ACCOUNT_CREATED, "ACCOUNT_CREATED")
|
||||||
state.FlagDebugger.Register(USERFLAG_ACCOUNT_SUCCESS, "ACCOUNT_SUCCESS")
|
state.FlagDebugger.Register(USERFLAG_ACCOUNT_SUCCESS, "ACCOUNT_SUCCESS")
|
||||||
state.FlagDebugger.Register(USERFLAG_ACCOUNT_PENDING, "ACCOUNT_PENDING")
|
state.FlagDebugger.Register(USERFLAG_ACCOUNT_PENDING, "ACCOUNT_PENDING")
|
||||||
|
state.FlagDebugger.Register(USERFLAG_INCORRECTPIN, "INCORRECTPIN")
|
||||||
|
|
||||||
rfs := resource.NewFsResource(scriptDir)
|
rfs := resource.NewFsResource(scriptDir)
|
||||||
ca := cache.NewCache()
|
ca := cache.NewCache()
|
||||||
@ -518,6 +552,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
pr := persist.NewFsPersister(dp)
|
pr := persist.NewFsPersister(dp)
|
||||||
en, err := engine.NewPersistedEngine(ctx, cfg, pr, rfs)
|
en, err := engine.NewPersistedEngine(ctx, cfg, pr, rfs)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
pr = pr.WithContent(&st, ca)
|
pr = pr.WithContent(&st, ca)
|
||||||
err = pr.Save(cfg.SessionId)
|
err = pr.Save(cfg.SessionId)
|
||||||
@ -540,7 +575,7 @@ func main() {
|
|||||||
rfs.AddLocalFunc("create_account", fs.create_account)
|
rfs.AddLocalFunc("create_account", fs.create_account)
|
||||||
rfs.AddLocalFunc("check_identifier", fs.checkIdentifier)
|
rfs.AddLocalFunc("check_identifier", fs.checkIdentifier)
|
||||||
rfs.AddLocalFunc("check_account_status", fs.check_account_status)
|
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("quit", fs.quit)
|
||||||
rfs.AddLocalFunc("check_balance", fs.checkBalance)
|
rfs.AddLocalFunc("check_balance", fs.checkBalance)
|
||||||
rfs.AddLocalFunc("validate_recipient", fs.validate_recipient)
|
rfs.AddLocalFunc("validate_recipient", fs.validate_recipient)
|
||||||
@ -549,8 +584,11 @@ func main() {
|
|||||||
rfs.AddLocalFunc("validate_amount", fs.validate_amount)
|
rfs.AddLocalFunc("validate_amount", fs.validate_amount)
|
||||||
rfs.AddLocalFunc("get_recipient", fs.get_recipient)
|
rfs.AddLocalFunc("get_recipient", fs.get_recipient)
|
||||||
rfs.AddLocalFunc("get_sender", fs.get_sender)
|
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)
|
cont, err := en.Init(ctx)
|
||||||
|
en.SetDebugger(engine.NewSimpleDebug(nil))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "engine init exited with error: %v\n", err)
|
fmt.Fprintf(os.Stderr, "engine init exited with error: %v\n", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
LOAD create_account 0
|
LOAD create_account 0
|
||||||
|
LOAD quit 0
|
||||||
HALT
|
HALT
|
||||||
MOVE quit
|
|
||||||
|
@ -4,5 +4,5 @@ MOUT back 0
|
|||||||
HALT
|
HALT
|
||||||
INCMP ^ 0
|
INCMP ^ 0
|
||||||
INCMP my_balance 1
|
INCMP my_balance 1
|
||||||
INCMP my_community_balance 2
|
INCMP community_balance 2
|
||||||
|
|
||||||
|
6
services/registration/community_balance.vis
Normal file
6
services/registration/community_balance.vis
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
LOAD reset_incorrect 0
|
||||||
|
CATCH incorrect_pin 15 1
|
||||||
|
CATCH pin_entry 12 0
|
||||||
|
LOAD quit_with_balance 0
|
||||||
|
HALT
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
MOUT back 0
|
MOUT back 0
|
||||||
HALT
|
HALT
|
||||||
INCMP ^ 0
|
INCMP _ 0
|
||||||
INCMP display_profile_info *
|
INCMP display_profile_info *
|
||||||
|
1
services/registration/incorrect_pin
Normal file
1
services/registration/incorrect_pin
Normal file
@ -0,0 +1 @@
|
|||||||
|
Incorrect pin
|
7
services/registration/incorrect_pin.vis
Normal file
7
services/registration/incorrect_pin.vis
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
LOAD reset_incorrect 0
|
||||||
|
RELOAD reset_incorrect
|
||||||
|
MOUT retry 1
|
||||||
|
MOUT quit 9
|
||||||
|
HALT
|
||||||
|
INCMP _ 1
|
||||||
|
INCMP quit 9
|
1
services/registration/incorrect_pin_swa
Normal file
1
services/registration/incorrect_pin_swa
Normal file
@ -0,0 +1 @@
|
|||||||
|
PIN ulioeka sio sahihi
|
@ -1,3 +1,6 @@
|
|||||||
|
LOAD reset_incorrect 0
|
||||||
|
CATCH incorrect_pin 15 1
|
||||||
CATCH pin_entry 12 0
|
CATCH pin_entry 12 0
|
||||||
|
LOAD quit_with_balance 0
|
||||||
HALT
|
HALT
|
||||||
MOVE quit
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
CATCH pin_entry 12 0
|
|
||||||
HALT
|
|
||||||
MOVE quit
|
|
Loading…
Reference in New Issue
Block a user