Merge branch 'master' into age-withdraw

1 files changed, 21 insertions, 25 deletions

diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts
index bae348dc1..eff427bec 100644
--- a/packages/taler-wallet-core/src/operations/withdraw.ts
+++ b/packages/taler-wallet-core/src/operations/withdraw.ts
@@ -135,6 +135,7 @@ import {
   ExchangeEntryDbUpdateStatus,
   PendingTaskType,
   isWithdrawableDenom,
+  timestampPreciseToDb,
 } from "../index.js";
 import {
   TransitionInfo,
@@ -573,7 +574,7 @@ export async function getBankWithdrawalInfo(
     throw TalerError.fromDetail(
       TalerErrorCode.WALLET_BANK_INTEGRATION_PROTOCOL_VERSION_INCOMPATIBLE,
       {
-        exchangeProtocolVersion: config.version,
+        bankProtocolVersion: config.version,
         walletProtocolVersion: WALLET_BANK_INTEGRATION_PROTOCOL_VERSION,
       },
       "bank integration protocol version not compatible with wallet",
@@ -816,10 +817,10 @@ async function handleKycRequired(
             amlStatus === AmlStatus.normal || amlStatus === undefined
               ? WithdrawalGroupStatus.PendingKyc
               : amlStatus === AmlStatus.pending
-              ? WithdrawalGroupStatus.PendingAml
-              : amlStatus === AmlStatus.fronzen
-              ? WithdrawalGroupStatus.SuspendedAml
-              : assertUnreachable(amlStatus);
+                ? WithdrawalGroupStatus.PendingAml
+                : amlStatus === AmlStatus.fronzen
+                  ? WithdrawalGroupStatus.SuspendedAml
+                  : assertUnreachable(amlStatus);
 
           await tx.withdrawalGroups.put(wg2);
           const newTxState = computeWithdrawalTransactionStatus(wg2);
@@ -1149,8 +1150,7 @@ export async function updateWithdrawalDenoms(
         denom.verificationStatus === DenominationVerificationStatus.Unverified
       ) {
         logger.trace(
-          `Validating denomination (${current + 1}/${
-            denominations.length
+          `Validating denomination (${current + 1}/${denominations.length
           }) signature of ${denom.denomPubHash}`,
         );
         let valid = false;
@@ -1244,7 +1244,7 @@ async function queryReserve(
     if (
       resp.status === 404 &&
       result.talerErrorResponse.code ===
-        TalerErrorCode.EXCHANGE_RESERVES_STATUS_UNKNOWN
+      TalerErrorCode.EXCHANGE_RESERVES_STATUS_UNKNOWN
     ) {
       return { ready: false };
     } else {
@@ -1330,7 +1330,7 @@ async function processWithdrawalGroupAbortingBank(
       }
       const txStatusOld = computeWithdrawalTransactionStatus(wg);
       wg.status = WithdrawalGroupStatus.AbortedBank;
-      wg.timestampFinish = TalerPreciseTimestamp.now();
+      wg.timestampFinish = timestampPreciseToDb(TalerPreciseTimestamp.now());
       const txStatusNew = computeWithdrawalTransactionStatus(wg);
       await tx.withdrawalGroups.put(wg);
       return {
@@ -1463,7 +1463,7 @@ async function processWithdrawalGroupPendingReady(
         }
         const txStatusOld = computeWithdrawalTransactionStatus(wg);
         wg.status = WithdrawalGroupStatus.Done;
-        wg.timestampFinish = TalerPreciseTimestamp.now();
+        wg.timestampFinish = timestampPreciseToDb(TalerPreciseTimestamp.now());
         const txStatusNew = computeWithdrawalTransactionStatus(wg);
         await tx.withdrawalGroups.put(wg);
         return {
@@ -1559,7 +1559,7 @@ async function processWithdrawalGroupPendingReady(
       const oldTxState = computeWithdrawalTransactionStatus(wg);
       logger.info(`now withdrawn ${numFinished} of ${numTotalCoins} coins`);
       if (wg.timestampFinish === undefined && numFinished === numTotalCoins) {
-        wg.timestampFinish = TalerPreciseTimestamp.now();
+        wg.timestampFinish = timestampPreciseToDb(TalerPreciseTimestamp.now());
         wg.status = WithdrawalGroupStatus.Done;
         await makeCoinsVisible(ws, tx, transactionId);
       }
@@ -1779,7 +1779,7 @@ export async function getExchangeWithdrawalInfo(
     ) {
       logger.warn(
         `wallet's support for exchange protocol version ${WALLET_EXCHANGE_PROTOCOL_VERSION} might be outdated ` +
-          `(exchange has ${exchangeDetails.protocolVersionRange}), checking for updates`,
+        `(exchange has ${exchangeDetails.protocolVersionRange}), checking for updates`,
       );
     }
   }
@@ -2052,8 +2052,9 @@ async function registerReserveWithBank(
       if (r.wgInfo.withdrawalType !== WithdrawalRecordType.BankIntegrated) {
         throw Error("invariant failed");
       }
-      r.wgInfo.bankInfo.timestampReserveInfoPosted =
-        AbsoluteTime.toPreciseTimestamp(AbsoluteTime.now());
+      r.wgInfo.bankInfo.timestampReserveInfoPosted = timestampPreciseToDb(
+        AbsoluteTime.toPreciseTimestamp(AbsoluteTime.now()),
+      );
       const oldTxState = computeWithdrawalTransactionStatus(r);
       r.status = WithdrawalGroupStatus.PendingWaitConfirmBank;
       const newTxState = computeWithdrawalTransactionStatus(r);
@@ -2135,7 +2136,7 @@ async function processReserveBankStatus(
         }
         const now = AbsoluteTime.toPreciseTimestamp(AbsoluteTime.now());
         const oldTxState = computeWithdrawalTransactionStatus(r);
-        r.wgInfo.bankInfo.timestampBankConfirmed = now;
+        r.wgInfo.bankInfo.timestampBankConfirmed = timestampPreciseToDb(now);
         r.status = WithdrawalGroupStatus.FailedBankAborted;
         const newTxState = computeWithdrawalTransactionStatus(r);
         await tx.withdrawalGroups.put(r);
@@ -2184,7 +2185,7 @@ async function processReserveBankStatus(
       if (status.transfer_done) {
         logger.info("withdrawal: transfer confirmed by bank.");
         const now = AbsoluteTime.toPreciseTimestamp(AbsoluteTime.now());
-        r.wgInfo.bankInfo.timestampBankConfirmed = now;
+        r.wgInfo.bankInfo.timestampBankConfirmed = timestampPreciseToDb(now);
         r.status = WithdrawalGroupStatus.PendingQueryingStatus;
       } else {
         logger.info("withdrawal: transfer not yet confirmed by bank");
@@ -2290,7 +2291,7 @@ export async function internalPrepareCreateWithdrawalGroup(
     denomsSel: initialDenomSel,
     exchangeBaseUrl: canonExchange,
     instructedAmount: Amounts.stringify(amount),
-    timestampStart: now,
+    timestampStart: timestampPreciseToDb(now),
     rawWithdrawalAmount: initialDenomSel.totalWithdrawCost,
     effectiveWithdrawalAmount: initialDenomSel.totalCoinValue,
     secretSeed,
@@ -2344,8 +2345,7 @@ export async function internalPerformCreateWithdrawalGroup(
   if (!prep.creationInfo) {
     return { withdrawalGroup, transitionInfo: undefined };
   }
-  const { amount, canonExchange, exchangeDetails } =
-    prep.creationInfo;
+  const { amount, canonExchange, exchangeDetails } = prep.creationInfo;
 
   await tx.withdrawalGroups.add(withdrawalGroup);
   await tx.reserves.put({
@@ -2355,7 +2355,7 @@ export async function internalPerformCreateWithdrawalGroup(
 
   const exchange = await tx.exchanges.get(withdrawalGroup.exchangeBaseUrl);
   if (exchange) {
-    exchange.lastWithdrawal = TalerPreciseTimestamp.now();
+    exchange.lastWithdrawal = timestampPreciseToDb(TalerPreciseTimestamp.now());
     exchange.entryStatus = ExchangeEntryDbRecordStatus.Used;
     await tx.exchanges.put(exchange);
   }
@@ -2546,11 +2546,7 @@ export async function createManualWithdrawal(
   });
 
   const exchangePaytoUris = await ws.db
-    .mktx((x) => [
-      x.withdrawalGroups,
-      x.exchanges,
-      x.exchangeDetails,
-    ])
+    .mktx((x) => [x.withdrawalGroups, x.exchanges, x.exchangeDetails])
     .runReadOnly(async (tx) => {
       return await getFundingPaytoUris(tx, withdrawalGroup.withdrawalGroupId);
     });