1 files changed, 64 insertions, 70 deletions

diff --git a/packages/taler-wallet-core/src/pay-peer-common.ts b/packages/taler-wallet-core/src/pay-peer-common.ts
index 599010c1d..a1729ced7 100644
--- a/packages/taler-wallet-core/src/pay-peer-common.ts
+++ b/packages/taler-wallet-core/src/pay-peer-common.ts
@@ -22,7 +22,7 @@ import {
   AmountString,
   Amounts,
   Codec,
-  SelectedCoin,
+  SelectedProspectiveCoin,
   TalerProtocolTimestamp,
   buildCodecForObject,
   checkDbInvariant,
@@ -34,7 +34,6 @@ import { SpendCoinDetails } from "./crypto/cryptoImplementation.js";
 import { DbPeerPushPaymentCoinSelection, ReserveRecord } from "./db.js";
 import { getTotalRefreshCost } from "./refresh.js";
 import { WalletExecutionContext, getDenomInfo } from "./wallet.js";
-import { getCandidateWithdrawalDenomsTx } from "./withdraw.js";
 
 /**
  * Get information about the coin selected for signatures.
@@ -44,79 +43,74 @@ export async function queryCoinInfosForSelection(
   csel: DbPeerPushPaymentCoinSelection,
 ): Promise<SpendCoinDetails[]> {
   let infos: SpendCoinDetails[] = [];
-  await wex.db.runReadOnlyTx(["coins", "denominations"], async (tx) => {
-    for (let i = 0; i < csel.coinPubs.length; i++) {
-      const coin = await tx.coins.get(csel.coinPubs[i]);
-      if (!coin) {
-        throw Error("coin not found anymore");
-      }
-      const denom = await getDenomInfo(
-        wex,
-        tx,
-        coin.exchangeBaseUrl,
-        coin.denomPubHash,
-      );
-      if (!denom) {
-        throw Error("denom for coin not found anymore");
+  await wex.db.runReadOnlyTx(
+    { storeNames: ["coins", "denominations"] },
+    async (tx) => {
+      for (let i = 0; i < csel.coinPubs.length; i++) {
+        const coin = await tx.coins.get(csel.coinPubs[i]);
+        if (!coin) {
+          throw Error("coin not found anymore");
+        }
+        const denom = await getDenomInfo(
+          wex,
+          tx,
+          coin.exchangeBaseUrl,
+          coin.denomPubHash,
+        );
+        if (!denom) {
+          throw Error("denom for coin not found anymore");
+        }
+        infos.push({
+          coinPriv: coin.coinPriv,
+          coinPub: coin.coinPub,
+          denomPubHash: coin.denomPubHash,
+          denomSig: coin.denomSig,
+          ageCommitmentProof: coin.ageCommitmentProof,
+          contribution: csel.contributions[i],
+        });
       }
-      infos.push({
-        coinPriv: coin.coinPriv,
-        coinPub: coin.coinPub,
-        denomPubHash: coin.denomPubHash,
-        denomSig: coin.denomSig,
-        ageCommitmentProof: coin.ageCommitmentProof,
-        contribution: csel.contributions[i],
-      });
-    }
-  });
+    },
+  );
   return infos;
 }
 
 export async function getTotalPeerPaymentCost(
   wex: WalletExecutionContext,
-  pcs: SelectedCoin[],
+  pcs: SelectedProspectiveCoin[],
 ): Promise<AmountJson> {
-  const currency = Amounts.currencyOf(pcs[0].contribution);
-  return wex.db.runReadOnlyTx(["coins", "denominations"], async (tx) => {
-    const costs: AmountJson[] = [];
-    for (let i = 0; i < pcs.length; i++) {
-      const coin = await tx.coins.get(pcs[i].coinPub);
-      if (!coin) {
-        throw Error("can't calculate payment cost, coin not found");
-      }
-      const denomInfo = await getDenomInfo(
-        wex,
-        tx,
-        coin.exchangeBaseUrl,
-        coin.denomPubHash,
-      );
-      if (!denomInfo) {
-        throw Error(
-          "can't calculate payment cost, denomination for coin not found",
+  return wex.db.runReadOnlyTx(
+    { storeNames: ["coins", "denominations"] },
+    async (tx) => {
+      const costs: AmountJson[] = [];
+      for (let i = 0; i < pcs.length; i++) {
+        const denomInfo = await getDenomInfo(
+          wex,
+          tx,
+          pcs[i].exchangeBaseUrl,
+          pcs[i].denomPubHash,
+        );
+        if (!denomInfo) {
+          throw Error(
+            "can't calculate payment cost, denomination for coin not found",
+          );
+        }
+        const amountLeft = Amounts.sub(
+          denomInfo.value,
+          pcs[i].contribution,
+        ).amount;
+        const refreshCost = await getTotalRefreshCost(
+          wex,
+          tx,
+          denomInfo,
+          amountLeft,
         );
+        costs.push(Amounts.parseOrThrow(pcs[i].contribution));
+        costs.push(refreshCost);
       }
-      const allDenoms = await getCandidateWithdrawalDenomsTx(
-        wex,
-        tx,
-        coin.exchangeBaseUrl,
-        currency,
-      );
-      const amountLeft = Amounts.sub(
-        denomInfo.value,
-        pcs[i].contribution,
-      ).amount;
-      const refreshCost = getTotalRefreshCost(
-        allDenoms,
-        denomInfo,
-        amountLeft,
-        wex.ws.config.testing.denomselAllowLate,
-      );
-      costs.push(Amounts.parseOrThrow(pcs[i].contribution));
-      costs.push(refreshCost);
-    }
-    const zero = Amounts.zeroOfAmount(pcs[0].contribution);
-    return Amounts.sum([zero, ...costs]).amount;
-  });
+      const zero = Amounts.zeroOfAmount(pcs[0].contribution);
+      return Amounts.sum([zero, ...costs]).amount;
+    },
+  );
 }
 
 interface ExchangePurseStatus {
@@ -143,13 +137,13 @@ export async function getMergeReserveInfo(
   const newReservePair = await wex.cryptoApi.createEddsaKeypair({});
 
   const mergeReserveRecord: ReserveRecord = await wex.db.runReadWriteTx(
-    ["exchanges", "reserves"],
+    { storeNames: ["exchanges", "reserves"] },
     async (tx) => {
       const ex = await tx.exchanges.get(req.exchangeBaseUrl);
-      checkDbInvariant(!!ex);
+      checkDbInvariant(!!ex, `no exchange record for ${req.exchangeBaseUrl}`);
       if (ex.currentMergeReserveRowId != null) {
         const reserve = await tx.reserves.get(ex.currentMergeReserveRowId);
-        checkDbInvariant(!!reserve);
+        checkDbInvariant(!!reserve, `reserver ${ex.currentMergeReserveRowId} missing in db`);
         return reserve;
       }
       const reserve: ReserveRecord = {
@@ -157,7 +151,7 @@ export async function getMergeReserveInfo(
         reservePub: newReservePair.pub,
       };
       const insertResp = await tx.reserves.put(reserve);
-      checkDbInvariant(typeof insertResp.key === "number");
+      checkDbInvariant(typeof insertResp.key === "number", `reserve key is not a number`);
       reserve.rowId = insertResp.key;
       ex.currentMergeReserveRowId = reserve.rowId;
       await tx.exchanges.put(ex);