wallet-core: fix creation of refresh session after peer-{push,pull}

4 files changed, 12 insertions, 6 deletions

diff --git a/packages/taler-util/src/walletTypes.ts b/packages/taler-util/src/walletTypes.ts
index 43570c44c..a993f29a0 100644
--- a/packages/taler-util/src/walletTypes.ts
+++ b/packages/taler-util/src/walletTypes.ts
@@ -523,7 +523,9 @@ export interface PlanchetCreationRequest {
  */
 export enum RefreshReason {
   Manual = "manual",
-  Pay = "pay",
+  PayMerchant = "pay-merchant",
+  PayPeerPush = "pay-peer-push",
+  PayPeerPull = "pay-peer-pull",
   Refund = "refund",
   AbortPay = "abort-pay",
   Recoup = "recoup",
diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts
index 57d7449e0..ff7ff0d03 100644
--- a/packages/taler-wallet-core/src/operations/backup/import.ts
+++ b/packages/taler-wallet-core/src/operations/backup/import.ts
@@ -810,7 +810,7 @@ export async function importBackup(
               reason = RefreshReason.Manual;
               break;
             case BackupRefreshReason.Pay:
-              reason = RefreshReason.Pay;
+              reason = RefreshReason.PayMerchant;
               break;
             case BackupRefreshReason.Recoup:
               reason = RefreshReason.Recoup;
diff --git a/packages/taler-wallet-core/src/operations/pay.ts b/packages/taler-wallet-core/src/operations/pay.ts
index 8193bf86a..3d4d2b5a0 100644
--- a/packages/taler-wallet-core/src/operations/pay.ts
+++ b/packages/taler-wallet-core/src/operations/pay.ts
@@ -409,7 +409,7 @@ export async function applyCoinSpend(
   const refreshCoinPubs = coinSelection.coinPubs.map((x) => ({
     coinPub: x,
   }));
-  await createRefreshGroup(ws, tx, refreshCoinPubs, RefreshReason.Pay);
+  await createRefreshGroup(ws, tx, refreshCoinPubs, RefreshReason.PayMerchant);
 }
 
 /**
diff --git a/packages/taler-wallet-core/src/operations/peer-to-peer.ts b/packages/taler-wallet-core/src/operations/peer-to-peer.ts
index 965dfd8ed..9ce460ad6 100644
--- a/packages/taler-wallet-core/src/operations/peer-to-peer.ts
+++ b/packages/taler-wallet-core/src/operations/peer-to-peer.ts
@@ -214,7 +214,6 @@ export async function initiatePeerToPeerPush(
   ws: InternalWalletState,
   req: InitiatePeerPushPaymentRequest,
 ): Promise<InitiatePeerPushPaymentResponse> {
-  // FIXME: actually create a record for retries here!
   const instructedAmount = Amounts.parseOrThrow(req.amount);
 
   const pursePair = await ws.cryptoApi.createEddsaKeypair({});
@@ -265,6 +264,7 @@ export async function initiatePeerToPeerPush(
           Amounts.parseOrThrow(c.contribution),
         ).amount;
         coin.status = CoinStatus.Dormant;
+        pubs.push({ coinPub: coin.coinPub });
         await tx.coins.put(coin);
       }
 
@@ -283,7 +283,7 @@ export async function initiatePeerToPeerPush(
         timestampCreated: TalerProtocolTimestamp.now(),
       });
 
-      await createRefreshGroup(ws, tx, pubs, RefreshReason.Pay);
+      await createRefreshGroup(ws, tx, pubs, RefreshReason.PayPeerPush);
 
       return sel;
     });
@@ -601,10 +601,11 @@ export async function acceptPeerPullPayment(
           Amounts.parseOrThrow(c.contribution),
         ).amount;
         coin.status = CoinStatus.Dormant;
+        pubs.push({ coinPub: coin.coinPub });
         await tx.coins.put(coin);
       }
 
-      await createRefreshGroup(ws, tx, pubs, RefreshReason.Pay);
+      await createRefreshGroup(ws, tx, pubs, RefreshReason.PayPeerPull);
 
       const pi = await tx.peerPullPaymentIncoming.get(
         req.peerPullPaymentIncomingId,
@@ -711,6 +712,9 @@ export async function checkPeerPullPayment(
   };
 }
 
+/**
+ * Initiate a peer pull payment.
+ */
 export async function initiatePeerRequestForPay(
   ws: InternalWalletState,
   req: InitiatePeerPullPaymentRequest,