cashless2ecash

commit edf2272a49788f320e0e146eaf8c365a8bfe6b16
parent ec79baf90c10dc418486ad4df5d5f164b6195c52
Author: Joel-Haeberli <haebu@rubigen.ch>
Date:   Sat, 18 May 2024 15:41:55 +0200

fix: wire gateway amount format

Diffstat:
M
c2ec/api-wire-gateway.go
 | 
22
++++++++++++----------

1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/c2ec/api-wire-gateway.go b/c2ec/api-wire-gateway.go
@@ -53,7 +53,7 @@ type IncomingReserveTransaction struct {
 	Type         string         `json:"type"`
 	RowId        int            `json:"row_id"`
 	Date         Timestamp      `json:"date"`
-	Amount       Amount         `json:"amount"`
+	Amount       string         `json:"amount"`
 	DebitAccount string         `json:"debit_account"`
 	ReservePub   EddsaPublicKey `json:"reserve_pub"`
 }
@@ -66,7 +66,7 @@ type OutgoingHistory struct {
 type OutgoingBankTransaction struct {
 	RowId           uint64        `json:"row_id"`
 	Date            Timestamp     `json:"date"`
-	Amount          Amount        `json:"amount"`
+	Amount          string        `json:"amount"`
 	CreditAccount   string        `json:"credit_account"`
 	Wtid            ShortHashCode `json:"wtid"`
 	ExchangeBaseUrl string        `json:"exchange_base_url"`
@@ -92,11 +92,12 @@ func NewIncomingReserveTransaction(w *Withdrawal) *IncomingReserveTransaction {
 	}
 
 	t := new(IncomingReserveTransaction)
-	t.Amount = Amount{
-		Value:    uint64(w.Amount.Val),
-		Fraction: uint64(w.Amount.Frac),
-		Currency: w.Amount.Curr,
+	a, err := ToAmount(w.Amount)
+	if err != nil {
+		LogError("wire-gateway", err)
+		return nil
 	}
+	t.Amount = FormatAmount(a)
 	t.Date = Timestamp{
 		Ts: int(w.RegistrationTs),
 	}
@@ -109,11 +110,12 @@ func NewIncomingReserveTransaction(w *Withdrawal) *IncomingReserveTransaction {
 
 func NewOutgoingBankTransaction(tr *Transfer) *OutgoingBankTransaction {
 	t := new(OutgoingBankTransaction)
-	t.Amount = Amount{
-		Value:    uint64(tr.Amount.Val),
-		Fraction: uint64(tr.Amount.Frac),
-		Currency: tr.Amount.Curr,
+	a, err := ToAmount(tr.Amount)
+	if err != nil {
+		LogError("wire-gateway", err)
+		return nil
 	}
+	t.Amount = FormatAmount(a)
 	t.Date = Timestamp{
 		Ts: int(tr.TransferTs),
 	}