diff options
Diffstat (limited to 'packages/taler-wallet-core/src/operations/backup/import.ts')
-rw-r--r-- | packages/taler-wallet-core/src/operations/backup/import.ts | 95 |
1 files changed, 46 insertions, 49 deletions
diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts index 296517162..5375a58bb 100644 --- a/packages/taler-wallet-core/src/operations/backup/import.ts +++ b/packages/taler-wallet-core/src/operations/backup/import.ts @@ -49,9 +49,7 @@ import { PurchasePayInfo, RefreshCoinStatus, RefreshSessionRecord, - RefundState, WalletContractData, - WalletRefundItem, WalletStoresV1, WgInfo, WithdrawalGroupStatus, @@ -65,7 +63,6 @@ import { GetReadOnlyAccess, GetReadWriteAccess } from "../../util/query.js"; import { makeCoinAvailable, makeTombstoneId, - makeTransactionId, TombstoneTag, } from "../common.js"; import { getExchangeDetails } from "../exchanges.js"; @@ -576,16 +573,16 @@ export async function importBackup( let proposalStatus: PurchaseStatus; switch (backupPurchase.proposal_status) { case BackupProposalStatus.Paid: - proposalStatus = PurchaseStatus.Paid; + proposalStatus = PurchaseStatus.Done; break; case BackupProposalStatus.Proposed: proposalStatus = PurchaseStatus.Proposed; break; case BackupProposalStatus.PermanentlyFailed: - proposalStatus = PurchaseStatus.PaymentAbortFinished; + proposalStatus = PurchaseStatus.AbortedIncompletePayment; break; case BackupProposalStatus.Refused: - proposalStatus = PurchaseStatus.ProposalRefused; + proposalStatus = PurchaseStatus.AbortedProposalRefused; break; case BackupProposalStatus.Repurchase: proposalStatus = PurchaseStatus.RepurchaseDetected; @@ -596,48 +593,48 @@ export async function importBackup( } } if (!existingPurchase) { - const refunds: { [refundKey: string]: WalletRefundItem } = {}; - for (const backupRefund of backupPurchase.refunds) { - const key = `${backupRefund.coin_pub}-${backupRefund.rtransaction_id}`; - const coin = await tx.coins.get(backupRefund.coin_pub); - checkBackupInvariant(!!coin); - const denom = await tx.denominations.get([ - coin.exchangeBaseUrl, - coin.denomPubHash, - ]); - checkBackupInvariant(!!denom); - const common = { - coinPub: backupRefund.coin_pub, - executionTime: backupRefund.execution_time, - obtainedTime: backupRefund.obtained_time, - refundAmount: Amounts.stringify(backupRefund.refund_amount), - refundFee: Amounts.stringify(denom.fees.feeRefund), - rtransactionId: backupRefund.rtransaction_id, - totalRefreshCostBound: Amounts.stringify( - backupRefund.total_refresh_cost_bound, - ), - }; - switch (backupRefund.type) { - case BackupRefundState.Applied: - refunds[key] = { - type: RefundState.Applied, - ...common, - }; - break; - case BackupRefundState.Failed: - refunds[key] = { - type: RefundState.Failed, - ...common, - }; - break; - case BackupRefundState.Pending: - refunds[key] = { - type: RefundState.Pending, - ...common, - }; - break; - } - } + //const refunds: { [refundKey: string]: WalletRefundItem } = {}; + // for (const backupRefund of backupPurchase.refunds) { + // const key = `${backupRefund.coin_pub}-${backupRefund.rtransaction_id}`; + // const coin = await tx.coins.get(backupRefund.coin_pub); + // checkBackupInvariant(!!coin); + // const denom = await tx.denominations.get([ + // coin.exchangeBaseUrl, + // coin.denomPubHash, + // ]); + // checkBackupInvariant(!!denom); + // const common = { + // coinPub: backupRefund.coin_pub, + // executionTime: backupRefund.execution_time, + // obtainedTime: backupRefund.obtained_time, + // refundAmount: Amounts.stringify(backupRefund.refund_amount), + // refundFee: Amounts.stringify(denom.fees.feeRefund), + // rtransactionId: backupRefund.rtransaction_id, + // totalRefreshCostBound: Amounts.stringify( + // backupRefund.total_refresh_cost_bound, + // ), + // }; + // switch (backupRefund.type) { + // case BackupRefundState.Applied: + // refunds[key] = { + // type: RefundState.Applied, + // ...common, + // }; + // break; + // case BackupRefundState.Failed: + // refunds[key] = { + // type: RefundState.Failed, + // ...common, + // }; + // break; + // case BackupRefundState.Pending: + // refunds[key] = { + // type: RefundState.Pending, + // ...common, + // }; + // break; + // } + // } const parsedContractTerms = codecForMerchantContractTerms().decode( backupPurchase.contract_terms_raw, ); @@ -694,7 +691,7 @@ export async function importBackup( posConfirmation: backupPurchase.pos_confirmation, lastSessionId: undefined, download, - refunds, + //refunds, claimToken: backupPurchase.claim_token, downloadSessionId: backupPurchase.download_session_id, merchantBaseUrl: backupPurchase.merchant_base_url, |