From b96464fe09605e829dcd5715c69668e64c5454b3 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 13 Apr 2023 15:04:08 +0200
Subject: Revert "wallet-core: check master public key in /wire response"

This reverts commit 7944a36e30182638b35da6e113b29de8b5f16305.
---
 .../taler-wallet-core/src/operations/exchanges.ts  | 30 +++++-----------------
 1 file changed, 6 insertions(+), 24 deletions(-)

(limited to 'packages/taler-wallet-core/src/operations/exchanges.ts')

diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts
index 1fce92caf..d9051b32f 100644
--- a/packages/taler-wallet-core/src/operations/exchanges.ts
+++ b/packages/taler-wallet-core/src/operations/exchanges.ts
@@ -63,7 +63,7 @@ import {
   ExchangeRecord,
   WalletStoresV1,
 } from "../db.js";
-import { isWithdrawableDenom, TalerCryptoInterface } from "../index.js";
+import { isWithdrawableDenom } from "../index.js";
 import { InternalWalletState, TrustInfo } from "../internal-wallet-state.js";
 import { checkDbInvariant } from "../util/invariants.js";
 import {
@@ -236,25 +236,12 @@ export async function acceptExchangeTermsOfService(
     });
 }
 
-export interface ValidateWireInfoArgs {
-  cryptoApi: TalerCryptoInterface;
-
-  /**
-   * Exchange major protocol version.
-   */
-  versionCurrent?: number;
-
-  wireInfo: ExchangeWireJson;
-
-  insecureTrustExchange?: boolean;
-
-  masterPublicKey: string;
-}
-
-export async function validateWireInfo(
-  args: ValidateWireInfoArgs,
+async function validateWireInfo(
+  ws: InternalWalletState,
+  versionCurrent: number,
+  wireInfo: ExchangeWireJson,
+  masterPublicKey: string,
 ): Promise<WireInfo> {
-  const { wireInfo, masterPublicKey, insecureTrustExchange } = args;
   for (const a of wireInfo.accounts) {
     logger.trace("validating exchange acct");
     let isValid = false;
@@ -645,11 +632,6 @@ export async function updateExchangeFromUrlHandler(
     throw Error("unexpected invalid version");
   }
 
-  if (wireInfoDownload.master_public_key != keysInfo.masterPublicKey) {
-    // FIXME: introduce error code
-    throw Error("inconsistent master public key between /keys and /wire");
-  }
-
   const wireInfo = await validateWireInfo(
     ws,
     version.current,
-- 
cgit v1.2.3