From 205b9ba828922e0ff8d1b47481a569d199d43201 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 24 May 2021 16:44:47 -0400
Subject: check for payment address

---
 routes/bitcoin/receive.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'routes/bitcoin')

diff --git a/routes/bitcoin/receive.js b/routes/bitcoin/receive.js
index 1784fd5f..e76c3664 100644
--- a/routes/bitcoin/receive.js
+++ b/routes/bitcoin/receive.js
@@ -154,8 +154,9 @@ setInterval(async () => {
           transaction
         });
 
-
-        ({ address, user } = p);
+ 
+        if (p && p.address) address = p.address;
+        if (p && p.user) user = p.user;
 
         if (p && p.account) {
           ({ account } = p);
@@ -179,16 +180,16 @@ setInterval(async () => {
           l.info("bitcoin confirmed", user.username, p.amount, p.tip);
           notify(user, `${total} SAT payment confirmed`);
         } else {
-          l.warn("couldn't find payment", hash);
+          l.warn("couldn't find bitcoin payment", hash);
         }
+
+        delete queue[hash];
       });
 
       let c = convert[address];
-      if (c) {
+      if (address && c) {
         user.account = account;
 
-        delete queue[hash];
-
         await sendLiquid({
           address: c.address,
           amount: total - 100,
@@ -198,6 +199,6 @@ setInterval(async () => {
       }
     }
   } catch (e) {
-    l.error("problem processing queued bitcoin transaction", e.message);
+    l.error("problem processing queued bitcoin transaction", e.message, e.stack);
   }
 }, 1000);
-- 
cgit v1.2.3