kosmos/lndhub
8
0
Fork 0
Code Issues Pull Requests Releases Activity

FIX: occasional duplicate payments (closes #3)

Browse Source
This commit is contained in:
Overtorment 2019-01-06 14:35:14 +00:00
parent 6a57559b16
commit d3100a1390
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
controllers/api.js
View File

@ -113,6 +113,7 @@ router.post('/payinvoice', async function(req, res) {
if (!req.body.invoice) return errorBadArguments(res); if (!req.body.invoice) return errorBadArguments(res);
let freeAmount = false; let freeAmount = false;
if (req.body.amount) freeAmount = parseInt(req.body.amount); if (req.body.amount) freeAmount = parseInt(req.body.amount);
const lock_key = 'invoice_paying_for_' + u.getUserId();
let userBalance = await u.getBalance(); let userBalance = await u.getBalance();
@ -133,6 +134,12 @@ router.post('/payinvoice', async function(req, res) {
let userid_payee = await u.getUseridByPaymentHash(info.payment_hash); let userid_payee = await u.getUseridByPaymentHash(info.payment_hash);
if (!userid_payee) return errorGeneralServerError(res); if (!userid_payee) return errorGeneralServerError(res);
if (await redis.get(lock_key)) {
return errorTryAgainLater(res);
}
await redis.set(lock_key, 1);
await redis.expire(lock_key, 2 * 60);
let UserPayee = new User(redis); let UserPayee = new User(redis);
UserPayee._userid = userid_payee; // hacky, fixme UserPayee._userid = userid_payee; // hacky, fixme
let payee_balance = await UserPayee.getBalance(); let payee_balance = await UserPayee.getBalance();
@ -152,6 +159,7 @@ router.post('/payinvoice', async function(req, res) {
await UserPayee.setPaymentHashPaid(info.payment_hash); await UserPayee.setPaymentHashPaid(info.payment_hash);
await redis.del(lock_key, 1);
return res.send(info); return res.send(info);
} }
@ -164,9 +172,11 @@ router.post('/payinvoice', async function(req, res) {
payment.pay_req = req.body.invoice; payment.pay_req = req.body.invoice;
payment.decoded = info; payment.decoded = info;
u.savePaidLndInvoice(payment); u.savePaidLndInvoice(payment);
redis.del(lock_key);
res.send(payment); res.send(payment);
} else { } else {
// payment failed // payment failed
redis.del(lock_key);
return errorLnd(res); return errorLnd(res);
} }
}); });
@ -176,6 +186,11 @@ router.post('/payinvoice', async function(req, res) {
} }
let inv = { payment_request: req.body.invoice, amt: info.num_satoshis }; // amt is used only for 'tip' invoices let inv = { payment_request: req.body.invoice, amt: info.num_satoshis }; // amt is used only for 'tip' invoices
try { try {
if (await redis.get(lock_key)) {
return errorTryAgainLater(res);
}
await redis.set(lock_key, 1);
await redis.expire(lock_key, 2 * 60);
logger.log('/payinvoice', [req.id, 'before write', JSON.stringify(inv)]); logger.log('/payinvoice', [req.id, 'before write', JSON.stringify(inv)]);
call.write(inv); call.write(inv);
} catch (Err) { } catch (Err) {
@ -362,3 +377,11 @@ function errorBadArguments(res) {
message: 'Bad arguments', message: 'Bad arguments',
}); });
} }
function errorTryAgainLater(res) {
return res.send({
error: true,
code: 9,
message: 'Try again later',
});
}

1
doc/schema.md
View File

@ -10,6 +10,7 @@ User storage schema
* userid_for_{refresh_token} = {userid} * userid_for_{refresh_token} = {userid}
* refresh_token_for_{userid} = {access_token} * refresh_token_for_{userid} = {access_token}
* importing_{txid} = 1 `atomic lock when processing topup tx` * importing_{txid} = 1 `atomic lock when processing topup tx`
* invoice_paying_for_{userid} = 1 `lock for when payinvoice is in progress`