From cbf0f839542f7eda88cdc2a5c7b602e690309154 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Fri, 5 May 2023 13:29:49 +0200
Subject: wallet-core: remove allowed auditors from contract terms

---
 packages/taler-wallet-core/src/db.ts                      |  1 -
 packages/taler-wallet-core/src/operations/deposits.ts     |  6 ++----
 packages/taler-wallet-core/src/operations/pay-merchant.ts | 10 +++-------
 3 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'packages/taler-wallet-core/src')

diff --git a/packages/taler-wallet-core/src/db.ts b/packages/taler-wallet-core/src/db.ts
index a95db9ca3..d1258f2f9 100644
--- a/packages/taler-wallet-core/src/db.ts
+++ b/packages/taler-wallet-core/src/db.ts
@@ -1120,7 +1120,6 @@ export interface WalletContractData {
   wireFeeAmortization: number;
   payDeadline: TalerProtocolTimestamp;
   refundDeadline: TalerProtocolTimestamp;
-  allowedAuditors: AllowedAuditorInfo[];
   allowedExchanges: AllowedExchangeInfo[];
   timestamp: TalerProtocolTimestamp;
   wireMethod: string;
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),
-- 
cgit v1.2.3