mirrors/lnbits-legend
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits-legend.git synced 2024-11-19 09:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: raise proper exception in services pay_invoice

Browse Source 
also values where checked twice
This commit is contained in:
dni ⚡ 2024-02-21 10:43:34 +01:00 committed by Pavol Rusnak
parent d6c8ad1d0d
commit ddab4075d2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lnbits/core/services.py
View File

@ -189,12 +189,15 @@ async def pay_invoice(
If the payment is still in flight, we hope that some other process If the payment is still in flight, we hope that some other process
will regularly check for the payment. will regularly check for the payment.
""" """
invoice = bolt11_decode(payment_request) try:
invoice = bolt11_decode(payment_request)
except Exception:
raise InvoiceFailure("Bolt11 decoding failed.")
if not invoice.amount_msat or not invoice.amount_msat > 0: if not invoice.amount_msat or not invoice.amount_msat > 0:
raise ValueError("Amountless invoices not supported.") raise InvoiceFailure("Amountless invoices not supported.")
if max_sat and invoice.amount_msat > max_sat * 1000: if max_sat and invoice.amount_msat > max_sat * 1000:
raise ValueError("Amount in invoice is too high.") raise InvoiceFailure("Amount in invoice is too high.")
await check_wallet_limits(wallet_id, conn, invoice.amount_msat) await check_wallet_limits(wallet_id, conn, invoice.amount_msat)
@ -202,11 +205,6 @@ async def pay_invoice(
temp_id = invoice.payment_hash temp_id = invoice.payment_hash
internal_id = f"internal_{invoice.payment_hash}" internal_id = f"internal_{invoice.payment_hash}"
if invoice.amount_msat == 0:
raise ValueError("Amountless invoices not supported.")
if max_sat and invoice.amount_msat > max_sat * 1000:
raise ValueError("Amount in invoice is too high.")
_, extra = await calculate_fiat_amounts( _, extra = await calculate_fiat_amounts(
invoice.amount_msat / 1000, wallet_id, extra=extra, conn=conn invoice.amount_msat / 1000, wallet_id, extra=extra, conn=conn
) )