diff options
| author | Adam Soltys <[email protected]> | 2022-09-08 16:45:32 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2022-09-08 16:45:32 -0700 |
| commit | 529cdff2a9df43a156a34072fd71f406cb7186f2 (patch) | |
| tree | b627342bc043083abb451f2908155983bb164ad7 | |
| parent | be27adba90c2c52ccbfac5885d70e5b37753fc58 (diff) | |
| download | coinos-server-529cdff2a9df43a156a34072fd71f406cb7186f2.tar.gz coinos-server-529cdff2a9df43a156a34072fd71f406cb7186f2.zip | |
missing imports
| -rw-r--r-- | lib/buildliquidtx.js | 2 | ||||
| -rw-r--r-- | routes/liquid/fee.js | 3 | ||||
| -rw-r--r-- | routes/liquid/index.js | 4 | ||||
| -rw-r--r-- | routes/liquid/send.js | 12 | ||||
| -rw-r--r-- | routes/payments.js | 4 |
5 files changed, 16 insertions, 9 deletions
diff --git a/lib/buildliquidtx.js b/lib/buildliquidtx.js index ab2c597e..f2dce6e1 100644 --- a/lib/buildliquidtx.js +++ b/lib/buildliquidtx.js @@ -1,7 +1,7 @@ import store from "./store"; import { prod } from "./utils"; import axios from "axios"; -// import liquid from 'liquidjs-lib'; +import liquid from 'liquidjs-lib'; import coinselect from "coinselect"; import split from "coinselect/split"; const api = prod diff --git a/routes/liquid/fee.js b/routes/liquid/fee.js index 4ec29455..ae6e4393 100644 --- a/routes/liquid/fee.js +++ b/routes/liquid/fee.js @@ -1,7 +1,10 @@ +import config from "$config"; import db from "$db"; import { emit } from "$lib/sockets"; import buildTx from "$lib/buildliquidtx"; import { err, l } from "$lib/logging"; +import { SATS } from "$lib/utils"; +import lq from "$lib/liquid"; export const liquidTx = async ({ address, asset, amount, feeRate, replaceable, user }) => { let tx, fee; diff --git a/routes/liquid/index.js b/routes/liquid/index.js index b75cf23e..c4c50021 100644 --- a/routes/liquid/index.js +++ b/routes/liquid/index.js @@ -1,11 +1,11 @@ import broadcast from "./broadcast"; import generate from "./generate"; -// import fee from "./fee"; +import fee from "./fee"; import send from "./send"; export default { broadcast, generate, -// fee, + fee, send, }; diff --git a/routes/liquid/send.js b/routes/liquid/send.js index 8c94d976..2fa7a22a 100644 --- a/routes/liquid/send.js +++ b/routes/liquid/send.js @@ -5,8 +5,8 @@ import { emit } from "$lib/sockets"; import store from "$lib/store"; import config from "$config"; import { l, warn, err } from "$lib/logging"; -// import { liquidTx } from "$routes/liquid/fee"; -// import { Transaction } from 'liquidjs-lib'; +import { liquidTx } from "$routes/liquid/fee"; +import { Transaction } from 'liquidjs-lib'; import { computeConversionFee, @@ -229,7 +229,7 @@ export const sendLiquid = async ({ asset, amount, user, address, memo, tx, limit let txid = Transaction.fromHex(signed.hex).getId(); for (let i = 0; i < payments.length; i++) { - p = payments[i]; + let p = payments[i]; if (p) { let { account } = p; p.hash = txid; @@ -255,6 +255,7 @@ export const sendLiquid = async ({ asset, amount, user, address, memo, tx, limit return main; } catch (e) { err("problem sending liquid", e.message); + return e; } }; @@ -262,8 +263,11 @@ export default async (req, res) => { let { user } = req; try { - res.send(await sendLiquid({ ...req.body, user })); + let result = await sendLiquid({ ...req.body, user }) + if (result instanceof Error) throw result; + res.send(result); } catch (e) { + console.log(e) err("problem sending liquid", user.username, e.message); return res.code(500).send(e); } diff --git a/routes/payments.js b/routes/payments.js index 1f9a94ec..4ffeb6b3 100644 --- a/routes/payments.js +++ b/routes/payments.js @@ -86,8 +86,8 @@ setTimeout(async () => { app.post("/liquid/broadcast", optionalAuth, lqRoutes.broadcast); app.get("/liquid/generate", auth, lqRoutes.generate); -// app.post("/liquid/fee", auth, lqRoutes.fee); -// app.post("/liquid/send", auth, lqRoutes.send); +app.post("/liquid/fee", auth, lqRoutes.fee); +app.post("/liquid/send", auth, lqRoutes.send); setTimeout(async () => { try { |
