Merge pull request 'fix-amount-conversion' (#87) from fix-amount-conversion into master

Reviewed-on: #87

go.mod

@@ -5,7 +5,7 @@ go 1.23.4
 require (
 	git.defalsify.org/vise.git v0.3.2-0.20250528124150-03bf7bfc1b66
 	git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250623070026-d945964b0b46
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250624090744-339ba854c997
 	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306
 	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694
 	github.com/alecthomas/assert/v2 v2.2.2

go.sum

@@ -6,6 +6,12 @@ git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250623063234-
 git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250623063234-c1797e7a32b5/go.mod h1:H97hR+VOnZvR5BiGVb0ScCPwH/IoKBOlKM+yrQNVpq0=
 git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250623070026-d945964b0b46 h1:0+XkSRe7XSHa9WHXKpGPuC0myDszjchr4syH006lQ28=
 git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250623070026-d945964b0b46/go.mod h1:y/vsN8UO0wSxZk3gv0y5df4RPKMJI6TIxjVcVCPF8T8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250623075057-7b42d509e6d4 h1:W+8CC7x5eCPylkGy2TEoOpfJuiIlqzEzyYTzCLlY/u8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250623075057-7b42d509e6d4/go.mod h1:y/vsN8UO0wSxZk3gv0y5df4RPKMJI6TIxjVcVCPF8T8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250624074830-5aa032400c12 h1:vD8biQmN36eouuE+TdxgXQjKisRf5cTGu/tMPv3afs0=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250624074830-5aa032400c12/go.mod h1:y/vsN8UO0wSxZk3gv0y5df4RPKMJI6TIxjVcVCPF8T8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250624090744-339ba854c997 h1:8bCKyYoV4YiVBvCZlRclc3aQlBYpWhgtM35mvniDFD8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250624090744-339ba854c997/go.mod h1:y/vsN8UO0wSxZk3gv0y5df4RPKMJI6TIxjVcVCPF8T8=
 git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306 h1:Jo+yWysWw/N5BJQtAyEMN8ePVvAyPHv+JG4lQti+1N4=
 git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306/go.mod h1:FdLwYtzsjOIcDiW4uDgDYnB4Wdzq12uJUe0QHSSPbSo=
 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E=

handlers/application/menuhandler.go

@@ -1830,12 +1830,12 @@ func (h *MenuHandlers) ValidateAmount(ctx context.Context, sym string, input []b
 		return res, fmt.Errorf("missing session")
 	}
 	flag_invalid_amount, _ := h.flagManager.GetFlag("flag_invalid_amount")
-	store := h.userdataStore
+	userStore := h.userdataStore
 
 	var balanceValue float64
 
 	// retrieve the active balance
-	activeBal, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_BAL)
+	activeBal, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_BAL)
 	if err != nil {
 		logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", storedb.DATA_ACTIVE_BAL, "error", err)
 		return res, err
@@ -1861,9 +1861,15 @@ func (h *MenuHandlers) ValidateAmount(ctx context.Context, sym string, input []b
 		return res, nil
 	}
 
-	// Format the amount with 2 decimal places before saving
-	formattedAmount := fmt.Sprintf("%.2f", inputAmount)
-	err = store.WriteEntry(ctx, sessionId, storedb.DATA_AMOUNT, []byte(formattedAmount))
+	// Format the amount to 2 decimal places before saving (truncated)
+	formattedAmount, err := store.TruncateDecimalString(amountStr, 2)
+	if err != nil {
+		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
+		res.Content = amountStr
+		return res, nil
+	}
+
+	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_AMOUNT, []byte(formattedAmount))
 	if err != nil {
 		logg.ErrorCtxf(ctx, "failed to write amount entry with", "key", storedb.DATA_AMOUNT, "value", formattedAmount, "error", err)
 		return res, err
@@ -3046,7 +3052,15 @@ func (h *MenuHandlers) SwapPreview(ctx context.Context, sym string, input []byte
 		return res, nil
 	}
 
-	finalAmountStr, err := store.ParseAndScaleAmount(inputStr, swapData.ActiveSwapFromDecimal)
+	// Format the amount to 2 decimal places
+	formattedAmount, err := store.TruncateDecimalString(inputStr, 2)
+	if err != nil {
+		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
+		res.Content = inputStr
+		return res, nil
+	}
+
+	finalAmountStr, err := store.ParseAndScaleAmount(formattedAmount, swapData.ActiveSwapFromDecimal)
 	if err != nil {
 		return res, err
 	}

handlers/application/menuhandler_test.go

@@ -1678,6 +1678,22 @@ func TestValidateAmount(t *testing.T) {
 				Content: "0.02ms",
 			},
 		},
+		{
+			name:      "Test with valid decimal amount",
+			input:     []byte("0.149"),
+			activeBal: []byte("5"),
+			expectedResult: resource.Result{
+				Content: "0.14",
+			},
+		},
+		{
+			name:      "Test with valid large decimal amount",
+			input:     []byte("1.8599999999"),
+			activeBal: []byte("5"),
+			expectedResult: resource.Result{
+				Content: "1.85",
+			},
+		},
 	}
 
 	for _, tt := range tests {
@@ -2529,11 +2545,11 @@ func TestCheckTransactions(t *testing.T) {
 
 	mockTXResponse := []dataserviceapi.Last10TxResponse{
 		{
-			Sender: "0X13242618721", Recipient: "0x41c188d63Qa", TransferValue: "100", TokenAddress: "0X1324262343rfdGW23",
+			Sender: "0X13242618721", Recipient: "0x41c188d63Qa", TransferValue: "100", ContractAddress: "0X1324262343rfdGW23",
 			TxHash: "0x123wefsf34rf", DateBlock: time.Now(), TokenSymbol: "SRF", TokenDecimals: "6",
 		},
 		{
-			Sender: "0x41c188d63Qa", Recipient: "0X13242618721", TransferValue: "200", TokenAddress: "0X1324262343rfdGW23",
+			Sender: "0x41c188d63Qa", Recipient: "0X13242618721", TransferValue: "200", ContractAddress: "0X1324262343rfdGW23",
 			TxHash: "0xq34wresfdb44", DateBlock: time.Now(), TokenSymbol: "SRF", TokenDecimals: "6",
 		},
 	}
@@ -2585,11 +2601,11 @@ func TestGetTransactionsList(t *testing.T) {
 
 	mockTXResponse := []dataserviceapi.Last10TxResponse{
 		{
-			Sender: "0X13242618721", Recipient: "0x41c188d63Qa", TransferValue: "1000", TokenAddress: "0X1324262343rfdGW23",
+			Sender: "0X13242618721", Recipient: "0x41c188d63Qa", TransferValue: "1000", ContractAddress: "0X1324262343rfdGW23",
 			TxHash: "0x123wefsf34rf", DateBlock: dateBlock, TokenSymbol: "SRF", TokenDecimals: "2",
 		},
 		{
-			Sender: "0x41c188d63Qa", Recipient: "0X13242618721", TransferValue: "2000", TokenAddress: "0X1324262343rfdGW23",
+			Sender: "0x41c188d63Qa", Recipient: "0X13242618721", TransferValue: "2000", ContractAddress: "0X1324262343rfdGW23",
 			TxHash: "0xq34wresfdb44", DateBlock: dateBlock, TokenSymbol: "SRF", TokenDecimals: "2",
 		},
 	}
@@ -2654,11 +2670,11 @@ func TestViewTransactionStatement(t *testing.T) {
 
 	mockTXResponse := []dataserviceapi.Last10TxResponse{
 		{
-			Sender: "0X13242618721", Recipient: "0x41c188d63Qa", TransferValue: "1000", TokenAddress: "0X1324262343rfdGW23",
+			Sender: "0X13242618721", Recipient: "0x41c188d63Qa", TransferValue: "1000", ContractAddress: "0X1324262343rfdGW23",
 			TxHash: "0x123wefsf34rf", DateBlock: dateBlock, TokenSymbol: "SRF", TokenDecimals: "2",
 		},
 		{
-			Sender: "0x41c188d63Qa", Recipient: "0X13242618721", TransferValue: "2000", TokenAddress: "0X1324262343rfdGW23",
+			Sender: "0x41c188d63Qa", Recipient: "0X13242618721", TransferValue: "2000", ContractAddress: "0X1324262343rfdGW23",
 			TxHash: "0xq34wresfdb44", DateBlock: dateBlock, TokenSymbol: "SRF", TokenDecimals: "2",
 		},
 	}

store/swap.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
-	"strconv"
 
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
@@ -133,7 +132,7 @@ func GetSwapFromVoucherData(ctx context.Context, store DataStore, sessionId stri
 }
 
 // GetSwapToVoucherData retrieves and matches token data
-func GetSwapToVoucherData(ctx context.Context, store DataStore, sessionId string, input string) (*dataserviceapi.TokenDetails, error) {
+func GetSwapToVoucherData(ctx context.Context, store DataStore, sessionId string, input string) (*dataserviceapi.TokenHoldings, error) {
 	keys := []storedb.DataTyp{
 		storedb.DATA_POOL_TO_SYMBOLS,
 		storedb.DATA_POOL_TO_BALANCES,
@@ -150,7 +149,7 @@ func GetSwapToVoucherData(ctx context.Context, store DataStore, sessionId string
 		data[key] = string(value)
 	}
 
-	symbol, _, decimal, address := MatchVoucher(input,
+	symbol, balance, decimal, address := MatchVoucher(input,
 		data[storedb.DATA_POOL_TO_SYMBOLS],
 		data[storedb.DATA_POOL_TO_BALANCES],
 		data[storedb.DATA_POOL_TO_DECIMALS],
@@ -161,30 +160,21 @@ func GetSwapToVoucherData(ctx context.Context, store DataStore, sessionId string
 		return nil, nil
 	}
 
-	decimalInt, err := strconv.ParseUint(decimal, 0, 64)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "Failed to parse decimal to Uint:", "sessionId", sessionId, "decimal", decimal, "error", err)
-		return nil, nil
-	}
-
-	return &dataserviceapi.TokenDetails{
+	return &dataserviceapi.TokenHoldings{
 		TokenSymbol:   string(symbol),
-		TokenDecimals: uint8(decimalInt),
+		Balance:       string(balance),
+		TokenDecimals: string(decimal),
 		TokenAddress:  string(address),
 	}, nil
 }
 
 // UpdateSwapToVoucherData updates the active swap to voucher data in the DataStore.
-func UpdateSwapToVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenDetails) error {
+func UpdateSwapToVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
 	logg.InfoCtxf(ctx, "UpdateSwapToVoucherData", "data", data)
-
-	// Convert TokenDecimals (uint8) to string
-	tokenDecimalsStr := strconv.FormatUint(uint64(data.TokenDecimals), 10)
-
 	// Active swap to voucher data entries
 	activeEntries := map[storedb.DataTyp][]byte{
 		storedb.DATA_ACTIVE_SWAP_TO_SYM:     []byte(data.TokenSymbol),
-		storedb.DATA_ACTIVE_SWAP_TO_DECIMAL: []byte(tokenDecimalsStr),
+		storedb.DATA_ACTIVE_SWAP_TO_DECIMAL: []byte(data.TokenDecimals),
 		storedb.DATA_ACTIVE_SWAP_TO_ADDRESS: []byte(data.TokenAddress),
 	}
 

store/tokens.go

@@ -3,6 +3,7 @@ package store
 import (
 	"context"
 	"errors"
+	"fmt"
 	"math/big"
 	"reflect"
 	"strconv"
@@ -20,6 +21,27 @@ type TransactionData struct {
 	ActiveAddress  string
 }
 
+// TruncateDecimalString safely truncates the input amount to the specified decimal places
+func TruncateDecimalString(input string, decimalPlaces int) (string, error) {
+	num, ok := new(big.Float).SetString(input)
+	if !ok {
+		return "", fmt.Errorf("invalid input")
+	}
+
+	// Multiply by 10^decimalPlaces
+	scale := new(big.Float).SetInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(decimalPlaces)), nil))
+	scaled := new(big.Float).Mul(num, scale)
+
+	// Truncate by converting to int (chops off decimals)
+	intPart, _ := scaled.Int(nil)
+
+	// Divide back to get truncated float
+	truncated := new(big.Float).Quo(new(big.Float).SetInt(intPart), scale)
+
+	// Format with fixed decimals
+	return truncated.Text('f', decimalPlaces), nil
+}
+
 func ParseAndScaleAmount(storedAmount, activeDecimal string) (string, error) {
 	// Parse token decimal
 	tokenDecimal, err := strconv.Atoi(activeDecimal)
@@ -38,11 +60,8 @@ func ParseAndScaleAmount(storedAmount, activeDecimal string) (string, error) {
 	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
+	// Return finalAmount as a string with 0 decimal places (rounded)
+	return finalAmount.Text('f', 0), nil
 }
 
 func ReadTransactionData(ctx context.Context, store DataStore, sessionId string) (TransactionData, error) {

store/tokens_test.go

@@ -7,6 +7,109 @@ import (
 	"github.com/alecthomas/assert/v2"
 )
 
+func TestTruncateDecimalString(t *testing.T) {
+	tests := []struct {
+		name          string
+		input         string
+		decimalPlaces int
+		want          string
+		expectError   bool
+	}{
+		{
+			name:          "whole number",
+			input:         "4",
+			decimalPlaces: 2,
+			want:          "4.00",
+			expectError:   false,
+		},
+		{
+			name:          "single decimal",
+			input:         "4.1",
+			decimalPlaces: 2,
+			want:          "4.10",
+			expectError:   false,
+		},
+		{
+			name:          "one decimal place",
+			input:         "4.19",
+			decimalPlaces: 1,
+			want:          "4.1",
+			expectError:   false,
+		},
+		{
+			name:          "truncates to 2 dp",
+			input:         "0.149",
+			decimalPlaces: 2,
+			want:          "0.14",
+			expectError:   false,
+		},
+		{
+			name:          "does not round",
+			input:         "1.8599999999",
+			decimalPlaces: 2,
+			want:          "1.85",
+			expectError:   false,
+		},
+		{
+			name:          "high precision input",
+			input:         "123.456789",
+			decimalPlaces: 4,
+			want:          "123.4567",
+			expectError:   false,
+		},
+		{
+			name:          "zero",
+			input:         "0",
+			decimalPlaces: 2,
+			want:          "0.00",
+			expectError:   false,
+		},
+		{
+			name:          "invalid input string",
+			input:         "abc",
+			decimalPlaces: 2,
+			want:          "",
+			expectError:   true,
+		},
+		{
+			name:          "edge rounding case",
+			input:         "4.99999999",
+			decimalPlaces: 2,
+			want:          "4.99",
+			expectError:   false,
+		},
+		{
+			name:          "small value",
+			input:         "0.0001",
+			decimalPlaces: 2,
+			want:          "0.00",
+			expectError:   false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := TruncateDecimalString(tt.input, tt.decimalPlaces)
+
+			if tt.expectError {
+				if err == nil {
+					t.Errorf("TruncateDecimalString(%q, %d) expected error, got nil", tt.input, tt.decimalPlaces)
+				}
+				return
+			}
+
+			if err != nil {
+				t.Errorf("TruncateDecimalString(%q, %d) unexpected error: %v", tt.input, tt.decimalPlaces, err)
+				return
+			}
+
+			if got != tt.want {
+				t.Errorf("TruncateDecimalString(%q, %d) = %q, want %q", tt.input, tt.decimalPlaces, got, tt.want)
+			}
+		})
+	}
+}
+
 func TestParseAndScaleAmount(t *testing.T) {
 	tests := []struct {
 		name        string
@@ -64,6 +167,20 @@ func TestParseAndScaleAmount(t *testing.T) {
 			want:        "0",
 			expectError: false,
 		},
+		{
+			name:        "high decimals",
+			amount:      "1.85",
+			decimals:    "18",
+			want:        "1850000000000000000",
+			expectError: false,
+		},
+		{
+			name:        "6 d.p",
+			amount:      "2.32",
+			decimals:    "6",
+			want:        "2320000",
+			expectError: false,
+		},
 	}
 
 	for _, tt := range tests {