Merge branch 'master' into age-withdraw

1 files changed, 23 insertions, 8 deletions

diff --git a/packages/taler-wallet-core/src/operations/backup/index.ts b/packages/taler-wallet-core/src/operations/backup/index.ts
index a5e8dbd42..7a2771c57 100644
--- a/packages/taler-wallet-core/src/operations/backup/index.ts
+++ b/packages/taler-wallet-core/src/operations/backup/index.ts
@@ -84,6 +84,9 @@ import {
   ConfigRecord,
   ConfigRecordKey,
   WalletBackupConfState,
+  timestampOptionalPreciseFromDb,
+  timestampPreciseFromDb,
+  timestampPreciseToDb,
 } from "../../db.js";
 import { InternalWalletState } from "../../internal-wallet-state.js";
 import { assertUnreachable } from "../../util/assertUnreachable.js";
@@ -259,10 +262,12 @@ async function runBackupCycleForProvider(
         if (!prov) {
           return;
         }
-        prov.lastBackupCycleTimestamp = TalerPreciseTimestamp.now();
+        prov.lastBackupCycleTimestamp = timestampPreciseToDb(
+          TalerPreciseTimestamp.now(),
+        );
         prov.state = {
           tag: BackupProviderStateTag.Ready,
-          nextBackupTimestamp: getNextBackupTimestamp(),
+          nextBackupTimestamp: timestampPreciseToDb(getNextBackupTimestamp()),
         };
         await tx.backupProviders.put(prov);
       });
@@ -361,10 +366,12 @@ async function runBackupCycleForProvider(
           return;
         }
         prov.lastBackupHash = encodeCrock(currentBackupHash);
-        prov.lastBackupCycleTimestamp = TalerPreciseTimestamp.now();
+        prov.lastBackupCycleTimestamp = timestampPreciseToDb(
+          TalerPreciseTimestamp.now(),
+        );
         prov.state = {
           tag: BackupProviderStateTag.Ready,
-          nextBackupTimestamp: getNextBackupTimestamp(),
+          nextBackupTimestamp: timestampPreciseToDb(getNextBackupTimestamp()),
         };
         await tx.backupProviders.put(prov);
       });
@@ -594,7 +601,9 @@ export async function addBackupProvider(
         if (req.activate) {
           oldProv.state = {
             tag: BackupProviderStateTag.Ready,
-            nextBackupTimestamp: TalerPreciseTimestamp.now(),
+            nextBackupTimestamp: timestampPreciseToDb(
+              TalerPreciseTimestamp.now(),
+            ),
           };
           logger.info("setting existing backup provider to active");
           await tx.backupProviders.put(oldProv);
@@ -616,7 +625,9 @@ export async function addBackupProvider(
       if (req.activate) {
         state = {
           tag: BackupProviderStateTag.Ready,
-          nextBackupTimestamp: TalerPreciseTimestamp.now(),
+          nextBackupTimestamp: timestampPreciseToDb(
+            TalerPreciseTimestamp.now(),
+          ),
         };
       } else {
         state = {
@@ -840,7 +851,9 @@ export async function getBackupInfo(
     providers.push({
       active: x.provider.state.tag !== BackupProviderStateTag.Provisional,
       syncProviderBaseUrl: x.provider.baseUrl,
-      lastSuccessfulBackupTimestamp: x.provider.lastBackupCycleTimestamp,
+      lastSuccessfulBackupTimestamp: timestampOptionalPreciseFromDb(
+        x.provider.lastBackupCycleTimestamp,
+      ),
       paymentProposalIds: x.provider.paymentProposalIds,
       lastError:
         x.provider.state.tag === BackupProviderStateTag.Retrying
@@ -917,7 +930,9 @@ async function backupRecoveryTheirs(
             shouldRetryFreshProposal: false,
             state: {
               tag: BackupProviderStateTag.Ready,
-              nextBackupTimestamp: TalerPreciseTimestamp.now(),
+              nextBackupTimestamp: timestampPreciseToDb(
+                TalerPreciseTimestamp.now(),
+              ),
             },
             uids: [encodeCrock(getRandomBytes(32))],
           });