wallet-core: remove usage of /wire

9 files changed, 86 insertions, 104 deletions

diff --git a/packages/taler-wallet-core/src/operations/backup/index.ts b/packages/taler-wallet-core/src/operations/backup/index.ts
index 236ef1e0f..e35765165 100644
--- a/packages/taler-wallet-core/src/operations/backup/index.ts
+++ b/packages/taler-wallet-core/src/operations/backup/index.ts
@@ -661,7 +661,7 @@ export async function addBackupProvider(
       }
     });
   const termsUrl = new URL("config", canonUrl);
-  const resp = await ws.http.get(termsUrl.href);
+  const resp = await ws.http.fetch(termsUrl.href);
   const terms = await readSuccessResponseJsonOrThrow(
     resp,
     codecForSyncTermsOfServiceResponse(),
diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts
index 8bf70fa27..c6b46e360 100644
--- a/packages/taler-wallet-core/src/operations/exchanges.ts
+++ b/packages/taler-wallet-core/src/operations/exchanges.ts
@@ -19,12 +19,14 @@
  */
 import {
   AbsoluteTime,
+  AccountInfo,
   Amounts,
   CancellationToken,
   canonicalizeBaseUrl,
   codecForExchangeKeysJson,
-  codecForExchangeWireJson,
+  DenomGroup,
   DenominationPubKey,
+  DenomKeyType,
   Duration,
   durationFromSpec,
   encodeCrock,
@@ -51,6 +53,7 @@ import {
   URL,
   WireFee,
   WireFeeMap,
+  WireFeesJson,
   WireInfo,
 } from "@gnu-taler/taler-util";
 import {
@@ -84,43 +87,6 @@ import {
 
 const logger = new Logger("exchanges.ts");
 
-function denominationRecordFromKeys(
-  exchangeBaseUrl: string,
-  exchangeMasterPub: string,
-  listIssueDate: TalerProtocolTimestamp,
-  denomIn: ExchangeDenomination,
-): DenominationRecord {
-  let denomPub: DenominationPubKey;
-  denomPub = denomIn.denom_pub;
-  const denomPubHash = encodeCrock(hashDenomPub(denomPub));
-  const value = Amounts.parseOrThrow(denomIn.value);
-  const d: DenominationRecord = {
-    denomPub,
-    denomPubHash,
-    exchangeBaseUrl,
-    exchangeMasterPub,
-    fees: {
-      feeDeposit: Amounts.stringify(denomIn.fee_deposit),
-      feeRefresh: Amounts.stringify(denomIn.fee_refresh),
-      feeRefund: Amounts.stringify(denomIn.fee_refund),
-      feeWithdraw: Amounts.stringify(denomIn.fee_withdraw),
-    },
-    isOffered: true,
-    isRevoked: false,
-    masterSig: denomIn.master_sig,
-    stampExpireDeposit: denomIn.stamp_expire_deposit,
-    stampExpireLegal: denomIn.stamp_expire_legal,
-    stampExpireWithdraw: denomIn.stamp_expire_withdraw,
-    stampStart: denomIn.stamp_start,
-    verificationStatus: DenominationVerificationStatus.Unverified,
-    amountFrac: value.fraction,
-    amountVal: value.value,
-    currency: value.currency,
-    listIssueDate,
-  };
-  return d;
-}
-
 export function getExchangeRequestTimeout(): Duration {
   return Duration.fromSpec({
     seconds: 5,
@@ -145,7 +111,7 @@ export async function downloadExchangeWithTermsOfService(
     Accept: contentType,
   };
 
-  const resp = await http.get(reqUrl.href, {
+  const resp = await http.fetch(reqUrl.href, {
     headers,
     timeout,
   });
@@ -241,7 +207,7 @@ export async function acceptExchangeTermsOfService(
 async function validateWireInfo(
   ws: InternalWalletState,
   versionCurrent: number,
-  wireInfo: ExchangeWireJson,
+  wireInfo: ExchangeKeysDownloadResult,
   masterPublicKey: string,
 ): Promise<WireInfo> {
   for (const a of wireInfo.accounts) {
@@ -267,9 +233,9 @@ async function validateWireInfo(
   }
   logger.trace("account validation done");
   const feesForType: WireFeeMap = {};
-  for (const wireMethod of Object.keys(wireInfo.fees)) {
+  for (const wireMethod of Object.keys(wireInfo.wireFees)) {
     const feeList: WireFee[] = [];
-    for (const x of wireInfo.fees[wireMethod]) {
+    for (const x of wireInfo.wireFees[wireMethod]) {
       const startStamp = x.start_date;
       const endStamp = x.end_date;
       const fee: WireFee = {
@@ -343,7 +309,6 @@ async function validateGlobalFees(
 }
 
 export interface ExchangeInfo {
-  wire: ExchangeWireJson;
   keys: ExchangeKeysDownloadResult;
 }
 
@@ -351,11 +316,6 @@ export async function downloadExchangeInfo(
   exchangeBaseUrl: string,
   http: HttpRequestLibrary,
 ): Promise<ExchangeInfo> {
-  const wireInfo = await downloadExchangeWireInfo(
-    exchangeBaseUrl,
-    http,
-    Duration.getForever(),
-  );
   const keysInfo = await downloadExchangeKeysInfo(
     exchangeBaseUrl,
     http,
@@ -363,33 +323,9 @@ export async function downloadExchangeInfo(
   );
   return {
     keys: keysInfo,
-    wire: wireInfo,
   };
 }
 
-/**
- * Fetch wire information for an exchange.
- *
- * @param exchangeBaseUrl Exchange base URL, assumed to be already normalized.
- */
-async function downloadExchangeWireInfo(
-  exchangeBaseUrl: string,
-  http: HttpRequestLibrary,
-  timeout: Duration,
-): Promise<ExchangeWireJson> {
-  const reqUrl = new URL("wire", exchangeBaseUrl);
-
-  const resp = await http.get(reqUrl.href, {
-    timeout,
-  });
-  const wireInfo = await readSuccessResponseJsonOrThrow(
-    resp,
-    codecForExchangeWireJson(),
-  );
-
-  return wireInfo;
-}
-
 export async function provideExchangeRecordInTx(
   ws: InternalWalletState,
   tx: GetReadWriteAccess<{
@@ -434,6 +370,8 @@ interface ExchangeKeysDownloadResult {
   recoup: Recoup[];
   listIssueDate: TalerProtocolTimestamp;
   globalFees: GlobalFees[];
+  accounts: AccountInfo[];
+  wireFees: { [methodName: string]: WireFeesJson[] };
 }
 
 /**
@@ -446,7 +384,7 @@ async function downloadExchangeKeysInfo(
 ): Promise<ExchangeKeysDownloadResult> {
   const keysUrl = new URL("keys", baseUrl);
 
-  const resp = await http.get(keysUrl.href, {
+  const resp = await http.fetch(keysUrl.href, {
     timeout,
   });
   const exchangeKeysJsonUnchecked = await readSuccessResponseJsonOrThrow(
@@ -454,7 +392,7 @@ async function downloadExchangeKeysInfo(
     codecForExchangeKeysJson(),
   );
 
-  if (exchangeKeysJsonUnchecked.denoms.length === 0) {
+  if (exchangeKeysJsonUnchecked.denominations.length === 0) {
     throw TalerError.fromDetail(
       TalerErrorCode.WALLET_EXCHANGE_DENOMINATIONS_INSUFFICIENT,
       {
@@ -481,23 +419,72 @@ async function downloadExchangeKeysInfo(
     );
   }
 
-  const currency = Amounts.parseOrThrow(
-    exchangeKeysJsonUnchecked.denoms[0].value,
-  ).currency.toUpperCase();
+  const currency = exchangeKeysJsonUnchecked.currency;
+
+  const currentDenominations: DenominationRecord[] = [];
+
+  for (const denomGroup of exchangeKeysJsonUnchecked.denominations) {
+    switch (denomGroup.cipher) {
+      case "RSA":
+      case "RSA+age_restricted": {
+        let ageMask = 0;
+        if (denomGroup.cipher === "RSA+age_restricted") {
+          ageMask = denomGroup.age_mask;
+        }
+        for (const denomIn of denomGroup.denoms) {
+          const denomPub: DenominationPubKey = {
+            age_mask: ageMask,
+            cipher: DenomKeyType.Rsa,
+            rsa_public_key: denomIn.rsa_pub,
+          };
+          const denomPubHash = encodeCrock(hashDenomPub(denomPub));
+          const value = Amounts.parseOrThrow(denomGroup.value);
+          const rec: DenominationRecord = {
+            denomPub,
+            denomPubHash,
+            exchangeBaseUrl: baseUrl,
+            exchangeMasterPub: exchangeKeysJsonUnchecked.master_public_key,
+            isOffered: true,
+            isRevoked: false,
+            amountFrac: value.fraction,
+            amountVal: value.value,
+            currency: value.currency,
+            stampExpireDeposit: denomIn.stamp_expire_deposit,
+            stampExpireLegal: denomIn.stamp_expire_legal,
+            stampExpireWithdraw: denomIn.stamp_expire_withdraw,
+            stampStart: denomIn.stamp_start,
+            verificationStatus: DenominationVerificationStatus.Unverified,
+            masterSig: denomIn.master_sig,
+            listIssueDate: exchangeKeysJsonUnchecked.list_issue_date,
+            fees: {
+              feeDeposit: Amounts.stringify(denomGroup.fee_deposit),
+              feeRefresh: Amounts.stringify(denomGroup.fee_refresh),
+              feeRefund: Amounts.stringify(denomGroup.fee_refund),
+              feeWithdraw: Amounts.stringify(denomGroup.fee_withdraw),
+            },
+          };
+          currentDenominations.push(rec);
+        }
+        break;
+      }
+      case "CS+age_restricted":
+      case "CS":
+        logger.warn("Clause-Schnorr denominations not supported");
+        continue;
+      default:
+        logger.warn(
+          `denomination type ${(denomGroup as any).cipher} not supported`,
+        );
+        continue;
+    }
+  }
 
   return {
     masterPublicKey: exchangeKeysJsonUnchecked.master_public_key,
     currency,
     baseUrl: exchangeKeysJsonUnchecked.base_url,
     auditors: exchangeKeysJsonUnchecked.auditors,
-    currentDenominations: exchangeKeysJsonUnchecked.denoms.map((d) =>
-      denominationRecordFromKeys(
-        baseUrl,
-        exchangeKeysJsonUnchecked.master_public_key,
-        exchangeKeysJsonUnchecked.list_issue_date,
-        d,
-      ),
-    ),
+    currentDenominations,
     protocolVersion: exchangeKeysJsonUnchecked.version,
     signingKeys: exchangeKeysJsonUnchecked.signkeys,
     reserveClosingDelay: exchangeKeysJsonUnchecked.reserve_closing_delay,
@@ -509,6 +496,8 @@ async function downloadExchangeKeysInfo(
     recoup: exchangeKeysJsonUnchecked.recoup ?? [],
     listIssueDate: exchangeKeysJsonUnchecked.list_issue_date,
     globalFees: exchangeKeysJsonUnchecked.global_fees,
+    accounts: exchangeKeysJsonUnchecked.accounts,
+    wireFees: exchangeKeysJsonUnchecked.wire_fees,
   };
 }
 
@@ -654,14 +643,7 @@ export async function updateExchangeFromUrlHandler(
     }
   }
 
-  logger.trace("updating exchange /wire info");
-  const wireInfoDownload = await downloadExchangeWireInfo(
-    exchangeBaseUrl,
-    ws.http,
-    timeout,
-  );
-
-  logger.trace("validating exchange /wire info");
+  logger.trace("validating exchange wire info");
 
   const version = LibtoolVersion.parseVersion(keysInfo.protocolVersion);
   if (!version) {
@@ -672,7 +654,7 @@ export async function updateExchangeFromUrlHandler(
   const wireInfo = await validateWireInfo(
     ws,
     version.current,
-    wireInfoDownload,
+    keysInfo,
     keysInfo.masterPublicKey,
   );
 
diff --git a/packages/taler-wallet-core/src/operations/merchants.ts b/packages/taler-wallet-core/src/operations/merchants.ts
index c47ec4a0a..a148953f0 100644
--- a/packages/taler-wallet-core/src/operations/merchants.ts
+++ b/packages/taler-wallet-core/src/operations/merchants.ts
@@ -41,7 +41,7 @@ export async function getMerchantInfo(
   }
 
   const configUrl = new URL("config", canonBaseUrl);
-  const resp = await ws.http.get(configUrl.href);
+  const resp = await ws.http.fetch(configUrl.href);
 
   const configResp = await readSuccessResponseJsonOrThrow(
     resp,
diff --git a/packages/taler-wallet-core/src/operations/pay-peer-pull-debit.ts b/packages/taler-wallet-core/src/operations/pay-peer-pull-debit.ts
index eca3bc91b..8ba84585c 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-pull-debit.ts
+++ b/packages/taler-wallet-core/src/operations/pay-peer-pull-debit.ts
@@ -530,7 +530,7 @@ export async function preparePeerPullDebit(
 
   const getContractUrl = new URL(`contracts/${contractPub}`, exchangeBaseUrl);
 
-  const contractHttpResp = await ws.http.get(getContractUrl.href);
+  const contractHttpResp = await ws.http.fetch(getContractUrl.href);
 
   const contractResp = await readSuccessResponseJsonOrThrow(
     contractHttpResp,
diff --git a/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts b/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts
index c552d63f0..47e9eaddd 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts
+++ b/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts
@@ -165,7 +165,7 @@ export async function preparePeerPushCredit(
 
   const getPurseUrl = new URL(`purses/${pursePub}/deposit`, exchangeBaseUrl);
 
-  const purseHttpResp = await ws.http.get(getPurseUrl.href);
+  const purseHttpResp = await ws.http.fetch(getPurseUrl.href);
 
   const purseStatus = await readSuccessResponseJsonOrThrow(
     purseHttpResp,
diff --git a/packages/taler-wallet-core/src/operations/recoup.ts b/packages/taler-wallet-core/src/operations/recoup.ts
index abeca1119..6a18e5de6 100644
--- a/packages/taler-wallet-core/src/operations/recoup.ts
+++ b/packages/taler-wallet-core/src/operations/recoup.ts
@@ -358,7 +358,7 @@ export async function processRecoupGroup(
     );
     logger.info(`querying reserve status for recoup via ${reserveUrl}`);
 
-    const resp = await ws.http.get(reserveUrl.href);
+    const resp = await ws.http.fetch(reserveUrl.href);
 
     const result = await readSuccessResponseJsonOrThrow(
       resp,
diff --git a/packages/taler-wallet-core/src/operations/reward.ts b/packages/taler-wallet-core/src/operations/reward.ts
index 47956f15f..69c888d7a 100644
--- a/packages/taler-wallet-core/src/operations/reward.ts
+++ b/packages/taler-wallet-core/src/operations/reward.ts
@@ -161,7 +161,7 @@ export async function prepareTip(
       res.merchantBaseUrl,
     );
     logger.trace("checking tip status from", tipStatusUrl.href);
-    const merchantResp = await ws.http.get(tipStatusUrl.href);
+    const merchantResp = await ws.http.fetch(tipStatusUrl.href);
     const tipPickupStatus = await readSuccessResponseJsonOrThrow(
       merchantResp,
       codecForTipPickupGetResponse(),
diff --git a/packages/taler-wallet-core/src/operations/testing.ts b/packages/taler-wallet-core/src/operations/testing.ts
index 3090549d5..aff92622a 100644
--- a/packages/taler-wallet-core/src/operations/testing.ts
+++ b/packages/taler-wallet-core/src/operations/testing.ts
@@ -293,7 +293,7 @@ async function checkPayment(
 ): Promise<CheckPaymentResponse> {
   const reqUrl = new URL(`private/orders/${orderId}`, merchantBackend.baseUrl);
   reqUrl.searchParams.set("order_id", orderId);
-  const resp = await http.get(reqUrl.href, {
+  const resp = await http.fetch(reqUrl.href, {
     headers: getMerchantAuthHeader(merchantBackend),
   });
   return readSuccessResponseJsonOrThrow(resp, codecForCheckPaymentResponse());
diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts
index 673129928..040d191e1 100644
--- a/packages/taler-wallet-core/src/operations/withdraw.ts
+++ b/packages/taler-wallet-core/src/operations/withdraw.ts
@@ -554,7 +554,7 @@ export async function getBankWithdrawalInfo(
 
   const configReqUrl = new URL("config", uriResult.bankIntegrationApiBaseUrl);
 
-  const configResp = await http.get(configReqUrl.href);
+  const configResp = await http.fetch(configReqUrl.href);
   const config = await readSuccessResponseJsonOrThrow(
     configResp,
     codecForTalerConfigResponse(),
@@ -582,7 +582,7 @@ export async function getBankWithdrawalInfo(
 
   logger.info(`bank withdrawal status URL: ${reqUrl.href}}`);
 
-  const resp = await http.get(reqUrl.href);
+  const resp = await http.fetch(reqUrl.href);
   const status = await readSuccessResponseJsonOrThrow(
     resp,
     codecForWithdrawOperationStatusResponse(),
@@ -2098,7 +2098,7 @@ async function processReserveBankStatus(
 
   const bankStatusUrl = getBankStatusUrl(bankInfo.talerWithdrawUri);
 
-  const statusResp = await ws.http.get(bankStatusUrl, {
+  const statusResp = await ws.http.fetch(bankStatusUrl, {
     timeout: getReserveRequestTimeout(withdrawalGroup),
   });
   const status = await readSuccessResponseJsonOrThrow(