Fix fallbacks during last retry

stackernews · Jan 8, 2025 · e752aae · e752aae
1 parent 09cb758
commit e752aae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/api/paidAction/index.js b/api/paidAction/index.js
@@ -328,9 +328,7 @@ export async function retryPaidAction (actionType, args, incomingContext) {
     me: await models.user.findUnique({ where: { id: parseInt(me.id) } }),
     cost: BigInt(msatsRequested),
     actionId,
-    predecessorId: failedInvoice.id,
-    // a locked invoice means we're retrying a payment from the beginning with all sender and receiver wallets
-    retry: failedInvoice.lockedAt ? failedInvoice.retry + 1 : failedInvoice.retry
+    predecessorId: failedInvoice.id
   }
 
   let invoiceArgs

diff --git a/api/resolvers/paidAction.js b/api/resolvers/paidAction.js
@@ -67,11 +67,14 @@ export default {
         throw new Error(`Invoice is not in failed state: ${invoice.actionState}`)
       }
 
-      if (invoice.retry >= WALLET_MAX_RETRIES) {
+      // a locked invoice means we want to retry a payment from the beginning
+      // with all sender and receiver wallets so we need to increment the retry count
+      const retry = invoice.lockedAt ? invoice.retry + 1 : invoice.retry
+      if (retry > WALLET_MAX_RETRIES) {
         throw new Error('Payment has been retried too many times')
       }
 
-      const result = await retryPaidAction(invoice.actionType, { invoice }, { models, me, lnd })
+      const result = await retryPaidAction(invoice.actionType, { invoice }, { retry, models, me, lnd })
 
       return {
         ...result,