1 files changed, 42 insertions, 7 deletions
diff --git a/packages/taler-wallet-core/src/pay-peer-pull-credit.ts b/packages/taler-wallet-core/src/pay-peer-pull-credit.ts
index 840c244d0..3e7fdd36b 100644
--- a/packages/taler-wallet-core/src/pay-peer-pull-credit.ts
+++ b/packages/taler-wallet-core/src/pay-peer-pull-credit.ts
@@ -59,6 +59,7 @@ import {
   TombstoneTag,
   TransactionContext,
   constructTaskIdentifier,
+  requireExchangeTosAcceptedOrThrow,
 } from "./common.js";
 import {
   KycPendingInfo,
@@ -933,6 +934,11 @@ export async function checkPeerPullPaymentInitiation(
     Amounts.parseOrThrow(req.amount),
     undefined,
   );
+  if (wi.selectedDenoms.selectedDenoms.length === 0) {
+    throw Error(
+      `unable to check pull payment from ${exchangeUrl}, can't select denominations for instructed amount (${req.amount}`,
+    );
+  }
 
   logger.trace(`got withdrawal info`);
 
@@ -1021,7 +1027,8 @@ export async function initiatePeerPullPayment(
 
   const exchangeBaseUrl = maybeExchangeBaseUrl;
 
-  await fetchFreshExchange(wex, exchangeBaseUrl);
+  const exchange = await fetchFreshExchange(wex, exchangeBaseUrl);
+  requireExchangeTosAcceptedOrThrow(exchange);
 
   const mergeReserveInfo = await getMergeReserveInfo(wex, {
     exchangeBaseUrl: exchangeBaseUrl,
@@ -1039,7 +1046,10 @@ export async function initiatePeerPullPayment(
   const withdrawalGroupId = encodeCrock(getRandomBytes(32));
 
   const mergeReserveRowId = mergeReserveInfo.rowId;
-  checkDbInvariant(!!mergeReserveRowId);
+  checkDbInvariant(
+    !!mergeReserveRowId,
+    `merge reserve for ${exchangeBaseUrl} without rowid`,
+  );
 
   const contractEncNonce = encodeCrock(getRandomBytes(24));
 
@@ -1049,6 +1059,11 @@ export async function initiatePeerPullPayment(
     Amounts.parseOrThrow(req.partialContractTerms.amount),
     undefined,
   );
+  if (wi.selectedDenoms.selectedDenoms.length === 0) {
+    throw Error(
+      `unable to initiate pull payment from ${exchangeBaseUrl}, can't select denominations for instructed amount (${req.partialContractTerms.amount}`,
+    );
+  }
 
   const mergeTimestamp = TalerPreciseTimestamp.now();
 
@@ -1184,15 +1199,31 @@ export function computePeerPullCreditTransactionActions(
 ): TransactionAction[] {
   switch (pullCreditRecord.status) {
     case PeerPullPaymentCreditStatus.PendingCreatePurse:
-      return [TransactionAction.Abort, TransactionAction.Suspend];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Abort,
+        TransactionAction.Suspend,
+      ];
     case PeerPullPaymentCreditStatus.PendingMergeKycRequired:
-      return [TransactionAction.Abort, TransactionAction.Suspend];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Abort,
+        TransactionAction.Suspend,
+      ];
     case PeerPullPaymentCreditStatus.PendingReady:
-      return [TransactionAction.Abort, TransactionAction.Suspend];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Abort,
+        TransactionAction.Suspend,
+      ];
     case PeerPullPaymentCreditStatus.Done:
       return [TransactionAction.Delete];
     case PeerPullPaymentCreditStatus.PendingWithdrawing:
-      return [TransactionAction.Abort, TransactionAction.Suspend];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Abort,
+        TransactionAction.Suspend,
+      ];
     case PeerPullPaymentCreditStatus.SuspendedCreatePurse:
       return [TransactionAction.Resume, TransactionAction.Abort];
     case PeerPullPaymentCreditStatus.SuspendedReady:
@@ -1204,7 +1235,11 @@ export function computePeerPullCreditTransactionActions(
     case PeerPullPaymentCreditStatus.Aborted:
       return [TransactionAction.Delete];
     case PeerPullPaymentCreditStatus.AbortingDeletePurse:
-      return [TransactionAction.Suspend, TransactionAction.Fail];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Fail,
+      ];
     case PeerPullPaymentCreditStatus.Failed:
       return [TransactionAction.Delete];
     case PeerPullPaymentCreditStatus.Expired: