Check invoice status in finalizeAction

stackernews · May 23, 2024 · fb43c48 · fb43c48
1 parent d90c119
commit fb43c48
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/api/resolvers/item.js b/api/resolvers/item.js
@@ -1428,7 +1428,7 @@ export const createItem = async (parent, { forward, options, ...item }, { me, mo
         // since SubscribeToInvoices does not trigger if an invoice expired, we need a job that handles expired invoices
         await tx.$queryRaw`
           INSERT INTO pgboss.job (name, data, retrylimit, retrybackoff, startafter)
-          VALUES ('finalizeAction', jsonb_build_object('type', 'ITEM', 'id', ${item.id}::INTEGER), 21, true, ${expiresAt})`
+          VALUES ('finalizeAction', jsonb_build_object('hash', ${invoice.hash}::TEXT), 21, true, ${expiresAt})`
       }, { isolationLevel: Prisma.TransactionIsolationLevel.Serializable })
 
     // hmac is not required to submit action again but to allow user to cancel payment

diff --git a/api/resolvers/wallet.js b/api/resolvers/wallet.js
@@ -13,7 +13,7 @@ import assertGofacYourself from './ofac'
 import assertApiKeyNotPermitted from './apiKey'
 import { createInvoice as createInvoiceCLN } from '@/lib/cln'
 import { bolt11Tags } from '@/lib/bolt11'
-import { handleActionError } from 'worker/wallet'
+import { actionErrorQueries } from 'worker/action'
 
 export async function getInvoice (parent, { id }, { me, models, lnd }) {
   const inv = await models.invoice.findUnique({
@@ -391,7 +391,7 @@ export default {
             cancelled: true
           }
         }),
-        ...handleActionError({ data: inv, models })
+        ...actionErrorQueries({ data: inv, models })
       ], { models }
       )
       return { ...inv, cancelled: true }

diff --git a/worker/action.js b/worker/action.js
@@ -1,13 +1,19 @@
-import { handleActionError } from './wallet'
+import serialize from '@/api/resolvers/serial'
 
-export async function finalizeAction ({ data: { type, id }, models }) {
-  const queries = handleActionError({ data: { actionType: type, actionId: id }, models })
-  if (queries.length === 0) return
+export async function finalizeAction ({ data: { hash }, models }) {
+  const invoice = await models.invoice.findUnique({ where: { hash } })
+
+  if (invoice.confirmedAt) {
+    await handleAction({ data: invoice, models })
+    return
+  }
 
+  const queries = await actionErrorQueries({ data: invoice, models })
+  if (queries.length === 0) return
   await models.$transaction(queries)
 }
 
-export async function handleAction ({ data: { msatsReceived, actionType, actionId, actionData }, models }) {
+export async function handleAction ({ data: { actionType, actionId, actionData }, models }) {
   if (!actionType || !actionId) return
 
   if (actionType === 'ITEM') {
@@ -17,6 +23,10 @@ export async function handleAction ({ data: { msatsReceived, actionType, actionI
     const { cost } = actionData
     const item = await models.item.findUnique({ where: { id: actionId } })
 
+    if (item.status !== 'PENDING') {
+      return
+    }
+
     await serialize([
       models.item.update({
         where: {
@@ -46,7 +56,7 @@ export async function handleAction ({ data: { msatsReceived, actionType, actionI
   }
 }
 
-export function handleActionError ({ data: { actionType, actionId }, models }) {
+export function actionErrorQueries ({ data: { actionType, actionId }, models }) {
   if (!actionType || !actionId) return []
 
   if (actionType === 'ITEM') {

diff --git a/worker/wallet.js b/worker/wallet.js
@@ -9,7 +9,7 @@ import { datePivot, sleep } from '@/lib/time.js'
 import retry from 'async-retry'
 import { addWalletLog } from '@/api/resolvers/wallet'
 import { msatsToSats, numWithUnits } from '@/lib/format'
-import { handleAction, handleActionError } from './action'
+import { handleAction, actionErrorQueries } from './action'
 
 export async function subscribeToWallet (args) {
   await subscribeToDeposits(args)
@@ -176,7 +176,7 @@ async function checkInvoice ({ data: { hash }, boss, models, lnd }) {
           cancelled: true
         }
       }),
-      ...handleActionError({ data: dbInv, models })
+      ...actionErrorQueries({ data: dbInv, models })
     ], { models })
   }
 }