only convert btc

3 files changed, 8 insertions, 4 deletions

diff --git a/routes/liquid/fee.js b/routes/liquid/fee.js
index a6c29f41..fad69f13 100644
--- a/routes/liquid/fee.js
+++ b/routes/liquid/fee.js
@@ -59,6 +59,8 @@ liquidTx = async ({ address, asset, amount, feeRate, replaceable, user }) => {
     }
   );
 
+  l.info("funding tx for fee estimate", tx);
+
   tx = await node.fundRawTransaction(tx, params);
 
   let blinded = await node.blindRawTransaction(tx.hex);
diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js
index 05ecc21f..9d8923eb 100644
--- a/routes/liquid/receive.js
+++ b/routes/liquid/receive.js
@@ -287,9 +287,9 @@ setInterval(async () => {
     for (let i = 0; i < arr.length; i++) {
       const hash = arr[i];
 
-      let account, address, user, total;
+      let account, address, user, total, p;
       await db.transaction(async transaction => {
-        let p = await db.Payment.findOne({
+        p = await db.Payment.findOne({
           where: { hash, confirmed: 0, received: 1 },
           include: [
             {
@@ -343,7 +343,7 @@ setInterval(async () => {
       });
 
       let c = convert[address];
-      if (address && c) {
+      if (address && c && p.account.asset === network.assetHash) {
         l.info("liquid detected for conversion request", address, c.address, user.username);
 
         user.account = account;
diff --git a/routes/users.js b/routes/users.js
index 25a737ce..558d476d 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -438,7 +438,9 @@ app.get(
         type = "p2sh";
 
         // async request to node to bump its internal index but don't use result
-        lq.getNewAddress().catch((e) => l.warn("Problem bumping liquid address index", e.message))
+        lq.getNewAddress().catch(e =>
+          l.warn("Problem bumping liquid address index", e.message)
+        );
 
         i = parseInt(app.get("lqAddressIndex"));