aboutsummaryrefslogtreecommitdiffstats
path: root/routes/liquid
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2021-07-08 15:17:06 -0400
committerAdam Soltys <[email protected]>2021-07-08 15:17:06 -0400
commit29956a035056c76b3329792feb9a7fb3d7c8ec0e (patch)
tree737c37ce4c57612afa03b4a390d16d489852c1bd /routes/liquid
parent300ccc094a9c5261a42479ce4f241655dbd190e1 (diff)
downloadcoinos-server-29956a035056c76b3329792feb9a7fb3d7c8ec0e.tar.gz
coinos-server-29956a035056c76b3329792feb9a7fb3d7c8ec0e.zip
only convert btc
Diffstat (limited to 'routes/liquid')
-rw-r--r--routes/liquid/fee.js2
-rw-r--r--routes/liquid/receive.js6
2 files changed, 5 insertions, 3 deletions
diff --git a/routes/liquid/fee.js b/routes/liquid/fee.js
index a6c29f41..fad69f13 100644
--- a/routes/liquid/fee.js
+++ b/routes/liquid/fee.js
@@ -59,6 +59,8 @@ liquidTx = async ({ address, asset, amount, feeRate, replaceable, user }) => {
}
);
+ l.info("funding tx for fee estimate", tx);
+
tx = await node.fundRawTransaction(tx, params);
let blinded = await node.blindRawTransaction(tx.hex);
diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js
index 05ecc21f..9d8923eb 100644
--- a/routes/liquid/receive.js
+++ b/routes/liquid/receive.js
@@ -287,9 +287,9 @@ setInterval(async () => {
for (let i = 0; i < arr.length; i++) {
const hash = arr[i];
- let account, address, user, total;
+ let account, address, user, total, p;
await db.transaction(async transaction => {
- let p = await db.Payment.findOne({
+ p = await db.Payment.findOne({
where: { hash, confirmed: 0, received: 1 },
include: [
{
@@ -343,7 +343,7 @@ setInterval(async () => {
});
let c = convert[address];
- if (address && c) {
+ if (address && c && p.account.asset === network.assetHash) {
l.info("liquid detected for conversion request", address, c.address, user.username);
user.account = account;