Merge branch 'master' into age-withdraw

1 files changed, 19 insertions, 6 deletions

diff --git a/packages/taler-wallet-core/src/util/coinSelection.ts b/packages/taler-wallet-core/src/util/coinSelection.ts
index 0885215dd..8c90f26f1 100644
--- a/packages/taler-wallet-core/src/util/coinSelection.ts
+++ b/packages/taler-wallet-core/src/util/coinSelection.ts
@@ -419,6 +419,11 @@ interface SelResult {
   };
 }
 
+export function testing_selectGreedy(
+  ...args: Parameters<typeof selectGreedy>
+): ReturnType<typeof selectGreedy> {
+  return selectGreedy(...args);
+}
 function selectGreedy(
   req: SelectPayCoinRequestNg,
   candidateDenoms: AvailableDenom[],
@@ -897,9 +902,12 @@ interface PeerCoinSelectionTally {
 /**
  * exporting for testing
  */
-export function testing_greedySelectPeer(...args: Parameters<typeof greedySelectPeer>): ReturnType<typeof greedySelectPeer> {
-  return greedySelectPeer(...args)
+export function testing_greedySelectPeer(
+  ...args: Parameters<typeof greedySelectPeer>
+): ReturnType<typeof greedySelectPeer> {
+  return greedySelectPeer(...args);
 }
+
 function greedySelectPeer(
   candidates: AvailableDenom[],
   instructedAmount: AmountLike,
@@ -918,11 +926,16 @@ function greedySelectPeer(
         instructedAmount,
         tally.amountAcc,
       ).amount;
-      const coinContrib = Amounts.sub(denom.value, denom.feeDeposit).amount
+      // Maximum amount the coin could effectively contribute.
+      const maxCoinContrib = Amounts.sub(denom.value, denom.feeDeposit).amount;
+
+      const coinSpend = Amounts.min(
+        Amounts.add(amountPayRemaining, denom.feeDeposit).amount,
+        maxCoinContrib,
+      );
 
-      const coinSpend = Amounts.min(amountPayRemaining, coinContrib)
-      
       tally.amountAcc = Amounts.add(tally.amountAcc, coinSpend).amount;
+      tally.amountAcc = Amounts.sub(tally.amountAcc, denom.feeDeposit).amount;
 
       tally.depositFeesAcc = Amounts.add(
         tally.depositFeesAcc,
@@ -930,7 +943,7 @@ function greedySelectPeer(
       ).amount;
 
       tally.lastDepositFee = Amounts.parseOrThrow(denom.feeDeposit);
-      
+
       contributions.push(coinSpend);
     }
     if (contributions.length > 0) {