aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--index.js2
-rw-r--r--routes/liquid/fee.js3
-rw-r--r--routes/liquid/send.js7
-rw-r--r--routes/swaps.js1
4 files changed, 10 insertions, 3 deletions
diff --git a/index.js b/index.js
index 70b9564c..1178c71b 100644
--- a/index.js
+++ b/index.js
@@ -52,7 +52,7 @@ app.use((err, req, res, next) => {
return res.end();
});
app.use(cookieParser());
-app.use(cors({ credentials: true, origin: "https://coinos.io" }));
+app.use(cors({ credentials: true, origin: "*" }));
app.use(compression());
server = require("http").Server(app);
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) {
diff --git a/routes/swaps.js b/routes/swaps.js
index 385d7e84..6af3cac5 100644
--- a/routes/swaps.js
+++ b/routes/swaps.js
@@ -447,6 +447,7 @@ app.post(
"/orders",
auth,
ah(async (req, res) => {
+ return res.status(500).send("Trading temporarily disabled");
const { user } = req;
try {
await swap(user, req.body);