Merge branch 'master' into age-withdraw

1 files changed, 46 insertions, 21 deletions

diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts
index 43a08ed3b..82d7b42bf 100644
--- a/packages/taler-wallet-core/src/operations/exchanges.ts
+++ b/packages/taler-wallet-core/src/operations/exchanges.ts
@@ -74,6 +74,9 @@ import {
   ExchangeEntryDbRecordStatus,
   ExchangeEntryDbUpdateStatus,
   isWithdrawableDenom,
+  timestampPreciseFromDb,
+  timestampPreciseToDb,
+  timestampProtocolToDb,
   WalletDbReadWriteTransaction,
 } from "../index.js";
 import { InternalWalletState, TrustInfo } from "../internal-wallet-state.js";
@@ -174,7 +177,7 @@ export async function acceptExchangeTermsOfService(
       if (d) {
         d.tosAccepted = {
           etag: etag || d.tosCurrentEtag,
-          timestamp: TalerPreciseTimestamp.now(),
+          timestamp: timestampPreciseToDb(TalerPreciseTimestamp.now()),
         };
         await tx.exchangeDetails.put(d);
       }
@@ -306,6 +309,7 @@ export async function downloadExchangeInfo(
 export async function addPresetExchangeEntry(
   tx: WalletDbReadWriteTransaction<"exchanges">,
   exchangeBaseUrl: string,
+  currencyHint?: string,
 ): Promise<void> {
   let exchange = await tx.exchanges.get(exchangeBaseUrl);
   if (!exchange) {
@@ -313,17 +317,22 @@ export async function addPresetExchangeEntry(
       entryStatus: ExchangeEntryDbRecordStatus.Preset,
       updateStatus: ExchangeEntryDbUpdateStatus.Initial,
       baseUrl: exchangeBaseUrl,
+      presetCurrencyHint: currencyHint,
       detailsPointer: undefined,
       lastUpdate: undefined,
       lastKeysEtag: undefined,
-      nextRefreshCheckStampMs: AbsoluteTime.getStampMsNever(),
-      nextUpdateStampMs: AbsoluteTime.getStampMsNever(),
+      nextRefreshCheckStamp: timestampPreciseToDb(
+        AbsoluteTime.toPreciseTimestamp(AbsoluteTime.never()),
+      ),
+      nextUpdateStamp: timestampPreciseToDb(
+        AbsoluteTime.toPreciseTimestamp(AbsoluteTime.never()),
+      ),
     };
     await tx.exchanges.put(r);
   }
 }
 
-export async function provideExchangeRecordInTx(
+async function provideExchangeRecordInTx(
   ws: InternalWalletState,
   tx: GetReadWriteAccess<{
     exchanges: typeof WalletStoresV1.exchanges;
@@ -343,8 +352,12 @@ export async function provideExchangeRecordInTx(
       baseUrl: baseUrl,
       detailsPointer: undefined,
       lastUpdate: undefined,
-      nextUpdateStampMs: AbsoluteTime.getStampMsNever(),
-      nextRefreshCheckStampMs: AbsoluteTime.getStampMsNever(),
+      nextUpdateStamp: timestampPreciseToDb(
+        AbsoluteTime.toPreciseTimestamp(AbsoluteTime.never()),
+      ),
+      nextRefreshCheckStamp: timestampPreciseToDb(
+        AbsoluteTime.toPreciseTimestamp(AbsoluteTime.never()),
+      ),
       lastKeysEtag: undefined,
     };
     await tx.exchanges.put(r);
@@ -445,13 +458,19 @@ async function downloadExchangeKeysInfo(
             isRevoked: false,
             value: Amounts.stringify(value),
             currency: value.currency,
-            stampExpireDeposit: denomIn.stamp_expire_deposit,
-            stampExpireLegal: denomIn.stamp_expire_legal,
-            stampExpireWithdraw: denomIn.stamp_expire_withdraw,
-            stampStart: denomIn.stamp_start,
+            stampExpireDeposit: timestampProtocolToDb(
+              denomIn.stamp_expire_deposit,
+            ),
+            stampExpireLegal: timestampProtocolToDb(denomIn.stamp_expire_legal),
+            stampExpireWithdraw: timestampProtocolToDb(
+              denomIn.stamp_expire_withdraw,
+            ),
+            stampStart: timestampProtocolToDb(denomIn.stamp_start),
             verificationStatus: DenominationVerificationStatus.Unverified,
             masterSig: denomIn.master_sig,
-            listIssueDate: exchangeKeysJsonUnchecked.list_issue_date,
+            listIssueDate: timestampProtocolToDb(
+              exchangeKeysJsonUnchecked.list_issue_date,
+            ),
             fees: {
               feeDeposit: Amounts.stringify(denomGroup.fee_deposit),
               feeRefresh: Amounts.stringify(denomGroup.fee_refresh),
@@ -613,7 +632,9 @@ export async function updateExchangeFromUrlHandler(
     !forceNow &&
     exchangeDetails !== undefined &&
     !AbsoluteTime.isExpired(
-      AbsoluteTime.fromStampMs(exchange.nextUpdateStampMs),
+      AbsoluteTime.fromPreciseTimestamp(
+        timestampPreciseFromDb(exchange.nextUpdateStamp),
+      ),
     )
   ) {
     logger.trace("using existing exchange info");
@@ -753,17 +774,21 @@ export async function updateExchangeFromUrlHandler(
       if (existingDetails?.rowId) {
         newDetails.rowId = existingDetails.rowId;
       }
-      r.lastUpdate = TalerPreciseTimestamp.now();
-      r.nextUpdateStampMs = AbsoluteTime.toStampMs(
-        AbsoluteTime.fromProtocolTimestamp(keysInfo.expiry),
+      r.lastUpdate = timestampPreciseToDb(TalerPreciseTimestamp.now());
+      r.nextUpdateStamp = timestampPreciseToDb(
+        AbsoluteTime.toPreciseTimestamp(
+          AbsoluteTime.fromProtocolTimestamp(keysInfo.expiry),
+        ),
       );
       // New denominations might be available.
-      r.nextRefreshCheckStampMs = AbsoluteTime.getStampMsNow();
+      r.nextRefreshCheckStamp = timestampPreciseToDb(
+        TalerPreciseTimestamp.now(),
+      );
       if (detailsPointerChanged) {
         r.detailsPointer = {
           currency: newDetails.currency,
           masterPublicKey: newDetails.masterPublicKey,
-          updateClock: TalerPreciseTimestamp.now(),
+          updateClock: timestampPreciseToDb(TalerPreciseTimestamp.now()),
         };
       }
       await tx.exchanges.put(r);
@@ -776,9 +801,9 @@ export async function updateExchangeFromUrlHandler(
           exchangeDetailsRowId: drRowId.key,
           masterSig: sk.master_sig,
           signkeyPub: sk.key,
-          stampEnd: sk.stamp_end,
-          stampExpire: sk.stamp_expire,
-          stampStart: sk.stamp_start,
+          stampEnd: timestampProtocolToDb(sk.stamp_end),
+          stampExpire: timestampProtocolToDb(sk.stamp_expire),
+          stampStart: timestampProtocolToDb(sk.stamp_start),
         });
       }
 
@@ -813,7 +838,7 @@ export async function updateExchangeFromUrlHandler(
               );
             }
           } else {
-            x.listIssueDate = keysInfo.listIssueDate;
+            x.listIssueDate = timestampProtocolToDb(keysInfo.listIssueDate);
             if (!x.isOffered) {
               x.isOffered = true;
               logger.info(