aboutsummaryrefslogtreecommitdiffstats
path: root/routes/liquid
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2021-04-30 18:06:46 -0400
committerAdam Soltys <[email protected]>2021-04-30 18:06:46 -0400
commit01e85e75fa5c7de4b730d7dc440652a295703dba (patch)
tree843803b67614251573d1b5d6b07d21b8e451324c /routes/liquid
parent0351d70dd561ddf3bad4d716b4b01f77d3ac4a5e (diff)
downloadcoinos-server-01e85e75fa5c7de4b730d7dc440652a295703dba.tar.gz
coinos-server-01e85e75fa5c7de4b730d7dc440652a295703dba.zip
estimate fee during send if no tx provided
Diffstat (limited to 'routes/liquid')
-rw-r--r--routes/liquid/fee.js3
-rw-r--r--routes/liquid/send.js7
2 files changed, 8 insertions, 2 deletions
diff --git a/routes/liquid/fee.js b/routes/liquid/fee.js
index 1f5c1deb..debbdf55 100644
--- a/routes/liquid/fee.js
+++ b/routes/liquid/fee.js
@@ -72,7 +72,8 @@ liquidTx = async ({ address, asset, amount, feeRate, replaceable, user }) => {
module.exports = ah(async (req, res) => {
try {
- res.send(await liquidTx({ ...req.body, user: req.user }));
+ let tx = await liquidTx({ ...req.body, user: req.user })
+ res.send(tx);
} catch (e) {
l.error("error estimating liquid fee", e.message, e.stack);
return res.status(500).send(e.message);
diff --git a/routes/liquid/send.js b/routes/liquid/send.js
index ab28471e..a3bb7639 100644
--- a/routes/liquid/send.js
+++ b/routes/liquid/send.js
@@ -147,7 +147,12 @@ sendLiquid = async ({ user, address, memo, tx, limit }) => {
module.exports = ah(async (req, res) => {
let { user } = req;
- let { address, memo, tx } = req.body;
+ let { address, feeRate, memo, tx } = req.body;
+
+ if (!tx) {
+ ({ tx } = await liquidTx({ ...req.body, user }));
+ }
+
try {
res.send(await sendLiquid({ user, address, memo, tx }));
} catch (e) {