Merge remote-tracking branch 'origin/main' into SCRUB

This commit is contained in:
ben 2022-05-25 17:03:12 +01:00
commit 5574fa7263
2 changed files with 7 additions and 9 deletions

View file

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

View file

@ -365,13 +365,14 @@ async def api_payments_sse(
@core_app.get("/api/v1/payments/{payment_hash}")
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)
else:
wallet = None
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)
if not payment:
raise HTTPException(