wallet-core: put exchange in update-unavailable if master pub / currency change unexpectedly

1 files changed, 24 insertions, 19 deletions

diff --git a/packages/taler-wallet-core/src/common.ts b/packages/taler-wallet-core/src/common.ts
index 5b7ceeead..6d116c47e 100644
--- a/packages/taler-wallet-core/src/common.ts
+++ b/packages/taler-wallet-core/src/common.ts
@@ -42,10 +42,8 @@ import {
 } from "@gnu-taler/taler-util";
 import {
   BackupProviderRecord,
-  CoinAvailabilityRecord,
   CoinRecord,
   DbPreciseTimestamp,
-  DenominationRecord,
   DepositGroupRecord,
   ExchangeEntryDbRecordStatus,
   ExchangeEntryDbUpdateStatus,
@@ -283,6 +281,8 @@ export function getExchangeUpdateStatusFromRecord(
       return ExchangeUpdateStatus.ReadyUpdate;
     case ExchangeEntryDbUpdateStatus.Suspended:
       return ExchangeUpdateStatus.Suspended;
+    default:
+      assertUnreachable(r.updateStatus);
   }
 }
 
@@ -296,6 +296,8 @@ export function getExchangeEntryStatusFromRecord(
       return ExchangeEntryStatus.Preset;
     case ExchangeEntryDbRecordStatus.Used:
       return ExchangeEntryStatus.Used;
+    default:
+      assertUnreachable(r.entryStatus);
   }
 }
 
@@ -488,25 +490,28 @@ function updateTimeout(
   r.nextRetry = timestampPreciseToDb(TalerPreciseTimestamp.fromMilliseconds(t));
 }
 
-export namespace DbRetryInfo {
-  export function getDuration(
-    r: DbRetryInfo | undefined,
-    p: RetryPolicy = defaultRetryPolicy,
-  ): Duration {
-    if (!r) {
-      // If we don't have any retry info, run immediately.
-      return { d_ms: 0 };
-    }
-    if (p.backoffDelta.d_ms === "forever") {
-      return { d_ms: "forever" };
-    }
-    const t = p.backoffDelta.d_ms * Math.pow(p.backoffBase, r.retryCounter);
-    return {
-      d_ms:
-        p.maxTimeout.d_ms === "forever" ? t : Math.min(p.maxTimeout.d_ms, t),
-    };
+export function computeDbBackoff(retryCounter: number): DbPreciseTimestamp {
+  const now = AbsoluteTime.now();
+  if (now.t_ms === "never") {
+    throw Error("assertion failed");
+  }
+  const p = defaultRetryPolicy;
+  if (p.backoffDelta.d_ms === "forever") {
+    throw Error("assertion failed");
   }
 
+  const nextIncrement =
+    p.backoffDelta.d_ms * Math.pow(p.backoffBase, retryCounter);
+
+  const t =
+    now.t_ms +
+    (p.maxTimeout.d_ms === "forever"
+      ? nextIncrement
+      : Math.min(p.maxTimeout.d_ms, nextIncrement));
+  return timestampPreciseToDb(TalerPreciseTimestamp.fromMilliseconds(t));
+}
+
+export namespace DbRetryInfo {
   export function reset(p: RetryPolicy = defaultRetryPolicy): DbRetryInfo {
     const now = TalerPreciseTimestamp.now();
     const info: DbRetryInfo = {