Merge branch 'master' into feature-withdrawal-fee

3 files changed, 11 insertions, 17 deletions

diff --git a/lib/sync.js b/lib/sync.js
index fedb6798..e217dcd0 100644
--- a/lib/sync.js
+++ b/lib/sync.js
@@ -116,7 +116,7 @@ const sync = async () => {
             preimage,
             rate: invoice.rate,
             received: true,
-            confirmed: false,
+            confirmed: true,
             network: "lightning",
             tip: invoice.tip,
             invoice_id: invoice.id,
@@ -124,7 +124,7 @@ const sync = async () => {
             updatedAt: createdAt
           });
 
-          // await account.increment({ balance: amount });
+          await account.increment({ balance: amount });
 
           l.info("lightning missing from account", account.id, amount);
         }
@@ -152,7 +152,7 @@ const sync = async () => {
     const transactions = [
       ...(await bc.listTransactions("*", 500)),
       ...(await lq.listTransactions("*", 500))
-    ].filter(tx => ["send", "receive"].includes(tx.category));
+    ].filter(tx => ["send", "receive"].includes(tx.category) && new Date(tx.time * 1000) > twoWeeksAgo);
 
     missed = transactions.filter(
       tx =>
@@ -163,7 +163,6 @@ const sync = async () => {
 
     for (let i = 0; i < missed.length; i++) {
       let p = unconfirmed.find(p => p.hash === missed[i].txid);
-      /*
       p.confirmed = 1;
 
       await db.transaction(async transaction => {
@@ -175,7 +174,6 @@ const sync = async () => {
 
       emit(p.user.username, "account", p.account);
       emit(p.user.username, "payment", p);
-      */
 
       l.info("unconfirmed tx", p.user_id, p.hash, p.address);
     }
@@ -253,8 +251,7 @@ const sync = async () => {
         amount = toSats(amount);
 
         await db.transaction(async transaction => {
-            l.info("found pending balance", user.username, amount);
-          /*
+          l.info("found pending transaction", user.username, amount, hash);
           payments.push(hash);
           let p = await db.Payment.create(
             {
@@ -278,7 +275,6 @@ const sync = async () => {
 
           emit(user.username, "account", account);
           emit(user.username, "payment", p);
-          */
         });
       }
     }
diff --git a/routes/liquid/fee.js b/routes/liquid/fee.js
index fad69f13..253810a9 100644
--- a/routes/liquid/fee.js
+++ b/routes/liquid/fee.js
@@ -49,14 +49,12 @@ liquidTx = async ({ address, asset, amount, feeRate, replaceable, user }) => {
 
   tx = await node.createRawTransaction(
     [],
-    {
-      [address]: (amount / SATS).toFixed(8)
-    },
+    [{
+      [address]: (amount / SATS).toFixed(8),
+      asset
+    }],
     0,
     replaceable,
-    {
-      [address]: asset
-    }
   );
 
   l.info("funding tx for fee estimate", tx);
@@ -78,7 +76,7 @@ module.exports = ah(async (req, res) => {
     let tx = await liquidTx({ ...req.body, user: req.user })
     res.send(tx);
   } catch (e) {
-    l.error("error estimating liquid fee", e.message);
+    l.error("error estimating liquid fee", e.message, e.stack);
     return res.status(500).send(e.message);
   }
 });
diff --git a/routes/send.js b/routes/send.js
index 5f1151c5..4c8afa34 100644
--- a/routes/send.js
+++ b/routes/send.js
@@ -61,7 +61,7 @@ module.exports = ah(async (req, res, next) => {
         rate: app.get("rates")[user.currency],
         currency: user.currency,
         confirmed: true,
-        hash: username ? `Payment to ${username}` : "Internal Transfer",
+        hash: `#${uuidv4().substr(0, 6)} ${(username ? `Payment to ${username}` : "Internal Transfer")}`,
         network: "COINOS"
       };
 
@@ -165,7 +165,7 @@ module.exports = ah(async (req, res, next) => {
           rate: app.get("rates")[recipient.currency] * spread,
           currency: recipient.currency,
           confirmed: true,
-          hash: "Payment from " + user.username,
+          hash: `#${uuidv4().substr(0,6)} Payment from ${user.username}`,
           memo,
           network: "COINOS",
           received: true