wallet-core: more DB cleanup

packages/taler-util/src/transactions-types.ts

@@ -527,22 +527,6 @@ export interface OrderShortInfo {
    */
   summary_i18n?: InternationalizedString;
 
-  /**
-   * List of products that are part of the order
-   */
-  products: Product[] | undefined;
-
-  /**
-   * Time indicating when the order should be delivered.
-   * May be overwritten by individual products.
-   */
-  delivery_date?: TalerProtocolTimestamp;
-
-  /**
-   * Delivery location for (all!) products.
-   */
-  delivery_location?: Location;
-
   /**
    * URL of the fulfillment, given by the merchant
    */
@@ -724,7 +708,6 @@ export const codecForOrderShortInfo = (): Codec<OrderShortInfo> =>
     .property("fulfillmentUrl", codecOptional(codecForString()))
     .property("merchant", codecForMerchantInfo())
     .property("orderId", codecForString())
-    .property("products", codecOptional(codecForList(codecForProduct())))
     .property("summary", codecForString())
     .property("summary_i18n", codecOptional(codecForInternationalizedString()))
     .build("OrderShortInfo");

packages/taler-wallet-core/src/crypto/cryptoImplementation.ts

@@ -959,11 +959,7 @@ export const nativeCryptoR: TalerCryptoInterfaceR = {
     req: DenominationValidationRequest,
   ): Promise<ValidationResult> {
     const { masterPub, denom } = req;
-    const value: AmountJson = {
+    const value: AmountJson = Amounts.parseOrThrow(denom.value);
-      currency: denom.currency,
-      fraction: denom.amountFrac,
-      value: denom.amountVal,
-    };
     const p = buildSigPS(TalerSignaturePurpose.MASTER_DENOMINATION_KEY_VALIDITY)
       .put(decodeCrock(masterPub))
       .put(timestampRoundedToBuffer(denom.stampStart))

packages/taler-wallet-core/src/db.ts

@@ -28,56 +28,53 @@ import {
 } from "@gnu-taler/idb-bridge";
 import {
   AgeCommitmentProof,
-  AmountJson,
   AmountString,
+  Amounts,
+  AttentionInfo,
+  Codec,
   CoinEnvelope,
+  CoinPublicKeyString,
   CoinRefreshRequest,
   CoinStatus,
-  MerchantContractTerms,
+  DenomSelectionState,
   DenominationInfo,
   DenominationPubKey,
-  DenomSelectionState,
   EddsaPublicKeyString,
   EddsaSignatureString,
   ExchangeAuditor,
   ExchangeGlobalFees,
+  HashCodeString,
   InternationalizedString,
-  Location,
+  Logger,
+  MerchantContractTerms,
   MerchantInfo,
   PayCoinSelection,
   PeerContractTerms,
-  Product,
   RefreshReason,
   TalerErrorDetail,
+  TalerPreciseTimestamp,
   TalerProtocolDuration,
   TalerProtocolTimestamp,
   TransactionIdStr,
   UnblindedSignature,
   WireInfo,
-  HashCodeString,
-  Amounts,
-  AttentionInfo,
-  Logger,
-  CoinPublicKeyString,
-  TalerPreciseTimestamp,
   codecForAny,
-  Codec,
 } from "@gnu-taler/taler-util";
+import { RetryInfo, TaskIdentifiers } from "./operations/common.js";
 import {
   DbAccess,
   DbReadOnlyTransaction,
   DbReadWriteTransaction,
-  describeContents,
-  describeIndex,
-  describeStore,
   GetReadWriteAccess,
   IndexDescriptor,
-  openDatabase,
   StoreDescriptor,
   StoreNames,
   StoreWithIndexes,
+  describeContents,
+  describeIndex,
+  describeStore,
+  openDatabase,
 } from "./util/query.js";
-import { RetryInfo, TaskIdentifiers } from "./operations/common.js";
 
 /**
  * This file contains the database schema of the Taler wallet together
@@ -109,6 +106,9 @@ import { RetryInfo, TaskIdentifiers } from "./operations/common.js";
    store.
  - More object stores should have an "id" primary key,
    as this makes referencing less expensive.
+ - Coin selections should probably go into a separate object store.
+ - Some records should be split up into an extra "details" record
+   that we don't always need to iterate over.
  */
 
 /**
@@ -323,12 +323,14 @@ export interface DenomFees {
  * Denomination record as stored in the wallet's database.
  */
 export interface DenominationRecord {
+  /**
+   * Currency of the denomination.
+   *
+   * Stored separately as we have an index on it.
+   */
   currency: string;
 
-  // FIXME: Use binary encoding of amount instead?
+  value: AmountString;
-  amountVal: number;
-
-  amountFrac: number;
 
   /**
    * The denomination public key.
@@ -407,14 +409,6 @@ export interface DenominationRecord {
 }
 
 export namespace DenominationRecord {
-  export function getValue(d: DenominationRecord): AmountJson {
-    return {
-      currency: d.currency,
-      fraction: d.amountFrac,
-      value: d.amountVal,
-    };
-  }
-
   export function toDenomInfo(d: DenominationRecord): DenominationInfo {
     return {
       denomPub: d.denomPub,
@@ -427,7 +421,7 @@ export namespace DenominationRecord {
       stampExpireLegal: d.stampExpireLegal,
       stampExpireWithdraw: d.stampExpireWithdraw,
       stampStart: d.stampStart,
-      value: Amounts.stringify(DenominationRecord.getValue(d)),
+      value: Amounts.stringify(d.value),
       exchangeBaseUrl: d.exchangeBaseUrl,
     };
   }
@@ -1056,9 +1050,6 @@ export interface AllowedExchangeInfo {
  * processing in the wallet.
  */
 export interface WalletContractData {
-  products?: Product[];
-  summaryI18n: { [lang_tag: string]: string } | undefined;
-
   /**
    * Fulfillment URL, or the empty string if the order has no fulfillment URL.
    *
@@ -1076,6 +1067,7 @@ export interface WalletContractData {
   orderId: string;
   merchantBaseUrl: string;
   summary: string;
+  summaryI18n: { [lang_tag: string]: string } | undefined;
   autoRefund: TalerProtocolDuration | undefined;
   maxWireFee: AmountString;
   wireFeeAmortization: number;
@@ -1087,8 +1079,6 @@ export interface WalletContractData {
   wireInfoHash: string;
   maxDepositFee: AmountString;
   minimumAge?: number;
-  deliveryDate: TalerProtocolTimestamp | undefined;
-  deliveryLocation: Location | undefined;
 }
 
 export enum PurchaseStatus {
@@ -2095,8 +2085,7 @@ export interface OperationRetryRecord {
  */
 export interface CoinAvailabilityRecord {
   currency: string;
-  amountVal: number;
+  value: AmountString;
-  amountFrac: number;
   denomPubHash: string;
   exchangeBaseUrl: string;
 

packages/taler-wallet-core/src/dbless.ts

@@ -159,11 +159,7 @@ export async function withdrawCoin(args: {
     reservePriv: reserveKeyPair.reservePriv,
     reservePub: reserveKeyPair.reservePub,
     secretSeed: encodeCrock(getRandomBytes(32)),
-    value: {
+    value: Amounts.parseOrThrow(denom.value),
-      currency: denom.currency,
-      fraction: denom.amountFrac,
-      value: denom.amountVal,
-    },
   });
 
   const reqBody: ExchangeWithdrawRequest = {
@@ -211,11 +207,7 @@ export function findDenomOrThrow(
 ): DenominationRecord {
   const denomselAllowLate = options.denomselAllowLate ?? false;
   for (const d of exchangeInfo.keys.currentDenominations) {
-    const value: AmountJson = {
+    const value: AmountJson = Amounts.parseOrThrow(d.value);
-      currency: d.currency,
-      fraction: d.amountFrac,
-      value: d.amountVal,
-    };
     if (
       Amounts.cmp(value, amount) === 0 &&
       isWithdrawableDenom(d, denomselAllowLate)
@@ -303,11 +295,7 @@ export async function refreshCoin(req: {
       denomPub: x.denomPub,
       denomPubHash: x.denomPubHash,
       feeWithdraw: x.fees.feeWithdraw,
-      value: Amounts.stringify({
+      value: x.value,
-        currency: x.currency,
-        fraction: x.amountFrac,
-        value: x.amountVal,
-      }),
     })),
     meltCoinMaxAge: oldCoin.maxAge,
   });

packages/taler-wallet-core/src/operations/balance.ts

@@ -133,11 +133,7 @@ export async function getBalancesInsideTransaction(
     const b = initBalance(ca.currency);
     const count = ca.visibleCoinCount ?? 0;
     for (let i = 0; i < count; i++) {
-      b.available = Amounts.add(b.available, {
+      b.available = Amounts.add(b.available, ca.value).amount;
-        currency: ca.currency,
-        fraction: ca.amountFrac,
-        value: ca.amountVal,
-      }).amount;
     }
   });
 
@@ -408,11 +404,7 @@ export async function getMerchantPaymentBalanceDetails(
         if (ca.currency != req.currency) {
           return;
         }
-        const singleCoinAmount: AmountJson = {
+        const singleCoinAmount: AmountJson = Amounts.parseOrThrow(ca.value);
-          currency: ca.currency,
-          fraction: ca.amountFrac,
-          value: ca.amountVal,
-        };
         const coinAmount: AmountJson = Amounts.mult(
           singleCoinAmount,
           ca.freshCoinCount,
@@ -530,11 +522,7 @@ export async function getPeerPaymentBalanceDetailsInTx(
     ) {
       return;
     }
-    const singleCoinAmount: AmountJson = {
+    const singleCoinAmount: AmountJson = Amounts.parseOrThrow(ca.value);
-      currency: ca.currency,
-      fraction: ca.amountFrac,
-      value: ca.amountVal,
-    };
     const coinAmount: AmountJson = Amounts.mult(
       singleCoinAmount,
       ca.freshCoinCount,

packages/taler-wallet-core/src/operations/common.ts

@@ -26,7 +26,6 @@ import {
   CoinRefreshRequest,
   CoinStatus,
   Duration,
-  ErrorInfoSummary,
   ExchangeEntryStatus,
   ExchangeListItem,
   ExchangeTosStatus,
@@ -34,9 +33,11 @@ import {
   getErrorDetailFromException,
   j2s,
   Logger,
+  makeErrorDetail,
   NotificationType,
   OperationErrorInfo,
   RefreshReason,
+  TalerError,
   TalerErrorCode,
   TalerErrorDetail,
   TombstoneIdStr,
@@ -44,32 +45,31 @@ import {
   TransactionType,
   WalletNotification,
 } from "@gnu-taler/taler-util";
+import { CryptoApiStoppedError } from "../crypto/workers/crypto-dispatcher.js";
 import {
-  WalletStoresV1,
-  CoinRecord,
-  ExchangeDetailsRecord,
-  ExchangeEntryRecord,
   BackupProviderRecord,
+  CoinRecord,
   DepositGroupRecord,
-  PeerPullPaymentIncomingRecord,
+  ExchangeDetailsRecord,
+  ExchangeEntryDbRecordStatus,
+  ExchangeEntryDbUpdateStatus,
+  ExchangeEntryRecord,
   PeerPullCreditRecord,
-  PeerPushPaymentIncomingRecord,
+  PeerPullPaymentIncomingRecord,
   PeerPushDebitRecord,
+  PeerPushPaymentIncomingRecord,
   PurchaseRecord,
   RecoupGroupRecord,
   RefreshGroupRecord,
   RewardRecord,
+  WalletStoresV1,
   WithdrawalGroupRecord,
-  ExchangeEntryDbUpdateStatus,
-  ExchangeEntryDbRecordStatus,
 } from "../db.js";
-import { makeErrorDetail, TalerError } from "@gnu-taler/taler-util";
 import { InternalWalletState } from "../internal-wallet-state.js";
-import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js";
-import { GetReadOnlyAccess, GetReadWriteAccess } from "../util/query.js";
-import { CryptoApiStoppedError } from "../crypto/workers/crypto-dispatcher.js";
 import { PendingTaskType, TaskId } from "../pending-types.js";
 import { assertUnreachable } from "../util/assertUnreachable.js";
+import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js";
+import { GetReadOnlyAccess, GetReadWriteAccess } from "../util/query.js";
 import { constructTransactionIdentifier } from "./transactions.js";
 
 const logger = new Logger("operations/common.ts");
@@ -144,8 +144,7 @@ export async function makeCoinAvailable(
   if (!car) {
     car = {
       maxAge: ageRestriction,
-      amountFrac: denom.amountFrac,
+      value: denom.value,
-      amountVal: denom.amountVal,
       currency: denom.currency,
       denomPubHash: denom.denomPubHash,
       exchangeBaseUrl: denom.exchangeBaseUrl,

packages/taler-wallet-core/src/operations/deposits.ts

@@ -1539,7 +1539,7 @@ async function getTotalFeesForDepositAmount(
           .iter(coin.exchangeBaseUrl)
           .filter((x) =>
             Amounts.isSameCurrency(
-              DenominationRecord.getValue(x),
+              x.value,
               pcs.coinContributions[i],
             ),
           );

packages/taler-wallet-core/src/operations/exchanges.ts

@@ -443,8 +443,7 @@ async function downloadExchangeKeysInfo(
             exchangeMasterPub: exchangeKeysJsonUnchecked.master_public_key,
             isOffered: true,
             isRevoked: false,
-            amountFrac: value.fraction,
+            value: Amounts.stringify(value),
-            amountVal: value.value,
             currency: value.currency,
             stampExpireDeposit: denomIn.stamp_expire_deposit,
             stampExpireLegal: denomIn.stamp_expire_legal,

packages/taler-wallet-core/src/operations/pay-merchant.ts

@@ -174,12 +174,12 @@ export async function getTotalPaymentCost(
           .iter(coin.exchangeBaseUrl)
           .filter((x) =>
             Amounts.isSameCurrency(
-              DenominationRecord.getValue(x),
+              x.value,
               pcs.coinContributions[i],
             ),
           );
         const amountLeft = Amounts.sub(
-          DenominationRecord.getValue(denom),
+          denom.value,
           pcs.coinContributions[i],
         ).amount;
         const refreshCost = getTotalRefreshCost(

packages/taler-wallet-core/src/operations/pay-peer-common.ts

@@ -108,16 +108,8 @@ export async function getTotalPeerPaymentCost(
         }
         const allDenoms = await tx.denominations.indexes.byExchangeBaseUrl
           .iter(coin.exchangeBaseUrl)
-          .filter((x) =>
+          .filter((x) => Amounts.isSameCurrency(x.value, pcs[i].contribution));
-            Amounts.isSameCurrency(
+        const amountLeft = Amounts.sub(denom.value, pcs[i].contribution).amount;
-              DenominationRecord.getValue(x),
-              pcs[i].contribution,
-            ),
-          );
-        const amountLeft = Amounts.sub(
-          DenominationRecord.getValue(denom),
-          pcs[i].contribution,
-        ).amount;
         const refreshCost = getTotalRefreshCost(
           allDenoms,
           DenominationRecord.toDenomInfo(denom),

packages/taler-wallet-core/src/operations/refresh.ts

@@ -134,11 +134,7 @@ export function getTotalRefreshCost(
   const resultingAmount = Amounts.add(
     Amounts.zeroOfCurrency(withdrawAmount.currency),
     ...withdrawDenoms.selectedDenoms.map(
-      (d) =>
+      (d) => Amounts.mult(denomMap[d.denomPubHash].value, d.count).amount,
-        Amounts.mult(
-          DenominationRecord.getValue(denomMap[d.denomPubHash]),
-          d.count,
-        ).amount,
     ),
   ).amount;
   const totalCost = Amounts.sub(amountLeft, resultingAmount).amount;
@@ -1200,11 +1196,7 @@ export async function autoRefresh(
         if (AbsoluteTime.isExpired(executeThreshold)) {
           refreshCoins.push({
             coinPub: coin.coinPub,
-            amount: Amounts.stringify({
+            amount: denom.value,
-              value: denom.amountVal,
-              fraction: denom.amountFrac,
-              currency: denom.currency,
-            }),
           });
         } else {
           const checkThreshold = getAutoRefreshCheckThreshold(denom);

packages/taler-wallet-core/src/operations/transactions.ts

@@ -884,7 +884,6 @@ async function buildTransactionForPurchase(
   const info: OrderShortInfo = {
     merchant: contractData.merchant,
     orderId: contractData.orderId,
-    products: contractData.products,
     summary: contractData.summary,
     summary_i18n: contractData.summaryI18n,
     contractTermsHash: contractData.contractTermsHash,

packages/taler-wallet-core/src/operations/withdraw.test.ts

@@ -78,8 +78,7 @@ test("withdrawal selection bug repro", (t) => {
       },
       verificationStatus: DenominationVerificationStatus.Unverified,
       currency: "KUDOS",
-      amountFrac: 0,
+      value: "KUDOS:1000",
-      amountVal: 1000,
       listIssueDate: { t_s: 0 },
     },
     {
@@ -133,8 +132,7 @@ test("withdrawal selection bug repro", (t) => {
         t_s: 1585229388,
       },
       verificationStatus: DenominationVerificationStatus.Unverified,
-      amountFrac: 0,
+      value: "KUDOS:10",
-      amountVal: 10,
       currency: "KUDOS",
       listIssueDate: { t_s: 0 },
     },
@@ -188,8 +186,7 @@ test("withdrawal selection bug repro", (t) => {
         t_s: 1585229388,
       },
       verificationStatus: DenominationVerificationStatus.Unverified,
-      amountFrac: 0,
+      value: "KUDOS:5",
-      amountVal: 5,
       currency: "KUDOS",
       listIssueDate: { t_s: 0 },
     },
@@ -244,8 +241,7 @@ test("withdrawal selection bug repro", (t) => {
         t_s: 1585229388,
       },
       verificationStatus: DenominationVerificationStatus.Unverified,
-      amountFrac: 0,
+      value: "KUDOS:1",
-      amountVal: 1,
       currency: "KUDOS",
       listIssueDate: { t_s: 0 },
     },
@@ -299,8 +295,11 @@ test("withdrawal selection bug repro", (t) => {
         t_s: 1585229388,
       },
       verificationStatus: DenominationVerificationStatus.Unverified,
-      amountFrac: 10000000,
+      value: Amounts.stringify({
-      amountVal: 0,
+        currency: "KUDOS",
+        fraction: 10000000,
+        value: 0,
+      }),
       currency: "KUDOS",
       listIssueDate: { t_s: 0 },
     },
@@ -354,8 +353,7 @@ test("withdrawal selection bug repro", (t) => {
         t_s: 1585229388,
       },
       verificationStatus: DenominationVerificationStatus.Unverified,
-      amountFrac: 0,
+      value: "KUDOS:2",
-      amountVal: 2,
       currency: "KUDOS",
       listIssueDate: { t_s: 0 },
     },

packages/taler-wallet-core/src/util/coinSelection.ts

@@ -699,25 +699,17 @@ export function selectWithdrawalDenominations(
   let totalWithdrawCost = Amounts.zeroOfCurrency(amountAvailable.currency);
 
   denoms = denoms.filter((d) => isWithdrawableDenom(d, denomselAllowLate));
-  denoms.sort((d1, d2) =>
+  denoms.sort((d1, d2) => Amounts.cmp(d2.value, d1.value));
-    Amounts.cmp(
-      DenominationRecord.getValue(d2),
-      DenominationRecord.getValue(d1),
-    ),
-  );
 
   for (const d of denoms) {
-    const cost = Amounts.add(
+    const cost = Amounts.add(d.value, d.fees.feeWithdraw).amount;
-      DenominationRecord.getValue(d),
-      d.fees.feeWithdraw,
-    ).amount;
     const res = Amounts.divmod(remaining, cost);
     const count = res.quotient;
     remaining = Amounts.sub(remaining, Amounts.mult(cost, count).amount).amount;
     if (count > 0) {
       totalCoinValue = Amounts.add(
         totalCoinValue,
-        Amounts.mult(DenominationRecord.getValue(d), count).amount,
+        Amounts.mult(d.value, count).amount,
       ).amount;
       totalWithdrawCost = Amounts.add(
         totalWithdrawCost,
@@ -766,30 +758,22 @@ export function selectForcedWithdrawalDenominations(
   let totalWithdrawCost = Amounts.zeroOfCurrency(amountAvailable.currency);
 
   denoms = denoms.filter((d) => isWithdrawableDenom(d, denomselAllowLate));
-  denoms.sort((d1, d2) =>
+  denoms.sort((d1, d2) => Amounts.cmp(d2.value, d1.value));
-    Amounts.cmp(
-      DenominationRecord.getValue(d2),
-      DenominationRecord.getValue(d1),
-    ),
-  );
 
   for (const fds of forcedDenomSel.denoms) {
     const count = fds.count;
     const denom = denoms.find((x) => {
-      return Amounts.cmp(DenominationRecord.getValue(x), fds.value) == 0;
+      return Amounts.cmp(x.value, fds.value) == 0;
     });
     if (!denom) {
       throw Error(
         `unable to find denom for forced selection (value ${fds.value})`,
       );
     }
-    const cost = Amounts.add(
+    const cost = Amounts.add(denom.value, denom.fees.feeWithdraw).amount;
-      DenominationRecord.getValue(denom),
-      denom.fees.feeWithdraw,
-    ).amount;
     totalCoinValue = Amounts.add(
       totalCoinValue,
-      Amounts.mult(DenominationRecord.getValue(denom), count).amount,
+      Amounts.mult(denom.value, count).amount,
     ).amount;
     totalWithdrawCost = Amounts.add(
       totalWithdrawCost,

packages/taler-wallet-core/src/util/instructedAmountConversion.ts

@@ -321,7 +321,7 @@ function buildCoinInfoFromDenom(
       AbsoluteTime.fromProtocolTimestamp(denom.stampExpireDeposit),
     ),
     totalAvailable: total,
-    value: DenominationRecord.getValue(denom),
+    value: Amounts.parseOrThrow(denom.value),
     maxAge,
   };
 }

packages/taler-wallet-core/src/wallet.ts

@@ -915,11 +915,7 @@ async function dumpCoins(ws: InternalWalletState): Promise<CoinDumpJson> {
           coin_pub: c.coinPub,
           denom_pub: denomInfo.denomPub,
           denom_pub_hash: c.denomPubHash,
-          denom_value: Amounts.stringify({
+          denom_value: denom.value,
-            value: denom.amountVal,
-            currency: denom.currency,
-            fraction: denom.amountFrac,
-          }),
           exchange_base_url: c.exchangeBaseUrl,
           refresh_parent_coin_pub: refreshParentCoinPub,
           withdrawal_reserve_pub: withdrawalReservePub,
@@ -1876,35 +1872,27 @@ class InternalWalletStateImpl implements InternalWalletState {
         return computeRefundTransactionState(rec);
       }
       case TransactionType.PeerPullCredit:
-        const rec = await tx.peerPullCredit.get(
+        const rec = await tx.peerPullCredit.get(parsedTxId.pursePub);
-          parsedTxId.pursePub,
-        );
         if (!rec) {
           return undefined;
         }
         return computePeerPullCreditTransactionState(rec);
       case TransactionType.PeerPullDebit: {
-        const rec = await tx.peerPullDebit.get(
+        const rec = await tx.peerPullDebit.get(parsedTxId.peerPullDebitId);
-          parsedTxId.peerPullDebitId,
-        );
         if (!rec) {
           return undefined;
         }
         return computePeerPullDebitTransactionState(rec);
       }
       case TransactionType.PeerPushCredit: {
-        const rec = await tx.peerPushCredit.get(
+        const rec = await tx.peerPushCredit.get(parsedTxId.peerPushCreditId);
-          parsedTxId.peerPushCreditId,
-        );
         if (!rec) {
           return undefined;
         }
         return computePeerPushCreditTransactionState(rec);
       }
       case TransactionType.PeerPushDebit: {
-        const rec = await tx.peerPushDebit.get(
+        const rec = await tx.peerPushDebit.get(parsedTxId.pursePub);
-          parsedTxId.pursePub,
-        );
         if (!rec) {
           return undefined;
         }