From 3f4ef5ab89019353f1e989194c73c8a1528f96e2 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 21 May 2020 13:54:56 -0700
Subject: fix liquid send

---
 routes/liquid/fee.js  |  4 ++--
 routes/liquid/send.js | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/routes/liquid/fee.js b/routes/liquid/fee.js
index 24e6ff73..0b2a4d90 100644
--- a/routes/liquid/fee.js
+++ b/routes/liquid/fee.js
@@ -69,8 +69,8 @@ module.exports = async (req, res) => {
     let signed = await lq.walletSignPsbt(blinded);
 
     decoded = await lq.decodePsbt(signed.psbt);
-    feeRate = Math.round((decoded.fees * SATS * 1000) / decoded.vsize);
-    l.info("estimated", asset, feeRate );
+    feeRate = Math.round((decoded.fees.bitcoin * SATS * 1000) / decoded.tx.vsize);
+    l.info("estimated", asset, feeRate);
 
     res.send({ feeRate, tx, psbt });
   } catch (e) {
diff --git a/routes/liquid/send.js b/routes/liquid/send.js
index aa2763d1..89e9d8b7 100644
--- a/routes/liquid/send.js
+++ b/routes/liquid/send.js
@@ -11,18 +11,20 @@ module.exports = async (req, res) => {
     (await lq.getAddressInfo(address)).ismine &&
     (!Object.keys(addresses).includes(address) || address === user.liquid);
 
-  tx = await lq.decodePsbt(psbt);
+  let decoded = await lq.decodePsbt(psbt);
 
   let totals = {};
   let change = {};
   let fee = 0;
+  
+  let { tx: { vout } } = decoded;
 
-  for (let i = 0; i < tx.vout.length; i++) {
+  for (let i = 0; i < vout.length; i++) {
     let {
       asset,
       value,
       scriptPubKey: { type, addresses }
-    } = tx.vout[i];
+    } = vout[i];
 
     if (type === "fee") fee = toSats(value);
     else {
@@ -97,9 +99,10 @@ module.exports = async (req, res) => {
     if (config.liquid.walletpass)
       await lq.walletPassphrase(config.liquid.walletpass, 300);
 
-    hex = await lq.blindRawTransaction(hex);
-    rawtx = (await lq.signRawTransactionWithWallet(hex)).hex;
-    let txid = await lq.sendRawTransaction(rawtx);
+    let blinded = await lq.blindPsbt(psbt);
+    let signed = await lq.walletSignPsbt(blinded);
+    let finalized = await lq.finalizePsbt(signed.psbt);
+    let txid = await lq.sendRawTransaction(finalized.hex);
 
     let main;
     for (let i = 0; i < assets.length; i++) {
-- 
cgit v1.2.3