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

Merge pull request #633 from lnbits/revert-619-check_invoice_status_outgoing

Browse source 
Revert "Check invoice status outgoing"
This commit is contained in:
Arc 2022-05-20 14:35:46 +01:00 • committed by GitHub
commit 11006ef7ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lnbits/core/services.py
View file

@ -321,10 +321,7 @@ async def check_invoice_status(
payment = await get_wallet_payment(wallet_id, payment_hash, conn=conn) payment = await get_wallet_payment(wallet_id, payment_hash, conn=conn)
if not payment: if not payment:
return PaymentStatus(None) return PaymentStatus(None)
if payment.is_out: status = await WALLET.get_invoice_status(payment.checking_id)
status = await WALLET.get_payment_status(payment.checking_id)
else:
status = await WALLET.get_invoice_status(payment.checking_id)
if not payment.pending: if not payment.pending:
return status return status
if payment.is_out and status.failed: if payment.is_out and status.failed:

11
lnbits/core/views/api.py
View file

@ -365,13 +365,14 @@ async def api_payments_sse(
@core_app.get("/api/v1/payments/{payment_hash}") @core_app.get("/api/v1/payments/{payment_hash}")
async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)): async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):
if X_Api_Key is not None: wallet = None
try:
if X_Api_Key.extra:
print("No key")
except:
wallet = await get_wallet_for_key(X_Api_Key) wallet = await get_wallet_for_key(X_Api_Key)
else:
wallet = None
payment = await get_standalone_payment(payment_hash) payment = await get_standalone_payment(payment_hash)
if payment: await check_invoice_status(payment.wallet_id, payment_hash)
await check_invoice_status(payment.wallet_id, payment_hash)
payment = await get_standalone_payment(payment_hash) payment = await get_standalone_payment(payment_hash)
if not payment: if not payment:
raise HTTPException( raise HTTPException(