towards new recoup API

3 files changed, 103 insertions, 26 deletions

diff --git a/packages/taler-wallet-core/src/crypto/cryptoTypes.ts b/packages/taler-wallet-core/src/crypto/cryptoTypes.ts
index 9b72dfbe2..5351815a7 100644
--- a/packages/taler-wallet-core/src/crypto/cryptoTypes.ts
+++ b/packages/taler-wallet-core/src/crypto/cryptoTypes.ts
@@ -27,7 +27,13 @@
 /**
  * Imports.
  */
-import { AmountJson, DenominationPubKey, ExchangeProtocolVersion } from "@gnu-taler/taler-util";
+import {
+  AmountJson,
+  AmountString,
+  DenominationPubKey,
+  ExchangeProtocolVersion,
+  UnblindedSignature,
+} from "@gnu-taler/taler-util";
 
 export interface RefreshNewDenomInfo {
   count: number;
@@ -140,3 +146,29 @@ export interface SignTrackTransactionRequest {
   merchantPriv: string;
   merchantPub: string;
 }
+
+/**
+ * Request to create a recoup request payload.
+ */
+export interface CreateRecoupReqRequest {
+  coinPub: string;
+  coinPriv: string;
+  blindingKey: string;
+  denomPub: DenominationPubKey;
+  denomPubHash: string;
+  denomSig: UnblindedSignature;
+  recoupAmount: AmountJson;
+}
+
+/**
+ * Request to create a recoup-refresh request payload.
+ */
+export interface CreateRecoupRefreshReqRequest {
+  coinPub: string;
+  coinPriv: string;
+  blindingKey: string;
+  denomPub: DenominationPubKey;
+  denomPubHash: string;
+  denomSig: UnblindedSignature;
+  recoupAmount: AmountJson;
+}
diff --git a/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts b/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts
index e88b64c3c..29c2553a5 100644
--- a/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts
+++ b/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts
@@ -26,7 +26,11 @@ import { CoinRecord, DenominationRecord, WireFee } from "../../db.js";
 
 import { CryptoWorker } from "./cryptoWorkerInterface.js";
 
-import { RecoupRequest, CoinDepositPermission } from "@gnu-taler/taler-util";
+import {
+  CoinDepositPermission,
+  RecoupRefreshRequest,
+  RecoupRequest,
+} from "@gnu-taler/taler-util";
 
 import {
   BenchmarkResult,
@@ -39,6 +43,8 @@ import {
 import * as timer from "../../util/timer.js";
 import { Logger } from "@gnu-taler/taler-util";
 import {
+  CreateRecoupRefreshReqRequest,
+  CreateRecoupReqRequest,
   DerivedRefreshSession,
   DerivedTipPlanchet,
   DeriveRefreshSessionRequest,
@@ -421,8 +427,18 @@ export class CryptoApi {
     );
   }
 
-  createRecoupRequest(coin: CoinRecord): Promise<RecoupRequest> {
-    return this.doRpc<RecoupRequest>("createRecoupRequest", 1, coin);
+  createRecoupRequest(req: CreateRecoupReqRequest): Promise<RecoupRequest> {
+    return this.doRpc<RecoupRequest>("createRecoupRequest", 1, req);
+  }
+
+  createRecoupRefreshRequest(
+    req: CreateRecoupRefreshReqRequest,
+  ): Promise<RecoupRefreshRequest> {
+    return this.doRpc<RecoupRefreshRequest>(
+      "createRecoupRefreshRequest",
+      1,
+      req,
+    );
   }
 
   deriveRefreshSession(
diff --git a/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts b/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts
index 9e2dc18f3..b366fa9ec 100644
--- a/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts
+++ b/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts
@@ -25,12 +25,7 @@
  */
 
 // FIXME: Crypto should not use DB Types!
-import {
-  CoinRecord,
-  DenominationRecord,
-  WireFee,
-  CoinSourceType,
-} from "../../db.js";
+import { DenominationRecord, WireFee } from "../../db.js";
 
 import {
   buildSigPS,
@@ -39,6 +34,7 @@ import {
   ExchangeProtocolVersion,
   FreshCoin,
   hashDenomPub,
+  RecoupRefreshRequest,
   RecoupRequest,
   RefreshPlanchetInfo,
   TalerSignaturePurpose,
@@ -78,6 +74,8 @@ import { Timestamp, timestampTruncateToSecond } from "@gnu-taler/taler-util";
 
 import { Logger } from "@gnu-taler/taler-util";
 import {
+  CreateRecoupRefreshReqRequest,
+  CreateRecoupReqRequest,
   DerivedRefreshSession,
   DerivedTipPlanchet,
   DeriveRefreshSessionRequest,
@@ -261,33 +259,64 @@ export class CryptoImplementation {
   /**
    * Create and sign a message to recoup a coin.
    */
-  createRecoupRequest(coin: CoinRecord): RecoupRequest {
+  createRecoupRequest(req: CreateRecoupReqRequest): RecoupRequest {
     const p = buildSigPS(TalerSignaturePurpose.WALLET_COIN_RECOUP)
-      .put(decodeCrock(coin.coinPub))
-      .put(decodeCrock(coin.denomPubHash))
-      .put(decodeCrock(coin.blindingKey))
+      .put(decodeCrock(req.denomPubHash))
+      .put(decodeCrock(req.blindingKey))
+      .put(amountToBuffer(Amounts.jsonifyAmount(req.recoupAmount)))
       .build();
 
-    const coinPriv = decodeCrock(coin.coinPriv);
+    const coinPriv = decodeCrock(req.coinPriv);
     const coinSig = eddsaSign(p, coinPriv);
-    if (coin.denomPub.cipher === DenomKeyType.LegacyRsa) {
+    if (req.denomPub.cipher === DenomKeyType.LegacyRsa) {
       const paybackRequest: RecoupRequest = {
-        coin_blind_key_secret: coin.blindingKey,
-        coin_pub: coin.coinPub,
+        coin_blind_key_secret: req.blindingKey,
         coin_sig: encodeCrock(coinSig),
-        denom_pub_hash: coin.denomPubHash,
-        denom_sig: coin.denomSig.rsa_signature,
-        refreshed: coin.coinSource.type === CoinSourceType.Refresh,
+        denom_pub_hash: req.denomPubHash,
+        denom_sig: req.denomSig.rsa_signature,
+        amount: Amounts.stringify(req.recoupAmount),
       };
       return paybackRequest;
     } else {
       const paybackRequest: RecoupRequest = {
-        coin_blind_key_secret: coin.blindingKey,
-        coin_pub: coin.coinPub,
+        coin_blind_key_secret: req.blindingKey,
+        coin_sig: encodeCrock(coinSig),
+        denom_pub_hash: req.denomPubHash,
+        denom_sig: req.denomSig,
+        amount: Amounts.stringify(req.recoupAmount),
+      };
+      return paybackRequest;
+    }
+  }
+
+  /**
+   * Create and sign a message to recoup a coin.
+   */
+   createRecoupRefreshRequest(req: CreateRecoupRefreshReqRequest): RecoupRefreshRequest {
+    const p = buildSigPS(TalerSignaturePurpose.WALLET_COIN_RECOUP_REFRESH)
+      .put(decodeCrock(req.denomPubHash))
+      .put(decodeCrock(req.blindingKey))
+      .put(amountToBuffer(Amounts.jsonifyAmount(req.recoupAmount)))
+      .build();
+
+    const coinPriv = decodeCrock(req.coinPriv);
+    const coinSig = eddsaSign(p, coinPriv);
+    if (req.denomPub.cipher === DenomKeyType.LegacyRsa) {
+      const paybackRequest: RecoupRefreshRequest = {
+        coin_blind_key_secret: req.blindingKey,
+        coin_sig: encodeCrock(coinSig),
+        denom_pub_hash: req.denomPubHash,
+        denom_sig: req.denomSig.rsa_signature,
+        amount: Amounts.stringify(req.recoupAmount),
+      };
+      return paybackRequest;
+    } else {
+      const paybackRequest: RecoupRefreshRequest = {
+        coin_blind_key_secret: req.blindingKey,
         coin_sig: encodeCrock(coinSig),
-        denom_pub_hash: coin.denomPubHash,
-        denom_sig: coin.denomSig,
-        refreshed: coin.coinSource.type === CoinSourceType.Refresh,
+        denom_pub_hash: req.denomPubHash,
+        denom_sig: req.denomSig,
+        amount: Amounts.stringify(req.recoupAmount),
       };
       return paybackRequest;
     }