wallet-core: report 'retry' as part of transaction actions where applicable

7 files changed, 151 insertions, 41 deletions

diff --git a/packages/taler-wallet-core/src/deposits.ts b/packages/taler-wallet-core/src/deposits.ts
index 32b22c1ef..2004c12cb 100644
--- a/packages/taler-wallet-core/src/deposits.ts
+++ b/packages/taler-wallet-core/src/deposits.ts
@@ -387,11 +387,19 @@ export function computeDepositTransactionActions(
     case DepositOperationStatus.Finished:
       return [TransactionAction.Delete];
     case DepositOperationStatus.PendingDeposit:
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Abort,
+      ];
     case DepositOperationStatus.SuspendedDeposit:
       return [TransactionAction.Resume];
     case DepositOperationStatus.Aborting:
-      return [TransactionAction.Fail, TransactionAction.Suspend];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Fail,
+        TransactionAction.Suspend,
+      ];
     case DepositOperationStatus.Aborted:
       return [TransactionAction.Delete];
     case DepositOperationStatus.Failed:
@@ -399,9 +407,17 @@ export function computeDepositTransactionActions(
     case DepositOperationStatus.SuspendedAborting:
       return [TransactionAction.Resume, TransactionAction.Fail];
     case DepositOperationStatus.PendingKyc:
-      return [TransactionAction.Suspend, TransactionAction.Fail];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Fail,
+      ];
     case DepositOperationStatus.PendingTrack:
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Abort,
+      ];
     case DepositOperationStatus.SuspendedKyc:
       return [TransactionAction.Resume, TransactionAction.Fail];
     case DepositOperationStatus.SuspendedTrack:
diff --git a/packages/taler-wallet-core/src/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts
index 41e1b3c9e..91ea4bd1d 100644
--- a/packages/taler-wallet-core/src/pay-merchant.ts
+++ b/packages/taler-wallet-core/src/pay-merchant.ts
@@ -34,7 +34,6 @@ import {
   assertUnreachable,
   AsyncFlag,
   checkDbInvariant,
-  CheckPaymentResponse,
   CheckPayTemplateReponse,
   CheckPayTemplateRequest,
   codecForAbortResponse,
@@ -1027,11 +1026,17 @@ async function storeFirstPaySuccess(
       purchase.merchantPaySig = payResponse.sig;
       purchase.posConfirmation = payResponse.pos_confirmation;
       const dl = purchase.download;
-      checkDbInvariant(!!dl, `purchase ${purchase.orderId} without ct downloaded`);
+      checkDbInvariant(
+        !!dl,
+        `purchase ${purchase.orderId} without ct downloaded`,
+      );
       const contractTermsRecord = await tx.contractTerms.get(
         dl.contractTermsHash,
       );
-      checkDbInvariant(!!contractTermsRecord, `no contract terms found for purchase ${purchase.orderId}`);
+      checkDbInvariant(
+        !!contractTermsRecord,
+        `no contract terms found for purchase ${purchase.orderId}`,
+      );
       const contractData = extractContractData(
         contractTermsRecord.contractTermsRaw,
         dl.contractTermsHash,
@@ -2650,21 +2655,45 @@ export function computePayMerchantTransactionActions(
   switch (purchaseRecord.purchaseStatus) {
     // Pending States
     case PurchaseStatus.PendingDownloadingProposal:
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Abort,
+      ];
     case PurchaseStatus.PendingPaying:
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Abort,
+      ];
     case PurchaseStatus.PendingPayingReplay:
       // Special "abort" since it goes back to "done".
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Abort,
+      ];
     case PurchaseStatus.PendingQueryingAutoRefund:
       // Special "abort" since it goes back to "done".
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Abort,
+      ];
     case PurchaseStatus.PendingQueryingRefund:
       // Special "abort" since it goes back to "done".
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Abort,
+      ];
     case PurchaseStatus.PendingAcceptRefund:
       // Special "abort" since it goes back to "done".
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Abort,
+      ];
     // Suspended Pending States
     case PurchaseStatus.SuspendedDownloadingProposal:
       return [TransactionAction.Resume, TransactionAction.Abort];
@@ -2684,14 +2713,18 @@ export function computePayMerchantTransactionActions(
       return [TransactionAction.Resume, TransactionAction.Abort];
     // Aborting States
     case PurchaseStatus.AbortingWithRefund:
-      return [TransactionAction.Fail, TransactionAction.Suspend];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Fail,
+        TransactionAction.Suspend,
+      ];
     case PurchaseStatus.SuspendedAbortingWithRefund:
       return [TransactionAction.Fail, TransactionAction.Resume];
     // Dialog States
     case PurchaseStatus.DialogProposed:
-      return [];
+      return [TransactionAction.Retry];
     case PurchaseStatus.DialogShared:
-      return [];
+      return [TransactionAction.Retry];
     // Final States
     case PurchaseStatus.AbortedProposalRefused:
     case PurchaseStatus.AbortedOrderDeleted:
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 14b3eeaf0..b7fb13da3 100644
--- a/packages/taler-wallet-core/src/pay-peer-pull-credit.ts
+++ b/packages/taler-wallet-core/src/pay-peer-pull-credit.ts
@@ -1039,7 +1039,10 @@ export async function initiatePeerPullPayment(
   const withdrawalGroupId = encodeCrock(getRandomBytes(32));
 
   const mergeReserveRowId = mergeReserveInfo.rowId;
-  checkDbInvariant(!!mergeReserveRowId, `merge reserve for ${exchangeBaseUrl} without rowid`);
+  checkDbInvariant(
+    !!mergeReserveRowId,
+    `merge reserve for ${exchangeBaseUrl} without rowid`,
+  );
 
   const contractEncNonce = encodeCrock(getRandomBytes(24));
 
@@ -1184,15 +1187,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 +1223,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:
diff --git a/packages/taler-wallet-core/src/pay-peer-pull-debit.ts b/packages/taler-wallet-core/src/pay-peer-pull-debit.ts
index 0355b58ad..e9be15026 100644
--- a/packages/taler-wallet-core/src/pay-peer-pull-debit.ts
+++ b/packages/taler-wallet-core/src/pay-peer-pull-debit.ts
@@ -1000,7 +1000,7 @@ export function computePeerPullDebitTransactionActions(
 ): TransactionAction[] {
   switch (pullDebitRecord.status) {
     case PeerPullDebitRecordStatus.DialogProposed:
-      return [];
+      return [TransactionAction.Retry, TransactionAction.Delete];
     case PeerPullDebitRecordStatus.PendingDeposit:
       return [TransactionAction.Abort, TransactionAction.Suspend];
     case PeerPullDebitRecordStatus.Done:
diff --git a/packages/taler-wallet-core/src/pay-peer-push-credit.ts b/packages/taler-wallet-core/src/pay-peer-push-credit.ts
index 1476a0f4b..6d9f329e5 100644
--- a/packages/taler-wallet-core/src/pay-peer-push-credit.ts
+++ b/packages/taler-wallet-core/src/pay-peer-push-credit.ts
@@ -872,7 +872,10 @@ export async function processPeerPushCredit(
     `processing peerPushCredit in state ${peerInc.status.toString(16)}`,
   );
 
-  checkDbInvariant(!!contractTerms, `not contract terms for peer push ${peerPushCreditId}`);
+  checkDbInvariant(
+    !!contractTerms,
+    `not contract terms for peer push ${peerPushCreditId}`,
+  );
 
   switch (peerInc.status) {
     case PeerPushCreditStatus.PendingMergeKycRequired: {
@@ -1011,15 +1014,27 @@ export function computePeerPushCreditTransactionActions(
 ): TransactionAction[] {
   switch (pushCreditRecord.status) {
     case PeerPushCreditStatus.DialogProposed:
-      return [TransactionAction.Delete];
+      return [TransactionAction.Retry, TransactionAction.Delete];
     case PeerPushCreditStatus.PendingMerge:
-      return [TransactionAction.Abort, TransactionAction.Suspend];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Abort,
+        TransactionAction.Suspend,
+      ];
     case PeerPushCreditStatus.Done:
       return [TransactionAction.Delete];
     case PeerPushCreditStatus.PendingMergeKycRequired:
-      return [TransactionAction.Abort, TransactionAction.Suspend];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Abort,
+        TransactionAction.Suspend,
+      ];
     case PeerPushCreditStatus.PendingWithdrawing:
-      return [TransactionAction.Suspend, TransactionAction.Fail];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Fail,
+      ];
     case PeerPushCreditStatus.SuspendedMerge:
       return [TransactionAction.Resume, TransactionAction.Abort];
     case PeerPushCreditStatus.SuspendedMergeKycRequired:
diff --git a/packages/taler-wallet-core/src/pay-peer-push-debit.ts b/packages/taler-wallet-core/src/pay-peer-push-debit.ts
index 3a936fb04..f8e6adb3c 100644
--- a/packages/taler-wallet-core/src/pay-peer-push-debit.ts
+++ b/packages/taler-wallet-core/src/pay-peer-push-debit.ts
@@ -406,7 +406,10 @@ async function handlePurseCreationConflict(
   const instructedAmount = Amounts.parseOrThrow(peerPushInitiation.amount);
   const sel = peerPushInitiation.coinSel;
 
-  checkDbInvariant(!!sel, `no coin selected for peer push initiation ${peerPushInitiation.pursePub}`);
+  checkDbInvariant(
+    !!sel,
+    `no coin selected for peer push initiation ${peerPushInitiation.pursePub}`,
+  );
 
   const repair: PreviousPayCoins = [];
 
@@ -1218,17 +1221,37 @@ export function computePeerPushDebitTransactionActions(
 ): TransactionAction[] {
   switch (ppiRecord.status) {
     case PeerPushDebitStatus.PendingCreatePurse:
-      return [TransactionAction.Abort, TransactionAction.Suspend];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Abort,
+        TransactionAction.Suspend,
+      ];
     case PeerPushDebitStatus.PendingReady:
-      return [TransactionAction.Abort, TransactionAction.Suspend];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Abort,
+        TransactionAction.Suspend,
+      ];
     case PeerPushDebitStatus.Aborted:
       return [TransactionAction.Delete];
     case PeerPushDebitStatus.AbortingDeletePurse:
-      return [TransactionAction.Suspend, TransactionAction.Fail];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Fail,
+      ];
     case PeerPushDebitStatus.AbortingRefreshDeleted:
-      return [TransactionAction.Suspend, TransactionAction.Fail];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Fail,
+      ];
     case PeerPushDebitStatus.AbortingRefreshExpired:
-      return [TransactionAction.Suspend, TransactionAction.Fail];
+      return [
+        TransactionAction.Retry,
+        TransactionAction.Suspend,
+        TransactionAction.Fail,
+      ];
     case PeerPushDebitStatus.SuspendedAbortingRefreshExpired:
       return [TransactionAction.Resume, TransactionAction.Fail];
     case PeerPushDebitStatus.SuspendedAbortingDeletePurse:
diff --git a/packages/taler-wallet-core/src/withdraw.ts b/packages/taler-wallet-core/src/withdraw.ts
index dbd7e8673..b88b1d5c6 100644
--- a/packages/taler-wallet-core/src/withdraw.ts
+++ b/packages/taler-wallet-core/src/withdraw.ts
@@ -731,15 +731,15 @@ export function computeWithdrawalTransactionActions(
     case WithdrawalGroupStatus.Done:
       return [TransactionAction.Delete];
     case WithdrawalGroupStatus.PendingRegisteringBank:
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [TransactionAction.Retry, TransactionAction.Suspend, TransactionAction.Abort];
     case WithdrawalGroupStatus.PendingReady:
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [TransactionAction.Retry, TransactionAction.Suspend, TransactionAction.Abort];
     case WithdrawalGroupStatus.PendingQueryingStatus:
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [TransactionAction.Retry, TransactionAction.Suspend, TransactionAction.Abort];
     case WithdrawalGroupStatus.PendingWaitConfirmBank:
-      return [TransactionAction.Suspend, TransactionAction.Abort];
+      return [TransactionAction.Retry, TransactionAction.Suspend, TransactionAction.Abort];
     case WithdrawalGroupStatus.AbortingBank:
-      return [TransactionAction.Suspend, TransactionAction.Fail];
+      return [TransactionAction.Retry, TransactionAction.Suspend, TransactionAction.Fail];
     case WithdrawalGroupStatus.SuspendedAbortingBank:
       return [TransactionAction.Resume, TransactionAction.Fail];
     case WithdrawalGroupStatus.SuspendedQueryingStatus:
@@ -751,9 +751,9 @@ export function computeWithdrawalTransactionActions(
     case WithdrawalGroupStatus.SuspendedReady:
       return [TransactionAction.Resume, TransactionAction.Abort];
     case WithdrawalGroupStatus.PendingAml:
-      return [TransactionAction.Resume, TransactionAction.Abort];
+      return [TransactionAction.Retry, TransactionAction.Resume, TransactionAction.Abort];
     case WithdrawalGroupStatus.PendingKyc:
-      return [TransactionAction.Resume, TransactionAction.Abort];
+      return [TransactionAction.Retry, TransactionAction.Resume, TransactionAction.Abort];
     case WithdrawalGroupStatus.SuspendedAml:
       return [TransactionAction.Resume, TransactionAction.Abort];
     case WithdrawalGroupStatus.SuspendedKyc: