Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mint: LNbitsWallet add extra check for payment state #601

Merged
merged 5 commits into from
Oct 28, 2024
Merged

Mint: LNbitsWallet add extra check for payment state #601

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b66f065
add extra check for payment state
callebtc Jul 26, 2024
4c50f63
improve error handling
callebtc Aug 9, 2024
0ac7c3f
Merge branch 'main' into fix-lnbits-stuck-melt
callebtc Oct 28, 2024
03464e9
fix response
callebtc Oct 28, 2024
d966e62
add failure
callebtc Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions cashu/lightning/lnbits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,13 @@ async def status(self) -> StatusResponse:
try:
r = await self.client.get(url=f"{self.endpoint}/api/v1/wallet", timeout=15)
r.raise_for_status()
data: dict = r.json()
except Exception as exc:
return StatusResponse(
error_message=f"Failed to connect to {self.endpoint} due to: {exc}",
balance=0,
)

try:
data: dict = r.json()
except Exception:
return StatusResponse(
error_message=(
f"Received invalid response from {self.endpoint}: {r.text}"
),
balance=0,
)
if "detail" in data:
if data.get("detail"):
return StatusResponse(
error_message=f"LNbits error: {data['detail']}", balance=0
)
Expand Down Expand Up @@ -87,10 +78,16 @@ async def create_invoice(
url=f"{self.endpoint}/api/v1/payments", json=data
)
r.raise_for_status()
except Exception as e:
return InvoiceResponse(ok=False, error_message=str(e))
data = r.json()
except httpx.HTTPStatusError:
return InvoiceResponse(
ok=False, error_message=f"HTTP status: {r.reason_phrase}"
)
except Exception as exc:
return InvoiceResponse(ok=False, error_message=str(exc))
if data.get("detail"):
return InvoiceResponse(ok=False, error_message=data["detail"])

data = r.json()
checking_id, payment_request = data["checking_id"], data["payment_request"]

return InvoiceResponse(
Expand All @@ -109,17 +106,19 @@ async def pay_invoice(
timeout=None,
)
r.raise_for_status()
except Exception:
error_message = r.json().get("detail") or r.reason_phrase
data: dict = r.json()
except httpx.HTTPStatusError:
return PaymentResponse(
result=PaymentResult.FAILED, error_message=error_message
result=PaymentResult.FAILED,
error_message=f"HTTP status: {r.reason_phrase}",
)
if r.json().get("detail"):
except Exception as exc:
return PaymentResponse(result=PaymentResult.FAILED, error_message=str(exc))
if data.get("detail"):
return PaymentResponse(
result=PaymentResult.FAILED, error_message=(r.json()["detail"],)
result=PaymentResult.FAILED, error_message=data["detail"]
)

data: dict = r.json()
checking_id = data.get("payment_hash")
if not checking_id:
return PaymentResponse(
Expand All @@ -142,6 +141,7 @@ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
url=f"{self.endpoint}/api/v1/payments/{checking_id}"
)
r.raise_for_status()
data: dict = r.json()
except Exception as e:
return PaymentStatus(result=PaymentResult.UNKNOWN, error_message=str(e))
data: dict = r.json()
Expand Down Expand Up @@ -171,14 +171,16 @@ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
url=f"{self.endpoint}/api/v1/payments/{checking_id}"
)
r.raise_for_status()
data = r.json()
except httpx.HTTPStatusError as e:
if e.response.status_code != 404:
raise e
return PaymentStatus(
result=PaymentResult.UNKNOWN, error_message=e.response.text
)
except Exception as e:
return PaymentStatus(result=PaymentResult.UNKNOWN, error_message=str(e))

data = r.json()
if "paid" not in data and "details" not in data:
return PaymentStatus(
result=PaymentResult.UNKNOWN, error_message="invalid response"
Expand Down
Loading