diff options
| -rw-r--r-- | routes/bitcoin/fee.js | 7 | ||||
| -rw-r--r-- | routes/liquid/fee.js | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/routes/bitcoin/fee.js b/routes/bitcoin/fee.js index 259f2329..a2c63660 100644 --- a/routes/bitcoin/fee.js +++ b/routes/bitcoin/fee.js @@ -14,10 +14,13 @@ module.exports = async (req, res) => { subtractFeeFromOutputs: amount === user.balance ? [0] : [] } - if (feeRate) params["feeRate"] = (parseInt(feeRate) / SATS * 1000).toFixed(8); + if (feeRate) params["feeRate"] = (feeRate / SATS * 1000).toFixed(8); tx = await bc.fundRawTransaction(tx, params); - res.send({ tx }); + let decoded = await bc.decodeRawTransaction(tx.hex); + /* TODO: figure out why this 0.8 multiplier seems necessary */ + feeRate = (tx.fee * SATS / decoded.vsize) * 1000 * 0.80145; + res.send({ feeRate, tx }); } catch (e) { l.error("bitcoin fee estimation error", e); return res.status(500).send(e.message); diff --git a/routes/liquid/fee.js b/routes/liquid/fee.js index cf581905..ac1a1a49 100644 --- a/routes/liquid/fee.js +++ b/routes/liquid/fee.js @@ -14,10 +14,14 @@ module.exports = async (req, res) => { subtractFeeFromOutputs: amount === user.balance ? [0] : [] } - if (feeRate) params.feeRate = (parseFloat(feeRate) / SATS * 1000).toFixed(8); + if (feeRate) params["feeRate"] = (feeRate / SATS * 1000).toFixed(8); tx = await lq.fundRawTransaction(tx, params); - res.send({ tx }); + let decoded = await lq.decodeRawTransaction(tx.hex); + /* TODO: figure out why this multiplier seems necessary */ + feeRate = (tx.fee * SATS / decoded.size) * 1000 * 0.137685; + l.info(decoded.weight, decoded.size, decoded.vsize, feeRate); + res.send({ feeRate, tx }); } catch (e) { l.error("error estimating liquid fee", e); return res.status(500).send(e.message); |