Merge branch 'master' into age-withdraw

1 files changed, 15 insertions, 10 deletions

diff --git a/packages/taler-wallet-core/src/operations/refresh.ts b/packages/taler-wallet-core/src/operations/refresh.ts
index 75adbc860..95aedbbd6 100644
--- a/packages/taler-wallet-core/src/operations/refresh.ts
+++ b/packages/taler-wallet-core/src/operations/refresh.ts
@@ -80,6 +80,8 @@ import {
   isWithdrawableDenom,
   PendingTaskType,
   RefreshSessionRecord,
+  timestampPreciseToDb,
+  timestampProtocolFromDb,
 } from "../index.js";
 import {
   EXCHANGE_COINS_LOCK,
@@ -157,10 +159,10 @@ function updateGroupStatus(rg: RefreshGroupRecord): { final: boolean } {
   );
   if (allFinal) {
     if (anyFailed) {
-      rg.timestampFinished = TalerPreciseTimestamp.now();
+      rg.timestampFinished = timestampPreciseToDb(TalerPreciseTimestamp.now());
       rg.operationStatus = RefreshOperationStatus.Failed;
     } else {
-      rg.timestampFinished = TalerPreciseTimestamp.now();
+      rg.timestampFinished = timestampPreciseToDb(TalerPreciseTimestamp.now());
       rg.operationStatus = RefreshOperationStatus.Finished;
     }
     return { final: true };
@@ -1099,12 +1101,14 @@ export async function createRefreshGroup(
     expectedOutputPerCoin: estimatedOutputPerCoin.map((x) =>
       Amounts.stringify(x),
     ),
-    timestampCreated: TalerPreciseTimestamp.now(),
+    timestampCreated: timestampPreciseToDb(TalerPreciseTimestamp.now()),
   };
 
   if (oldCoinPubs.length == 0) {
     logger.warn("created refresh group with zero coins");
-    refreshGroup.timestampFinished = TalerPreciseTimestamp.now();
+    refreshGroup.timestampFinished = timestampPreciseToDb(
+      TalerPreciseTimestamp.now(),
+    );
     refreshGroup.operationStatus = RefreshOperationStatus.Finished;
   }
 
@@ -1122,10 +1126,10 @@ export async function createRefreshGroup(
  */
 function getAutoRefreshCheckThreshold(d: DenominationRecord): AbsoluteTime {
   const expireWithdraw = AbsoluteTime.fromProtocolTimestamp(
-    d.stampExpireWithdraw,
+    timestampProtocolFromDb(d.stampExpireWithdraw),
   );
   const expireDeposit = AbsoluteTime.fromProtocolTimestamp(
-    d.stampExpireDeposit,
+    timestampProtocolFromDb(d.stampExpireDeposit),
   );
   const delta = AbsoluteTime.difference(expireWithdraw, expireDeposit);
   const deltaDiv = durationMul(delta, 0.75);
@@ -1137,10 +1141,10 @@ function getAutoRefreshCheckThreshold(d: DenominationRecord): AbsoluteTime {
  */
 function getAutoRefreshExecuteThreshold(d: DenominationRecord): AbsoluteTime {
   const expireWithdraw = AbsoluteTime.fromProtocolTimestamp(
-    d.stampExpireWithdraw,
+    timestampProtocolFromDb(d.stampExpireWithdraw),
   );
   const expireDeposit = AbsoluteTime.fromProtocolTimestamp(
-    d.stampExpireDeposit,
+    timestampProtocolFromDb(d.stampExpireDeposit),
   );
   const delta = AbsoluteTime.difference(expireWithdraw, expireDeposit);
   const deltaDiv = durationMul(delta, 0.5);
@@ -1224,8 +1228,9 @@ export async function autoRefresh(
       logger.trace(
         `next refresh check at ${AbsoluteTime.toIsoString(minCheckThreshold)}`,
       );
-      exchange.nextRefreshCheckStampMs =
-        AbsoluteTime.toStampMs(minCheckThreshold);
+      exchange.nextRefreshCheckStamp = timestampPreciseToDb(
+        AbsoluteTime.toPreciseTimestamp(minCheckThreshold),
+      );
       await tx.exchanges.put(exchange);
     });
   return TaskRunResult.finished();