diff options
author | Florian Dold <florian@dold.me> | 2023-05-05 13:29:49 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2023-05-05 13:29:49 +0200 |
commit | cbf0f839542f7eda88cdc2a5c7b602e690309154 (patch) | |
tree | 5d5530f11947bd218577d7b9857e1a3752ddb2b5 /packages/taler-wallet-core/src/operations | |
parent | 60805f3ff88d7ecd149a88ec7cea846384155c5b (diff) | |
download | wallet-core-cbf0f839542f7eda88cdc2a5c7b602e690309154.tar.xz |
wallet-core: remove allowed auditors from contract terms
Diffstat (limited to 'packages/taler-wallet-core/src/operations')
-rw-r--r-- | packages/taler-wallet-core/src/operations/deposits.ts | 6 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/operations/pay-merchant.ts | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/packages/taler-wallet-core/src/operations/deposits.ts b/packages/taler-wallet-core/src/operations/deposits.ts index b08f03bd1..c3d24cbf3 100644 --- a/packages/taler-wallet-core/src/operations/deposits.ts +++ b/packages/taler-wallet-core/src/operations/deposits.ts @@ -910,7 +910,6 @@ export async function prepareDepositGroup( const now = AbsoluteTime.now(); const nowRounded = AbsoluteTime.toTimestamp(now); const contractTerms: MerchantContractTerms = { - auditors: [], exchanges: exchangeInfos, amount: req.amount, max_fee: Amounts.stringify(amount), @@ -944,7 +943,7 @@ export async function prepareDepositGroup( ); const payCoinSel = await selectPayCoinsNew(ws, { - auditors: contractData.allowedAuditors, + auditors: [], exchanges: contractData.allowedExchanges, wireMethod: contractData.wireMethod, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), @@ -1029,7 +1028,6 @@ export async function createDepositGroup( const wireSalt = encodeCrock(getRandomBytes(16)); const wireHash = hashWire(req.depositPaytoUri, wireSalt); const contractTerms: MerchantContractTerms = { - auditors: [], exchanges: exchangeInfos, amount: req.amount, max_fee: Amounts.stringify(amount), @@ -1063,7 +1061,7 @@ export async function createDepositGroup( ); const payCoinSel = await selectPayCoinsNew(ws, { - auditors: contractData.allowedAuditors, + auditors: [], exchanges: contractData.allowedExchanges, wireMethod: contractData.wireMethod, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), diff --git a/packages/taler-wallet-core/src/operations/pay-merchant.ts b/packages/taler-wallet-core/src/operations/pay-merchant.ts index 67343d69a..6aad1d742 100644 --- a/packages/taler-wallet-core/src/operations/pay-merchant.ts +++ b/packages/taler-wallet-core/src/operations/pay-merchant.ts @@ -286,10 +286,6 @@ export function extractContractData( payDeadline: parsedContractTerms.pay_deadline, refundDeadline: parsedContractTerms.refund_deadline, wireFeeAmortization: parsedContractTerms.wire_fee_amortization || 1, - allowedAuditors: parsedContractTerms.auditors.map((x) => ({ - auditorBaseUrl: x.url, - auditorPub: x.auditor_pub, - })), allowedExchanges: parsedContractTerms.exchanges.map((x) => ({ exchangeBaseUrl: x.url, exchangePub: x.master_pub, @@ -798,7 +794,7 @@ async function handleInsufficientFunds( }); const res = await selectPayCoinsNew(ws, { - auditors: contractData.allowedAuditors, + auditors: [], exchanges: contractData.allowedExchanges, wireMethod: contractData.wireMethod, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), @@ -921,7 +917,7 @@ export async function checkPaymentByProposalId( if (!purchase || purchase.purchaseStatus === PurchaseStatus.Proposed) { // If not already paid, check if we could pay for it. const res = await selectPayCoinsNew(ws, { - auditors: contractData.allowedAuditors, + auditors: [], exchanges: contractData.allowedExchanges, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee), @@ -1266,7 +1262,7 @@ export async function confirmPay( const contractData = d.contractData; const selectCoinsResult = await selectPayCoinsNew(ws, { - auditors: contractData.allowedAuditors, + auditors: [], exchanges: contractData.allowedExchanges, wireMethod: contractData.wireMethod, contractTermsAmount: Amounts.parseOrThrow(contractData.amount), |