diff options
| -rw-r--r-- | lib/sync.js | 12 | ||||
| -rw-r--r-- | routes/send.js | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/sync.js b/lib/sync.js index fedb6798..e217dcd0 100644 --- a/lib/sync.js +++ b/lib/sync.js @@ -116,7 +116,7 @@ const sync = async () => { preimage, rate: invoice.rate, received: true, - confirmed: false, + confirmed: true, network: "lightning", tip: invoice.tip, invoice_id: invoice.id, @@ -124,7 +124,7 @@ const sync = async () => { updatedAt: createdAt }); - // await account.increment({ balance: amount }); + await account.increment({ balance: amount }); l.info("lightning missing from account", account.id, amount); } @@ -152,7 +152,7 @@ const sync = async () => { const transactions = [ ...(await bc.listTransactions("*", 500)), ...(await lq.listTransactions("*", 500)) - ].filter(tx => ["send", "receive"].includes(tx.category)); + ].filter(tx => ["send", "receive"].includes(tx.category) && new Date(tx.time * 1000) > twoWeeksAgo); missed = transactions.filter( tx => @@ -163,7 +163,6 @@ const sync = async () => { for (let i = 0; i < missed.length; i++) { let p = unconfirmed.find(p => p.hash === missed[i].txid); - /* p.confirmed = 1; await db.transaction(async transaction => { @@ -175,7 +174,6 @@ const sync = async () => { emit(p.user.username, "account", p.account); emit(p.user.username, "payment", p); - */ l.info("unconfirmed tx", p.user_id, p.hash, p.address); } @@ -253,8 +251,7 @@ const sync = async () => { amount = toSats(amount); await db.transaction(async transaction => { - l.info("found pending balance", user.username, amount); - /* + l.info("found pending transaction", user.username, amount, hash); payments.push(hash); let p = await db.Payment.create( { @@ -278,7 +275,6 @@ const sync = async () => { emit(user.username, "account", account); emit(user.username, "payment", p); - */ }); } } diff --git a/routes/send.js b/routes/send.js index 5f1151c5..4c8afa34 100644 --- a/routes/send.js +++ b/routes/send.js @@ -61,7 +61,7 @@ module.exports = ah(async (req, res, next) => { rate: app.get("rates")[user.currency], currency: user.currency, confirmed: true, - hash: username ? `Payment to ${username}` : "Internal Transfer", + hash: `#${uuidv4().substr(0, 6)} ${(username ? `Payment to ${username}` : "Internal Transfer")}`, network: "COINOS" }; @@ -165,7 +165,7 @@ module.exports = ah(async (req, res, next) => { rate: app.get("rates")[recipient.currency] * spread, currency: recipient.currency, confirmed: true, - hash: "Payment from " + user.username, + hash: `#${uuidv4().substr(0,6)} Payment from ${user.username}`, memo, network: "COINOS", received: true |