From b075ae593d619a860c0b38350cada35f29f65c23 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 9 Sep 2022 10:27:32 -0400
Subject: use actual received amount for lightning payments

---
 lib/sync.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/sync.js')

diff --git a/lib/sync.js b/lib/sync.js
index 7b72b20a..536bd582 100644
--- a/lib/sync.js
+++ b/lib/sync.js
@@ -80,14 +80,14 @@ const sync = async () => {
     let recent = invoices
       .filter(
         i =>
-          i.settled &&
-          differenceInDays(new Date(), new Date(i.settle_date * 1000)) < 2
+          i.secret &&
+          differenceInDays(new Date(), new Date(i.created_at)) < 2
       )
       .map(i => ({
-        amount: parseInt(i.amt_paid_sat),
-        preimage: i.r_preimage.toString("hex"),
-        pr: i.payment_request.toString("hex"),
-        createdAt: new Date(i.settle_date * 1000)
+        amount: parseInt(i.received),
+        preimage: i.secret,
+        pr: i.request.toString("hex"),
+        createdAt: new Date(i.created_at)
       }));
 
     const twoDaysAgo = new Date(new Date().setDate(new Date().getDate() - 2));
-- 
cgit v1.2.3


From 86c59fc85cba222abc6dbe82d862ca45892a27c8 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 9 Sep 2022 14:27:02 -0400
Subject: remove cancelled ln payments

---
 lib/sync.js | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'lib/sync.js')

diff --git a/lib/sync.js b/lib/sync.js
index 536bd582..57f0c507 100644
--- a/lib/sync.js
+++ b/lib/sync.js
@@ -75,12 +75,14 @@ const sync = async () => {
       ]
     });
 
-    let { invoices } = await getInvoices({ lnd, limit: 200 });
+    let { invoices } = await getInvoices({ lnd, limit: 1000 });
+    let x = invoices.find(i => i.request.includes('lnbc10100u1p333l3lpp5znwsrpr9g'));
+    let cancelled = invoices.filter(i => i.is_canceled);
 
     let recent = invoices
       .filter(
         i =>
-          i.secret &&
+          i.is_confirmed &&
           differenceInDays(new Date(), new Date(i.created_at)) < 2
       )
       .map(i => ({
@@ -98,6 +100,28 @@ const sync = async () => {
       })
     ).map(p => p.preimage);
 
+    for (let i = 0; i < cancelled.length; i++) {
+      let c = cancelled[i];
+      if (settled.includes(c.secret)) {
+        await db.transaction(async transaction => {
+          let p = await db.Payment.findOne({
+            where: {
+              preimage: c.secret
+            },
+            include: {
+              model: db.Account,
+              as: "account"
+            },
+            transaction
+          }); 
+
+          console.log("destroying", p.id);
+          await p.account.decrement({ balance: p.amount }, { transaction });
+          await p.destroy({ transaction });
+        });
+      }
+    } 
+
     let missed = recent.filter(i => !settled.includes(i.preimage));
     for (let i = 0; i < missed.length; i++) {
       let { amount, preimage, pr: text, createdAt } = missed[i];
-- 
cgit v1.2.3


From b83e7189e66c4d4f04a029268e87af185bf7aee7 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 9 Sep 2022 14:27:28 -0400
Subject: remove cancelled fix

---
 lib/sync.js | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'lib/sync.js')

diff --git a/lib/sync.js b/lib/sync.js
index 57f0c507..62d13b24 100644
--- a/lib/sync.js
+++ b/lib/sync.js
@@ -100,28 +100,6 @@ const sync = async () => {
       })
     ).map(p => p.preimage);
 
-    for (let i = 0; i < cancelled.length; i++) {
-      let c = cancelled[i];
-      if (settled.includes(c.secret)) {
-        await db.transaction(async transaction => {
-          let p = await db.Payment.findOne({
-            where: {
-              preimage: c.secret
-            },
-            include: {
-              model: db.Account,
-              as: "account"
-            },
-            transaction
-          }); 
-
-          console.log("destroying", p.id);
-          await p.account.decrement({ balance: p.amount }, { transaction });
-          await p.destroy({ transaction });
-        });
-      }
-    } 
-
     let missed = recent.filter(i => !settled.includes(i.preimage));
     for (let i = 0; i < missed.length; i++) {
       let { amount, preimage, pr: text, createdAt } = missed[i];
-- 
cgit v1.2.3