Merge branch 'master' into feature-withdrawal-fee

2 files changed, 7 insertions, 9 deletions

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