diff options
Diffstat (limited to 'packages/taler-wallet-core/src/pay-merchant.ts')
| -rw-r--r-- | packages/taler-wallet-core/src/pay-merchant.ts | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/packages/taler-wallet-core/src/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts index a3623e6d2..ed58dc404 100644 --- a/packages/taler-wallet-core/src/pay-merchant.ts +++ b/packages/taler-wallet-core/src/pay-merchant.ts @@ -96,7 +96,7 @@ import { readUnexpectedResponseDetails, throwUnexpectedRequestError, } from "@gnu-taler/taler-util/http"; -import { PreviousPayCoins, selectPayCoinsNew } from "./coinSelection.js"; +import { PreviousPayCoins, selectPayCoins } from "./coinSelection.js"; import { constructTaskIdentifier, PendingTaskType, @@ -1161,10 +1161,12 @@ async function handleInsufficientFunds( } }); - const res = await selectPayCoinsNew(wex, { - auditors: [], - exchanges: contractData.allowedExchanges, - wireMethod: contractData.wireMethod, + const res = await selectPayCoins(wex, { + restrictExchanges: { + auditors: [], + exchanges: contractData.allowedExchanges, + }, + restrictWireMethod: contractData.wireMethod, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee), wireFeeAmortization: contractData.wireFeeAmortization ?? 1, @@ -1285,16 +1287,18 @@ async function checkPaymentByProposalId( purchase.purchaseStatus === PurchaseStatus.DialogShared ) { // If not already paid, check if we could pay for it. - const res = await selectPayCoinsNew(wex, { - auditors: [], - exchanges: contractData.allowedExchanges, + const res = await selectPayCoins(wex, { + restrictExchanges: { + auditors: [], + exchanges: contractData.allowedExchanges, + }, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee), wireFeeAmortization: contractData.wireFeeAmortization ?? 1, wireFeeLimit: Amounts.parseOrThrow(contractData.maxWireFee), prevPayCoins: [], requiredMinimumAge: contractData.minimumAge, - wireMethod: contractData.wireMethod, + restrictWireMethod: contractData.wireMethod, }); if (res.type !== "success") { @@ -1820,10 +1824,12 @@ export async function confirmPay( const contractData = d.contractData; - const selectCoinsResult = await selectPayCoinsNew(wex, { - auditors: [], - exchanges: contractData.allowedExchanges, - wireMethod: contractData.wireMethod, + const selectCoinsResult = await selectPayCoins(wex, { + restrictExchanges: { + auditors: [], + exchanges: contractData.allowedExchanges, + }, + restrictWireMethod: contractData.wireMethod, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee), wireFeeAmortization: contractData.wireFeeAmortization ?? 1, |