forked from urdt/ussd
Merge pull request 'updated send node' (#172) from send-node into master
Reviewed-on: urdt/ussd#172
This commit is contained in:
commit
b22a4adec1
@ -16,6 +16,5 @@ DB_TIMEZONE=Africa/Nairobi
|
|||||||
|
|
||||||
#External API Calls
|
#External API Calls
|
||||||
CUSTODIAL_URL_BASE=http://localhost:5003
|
CUSTODIAL_URL_BASE=http://localhost:5003
|
||||||
CUSTODIAL_BEARER_TOKEN=eyJeSIsInRcCI6IkpXVCJ.yJwdWJsaWNLZXkiOiIwrrrrrr
|
BEARER_TOKEN=eyJeSIsInRcCI6IkpXVCJ.yJwdWJsaWNLZXkiOiIwrrrrrr
|
||||||
DATA_URL_BASE=http://localhost:5006
|
DATA_URL_BASE=http://localhost:5006
|
||||||
DATA_BEARER_TOKEN=eyJeSIsIRcCI6IXVCJ.yJwdWJsaLZXkiOiIwrrrrrr
|
|
||||||
|
81
common/tokens.go
Normal file
81
common/tokens.go
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
package common
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"math/big"
|
||||||
|
"reflect"
|
||||||
|
"strconv"
|
||||||
|
)
|
||||||
|
|
||||||
|
type TransactionData struct {
|
||||||
|
TemporaryValue string
|
||||||
|
ActiveSym string
|
||||||
|
Amount string
|
||||||
|
PublicKey string
|
||||||
|
Recipient string
|
||||||
|
ActiveDecimal string
|
||||||
|
ActiveAddress string
|
||||||
|
}
|
||||||
|
|
||||||
|
func ParseAndScaleAmount(storedAmount, activeDecimal string) (string, error) {
|
||||||
|
// Parse token decimal
|
||||||
|
tokenDecimal, err := strconv.Atoi(activeDecimal)
|
||||||
|
if err != nil {
|
||||||
|
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse amount
|
||||||
|
amount, _, err := big.ParseFloat(storedAmount, 10, 0, big.ToZero)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Scale the amount
|
||||||
|
multiplier := new(big.Float).SetInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(tokenDecimal)), nil))
|
||||||
|
finalAmount := new(big.Float).Mul(amount, multiplier)
|
||||||
|
|
||||||
|
// Convert finalAmount to a string
|
||||||
|
finalAmountStr := new(big.Int)
|
||||||
|
finalAmount.Int(finalAmountStr)
|
||||||
|
|
||||||
|
return finalAmountStr.String(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func ReadTransactionData(ctx context.Context, store DataStore, sessionId string) (TransactionData, error) {
|
||||||
|
data := TransactionData{}
|
||||||
|
fieldToKey := map[string]DataTyp{
|
||||||
|
"TemporaryValue": DATA_TEMPORARY_VALUE,
|
||||||
|
"ActiveSym": DATA_ACTIVE_SYM,
|
||||||
|
"Amount": DATA_AMOUNT,
|
||||||
|
"PublicKey": DATA_PUBLIC_KEY,
|
||||||
|
"Recipient": DATA_RECIPIENT,
|
||||||
|
"ActiveDecimal": DATA_ACTIVE_DECIMAL,
|
||||||
|
"ActiveAddress": DATA_ACTIVE_ADDRESS,
|
||||||
|
}
|
||||||
|
|
||||||
|
v := reflect.ValueOf(&data).Elem()
|
||||||
|
for fieldName, key := range fieldToKey {
|
||||||
|
field := v.FieldByName(fieldName)
|
||||||
|
if !field.IsValid() || !field.CanSet() {
|
||||||
|
return data, errors.New("invalid struct field: " + fieldName)
|
||||||
|
}
|
||||||
|
|
||||||
|
value, err := readStringEntry(ctx, store, sessionId, key)
|
||||||
|
if err != nil {
|
||||||
|
return data, err
|
||||||
|
}
|
||||||
|
field.SetString(value)
|
||||||
|
}
|
||||||
|
|
||||||
|
return data, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func readStringEntry(ctx context.Context, store DataStore, sessionId string, key DataTyp) (string, error) {
|
||||||
|
entry, err := store.ReadEntry(ctx, sessionId, key)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return string(entry), nil
|
||||||
|
}
|
129
common/tokens_test.go
Normal file
129
common/tokens_test.go
Normal file
@ -0,0 +1,129 @@
|
|||||||
|
package common
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/alecthomas/assert/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestParseAndScaleAmount(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
amount string
|
||||||
|
decimals string
|
||||||
|
want string
|
||||||
|
expectError bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "whole number",
|
||||||
|
amount: "123",
|
||||||
|
decimals: "2",
|
||||||
|
want: "12300",
|
||||||
|
expectError: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "decimal number",
|
||||||
|
amount: "123.45",
|
||||||
|
decimals: "2",
|
||||||
|
want: "12345",
|
||||||
|
expectError: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "zero decimals",
|
||||||
|
amount: "123.45",
|
||||||
|
decimals: "0",
|
||||||
|
want: "123",
|
||||||
|
expectError: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "large number",
|
||||||
|
amount: "1000000.01",
|
||||||
|
decimals: "6",
|
||||||
|
want: "1000000010000",
|
||||||
|
expectError: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "invalid amount",
|
||||||
|
amount: "abc",
|
||||||
|
decimals: "2",
|
||||||
|
want: "",
|
||||||
|
expectError: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "invalid decimals",
|
||||||
|
amount: "123.45",
|
||||||
|
decimals: "abc",
|
||||||
|
want: "",
|
||||||
|
expectError: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "zero amount",
|
||||||
|
amount: "0",
|
||||||
|
decimals: "2",
|
||||||
|
want: "0",
|
||||||
|
expectError: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
got, err := ParseAndScaleAmount(tt.amount, tt.decimals)
|
||||||
|
|
||||||
|
// Check error cases
|
||||||
|
if tt.expectError {
|
||||||
|
if err == nil {
|
||||||
|
t.Errorf("ParseAndScaleAmount(%q, %q) expected error, got nil", tt.amount, tt.decimals)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("ParseAndScaleAmount(%q, %q) unexpected error: %v", tt.amount, tt.decimals, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if got != tt.want {
|
||||||
|
t.Errorf("ParseAndScaleAmount(%q, %q) = %v, want %v", tt.amount, tt.decimals, got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReadTransactionData(t *testing.T) {
|
||||||
|
sessionId := "session123"
|
||||||
|
publicKey := "0X13242618721"
|
||||||
|
ctx, store := InitializeTestDb(t)
|
||||||
|
|
||||||
|
// Test transaction data
|
||||||
|
transactionData := map[DataTyp]string{
|
||||||
|
DATA_TEMPORARY_VALUE: "0712345678",
|
||||||
|
DATA_ACTIVE_SYM: "SRF",
|
||||||
|
DATA_AMOUNT: "1000000",
|
||||||
|
DATA_PUBLIC_KEY: publicKey,
|
||||||
|
DATA_RECIPIENT: "0x41c188d63Qa",
|
||||||
|
DATA_ACTIVE_DECIMAL: "6",
|
||||||
|
DATA_ACTIVE_ADDRESS: "0xd4c288865Ce",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store the data
|
||||||
|
for key, value := range transactionData {
|
||||||
|
if err := store.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
expectedResult := TransactionData{
|
||||||
|
TemporaryValue: "0712345678",
|
||||||
|
ActiveSym: "SRF",
|
||||||
|
Amount: "1000000",
|
||||||
|
PublicKey: publicKey,
|
||||||
|
Recipient: "0x41c188d63Qa",
|
||||||
|
ActiveDecimal: "6",
|
||||||
|
ActiveAddress: "0xd4c288865Ce",
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := ReadTransactionData(ctx, store, sessionId)
|
||||||
|
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, expectedResult, data)
|
||||||
|
}
|
@ -3,6 +3,7 @@ package common
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math/big"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.grassecon.net/urdt/ussd/internal/storage"
|
"git.grassecon.net/urdt/ussd/internal/storage"
|
||||||
@ -24,7 +25,11 @@ func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
|
|||||||
|
|
||||||
for i, h := range holdings {
|
for i, h := range holdings {
|
||||||
symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, h.TokenSymbol))
|
symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, h.TokenSymbol))
|
||||||
balances = append(balances, fmt.Sprintf("%d:%s", i+1, h.Balance))
|
|
||||||
|
// Scale down the balance
|
||||||
|
scaledBalance := ScaleDownBalance(h.Balance, h.TokenDecimals)
|
||||||
|
|
||||||
|
balances = append(balances, fmt.Sprintf("%d:%s", i+1, scaledBalance))
|
||||||
decimals = append(decimals, fmt.Sprintf("%d:%s", i+1, h.TokenDecimals))
|
decimals = append(decimals, fmt.Sprintf("%d:%s", i+1, h.TokenDecimals))
|
||||||
addresses = append(addresses, fmt.Sprintf("%d:%s", i+1, h.ContractAddress))
|
addresses = append(addresses, fmt.Sprintf("%d:%s", i+1, h.ContractAddress))
|
||||||
}
|
}
|
||||||
@ -37,14 +42,25 @@ func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
|
|||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
|
||||||
//func StoreVouchers(db storage.PrefixDb, data VoucherMetadata) {
|
func ScaleDownBalance(balance, decimals string) string {
|
||||||
// value, err := db.Put(ctx, []byte(key))
|
// Convert balance and decimals to big.Float
|
||||||
// if err != nil {
|
bal := new(big.Float)
|
||||||
// return nil, fmt.Errorf("failed to get %s: %v", key, err)
|
bal.SetString(balance)
|
||||||
// }
|
|
||||||
// data[key] = string(value)
|
dec, ok := new(big.Int).SetString(decimals, 10)
|
||||||
// }
|
if !ok {
|
||||||
//}
|
dec = big.NewInt(0) // Default to 0 decimals in case of conversion failure
|
||||||
|
}
|
||||||
|
|
||||||
|
divisor := new(big.Float).SetInt(new(big.Int).Exp(big.NewInt(10), dec, nil))
|
||||||
|
scaledBalance := new(big.Float).Quo(bal, divisor)
|
||||||
|
|
||||||
|
// Return the scaled balance without trailing decimals if it's an integer
|
||||||
|
if scaledBalance.IsInt() {
|
||||||
|
return scaledBalance.Text('f', 0)
|
||||||
|
}
|
||||||
|
return scaledBalance.Text('f', -1)
|
||||||
|
}
|
||||||
|
|
||||||
// GetVoucherData retrieves and matches voucher data
|
// GetVoucherData retrieves and matches voucher data
|
||||||
func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
|
func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
|
||||||
@ -84,7 +100,7 @@ func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol,
|
|||||||
decList := strings.Split(decimals, "\n")
|
decList := strings.Split(decimals, "\n")
|
||||||
addrList := strings.Split(addresses, "\n")
|
addrList := strings.Split(addresses, "\n")
|
||||||
|
|
||||||
logg.Tracef("found" , "symlist", symList, "syms", symbols, "input", input)
|
logg.Tracef("found", "symlist", symList, "syms", symbols, "input", input)
|
||||||
for i, sym := range symList {
|
for i, sym := range symList {
|
||||||
parts := strings.SplitN(sym, ":", 2)
|
parts := strings.SplitN(sym, ":", 2)
|
||||||
|
|
||||||
|
@ -59,13 +59,13 @@ func TestMatchVoucher(t *testing.T) {
|
|||||||
|
|
||||||
func TestProcessVouchers(t *testing.T) {
|
func TestProcessVouchers(t *testing.T) {
|
||||||
holdings := []dataserviceapi.TokenHoldings{
|
holdings := []dataserviceapi.TokenHoldings{
|
||||||
{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100"},
|
{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100000000"},
|
||||||
{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200"},
|
{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200000000"},
|
||||||
}
|
}
|
||||||
|
|
||||||
expectedResult := VoucherMetadata{
|
expectedResult := VoucherMetadata{
|
||||||
Symbols: "1:SRF\n2:MILO",
|
Symbols: "1:SRF\n2:MILO",
|
||||||
Balances: "1:100\n2:200",
|
Balances: "1:100\n2:20000",
|
||||||
Decimals: "1:6\n2:4",
|
Decimals: "1:6\n2:4",
|
||||||
Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa",
|
Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa",
|
||||||
}
|
}
|
||||||
|
@ -11,6 +11,7 @@ const (
|
|||||||
trackStatusPath = "/api/track"
|
trackStatusPath = "/api/track"
|
||||||
balancePathPrefix = "/api/account"
|
balancePathPrefix = "/api/account"
|
||||||
trackPath = "/api/v2/account/status"
|
trackPath = "/api/v2/account/status"
|
||||||
|
tokenTransferPrefix = "/api/v2/token/transfer"
|
||||||
voucherHoldingsPathPrefix = "/api/v1/holdings"
|
voucherHoldingsPathPrefix = "/api/v1/holdings"
|
||||||
voucherTransfersPathPrefix = "/api/v1/transfers/last10"
|
voucherTransfersPathPrefix = "/api/v1/transfers/last10"
|
||||||
voucherDataPathPrefix = "/api/v1/token"
|
voucherDataPathPrefix = "/api/v1/token"
|
||||||
@ -19,8 +20,7 @@ const (
|
|||||||
var (
|
var (
|
||||||
custodialURLBase string
|
custodialURLBase string
|
||||||
dataURLBase string
|
dataURLBase string
|
||||||
CustodialBearerToken string
|
BearerToken string
|
||||||
DataBearerToken string
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -28,6 +28,7 @@ var (
|
|||||||
TrackStatusURL string
|
TrackStatusURL string
|
||||||
BalanceURL string
|
BalanceURL string
|
||||||
TrackURL string
|
TrackURL string
|
||||||
|
TokenTransferURL string
|
||||||
VoucherHoldingsURL string
|
VoucherHoldingsURL string
|
||||||
VoucherTransfersURL string
|
VoucherTransfersURL string
|
||||||
VoucherDataURL string
|
VoucherDataURL string
|
||||||
@ -38,8 +39,7 @@ func setBase() error {
|
|||||||
|
|
||||||
custodialURLBase = initializers.GetEnv("CUSTODIAL_URL_BASE", "http://localhost:5003")
|
custodialURLBase = initializers.GetEnv("CUSTODIAL_URL_BASE", "http://localhost:5003")
|
||||||
dataURLBase = initializers.GetEnv("DATA_URL_BASE", "http://localhost:5006")
|
dataURLBase = initializers.GetEnv("DATA_URL_BASE", "http://localhost:5006")
|
||||||
CustodialBearerToken = initializers.GetEnv("CUSTODIAL_BEARER_TOKEN", "")
|
BearerToken = initializers.GetEnv("BEARER_TOKEN", "")
|
||||||
DataBearerToken = initializers.GetEnv("DATA_BEARER_TOKEN", "")
|
|
||||||
|
|
||||||
_, err = url.JoinPath(custodialURLBase, "/foo")
|
_, err = url.JoinPath(custodialURLBase, "/foo")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -62,6 +62,7 @@ func LoadConfig() error {
|
|||||||
TrackStatusURL, _ = url.JoinPath(custodialURLBase, trackStatusPath)
|
TrackStatusURL, _ = url.JoinPath(custodialURLBase, trackStatusPath)
|
||||||
BalanceURL, _ = url.JoinPath(custodialURLBase, balancePathPrefix)
|
BalanceURL, _ = url.JoinPath(custodialURLBase, balancePathPrefix)
|
||||||
TrackURL, _ = url.JoinPath(custodialURLBase, trackPath)
|
TrackURL, _ = url.JoinPath(custodialURLBase, trackPath)
|
||||||
|
TokenTransferURL, _ = url.JoinPath(custodialURLBase, tokenTransferPrefix)
|
||||||
VoucherHoldingsURL, _ = url.JoinPath(dataURLBase, voucherHoldingsPathPrefix)
|
VoucherHoldingsURL, _ = url.JoinPath(dataURLBase, voucherHoldingsPathPrefix)
|
||||||
VoucherTransfersURL, _ = url.JoinPath(dataURLBase, voucherTransfersPathPrefix)
|
VoucherTransfersURL, _ = url.JoinPath(dataURLBase, voucherTransfersPathPrefix)
|
||||||
VoucherDataURL, _ = url.JoinPath(dataURLBase, voucherDataPathPrefix)
|
VoucherDataURL, _ = url.JoinPath(dataURLBase, voucherDataPathPrefix)
|
||||||
|
@ -80,6 +80,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceIn
|
|||||||
ls.DbRs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
|
ls.DbRs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
|
||||||
ls.DbRs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
|
ls.DbRs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
|
||||||
ls.DbRs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
|
ls.DbRs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
|
||||||
|
ls.DbRs.AddLocalFunc("invite_valid_recipient", ussdHandlers.InviteValidRecipient)
|
||||||
ls.DbRs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
|
ls.DbRs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
|
||||||
ls.DbRs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
|
ls.DbRs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
|
||||||
ls.DbRs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
|
ls.DbRs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
|
||||||
@ -108,6 +109,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceIn
|
|||||||
ls.DbRs.AddLocalFunc("get_vouchers", ussdHandlers.GetVoucherList)
|
ls.DbRs.AddLocalFunc("get_vouchers", ussdHandlers.GetVoucherList)
|
||||||
ls.DbRs.AddLocalFunc("view_voucher", ussdHandlers.ViewVoucher)
|
ls.DbRs.AddLocalFunc("view_voucher", ussdHandlers.ViewVoucher)
|
||||||
ls.DbRs.AddLocalFunc("set_voucher", ussdHandlers.SetVoucher)
|
ls.DbRs.AddLocalFunc("set_voucher", ussdHandlers.SetVoucher)
|
||||||
|
ls.DbRs.AddLocalFunc("get_voucher_details", ussdHandlers.GetVoucherDetails)
|
||||||
ls.DbRs.AddLocalFunc("reset_valid_pin", ussdHandlers.ResetValidPin)
|
ls.DbRs.AddLocalFunc("reset_valid_pin", ussdHandlers.ResetValidPin)
|
||||||
ls.DbRs.AddLocalFunc("check_pin_mismatch", ussdHandlers.CheckPinMisMatch)
|
ls.DbRs.AddLocalFunc("check_pin_mismatch", ussdHandlers.CheckPinMisMatch)
|
||||||
ls.DbRs.AddLocalFunc("validate_blocked_number", ussdHandlers.ValidateBlockedNumber)
|
ls.DbRs.AddLocalFunc("validate_blocked_number", ussdHandlers.ValidateBlockedNumber)
|
||||||
|
@ -702,7 +702,7 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
|
|||||||
r, err := h.accountService.TrackAccountStatus(ctx, string(publicKey))
|
r, err := h.accountService.TrackAccountStatus(ctx, string(publicKey))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
res.FlagSet = append(res.FlagSet, flag_api_error)
|
res.FlagSet = append(res.FlagSet, flag_api_error)
|
||||||
logg.ErrorCtxf(ctx, "failed on TrackAccountStatus", err)
|
logg.ErrorCtxf(ctx, "failed on TrackAccountStatus", "error", err)
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -930,6 +930,7 @@ func (h *Handlers) ValidateBlockedNumber(ctx context.Context, sym string, input
|
|||||||
func (h *Handlers) ValidateRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
func (h *Handlers) ValidateRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
var res resource.Result
|
var res resource.Result
|
||||||
var err error
|
var err error
|
||||||
|
store := h.userdataStore
|
||||||
|
|
||||||
sessionId, ok := ctx.Value("SessionId").(string)
|
sessionId, ok := ctx.Value("SessionId").(string)
|
||||||
if !ok {
|
if !ok {
|
||||||
@ -939,18 +940,41 @@ func (h *Handlers) ValidateRecipient(ctx context.Context, sym string, input []by
|
|||||||
recipient := string(input)
|
recipient := string(input)
|
||||||
|
|
||||||
flag_invalid_recipient, _ := h.flagManager.GetFlag("flag_invalid_recipient")
|
flag_invalid_recipient, _ := h.flagManager.GetFlag("flag_invalid_recipient")
|
||||||
|
flag_invalid_recipient_with_invite, _ := h.flagManager.GetFlag("flag_invalid_recipient_with_invite")
|
||||||
|
|
||||||
if recipient != "0" {
|
if recipient != "0" {
|
||||||
// mimic invalid number check
|
if !isValidPhoneNumber(recipient) {
|
||||||
if recipient == "000" {
|
|
||||||
res.FlagSet = append(res.FlagSet, flag_invalid_recipient)
|
res.FlagSet = append(res.FlagSet, flag_invalid_recipient)
|
||||||
res.Content = recipient
|
res.Content = recipient
|
||||||
|
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
store := h.userdataStore
|
|
||||||
err = store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, []byte(recipient))
|
// save the recipient as the temporaryRecipient
|
||||||
|
err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(recipient))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
logg.ErrorCtxf(ctx, "failed to write temporaryRecipient entry with", "key", common.DATA_TEMPORARY_VALUE, "value", recipient, "error", err)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
publicKey, err := store.ReadEntry(ctx, recipient, common.DATA_PUBLIC_KEY)
|
||||||
|
if err != nil {
|
||||||
|
if db.IsNotFound(err) {
|
||||||
|
logg.InfoCtxf(ctx, "Unregistered number")
|
||||||
|
|
||||||
|
res.FlagSet = append(res.FlagSet, flag_invalid_recipient_with_invite)
|
||||||
|
res.Content = recipient
|
||||||
|
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, publicKey)
|
||||||
|
if err != nil {
|
||||||
|
logg.ErrorCtxf(ctx, "failed to write recipient entry with", "key", common.DATA_RECIPIENT, "value", string(publicKey), "error", err)
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -987,6 +1011,31 @@ func (h *Handlers) TransactionReset(ctx context.Context, sym string, input []byt
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// InviteValidRecipient sends an invitation to the valid phone number.
|
||||||
|
func (h *Handlers) InviteValidRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
|
var res resource.Result
|
||||||
|
store := h.userdataStore
|
||||||
|
|
||||||
|
sessionId, ok := ctx.Value("SessionId").(string)
|
||||||
|
if !ok {
|
||||||
|
return res, fmt.Errorf("missing session")
|
||||||
|
}
|
||||||
|
|
||||||
|
code := codeFromCtx(ctx)
|
||||||
|
l := gotext.NewLocale(translationDir, code)
|
||||||
|
l.AddDomain("default")
|
||||||
|
|
||||||
|
recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
|
||||||
|
|
||||||
|
// TODO
|
||||||
|
// send an invitation SMS
|
||||||
|
// if successful
|
||||||
|
// res.Content = l.Get("Your invitation to %s to join Sarafu Network has been sent.", string(recipient))
|
||||||
|
|
||||||
|
res.Content = l.Get("Your invite request for %s to Sarafu Network failed. Please try again later.", string(recipient))
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
// ResetTransactionAmount resets the transaction amount and invalid flag
|
// ResetTransactionAmount resets the transaction amount and invalid flag
|
||||||
func (h *Handlers) ResetTransactionAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
func (h *Handlers) ResetTransactionAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
var res resource.Result
|
var res resource.Result
|
||||||
@ -1085,7 +1134,7 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRecipient returns the transaction recipient from the gdbm.
|
// GetRecipient returns the transaction recipient phone number from the gdbm.
|
||||||
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) {
|
||||||
var res resource.Result
|
var res resource.Result
|
||||||
|
|
||||||
@ -1094,7 +1143,7 @@ func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (
|
|||||||
return res, fmt.Errorf("missing session")
|
return res, fmt.Errorf("missing session")
|
||||||
}
|
}
|
||||||
store := h.userdataStore
|
store := h.userdataStore
|
||||||
recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_RECIPIENT)
|
recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
|
||||||
|
|
||||||
res.Content = string(recipient)
|
res.Content = string(recipient)
|
||||||
|
|
||||||
@ -1126,7 +1175,7 @@ func (h *Handlers) GetSender(ctx context.Context, sym string, input []byte) (res
|
|||||||
return res, fmt.Errorf("missing session")
|
return res, fmt.Errorf("missing session")
|
||||||
}
|
}
|
||||||
|
|
||||||
res.Content = string(sessionId)
|
res.Content = sessionId
|
||||||
|
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
@ -1155,8 +1204,7 @@ func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (res
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// InitiateTransaction returns a confirmation and resets the transaction data
|
// InitiateTransaction calls the TokenTransfer and returns a confirmation based on the result
|
||||||
// on the gdbm store.
|
|
||||||
func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
var res resource.Result
|
var res resource.Result
|
||||||
var err error
|
var err error
|
||||||
@ -1165,28 +1213,44 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
|
|||||||
return res, fmt.Errorf("missing session")
|
return res, fmt.Errorf("missing session")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
|
||||||
|
|
||||||
code := codeFromCtx(ctx)
|
code := codeFromCtx(ctx)
|
||||||
l := gotext.NewLocale(translationDir, code)
|
l := gotext.NewLocale(translationDir, code)
|
||||||
l.AddDomain("default")
|
l.AddDomain("default")
|
||||||
// TODO
|
|
||||||
// Use the amount, recipient and sender to call the API and initialize the transaction
|
|
||||||
store := h.userdataStore
|
|
||||||
|
|
||||||
amount, _ := store.ReadEntry(ctx, sessionId, common.DATA_AMOUNT)
|
data, err := common.ReadTransactionData(ctx, h.userdataStore, sessionId)
|
||||||
|
|
||||||
recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_RECIPIENT)
|
|
||||||
|
|
||||||
activeSym, _ := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_SYM)
|
|
||||||
|
|
||||||
res.Content = l.Get("Your request has been sent. %s will receive %s %s from %s.", string(recipient), string(amount), string(activeSym), string(sessionId))
|
|
||||||
|
|
||||||
account_authorized_flag, err := h.flagManager.GetFlag("flag_account_authorized")
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logg.ErrorCtxf(ctx, "Failed to set the flag_account_authorized", "error", err)
|
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
|
|
||||||
res.FlagReset = append(res.FlagReset, account_authorized_flag)
|
finalAmountStr, err := common.ParseAndScaleAmount(data.Amount, data.ActiveDecimal)
|
||||||
|
if err != nil {
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Call TokenTransfer
|
||||||
|
r, err := h.accountService.TokenTransfer(ctx, finalAmountStr, data.PublicKey, data.Recipient, data.ActiveAddress)
|
||||||
|
if err != nil {
|
||||||
|
flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
|
||||||
|
res.FlagSet = append(res.FlagSet, flag_api_error)
|
||||||
|
res.Content = l.Get("Your request failed. Please try again later.")
|
||||||
|
logg.ErrorCtxf(ctx, "failed on TokenTransfer", "error", err)
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
trackingId := r.TrackingId
|
||||||
|
logg.InfoCtxf(ctx, "TokenTransfer", "trackingId", trackingId)
|
||||||
|
|
||||||
|
res.Content = l.Get(
|
||||||
|
"Your request has been sent. %s will receive %s %s from %s.",
|
||||||
|
data.TemporaryValue,
|
||||||
|
data.Amount,
|
||||||
|
data.ActiveSym,
|
||||||
|
sessionId,
|
||||||
|
)
|
||||||
|
|
||||||
|
res.FlagReset = append(res.FlagReset, flag_account_authorized)
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1401,6 +1465,11 @@ func (h *Handlers) SetDefaultVoucher(ctx context.Context, sym string, input []by
|
|||||||
firstVoucher := vouchersResp[0]
|
firstVoucher := vouchersResp[0]
|
||||||
defaultSym := firstVoucher.TokenSymbol
|
defaultSym := firstVoucher.TokenSymbol
|
||||||
defaultBal := firstVoucher.Balance
|
defaultBal := firstVoucher.Balance
|
||||||
|
defaultDec := firstVoucher.TokenDecimals
|
||||||
|
defaultAddr := firstVoucher.ContractAddress
|
||||||
|
|
||||||
|
// Scale down the balance
|
||||||
|
scaledBalance := common.ScaleDownBalance(defaultBal, defaultDec)
|
||||||
|
|
||||||
// set the active symbol
|
// set the active symbol
|
||||||
err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_SYM, []byte(defaultSym))
|
err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_SYM, []byte(defaultSym))
|
||||||
@ -1409,9 +1478,21 @@ func (h *Handlers) SetDefaultVoucher(ctx context.Context, sym string, input []by
|
|||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
// set the active balance
|
// set the active balance
|
||||||
err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_BAL, []byte(defaultBal))
|
err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_BAL, []byte(scaledBalance))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logg.ErrorCtxf(ctx, "failed to write defaultBal entry with", "key", common.DATA_ACTIVE_BAL, "value", defaultBal, "error", err)
|
logg.ErrorCtxf(ctx, "failed to write defaultBal entry with", "key", common.DATA_ACTIVE_BAL, "value", scaledBalance, "error", err)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
// set the active decimals
|
||||||
|
err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_DECIMAL, []byte(defaultDec))
|
||||||
|
if err != nil {
|
||||||
|
logg.ErrorCtxf(ctx, "failed to write defaultDec entry with", "key", common.DATA_ACTIVE_DECIMAL, "value", defaultDec, "error", err)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
// set the active contract address
|
||||||
|
err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_ADDRESS, []byte(defaultAddr))
|
||||||
|
if err != nil {
|
||||||
|
logg.ErrorCtxf(ctx, "failed to write defaultAddr entry with", "key", common.DATA_ACTIVE_ADDRESS, "value", defaultAddr, "error", err)
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1485,6 +1566,7 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ViewVoucher retrieves the token holding and balance from the subprefixDB
|
// ViewVoucher retrieves the token holding and balance from the subprefixDB
|
||||||
|
// and displays it to the user for them to select it
|
||||||
func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
var res resource.Result
|
var res resource.Result
|
||||||
sessionId, ok := ctx.Value("SessionId").(string)
|
sessionId, ok := ctx.Value("SessionId").(string)
|
||||||
@ -1546,3 +1628,36 @@ func (h *Handlers) SetVoucher(ctx context.Context, sym string, input []byte) (re
|
|||||||
res.Content = tempData.TokenSymbol
|
res.Content = tempData.TokenSymbol
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetVoucherDetails retrieves the voucher details
|
||||||
|
func (h *Handlers) GetVoucherDetails(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
|
var res resource.Result
|
||||||
|
store := h.userdataStore
|
||||||
|
sessionId, ok := ctx.Value("SessionId").(string)
|
||||||
|
if !ok {
|
||||||
|
return res, fmt.Errorf("missing session")
|
||||||
|
}
|
||||||
|
|
||||||
|
flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
|
||||||
|
|
||||||
|
// get the active address
|
||||||
|
activeAddress, err := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_ADDRESS)
|
||||||
|
if err != nil {
|
||||||
|
logg.ErrorCtxf(ctx, "failed to read activeAddress entry with", "key", common.DATA_ACTIVE_ADDRESS, "error", err)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// use the voucher contract address to get the data from the API
|
||||||
|
voucherData, err := h.accountService.VoucherData(ctx, string(activeAddress))
|
||||||
|
if err != nil {
|
||||||
|
res.FlagSet = append(res.FlagSet, flag_api_error)
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
tokenSymbol := voucherData.TokenSymbol
|
||||||
|
tokenName := voucherData.TokenName
|
||||||
|
|
||||||
|
res.Content = fmt.Sprintf("%s %s", tokenSymbol, tokenName)
|
||||||
|
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
@ -586,9 +586,9 @@ func TestGetRecipient(t *testing.T) {
|
|||||||
ctx, store := InitializeTestStore(t)
|
ctx, store := InitializeTestStore(t)
|
||||||
ctx = context.WithValue(ctx, "SessionId", sessionId)
|
ctx = context.WithValue(ctx, "SessionId", sessionId)
|
||||||
|
|
||||||
recepient := "0xcasgatweksalw1018221"
|
recepient := "0712345678"
|
||||||
|
|
||||||
err := store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, []byte(recepient))
|
err := store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(recepient))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
@ -1227,31 +1227,40 @@ func TestInitiateTransaction(t *testing.T) {
|
|||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
input []byte
|
TemporaryValue []byte
|
||||||
Recipient []byte
|
|
||||||
Amount []byte
|
|
||||||
ActiveSym []byte
|
ActiveSym []byte
|
||||||
status string
|
StoredAmount []byte
|
||||||
|
TransferAmount string
|
||||||
|
PublicKey []byte
|
||||||
|
Recipient []byte
|
||||||
|
ActiveDecimal []byte
|
||||||
|
ActiveAddress []byte
|
||||||
|
TransferResponse *models.TokenTransferResponse
|
||||||
expectedResult resource.Result
|
expectedResult resource.Result
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "Test initiate transaction",
|
name: "Test initiate transaction",
|
||||||
Amount: []byte("0.002"),
|
TemporaryValue: []byte("0711223344"),
|
||||||
ActiveSym: []byte("SRF"),
|
ActiveSym: []byte("SRF"),
|
||||||
|
StoredAmount: []byte("1.00"),
|
||||||
|
TransferAmount: "1000000",
|
||||||
|
PublicKey: []byte("0X13242618721"),
|
||||||
Recipient: []byte("0x12415ass27192"),
|
Recipient: []byte("0x12415ass27192"),
|
||||||
|
ActiveDecimal: []byte("6"),
|
||||||
|
ActiveAddress: []byte("0xd4c288865Ce"),
|
||||||
|
TransferResponse: &models.TokenTransferResponse{
|
||||||
|
TrackingId: "1234567890",
|
||||||
|
},
|
||||||
expectedResult: resource.Result{
|
expectedResult: resource.Result{
|
||||||
FlagReset: []uint32{account_authorized_flag},
|
FlagReset: []uint32{account_authorized_flag},
|
||||||
Content: "Your request has been sent. 0x12415ass27192 will receive 0.002 SRF from 254712345678.",
|
Content: "Your request has been sent. 0711223344 will receive 1.00 SRF from 254712345678.",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
err := store.WriteEntry(ctx, sessionId, common.DATA_AMOUNT, []byte(tt.Amount))
|
err := store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(tt.TemporaryValue))
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
err = store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, []byte(tt.Recipient))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
@ -1259,9 +1268,31 @@ func TestInitiateTransaction(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
err = store.WriteEntry(ctx, sessionId, common.DATA_AMOUNT, []byte(tt.StoredAmount))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
err = store.WriteEntry(ctx, sessionId, common.DATA_PUBLIC_KEY, []byte(tt.PublicKey))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
err = store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, []byte(tt.Recipient))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_DECIMAL, []byte(tt.ActiveDecimal))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_ADDRESS, []byte(tt.ActiveAddress))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
mockAccountService.On("TokenTransfer").Return(tt.TransferResponse, nil)
|
||||||
|
|
||||||
// Call the method under test
|
// Call the method under test
|
||||||
res, _ := h.InitiateTransaction(ctx, "transaction_reset_amount", tt.input)
|
res, _ := h.InitiateTransaction(ctx, "transaction_reset_amount", []byte(""))
|
||||||
|
|
||||||
// Assert that no errors occurred
|
// Assert that no errors occurred
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
@ -1453,10 +1484,12 @@ func TestValidateRecipient(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
sessionId := "session123"
|
sessionId := "session123"
|
||||||
|
publicKey := "0X13242618721"
|
||||||
ctx, store := InitializeTestStore(t)
|
ctx, store := InitializeTestStore(t)
|
||||||
ctx = context.WithValue(ctx, "SessionId", sessionId)
|
ctx = context.WithValue(ctx, "SessionId", sessionId)
|
||||||
|
|
||||||
flag_invalid_recipient, _ := fm.parser.GetFlag("flag_invalid_recipient")
|
flag_invalid_recipient, _ := fm.parser.GetFlag("flag_invalid_recipient")
|
||||||
|
flag_invalid_recipient_with_invite, _ := fm.parser.GetFlag("flag_invalid_recipient_with_invite")
|
||||||
|
|
||||||
// Define test cases
|
// Define test cases
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@ -1466,19 +1499,33 @@ func TestValidateRecipient(t *testing.T) {
|
|||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "Test with invalid recepient",
|
name: "Test with invalid recepient",
|
||||||
input: []byte("000"),
|
input: []byte("9234adf5"),
|
||||||
expectedResult: resource.Result{
|
expectedResult: resource.Result{
|
||||||
FlagSet: []uint32{flag_invalid_recipient},
|
FlagSet: []uint32{flag_invalid_recipient},
|
||||||
Content: "000",
|
Content: "9234adf5",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Test with valid recepient",
|
name: "Test with valid unregistered recepient",
|
||||||
input: []byte("0705X2"),
|
input: []byte("0712345678"),
|
||||||
|
expectedResult: resource.Result{
|
||||||
|
FlagSet: []uint32{flag_invalid_recipient_with_invite},
|
||||||
|
Content: "0712345678",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Test with valid registered recepient",
|
||||||
|
input: []byte("0711223344"),
|
||||||
expectedResult: resource.Result{},
|
expectedResult: resource.Result{},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// store a public key for the valid recipient
|
||||||
|
err = store.WriteEntry(ctx, "0711223344", common.DATA_PUBLIC_KEY, []byte(publicKey))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
// Create the Handlers instance
|
// Create the Handlers instance
|
||||||
@ -1987,7 +2034,7 @@ func TestSetVoucher(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
res, err := h.SetVoucher(ctx, "set_voucher", []byte{})
|
res, err := h.SetVoucher(ctx, "set_voucher", []byte(""))
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
@ -28,7 +28,6 @@ func (m *MockAccountService) TrackAccountStatus(ctx context.Context, trackingId
|
|||||||
return args.Get(0).(*models.TrackStatusResult), args.Error(1)
|
return args.Get(0).(*models.TrackStatusResult), args.Error(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
func (m *MockAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
func (m *MockAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||||
args := m.Called(publicKey)
|
args := m.Called(publicKey)
|
||||||
return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
|
return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
|
||||||
@ -39,7 +38,12 @@ func (m *MockAccountService) FetchTransactions(ctx context.Context, publicKey st
|
|||||||
return args.Get(0).([]dataserviceapi.Last10TxResponse), args.Error(1)
|
return args.Get(0).([]dataserviceapi.Last10TxResponse), args.Error(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
func(m MockAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
|
func (m *MockAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
|
||||||
args := m.Called(address)
|
args := m.Called(address)
|
||||||
return args.Get(0).(*models.VoucherDataResult), args.Error(1)
|
return args.Get(0).(*models.VoucherDataResult), args.Error(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *MockAccountService) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
|
||||||
|
args := m.Called()
|
||||||
|
return args.Get(0).(*models.TokenTransferResponse), args.Error(1)
|
||||||
|
}
|
||||||
|
@ -12,14 +12,14 @@ type TestAccountService struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (tas *TestAccountService) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
|
func (tas *TestAccountService) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
|
||||||
return &models.AccountResult {
|
return &models.AccountResult{
|
||||||
TrackingId: "075ccc86-f6ef-4d33-97d5-e91cfb37aa0d",
|
TrackingId: "075ccc86-f6ef-4d33-97d5-e91cfb37aa0d",
|
||||||
PublicKey: "0x623EFAFa8868df4B934dd12a8B26CB3Dd75A7AdD",
|
PublicKey: "0x623EFAFa8868df4B934dd12a8B26CB3Dd75A7AdD",
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
|
func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
|
||||||
balanceResponse := &models.BalanceResult {
|
balanceResponse := &models.BalanceResult{
|
||||||
Balance: "0.003 CELO",
|
Balance: "0.003 CELO",
|
||||||
Nonce: json.Number("0"),
|
Nonce: json.Number("0"),
|
||||||
}
|
}
|
||||||
@ -27,7 +27,7 @@ func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey strin
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
|
func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
|
||||||
return &models.TrackStatusResult {
|
return &models.TrackStatusResult{
|
||||||
Active: true,
|
Active: true,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
@ -47,6 +47,12 @@ func (tas *TestAccountService) FetchTransactions(ctx context.Context, publicKey
|
|||||||
return []dataserviceapi.Last10TxResponse{}, nil
|
return []dataserviceapi.Last10TxResponse{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func(m TestAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
|
func (m TestAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
|
||||||
return &models.VoucherDataResult{}, nil
|
return &models.VoucherDataResult{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (tas *TestAccountService) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
|
||||||
|
return &models.TokenTransferResponse{
|
||||||
|
TrackingId: "e034d147-747d-42ea-928d-b5a7cb3426af",
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "send_with_invalid_inputs",
|
"name": "send_with_invite",
|
||||||
"steps": [
|
"steps": [
|
||||||
{
|
{
|
||||||
"input": "",
|
"input": "",
|
||||||
@ -65,39 +65,19 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"input": "000",
|
"input": "000",
|
||||||
"expectedContent": "000 is not registered or invalid, please try again:\n1:Retry\n9:Quit"
|
"expectedContent": "000 is invalid, please try again:\n1:Retry\n9:Quit"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"input": "1",
|
"input": "1",
|
||||||
"expectedContent": "Enter recipient's phone number:\n0:Back"
|
"expectedContent": "Enter recipient's phone number:\n0:Back"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"input": "065656",
|
"input": "0712345678",
|
||||||
"expectedContent": "{max_amount}\nEnter amount:\n0:Back"
|
"expectedContent": "0712345678 is not registered, please try again:\n1:Retry\n2:Invite to Sarafu Network\n9:Quit"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"input": "10000000",
|
"input": "2",
|
||||||
"expectedContent": "Amount 10000000 is invalid, please try again:\n1:Retry\n9:Quit"
|
"expectedContent": "Your invite request for 0712345678 to Sarafu Network failed. Please try again later."
|
||||||
},
|
|
||||||
{
|
|
||||||
"input": "1",
|
|
||||||
"expectedContent": "{max_amount}\nEnter amount:\n0:Back"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"input": "1.00",
|
|
||||||
"expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"input": "1222",
|
|
||||||
"expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"input": "1",
|
|
||||||
"expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"input": "1234",
|
|
||||||
"expectedContent": "Your request has been sent. 065656 will receive {send_amount} from {session_id}."
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -2,7 +2,6 @@ package models
|
|||||||
|
|
||||||
import "encoding/json"
|
import "encoding/json"
|
||||||
|
|
||||||
|
|
||||||
type BalanceResult struct {
|
type BalanceResult struct {
|
||||||
Balance string `json:"balance"`
|
Balance string `json:"balance"`
|
||||||
Nonce json.Number `json:"nonce"`
|
Nonce json.Number `json:"nonce"`
|
||||||
|
5
models/token_transfer_response.go
Normal file
5
models/token_transfer_response.go
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
type TokenTransferResponse struct {
|
||||||
|
TrackingId string `json:"trackingId"`
|
||||||
|
}
|
@ -1,18 +0,0 @@
|
|||||||
package models
|
|
||||||
|
|
||||||
type ApiResponse struct {
|
|
||||||
OK bool `json:"ok"`
|
|
||||||
Description string `json:"description"`
|
|
||||||
Result Result `json:"result"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type Result struct {
|
|
||||||
Holdings []Holding `json:"holdings"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type Holding struct {
|
|
||||||
ContractAddress string `json:"contractAddress"`
|
|
||||||
TokenSymbol string `json:"tokenSymbol"`
|
|
||||||
TokenDecimals string `json:"tokenDecimals"`
|
|
||||||
Balance string `json:"balance"`
|
|
||||||
}
|
|
8
models/voucher_data_result.go
Normal file
8
models/voucher_data_result.go
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
type VoucherDataResult struct {
|
||||||
|
TokenName string `json:"tokenName"`
|
||||||
|
TokenSymbol string `json:"tokenSymbol"`
|
||||||
|
TokenDecimals int `json:"tokenDecimals"`
|
||||||
|
SinkAddress string `json:"sinkAddress"`
|
||||||
|
}
|
@ -1,21 +0,0 @@
|
|||||||
package models
|
|
||||||
|
|
||||||
import dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
|
|
||||||
|
|
||||||
//type VoucherHoldingResponse struct {
|
|
||||||
// Ok bool `json:"ok"`
|
|
||||||
// Description string `json:"description"`
|
|
||||||
// Result VoucherResult `json:"result"`
|
|
||||||
//}
|
|
||||||
|
|
||||||
// VoucherResult holds the list of token holdings
|
|
||||||
type VoucherResult struct {
|
|
||||||
Holdings []dataserviceapi.TokenHoldings `json:"holdings"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type VoucherDataResult struct {
|
|
||||||
TokenName string `json:"tokenName"`
|
|
||||||
TokenSymbol string `json:"tokenSymbol"`
|
|
||||||
TokenDecimals string `json:"tokenDecimals"`
|
|
||||||
SinkAddress string `json:"sinkAddress"`
|
|
||||||
}
|
|
@ -23,6 +23,7 @@ type AccountServiceInterface interface {
|
|||||||
FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error)
|
FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error)
|
||||||
FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error)
|
FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error)
|
||||||
VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error)
|
VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error)
|
||||||
|
TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
type AccountService struct {
|
type AccountService struct {
|
||||||
@ -50,7 +51,7 @@ func (as *AccountService) TrackAccountStatus(ctx context.Context, publicKey stri
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = doCustodialRequest(ctx, req, &r)
|
_, err = doRequest(ctx, req, &r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -74,7 +75,7 @@ func (as *AccountService) CheckBalance(ctx context.Context, publicKey string) (*
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = doCustodialRequest(ctx, req, &balanceResult)
|
_, err = doRequest(ctx, req, &balanceResult)
|
||||||
return &balanceResult, err
|
return &balanceResult, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -91,7 +92,7 @@ func (as *AccountService) CreateAccount(ctx context.Context) (*models.AccountRes
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
_, err = doCustodialRequest(ctx, req, &r)
|
_, err = doRequest(ctx, req, &r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -103,7 +104,9 @@ func (as *AccountService) CreateAccount(ctx context.Context) (*models.AccountRes
|
|||||||
// Parameters:
|
// Parameters:
|
||||||
// - publicKey: The public key associated with the account.
|
// - publicKey: The public key associated with the account.
|
||||||
func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||||
var r []dataserviceapi.TokenHoldings
|
var r struct {
|
||||||
|
Holdings []dataserviceapi.TokenHoldings `json:"holdings"`
|
||||||
|
}
|
||||||
|
|
||||||
ep, err := url.JoinPath(config.VoucherHoldingsURL, publicKey)
|
ep, err := url.JoinPath(config.VoucherHoldingsURL, publicKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -115,19 +118,21 @@ func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) (
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = doDataRequest(ctx, req, r)
|
_, err = doRequest(ctx, req, &r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return r, nil
|
return r.Holdings, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// FetchTransactions retrieves the last 10 transactions for a given public key from the data indexer API endpoint
|
// FetchTransactions retrieves the last 10 transactions for a given public key from the data indexer API endpoint
|
||||||
// Parameters:
|
// Parameters:
|
||||||
// - publicKey: The public key associated with the account.
|
// - publicKey: The public key associated with the account.
|
||||||
func (as *AccountService) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
|
func (as *AccountService) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
|
||||||
var r []dataserviceapi.Last10TxResponse
|
var r struct {
|
||||||
|
Transfers []dataserviceapi.Last10TxResponse `json:"transfers"`
|
||||||
|
}
|
||||||
|
|
||||||
ep, err := url.JoinPath(config.VoucherTransfersURL, publicKey)
|
ep, err := url.JoinPath(config.VoucherTransfersURL, publicKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -139,19 +144,21 @@ func (as *AccountService) FetchTransactions(ctx context.Context, publicKey strin
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = doDataRequest(ctx, req, r)
|
_, err = doRequest(ctx, req, &r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return r, nil
|
return r.Transfers, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// VoucherData retrieves voucher metadata from the data indexer API endpoint.
|
// VoucherData retrieves voucher metadata from the data indexer API endpoint.
|
||||||
// Parameters:
|
// Parameters:
|
||||||
// - address: The voucher address.
|
// - address: The voucher address.
|
||||||
func (as *AccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
|
func (as *AccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
|
||||||
var voucherDataResult models.VoucherDataResult
|
var r struct {
|
||||||
|
TokenDetails models.VoucherDataResult `json:"tokenDetails"`
|
||||||
|
}
|
||||||
|
|
||||||
ep, err := url.JoinPath(config.VoucherDataURL, address)
|
ep, err := url.JoinPath(config.VoucherDataURL, address)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -163,14 +170,54 @@ func (as *AccountService) VoucherData(ctx context.Context, address string) (*mod
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = doCustodialRequest(ctx, req, &voucherDataResult)
|
_, err = doRequest(ctx, req, &r)
|
||||||
return &voucherDataResult, err
|
return &r.TokenDetails, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// TokenTransfer creates a new token transfer in the custodial system.
|
||||||
|
// Returns:
|
||||||
|
// - *models.TokenTransferResponse: A pointer to an TokenTransferResponse struct containing the trackingId.
|
||||||
|
// If there is an error during the request or processing, this will be nil.
|
||||||
|
// - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
|
||||||
|
// If no error occurs, this will be nil.
|
||||||
|
func (as *AccountService) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
|
||||||
|
var r models.TokenTransferResponse
|
||||||
|
|
||||||
|
// Create request payload
|
||||||
|
payload := map[string]string{
|
||||||
|
"amount": amount,
|
||||||
|
"from": from,
|
||||||
|
"to": to,
|
||||||
|
"tokenAddress": tokenAddress,
|
||||||
|
}
|
||||||
|
|
||||||
|
payloadBytes, err := json.Marshal(payload)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a new request
|
||||||
|
req, err := http.NewRequest("POST", config.TokenTransferURL, bytes.NewBuffer(payloadBytes))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
_, err = doRequest(ctx, req, &r)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &r, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
|
func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
|
||||||
var okResponse api.OKResponse
|
var okResponse api.OKResponse
|
||||||
var errResponse api.ErrResponse
|
var errResponse api.ErrResponse
|
||||||
|
|
||||||
|
req.Header.Set("Authorization", "Bearer "+config.BearerToken)
|
||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
logRequestDetails(req)
|
||||||
|
|
||||||
resp, err := http.DefaultClient.Do(req)
|
resp, err := http.DefaultClient.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Failed to make %s request to endpoint: %s with reason: %s", req.Method, req.URL, err.Error())
|
log.Printf("Failed to make %s request to endpoint: %s with reason: %s", req.Method, req.URL, err.Error())
|
||||||
@ -208,18 +255,6 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
|
|||||||
return &okResponse, err
|
return &okResponse, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func doCustodialRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
|
|
||||||
req.Header.Set("Authorization", "Bearer "+config.CustodialBearerToken)
|
|
||||||
logRequestDetails(req)
|
|
||||||
return doRequest(ctx, req, rcpt)
|
|
||||||
}
|
|
||||||
|
|
||||||
func doDataRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
|
|
||||||
req.Header.Set("Authorization", "Bearer "+config.DataBearerToken)
|
|
||||||
logRequestDetails(req)
|
|
||||||
return doRequest(ctx, req, rcpt)
|
|
||||||
}
|
|
||||||
|
|
||||||
func logRequestDetails(req *http.Request) {
|
func logRequestDetails(req *http.Request) {
|
||||||
var bodyBytes []byte
|
var bodyBytes []byte
|
||||||
contentType := req.Header.Get("Content-Type")
|
contentType := req.Header.Get("Content-Type")
|
||||||
|
@ -9,7 +9,7 @@ RELOAD validate_amount
|
|||||||
CATCH api_failure flag_api_call_error 1
|
CATCH api_failure flag_api_call_error 1
|
||||||
CATCH invalid_amount flag_invalid_amount 1
|
CATCH invalid_amount flag_invalid_amount 1
|
||||||
INCMP _ 0
|
INCMP _ 0
|
||||||
LOAD get_recipient 12
|
LOAD get_recipient 0
|
||||||
LOAD get_sender 64
|
LOAD get_sender 64
|
||||||
LOAD get_amount 32
|
LOAD get_amount 32
|
||||||
INCMP transaction_pin *
|
INCMP transaction_pin *
|
||||||
|
@ -1 +1 @@
|
|||||||
{{.validate_recipient}} is not registered or invalid, please try again:
|
{{.validate_recipient}} is invalid, please try again:
|
@ -1 +1 @@
|
|||||||
{{.validate_recipient}} haijasajiliwa au sio sahihi, tafadhali weka tena:
|
{{.validate_recipient}} sio sahihi, tafadhali weka tena:
|
1
services/registration/invite_menu
Normal file
1
services/registration/invite_menu
Normal file
@ -0,0 +1 @@
|
|||||||
|
Invite to Sarafu Network
|
1
services/registration/invite_menu_swa
Normal file
1
services/registration/invite_menu_swa
Normal file
@ -0,0 +1 @@
|
|||||||
|
Karibisha kwa matandao wa Sarafu
|
1
services/registration/invite_recipient
Normal file
1
services/registration/invite_recipient
Normal file
@ -0,0 +1 @@
|
|||||||
|
{{.validate_recipient}} is not registered, please try again:
|
8
services/registration/invite_recipient.vis
Normal file
8
services/registration/invite_recipient.vis
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
MAP validate_recipient
|
||||||
|
MOUT retry 1
|
||||||
|
MOUT invite 2
|
||||||
|
MOUT quit 9
|
||||||
|
HALT
|
||||||
|
INCMP _ 1
|
||||||
|
INCMP invite_result 2
|
||||||
|
INCMP quit 9
|
1
services/registration/invite_recipient_swa
Normal file
1
services/registration/invite_recipient_swa
Normal file
@ -0,0 +1 @@
|
|||||||
|
{{.validate_recipient}} haijasajiliwa, tafadhali weka tena:
|
2
services/registration/invite_result.vis
Normal file
2
services/registration/invite_result.vis
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
LOAD invite_valid_recipient 0
|
||||||
|
HALT
|
@ -12,3 +12,12 @@ msgstr "Kwa usaidizi zaidi,piga: 0757628885"
|
|||||||
|
|
||||||
msgid "Balance: %s\n"
|
msgid "Balance: %s\n"
|
||||||
msgstr "Salio: %s\n"
|
msgstr "Salio: %s\n"
|
||||||
|
|
||||||
|
msid "Your invite request for %s to Sarafu Network failed. Please try again later."
|
||||||
|
msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu halikufaulu. Tafadhali jaribu tena baadaye."
|
||||||
|
|
||||||
|
msgid "Your invitation to %s to join Sarafu Network has been sent."
|
||||||
|
msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu limetumwa."
|
||||||
|
|
||||||
|
msgid "Your request failed. Please try again later."
|
||||||
|
msgstr "Ombi lako halikufaulu. Tafadhali jaribu tena baadaye."
|
||||||
|
@ -6,3 +6,4 @@ MOUT back 0
|
|||||||
HALT
|
HALT
|
||||||
INCMP _ 0
|
INCMP _ 0
|
||||||
INCMP select_voucher 1
|
INCMP select_voucher 1
|
||||||
|
INCMP voucher_details 2
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
LOAD transaction_reset 0
|
LOAD transaction_reset 0
|
||||||
|
RELOAD transaction_reset
|
||||||
CATCH no_voucher flag_no_active_voucher 1
|
CATCH no_voucher flag_no_active_voucher 1
|
||||||
MOUT back 0
|
MOUT back 0
|
||||||
HALT
|
HALT
|
||||||
LOAD validate_recipient 20
|
LOAD validate_recipient 20
|
||||||
RELOAD validate_recipient
|
RELOAD validate_recipient
|
||||||
CATCH invalid_recipient flag_invalid_recipient 1
|
CATCH invalid_recipient flag_invalid_recipient 1
|
||||||
|
CATCH invite_recipient flag_invalid_recipient_with_invite 1
|
||||||
INCMP _ 0
|
INCMP _ 0
|
||||||
INCMP amount *
|
INCMP amount *
|
||||||
|
1
services/registration/voucher_details
Normal file
1
services/registration/voucher_details
Normal file
@ -0,0 +1 @@
|
|||||||
|
{{.get_voucher_details}}
|
6
services/registration/voucher_details.vis
Normal file
6
services/registration/voucher_details.vis
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
CATCH no_voucher flag_no_active_voucher 1
|
||||||
|
LOAD get_voucher_details 0
|
||||||
|
MAP get_voucher_details
|
||||||
|
MOUT back 0
|
||||||
|
HALT
|
||||||
|
INCMP _ 0
|
1
services/registration/voucher_details_swa
Normal file
1
services/registration/voucher_details_swa
Normal file
@ -0,0 +1 @@
|
|||||||
|
{{.get_voucher_details}}
|
Loading…
Reference in New Issue
Block a user