Merge branch 'master' into age-withdraw

1 files changed, 159 insertions, 85 deletions

diff --git a/packages/taler-wallet-core/src/util/coinSelection.test.ts b/packages/taler-wallet-core/src/util/coinSelection.test.ts
index 2a322c4a9..81a656f8a 100644
--- a/packages/taler-wallet-core/src/util/coinSelection.test.ts
+++ b/packages/taler-wallet-core/src/util/coinSelection.test.ts
@@ -15,65 +15,58 @@
  */
 import {
   AbsoluteTime,
-  AgeRestriction,
-  AmountJson,
   AmountString,
   Amounts,
   DenomKeyType,
   Duration,
-  TransactionAmountMode,
+  j2s,
 } from "@gnu-taler/taler-util";
 import test, { ExecutionContext } from "ava";
-import { AvailableDenom, testing_greedySelectPeer } from "./coinSelection.js"
-
-type Tester<T> = {
-  deep: {
-    equal(another: T): ReturnType<ExecutionContext["deepEqual"]>;
-    equals(another: T): ReturnType<ExecutionContext["deepEqual"]>;
-  }
-}
-
-function expect<T>(t: ExecutionContext, thing: T): Tester<T> {
-  return {
-    deep: {
-      equal: (another: T) => t.deepEqual(thing, another),
-      equals: (another: T) => t.deepEqual(thing, another),
-    },
-  };
-}
+import {
+  AvailableDenom,
+  testing_greedySelectPeer,
+  testing_selectGreedy,
+} from "./coinSelection.js";
 
 const inTheDistantFuture = AbsoluteTime.toProtocolTimestamp(
-  AbsoluteTime.addDuration(AbsoluteTime.now(), Duration.fromSpec({ hours: 1 }))
-)
+  AbsoluteTime.addDuration(AbsoluteTime.now(), Duration.fromSpec({ hours: 1 })),
+);
 const inThePast = AbsoluteTime.toProtocolTimestamp(
-  AbsoluteTime.subtractDuraction(AbsoluteTime.now(), Duration.fromSpec({ hours: 1 }))
-)
-
-test("should select the coin", (t) => {
-  const instructedAmount = Amounts.parseOrThrow("LOCAL:2")
+  AbsoluteTime.subtractDuraction(
+    AbsoluteTime.now(),
+    Duration.fromSpec({ hours: 1 }),
+  ),
+);
+
+test("p2p: should select the coin", (t) => {
+  const instructedAmount = Amounts.parseOrThrow("LOCAL:2");
   const tally = {
     amountAcc: Amounts.zeroOfCurrency(instructedAmount.currency),
     depositFeesAcc: Amounts.zeroOfCurrency(instructedAmount.currency),
     lastDepositFee: Amounts.zeroOfCurrency(instructedAmount.currency),
   };
   const coins = testing_greedySelectPeer(
-    createCandidates([{
-      amount: "LOCAL:10",
-      numAvailable: 5,
-      depositFee: "LOCAL:0.1",
-      fromExchange: "http://exchange.localhost/",
-    }]),
-    instructedAmount, 
-    tally
+    createCandidates([
+      {
+        amount: "LOCAL:10",
+        numAvailable: 5,
+        depositFee: "LOCAL:0.1",
+        fromExchange: "http://exchange.localhost/",
+      },
+    ]),
+    instructedAmount,
+    tally,
   );
 
+  t.log(j2s(coins));
+
   expect(t, coins).deep.equal({
     "hash0;32;http://exchange.localhost/": {
       exchangeBaseUrl: "http://exchange.localhost/",
       denomPubHash: "hash0",
       maxAge: 32,
-      contributions: [Amounts.parseOrThrow("LOCAL:2")],
-    }
+      contributions: [Amounts.parseOrThrow("LOCAL:2.1")],
+    },
   });
 
   expect(t, tally).deep.equal({
@@ -81,25 +74,26 @@ test("should select the coin", (t) => {
     depositFeesAcc: Amounts.parseOrThrow("LOCAL:0.1"),
     lastDepositFee: Amounts.parseOrThrow("LOCAL:0.1"),
   });
-
 });
 
-test("should select 3 coins", (t) => {
-  const instructedAmount = Amounts.parseOrThrow("LOCAL:20")
+test("p2p: should select 3 coins", (t) => {
+  const instructedAmount = Amounts.parseOrThrow("LOCAL:20");
   const tally = {
     amountAcc: Amounts.zeroOfCurrency(instructedAmount.currency),
     depositFeesAcc: Amounts.zeroOfCurrency(instructedAmount.currency),
     lastDepositFee: Amounts.zeroOfCurrency(instructedAmount.currency),
   };
   const coins = testing_greedySelectPeer(
-    createCandidates([{
-      amount: "LOCAL:10",
-      numAvailable: 5,
-      depositFee: "LOCAL:0.1",
-      fromExchange: "http://exchange.localhost/",
-    }]),
-    instructedAmount, 
-    tally
+    createCandidates([
+      {
+        amount: "LOCAL:10",
+        numAvailable: 5,
+        depositFee: "LOCAL:0.1",
+        fromExchange: "http://exchange.localhost/",
+      },
+    ]),
+    instructedAmount,
+    tally,
   );
 
   expect(t, coins).deep.equal({
@@ -110,9 +104,9 @@ test("should select 3 coins", (t) => {
       contributions: [
         Amounts.parseOrThrow("LOCAL:9.9"),
         Amounts.parseOrThrow("LOCAL:9.9"),
-        Amounts.parseOrThrow("LOCAL:0.2")
+        Amounts.parseOrThrow("LOCAL:0.5"),
       ],
-    }
+    },
   });
 
   expect(t, tally).deep.equal({
@@ -120,62 +114,142 @@ test("should select 3 coins", (t) => {
     depositFeesAcc: Amounts.parseOrThrow("LOCAL:0.3"),
     lastDepositFee: Amounts.parseOrThrow("LOCAL:0.1"),
   });
-
 });
 
-test("can't select since the instructed amount is too high", (t) => {
-  const instructedAmount = Amounts.parseOrThrow("LOCAL:60")
+test("p2p: can't select since the instructed amount is too high", (t) => {
+  const instructedAmount = Amounts.parseOrThrow("LOCAL:60");
   const tally = {
     amountAcc: Amounts.zeroOfCurrency(instructedAmount.currency),
     depositFeesAcc: Amounts.zeroOfCurrency(instructedAmount.currency),
     lastDepositFee: Amounts.zeroOfCurrency(instructedAmount.currency),
   };
   const coins = testing_greedySelectPeer(
-    createCandidates([{
-      amount: "LOCAL:10",
-      numAvailable: 5,
-      depositFee: "LOCAL:0.1",
-      fromExchange: "http://exchange.localhost/",
-    }]),
-    instructedAmount, 
-    tally
+    createCandidates([
+      {
+        amount: "LOCAL:10",
+        numAvailable: 5,
+        depositFee: "LOCAL:0.1",
+        fromExchange: "http://exchange.localhost/",
+      },
+    ]),
+    instructedAmount,
+    tally,
   );
 
   expect(t, coins).deep.equal(undefined);
 
   expect(t, tally).deep.equal({
-    amountAcc: Amounts.parseOrThrow("LOCAL:49.5"),
+    amountAcc: Amounts.parseOrThrow("LOCAL:49"),
     depositFeesAcc: Amounts.parseOrThrow("LOCAL:0.5"),
     lastDepositFee: Amounts.parseOrThrow("LOCAL:0.1"),
   });
-
 });
 
+test("pay: select one coin to pay with fee", (t) => {
+  const payment = Amounts.parseOrThrow("LOCAL:2");
+  const exchangeWireFee = Amounts.parseOrThrow("LOCAL:0.1");
+  const zero = Amounts.zeroOfCurrency(payment.currency);
+  const tally = {
+    amountPayRemaining: payment,
+    amountWireFeeLimitRemaining: zero,
+    amountDepositFeeLimitRemaining: zero,
+    customerDepositFees: zero,
+    customerWireFees: zero,
+    wireFeeCoveredForExchange: new Set<string>(),
+    lastDepositFee: zero,
+  };
+  const coins = testing_selectGreedy(
+    {
+      auditors: [],
+      exchanges: [
+        {
+          exchangeBaseUrl: "http://exchange.localhost/",
+          exchangePub: "E5M8CGRDHXF1RCVP3B8TQCTDYNQ7T4XHWR5SVEQRGVVMVME41VJ0",
+        },
+      ],
+      contractTermsAmount: payment,
+      depositFeeLimit: zero,
+      wireFeeAmortization: 1,
+      wireFeeLimit: zero,
+      prevPayCoins: [],
+      wireMethod: "x-taler-bank",
+    },
+    createCandidates([
+      {
+        amount: "LOCAL:10",
+        numAvailable: 5,
+        depositFee: "LOCAL:0.1",
+        fromExchange: "http://exchange.localhost/",
+      },
+    ]),
+    { "http://exchange.localhost/": exchangeWireFee },
+    tally,
+  );
 
+  expect(t, coins).deep.equal({
+    "hash0;32;http://exchange.localhost/": {
+      exchangeBaseUrl: "http://exchange.localhost/",
+      denomPubHash: "hash0",
+      maxAge: 32,
+      contributions: [Amounts.parseOrThrow("LOCAL:2.2")],
+    },
+  });
 
+  expect(t, tally).deep.equal({
+    amountPayRemaining: Amounts.parseOrThrow("LOCAL:2"),
+    amountWireFeeLimitRemaining: zero,
+    amountDepositFeeLimitRemaining: zero,
+    customerDepositFees: zero,
+    customerWireFees: zero,
+    wireFeeCoveredForExchange: new Set(),
+    lastDepositFee: zero,
+  });
+});
 
-function createCandidates(ar: {amount: AmountString, depositFee: AmountString, numAvailable: number, fromExchange: string}[]): AvailableDenom[] {
-  return ar.map((r,idx) => {
+function createCandidates(
+  ar: {
+    amount: AmountString;
+    depositFee: AmountString;
+    numAvailable: number;
+    fromExchange: string;
+  }[],
+): AvailableDenom[] {
+  return ar.map((r, idx) => {
     return {
-      "denomPub": {
-        "age_mask": 0,
-        "cipher": DenomKeyType.Rsa,
-        "rsa_public_key": "PPP"
+      denomPub: {
+        age_mask: 0,
+        cipher: DenomKeyType.Rsa,
+        rsa_public_key: "PPP",
       },
-      "denomPubHash": `hash${idx}`,
-      "value": r.amount,
-      "feeDeposit": r.depositFee,
-      "feeRefresh": "LOCAL:0",
-      "feeRefund": "LOCAL:0",
-      "feeWithdraw": "LOCAL:0",
-      "stampExpireDeposit": inTheDistantFuture,
-      "stampExpireLegal": inTheDistantFuture,
-      "stampExpireWithdraw": inTheDistantFuture,
-      "stampStart": inThePast,
-      "exchangeBaseUrl": r.fromExchange,
-      "numAvailable": r.numAvailable,
-      "maxAge": 32,
-
-    }
-  })
+      denomPubHash: `hash${idx}`,
+      value: r.amount,
+      feeDeposit: r.depositFee,
+      feeRefresh: "LOCAL:0",
+      feeRefund: "LOCAL:0",
+      feeWithdraw: "LOCAL:0",
+      stampExpireDeposit: inTheDistantFuture,
+      stampExpireLegal: inTheDistantFuture,
+      stampExpireWithdraw: inTheDistantFuture,
+      stampStart: inThePast,
+      exchangeBaseUrl: r.fromExchange,
+      numAvailable: r.numAvailable,
+      maxAge: 32,
+    };
+  });
+}
+
+type Tester<T> = {
+  deep: {
+    equal(another: T): ReturnType<ExecutionContext["deepEqual"]>;
+    equals(another: T): ReturnType<ExecutionContext["deepEqual"]>;
+  };
+};
+
+function expect<T>(t: ExecutionContext, thing: T): Tester<T> {
+  return {
+    deep: {
+      equal: (another: T) => t.deepEqual(thing, another),
+      equals: (another: T) => t.deepEqual(thing, another),
+    },
+  };
 }