diff options
Diffstat (limited to 'packages/taler-wallet-core')
-rw-r--r-- | packages/taler-wallet-core/src/deposits.ts | 15 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/pay-merchant.ts | 26 |
2 files changed, 18 insertions, 23 deletions
diff --git a/packages/taler-wallet-core/src/deposits.ts b/packages/taler-wallet-core/src/deposits.ts index 93f70c2ce..6c04b20de 100644 --- a/packages/taler-wallet-core/src/deposits.ts +++ b/packages/taler-wallet-core/src/deposits.ts @@ -33,6 +33,7 @@ import { DepositGroupFees, Duration, ExchangeBatchDepositRequest, + ExchangeHandle, ExchangeRefundRequest, HttpStatusCode, Logger, @@ -754,9 +755,9 @@ async function processDepositGroupPendingTrack( let updatedTxStatus: DepositElementStatus | undefined = undefined; let newWiredCoin: | { - id: string; - value: DepositTrackingInfo; - } + id: string; + value: DepositTrackingInfo; + } | undefined; if (depositGroup.statusPerCoin[i] !== DepositElementStatus.Wired) { @@ -1167,7 +1168,7 @@ export async function prepareDepositGroup( } const amount = Amounts.parseOrThrow(req.amount); - const exchangeInfos: { url: string; master_pub: string }[] = []; + const exchangeInfos: ExchangeHandle[] = []; await wex.db.runReadOnlyTx(["exchangeDetails", "exchanges"], async (tx) => { const allExchanges = await tx.exchanges.iter().toArray(); @@ -1189,7 +1190,6 @@ export async function prepareDepositGroup( exchanges: exchangeInfos, amount: req.amount, max_fee: Amounts.stringify(amount), - max_wire_fee: Amounts.stringify(amount), wire_method: p.targetType, timestamp: nowRounded, merchant_base_url: "", @@ -1226,7 +1226,7 @@ export async function prepareDepositGroup( restrictWireMethod: contractData.wireMethod, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee), - wireFeeAmortization: contractData.wireFeeAmortization ?? 1, + wireFeeAmortization: 1, // FIXME #8653 prevPayCoins: [], }); @@ -1309,7 +1309,6 @@ export async function createDepositGroup( exchanges: exchangeInfos, amount: req.amount, max_fee: Amounts.stringify(amount), - max_wire_fee: Amounts.stringify(amount), wire_method: p.targetType, timestamp: nowRounded, merchant_base_url: "", @@ -1346,7 +1345,7 @@ export async function createDepositGroup( restrictWireMethod: contractData.wireMethod, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee), - wireFeeAmortization: contractData.wireFeeAmortization ?? 1, + wireFeeAmortization: 1, // FIXME #8653 prevPayCoins: [], }); diff --git a/packages/taler-wallet-core/src/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts index 872e554c9..e473566b0 100644 --- a/packages/taler-wallet-core/src/pay-merchant.ts +++ b/packages/taler-wallet-core/src/pay-merchant.ts @@ -36,11 +36,11 @@ import { checkDbInvariant, codecForAbortResponse, codecForMerchantContractTerms, - codecForMerchantOrderRefundPickupResponse, codecForMerchantOrderStatusPaid, codecForMerchantPayResponse, codecForMerchantPostOrderResponse, codecForProposal, + codecForWalletRefundResponse, CoinDepositPermission, CoinRefreshRequest, ConfirmPayResult, @@ -580,7 +580,6 @@ export function extractContractData( autoRefund: parsedContractTerms.auto_refund, payDeadline: parsedContractTerms.pay_deadline, refundDeadline: parsedContractTerms.refund_deadline, - wireFeeAmortization: parsedContractTerms.wire_fee_amortization || 1, allowedExchanges: parsedContractTerms.exchanges.map((x) => ({ exchangeBaseUrl: x.url, exchangePub: x.master_pub, @@ -591,7 +590,6 @@ export function extractContractData( maxDepositFee: Amounts.stringify(parsedContractTerms.max_fee), merchant: parsedContractTerms.merchant, summaryI18n: parsedContractTerms.summary_i18n, - minimumAge: parsedContractTerms.minimum_age, }; } @@ -611,8 +609,7 @@ async function processDownloadProposal( if (proposal.purchaseStatus != PurchaseStatus.PendingDownloadingProposal) { logger.error( - `unexpected state ${proposal.purchaseStatus}/${ - PurchaseStatus[proposal.purchaseStatus] + `unexpected state ${proposal.purchaseStatus}/${PurchaseStatus[proposal.purchaseStatus] } for ${ctx.transactionId} in processDownloadProposal`, ); return TaskRunResult.finished(); @@ -868,8 +865,7 @@ async function createOrReusePurchase( oldProposal.claimToken === claimToken ) { logger.info( - `Found old proposal (status=${ - PurchaseStatus[oldProposal.purchaseStatus] + `Found old proposal (status=${PurchaseStatus[oldProposal.purchaseStatus] }) for order ${orderId} at ${merchantBaseUrl}`, ); if (oldProposal.purchaseStatus === PurchaseStatus.DialogShared) { @@ -1149,9 +1145,9 @@ async function handleInsufficientFunds( restrictWireMethod: contractData.wireMethod, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee), - wireFeeAmortization: contractData.wireFeeAmortization ?? 1, + wireFeeAmortization: 1, // FIXME #8653 prevPayCoins, - requiredMinimumAge: contractData.minimumAge, + requiredMinimumAge: undefined, // FIXME #8653 }); if (res.type !== "success") { @@ -1278,9 +1274,9 @@ async function checkPaymentByProposalId( }, contractTermsAmount: instructedAmount, depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee), - wireFeeAmortization: contractData.wireFeeAmortization ?? 1, + wireFeeAmortization: 1, // FIXME #8653 prevPayCoins: [], - requiredMinimumAge: contractData.minimumAge, + requiredMinimumAge: undefined, // FIXME #8653 restrictWireMethod: contractData.wireMethod, }); @@ -1634,7 +1630,7 @@ export async function generateDepositPermissions( timestamp: contractData.timestamp, wireInfoHash, ageCommitmentProof: coin.ageCommitmentProof, - requiredMinimumAge: contractData.minimumAge, + requiredMinimumAge: undefined,// FIXME #8653 }); depositPermissions.push(dp); } @@ -1817,9 +1813,9 @@ export async function confirmPay( restrictWireMethod: contractData.wireMethod, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee), - wireFeeAmortization: contractData.wireFeeAmortization ?? 1, + wireFeeAmortization: 1, // FIXME #8653 prevPayCoins: [], - requiredMinimumAge: contractData.minimumAge, + requiredMinimumAge: undefined, // FIXME #8653 forcedSelection: forcedCoinSel, }); @@ -2887,7 +2883,7 @@ async function processPurchaseAcceptRefund( const refundResponse = await readSuccessResponseJsonOrThrow( request, - codecForMerchantOrderRefundPickupResponse(), + codecForWalletRefundResponse(), ); return await storeRefunds( wex, |