From a508f06583cc0efe096f6fa518a496856e8d69f4 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Fri, 23 Aug 2024 14:34:55 +0300 Subject: [PATCH 1/4] create an account using the API --- cmd/main.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 8295bc0..dbe702b 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -300,18 +300,7 @@ func (fsd *fsData) create_account(ctx context.Context, sym string, input []byte) } f.Close() - //accountResp, err := createAccount() - 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", - }} + accountResp, err := createAccount() if err != nil { fmt.Println("Failed to create account:", err) @@ -428,7 +417,7 @@ func (fsd *fsData) check_account_status(ctx context.Context, sym string, input [ accountData["Status"] = status - if status == "REVERTED" { + if status == "SUCCESS" { res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_SUCCESS) res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_PENDING) } else { From 460e9515849b8b0a2d305101babf40d0e82112ce Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Fri, 23 Aug 2024 16:01:13 +0300 Subject: [PATCH 2/4] validate PIN using the set AccountPIN --- cmd/main.go | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index dbe702b..8b8043a 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -362,8 +362,21 @@ func (fsd *fsData) checkIdentifier(ctx context.Context, sym string, input []byte func (fsd *fsData) unLock(ctx context.Context, sym string, input []byte) (resource.Result, error) { res := resource.Result{} pin := string(input) - if len(input) > 0 { - if pin == "0000" { + 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 + } + + if len(input) > 1 { + if pin != accountData["AccountPIN"] { res.FlagSet = append(res.FlagSet, USERFLAG_INCORRECTPIN) res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED) return res, nil From 538a06887a49b4cd9412b79a125a79cf83f7de8e Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Fri, 23 Aug 2024 18:53:24 +0300 Subject: [PATCH 3/4] change position of CATCH to correct node and route to previous node --- services/registration/amount.vis | 6 +++--- services/registration/invalid_amount.vis | 2 +- services/registration/invalid_recipient.vis | 2 +- services/registration/send.vis | 2 ++ services/registration/transaction_pin.vis | 2 -- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/registration/amount.vis b/services/registration/amount.vis index 07bbbd9..884c8a5 100644 --- a/services/registration/amount.vis +++ b/services/registration/amount.vis @@ -1,12 +1,12 @@ LOAD reset_transaction_amount 0 -RELOAD validate_recipient -CATCH invalid_recipient 13 1 LOAD max_amount 10 MAP max_amount MOUT back 0 HALT -INCMP _ 0 LOAD validate_amount 64 +RELOAD validate_amount +CATCH invalid_amount 17 1 +INCMP _ 0 LOAD get_recipient 12 LOAD get_sender 64 INCMP transaction_pin * diff --git a/services/registration/invalid_amount.vis b/services/registration/invalid_amount.vis index 833e81c..d5b5f03 100644 --- a/services/registration/invalid_amount.vis +++ b/services/registration/invalid_amount.vis @@ -3,5 +3,5 @@ RELOAD reset_transaction_amount MOUT retry 1 MOUT quit 9 HALT -INCMP amount 1 +INCMP _ 1 INCMP quit 9 diff --git a/services/registration/invalid_recipient.vis b/services/registration/invalid_recipient.vis index 905ad2a..09efdde 100644 --- a/services/registration/invalid_recipient.vis +++ b/services/registration/invalid_recipient.vis @@ -3,5 +3,5 @@ RELOAD transaction_reset MOUT retry 1 MOUT quit 9 HALT -INCMP send 1 +INCMP _ 1 INCMP quit 9 diff --git a/services/registration/send.vis b/services/registration/send.vis index 25d6304..d0fe211 100644 --- a/services/registration/send.vis +++ b/services/registration/send.vis @@ -2,5 +2,7 @@ LOAD transaction_reset 0 MOUT back 0 HALT LOAD validate_recipient 20 +RELOAD validate_recipient +CATCH invalid_recipient 13 1 INCMP _ 0 INCMP amount * diff --git a/services/registration/transaction_pin.vis b/services/registration/transaction_pin.vis index 983e4c6..38347ba 100644 --- a/services/registration/transaction_pin.vis +++ b/services/registration/transaction_pin.vis @@ -1,6 +1,4 @@ -RELOAD validate_amount MAP validate_amount -CATCH invalid_amount 17 1 RELOAD get_recipient MAP get_recipient RELOAD get_sender From 617a6101aac610335ef819e7eb03c701bc195636 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Fri, 23 Aug 2024 19:07:09 +0300 Subject: [PATCH 4/4] remove extra new lines --- services/registration/address.vis | 1 - services/registration/balances.vis | 1 - services/registration/community_balance.vis | 1 - services/registration/edit_profile.vis | 2 -- services/registration/enter_familyname.vis | 1 - services/registration/enter_offerings.vis | 2 -- services/registration/my_account.vis | 1 - services/registration/my_balance.vis | 1 - 8 files changed, 10 deletions(-) diff --git a/services/registration/address.vis b/services/registration/address.vis index d716499..ac7b631 100644 --- a/services/registration/address.vis +++ b/services/registration/address.vis @@ -3,4 +3,3 @@ RELOAD check_identifier MAP check_identifier HALT MOVE quit - diff --git a/services/registration/balances.vis b/services/registration/balances.vis index 7873dd2..552acdb 100644 --- a/services/registration/balances.vis +++ b/services/registration/balances.vis @@ -6,4 +6,3 @@ HALT INCMP _ 0 INCMP my_balance 1 INCMP community_balance 2 - diff --git a/services/registration/community_balance.vis b/services/registration/community_balance.vis index e6d5805..4894944 100644 --- a/services/registration/community_balance.vis +++ b/services/registration/community_balance.vis @@ -3,4 +3,3 @@ CATCH incorrect_pin 15 1 CATCH pin_entry 12 0 LOAD quit_with_balance 0 HALT - diff --git a/services/registration/edit_profile.vis b/services/registration/edit_profile.vis index a8b0e49..5c92ac2 100644 --- a/services/registration/edit_profile.vis +++ b/services/registration/edit_profile.vis @@ -15,5 +15,3 @@ INCMP enter_yob 3 INCMP enter_location 4 INCMP enter_offerings 5 INCMP view_profile 6 - - diff --git a/services/registration/enter_familyname.vis b/services/registration/enter_familyname.vis index 2085c38..93def9b 100644 --- a/services/registration/enter_familyname.vis +++ b/services/registration/enter_familyname.vis @@ -3,4 +3,3 @@ MOUT back 0 HALT INCMP _ 0 INCMP select_gender * - diff --git a/services/registration/enter_offerings.vis b/services/registration/enter_offerings.vis index eb7dad2..f48f1ea 100644 --- a/services/registration/enter_offerings.vis +++ b/services/registration/enter_offerings.vis @@ -6,5 +6,3 @@ HALT LOAD save_offerings 0 INCMP _ 0 INCMP pin_entry * - - diff --git a/services/registration/my_account.vis b/services/registration/my_account.vis index 48f12ee..20eb6d5 100644 --- a/services/registration/my_account.vis +++ b/services/registration/my_account.vis @@ -12,4 +12,3 @@ INCMP edit_profile 1 INCMP balances 3 INCMP pin_management 5 INCMP address 6 - diff --git a/services/registration/my_balance.vis b/services/registration/my_balance.vis index e6d5805..4894944 100644 --- a/services/registration/my_balance.vis +++ b/services/registration/my_balance.vis @@ -3,4 +3,3 @@ CATCH incorrect_pin 15 1 CATCH pin_entry 12 0 LOAD quit_with_balance 0 HALT -