p2p fallbacks and lnurlp

stackernews · Nov 9, 2024 · 707826c · 707826c
1 parent 9f9804a
commit 707826c
Show file tree

Hide file tree

Showing 39 changed files with 1,077 additions and 563 deletions.
diff --git a/api/paidAction/boost.js b/api/paidAction/boost.js
@@ -34,12 +34,12 @@ export async function perform ({ invoiceId, sats, id: itemId, ...args }, { me, c
 }
 
 export async function retry ({ invoiceId, newInvoiceId }, { tx, cost }) {
-  await tx.itemAct.updateMany({ where: { invoiceId }, data: { invoiceId: newInvoiceId, invoiceActionState: 'PENDING' } })
   const [{ id, path }] = await tx.$queryRaw`
     SELECT "Item".id, ltree2text(path) as path
     FROM "Item"
     JOIN "ItemAct" ON "Item".id = "ItemAct"."itemId"
-    WHERE "ItemAct"."invoiceId" = ${newInvoiceId}::INTEGER`
+    WHERE "ItemAct"."invoiceId" = ${invoiceId}::INTEGER`
+  await tx.itemAct.updateMany({ where: { invoiceId }, data: { invoiceId: newInvoiceId, invoiceActionState: 'PENDING' } })
   return { id, sats: msatsToSats(cost), act: 'BOOST', path }
 }
 

diff --git a/api/paidAction/downZap.js b/api/paidAction/downZap.js
@@ -35,12 +35,12 @@ export async function perform ({ invoiceId, sats, id: itemId }, { me, cost, tx }
 }
 
 export async function retry ({ invoiceId, newInvoiceId }, { tx, cost }) {
-  await tx.itemAct.updateMany({ where: { invoiceId }, data: { invoiceId: newInvoiceId, invoiceActionState: 'PENDING' } })
   const [{ id, path }] = await tx.$queryRaw`
     SELECT "Item".id, ltree2text(path) as path
     FROM "Item"
     JOIN "ItemAct" ON "Item".id = "ItemAct"."itemId"
-    WHERE "ItemAct"."invoiceId" = ${newInvoiceId}::INTEGER`
+    WHERE "ItemAct"."invoiceId" = ${invoiceId}::INTEGER`
+  await tx.itemAct.updateMany({ where: { invoiceId }, data: { invoiceId: newInvoiceId, invoiceActionState: 'PENDING' } })
   return { id, sats: msatsToSats(cost), act: 'DONT_LIKE_THIS', path }
 }