From 610df1c9cf8ec91815130ac2a426f8f5b7d1ed0c Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Oct 2022 15:58:10 -0300 Subject: create a fee description timeline for global fee and wire fees --- .../taler-wallet-core/src/operations/backup/export.ts | 14 +++++++++++++- .../taler-wallet-core/src/operations/backup/import.ts | 15 ++++++++++++++- 2 files changed, 27 insertions(+), 2 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 f611a2380..a3c4c8d99 100644 --- a/packages/taler-wallet-core/src/operations/backup/export.ts +++ b/packages/taler-wallet-core/src/operations/backup/export.ts @@ -345,7 +345,19 @@ export async function exportBackup( stamp_expire: x.stamp_expire, stamp_start: x.stamp_start, })), - global_fees: ex.globalFees, + global_fees: ex.globalFees.map((x) => ({ + accountFee: Amounts.stringify(x.accountFee), + historyFee: Amounts.stringify(x.historyFee), + kycFee: Amounts.stringify(x.kycFee), + purseFee: Amounts.stringify(x.purseFee), + kycTimeout: x.kycTimeout, + endDate: x.endDate, + historyTimeout: x.historyTimeout, + signature: x.signature, + purseLimit: x.purseLimit, + purseTimeout: x.purseTimeout, + startDate: x.startDate, + })), tos_accepted_etag: ex.termsOfServiceAcceptedEtag, tos_accepted_timestamp: ex.termsOfServiceAcceptedTimestamp, denominations: diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts index ee8cb6f6c..e631845f6 100644 --- a/packages/taler-wallet-core/src/operations/backup/import.ts +++ b/packages/taler-wallet-core/src/operations/backup/import.ts @@ -405,7 +405,20 @@ export async function importBackup( masterPublicKey: backupExchangeDetails.master_public_key, protocolVersion: backupExchangeDetails.protocol_version, reserveClosingDelay: backupExchangeDetails.reserve_closing_delay, - globalFees: backupExchangeDetails.global_fees, + globalFees: backupExchangeDetails.global_fees.map((x) => ({ + accountFee: Amounts.parseOrThrow(x.accountFee), + historyFee: Amounts.parseOrThrow(x.historyFee), + kycFee: Amounts.parseOrThrow(x.kycFee), + purseFee: Amounts.parseOrThrow(x.purseFee), + kycTimeout: x.kycTimeout, + endDate: x.endDate, + historyTimeout: x.historyTimeout, + signature: x.signature, + purseLimit: x.purseLimit, + purseTimeout: x.purseTimeout, + startDate: x.startDate, + })), + signingKeys: backupExchangeDetails.signing_keys.map((x) => ({ key: x.key, master_sig: x.master_sig, -- cgit v1.2.3