Merge branch 'main' into diagon-alley

lnbits/core/models.py

@@ -9,6 +9,7 @@ from lnurl import encode as lnurl_encode  # type: ignore
 from loguru import logger
 from pydantic import BaseModel
 
+from lnbits.db import Connection
 from lnbits.helpers import url_for
 from lnbits.settings import WALLET
 from lnbits.wallets.base import PaymentStatus
@@ -131,7 +132,11 @@ class Payment(BaseModel):
     def is_uncheckable(self) -> bool:
         return self.checking_id.startswith("internal_")
 
-    async def update_status(self, status: PaymentStatus) -> None:
+    async def update_status(
+        self,
+        status: PaymentStatus,
+        conn: Optional[Connection] = None,
+    ) -> None:
         from .crud import update_payment_details
 
         await update_payment_details(
@@ -139,6 +144,7 @@ class Payment(BaseModel):
             pending=status.pending,
             fee=status.fee_msat,
             preimage=status.preimage,
+            conn=conn,
         )
 
     async def set_pending(self, pending: bool) -> None:
@@ -146,7 +152,10 @@ class Payment(BaseModel):
 
         await update_payment_status(self.checking_id, pending)
 
-    async def check_status(self) -> PaymentStatus:
+    async def check_status(
+        self,
+        conn: Optional[Connection] = None,
+    ) -> PaymentStatus:
         if self.is_uncheckable:
             return PaymentStatus(None)
 
@@ -170,7 +179,7 @@ class Payment(BaseModel):
             logger.info(
                 f"Marking '{'in' if self.is_in else 'out'}' {self.checking_id} as not pending anymore: {status}"
             )
-            await self.update_status(status)
+            await self.update_status(status, conn=conn)
         return status
 
     async def delete(self) -> None:

lnbits/core/templates/core/index.html

@@ -66,7 +66,7 @@
               outline
               color="grey"
               type="a"
-              href="https://github.com/lnbits/lnbits"
+              href="https://github.com/lnbits/lnbits-legend"
               target="_blank"
               rel="noopener"
               >View project in GitHub</q-btn
@@ -75,7 +75,7 @@
               outline
               color="grey"
               type="a"
-              href="https://lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK"
+              href="https://legend.lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK"
               target="_blank"
               rel="noopener"
               >Donate</q-btn

lnbits/core/views/api.py

@@ -402,10 +402,6 @@ async def subscribe(request: Request, wallet: Wallet):
 async def api_payments_sse(
     request: Request, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
-    if wallet is None or wallet.wallet is None:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Wallet does not exist."
-        )
     return EventSourceResponse(
         subscribe(request, wallet.wallet), ping=20, media_type="text/event-stream"
     )

lnbits/decorators.py

@@ -138,13 +138,20 @@ async def get_key_type(
             detail="Invoice (or Admin) key required.",
         )
 
-    try:
+    for typenr, WalletChecker in zip(
-        admin_checker = WalletAdminKeyChecker(api_key=token)
+        [0, 1], [WalletAdminKeyChecker, WalletInvoiceKeyChecker]
-        await admin_checker.__call__(r)
-        wallet = WalletTypeInfo(0, admin_checker.wallet)  # type: ignore
-        if (LNBITS_ADMIN_USERS and wallet.wallet.user not in LNBITS_ADMIN_USERS) and (
-            LNBITS_ADMIN_EXTENSIONS and pathname in LNBITS_ADMIN_EXTENSIONS
     ):
+        try:
+            checker = WalletChecker(api_key=token)
+            await checker.__call__(r)
+            wallet = WalletTypeInfo(typenr, checker.wallet)  # type: ignore
+            if wallet is None or wallet.wallet is None:
+                raise HTTPException(
+                    status_code=HTTPStatus.NOT_FOUND, detail="Wallet does not exist."
+                )
+            if (
+                LNBITS_ADMIN_USERS and wallet.wallet.user not in LNBITS_ADMIN_USERS
+            ) and (LNBITS_ADMIN_EXTENSIONS and pathname in LNBITS_ADMIN_EXTENSIONS):
                 raise HTTPException(
                     status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
                 )
@@ -156,26 +163,9 @@ async def get_key_type(
                 pass
         except:
             raise
-
-    try:
-        invoice_checker = WalletInvoiceKeyChecker(api_key=token)
-        await invoice_checker.__call__(r)
-        wallet = WalletTypeInfo(1, invoice_checker.wallet)  # type: ignore
-        if (LNBITS_ADMIN_USERS and wallet.wallet.user not in LNBITS_ADMIN_USERS) and (
-            LNBITS_ADMIN_EXTENSIONS and pathname in LNBITS_ADMIN_EXTENSIONS
-        ):
     raise HTTPException(
-                status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+        status_code=HTTPStatus.NOT_FOUND, detail="Wallet does not exist."
     )
-        return wallet
-    except HTTPException as e:
-        if e.status_code == HTTPStatus.BAD_REQUEST:
-            raise
-        if e.status_code == HTTPStatus.UNAUTHORIZED:
-            return WalletTypeInfo(2, None)  # type: ignore
-    except:
-        raise
-    return wallet
 
 
 async def require_admin_key(

lnbits/tasks.py

@@ -103,7 +103,7 @@ async def check_pending_payments():
                 conn=conn,
             )
             for payment in pending_payments:
-                await payment.check_status()
+                await payment.check_status(conn=conn)
 
             logger.debug(
                 f"Task: pending check finished for {len(pending_payments)} payments (took {time.time() - start_time:0.3f} s)"