wip-account-creation #4

Merged
lash merged 143 commits from wip-account-creation into master 2024-08-30 14:37:58 +02:00
Showing only changes of commit 8d9aaeedbc - Show all commits

View File

@ -5,6 +5,7 @@ import (
"context" "context"
"fmt" "fmt"
"strconv" "strconv"
"strings"
"git.defalsify.org/vise.git/engine" "git.defalsify.org/vise.git/engine"
"git.defalsify.org/vise.git/lang" "git.defalsify.org/vise.git/lang"
@ -505,36 +506,57 @@ func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (res
} }
func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) { func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
res := resource.Result{} res := resource.Result{}
amount := string(input) amountStr := string(input)
accountData, err := h.accountFileHandler.ReadAccountData() accountData, err := h.accountFileHandler.ReadAccountData()
if err != nil { if err != nil {
return res, err return res, err
} }
if amount != "0" { balanceStr, err := server.CheckBalance(accountData["PublicKey"])
// mimic invalid amount if err != nil {
if amount == "00" { return res, err
res.FlagSet = append(res.FlagSet, models.USERFLAG_INVALID_AMOUNT) }
res.Content = amount res.Content = balanceStr
return res, nil // Parse the balance
} balanceParts := strings.Split(balanceStr, " ")
if len(balanceParts) != 2 {
return res, fmt.Errorf("unexpected balance format: %s", balanceStr)
}
balanceValue, err := strconv.ParseFloat(balanceParts[0], 64)
if err != nil {
return res, fmt.Errorf("failed to parse balance: %v", err)
}
res.Content = amount // Parse the input amount
if amountStr != "0" {
inputAmount, err := strconv.ParseFloat(amountStr, 64)
if err != nil {
res.FlagSet = append(res.FlagSet, models.USERFLAG_INVALID_AMOUNT)
res.Content = amountStr
return res, nil
}
accountData["Amount"] = amount if inputAmount > balanceValue {
res.FlagSet = append(res.FlagSet, models.USERFLAG_INVALID_AMOUNT)
res.Content = amountStr
return res, nil
}
err = h.accountFileHandler.WriteAccountData(accountData) res.Content = amountStr
if err != nil { accountData["Amount"] = amountStr
return res, err
}
return res, nil err = h.accountFileHandler.WriteAccountData(accountData)
} if err != nil {
return res, err
}
return res, nil return res, nil
}
return res, nil
} }
func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) { func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {