Merge remote-tracking branch 'refs/remotes/origin/wip-account-creation' into wip-account-creation
This commit is contained in:
commit
e521145faa
41
cmd/main.go
41
cmd/main.go
@ -24,8 +24,8 @@ const (
|
|||||||
USERFLAG_ACCOUNT_PENDING
|
USERFLAG_ACCOUNT_PENDING
|
||||||
USERFLAG_ACCOUNT_SUCCESS
|
USERFLAG_ACCOUNT_SUCCESS
|
||||||
USERFLAG_ACCOUNT_UNLOCKED
|
USERFLAG_ACCOUNT_UNLOCKED
|
||||||
invalidRecipient
|
USERFLAG_INVALID_RECIPIENT
|
||||||
invalidRecipientWithInvite
|
USERFLAG_INVALID_RECIPIENT_WITH_INVITE
|
||||||
USERFLAG_INCORRECTPIN
|
USERFLAG_INCORRECTPIN
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -326,9 +326,6 @@ func (fsd *fsData) validate_recipient(ctx context.Context, sym string, input []b
|
|||||||
res := resource.Result{}
|
res := resource.Result{}
|
||||||
recipient := string(input)
|
recipient := string(input)
|
||||||
|
|
||||||
res.FlagReset = []uint32{invalidRecipient}
|
|
||||||
res.FlagReset = []uint32{invalidRecipientWithInvite}
|
|
||||||
|
|
||||||
fp := fsd.path + "_data"
|
fp := fsd.path + "_data"
|
||||||
|
|
||||||
jsonData, err := os.ReadFile(fp)
|
jsonData, err := os.ReadFile(fp)
|
||||||
@ -342,24 +339,26 @@ func (fsd *fsData) validate_recipient(ctx context.Context, sym string, input []b
|
|||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// mimic invalid number check
|
if recipient != "0" {
|
||||||
if recipient == "000" {
|
// mimic invalid number check
|
||||||
res.FlagSet = []uint32{invalidRecipient}
|
if recipient == "000" {
|
||||||
res.Content = recipient
|
res.FlagSet = append(res.FlagSet, USERFLAG_INVALID_RECIPIENT)
|
||||||
|
res.Content = recipient
|
||||||
|
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
accountData["Recipient"] = recipient
|
accountData["Recipient"] = recipient
|
||||||
|
|
||||||
updatedJsonData, err := json.Marshal(accountData)
|
updatedJsonData, err := json.Marshal(accountData)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = os.WriteFile(fp, updatedJsonData, 0644)
|
err = os.WriteFile(fp, updatedJsonData, 0644)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return res, nil
|
return res, nil
|
||||||
@ -393,8 +392,8 @@ func (fsd *fsData) transaction_reset(ctx context.Context, sym string, input []by
|
|||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
|
|
||||||
res.FlagReset = []uint32{invalidRecipient}
|
res.FlagReset = append(res.FlagReset, USERFLAG_INVALID_RECIPIENT, USERFLAG_INVALID_RECIPIENT_WITH_INVITE)
|
||||||
res.FlagReset = []uint32{invalidRecipientWithInvite}
|
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
LOAD max_amount 0
|
RELOAD validate_recipient
|
||||||
|
CATCH invalid_recipient 13 1
|
||||||
|
LOAD max_amount 10
|
||||||
MAP max_amount
|
MAP max_amount
|
||||||
MOUT back 0
|
MOUT back 0
|
||||||
HALT
|
HALT
|
||||||
INCMP ^ 0
|
INCMP _ 0
|
||||||
LOAD validate_amount 0
|
LOAD validate_amount 64
|
||||||
LOAD get_recipient 12
|
LOAD get_recipient 12
|
||||||
LOAD get_sender 64
|
LOAD get_sender 64
|
||||||
MOVE transaction_pin
|
INCMP transaction_pin *
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
MAP validate_recipient
|
MAP validate_recipient
|
||||||
LOAD transaction_reset 0
|
RELOAD transaction_reset
|
||||||
MOUT retry 1
|
MOUT retry 1
|
||||||
MOUT quit 9
|
MOUT quit 9
|
||||||
HALT
|
HALT
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
LOAD transaction_reset 0
|
LOAD transaction_reset 0
|
||||||
MOUT back 0
|
MOUT back 0
|
||||||
HALT
|
HALT
|
||||||
INCMP ^ 0
|
LOAD validate_recipient 20
|
||||||
LOAD validate_recipient 0
|
INCMP _ 0
|
||||||
MAP validate_recipient
|
INCMP amount *
|
||||||
MOVE amount
|
|
||||||
|
@ -7,5 +7,5 @@ MAP get_sender
|
|||||||
MOUT back 0
|
MOUT back 0
|
||||||
MOUT quit 9
|
MOUT quit 9
|
||||||
HALT
|
HALT
|
||||||
INCMP ^ 0
|
INCMP _ 0
|
||||||
INCMP quit 9
|
INCMP quit 9
|
||||||
|
Loading…
Reference in New Issue
Block a user