aboutsummaryrefslogtreecommitdiffstats
path: root/routes/liquid/receive.js
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2021-08-03 01:52:33 -0700
committerAdam Soltys <[email protected]>2021-08-03 01:52:33 -0700
commite5e2bcf015b128c71cacf125d6aea4a0dddd30c3 (patch)
tree09af4085f72fa2466cb0f66768be6e882be30f81 /routes/liquid/receive.js
parent2f52a91c5babde9e374dd9c532448f565bcbfeee (diff)
parent1fbae57bb9540b1c116efc367809ac01ae2e9df2 (diff)
downloadcoinos-server-e5e2bcf015b128c71cacf125d6aea4a0dddd30c3.tar.gz
coinos-server-e5e2bcf015b128c71cacf125d6aea4a0dddd30c3.zip
Merge branch 'prod' into dev
Diffstat (limited to 'routes/liquid/receive.js')
-rw-r--r--routes/liquid/receive.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js
index c377a6b5..259db7c7 100644
--- a/routes/liquid/receive.js
+++ b/routes/liquid/receive.js
@@ -101,7 +101,7 @@ zmqRawTx.on("message", async (topic, message, sequence) => {
user_id: user.id,
network: "liquid"
},
- order: [["id", "DESC"]],
+ order: [["id", "DESC"]]
});
if (!invoice) return;
@@ -286,9 +286,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: [
{
@@ -347,7 +347,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,