Don't retry too old invoices

stackernews · Jan 6, 2025 · 4c96c48 · 4c96c48
1 parent fcad2ba
commit 4c96c48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/api/resolvers/wallet.js b/api/resolvers/wallet.js
@@ -10,7 +10,8 @@ import {
   USER_ID, INVOICE_RETENTION_DAYS,
   PAID_ACTION_PAYMENT_METHODS,
   WALLET_CREATE_INVOICE_TIMEOUT_MS,
-  WALLET_RETRY_AFTER_MS
+  WALLET_RETRY_AFTER_MS,
+  WALLET_RETRY_BEFORE_MS
 } from '@/lib/constants'
 import { amountSchema, validateSchema, withdrawlSchema, lnAddrSchema } from '@/lib/validate'
 import assertGofacYourself from './ofac'
@@ -471,7 +472,10 @@ const resolvers = {
             SELECT id FROM "Invoice"
             WHERE "userId" = ${me.id}
             AND "actionState" = 'FAILED'
-            AND "cancelledAt" < now() - interval '${WALLET_RETRY_AFTER_MS} milliseconds'
+            AND now()::timestamp <@ tsrange(
+              "cancelledAt" + interval '${WALLET_RETRY_AFTER_MS} milliseconds',
+              "cancelledAt" + interval '${WALLET_RETRY_BEFORE_MS} milliseconds'
+            )
             AND "lockedAt" IS NULL
             ORDER BY id DESC
             FOR UPDATE SKIP LOCKED

diff --git a/lib/constants.js b/lib/constants.js
@@ -198,3 +198,4 @@ export const WALLET_CREATE_INVOICE_TIMEOUT_MS = 45_000
 // This must be high enough such that intermediate failed invoices that will be retried
 // by the client due to sender or receiver fallbacks are not returned to the client.
 export const WALLET_RETRY_AFTER_MS = 60_000
+export const WALLET_RETRY_BEFORE_MS = 86_400_000 // 24 hours