aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

internal invoices resolved internally.

Browse source
This commit is contained in:
fiatjaf 2019-12-16 18:24:06 +00:00
parent ce94fc8984
commit 21598f862d
1 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
LNbits/__init__.py
View file

@ -280,25 +280,31 @@ def api_transactions():
# check balance # check balance
balance = db.fetchone("SELECT balance/1000 FROM balances WHERE wallet = ?", (wallet["id"],))[0] balance = db.fetchone("SELECT balance/1000 FROM balances WHERE wallet = ?", (wallet["id"],))[0]
if balance < 0: if balance < 0:
db.execute("DELETE FROM apipayments WHERE payhash = ? AND wallet = ?", (invoice.payment_hash, wallet["id"]))
return jsonify({"ERROR": "INSUFFICIENT BALANCE"}), 403 return jsonify({"ERROR": "INSUFFICIENT BALANCE"}), 403
# actually send the payment # check if the invoice is an internal one
r = WALLET.pay_invoice(data["payment_request"]) if db.fetchone("SELECT count(*) FROM apipayments WHERE payhash = ?", (invoice.payment_hash,))[0] == 2:
if not r.ok or r.json().get('error'): # internal. mark both sides as fulfilled.
return jsonify({"ERROR": "UNEXPECTED PAYMENT ERROR"}), 500 db.execute("UPDATE apipayments SET pending = 0, fee = 0 WHERE payhash = ?", (invoice.payment_hash,))
else:
# actually send the payment
r = WALLET.pay_invoice(data["payment_request"])
if not r.ok or r.json().get('error'):
return jsonify({"ERROR": "UNEXPECTED PAYMENT ERROR"}), 500
data = r.json() data = r.json()
if r.ok and "error" in data: if r.ok and "error" in data:
# payment didn't went through, delete it here # payment didn't went through, delete it here
# (these guarantees specific to lntxbot) # (these guarantees specific to lntxbot)
db.execute("DELETE FROM apipayments WHERE payhash = ?", (invoice.payment_hash,)) db.execute("DELETE FROM apipayments WHERE payhash = ?", (invoice.payment_hash,))
return jsonify({"PAID": "FALSE"}), 200 return jsonify({"PAID": "FALSE"}), 200
# payment went through, not pending anymore, save actual fees # payment went through, not pending anymore, save actual fees
db.execute( db.execute(
"UPDATE apipayments SET pending = 0, fee = ? WHERE payhash = ? AND wallet = ?", "UPDATE apipayments SET pending = 0, fee = ? WHERE payhash = ? AND wallet = ?",
(data["fee_msat"], invoice.payment_hash, wallet['id']), (data["fee_msat"], invoice.payment_hash, wallet['id']),
) )
return jsonify({"PAID": "TRUE"}), 200 return jsonify({"PAID": "TRUE"}), 200