remove upper receive range limit for lightning

2 files changed, 11 insertions, 7 deletions

diff --git a/lib/sync.js b/lib/sync.js
index d6adba2e..fedb6798 100644
--- a/lib/sync.js
+++ b/lib/sync.js
@@ -116,7 +116,7 @@ const sync = async () => {
             preimage,
             rate: invoice.rate,
             received: true,
-            confirmed: true,
+            confirmed: false,
             network: "lightning",
             tip: invoice.tip,
             invoice_id: invoice.id,
@@ -124,9 +124,9 @@ const sync = async () => {
             updatedAt: createdAt
           });
 
-          await account.increment({ balance: amount });
+          // await account.increment({ balance: amount });
 
-          l.info("rectified account", account.id, amount);
+          l.info("lightning missing from account", account.id, amount);
         }
       }
     }
@@ -185,7 +185,9 @@ const sync = async () => {
     transactions.map(tx => {
       if (
         !payments.find(p => p.hash === tx.txid) &&
-        !exceptions.includes(tx.txid)
+        !exceptions.includes(tx.txid) &&
+        !unaccounted.find(a => a.txid === tx.txid) &&
+        new Date(tx.blocktime * 1000) >= twoWeeksAgo
       ) {
         unaccounted.push(tx);
       }
@@ -251,6 +253,8 @@ const sync = async () => {
         amount = toSats(amount);
 
         await db.transaction(async transaction => {
+            l.info("found pending balance", user.username, amount);
+          /*
           payments.push(hash);
           let p = await db.Payment.create(
             {
@@ -272,10 +276,9 @@ const sync = async () => {
 
           await account.increment({ pending: amount }, { transaction });
 
-          l.info("found pending balance", user.username, amount);
-
           emit(user.username, "account", account);
           emit(user.username, "payment", p);
+          */
         });
       }
     }
diff --git a/routes/lightning/receive.js b/routes/lightning/receive.js
index ffc0ae03..6723d577 100644
--- a/routes/lightning/receive.js
+++ b/routes/lightning/receive.js
@@ -1,4 +1,5 @@
 const handlePayment = async (msg) => {
+  l.info("incoming lightning payment", msg.value, msg.payment_request, msg.settled);
   if (!msg.settled) return;
   let account, total, user;
 
@@ -15,7 +16,7 @@ const handlePayment = async (msg) => {
     await db.transaction(async (transaction) => {
       const { text: hash, currency, memo, rate, tip, user_id } = invoice;
       const amount = parseInt(msg.amt_paid_sat) - tip;
-      if (amount > 10000000 || amount < 0)
+      if (amount < 0)
         throw new Error("amount out of range");
 
       account = await db.Account.findOne({