From e075134ffc94fda3582b179122bda594d91a962b Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Sat, 15 Oct 2022 11:52:07 +0200
Subject: wallet-core: simplify coin record

we only track the allocation now, not the remaining amount
---
 packages/taler-wallet-core/src/operations/backup/export.ts | 10 +++++++---
 packages/taler-wallet-core/src/operations/backup/import.ts |  6 ++----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'packages/taler-wallet-core/src/operations/backup')

diff --git a/packages/taler-wallet-core/src/operations/backup/export.ts b/packages/taler-wallet-core/src/operations/backup/export.ts
index 30e61e382..1472b1b90 100644
--- a/packages/taler-wallet-core/src/operations/backup/export.ts
+++ b/packages/taler-wallet-core/src/operations/backup/export.ts
@@ -54,6 +54,7 @@ import {
   BACKUP_VERSION_MINOR,
   canonicalizeBaseUrl,
   canonicalJson,
+  CoinStatus,
   encodeCrock,
   getRandomBytes,
   hash,
@@ -63,7 +64,6 @@ import {
 } from "@gnu-taler/taler-util";
 import {
   CoinSourceType,
-  CoinStatus,
   ConfigRecordKey,
   DenominationRecord,
   PurchaseStatus,
@@ -206,7 +206,6 @@ export async function exportBackup(
           coins: recoupGroup.coinPubs.map((x, i) => ({
             coin_pub: x,
             recoup_finished: recoupGroup.recoupFinishedPerCoin[i],
-            old_amount: Amounts.stringify(recoupGroup.oldAmountPerCoin[i]),
           })),
         });
       });
@@ -259,8 +258,13 @@ export async function exportBackup(
           blinding_key: coin.blindingKey,
           coin_priv: coin.coinPriv,
           coin_source: bcs,
-          current_amount: Amounts.stringify(coin.currentAmount),
           fresh: coin.status === CoinStatus.Fresh,
+          spend_allocation: coin.spendAllocation
+            ? {
+                amount: coin.spendAllocation.amount,
+                id: coin.spendAllocation.id,
+              }
+            : undefined,
           denom_sig: coin.denomSig,
         });
       });
diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts
index 3bbb7d798..9c5eea9af 100644
--- a/packages/taler-wallet-core/src/operations/backup/import.ts
+++ b/packages/taler-wallet-core/src/operations/backup/import.ts
@@ -27,6 +27,7 @@ import {
   BackupRefundState,
   BackupWgType,
   codecForContractTerms,
+  CoinStatus,
   DenomKeyType,
   DenomSelectionState,
   j2s,
@@ -41,10 +42,8 @@ import {
   CoinRecord,
   CoinSource,
   CoinSourceType,
-  CoinStatus,
   DenominationRecord,
   DenominationVerificationStatus,
-  OperationStatus,
   ProposalDownloadInfo,
   PurchaseStatus,
   PurchasePayInfo,
@@ -272,7 +271,6 @@ export async function importCoin(
       blindingKey: backupCoin.blinding_key,
       coinEvHash: compCoin.coinEvHash,
       coinPriv: backupCoin.coin_priv,
-      currentAmount: Amounts.parseOrThrow(backupCoin.current_amount),
       denomSig: backupCoin.denom_sig,
       coinPub: compCoin.coinPub,
       exchangeBaseUrl,
@@ -284,7 +282,7 @@ export async function importCoin(
       // FIXME!
       ageCommitmentProof: undefined,
       // FIXME!
-      allocation: undefined,
+      spendAllocation: undefined,
     };
     if (coinRecord.status === CoinStatus.Fresh) {
       await makeCoinAvailable(ws, tx, coinRecord);
-- 
cgit v1.2.3