Merge branch 'master' into age-withdraw

1 files changed, 24 insertions, 13 deletions

diff --git a/packages/taler-wallet-core/src/operations/pay-merchant.ts b/packages/taler-wallet-core/src/operations/pay-merchant.ts
index fe0cbeda0..157541ed3 100644
--- a/packages/taler-wallet-core/src/operations/pay-merchant.ts
+++ b/packages/taler-wallet-core/src/operations/pay-merchant.ts
@@ -103,6 +103,9 @@ import {
   RefundGroupStatus,
   RefundItemRecord,
   RefundItemStatus,
+  timestampPreciseToDb,
+  timestampProtocolFromDb,
+  timestampProtocolToDb,
 } from "../index.js";
 import {
   EXCHANGE_COINS_LOCK,
@@ -114,7 +117,7 @@ import { checkDbInvariant } from "../util/invariants.js";
 import { GetReadOnlyAccess } from "../util/query.js";
 import {
   constructTaskIdentifier,
-  RetryInfo,
+  DbRetryInfo,
   runLongpollAsync,
   runTaskWithErrorReporting,
   spendCoins,
@@ -216,11 +219,13 @@ async function failProposalPermanently(
   notifyTransition(ws, transactionId, transitionInfo);
 }
 
-function getProposalRequestTimeout(retryInfo?: RetryInfo): Duration {
+function getProposalRequestTimeout(retryInfo?: DbRetryInfo): Duration {
   return Duration.clamp({
     lower: Duration.fromSpec({ seconds: 1 }),
     upper: Duration.fromSpec({ seconds: 60 }),
-    value: retryInfo ? RetryInfo.getDuration(retryInfo) : Duration.fromSpec({}),
+    value: retryInfo
+      ? DbRetryInfo.getDuration(retryInfo)
+      : Duration.fromSpec({}),
   });
 }
 
@@ -644,7 +649,7 @@ async function createPurchase(
     noncePriv: priv,
     noncePub: pub,
     claimToken,
-    timestamp: TalerPreciseTimestamp.now(),
+    timestamp: timestampPreciseToDb(TalerPreciseTimestamp.now()),
     merchantBaseUrl,
     orderId,
     proposalId: proposalId,
@@ -717,7 +722,7 @@ async function storeFirstPaySuccess(
       if (purchase.purchaseStatus === PurchaseStatus.PendingPaying) {
         purchase.purchaseStatus = PurchaseStatus.Done;
       }
-      purchase.timestampFirstSuccessfulPay = now;
+      purchase.timestampFirstSuccessfulPay = timestampPreciseToDb(now);
       purchase.lastSessionId = sessionId;
       purchase.merchantPaySig = payResponse.sig;
       purchase.posConfirmation = payResponse.pos_confirmation;
@@ -737,8 +742,10 @@ async function storeFirstPaySuccess(
         const ar = Duration.fromTalerProtocolDuration(protoAr);
         logger.info("auto_refund present");
         purchase.purchaseStatus = PurchaseStatus.PendingQueryingAutoRefund;
-        purchase.autoRefundDeadline = AbsoluteTime.toProtocolTimestamp(
-          AbsoluteTime.addDuration(AbsoluteTime.now(), ar),
+        purchase.autoRefundDeadline = timestampProtocolToDb(
+          AbsoluteTime.toProtocolTimestamp(
+            AbsoluteTime.addDuration(AbsoluteTime.now(), ar),
+          ),
         );
       }
       await tx.purchases.put(purchase);
@@ -941,7 +948,9 @@ async function unblockBackup(
         .forEachAsync(async (bp) => {
           bp.state = {
             tag: BackupProviderStateTag.Ready,
-            nextBackupTimestamp: TalerPreciseTimestamp.now(),
+            nextBackupTimestamp: timestampPreciseToDb(
+              TalerPreciseTimestamp.now(),
+            ),
           };
           tx.backupProviders.put(bp);
         });
@@ -1447,7 +1456,7 @@ export async function confirmPay(
             totalPayCost: Amounts.stringify(payCostInfo),
           };
           p.lastSessionId = sessionId;
-          p.timestampAccept = TalerPreciseTimestamp.now();
+          p.timestampAccept = timestampPreciseToDb(TalerPreciseTimestamp.now());
           p.purchaseStatus = PurchaseStatus.PendingPaying;
           await tx.purchases.put(p);
           await spendCoins(ws, tx, {
@@ -2340,7 +2349,9 @@ async function processPurchaseAutoRefund(
     if (
       !purchase.autoRefundDeadline ||
       AbsoluteTime.isExpired(
-        AbsoluteTime.fromProtocolTimestamp(purchase.autoRefundDeadline),
+        AbsoluteTime.fromProtocolTimestamp(
+          timestampProtocolFromDb(purchase.autoRefundDeadline),
+        ),
       )
     ) {
       const transitionInfo = await ws.db
@@ -2791,7 +2802,7 @@ async function storeRefunds(
               proposalId: purchase.proposalId,
               refundGroupId: newRefundGroupId,
               status: RefundGroupStatus.Pending,
-              timestampCreated: now,
+              timestampCreated: timestampPreciseToDb(now),
               amountEffective: Amounts.stringify(
                 Amounts.zeroOfCurrency(currency),
               ),
@@ -2801,8 +2812,8 @@ async function storeRefunds(
           const status: RefundItemStatus = getItemStatus(rf);
           const newItem: RefundItemRecord = {
             coinPub: rf.coin_pub,
-            executionTime: rf.execution_time,
-            obtainedTime: now,
+            executionTime: timestampProtocolToDb(rf.execution_time),
+            obtainedTime: timestampPreciseToDb(now),
             refundAmount: rf.refund_amount,
             refundGroupId: newGroup.refundGroupId,
             rtxid: rf.rtransaction_id,