Merge pull request #135 from grmkris/extensions/subdomains

subdomains extension

lnbits/core/crud.py

@@ -285,7 +285,11 @@ async def create_payment(
 
 async def update_payment_status(checking_id: str, pending: bool) -> None:
     await db.execute(
-        "UPDATE apipayments SET pending = ? WHERE checking_id = ?", (int(pending), checking_id,),
+        "UPDATE apipayments SET pending = ? WHERE checking_id = ?",
+        (
+            int(pending),
+            checking_id,
+        ),
     )
 
 

lnbits/core/models.py

@@ -40,7 +40,11 @@ class Wallet(NamedTuple):
         hashing_key = hashlib.sha256(self.id.encode("utf-8")).digest()
         linking_key = hmac.digest(hashing_key, domain.encode("utf-8"), "sha256")
 
-        return SigningKey.from_string(linking_key, curve=SECP256k1, hashfunc=hashlib.sha256,)
+        return SigningKey.from_string(
+            linking_key,
+            curve=SECP256k1,
+            hashfunc=hashlib.sha256,
+        )
 
     async def get_payment(self, payment_hash: str) -> Optional["Payment"]:
         from .crud import get_wallet_payment

lnbits/core/services.py

@@ -133,7 +133,10 @@ async def pay_invoice(
         payment: PaymentResponse = WALLET.pay_invoice(payment_request)
         if payment.ok and payment.checking_id:
             await create_payment(
-                checking_id=payment.checking_id, fee=payment.fee_msat, preimage=payment.preimage, **payment_kwargs,
+                checking_id=payment.checking_id,
+                fee=payment.fee_msat,
+                preimage=payment.preimage,
+                **payment_kwargs,
             )
             await delete_payment(temp_id)
         else:
@@ -153,7 +156,8 @@ async def redeem_lnurl_withdraw(wallet_id: str, res: LnurlWithdrawResponse, memo
 
     async with httpx.AsyncClient() as client:
         await client.get(
-            res.callback.base, params={**res.callback.query_params, **{"k1": res.k1, "pr": payment_request}},
+            res.callback.base,
+            params={**res.callback.query_params, **{"k1": res.k1, "pr": payment_request}},
         )
 
 
@@ -210,7 +214,11 @@ async def perform_lnurlauth(callback: str) -> Optional[LnurlErrorResponse]:
     async with httpx.AsyncClient() as client:
         r = await client.get(
             callback,
-            params={"k1": k1.hex(), "key": key.verifying_key.to_string("compressed").hex(), "sig": sig.hex(),},
+            params={
+                "k1": k1.hex(),
+                "key": key.verifying_key.to_string("compressed").hex(),
+                "sig": sig.hex(),
+            },
         )
         try:
             resp = json.loads(r.text)
@@ -219,7 +227,9 @@ async def perform_lnurlauth(callback: str) -> Optional[LnurlErrorResponse]:
 
             return LnurlErrorResponse(reason=resp["reason"])
         except (KeyError, json.decoder.JSONDecodeError):
-            return LnurlErrorResponse(reason=r.text[:200] + "..." if len(r.text) > 200 else r.text,)
+            return LnurlErrorResponse(
+                reason=r.text[:200] + "..." if len(r.text) > 200 else r.text,
+            )
 
 
 async def check_invoice_status(wallet_id: str, payment_hash: str) -> PaymentStatus:

lnbits/core/tasks.py

@@ -38,7 +38,11 @@ async def dispatch_webhook(payment: Payment):
     async with httpx.AsyncClient() as client:
         data = payment._asdict()
         try:
-            r = await client.post(payment.webhook, json=data, timeout=40,)
+            r = await client.post(
+                payment.webhook,
+                json=data,
+                timeout=40,
+            )
             await mark_webhook_sent(payment, r.status_code)
         except (httpx.ConnectError, httpx.RequestError):
             await mark_webhook_sent(payment, -1)

lnbits/core/views/api.py

@@ -21,7 +21,13 @@ from ..tasks import sse_listeners
 @api_check_wallet_key("invoice")
 async def api_wallet():
     return (
-        jsonify({"id": g.wallet.id, "name": g.wallet.name, "balance": g.wallet.balance_msat,}),
+        jsonify(
+            {
+                "id": g.wallet.id,
+                "name": g.wallet.name,
+                "balance": g.wallet.balance_msat,
+            }
+        ),
         HTTPStatus.OK,
     )
 
@@ -78,7 +84,11 @@ async def api_payments_create_invoice():
     if g.data.get("lnurl_callback"):
         async with httpx.AsyncClient() as client:
             try:
-                r = await client.get(g.data["lnurl_callback"], params={"pr": payment_request}, timeout=10,)
+                r = await client.get(
+                    g.data["lnurl_callback"],
+                    params={"pr": payment_request},
+                    timeout=10,
+                )
                 if r.is_error:
                     lnurl_response = r.text
                 else:
@@ -154,7 +164,9 @@ async def api_payments_pay_lnurl():
     async with httpx.AsyncClient() as client:
         try:
             r = await client.get(
-                g.data["callback"], params={"amount": g.data["amount"], "comment": g.data["comment"]}, timeout=40,
+                g.data["callback"],
+                params={"amount": g.data["amount"], "comment": g.data["comment"]},
+                timeout=40,
             )
             if r.is_error:
                 return jsonify({"message": "failed to connect"}), HTTPStatus.BAD_REQUEST
@@ -194,7 +206,10 @@ async def api_payments_pay_lnurl():
             extra["comment"] = g.data["comment"]
 
         payment_hash = await pay_invoice(
-            wallet_id=g.wallet.id, payment_request=params["pr"], description=g.data.get("description", ""), extra=extra,
+            wallet_id=g.wallet.id,
+            payment_request=params["pr"],
+            description=g.data.get("description", ""),
+            extra=extra,
         )
     except Exception as exc:
         await db.rollback()
@@ -354,7 +369,9 @@ async def api_lnurlscan(code: str):
 @core_app.route("/api/v1/lnurlauth", methods=["POST"])
 @api_check_wallet_key("admin")
 @api_validate_post_request(
-    schema={"callback": {"type": "string", "required": True},}
+    schema={
+        "callback": {"type": "string", "required": True},
+    }
 )
 async def api_perform_lnurlauth():
     err = await perform_lnurlauth(g.data["callback"])