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

Merge pull request #228 from evildido/fix-concurrent-withdraw

Browse source 
Fix concurrent withdrawal behavior
This commit is contained in:
Arc 2021-06-21 23:25:30 +01:00 • committed by GitHub
commit 0a884e8983
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lnbits/extensions/withdraw/lnurl.py
View file

@ -98,19 +98,21 @@ async def api_lnurl_callback(unique_hash):
HTTPStatus.OK, HTTPStatus.OK,
) )
try:
await pay_invoice(
wallet_id=link.wallet,
payment_request=payment_request,
max_sat=link.max_withdrawable,
extra={"tag": "withdraw"},
)
try:
usescsv = "" usescsv = ""
for x in range(1, link.uses - link.used): for x in range(1, link.uses - link.used):
usecv = link.usescsv.split(",") usecv = link.usescsv.split(",")
usescsv += "," + str(usecv[x]) usescsv += "," + str(usecv[x])
usecsvback = usescsv
usescsv = usescsv[1:] usescsv = usescsv[1:]
changesback = {
"open_time": link.wait_time,
"used": link.used,
"usescsv": usecsvback,
}
changes = { changes = {
"open_time": link.wait_time + now, "open_time": link.wait_time + now,
"used": link.used + 1, "used": link.used + 1,
@ -118,11 +120,21 @@ async def api_lnurl_callback(unique_hash):
} }
await update_withdraw_link(link.id, **changes) await update_withdraw_link(link.id, **changes)
await pay_invoice(
wallet_id=link.wallet,
payment_request=payment_request,
max_sat=link.max_withdrawable,
extra={"tag": "withdraw"},
)
except ValueError as e: except ValueError as e:
await update_withdraw_link(link.id, **changesback)
return jsonify({"status": "ERROR", "reason": str(e)}) return jsonify({"status": "ERROR", "reason": str(e)})
except PermissionError: except PermissionError:
await update_withdraw_link(link.id, **changesback)
return jsonify({"status": "ERROR", "reason": "Withdraw link is empty."}) return jsonify({"status": "ERROR", "reason": "Withdraw link is empty."})
except Exception as e: except Exception as e:
await update_withdraw_link(link.id, **changesback)
return jsonify({"status": "ERROR", "reason": str(e)}) return jsonify({"status": "ERROR", "reason": str(e)})
return jsonify({"status": "OK"}), HTTPStatus.OK return jsonify({"status": "OK"}), HTTPStatus.OK