diff --git a/lnbits/core/models.py b/lnbits/core/models.py index b2cd70af..bef29135 100644 --- a/lnbits/core/models.py +++ b/lnbits/core/models.py @@ -52,7 +52,10 @@ class Wallet(NamedTuple): wal=self.id, _external=True, ) - return lnurl_encode(url) + try: + return lnurl_encode(url) + except: + return "" def lnurlauth_key(self, domain: str) -> SigningKey: hashing_key = hashlib.sha256(self.id.encode("utf-8")).digest() diff --git a/lnbits/core/services.py b/lnbits/core/services.py index 97435f72..f2821fdc 100644 --- a/lnbits/core/services.py +++ b/lnbits/core/services.py @@ -186,6 +186,9 @@ async def redeem_lnurl_withdraw( wait_seconds: int = 0, conn: Optional[Connection] = None, ) -> None: + if not lnurl_request: + return None + res = {} async with httpx.AsyncClient() as client: @@ -193,13 +196,19 @@ async def redeem_lnurl_withdraw( r = await client.get(str(lnurl)) res = r.json() - _, payment_request = await create_invoice( - wallet_id=wallet_id, - amount=int(res["maxWithdrawable"] / 1000), - memo=memo or res["defaultDescription"] or "", - extra=extra, - conn=conn, - ) + try: + _, payment_request = await create_invoice( + wallet_id=wallet_id, + amount=int(res["maxWithdrawable"] / 1000), + memo=memo or res["defaultDescription"] or "", + extra=extra, + conn=conn, + ) + except: + print( + f"failed to create invoice on redeem_lnurl_withdraw from {lnurl}. params: {res}" + ) + return None if wait_seconds: await trio.sleep(wait_seconds) diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html index 39c519af..c6851793 100644 --- a/lnbits/core/templates/core/wallet.html +++ b/lnbits/core/templates/core/wallet.html @@ -231,11 +231,9 @@ {% include "core/_api_docs.html" %} - + + {% if wallet.lnurlwithdraw_full %} +

@@ -257,6 +255,8 @@ + {% endif %} + diff --git a/lnbits/wallets/lnbits.py b/lnbits/wallets/lnbits.py index 13ea8046..f55df5a7 100644 --- a/lnbits/wallets/lnbits.py +++ b/lnbits/wallets/lnbits.py @@ -123,7 +123,6 @@ class LNbitsWallet(Wallet): async with client.stream("GET", url) as r: async for line in r.aiter_lines(): if line.startswith("data:"): - try: data = json.loads(line[5:]) except json.decoder.JSONDecodeError: @@ -134,7 +133,7 @@ class LNbitsWallet(Wallet): yield data["payment_hash"] # payment_hash - except (OSError, httpx.ReadError, httpx.ConnectError): + except (OSError, httpx.ReadError, httpx.ConnectError, httpx.ReadTimeout): pass print("lost connection to lnbits /payments/sse, retrying in 5 seconds") diff --git a/lnbits/wallets/lntxbot.py b/lnbits/wallets/lntxbot.py index a346cd43..f8ff709c 100644 --- a/lnbits/wallets/lntxbot.py +++ b/lnbits/wallets/lntxbot.py @@ -146,7 +146,7 @@ class LntxbotWallet(Wallet): data = json.loads(line[5:]) if "payment_hash" in data and data.get("msatoshi") > 0: yield data["payment_hash"] - except (OSError, httpx.ReadError): + except (OSError, httpx.ReadError, httpx.ReadTimeout, httpx.ConnectError): pass print("lost connection to lntxbot /payments/stream, retrying in 5 seconds") diff --git a/lnbits/wallets/spark.py b/lnbits/wallets/spark.py index 5d0f024a..0c81733e 100644 --- a/lnbits/wallets/spark.py +++ b/lnbits/wallets/spark.py @@ -195,7 +195,7 @@ class SparkWallet(Wallet): data = json.loads(line[5:]) if "pay_index" in data and data.get("status") == "paid": yield data["label"] - except (OSError, httpx.ReadError, httpx.ConnectError): + except (OSError, httpx.ReadError, httpx.ConnectError, httpx.ReadTimeout): pass print("lost connection to spark /stream, retrying in 5 seconds")