From 6e11b69cf5beb25fec1dfdff281877a76bf195a4 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Mon, 14 Jun 2021 11:21:29 +0200
Subject: allow changing the wallet device ID

---
 .../taler-wallet-core/src/operations/backup/index.ts     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'packages/taler-wallet-core/src/operations/backup/index.ts')

diff --git a/packages/taler-wallet-core/src/operations/backup/index.ts b/packages/taler-wallet-core/src/operations/backup/index.ts
index bb067dfb5..86f1df541 100644
--- a/packages/taler-wallet-core/src/operations/backup/index.ts
+++ b/packages/taler-wallet-core/src/operations/backup/index.ts
@@ -35,6 +35,8 @@ import {
   BackupProviderRecord,
   BackupProviderTerms,
   ConfigRecord,
+  WalletBackupConfState,
+  WALLET_BACKUP_STATE_KEY,
 } from "../../db.js";
 import { checkDbInvariant, checkLogicInvariant } from "../../util/invariants";
 import {
@@ -85,12 +87,7 @@ import { secretbox, secretbox_open } from "../../crypto/primitives/nacl-fast";
 import { checkPaymentByProposalId, confirmPay, preparePayForUri } from "../pay";
 import { exportBackup } from "./export";
 import { BackupCryptoPrecomputedData, importBackup } from "./import";
-import {
-  provideBackupState,
-  WALLET_BACKUP_STATE_KEY,
-  getWalletBackupState,
-  WalletBackupConfState,
-} from "./state";
+import { provideBackupState, getWalletBackupState } from "./state";
 
 const logger = new Logger("operations/backup.ts");
 
@@ -720,10 +717,11 @@ async function backupRecoveryTheirs(
   await ws.db
     .mktx((x) => ({ config: x.config, backupProviders: x.backupProviders }))
     .runReadWrite(async (tx) => {
-      let backupStateEntry:
-        | ConfigRecord<WalletBackupConfState>
-        | undefined = await tx.config.get(WALLET_BACKUP_STATE_KEY);
+      let backupStateEntry: ConfigRecord | undefined = await tx.config.get(
+        WALLET_BACKUP_STATE_KEY,
+      );
       checkDbInvariant(!!backupStateEntry);
+      checkDbInvariant(backupStateEntry.key === WALLET_BACKUP_STATE_KEY);
       backupStateEntry.value.lastBackupNonce = undefined;
       backupStateEntry.value.lastBackupTimestamp = undefined;
       backupStateEntry.value.lastBackupCheckTimestamp = undefined;
-- 
cgit v1.2.3