give two more chances to retry an invoice with fee credit and manually

api/paidAction/index.js

@@ -79,6 +79,8 @@ export default async function performPaidAction (actionType, args, context) {
     context.descriptionHash = context.descriptionHash ?? (paidAction.describeHash ? await paidAction.describeHash(args, context) : undefined)
     context.fallbackToSN = context.fallbackToSN ?? true
     context.actionAttempt = context.actionAttempt ?? 0
+    context.retriedWithFeeCredits = context.retriedWithFeeCredits ?? false
+    context.retriedManually = context.retriedManually ?? false
 
     const { me, forceFeeCredits, cost, description, descriptionHash, sybilFeePercent, fallbackToSN, disableFeeCredit, actionAttempt } = context
     let canPerformOptimistically = paidAction.supportsOptimism
@@ -263,7 +265,22 @@ export async function retryPaidAction (actionType, { invoice, forceFeeCredits },
     throw new Error(`retryPaidAction - missing invoice ${actionType}`)
   }
 
-  if (!failedInvoice.retriable && !forceFeeCredits) { // always retriable with fee credits
+  let retriable = false
+  if (failedInvoice.retriable) retriable = true
+  context.retriedWithFeeCredits = !failedInvoice.retriableWithFeeCredits
+  context.retriedManually = !failedInvoice.retriableManually
+
+  if (forceFeeCredits && failedInvoice.retriableWithFeeCredits) {
+    retriable = true
+    context.retriedWithFeeCredits = true
+  }
+
+  if (!retriable && failedInvoice.retriableManually) {
+    retriable = true
+    context.retriedManually = true
+  }
+
+  if (!retriable) {
     throw new Error(`retryPaidAction - invoice is not retriable ${actionType}`)
   }
 
@@ -295,7 +312,7 @@ export async function retryPaidAction (actionType, { invoice, forceFeeCredits },
   }, { isolationLevel: Prisma.TransactionIsolationLevel.ReadCommitted })
 }
 
-export async function createDbInvoice (invoiceData, actionData, { me, models, tx }) {
+export async function createDbInvoice (invoiceData, actionData, { me, models, tx, retriedWithFeeCredits, retriedManually }) {
   const { invoice: servedBolt11, wallet, maxFee, preimage, innerInvoice: bolt11, isWrapped, isHodl, isFeeCredit } = invoiceData
   const { actionId, actionType, optimistic: isOptimisticAction, args } = actionData
 
@@ -338,7 +355,9 @@ export async function createDbInvoice (invoiceData, actionData, { me, models, tx
     expiresAt,
     actionId,
     desc: invoiceData.description ?? servedInvoice.description,
-    retriable: invoiceData.retriable
+    retriable: invoiceData.retriable,
+    retriableWithFeeCredits: retriedWithFeeCredits ? invoiceData.retriable : true,
+    retriableManually: retriedManually ? invoiceData.retriable : true
   }
 
   let invoiceEntry

components/use-paid-mutation.js

@@ -90,8 +90,6 @@ export function usePaidMutation (mutation,
     }
 
     if (alwaysShowQROnFailure) {
-      // TODO give another change to retry manually
-      // currently this fails because all the retry are exhausted
       console.log('show qr code for manual payment')
       const retry = await retryPaidAction({ variables: { invoiceId: parseInt(invoice.id) } })
       response = retry.data?.retryPaidAction

prisma/schema.prisma

@@ -913,6 +913,8 @@ model Invoice {
   comment        String?
   lud18Data      Json?
   retriable      Boolean         @default(false)
+  retriableWithFeeCredits Boolean  @default(true)
+  retriableManually      Boolean  @default(true)
 
   user           User            @relation(fields: [userId], references: [id], onDelete: Cascade)
   invoiceForward InvoiceForward?