From f1cba79c656875af0c6a09fd8e03b2c94fb2ac44 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 14 Oct 2022 21:00:13 +0200 Subject: wallet-core: DB tweaks --- packages/taler-wallet-core/src/operations/backup/export.ts | 2 +- packages/taler-wallet-core/src/operations/backup/import.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'packages/taler-wallet-core/src/operations/backup') diff --git a/packages/taler-wallet-core/src/operations/backup/export.ts b/packages/taler-wallet-core/src/operations/backup/export.ts index c7890b5d8..3ba0d85e6 100644 --- a/packages/taler-wallet-core/src/operations/backup/export.ts +++ b/packages/taler-wallet-core/src/operations/backup/export.ts @@ -336,7 +336,7 @@ export async function exportBackup( })), master_public_key: ex.masterPublicKey, currency: ex.currency, - protocol_version: ex.protocolVersion, + protocol_version: ex.protocolVersionRange, wire_fees: wireFees, signing_keys: ex.signingKeys.map((x) => ({ key: x.key, diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts index f4e6ab5eb..59fd3c398 100644 --- a/packages/taler-wallet-core/src/operations/backup/import.ts +++ b/packages/taler-wallet-core/src/operations/backup/import.ts @@ -57,6 +57,7 @@ import { WgInfo, WithdrawalGroupStatus, WithdrawalRecordType, + RefreshOperationStatus, } from "../../db.js"; import { InternalWalletState } from "../../internal-wallet-state.js"; import { assertUnreachable } from "../../util/assertUnreachable.js"; @@ -403,7 +404,7 @@ export async function importBackup( denomination_keys: x.denomination_keys, })), masterPublicKey: backupExchangeDetails.master_public_key, - protocolVersion: backupExchangeDetails.protocol_version, + protocolVersionRange: backupExchangeDetails.protocol_version, reserveClosingDelay: backupExchangeDetails.reserve_closing_delay, globalFees: backupExchangeDetails.global_fees.map((x) => ({ accountFee: Amounts.parseOrThrow(x.accountFee), @@ -773,8 +774,8 @@ export async function importBackup( : RefreshCoinStatus.Pending, ), operationStatus: backupRefreshGroup.timestamp_finish - ? OperationStatus.Finished - : OperationStatus.Pending, + ? RefreshOperationStatus.Finished + : RefreshOperationStatus.Pending, inputPerCoin: backupRefreshGroup.old_coins.map((x) => Amounts.parseOrThrow(x.input_amount), ), -- cgit v1.2.3