chore: make bundle [skip ci]

.env.example

@@ -119,8 +119,6 @@ LNBITS_SITE_TAGLINE="Open Source Lightning Payments Platform"
 LNBITS_SITE_DESCRIPTION="The world's most powerful suite of bitcoin tools. Run for yourself, for others, or as part of a stack."
 # Choose from bitcoin, mint, flamingo, freedom, salvador, autumn, monochrome, classic, cyber
 LNBITS_THEME_OPTIONS="classic, bitcoin, flamingo, freedom, mint, autumn, monochrome, salvador, cyber"
-# Toggle the background styling on burger menus / drawers
-# LNBITS_DEFAULT_BURGER_MENU_BACKGROUND=true
 # LNBITS_CUSTOM_LOGO="https://lnbits.com/assets/images/logo/logo.svg"
 
 ######################################

.github/workflows/bundle.yml

@@ -10,16 +10,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.head_ref || github.event.pull_request.head.sha }}
+          ref: ${{ github.head_ref }}
       - uses: lnbits/lnbits/.github/actions/prepare@dev
         with:
           python-version: "3.10"
           node-version: "24.x"
           npm: true
-      - name: Build and commit bundle (same-repo PR)
-        if: github.event.pull_request.head.repo.full_name == github.repository
+      - run: make bundle
+      - name: Commit and push bundle changes
         run: |
-          make bundle
           git config user.name "alan"
           git config user.email "alan@lnbits.com"
           git add lnbits/static
@@ -28,6 +27,3 @@ jobs:
           fi
           git commit -m "chore: make bundle [skip ci]"
           git push
-      - name: Check bundle is up-to-date (fork PR)
-        if: github.event.pull_request.head.repo.full_name != github.repository
-        run: make checkbundle

.github/workflows/regtest.yml

@@ -66,7 +66,6 @@ jobs:
           BOLTZ_MNEMONIC: abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about
           LNBITS_MAX_OUTGOING_PAYMENT_AMOUNT_SATS: 1000000000
           LNBITS_MAX_INCOMING_PAYMENT_AMOUNT_SATS: 1000000000
-          LNBITS_FUNDING_SOURCE_PAY_INVOICE_WAIT_SECONDS: ${{ inputs.backend-wallet-class == 'CoreLightningRestWallet' && 60 || 5 }}
           ECLAIR_PASS: lnbits
           PYTHONUNBUFFERED: 1
           DEBUG: true

.npmrc

@@ -1 +0,0 @@
-min-release-age=7

lnbits/app.py

@@ -40,7 +40,6 @@ from lnbits.core.tasks import (
 )
 from lnbits.exceptions import register_exception_handlers
 from lnbits.helpers import version_parse
-from lnbits.llms_txt import create_llms_txt_route
 from lnbits.settings import settings
 from lnbits.tasks import (
     cancel_all_tasks,
@@ -103,9 +102,6 @@ async def startup(app: FastAPI):
     # register core routes
     init_core_routers(app)
 
-    # register llms.txt endpoint for AI agents
-    create_llms_txt_route(app)
-
     # initialize tasks
     register_async_tasks()
 

lnbits/core/crud/payments.py

@@ -16,7 +16,6 @@ from ..models import (
     PaymentFilters,
     PaymentHistoryPoint,
     PaymentsStatusCount,
-    PaymentTotalBreakdown,
     PaymentWalletStats,
 )
 
@@ -307,7 +306,7 @@ async def update_payment_checking_id(
     await (conn or db).execute(
         f"""
             UPDATE apipayments
-            SET checking_id = :new_id, updated_at = {db.timestamp_placeholder("now")}
+            SET checking_id = :new_id, updated_at = {db.timestamp_placeholder('now')}
             WHERE checking_id = :old_id
         """,  # noqa: S608
         {
@@ -322,15 +321,13 @@ async def update_payment(
     payment: Payment,
     new_checking_id: str | None = None,
     conn: Connection | None = None,
-) -> Payment:
+) -> None:
     payment.updated_at = datetime.now(timezone.utc)
     await (conn or db).update(
         "apipayments", payment, "WHERE checking_id = :checking_id"
     )
     if new_checking_id and new_checking_id != payment.checking_id:
         await update_payment_checking_id(payment.checking_id, new_checking_id, conn)
-        payment.checking_id = new_checking_id
-    return payment
 
 
 async def get_payments_history(
@@ -402,6 +399,7 @@ async def get_payment_count_stats(
     user_id: str | None = None,
     conn: Connection | None = None,
 ) -> list[PaymentCountStat]:
+
     if not filters:
         filters = Filters()
     extra_stmts = []
@@ -429,49 +427,12 @@ async def get_payment_count_stats(
     return data
 
 
-async def get_wallet_payment_total_breakdown(
-    wallet_id: str,
-    conn: Connection | None = None,
-) -> list[PaymentTotalBreakdown]:
-    wallet = await get_wallet(wallet_id, conn=conn)
-    if not wallet or not wallet.can_view_payments:
-        return []
-
-    values = {"wallet_id": wallet.source_wallet_id}
-    data = await (conn or db).fetchall(
-        query=f"""
-            SELECT tag,
-                CASE
-                    WHEN fiat_provider IS NOT NULL
-                    OR checking_id LIKE 'fiat_%'
-                    OR extra LIKE '%"fiat_payment_request"%'
-                    OR extra LIKE '%"fiat_amount"%'
-                    THEN true
-                    ELSE false
-                END AS is_fiat,
-                COUNT(*) AS payments_count,
-                SUM(amount - ABS(fee)) AS total
-            FROM apipayments
-            WHERE wallet_id = :wallet_id
-            AND (
-                status = '{PaymentState.SUCCESS}'
-                OR (amount < 0 AND status = '{PaymentState.PENDING}')
-            )
-            GROUP BY tag, is_fiat
-            ORDER BY tag
-        """,  # noqa: S608
-        values=values,
-        model=PaymentTotalBreakdown,
-    )
-
-    return data
-
-
 async def get_daily_stats(
     filters: Filters[PaymentFilters] | None = None,
     user_id: str | None = None,
     conn: Connection | None = None,
 ) -> tuple[list[PaymentDailyStats], list[PaymentDailyStats]]:
+
     if not filters:
         filters = Filters()
 
@@ -521,6 +482,7 @@ async def get_wallets_stats(
     user_id: str | None = None,
     conn: Connection | None = None,
 ) -> list[PaymentWalletStats]:
+
     if not filters:
         filters = Filters()
 

lnbits/core/models/__init__.py

@@ -23,10 +23,8 @@ from .payments import (
     PaymentHistoryPoint,
     PaymentsStatusCount,
     PaymentState,
-    PaymentTotalBreakdown,
     PaymentWalletStats,
     SettleInvoice,
-    UpdatePaymentExtra,
 )
 from .tinyurl import TinyURL
 from .users import (
@@ -84,7 +82,6 @@ __all__ = [
     "PaymentFilters",
     "PaymentHistoryPoint",
     "PaymentState",
-    "PaymentTotalBreakdown",
     "PaymentWalletStats",
     "PaymentsStatusCount",
     "RegisterUser",
@@ -93,7 +90,6 @@ __all__ = [
     "SimpleStatus",
     "TinyURL",
     "UpdateBalance",
-    "UpdatePaymentExtra",
     "UpdateSuperuserPassword",
     "UpdateUser",
     "UpdateUserPassword",

lnbits/core/models/extensions.py

@@ -55,10 +55,9 @@ class GitHubRelease(BaseModel):
 
 
 class Manifest(BaseModel):
+    featured: list[str] = []
     extensions: list[ExplicitRelease] = []
     repos: list[GitHubRelease] = []
-    featured: list[str] = []
-    categories: dict[str, list[str]] = {}
 
 
 class GitHubRepoRelease(BaseModel):
@@ -309,6 +308,7 @@ class ExtensionRelease(BaseModel):
 
     @classmethod
     async def fetch_release_details(cls, details_link: str) -> dict | None:
+
         try:
             async with httpx.AsyncClient() as client:
                 resp = await client.get(details_link)
@@ -333,7 +333,6 @@ class ExtensionMeta(BaseModel):
     dependencies: list[str] = []
     archive: str | None = None
     featured: bool = False
-    categories: list[str] = []
     paid_features: str | None = None
     has_paid_release: bool = False
     has_free_release: bool = False
@@ -681,11 +680,6 @@ class InstallableExtension(BaseModel):
 
                     meta = ext.meta or ExtensionMeta()
                     meta.featured = ext.id in manifest.featured
-                    meta.categories = [
-                        category
-                        for category, ext_ids in manifest.categories.items()
-                        if ext.id in ext_ids
-                    ]
                     ext.meta = meta
                     extension_list += [ext]
 
@@ -701,11 +695,6 @@ class InstallableExtension(BaseModel):
                     ext.check_release_updates(release)
                     meta = ext.meta or ExtensionMeta()
                     meta.featured = ext.id in manifest.featured
-                    meta.categories = [
-                        category
-                        for category, ext_ids in manifest.categories.items()
-                        if ext.id in ext_ids
-                    ]
                     ext.meta = meta
                     extension_list += [ext]
             except Exception as e:

lnbits/core/models/payments.py

@@ -35,11 +35,6 @@ class PaymentExtra(BaseModel):
     lnurl_response: str | None = None
 
 
-class UpdatePaymentExtra(BaseModel):
-    payment_hash: str
-    extra: dict = Field(default_factory=dict)
-
-
 class PayInvoice(BaseModel):
     payment_request: str
     description: str | None = None
@@ -140,18 +135,22 @@ class Payment(BaseModel):
         )
 
     # DEPRECATED: in v1.5.0, use service check_payment_status instead
-    async def check_status(self) -> PaymentStatus:
+    async def check_status(
+        self, skip_internal_payment_notifications: bool | None = False
+    ) -> PaymentStatus:
         logger.warning("payment.check_status() is deprecated.")
         from lnbits.core.services.payments import check_payment_status
 
-        return await check_payment_status(self)
+        return await check_payment_status(self, skip_internal_payment_notifications)
 
     # DEPRECATED: in v1.5.0, use service check_payment_status instead
-    async def check_fiat_status(self) -> FiatPaymentStatus:
+    async def check_fiat_status(
+        self, skip_internal_payment_notifications: bool | None = False
+    ) -> FiatPaymentStatus:
         logger.warning("payment.check_fiat_status() is deprecated.")
         from lnbits.core.services.fiat_providers import check_fiat_status
 
-        return await check_fiat_status(self)
+        return await check_fiat_status(self, skip_internal_payment_notifications)
 
 
 class PaymentFilters(FilterModel):
@@ -220,13 +219,6 @@ class PaymentWalletStats(BaseModel):
     balance: float = 0
 
 
-class PaymentTotalBreakdown(BaseModel):
-    tag: str | None = None
-    is_fiat: bool = False
-    payments_count: int = 0
-    total: int = 0
-
-
 class PaymentDailyStats(BaseModel):
     date: datetime
     balance: float = 0

lnbits/core/services/assets.py

@@ -1,9 +1,7 @@
 import base64
 import io
-from urllib.parse import quote
 from uuid import uuid4
 
-import filetype
 from fastapi import UploadFile
 from loguru import logger
 from PIL import Image
@@ -12,48 +10,11 @@ from lnbits.core.crud.assets import create_asset, get_user_assets_count
 from lnbits.core.models.assets import Asset
 from lnbits.settings import settings
 
-IMAGE_MIME_TYPE_ALIASES = {
-    "heic": "image/heic",
-    "heics": "image/heics",
-    "heif": "image/heif",
-    "image/jpg": "image/jpeg",
-    "jpeg": "image/jpeg",
-    "jpg": "image/jpeg",
-    "png": "image/png",
-}
-PIL_IMAGE_FORMAT_MIME_TYPES = {
-    "JPEG": "image/jpeg",
-    "PNG": "image/png",
-}
-INLINE_ASSET_MIME_TYPES = {
-    "image/heic",
-    "image/heics",
-    "image/heif",
-    "image/jpeg",
-    "image/png",
-}
-ASSET_SECURITY_HEADERS = {
-    "X-Content-Type-Options": "nosniff",
-    "Content-Security-Policy": (
-        "sandbox; default-src 'none'; script-src 'none'; "
-        "object-src 'none'; base-uri 'none'"
-    ),
-}
-THUMBNAIL_FORMAT_MIME_TYPES = {
-    "jpg": "image/jpeg",
-    "jpeg": "image/jpeg",
-    "png": "image/png",
-}
-
 
 async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) -> Asset:
     if not file.content_type:
         raise ValueError("File must have a content type.")
-
-    content_type = normalize_asset_mime_type(file.content_type)
-    filename = file.filename or "unnamed"
-
-    if content_type not in allowed_asset_mime_types():
+    if file.content_type.lower() not in settings.lnbits_assets_allowed_mime_types:
         raise ValueError(f"File type '{file.content_type}' not allowed.")
 
     if not settings.is_unlimited_assets_user(user_id):
@@ -69,26 +30,14 @@ async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) ->
             f"File limit of {settings.lnbits_max_asset_size_mb}MB exceeded."
         )
 
-    stored_mime_type = detect_image_mime_type(contents)
-    if stored_mime_type != content_type:
-        logger.warning(
-            "Image MIME type mismatch: declared={}, detected={}",
-            content_type,
-            stored_mime_type,
-        )
-        raise ValueError(
-            "Image file content does not match declared file type. "
-            f"Declared: '{content_type}', detected: '{stored_mime_type}'."
-        )
-
     thumb_buffer = thumbnail_from_bytes(contents)
 
     asset = Asset(
         id=uuid4().hex,
         user_id=user_id,
-        mime_type=stored_mime_type,
+        mime_type=file.content_type,
         is_public=is_public,
-        name=filename,
+        name=file.filename or "unnamed",
         size_bytes=len(contents),
         thumbnail_base64=(
             base64.b64encode(thumb_buffer.getvalue()).decode("utf-8")
@@ -102,79 +51,6 @@ async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) ->
     return asset
 
 
-def normalize_asset_mime_type(content_type: str) -> str:
-    content_type = content_type.split(";", 1)[0].strip().lower()
-    return IMAGE_MIME_TYPE_ALIASES.get(content_type, content_type)
-
-
-def normalize_media_type(media_type: str) -> str:
-    return media_type.split(";", 1)[0].strip().lower() or "application/octet-stream"
-
-
-def thumbnail_media_type() -> str:
-    thumbnail_format = (settings.lnbits_asset_thumbnail_format or "png").strip().lower()
-    return THUMBNAIL_FORMAT_MIME_TYPES.get(thumbnail_format, "application/octet-stream")
-
-
-def content_disposition(disposition: str, filename: str) -> str:
-    safe_filename = filename or "unnamed"
-    quoted_filename = quote(safe_filename, safe="")
-    if quoted_filename == safe_filename:
-        return f'{disposition}; filename="{safe_filename}"'
-    return f"{disposition}; filename*=utf-8''{quoted_filename}"
-
-
-def allowed_asset_mime_types() -> set[str]:
-    return {
-        mime_type
-        for mime_type in (
-            normalize_asset_mime_type(mime_type)
-            for mime_type in settings.lnbits_assets_allowed_mime_types
-        )
-        if mime_type.startswith("image/")
-    }
-
-
-def detect_image_mime_type(contents: bytes) -> str:
-    kind = filetype.guess(contents)
-    mime_type = normalize_asset_mime_type(kind.mime) if kind else None
-
-    if mime_type and mime_type in PIL_IMAGE_FORMAT_MIME_TYPES.values():
-        verify_pil_image(contents, mime_type)
-        return mime_type
-
-    if mime_type and mime_type.startswith("image/"):
-        return mime_type
-
-    try:
-        with Image.open(io.BytesIO(contents)) as image:
-            image.verify()
-            mime_type = PIL_IMAGE_FORMAT_MIME_TYPES.get(image.format or "")
-    except Exception as exc:
-        raise ValueError(
-            "Image file content does not match declared file type."
-        ) from exc
-
-    if not mime_type:
-        raise ValueError("Image file content does not match declared file type.")
-
-    return mime_type
-
-
-def verify_pil_image(contents: bytes, mime_type: str) -> None:
-    try:
-        with Image.open(io.BytesIO(contents)) as image:
-            image.verify()
-            detected_mime_type = PIL_IMAGE_FORMAT_MIME_TYPES.get(image.format or "")
-    except Exception as exc:
-        raise ValueError(
-            "Image file content does not match declared file type."
-        ) from exc
-
-    if detected_mime_type != mime_type:
-        raise ValueError("Image file content does not match declared file type.")
-
-
 def thumbnail_from_bytes(contents: bytes) -> io.BytesIO | None:
     try:
         image = Image.open(io.BytesIO(contents))

lnbits/core/services/fiat_providers.py

@@ -1,6 +1,7 @@
 import hashlib
 import hmac
 import json
+import math
 import time
 from base64 import b64encode
 
@@ -8,7 +9,7 @@ import httpx
 from loguru import logger
 
 from lnbits.core.crud import get_wallet
-from lnbits.core.crud.payments import create_payment, update_payment
+from lnbits.core.crud.payments import create_payment
 from lnbits.core.models import CreatePayment, Payment, PaymentState
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.db import Connection
@@ -36,7 +37,9 @@ async def handle_fiat_payment_confirmation(
         logger.warning(e)
 
 
-async def check_fiat_status(payment: Payment) -> FiatPaymentStatus:
+async def check_fiat_status(
+    payment: Payment, skip_internal_payment_notifications: bool | None = False
+) -> FiatPaymentStatus:
     if not payment.is_internal:
         return FiatPaymentPendingStatus()
     if payment.success:
@@ -56,11 +59,10 @@ async def check_fiat_status(payment: Payment) -> FiatPaymentStatus:
         return FiatPaymentPendingStatus()
     fiat_status = await fiat_provider.get_invoice_status(checking_id)
 
-    if fiat_status.success:
-        payment.status = PaymentState.SUCCESS.value
-        await update_payment(payment)
-        await handle_fiat_payment_confirmation(payment)
+    if skip_internal_payment_notifications:
+        return fiat_status
 
+    if fiat_status.success:
         # notify receivers asynchronously
         from lnbits.tasks import internal_invoice_queue
 
@@ -218,27 +220,35 @@ def check_revolut_signature(
         logger.warning("Revolut webhook signing secret is not set.")
         raise ValueError("Revolut webhook cannot be verified.")
 
-    try:
-        timestamp = int(timestamp_header)
-    except ValueError as exc:
-        logger.warning("Invalid Revolut timestamp.")
-        raise ValueError("Invalid Revolut timestamp.") from exc
-
+    timestamp = int(timestamp_header)
     timestamp_seconds = timestamp / 1000 if timestamp > 9999999999 else timestamp
+    if not math.isfinite(timestamp_seconds):
+        logger.warning("Invalid Revolut timestamp.")
+        raise ValueError("Invalid Revolut timestamp.")
 
     if abs(time.time() - timestamp_seconds) > tolerance_seconds:
         logger.warning("Timestamp outside tolerance.")
         raise ValueError("Timestamp outside tolerance." f"Timestamp: {timestamp}")
 
-    signed_payload = b"v1." + timestamp_header.encode() + b"." + payload
-    digest = hmac.new(
-        key=secret.encode(), msg=signed_payload, digestmod=hashlib.sha256
-    ).hexdigest()
-    expected_signature = f"v1={digest}"
+    candidates = [
+        b"v1." + timestamp_header.encode() + b"." + payload,
+        payload,
+        f"{timestamp_header}.{payload.decode()}".encode(),
+        timestamp_header.encode() + b"." + payload,
+    ]
+    signatures = []
+    for candidate in candidates:
+        digest = hmac.new(
+            key=secret.encode(), msg=candidate, digestmod=hashlib.sha256
+        ).digest()
+        signatures.extend(
+            [digest.hex(), f"v1={digest.hex()}", b64encode(digest).decode()]
+        )
 
     provided_signatures = [sig.strip() for sig in sig_header.split(",") if sig.strip()]
     if not any(
-        hmac.compare_digest(expected_signature, provided)
+        hmac.compare_digest(expected, provided)
+        for expected in signatures
         for provided in provided_signatures
     ):
         logger.warning("Revolut signature verification failed.")

lnbits/core/services/notifications.py

@@ -74,7 +74,7 @@ async def send_admin_notification(
     message: str,
     message_type: str | None = None,
 ) -> None:
-    return await send_notification_in_background(
+    return await send_notification(
         settings.lnbits_telegram_notifications_chat_id,
         settings.lnbits_nostr_notifications_identifiers,
         settings.lnbits_email_notifications_to_emails,
@@ -97,7 +97,7 @@ async def send_user_notification(
         if user_notifications.nostr_identifier
         else []
     )
-    return await send_notification_in_background(
+    return await send_notification(
         user_notifications.telegram_chat_id,
         nostr_identifiers,
         email_address,
@@ -222,20 +222,12 @@ async def send_email(
     msg["Subject"] = subject
     msg.attach(MIMEText(message, "plain"))
     username = username if len(username) > 0 else from_email
-
-    def _send() -> bool:
-        with smtplib.SMTP(server, port) as smtp_server:
-            smtp_server.starttls()
-            smtp_server.login(username, password)
-            smtp_server.sendmail(from_email, to_emails, msg.as_string())
+    with smtplib.SMTP(server, port) as smtp_server:
+        smtp_server.starttls()
+        smtp_server.login(username, password)
+        smtp_server.sendmail(from_email, to_emails, msg.as_string())
         return True
 
-    try:
-        return await asyncio.to_thread(_send)
-    except Exception as e:
-        logger.warning(f"Sending Email failed. {e!s}")
-        return False
-
 
 async def dispatch_webhook(payment: Payment):
     """
@@ -302,27 +294,6 @@ def send_payment_notification_in_background(wallet: Wallet, payment: Payment):
         logger.warning(f"Error sending payment notification: {e}")
 
 
-async def send_notification_in_background(
-    telegram_chat_id: str | None,
-    nostr_identifiers: list[str] | None,
-    email_addresses: list[str] | None,
-    message: str,
-    message_type: str | None = None,
-):
-    try:
-        create_task(
-            send_notification(
-                telegram_chat_id,
-                nostr_identifiers,
-                email_addresses,
-                message,
-                message_type,
-            )
-        )
-    except Exception as e:
-        logger.warning(f"Error sending notification in background: {e}")
-
-
 async def send_ws_payment_notification(wallet: Wallet, payment: Payment):
     # TODO: websocket message should be a clean payment model
     # await websocket_manager.send(wallet.inkey, payment.json())

lnbits/core/services/payments.py

@@ -13,6 +13,7 @@ from lnbits.core.crud.payments import get_daily_stats
 from lnbits.core.db import db
 from lnbits.core.models import PaymentDailyStats, PaymentFilters
 from lnbits.core.models.payments import CreateInvoice
+from lnbits.core.services.fiat_providers import handle_fiat_payment_confirmation
 from lnbits.db import Connection, Filters
 from lnbits.decorators import check_user_extension_access
 from lnbits.exceptions import InvoiceError, PaymentError, UnsupportedError
@@ -170,15 +171,15 @@ async def create_fiat_invoice(
 
     internal_payment.fiat_provider = fiat_provider_name
     internal_payment.extra["fiat_checking_id"] = fiat_invoice.checking_id
-    # TODO: move to payment
+    # todo: move to payent
     internal_payment.extra["fiat_payment_request"] = fiat_invoice.payment_request
     new_checking_id = (
         f"fiat_{fiat_provider_name}_"
         f"{fiat_invoice.checking_id or internal_payment.checking_id}"
     )
-    internal_payment = await update_payment(
-        internal_payment, new_checking_id, conn=conn
-    )
+    await update_payment(internal_payment, new_checking_id, conn=conn)
+    internal_payment.checking_id = new_checking_id
+
     return internal_payment
 
 
@@ -373,7 +374,7 @@ async def update_pending_payment(
     status = await check_payment_status(payment)
     if status.failed:
         payment.status = PaymentState.FAILED
-        payment = await update_payment(payment, conn=conn)
+        await update_payment(payment, conn=conn)
     elif status.success:
         payment = await update_payment_success_status(payment, status, conn=conn)
     return payment
@@ -629,14 +630,18 @@ async def check_transaction_status(
     return await check_payment_status(payment)
 
 
-async def check_payment_status(payment: Payment) -> PaymentStatus:
+async def check_payment_status(
+    payment: Payment, skip_internal_payment_notifications: bool | None = False
+) -> PaymentStatus:
     if payment.is_internal:
         if payment.success:
             return PaymentSuccessStatus()
         if payment.failed:
             return PaymentFailedStatus()
         if payment.is_in and payment.fiat_provider:
-            fiat_status = await check_fiat_status(payment)
+            fiat_status = await check_fiat_status(
+                payment, skip_internal_payment_notifications
+            )
             return PaymentStatus(paid=fiat_status.paid)
         return PaymentPendingStatus()
     funding_source = get_funding_source()
@@ -778,14 +783,9 @@ async def _pay_internal_invoice(
     await update_payment(internal_payment, conn=conn)
     logger.success(f"internal payment successful {internal_payment.checking_id}")
 
-    await _send_payment_notification_in_background(
-        wallet.id, payment, conn=conn
-    )  # notify the sender
-    await _send_payment_notification_in_background(
-        internal_payment.wallet_id, internal_payment, conn=conn
-    )  # notify the receiver
+    await _send_payment_notification_in_background(wallet.id, payment, conn=conn)
 
-    # notify receiver asynchronously (extension listeners)
+    # notify receiver asynchronously
     from lnbits.tasks import internal_invoice_queue
 
     logger.debug(f"enqueuing internal invoice {internal_payment.checking_id}")
@@ -876,7 +876,7 @@ async def update_payment_success_status(
         payment.status = PaymentState.SUCCESS
         payment.fee = -(abs(status.fee_msat or 0) + abs(service_fee_msat))
         payment.preimage = payment.preimage or status.preimage
-        payment = await update_payment(payment, conn=conn)
+        await update_payment(payment, conn=conn)
     return payment
 
 
@@ -1079,29 +1079,28 @@ async def _send_payment_notification_in_background(
     send_payment_notification_in_background(wallet, payment)
 
 
-async def update_invoice_from_paid_invoices_stream(checking_id: str) -> Payment | None:
+async def update_invoice_callback(checking_id: str) -> Payment | None:
     """
-    Takes a checking_id of an incoming payment from paid_invoices_stream()
-    Checks its status, updates its status and returns it.
-    returns None if no incoming payment was found or the status is not successful
+    Takes a checking_id of an incoming payment, from either paid_invoices_stream()
+    or internal_invoice_queue. Checks its status, updates and returns it.
+    returns None if no payment was found or it not and incoming payment.
     """
     payment = await get_standalone_payment(checking_id, incoming=True)
     if not payment:
-        logger.warning(f"No incoming payment found for '{checking_id}'.")
+        logger.warning(f"No payment found for '{checking_id}'.")
         return None
-
-    status = await check_payment_status(payment)
-
-    if not status.success:
-        logger.error(
-            "Unexpected status response from paid_invoices_stream. Skipping update."
-        )
+    if not payment.is_in:
+        logger.warning(f"Payment '{checking_id}' is not incoming, skipping.")
         return None
 
+    status = await check_payment_status(
+        payment, skip_internal_payment_notifications=True
+    )
     payment.fee = status.fee_msat or payment.fee
     # only overwrite preimage if status.preimage provides it
     payment.preimage = status.preimage or payment.preimage
     payment.status = PaymentState.SUCCESS
-    payment = await update_payment(payment)
-
+    await update_payment(payment)
+    if payment.fiat_provider:
+        await handle_fiat_payment_confirmation(payment)
     return payment

lnbits/core/tasks.py

@@ -25,7 +25,6 @@ from lnbits.core.services.notifications import (
 )
 from lnbits.db import Filters
 from lnbits.settings import settings
-from lnbits.utils.cache import cache
 from lnbits.utils.exchange_rates import btc_rates
 
 audit_queue: asyncio.Queue[AuditEntry] = asyncio.Queue()
@@ -156,11 +155,6 @@ async def collect_exchange_rates_data() -> None:
                     rates_values = [r[1] for r in rates]
                     lnbits_rate = sum(rates_values) / len(rates_values)
                     rates.append(("LNbits", lnbits_rate))
-                    cache.set(
-                        f"btc-price-{currency}",
-                        lnbits_rate,
-                        expiry=settings.lnbits_exchange_rate_cache_seconds,
-                    )
                 settings.append_exchange_rate_datapoint(dict(rates), max_history_size)
             except Exception as ex:
                 logger.warning(ex)

lnbits/core/views/asset_api.py

@@ -16,14 +16,7 @@ from lnbits.core.crud.assets import (
 from lnbits.core.models.assets import AssetFilters, AssetInfo, AssetUpdate
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.core.models.users import AccountId
-from lnbits.core.services.assets import (
-    ASSET_SECURITY_HEADERS,
-    INLINE_ASSET_MIME_TYPES,
-    content_disposition,
-    create_user_asset,
-    normalize_media_type,
-    thumbnail_media_type,
-)
+from lnbits.core.services.assets import create_user_asset
 from lnbits.db import Filters, Page
 from lnbits.decorators import (
     check_account_id_exists,
@@ -82,7 +75,11 @@ async def api_get_asset_data(
     if not asset:
         raise HTTPException(HTTPStatus.NOT_FOUND, "Asset not found.")
 
-    return asset_response(asset.data, asset.mime_type, asset.name)
+    return Response(
+        content=asset.data,
+        media_type=asset.mime_type,
+        headers={"Content-Disposition": f'inline; filename="{asset.name}"'},
+    )
 
 
 @asset_router.get(
@@ -104,14 +101,14 @@ async def api_get_asset_thumbnail(
     if not asset_info:
         raise HTTPException(HTTPStatus.NOT_FOUND, "Asset not found.")
 
-    return asset_response(
+    return Response(
         content=(
             base64.b64decode(asset_info.thumbnail_base64)
             if asset_info.thumbnail_base64
             else b""
         ),
-        media_type=thumbnail_media_type(),
-        filename=asset_info.name,
+        media_type=asset_info.mime_type,
+        headers={"Content-Disposition": f'inline; filename="{asset_info.name}"'},
     )
 
 
@@ -175,16 +172,3 @@ async def api_delete_asset(
 
     await delete_user_asset(account_id.id, asset_id)
     return SimpleStatus(success=True, message="Asset deleted successfully.")
-
-
-def asset_response(content: bytes, media_type: str, filename: str) -> Response:
-    media_type = normalize_media_type(media_type)
-    disposition = "inline" if media_type in INLINE_ASSET_MIME_TYPES else "attachment"
-    return Response(
-        content=content,
-        media_type=media_type,
-        headers={
-            **ASSET_SECURITY_HEADERS,
-            "Content-Disposition": content_disposition(disposition, filename),
-        },
-    )

lnbits/core/views/auth_api.py

@@ -36,7 +36,6 @@ from lnbits.decorators import (
     check_account_exists,
     check_admin,
     check_user_exists,
-    optional_user_id,
 )
 from lnbits.helpers import (
     create_access_token,
@@ -321,10 +320,7 @@ async def api_delete_user_api_token(
 
 @auth_router.get("/{provider}", description="SSO Provider")
 async def login_with_sso_provider(
-    request: Request,
-    provider: str,
-    user_id: str | None,
-    auth_user_id: str | None = Depends(optional_user_id),
+    request: Request, provider: str, user_id: str | None = None
 ):
     provider_sso = _new_sso(provider)
     if not provider_sso:
@@ -332,8 +328,6 @@ async def login_with_sso_provider(
             HTTPStatus.FORBIDDEN,
             f"Login by '{provider}' not allowed.",
         )
-    if user_id and user_id != auth_user_id:
-        raise HTTPException(HTTPStatus.FORBIDDEN, "User ID mismatch.")
 
     provider_sso.redirect_uri = str(request.base_url) + f"api/v1/auth/{provider}/token"
     with provider_sso:
@@ -354,11 +348,7 @@ async def handle_oauth_token(request: Request, provider: str) -> RedirectRespons
         userinfo = await provider_sso.verify_and_process(request)
         if not userinfo:
             raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid user info.")
-        if provider_sso.state is None or provider_sso.state == "null":
-            user_id = None
-        else:
-            user_id = decrypt_internal_message(provider_sso.state)
-
+        user_id = decrypt_internal_message(provider_sso.state)
     request.session.pop("user", None)
     return await _handle_sso_login(userinfo, user_id)
 

lnbits/core/views/callback_api.py

@@ -18,11 +18,7 @@ from lnbits.core.services.fiat_providers import (
     check_stripe_signature,
     verify_paypal_webhook,
 )
-from lnbits.core.services.payments import (
-    create_fiat_invoice,
-    create_wallet_invoice,
-    service_fee_fiat,
-)
+from lnbits.core.services.payments import create_fiat_invoice
 from lnbits.db import Filter, Filters
 from lnbits.fiat import get_fiat_provider
 from lnbits.fiat.base import FiatSubscriptionPaymentOptions
@@ -357,20 +353,15 @@ async def handle_revolut_event(event: dict):
             return
 
         payment = await get_standalone_payment(f"fiat_revolut_order_{order_id}")
-        if payment:
-            await check_fiat_status(payment)
-            return
-
-        if event_type == "ORDER_COMPLETED":
+        if not payment:
             logger.warning(f"No payment found for Revolut order: '{order_id}'.")
-            await _handle_revolut_subscription_order_paid(order_id)
             return
 
-        logger.info(f"Ignoring Revolut authorised order without payment: '{order_id}'.")
+        await check_fiat_status(payment)
         return
 
     if event_type == "SUBSCRIPTION_INITIATED":
-        logger.info("Revolut subscription initiated event received.")
+        await _handle_revolut_subscription_initiated(event)
         return
 
     if event_type in [
@@ -384,25 +375,18 @@ async def handle_revolut_event(event: dict):
     logger.warning(f"Unhandled Revolut event type: '{event_type}'.")
 
 
-async def _get_revolut_provider() -> RevolutWallet | None:
+async def _handle_revolut_subscription_initiated(event: dict):
+    subscription_id = event.get("subscription_id")
+    if not subscription_id:
+        logger.warning("Revolut subscription event missing subscription_id.")
+        return
+
     fiat_provider = await get_fiat_provider("revolut")
     if not isinstance(fiat_provider, RevolutWallet):
         logger.warning("Revolut fiat provider is not configured.")
-        return None
-    return fiat_provider
-
-
-async def _handle_revolut_subscription(
-    subscription: dict,
-    fiat_provider: RevolutWallet,
-    order_id: str | None = None,
-    order: dict | None = None,
-):
-    subscription_id = subscription.get("id")
-    if not subscription_id:
-        logger.warning("Revolut subscription missing id.")
         return
 
+    subscription = await fiat_provider.get_subscription(subscription_id)
     reference = fiat_provider.deserialize_subscription_reference(
         subscription.get("external_reference")
     )
@@ -410,17 +394,16 @@ async def _handle_revolut_subscription(
         logger.warning("Revolut subscription event missing LNbits metadata.")
         return
 
-    if not order_id:
-        cycle_id = subscription.get("current_cycle_id")
-        if not cycle_id:
-            logger.warning("Revolut subscription missing current_cycle_id.")
-            return
+    cycle_id = subscription.get("current_cycle_id")
+    if not cycle_id:
+        logger.warning("Revolut subscription missing current_cycle_id.")
+        return
 
-        cycle = await fiat_provider.get_subscription_cycle(subscription_id, cycle_id)
-        order_id = cycle.get("order_id")
-        if not order_id:
-            logger.warning("Revolut subscription cycle missing order_id.")
-            return
+    cycle = await fiat_provider.get_subscription_cycle(subscription_id, cycle_id)
+    order_id = cycle.get("order_id")
+    if not order_id:
+        logger.warning("Revolut subscription cycle missing order_id.")
+        return
 
     existing_payment = await get_standalone_payment(f"fiat_revolut_order_{order_id}")
     if existing_payment:
@@ -430,8 +413,7 @@ async def _handle_revolut_subscription(
         await check_fiat_status(existing_payment)
         return
 
-    if not order:
-        order = await fiat_provider.get_order(order_id)
+    order = await fiat_provider.get_order(order_id)
     amount_minor = order.get("amount")
     currency = (order.get("currency") or "").upper()
     if amount_minor is None or not currency:
@@ -439,7 +421,7 @@ async def _handle_revolut_subscription(
 
     extra = {
         **(reference.extra or {}),
-        "subscription_request_id": subscription_id,
+        "subscription_request_id": reference.subscription_request_id,
         "fiat_method": "subscription",
         "tag": reference.tag,
         "subscription": {
@@ -447,78 +429,19 @@ async def _handle_revolut_subscription(
             "payment_request": order.get("checkout_url") or "",
         },
     }
-    lnbits_payment = await _create_revolut_subscription_payment(
+    lnbits_payment = await create_fiat_invoice(
         wallet_id=reference.wallet_id,
-        amount_minor=amount_minor,
-        currency=currency,
-        memo=reference.memo or "",
-        extra=extra,
-        order_id=order_id,
-        payment_request=order.get("checkout_url") or "",
-        subscription_id=subscription_id,
-    )
-
-    await check_fiat_status(lnbits_payment)
-
-
-async def _handle_revolut_subscription_order_paid(order_id: str):
-    fiat_provider = await _get_revolut_provider()
-    if not fiat_provider:
-        return
-
-    order = await fiat_provider.get_order(order_id)
-    order_type = (order.get("type") or "").lower()
-    order_state = (order.get("state") or "").upper()
-    if order_type != "payment" or order_state != "COMPLETED":
-        logger.warning(f"Revolut order is not a completed payment: '{order_id}'.")
-        return
-
-    channel_data = order.get("channel_data") or {}
-    subscription_id = channel_data.get("subscription_id")
-    if not subscription_id:
-        logger.warning(f"Revolut order missing subscription_id: '{order_id}'.")
-        return
-
-    subscription = await fiat_provider.get_subscription(subscription_id)
-    if subscription.get("state") != "active":
-        logger.warning(f"Revolut subscription is not active: '{subscription_id}'.")
-        return
-
-    await _handle_revolut_subscription(
-        subscription, fiat_provider, order_id=order_id, order=order
-    )
-
-
-async def _create_revolut_subscription_payment(
-    wallet_id: str,
-    amount_minor: int,
-    currency: str,
-    memo: str,
-    extra: dict,
-    order_id: str,
-    payment_request: str,
-    subscription_id: str,
-) -> Payment:
-    amount = RevolutWallet.minor_units_to_amount(amount_minor, currency)
-    payment = await create_wallet_invoice(
-        wallet_id,
-        CreateInvoice(
+        invoice_data=CreateInvoice(
             unit=currency,
-            amount=amount,
-            memo=memo,
+            amount=amount_minor / 100,
+            memo=reference.memo or "",
             extra=extra,
-            internal=True,
+            fiat_provider="revolut",
             external_id=subscription_id,
         ),
     )
-    payment.fee = -abs(service_fee_fiat(payment.msat, "revolut"))
-    payment.fiat_provider = "revolut"
-    payment.extra["fiat_checking_id"] = f"order_{order_id}"
-    payment.extra["fiat_payment_request"] = payment_request
-    checking_id = f"fiat_revolut_order_{order_id}"
-    await update_payment(payment, checking_id)
-    payment.checking_id = checking_id
-    return payment
+
+    await check_fiat_status(lnbits_payment)
 
 
 async def _handle_square_payment_event(event: dict):

lnbits/core/views/extension_api.py

@@ -292,6 +292,7 @@ async def api_deactivate_extension(ext_id: str) -> SimpleStatus:
 
 @extension_router.delete("/{ext_id}", dependencies=[Depends(check_admin)])
 async def api_uninstall_extension(ext_id: str) -> SimpleStatus:
+
     extension = await get_installed_extension(ext_id)
     if not extension:
         raise HTTPException(
@@ -566,7 +567,6 @@ async def extensions(account_id: AccountId = Depends(check_account_id_exists)):
             "shortDescription": ext.short_description,
             "stars": ext.stars,
             "isFeatured": ext.meta.featured if ext.meta else False,
-            "categories": ext.meta.categories if ext.meta else [],
             "dependencies": ext.meta.dependencies if ext.meta else "",
             "isInstalled": ext.id in installed_exts_ids,
             "hasDatabaseTables": next(

lnbits/core/views/payment_api.py

@@ -14,7 +14,6 @@ from lnurl import url_decode
 from lnbits import bolt11
 from lnbits.core.crud.payments import (
     get_payment_count_stats,
-    get_wallet_payment_total_breakdown,
     get_wallets_stats,
     update_payment,
 )
@@ -32,11 +31,9 @@ from lnbits.core.models import (
     PaymentDailyStats,
     PaymentFilters,
     PaymentHistoryPoint,
-    PaymentTotalBreakdown,
     PaymentWalletStats,
     SettleInvoice,
     SimpleStatus,
-    UpdatePaymentExtra,
 )
 from lnbits.core.models.payments import UpdatePaymentLabels
 from lnbits.core.models.users import AccountId
@@ -133,17 +130,6 @@ async def api_payments_counting_stats(
     return await get_payment_count_stats(count_by, filters=filters, user_id=for_user_id)
 
 
-@payment_router.get(
-    "/stats/breakdown",
-    name="Get wallet payment total breakdown",
-    response_model=list[PaymentTotalBreakdown],
-)
-async def api_payments_total_breakdown(
-    key_info: BaseWalletTypeInfo = Depends(require_base_invoice_key),
-):
-    return await get_wallet_payment_total_breakdown(key_info.wallet.id)
-
-
 @payment_router.get(
     "/stats/wallets",
     name="Get payments history for all users",
@@ -311,38 +297,6 @@ async def api_update_payment_labels(
     return SimpleStatus(success=True, message="Payment labels updated.")
 
 
-@payment_router.patch(
-    "/extra",
-    name="Update payment extra",
-    description="Append new extra metadata to a payment.",
-    response_model=Payment,
-)
-async def api_update_payment_extra(
-    data: UpdatePaymentExtra,
-    key_type: WalletTypeInfo = Depends(require_admin_key),
-) -> Payment:
-    payment = await get_standalone_payment(
-        data.payment_hash, wallet_id=key_type.wallet.id
-    )
-    if payment is None:
-        raise HTTPException(HTTPStatus.NOT_FOUND, "Payment does not exist.")
-    if not payment.success:
-        raise HTTPException(
-            HTTPStatus.BAD_REQUEST, "Payment extra can only be updated after success."
-        )
-
-    duplicate_keys = sorted(set(payment.extra).intersection(data.extra))
-    if duplicate_keys:
-        raise HTTPException(
-            HTTPStatus.BAD_REQUEST,
-            f"Extra keys already exist: {', '.join(duplicate_keys)}.",
-        )
-
-    payment.extra.update(data.extra)
-    await update_payment(payment)
-    return payment
-
-
 @payment_router.get("/fee-reserve")
 async def api_payments_fee_reserve(invoice: str = Query("invoice")) -> JSONResponse:
     invoice_obj = bolt11.decode(invoice)

lnbits/fiat/base.py

@@ -95,10 +95,6 @@ class FiatSubscriptionPaymentOptions(BaseModel):
         description="Unique ID that can be used to identify the subscription request."
         "If not provided, one will be generated.",
     )
-    customer_email: str | None = Field(
-        default=None,
-        description="The customer email to use for the subscription.",
-    )
     tag: str | None = Field(
         default=None,
         description="Payments created by the recurring subscription"
@@ -131,15 +127,15 @@ class FiatSubscriptionResponse(BaseModel):
 
 
 class FiatPaymentSuccessStatus(FiatPaymentStatus):
-    paid = True  # type: ignore[reportIncompatibleVariableOverride]
+    paid = True
 
 
 class FiatPaymentFailedStatus(FiatPaymentStatus):
-    paid = False  # type: ignore[reportIncompatibleVariableOverride]
+    paid = False
 
 
 class FiatPaymentPendingStatus(FiatPaymentStatus):
-    paid = None  # type: ignore[reportIncompatibleVariableOverride]
+    paid = None
 
 
 class FiatProvider(ABC):

lnbits/fiat/revolut.py

@@ -2,7 +2,6 @@ import asyncio
 import ipaddress
 import json
 from collections.abc import AsyncGenerator
-from decimal import ROUND_HALF_UP, Decimal
 from typing import Any
 from urllib.parse import urlparse
 
@@ -57,37 +56,6 @@ REVOLUT_WEBHOOK_EVENTS = [
     "SUBSCRIPTION_INITIATED",
 ]
 
-ZERO_DECIMAL_CURRENCIES = {
-    "BIF",
-    "CLP",
-    "DJF",
-    "GNF",
-    "ISK",
-    "JPY",
-    "KMF",
-    "KRW",
-    "PYG",
-    "RWF",
-    "UGX",
-    "VND",
-    "VUV",
-    "XAF",
-    "XOF",
-    "XPF",
-}
-THREE_DECIMAL_CURRENCIES = {
-    "BHD",
-    "IQD",
-    "JOD",
-    "KWD",
-    "LYD",
-    "OMR",
-    "TND",
-}
-REVOLUT_CUSTOMER_LIST_LIMIT = 500
-REVOLUT_CUSTOMER_LIST_MAX_PAGES = 20
-REVOLUT_REQUEST_TIMEOUT = 30
-
 
 class RevolutWallet(FiatProvider):
     """https://developer.revolut.com/docs/merchant"""
@@ -125,11 +93,7 @@ class RevolutWallet(FiatProvider):
             return FiatStatusResponse(balance=0)
 
         try:
-            r = await self.client.get(
-                "/api/orders",
-                params={"limit": 1},
-                timeout=REVOLUT_REQUEST_TIMEOUT,
-            )
+            r = await self.client.get("/api/orders", params={"limit": 1}, timeout=15)
             r.raise_for_status()
             _ = r.json()
             return FiatStatusResponse(balance=0)
@@ -154,7 +118,7 @@ class RevolutWallet(FiatProvider):
                 ok=False, error_message="Invalid Revolut options"
             )
 
-        amount_minor = self.amount_to_minor_units(amount, currency)
+        amount_minor = int(amount * 100)
         checkout = opts.checkout or RevolutCheckoutOptions()
         success_url = (
             checkout.success_url
@@ -175,9 +139,7 @@ class RevolutWallet(FiatProvider):
         }
 
         try:
-            r = await self.client.post(
-                "/api/orders", json=payload, timeout=REVOLUT_REQUEST_TIMEOUT
-            )
+            r = await self.client.post("/api/orders", json=payload)
             r.raise_for_status()
             data = r.json()
             order_id = data.get("id")
@@ -221,6 +183,13 @@ class RevolutWallet(FiatProvider):
             )
 
         extra = payment_options.extra or {}
+        customer_id = extra.get("customer_id")
+        if not customer_id:
+            return FiatSubscriptionResponse(
+                ok=False,
+                error_message="Revolut subscriptions require extra.customer_id.",
+            )
+
         if not payment_options.subscription_request_id:
             payment_options.subscription_request_id = urlsafe_short_hash()
 
@@ -233,6 +202,7 @@ class RevolutWallet(FiatProvider):
         )
         payload: dict[str, Any] = {
             "plan_variation_id": subscription_id,
+            "customer_id": customer_id,
             "external_reference": self._serialize_subscription_reference(reference),
             "setup_order_redirect_url": (
                 payment_options.success_url
@@ -249,17 +219,8 @@ class RevolutWallet(FiatProvider):
         }
 
         try:
-            customer_id, customer_error = await self._get_subscription_customer_id(
-                payment_options
-            )
-            if not customer_id:
-                return FiatSubscriptionResponse(ok=False, error_message=customer_error)
-            payload["customer_id"] = customer_id
             r = await self.client.post(
-                "/api/subscriptions",
-                json=payload,
-                headers=headers,
-                timeout=REVOLUT_REQUEST_TIMEOUT,
+                "/api/subscriptions", json=payload, headers=headers
             )
             r.raise_for_status()
             data = r.json()
@@ -302,19 +263,7 @@ class RevolutWallet(FiatProvider):
         **kwargs,
     ) -> FiatSubscriptionResponse:
         try:
-            subscription = await self.get_subscription(subscription_id)
-            reference = self.deserialize_subscription_reference(
-                subscription.get("external_reference")
-            )
-            if not reference or reference.wallet_id != correlation_id:
-                return FiatSubscriptionResponse(
-                    ok=False, error_message="Subscription not found."
-                )
-
-            r = await self.client.post(
-                f"/api/subscriptions/{subscription_id}/cancel",
-                timeout=REVOLUT_REQUEST_TIMEOUT,
-            )
+            r = await self.client.post(f"/api/subscriptions/{subscription_id}/cancel")
             r.raise_for_status()
             return FiatSubscriptionResponse(ok=True)
         except Exception as exc:
@@ -355,16 +304,12 @@ class RevolutWallet(FiatProvider):
         return value.replace("order_", "", 1) if value.startswith("order_") else value
 
     async def get_order(self, order_id: str) -> dict[str, Any]:
-        r = await self.client.get(
-            f"/api/orders/{order_id}", timeout=REVOLUT_REQUEST_TIMEOUT
-        )
+        r = await self.client.get(f"/api/orders/{order_id}")
         r.raise_for_status()
         return r.json()
 
     async def get_subscription(self, subscription_id: str) -> dict[str, Any]:
-        r = await self.client.get(
-            f"/api/subscriptions/{subscription_id}", timeout=REVOLUT_REQUEST_TIMEOUT
-        )
+        r = await self.client.get(f"/api/subscriptions/{subscription_id}")
         r.raise_for_status()
         return r.json()
 
@@ -372,60 +317,7 @@ class RevolutWallet(FiatProvider):
         self, subscription_id: str, cycle_id: str
     ) -> dict[str, Any]:
         r = await self.client.get(
-            f"/api/subscriptions/{subscription_id}/cycles/{cycle_id}",
-            timeout=REVOLUT_REQUEST_TIMEOUT,
-        )
-        r.raise_for_status()
-        return r.json()
-
-    async def _get_subscription_customer_id(
-        self, payment_options: FiatSubscriptionPaymentOptions
-    ) -> tuple[str | None, str | None]:
-        if not payment_options.customer_email:
-            return (
-                None,
-                "Revolut subscriptions require customer_email.",
-            )
-
-        customer = await self._get_customer_by_email(payment_options.customer_email)
-        customer_id = customer.get("id") if customer else None
-        if customer_id:
-            return customer_id, None
-
-        customer = await self._create_customer(payment_options.customer_email)
-        customer_id = customer.get("id")
-        if not customer_id:
-            return None, "Server error: missing customer id"
-        return customer_id, None
-
-    async def _get_customer_by_email(self, email: str) -> dict[str, Any] | None:
-        page_token = None
-        for _ in range(REVOLUT_CUSTOMER_LIST_MAX_PAGES):
-            customer_page = await self._list_customers(page_token=page_token)
-            customer = _find_customer_by_email(customer_page["customers"], email)
-            if customer:
-                return customer
-
-            page_token = customer_page.get("next_page_token")
-            if not page_token:
-                return None
-        return None
-
-    async def _list_customers(self, page_token: str | None = None) -> dict[str, Any]:
-        params: dict[str, Any] = {"limit": REVOLUT_CUSTOMER_LIST_LIMIT}
-        if page_token:
-            params["page_token"] = page_token
-        r = await self.client.get(
-            "/api/customers", params=params, timeout=REVOLUT_REQUEST_TIMEOUT
-        )
-        r.raise_for_status()
-        return _extract_customer_page(r.json())
-
-    async def _create_customer(self, email: str) -> dict[str, Any]:
-        r = await self.client.post(
-            "/api/customers",
-            json={"email": email},
-            timeout=REVOLUT_REQUEST_TIMEOUT,
+            f"/api/subscriptions/{subscription_id}/cycles/{cycle_id}"
         )
         r.raise_for_status()
         return r.json()
@@ -462,15 +354,13 @@ class RevolutWallet(FiatProvider):
                 existing["already_exists"] = True
                 return existing
 
-            response = await client.post(
-                "/api/webhooks", json=payload, timeout=REVOLUT_REQUEST_TIMEOUT
-            )
+            response = await client.post("/api/webhooks", json=payload, timeout=15)
             response.raise_for_status()
             return response.json()
 
     @classmethod
     async def _list_webhooks(cls, client: httpx.AsyncClient) -> list[dict[str, Any]]:
-        response = await client.get("/api/webhooks", timeout=REVOLUT_REQUEST_TIMEOUT)
+        response = await client.get("/api/webhooks", timeout=15)
         response.raise_for_status()
         data = response.json()
         if isinstance(data, list):
@@ -495,9 +385,7 @@ class RevolutWallet(FiatProvider):
             if webhook_id and (
                 not webhook.get("events") or not webhook.get("signing_secret")
             ):
-                response = await client.get(
-                    f"/api/webhooks/{webhook_id}", timeout=REVOLUT_REQUEST_TIMEOUT
-                )
+                response = await client.get(f"/api/webhooks/{webhook_id}", timeout=15)
                 response.raise_for_status()
                 webhook = response.json()
 
@@ -557,25 +445,6 @@ class RevolutWallet(FiatProvider):
             return FiatPaymentFailedStatus()
         return FiatPaymentPendingStatus()
 
-    @classmethod
-    def amount_to_minor_units(cls, amount: float | Decimal, currency: str) -> int:
-        scale = Decimal(10) ** cls.currency_exponent(currency)
-        return int((Decimal(str(amount)) * scale).quantize(Decimal("1"), ROUND_HALF_UP))
-
-    @classmethod
-    def minor_units_to_amount(cls, amount: int, currency: str) -> float:
-        scale = Decimal(10) ** cls.currency_exponent(currency)
-        return float(Decimal(amount) / scale)
-
-    @classmethod
-    def currency_exponent(cls, currency: str) -> int:
-        normalized = currency.upper()
-        if normalized in ZERO_DECIMAL_CURRENCIES:
-            return 0
-        if normalized in THREE_DECIMAL_CURRENCIES:
-            return 3
-        return 2
-
     def _parse_create_opts(
         self, raw_opts: dict[str, Any]
     ) -> RevolutCreateInvoiceOptions | None:
@@ -616,31 +485,3 @@ class RevolutWallet(FiatProvider):
                 str(settings.revolut_webhook_signing_secret),
             ]
         )
-
-
-def _extract_customer_page(data: Any) -> dict[str, Any]:
-    if isinstance(data, list):
-        return {"customers": _filter_customer_list(data)}
-    if isinstance(data, dict):
-        for field in ["customers", "data", "items"]:
-            customers = data.get(field)
-            if isinstance(customers, list):
-                return {
-                    "customers": _filter_customer_list(customers),
-                    "next_page_token": data.get("next_page_token"),
-                }
-    return {"customers": []}
-
-
-def _filter_customer_list(customers: list[Any]) -> list[dict[str, Any]]:
-    return [customer for customer in customers if isinstance(customer, dict)]
-
-
-def _find_customer_by_email(
-    customers: list[dict[str, Any]], email: str
-) -> dict[str, Any] | None:
-    normalized_email = email.casefold()
-    for customer in customers:
-        if str(customer.get("email") or "").casefold() == normalized_email:
-            return customer
-    return None

lnbits/fiat/square.py

@@ -137,10 +137,6 @@ class SquareWallet(FiatProvider):
         payment_options: FiatSubscriptionPaymentOptions,
         **kwargs,
     ) -> FiatSubscriptionResponse:
-        if settings.lnbits_running:
-            return FiatSubscriptionResponse(
-                ok=False, error_message="Subscription not supported for Square."
-            )
         success_url = (
             payment_options.success_url
             or settings.square_payment_success_url

lnbits/llms_txt.py

@@ -1,78 +0,0 @@
-"""Generate llms.txt markdown from FastAPI OpenAPI schema for AI agents."""
-
-from typing import Any
-
-from fastapi import FastAPI
-from fastapi.responses import PlainTextResponse
-
-
-def generate_llms_txt(app: FastAPI) -> str:
-    """Convert an OpenAPI schema to llms.txt markdown format."""
-    openapi_schema = app.openapi()
-    lines: list[str] = []
-
-    # H1: API Title
-    info = openapi_schema.get("info", {})
-    title = info.get("title", "API")
-    lines.append(f"# {title}")
-    lines.append("")
-
-    # Blockquote: Description
-    description = info.get("description")
-    if description:
-        for line in description.strip().split("\n"):
-            lines.append(f"> {line}")
-        lines.append("")
-
-    # Group endpoints by tag
-    paths = openapi_schema.get("paths", {})
-    endpoints_by_tag: dict[str, list[dict[str, Any]]] = {}
-
-    for path, path_item in paths.items():
-        for method in ["get", "post", "put", "patch", "delete", "head", "options"]:
-            if method not in path_item:
-                continue
-            operation = path_item[method]
-            tags = operation.get("tags", ["Endpoints"])
-            tag = tags[0] if tags else "Endpoints"
-            if tag not in endpoints_by_tag:
-                endpoints_by_tag[tag] = []
-            endpoints_by_tag[tag].append(
-                {
-                    "path": path,
-                    "method": method.upper(),
-                    "operation": operation,
-                }
-            )
-
-    # Generate sections by tag
-    for tag, endpoints in endpoints_by_tag.items():
-        lines.append(f"## {tag}")
-        lines.append("")
-        for endpoint in endpoints:
-            method = endpoint["method"]
-            path = endpoint["path"]
-            operation = endpoint["operation"]
-            summary = operation.get("summary", "")
-            if summary:
-                lines.append(f"### `{method} {path}` - {summary}")
-            else:
-                lines.append(f"### `{method} {path}`")
-            lines.append("")
-        lines.append("")
-
-    return "\n".join(lines).strip() + "\n"
-
-
-def create_llms_txt_route(app: FastAPI) -> None:
-    """Add a /llms.txt endpoint to the app."""
-
-    @app.get(
-        "/llms.txt",
-        response_class=PlainTextResponse,
-        include_in_schema=False,
-        summary="Get LLM-friendly API documentation",
-    )
-    async def get_llms_txt() -> str:
-        """Return the API documentation in llms.txt markdown format."""
-        return generate_llms_txt(app)

lnbits/settings.py

@@ -300,7 +300,6 @@ class ThemesSettings(LNbitsSettings):
     lnbits_default_card_rounded: bool = Field(default=True)
     lnbits_default_card_gradient: bool = Field(default=True)
     lnbits_default_card_shadow: bool = Field(default=False)
-    lnbits_default_burger_menu_background: bool = Field(default=True)
 
 
 class OpsSettings(LNbitsSettings):
@@ -324,6 +323,11 @@ class AssetSettings(LNbitsSettings):
             "heic",
             "heif",
             "heics",
+            "text/plain",
+            "text/json",
+            "text/xml",
+            "application/json",
+            "application/pdf",
         ]
     )
     lnbits_asset_thumbnail_width: int = Field(default=128, ge=0)
@@ -359,7 +363,7 @@ class FeeSettings(LNbitsSettings):
 
 
 class ExchangeProvidersSettings(LNbitsSettings):
-    lnbits_exchange_rate_cache_seconds: int = Field(default=60, ge=0)
+    lnbits_exchange_rate_cache_seconds: int = Field(default=30, ge=0)
     lnbits_exchange_history_size: int = Field(default=60, ge=0)
     lnbits_exchange_history_refresh_interval_seconds: int = Field(default=300, ge=0)
 
@@ -1047,7 +1051,7 @@ class EditableSettings(
 
 
 class UpdateSettings(EditableSettings):
-    class Config(EditableSettings.Config):
+    class Config:
         extra = Extra.forbid
 
 
@@ -1198,11 +1202,11 @@ class ReadOnlySettings(
 
 
 class Settings(EditableSettings, ReadOnlySettings, TransientSettings, BaseSettings):
-    class Config(EditableSettings.Config, BaseSettings.Config):  # type: ignore[misc]
+    class Config:
         env_file = ".env"
         env_file_encoding = "utf-8"
         case_sensitive = False
-        json_loads = list_parse_fallback  # type: ignore[assignment]
+        json_loads = list_parse_fallback
 
     def is_user_allowed(self, user_id: str) -> bool:
         return (
@@ -1282,7 +1286,6 @@ class PublicSettings(BaseModel):
     default_card_rounded: bool = Field(alias="defaultCardRounded")
     default_card_gradient: bool = Field(alias="defaultCardGradient")
     default_card_shadow: bool = Field(alias="defaultCardShadow")
-    default_burger_menu_background: bool = Field(alias="defaultBurgerMenuBackground")
     denomination: str | None = Field()
     extensions: list[str] = Field()
     allowed_currencies: list[str] = Field(alias="allowedCurrencies")
@@ -1346,7 +1349,6 @@ class PublicSettings(BaseModel):
             defaultCardRounded=settings.lnbits_default_card_rounded,
             defaultCardGradient=settings.lnbits_default_card_gradient,
             defaultCardShadow=settings.lnbits_default_card_shadow,
-            defaultBurgerMenuBackground=settings.lnbits_default_burger_menu_background,
             denomination=settings.lnbits_denomination,
             extensions=list(settings.lnbits_installed_extensions_ids),
             allowedCurrencies=settings.lnbits_allowed_currencies,

lnbits/static/css/base.css

@@ -212,15 +212,12 @@ body.bg-image .q-page-container {
   backdrop-filter: none; /* Ensure the page content is not affected */
 }
 
-body.body--dark .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-  --q-dark: rgba(29, 29, 29, 0.3);
-  background-color: var(--q-dark);
-}
+body.body--dark .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark),
 body.body--dark .q-header,
 body.body--dark .q-drawer {
   --q-dark: rgba(29, 29, 29, 0.3);
   background-color: var(--q-dark);
-  backdrop-filter: brightness(0.8);
+  backdrop-filter: blur(6px) brightness(0.8);
 }
 
 body.rounded-ui .q-card,
@@ -391,18 +388,11 @@ body[data-theme=salvador].card-gradient.body--dark .q-drawer {
 }
 
 body.card-shadow .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-  box-shadow: 0 10px 24px rgba(0, 0, 0, 0.18);
+  filter: drop-shadow(0 10px 24px rgba(0, 0, 0, 0.18));
 }
 
 body.card-shadow.body--dark .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-  box-shadow: 0 12px 28px rgba(0, 0, 0, 0.45);
-}
-
-body.no-burger-background .q-drawer {
-  background-color: transparent !important;
-  background-image: none !important;
-  backdrop-filter: none !important;
-  box-shadow: none !important;
+  filter: drop-shadow(0 12px 28px rgba(0, 0, 0, 0.45));
 }
 
 :root {

lnbits/static/i18n/en.js

@@ -184,7 +184,6 @@ window.localisation.en = {
   release_notes: 'Release Notes',
   activate_extension_details: 'Make extension available/unavailable for users',
   featured: 'Featured',
-  categories: 'Categories',
   all: 'All',
   only_admins_can_install: '(Only admin accounts can install extensions)',
   only_admins_can_create_extensions:
@@ -491,8 +490,6 @@ window.localisation.en = {
   toggle_card_gradient: 'Toggle gradient on cards',
   card_shadow: 'Card Shadow',
   toggle_card_shadow: 'Toggle shadow on cards',
-  burger_menu_background: 'Burger Menu Background',
-  toggle_burger_menu_background: 'Toggle burger menu background',
   language: 'Language',
   assets: 'Assets',
   max_asset_size_mb: 'Max Asset Size (MB)',

lnbits/static/js/api.js

@@ -175,9 +175,6 @@ window._lnbitsApi = {
       wallet.inkey
     )
   },
-  getPaymentTotalBreakdown(wallet) {
-    return this.request('get', '/api/v1/payments/stats/breakdown', wallet.inkey)
-  },
   getPayment(wallet, paymentHash) {
     return this.request('get', '/api/v1/payments/' + paymentHash, wallet.inkey)
   },

lnbits/static/js/components.js

@@ -452,9 +452,7 @@ window.app.component('username-password', {
       confirmationMethod: 'code',
       confirmationEmail: '',
       confirmationCode: this.invitationCode || '',
-      showConfirmationCode: false,
-      showPwd: false,
-      showPwdRepeat: false
+      showConfirmationCode: false
     }
   },
   methods: {

lnbits/static/js/components/lnbits-payment-list.js

@@ -360,37 +360,18 @@ window.app.component('lnbits-payment-list', {
     paymentTableRowKey(row) {
       return row.payment_hash + row.amount
     },
-    async exportCSV(detailed = false) {
+    exportCSV(detailed = false) {
       // status is important for export but it is not in paymentsTable
       // because it is manually added with payment detail link and icons
       // and would cause duplication in the list
       const pagination = this.paymentsTable.pagination
-      const maxPages = 100
-      const limit = 1000
-      let payments = []
-
-      this.paymentsCSV.loading = true
-      try {
-        for (let page = 0; page < maxPages; page++) {
-          const query = {
-            sortby: pagination.sortBy ?? 'time',
-            direction: pagination.descending ? 'desc' : 'asc',
-            limit,
-            offset: page * limit
-          }
-          const params = new URLSearchParams(query)
-          const response = await LNbits.api.getPayments(this.wallet, params)
-          const pagePayments = response.data.data || []
-          payments = payments.concat(pagePayments.map(this.mapPayment))
-
-          if (
-            pagePayments.length < limit ||
-            payments.length >= response.data.total
-          ) {
-            break
-          }
-        }
-
+      const query = {
+        sortby: pagination.sortBy ?? 'time',
+        direction: pagination.descending ? 'desc' : 'asc'
+      }
+      const params = new URLSearchParams(query)
+      LNbits.api.getPayments(this.wallet, params).then(response => {
+        let payments = response.data.data.map(this.mapPayment)
         let columns = this.paymentsCSV.columns
 
         if (detailed) {
@@ -419,11 +400,7 @@ window.app.component('lnbits-payment-list', {
           payments,
           this.wallet.name + '-payments'
         )
-      } catch (err) {
-        LNbits.utils.notifyApiError(err)
-      } finally {
-        this.paymentsCSV.loading = false
-      }
+      })
     },
     addFilterTag() {
       if (!this.exportTagName) return

lnbits/static/js/components/lnbits-qrcode-lnurl.js

@@ -8,10 +8,6 @@ window.app.component('lnbits-qrcode-lnurl', {
     prefix: {
       type: String,
       default: 'lnurlp'
-    },
-    href: {
-      type: String,
-      default: ''
     }
   },
   data() {
@@ -25,10 +21,7 @@ window.app.component('lnbits-qrcode-lnurl', {
       if (this.tab == 'bech32') {
         const bytes = new TextEncoder().encode(this.url)
         const bech32 = NostrTools.nip19.encodeBytes('lnurl', bytes)
-        this.lnurl =
-          this.href && this.href.trim() !== ''
-            ? `${this.href}?lightning=${bech32.toUpperCase()}`
-            : `lightning:${bech32.toUpperCase()}`
+        this.lnurl = `lightning:${bech32.toUpperCase()}`
       } else if (this.tab == 'lud17') {
         if (this.url.startsWith('http://')) {
           this.lnurl = this.url.replace('http://', this.prefix + '://')

lnbits/static/js/components/lnbits-qrcode.js

@@ -85,9 +85,6 @@ window.app.component('lnbits-qrcode', {
         event.preventDefault()
         event.stopPropagation()
         return false
-      } else if (this.href && this.href.startsWith('http')) {
-        window.open(this.href, '_blank')
-        event.preventDefault()
       }
     },
     async writeNfcTag() {

lnbits/static/js/components/lnbits-theme.js

@@ -69,14 +69,6 @@ window.app.component('lnbits-theme', {
         document.body.classList.remove('card-shadow')
       }
     },
-    'g.burgerMenuChoice'(val) {
-      this.$q.localStorage.set('lnbits.burgerMenu', val)
-      if (val === true) {
-        document.body.classList.remove('no-burger-background')
-      } else {
-        document.body.classList.add('no-burger-background')
-      }
-    },
     'g.mobileSimple'(val) {
       this.$q.localStorage.set('lnbits.mobileSimple', val)
       if (val === true) {
@@ -158,9 +150,6 @@ window.app.component('lnbits-theme', {
     if (this.g.cardShadowChoice === true) {
       document.body.classList.add('card-shadow')
     }
-    if (this.g.burgerMenuChoice !== true) {
-      document.body.classList.add('no-burger-background')
-    }
     if (this.g.bgimageChoice !== '') {
       document.body.classList.add('bg-image')
       document.body.style.setProperty(

lnbits/static/js/event-reactions.js

@@ -1,17 +1,16 @@
 function eventReaction(amount) {
   localUrl = ''
-  const reaction =
-    Quasar.LocalStorage.getItem('lnbits.reactions') || SETTINGS.defaultReaction
-  if (!reaction || reaction.toLowerCase() === 'none') {
+  reaction = localStorage.getItem('lnbits.reactions')
+  if (!reaction || reaction === 'None') {
     return
   }
-
   try {
     if (amount < 0) {
       return
     }
-    if (typeof window[reaction] === 'function') {
-      window[reaction]()
+    reaction = localStorage.getItem('lnbits.reactions')
+    if (reaction) {
+      window[reaction.split('|')[1]]()
     }
   } catch (e) {
     console.log(e)

lnbits/static/js/globals.js

@@ -29,10 +29,6 @@ window.g = Vue.reactive({
     SETTINGS.defaultCardGradient
   ),
   cardShadowChoice: localStore('lnbits.cardShadow', SETTINGS.defaultCardShadow),
-  burgerMenuChoice: localStore(
-    'lnbits.burgerMenu',
-    SETTINGS.defaultBurgerMenuBackground
-  ),
   reactionChoice: localStore('lnbits.reactions', SETTINGS.defaultReaction),
   bgimageChoice: localStore(
     'lnbits.backgroundImage',

lnbits/static/js/init-app.js

@@ -27,14 +27,6 @@ const DynamicComponent = {
             name: r.name,
             component: async () => {
               await LNbits.utils.loadTemplate(r.template)
-              if (r.i18n) {
-                const locale =
-                  window.i18n?.global?.locale?.value ??
-                  window.i18n?.global?.locale ??
-                  window.g.locale ??
-                  'en'
-                await LNbits.utils.loadExtI18n(r.i18n, locale)
-              }
               await LNbits.utils.loadScript(r.component)
               return window[r.name]
             }
@@ -159,30 +151,6 @@ window.i18n = new VueI18n.createI18n({
   fallbackLocale: 'en',
   messages: window.localisation
 })
-;(function () {
-  let _applying = false
-  let _target = null
-  Vue.watch(
-    () => window.i18n.global.locale,
-    async (locale, prevLocale) => {
-      if (_applying || !LNbits.utils._extI18nDirs.size) return
-      _target = locale
-      _applying = true
-      window.i18n.global.locale = prevLocale
-      _applying = false
-      await Promise.all(
-        [...LNbits.utils._extI18nDirs].map(dir =>
-          LNbits.utils.loadExtI18n(dir, locale)
-        )
-      )
-      if (_target !== locale) return
-      _applying = true
-      window.i18n.global.locale = locale
-      _applying = false
-    },
-    {flush: 'sync'}
-  )
-})()
 
 window.app.mixin({
   data() {

lnbits/static/js/pages/account.js

@@ -732,8 +732,7 @@ window.PageAccount = {
         darkChoice: this.g.settings.defaultDark,
         cardRoundedChoice: this.g.settings.defaultCardRounded,
         cardGradientChoice: this.g.settings.defaultCardGradient,
-        cardShadowChoice: this.g.settings.defaultCardShadow,
-        burgerMenuChoice: this.g.settings.defaultBurgerMenuBackground
+        cardShadowChoice: this.g.settings.defaultCardShadow
       }
       this.siteCustomisationChanged(defaults)
     }

lnbits/static/js/pages/extensions.js

@@ -10,7 +10,6 @@ window.PageExtensions = {
       tab: 'installed',
       manageExtensionTab: 'releases',
       filteredExtensions: [],
-      categories: new Set(),
       updatableExtensions: [],
       showUninstallDialog: false,
       showManageExtensionDialog: false,
@@ -107,10 +106,6 @@ window.PageExtensions = {
         }
       }
 
-      const isCategoryTab = !['installed', 'all', 'featured'].includes(tab)
-      const isInSelectedCategory = extension =>
-        extension.categories?.includes(tab) ?? false
-
       this.filteredExtensions = this.extensions
         .filter(e => (tab === 'all' ? !e.isInstalled : true))
         .filter(e => (tab === 'installed' ? e.isInstalled : true))
@@ -118,7 +113,6 @@ window.PageExtensions = {
           tab === 'installed' ? (e.isActive ? true : !!this.g.user.admin) : true
         )
         .filter(e => (tab === 'featured' ? e.isFeatured : true))
-        .filter(e => (isCategoryTab ? isInSelectedCategory(e) : true))
         .filter(extensionNameContains(term))
         .map(e => ({
           ...e,
@@ -838,9 +832,6 @@ window.PageExtensions = {
     async fetchAllExtensions() {
       try {
         const {data} = await LNbits.api.request('GET', `/api/v1/extension/all`)
-        data.forEach(ext => {
-          ext.categories?.forEach(category => this.categories.add(category))
-        })
         return data
       } catch (error) {
         console.warn(error)

lnbits/static/js/pages/wallet.js

@@ -48,13 +48,6 @@ window.PageWallet = {
       hasNfc: false,
       nfcReaderAbortController: null,
       formattedFiatAmount: 0,
-      totalBreakdown: {
-        show: false,
-        loading: false,
-        rows: [],
-        selectedTypes: ['bitcoin', 'fiat'],
-        selectedTags: []
-      },
       paymentFilter: {
         'status[ne]': 'failed'
       },
@@ -91,116 +84,9 @@ window.PageWallet = {
     },
     formattedSatAmount() {
       return LNbits.utils.formatMsat(this.receive.amountMsat) + ' sat'
-    },
-    totalBreakdownTags() {
-      const tags = this.totalBreakdown.rows.map(row => row.tag || null)
-      return [...new Set(tags)].sort((a, b) =>
-        this.totalBreakdownTagLabel(a).localeCompare(
-          this.totalBreakdownTagLabel(b)
-        )
-      )
-    },
-    hasFiatTotalBreakdown() {
-      return this.totalBreakdown.rows.some(row => row.is_fiat)
-    },
-    selectedTotalBreakdownRows() {
-      return this.totalBreakdown.rows.filter(row => {
-        const type = row.is_fiat ? 'fiat' : 'bitcoin'
-        return (
-          this.totalBreakdown.selectedTypes.includes(type) &&
-          this.totalBreakdown.selectedTags.includes(
-            this.totalBreakdownTagKey(row.tag)
-          )
-        )
-      })
-    },
-    selectedTotalBreakdownMsat() {
-      return this.selectedTotalBreakdownRows.reduce(
-        (total, row) => total + row.total,
-        0
-      )
-    },
-    selectedTotalBreakdownSat() {
-      return Math.round(this.selectedTotalBreakdownMsat / 1000)
-    },
-    selectedTotalBreakdownCount() {
-      return this.selectedTotalBreakdownRows.reduce(
-        (total, row) => total + row.payments_count,
-        0
-      )
-    },
-    formattedTotalBreakdown() {
-      return this.utils.formatBalance(
-        this.selectedTotalBreakdownSat,
-        this.g.denomination
-      )
-    },
-    formattedTotalBreakdownFiat() {
-      if (!this.g.fiatTracking) return null
-      const amount =
-        (this.selectedTotalBreakdownSat / 100000000) * this.g.exchangeRate
-      return LNbits.utils.formatCurrency(amount, this.g.wallet.currency)
-    },
-    primaryTotalBreakdownValue() {
-      if (this.g.isFiatPriority && this.g.fiatTracking) {
-        return this.formattedTotalBreakdownFiat || this.formattedTotalBreakdown
-      }
-      return this.formattedTotalBreakdown
-    },
-    secondaryTotalBreakdownValue() {
-      if (!this.g.fiatTracking) return null
-      if (this.g.isFiatPriority) {
-        return this.formattedTotalBreakdown
-      }
-      return this.formattedTotalBreakdownFiat
     }
   },
   methods: {
-    showWalletTotalBreakdown() {
-      this.totalBreakdown.show = true
-      if (!this.totalBreakdown.rows.length) {
-        this.fetchTotalBreakdown()
-      }
-    },
-    fetchTotalBreakdown() {
-      this.totalBreakdown.loading = true
-      LNbits.api
-        .getPaymentTotalBreakdown(this.g.wallet)
-        .then(response => {
-          this.totalBreakdown.rows = response.data
-          this.totalBreakdown.selectedTypes = ['bitcoin', 'fiat']
-          this.totalBreakdown.selectedTags = this.totalBreakdownTags.map(
-            this.totalBreakdownTagKey
-          )
-          this.totalBreakdown.loading = false
-        })
-        .catch(err => {
-          this.totalBreakdown.loading = false
-          LNbits.utils.notifyApiError(err)
-        })
-    },
-    totalBreakdownTagLabel(tag) {
-      return tag || 'No tag'
-    },
-    totalBreakdownTagKey(tag) {
-      return tag || '__untagged__'
-    },
-    totalBreakdownTagCount(tag) {
-      return this.totalBreakdown.rows
-        .filter(row => (row.tag || null) === tag)
-        .reduce((total, row) => total + row.payments_count, 0)
-    },
-    totalBreakdownTagMsat(tag) {
-      return this.totalBreakdown.rows
-        .filter(row => (row.tag || null) === tag)
-        .reduce((total, row) => total + row.total, 0)
-    },
-    formatTotalBreakdownMsat(msat) {
-      return this.utils.formatBalance(
-        Math.round(msat / 1000),
-        this.g.denomination
-      )
-    },
     handleSendLnurl(lnurl) {
       this.parse.data.request = lnurl
       this.parse.show = true
@@ -337,12 +223,6 @@ window.PageWallet = {
           if (data.tag === 'payRequest') {
             this.parse.lnurlpay = Object.freeze(data)
             this.parse.data.amount = data.minSendable / 1000
-            this.receive.units = [
-              'sats',
-              ...(this.g.allowedCurrencies.length > 0
-                ? this.g.allowedCurrencies
-                : this.g.currencies)
-            ]
           } else if (data.tag === 'login') {
             this.parse.lnurlauth = Object.freeze(data)
           } else if (data.tag === 'withdrawRequest') {

lnbits/static/js/utils.js

@@ -323,20 +323,6 @@ window._lnbitsUtils = {
     converter.setOption('simpleLineBreaks', true)
     return converter.makeHtml(text)
   },
-  _extI18nDirs: new Set(),
-  _extI18nLoaded: {},
-  loadExtI18n(dir, locale) {
-    this._extI18nDirs.add(dir)
-    const loaded = (this._extI18nLoaded[dir] ??= {})
-    if (loaded[locale]) return loaded[locale]
-    loaded[locale] = this.loadScript(`${dir}/${locale}.js`).catch(() => {
-      if (locale !== 'en') {
-        loaded['en'] ??= this.loadScript(`${dir}/en.js`).catch(() => {})
-        return loaded['en']
-      }
-    })
-    return loaded[locale]
-  },
   async decryptLnurlPayAES(success_action, preimage) {
     let keyb = new Uint8Array(
       preimage.match(/[\da-f]{2}/gi).map(h => parseInt(h, 16))

lnbits/static/scss/background.scss

@@ -58,15 +58,11 @@ body.bg-image {
 }
 // transparent background for specific elements
 body.body--dark {
-  .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-    --q-dark: #{color.adjust(#1d1d1d, $alpha: -0.7)};
-    background-color: var(--q-dark);
-  }
-
+  .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark),
   .q-header,
   .q-drawer {
     --q-dark: #{color.adjust(#1d1d1d, $alpha: -0.7)};
     background-color: var(--q-dark);
-    backdrop-filter: brightness(0.8);
+    backdrop-filter: blur(6px) brightness(0.8);
   }
 }

lnbits/static/scss/cards.scss

@@ -61,21 +61,12 @@ body.rounded-ui {
 
 body.card-shadow {
   .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-    box-shadow: 0 10px 24px rgba(0, 0, 0, 0.18);
+    filter: drop-shadow(0 10px 24px rgba(0, 0, 0, 0.18));
   }
 }
 
 body.card-shadow.body--dark {
   .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-    box-shadow: 0 12px 28px rgba(0, 0, 0, 0.45);
-  }
-}
-
-body.no-burger-background {
-  .q-drawer {
-    background-color: transparent !important;
-    background-image: none !important;
-    backdrop-filter: none !important;
-    box-shadow: none !important;
+    filter: drop-shadow(0 12px 28px rgba(0, 0, 0, 0.45));
   }
 }

lnbits/static/vendor/Chart.css

@@ -0,0 +1,47 @@
+/*
+ * DOM element rendering detection
+ * https://davidwalsh.name/detect-node-insertion
+ */
+@keyframes chartjs-render-animation {
+	from { opacity: 0.99; }
+	to { opacity: 1; }
+}
+
+.chartjs-render-monitor {
+	animation: chartjs-render-animation 0.001s;
+}
+
+/*
+ * DOM element resizing detection
+ * https://github.com/marcj/css-element-queries
+ */
+.chartjs-size-monitor,
+.chartjs-size-monitor-expand,
+.chartjs-size-monitor-shrink {
+	position: absolute;
+	direction: ltr;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	overflow: hidden;
+	pointer-events: none;
+	visibility: hidden;
+	z-index: -1;
+}
+
+.chartjs-size-monitor-expand > div {
+	position: absolute;
+	width: 1000000px;
+	height: 1000000px;
+	left: 0;
+	top: 0;
+}
+
+.chartjs-size-monitor-shrink > div {
+	position: absolute;
+	width: 200%;
+	height: 200%;
+	left: 0;
+	top: 0;
+}

lnbits/static/vendor/qrcode.vue.browser.js

@@ -1,5 +1,5 @@
 /*!
- * qrcode.vue v3.9.0
+ * qrcode.vue v3.6.0
  * A Vue.js component to generate QRCode. Both support Vue 2 and Vue 3
  * © 2017-PRESENT @scopewu(https://github.com/scopewu)
  * MIT License.
@@ -909,18 +909,7 @@ var qrcodegen;
 })(qrcodegen || (qrcodegen = {}));
 var QR = qrcodegen;
 
-var _uid = 0;
-function getUid() {
-    if (typeof vue.useId === 'function') {
-        return "".concat(vue.useId(), "-").concat(_uid++);
-    }
-    return "vue-".concat(Math.random().toString(36).slice(2), "-").concat(_uid++);
-}
 var defaultErrorCorrectLevel = 'L';
-var DEFAULT_QR_SIZE = 100;
-var DEFAULT_MARGIN = 0;
-var DEFAULT_IMAGE_SIZE_RATIO = 0.1;
-var IMAGE_EXCAVATE_THICKNESS = 2;
 var ErrorCorrectLevelMap = {
     L: QR.QrCode.Ecc.LOW,
     M: QR.QrCode.Ecc.MEDIUM,
@@ -940,139 +929,74 @@ var SUPPORTS_PATH2D = (function () {
 function validErrorCorrectLevel(level) {
     return level in ErrorCorrectLevelMap;
 }
-function getNeighborFlags(modules, row, col) {
-    var north = row > 0 ? modules[row - 1][col] : false;
-    var south = row < modules.length - 1 ? modules[row + 1][col] : false;
-    var west = col > 0 ? modules[row][col - 1] : false;
-    var east = col < modules[row].length - 1 ? modules[row][col + 1] : false;
-    return {
-        nw: !north && !west,
-        ne: !north && !east,
-        se: !south && !east,
-        sw: !south && !west,
-    };
-}
-function generateRoundedPath(modules, margin, radius) {
-    if (margin === void 0) { margin = 0; }
-    if (radius === void 0) { radius = 0; }
-    var pathSegments = [];
-    var r = Math.min(radius, 0.5);
-    for (var row = 0; row < modules.length; row++) {
-        for (var col = 0; col < modules[row].length; col++) {
-            if (!modules[row][col])
-                continue;
-            var _a = getNeighborFlags(modules, row, col), nw = _a.nw, ne = _a.ne, se = _a.se, sw = _a.sw;
-            var x = col + margin;
-            var y = row + margin;
-            pathSegments.push("M".concat(x + (nw ? r : 0), " ").concat(y), "L".concat(x + 1 - (ne ? r : 0), " ").concat(y));
-            if (ne) {
-                pathSegments.push("A".concat(r, " ").concat(r, " 0 0 1 ").concat(x + 1, " ").concat(y + r));
-            }
-            pathSegments.push("L".concat(x + 1, " ").concat(y + 1 - (se ? r : 0)));
-            if (se) {
-                pathSegments.push("A".concat(r, " ").concat(r, " 0 0 1 ").concat(x + 1 - r, " ").concat(y + 1));
-            }
-            pathSegments.push("L".concat(x + (sw ? r : 0), " ").concat(y + 1));
-            if (sw) {
-                pathSegments.push("A".concat(r, " ").concat(r, " 0 0 1 ").concat(x, " ").concat(y + 1 - r));
-            }
-            pathSegments.push("L".concat(x, " ").concat(y + (nw ? r : 0)));
-            if (nw) {
-                pathSegments.push("A".concat(r, " ").concat(r, " 0 0 1 ").concat(x + r, " ").concat(y));
-            }
-            pathSegments.push('z');
-        }
-    }
-    return pathSegments.join('');
-}
 function generatePath(modules, margin) {
     if (margin === void 0) { margin = 0; }
-    var pathSegments = [];
-    for (var y = 0; y < modules.length; y++) {
-        var row = modules[y];
+    var ops = [];
+    modules.forEach(function (row, y) {
         var start = null;
-        for (var x = 0; x < row.length; x++) {
-            var cell = row[x];
+        row.forEach(function (cell, x) {
             if (!cell && start !== null) {
                 // M0 0h7v1H0z injects the space with the move and drops the comma,
-                pathSegments.push("M".concat(start + margin, " ").concat(y + margin, "h").concat(x - start, "v1H").concat(start + margin, "z"));
+                // saving a char per operation
+                ops.push("M".concat(start + margin, " ").concat(y + margin, "h").concat(x - start, "v1H").concat(start + margin, "z"));
                 start = null;
-                continue;
+                return;
             }
             // end of row, clean up or skip
             if (x === row.length - 1) {
                 if (!cell) {
                     // We would have closed the op above already so this can only mean
                     // 2+ light modules in a row.
-                    continue;
+                    return;
                 }
                 if (start === null) {
                     // Just a single dark module.
-                    pathSegments.push("M".concat(x + margin, ",").concat(y + margin, " h1v1H").concat(x + margin, "z"));
+                    ops.push("M".concat(x + margin, ",").concat(y + margin, " h1v1H").concat(x + margin, "z"));
                 }
                 else {
                     // Otherwise finish the current line.
-                    pathSegments.push("M".concat(start + margin, ",").concat(y + margin, " h").concat(x + 1 - start, "v1H").concat(start + margin, "z"));
+                    ops.push("M".concat(start + margin, ",").concat(y + margin, " h").concat(x + 1 - start, "v1H").concat(start + margin, "z"));
                 }
-                continue;
+                return;
             }
             if (cell && start === null) {
                 start = x;
             }
-        }
-    }
-    return pathSegments.join('');
+        });
+    });
+    return ops.join('');
 }
 function getImageSettings(cells, size, margin, imageSettings) {
     var width = imageSettings.width, height = imageSettings.height, imageX = imageSettings.x, imageY = imageSettings.y;
     var numCells = cells.length + margin * 2;
-    var defaultSize = Math.floor(size * DEFAULT_IMAGE_SIZE_RATIO);
+    var defaultSize = Math.floor(size * 0.1);
     var scale = numCells / size;
     var w = (width || defaultSize) * scale;
     var h = (height || defaultSize) * scale;
     var x = imageX == null ? cells.length / 2 - w / 2 : imageX * scale;
     var y = imageY == null ? cells.length / 2 - h / 2 : imageY * scale;
-    var borderRadius = (imageSettings.borderRadius || 0) * scale;
-    return { x: x, y: y, h: h, w: w, borderRadius: borderRadius };
+    var excavation = null;
+    if (imageSettings.excavate) {
+        var floorX = Math.floor(x);
+        var floorY = Math.floor(y);
+        var ceilW = Math.ceil(w + x - floorX);
+        var ceilH = Math.ceil(h + y - floorY);
+        excavation = { x: floorX, y: floorY, w: ceilW, h: ceilH };
+    }
+    return { x: x, y: y, h: h, w: w, excavation: excavation };
 }
-function useQRCode(props) {
-    var margin = vue.computed(function () { var _a; return ((_a = props.margin) !== null && _a !== void 0 ? _a : DEFAULT_MARGIN) >>> 0; });
-    var cells = vue.computed(function () {
-        var level = validErrorCorrectLevel(props.level) ? props.level : defaultErrorCorrectLevel;
-        return QR.QrCode.encodeText(props.value, ErrorCorrectLevelMap[level]).getModules();
-    });
-    var numCells = vue.computed(function () { return cells.value.length + margin.value * 2; });
-    var fgPath = vue.computed(function () {
-        if (props.radius > 0) {
-            return generateRoundedPath(cells.value, margin.value, props.radius);
+function excavateModules(modules, excavation) {
+    return modules.slice().map(function (row, y) {
+        if (y < excavation.y || y >= excavation.y + excavation.h) {
+            return row;
         }
-        return generatePath(cells.value, margin.value);
+        return row.map(function (cell, x) {
+            if (x < excavation.x || x >= excavation.x + excavation.w) {
+                return cell;
+            }
+            return false;
+        });
     });
-    var imageProps = vue.computed(function () {
-        if (!props.imageSettings.src)
-            return null;
-        var settings = getImageSettings(cells.value, props.size, margin.value, props.imageSettings);
-        return {
-            x: settings.x + margin.value,
-            y: settings.y + margin.value,
-            width: settings.w,
-            height: settings.h,
-            borderRadius: settings.borderRadius,
-        };
-    });
-    var imageBorderProps = vue.computed(function () {
-        if (!props.imageSettings.excavate || !imageProps.value)
-            return null;
-        var borderThickness = IMAGE_EXCAVATE_THICKNESS / (props.size / numCells.value);
-        return {
-            x: imageProps.value.x - borderThickness,
-            y: imageProps.value.y - borderThickness,
-            width: imageProps.value.width + borderThickness * 2,
-            height: imageProps.value.height + borderThickness * 2,
-            borderRadius: imageProps.value.borderRadius,
-        };
-    });
-    return { margin: margin, numCells: numCells, cells: cells, fgPath: fgPath, imageProps: imageProps, imageBorderProps: imageBorderProps };
 }
 var QRCodeProps = {
     value: {
@@ -1082,7 +1006,7 @@ var QRCodeProps = {
     },
     size: {
         type: Number,
-        default: DEFAULT_QR_SIZE,
+        default: 100,
     },
     level: {
         type: String,
@@ -1100,7 +1024,7 @@ var QRCodeProps = {
     margin: {
         type: Number,
         required: false,
-        default: DEFAULT_MARGIN,
+        default: 0,
     },
     imageSettings: {
         type: Object,
@@ -1128,12 +1052,6 @@ var QRCodeProps = {
         required: false,
         default: '#fff',
     },
-    radius: {
-        type: Number,
-        required: false,
-        default: 0,
-        validator: function (r) { return !isNaN(r) && r >= 0 && r <= 0.5; },
-    },
 };
 var QRCodeVueProps = __assign(__assign({}, QRCodeProps), { renderAs: {
         type: String,
@@ -1145,11 +1063,36 @@ var QrcodeSvg = vue.defineComponent({
     name: 'QRCodeSvg',
     props: QRCodeProps,
     setup: function (props) {
-        var _a = useQRCode(props), numCells = _a.numCells, fgPath = _a.fgPath, imageProps = _a.imageProps, imageBorderProps = _a.imageBorderProps;
-        var uid = getUid();
-        var qrGradientId = "qrcode.vue-gradient-".concat(uid);
-        var qrLogoClipPathId = "qrcode.vue-logo-clip-path-".concat(uid);
-        var gradientVNode = vue.computed(function () {
+        var numCells = vue.ref(0);
+        var fgPath = vue.ref('');
+        var imageProps;
+        var generate = function () {
+            var value = props.value, _level = props.level, _margin = props.margin;
+            var margin = _margin >>> 0;
+            var level = validErrorCorrectLevel(_level) ? _level : defaultErrorCorrectLevel;
+            var cells = QR.QrCode.encodeText(value, ErrorCorrectLevelMap[level]).getModules();
+            numCells.value = cells.length + margin * 2;
+            if (props.imageSettings.src) {
+                var imageSettings = getImageSettings(cells, props.size, margin, props.imageSettings);
+                imageProps = {
+                    x: imageSettings.x + margin,
+                    y: imageSettings.y + margin,
+                    width: imageSettings.w,
+                    height: imageSettings.h,
+                };
+                if (imageSettings.excavation) {
+                    cells = excavateModules(cells, imageSettings.excavation);
+                }
+            }
+            // Drawing strategy: instead of a rect per module, we're going to create a
+            // single path for the dark modules and layer that on top of a light rect,
+            // for a total of 2 DOM nodes. We pay a bit more in string concat but that's
+            // way faster than DOM ops.
+            // For level 1, 441 nodes -> 2
+            // For level 40, 31329 -> 2
+            fgPath.value = generatePath(cells, margin);
+        };
+        var renderGradient = function () {
             if (!props.gradient)
                 return null;
             var gradientProps = props.gradientType === 'linear'
@@ -1166,7 +1109,7 @@ var QrcodeSvg = vue.defineComponent({
                     fx: '50%',
                     fy: '50%',
                 };
-            return vue.h(props.gradientType === 'linear' ? 'linearGradient' : 'radialGradient', __assign({ id: qrGradientId }, gradientProps), [
+            return vue.h(props.gradientType === 'linear' ? 'linearGradient' : 'radialGradient', __assign({ id: 'qr-gradient' }, gradientProps), [
                 vue.h('stop', {
                     offset: '0%',
                     style: { stopColor: props.gradientStartColor },
@@ -1176,52 +1119,27 @@ var QrcodeSvg = vue.defineComponent({
                     style: { stopColor: props.gradientEndColor },
                 }),
             ]);
-        });
-        var clipPathVNode = vue.computed(function () {
-            if (!imageProps.value)
-                return null;
-            var borderRadius = imageProps.value.borderRadius;
-            if (borderRadius <= 0)
-                return null;
-            return vue.h('clipPath', { id: qrLogoClipPathId }, [
-                vue.h('rect', {
-                    x: imageProps.value.x,
-                    y: imageProps.value.y,
-                    width: imageProps.value.width,
-                    height: imageProps.value.height,
-                    rx: borderRadius,
-                    ry: borderRadius,
-                }),
-            ]);
-        });
+        };
+        generate();
+        vue.onUpdated(generate);
         return function () { return vue.h('svg', {
             width: props.size,
             height: props.size,
+            'shape-rendering': "crispEdges",
             xmlns: 'http://www.w3.org/2000/svg',
             viewBox: "0 0 ".concat(numCells.value, " ").concat(numCells.value),
-            role: 'img',
-            'aria-label': props.value,
         }, [
-            vue.h('defs', {}, [gradientVNode.value, clipPathVNode.value]),
+            vue.h('defs', {}, [renderGradient()]),
             vue.h('rect', {
                 width: '100%',
                 height: '100%',
                 fill: props.background,
             }),
             vue.h('path', {
-                fill: props.gradient ? "url(#".concat(qrGradientId, ")") : props.foreground,
+                fill: props.gradient ? 'url(#qr-gradient)' : props.foreground,
                 d: fgPath.value,
             }),
-            imageBorderProps.value && vue.h('rect', {
-                x: imageBorderProps.value.x,
-                y: imageBorderProps.value.y,
-                width: imageBorderProps.value.width,
-                height: imageBorderProps.value.height,
-                fill: props.background,
-                rx: imageBorderProps.value.borderRadius,
-                ry: imageBorderProps.value.borderRadius,
-            }),
-            props.imageSettings.src && imageProps.value && vue.h('image', __assign(__assign({ href: props.imageSettings.src }, imageProps.value), (imageProps.value.borderRadius > 0 ? { 'clip-path': "url(#".concat(qrLogoClipPathId, ")") } : {}))),
+            props.imageSettings.src && vue.h('image', __assign({ href: props.imageSettings.src }, imageProps)),
         ]); };
     },
 });
@@ -1229,89 +1147,81 @@ var QrcodeCanvas = vue.defineComponent({
     name: 'QRCodeCanvas',
     props: QRCodeProps,
     setup: function (props, ctx) {
-        var _a = useQRCode(props), margin = _a.margin, cells = _a.cells, numCells = _a.numCells, fgPath = _a.fgPath, imageProps = _a.imageProps, imageBorderProps = _a.imageBorderProps;
         var canvasEl = vue.ref(null);
-        var imageEl = vue.ref(null);
-        var drawRoundedRect = function (ctx, x, y, width, height, radius) {
-            ctx.beginPath();
-            if (ctx.roundRect) {
-                ctx.roundRect(x, y, width, height, radius);
-            }
-            else {
-                ctx.rect(x, y, width, height);
-            }
-        };
+        var imageRef = vue.ref(null);
         var generate = function () {
-            var size = props.size, background = props.background, foreground = props.foreground, gradient = props.gradient, gradientType = props.gradientType, gradientStartColor = props.gradientStartColor, gradientEndColor = props.gradientEndColor;
+            var value = props.value, _level = props.level, size = props.size, _margin = props.margin, background = props.background, foreground = props.foreground, gradient = props.gradient, gradientType = props.gradientType, gradientStartColor = props.gradientStartColor, gradientEndColor = props.gradientEndColor;
+            var margin = _margin >>> 0;
+            var level = validErrorCorrectLevel(_level) ? _level : defaultErrorCorrectLevel;
             var canvas = canvasEl.value;
             if (!canvas) {
                 return;
             }
-            var canvasCtx = canvas.getContext('2d');
-            if (!canvasCtx) {
+            var ctx = canvas.getContext('2d');
+            if (!ctx) {
                 return;
             }
-            var image = imageEl.value;
-            var devicePixelRatio = typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1;
-            var scale = (size / numCells.value) * devicePixelRatio;
+            var cells = QR.QrCode.encodeText(value, ErrorCorrectLevelMap[level]).getModules();
+            var numCells = cells.length + margin * 2;
+            var image = imageRef.value;
+            var imageProps = { x: 0, y: 0, width: 0, height: 0 };
+            var showImage = props.imageSettings.src && image != null && image.naturalWidth !== 0 && image.naturalHeight !== 0;
+            if (showImage) {
+                var imageSettings = getImageSettings(cells, props.size, margin, props.imageSettings);
+                imageProps = {
+                    x: imageSettings.x + margin,
+                    y: imageSettings.y + margin,
+                    width: imageSettings.w,
+                    height: imageSettings.h,
+                };
+                if (imageSettings.excavation) {
+                    cells = excavateModules(cells, imageSettings.excavation);
+                }
+            }
+            var devicePixelRatio = window.devicePixelRatio || 1;
+            var scale = (size / numCells) * devicePixelRatio;
             canvas.height = canvas.width = size * devicePixelRatio;
-            canvasCtx.setTransform(scale, 0, 0, scale, 0, 0);
-            canvasCtx.fillStyle = background;
-            canvasCtx.fillRect(0, 0, numCells.value, numCells.value);
+            ctx.scale(scale, scale);
+            ctx.fillStyle = background;
+            ctx.fillRect(0, 0, numCells, numCells);
             if (gradient) {
                 var grad = void 0;
                 if (gradientType === 'linear') {
-                    grad = canvasCtx.createLinearGradient(0, 0, numCells.value, numCells.value);
+                    grad = ctx.createLinearGradient(0, 0, numCells, numCells);
                 }
                 else {
-                    grad = canvasCtx.createRadialGradient(numCells.value / 2, numCells.value / 2, 0, numCells.value / 2, numCells.value / 2, numCells.value / 2);
+                    grad = ctx.createRadialGradient(numCells / 2, numCells / 2, 0, numCells / 2, numCells / 2, numCells / 2);
                 }
                 grad.addColorStop(0, gradientStartColor);
                 grad.addColorStop(1, gradientEndColor);
-                canvasCtx.fillStyle = grad;
+                ctx.fillStyle = grad;
             }
             else {
-                canvasCtx.fillStyle = foreground;
+                ctx.fillStyle = foreground;
             }
             if (SUPPORTS_PATH2D) {
-                canvasCtx.fill(new Path2D(fgPath.value));
+                ctx.fill(new Path2D(generatePath(cells, margin)));
             }
             else {
-                cells.value.forEach(function (row, rdx) {
+                cells.forEach(function (row, rdx) {
                     row.forEach(function (cell, cdx) {
                         if (cell) {
-                            canvasCtx.fillRect(cdx + margin.value, rdx + margin.value, 1, 1);
+                            ctx.fillRect(cdx + margin, rdx + margin, 1, 1);
                         }
                     });
                 });
             }
-            var showImage = props.imageSettings.src && image && image.naturalWidth !== 0 && image.naturalHeight !== 0;
-            if (showImage && imageProps.value) {
-                if (imageBorderProps.value) {
-                    var imageBorder = imageBorderProps.value;
-                    canvasCtx.fillStyle = props.background;
-                    drawRoundedRect(canvasCtx, imageBorder.x, imageBorder.y, imageBorder.width, imageBorder.height, imageBorder.borderRadius);
-                    canvasCtx.fill();
-                }
-                var borderRadius = imageProps.value.borderRadius;
-                if (borderRadius > 0) {
-                    canvasCtx.save();
-                    drawRoundedRect(canvasCtx, imageProps.value.x, imageProps.value.y, imageProps.value.width, imageProps.value.height, borderRadius);
-                    canvasCtx.clip();
-                    canvasCtx.drawImage(image, imageProps.value.x, imageProps.value.y, imageProps.value.width, imageProps.value.height);
-                    canvasCtx.restore();
-                }
-                else {
-                    canvasCtx.drawImage(image, imageProps.value.x, imageProps.value.y, imageProps.value.width, imageProps.value.height);
-                }
+            if (showImage) {
+                ctx.drawImage(image, imageProps.x, imageProps.y, imageProps.width, imageProps.height);
             }
         };
         vue.onMounted(generate);
-        vue.watchEffect(generate);
+        vue.onUpdated(generate);
+        var style = ctx.attrs.style;
         return function () { return vue.h(vue.Fragment, [
-            vue.h('canvas', __assign(__assign({}, ctx.attrs), { ref: canvasEl, role: 'img', 'aria-label': props.value, style: __assign(__assign({}, ctx.attrs.style), { width: "".concat(props.size, "px"), height: "".concat(props.size, "px") }) })),
+            vue.h('canvas', __assign(__assign({}, ctx.attrs), { ref: canvasEl, style: __assign(__assign({}, style), { width: "".concat(props.size, "px"), height: "".concat(props.size, "px") }) })),
             props.imageSettings.src && vue.h('img', {
-                ref: imageEl,
+                ref: imageRef,
                 src: props.imageSettings.src,
                 style: { display: 'none' },
                 onLoad: generate,
@@ -1321,23 +1231,23 @@ var QrcodeCanvas = vue.defineComponent({
 });
 var QrcodeVue = vue.defineComponent({
     name: 'Qrcode',
-    props: QRCodeVueProps,
-    setup: function (props) {
-        return function () { return vue.h(props.renderAs === 'svg' ? QrcodeSvg : QrcodeCanvas, {
-            value: props.value,
-            size: props.size,
-            margin: props.margin,
-            level: props.level,
-            background: props.background,
-            foreground: props.foreground,
-            imageSettings: props.imageSettings,
-            gradient: props.gradient,
-            gradientType: props.gradientType,
-            gradientStartColor: props.gradientStartColor,
-            gradientEndColor: props.gradientEndColor,
-            radius: props.radius,
-        }); };
+    render: function () {
+        var _a = this.$props, renderAs = _a.renderAs, value = _a.value, size = _a.size, margin = _a.margin, level = _a.level, background = _a.background, foreground = _a.foreground, imageSettings = _a.imageSettings, gradient = _a.gradient, gradientType = _a.gradientType, gradientStartColor = _a.gradientStartColor, gradientEndColor = _a.gradientEndColor;
+        return vue.h(renderAs === 'svg' ? QrcodeSvg : QrcodeCanvas, {
+            value: value,
+            size: size,
+            margin: margin,
+            level: level,
+            background: background,
+            foreground: foreground,
+            imageSettings: imageSettings,
+            gradient: gradient,
+            gradientType: gradientType,
+            gradientStartColor: gradientStartColor,
+            gradientEndColor: gradientEndColor,
+        });
     },
+    props: QRCodeVueProps,
 });
 
 exports.QrcodeCanvas = QrcodeCanvas;

lnbits/static/vendor/quasar.css

@@ -43,7 +43,8 @@ summary {
 abbr[title] {
   border-bottom: none;
   text-decoration: underline;
-  text-decoration: underline dotted;
+  -webkit-text-decoration: underline dotted;
+          text-decoration: underline dotted;
 }
 
 /**
@@ -199,7 +200,8 @@ input[type=search]::-webkit-search-decoration {
 .material-symbols-outlined,
 .material-symbols-rounded,
 .material-symbols-sharp {
-  user-select: none;
+  -webkit-user-select: none;
+          user-select: none;
   cursor: inherit;
   font-size: inherit;
   display: inline-flex;
@@ -996,7 +998,8 @@ input[type=search]::-webkit-search-decoration {
   height: 1px;
 }
 .q-checkbox__bg, .q-checkbox__icon-container {
-  user-select: none;
+  -webkit-user-select: none;
+          user-select: none;
 }
 .q-checkbox__bg {
   top: 25%;
@@ -2209,7 +2212,8 @@ body.q-ios-padding .q-dialog__inner > div {
   width: 100%;
   min-width: 0;
   outline: 0 !important;
-  user-select: auto;
+  -webkit-user-select: auto;
+          user-select: auto;
 }
 .q-field__native:-webkit-autofill, .q-field__input:-webkit-autofill {
   -webkit-animation-name: q-autofill;
@@ -3035,7 +3039,8 @@ body.body--dark .q-knob--editable:focus:before {
   z-index: 2001;
   height: 100%;
   width: 15px;
-  user-select: none;
+  -webkit-user-select: none;
+          user-select: none;
 }
 
 .q-layout, .q-header, .q-footer, .q-page {
@@ -3292,7 +3297,8 @@ body.platform-ios .q-layout--containerized {
   height: 1px;
 }
 .q-radio__bg, .q-radio__icon-container {
-  user-select: none;
+  -webkit-user-select: none;
+          user-select: none;
 }
 .q-radio__bg {
   top: 25%;
@@ -3776,7 +3782,8 @@ body.platform-ios:not(.native-mobile) .q-dialog__inner--top .q-select__dialog--f
 .q-slide-item__content {
   background: inherit;
   transition: transform 0.2s ease-in;
-  user-select: none;
+  -webkit-user-select: none;
+          user-select: none;
   cursor: pointer;
 }
 
@@ -4149,7 +4156,8 @@ body.desktop .q-slider.q-slider--enabled .q-slider__track-container:hover .q-sli
 }
 .q-splitter__separator {
   background-color: rgba(0, 0, 0, 0.12);
-  user-select: none;
+  -webkit-user-select: none;
+          user-select: none;
   position: relative;
   z-index: 1;
 }
@@ -4238,7 +4246,8 @@ body.desktop .q-slider.q-slider--enabled .q-slider__track-container:hover .q-sli
   color: #000;
 }
 .q-stepper__tab--navigation {
-  user-select: none;
+  -webkit-user-select: none;
+          user-select: none;
   cursor: pointer;
 }
 .q-stepper__tab--active, .q-stepper__tab--done {
@@ -4470,7 +4479,8 @@ body.desktop .q-slider.q-slider--enabled .q-slider__track-container:hover .q-sli
 .q-table th {
   font-weight: 500;
   font-size: 12px;
-  user-select: none;
+  -webkit-user-select: none;
+          user-select: none;
 }
 .q-table th.sortable {
   cursor: pointer;
@@ -5474,7 +5484,8 @@ body.desktop .q-table > tbody > tr:not(.q-tr--no-hover):hover > td:not(.q-td--no
   width: 0.5em;
   height: 0.5em;
   transition: left 0.22s cubic-bezier(0.4, 0, 0.2, 1);
-  user-select: none;
+  -webkit-user-select: none;
+          user-select: none;
   z-index: 0;
 }
 .q-toggle__thumb:after {
@@ -10326,7 +10337,6 @@ body.body--dark .inset-shadow-down {
 .glossy {
   background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0) 50%, rgba(0, 0, 0, 0.12) 51%, rgba(0, 0, 0, 0.04)) !important;
 }
-
 .q-placeholder::placeholder {
   color: inherit;
   opacity: 0.7;
@@ -10358,7 +10368,8 @@ body.body--dark .inset-shadow-down {
   text-decoration: none;
 }
 .q-link--focusable:focus-visible {
-  text-decoration: underline dashed currentColor 1px;
+  -webkit-text-decoration: underline dashed currentColor 1px;
+          text-decoration: underline dashed currentColor 1px;
 }
 
 body.electron .q-electron-drag {
@@ -10375,7 +10386,8 @@ img.responsive {
 }
 
 .non-selectable {
-  user-select: none !important;
+  -webkit-user-select: none !important;
+          user-select: none !important;
 }
 
 .scroll,
@@ -11033,7 +11045,8 @@ body.q-ios-padding .fullscreen {
 }
 
 .q-touch {
-  user-select: none;
+  -webkit-user-select: none;
+          user-select: none;
   user-drag: none;
   -khtml-user-drag: none;
   -webkit-user-drag: none;

lnbits/tasks.py

@@ -6,10 +6,7 @@ from collections.abc import Callable, Coroutine
 from loguru import logger
 
 from lnbits.core.models import Payment
-from lnbits.core.services.payments import (
-    get_standalone_payment,
-    update_invoice_from_paid_invoices_stream,
-)
+from lnbits.core.services.payments import update_invoice_callback
 from lnbits.settings import settings
 from lnbits.wallets import get_funding_source
 
@@ -115,7 +112,7 @@ async def internal_invoice_listener() -> None:
     while settings.lnbits_running:
         checking_id = await internal_invoice_queue.get()
         logger.info(f"got an internal payment notification {checking_id}")
-        payment = await get_standalone_payment(checking_id, incoming=True)
+        payment = await update_invoice_callback(checking_id)
         if payment:
             logger.success(f"internal invoice {checking_id} settled")
             await invoice_callback_dispatcher(payment)
@@ -131,7 +128,7 @@ async def invoice_listener() -> None:
     funding_source = get_funding_source()
     async for checking_id in funding_source.paid_invoices_stream():
         logger.info(f"got a payment notification {checking_id}")
-        payment = await update_invoice_from_paid_invoices_stream(checking_id)
+        payment = await update_invoice_callback(checking_id)
         if payment:
             logger.success(f"fundingsource invoice {checking_id} settled")
             await invoice_callback_dispatcher(payment)

lnbits/templates/components.vue

@@ -774,13 +774,7 @@ include('components/lnbits-error.vue') %}
           v-model="password"
           name="password"
           :label="$t('password') + ' *'"
-          :type="showPwd ? 'text' : 'password'"
-          ><template v-slot:append>
-            <q-icon
-              :name="showPwd ? 'visibility' : 'visibility_off'"
-              class="cursor-pointer"
-              @click="showPwd = !showPwd"
-            /> </template
+          type="password"
         ></q-input>
         <div class="row justify-end">
           <q-btn
@@ -809,28 +803,16 @@ include('components/lnbits-error.vue') %}
           filled
           v-model="password"
           :label="$t('password') + ' *'"
-          :type="showPwd ? 'text' : 'password'"
+          type="password"
           :rules="[val => !val || val.length >= 8 || $t('invalid_password')]"
-          ><template v-slot:append>
-            <q-icon
-              :name="showPwd ? 'visibility' : 'visibility_off'"
-              class="cursor-pointer"
-              @click="showPwd = !showPwd"
-            /> </template
         ></q-input>
         <q-input
           dense
           filled
           v-model="passwordRepeat"
           :label="$t('password_repeat') + ' *'"
-          :type="showPwdRepeat ? 'text' : 'password'"
+          type="password"
           :rules="[val => !val || val.length >= 8 || $t('invalid_password')]"
-          ><template v-slot:append>
-            <q-icon
-              :name="showPwdRepeat ? 'visibility' : 'visibility_off'"
-              class="cursor-pointer"
-              @click="showPwdRepeat = !showPwdRepeat"
-            /> </template
         ></q-input>
         <div
           v-if="confirmationMethodsCount > 1"
@@ -943,28 +925,16 @@ include('components/lnbits-error.vue') %}
           filled
           v-model="password"
           :label="$t('password') + ' *'"
-          :type="showPwd ? 'text' : 'password'"
+          type="password"
           :rules="[val => !val || val.length >= 8 || $t('invalid_password')]"
-          ><template v-slot:append>
-            <q-icon
-              :name="showPwd ? 'visibility' : 'visibility_off'"
-              class="cursor-pointer"
-              @click="showPwd = !showPwd"
-            /> </template
         ></q-input>
         <q-input
           dense
           filled
           v-model="passwordRepeat"
           :label="$t('password_repeat') + ' *'"
-          :type="showPwdRepeat ? 'text' : 'password'"
+          type="password"
           :rules="[val => !val || val.length >= 8 || $t('invalid_password')]"
-          ><template v-slot:append>
-            <q-icon
-              :name="showPwdRepeat ? 'visibility' : 'visibility_off'"
-              class="cursor-pointer"
-              @click="showPwdRepeat = !showPwdRepeat"
-            /> </template
         ></q-input>
         <div class="row justify-end">
           <q-btn

lnbits/templates/components/admin/fiat_providers.vue

@@ -866,7 +866,6 @@
             </q-expansion-item>
           </q-card>
         </q-expansion-item>
-        <q-separator></q-separator>
         <q-expansion-item header-class="text-primary text-bold">
           <template v-slot:header>
             <q-item-section avatar>
@@ -1176,8 +1175,8 @@
             <q-chip dense color="positive" text-color="white" icon="check"
               >Checkout</q-chip
             >
-            <q-chip dense color="warning" text-color="black" icon="schedule"
-              >Subscriptions coming soon</q-chip
+            <q-chip dense color="positive" text-color="white" icon="check"
+              >Subscriptions</q-chip
             >
             <q-chip dense color="negative" text-color="white" icon="close"
               >Tap-to-pay</q-chip

lnbits/templates/components/admin/site_customisation.vue

@@ -320,15 +320,6 @@
           >
           </q-toggle>
         </div>
-        <div class="col-12 col-sm-6 col-lg-2">
-          <q-toggle
-            type="bool"
-            v-model="formData.lnbits_default_burger_menu_background"
-            color="primary"
-            :label="$t('burger_menu_background')"
-          >
-          </q-toggle>
-        </div>
       </div>
     </div>
   </q-card-section>

lnbits/templates/pages/account.vue

@@ -601,30 +601,6 @@
                     </div>
                   </div>
 
-                  <div class="row q-mb-md">
-                    <div class="col-4">
-                      <span v-text="$t('burger_menu_background')"></span>
-                    </div>
-                    <div class="col-8">
-                      <q-toggle
-                        dense
-                        flat
-                        round
-                        icon="menu_open"
-                        v-model="g.burgerMenuChoice"
-                        @update:model-value="
-                          siteCustomisationChanged({burgerMenuChoice: $event})
-                        "
-                      >
-                        <q-tooltip
-                          ><span
-                            v-text="$t('toggle_burger_menu_background')"
-                          ></span
-                        ></q-tooltip>
-                      </q-toggle>
-                    </div>
-                  </div>
-
                   <div class="row q-mb-md">
                     <div class="col-4">
                       <span v-text="$t('toggle_darkmode')"></span>

lnbits/templates/pages/extensions.vue

@@ -7,29 +7,7 @@
             <q-tabs v-model="tab" active-color="primary" align="left">
               <q-tab name="installed" :label="$t('installed')"></q-tab>
               <q-tab name="all" :label="$t('all')"></q-tab>
-              <q-tab
-                v-show="$q.screen.gt.xs"
-                name="featured"
-                :label="$t('featured')"
-              ></q-tab>
-              <q-btn-dropdown auto-close stretch flat :label="$t('categories')">
-                <q-list>
-                  <q-item
-                    clickable
-                    v-close-popup
-                    v-for="category in categories"
-                    @click="tab = category"
-                    :key="category"
-                  >
-                    <q-item-section>
-                      <q-item-label
-                        class="text-capitalize"
-                        v-text="category"
-                      ></q-item-label>
-                    </q-item-section>
-                  </q-item>
-                </q-list>
-              </q-btn-dropdown>
+              <q-tab name="featured" :label="$t('featured')"></q-tab>
               <i
                 v-if="!g.user.admin && tab != 'installed'"
                 v-text="$t('only_admins_can_install')"

lnbits/templates/pages/payments.vue

@@ -136,7 +136,7 @@
         </q-card>
       </div>
       <div
-        v-show="chartData.showPaymentTags"
+        v-show="chartData.showPaymentStatus"
         class="col-lg-3 col-md-6 col-sm-12 text-center"
       >
         <q-card class="q-pt-sm">

lnbits/templates/pages/wallet.vue

@@ -28,13 +28,7 @@
                 <div class="col-7">
                   <div class="row">
                     <div class="col-auto">
-                      <div
-                        class="text-h3 q-my-none full-width cursor-pointer"
-                        role="button"
-                        tabindex="0"
-                        @click="showWalletTotalBreakdown"
-                        @keyup.enter="showWalletTotalBreakdown"
-                      >
+                      <div class="text-h3 q-my-none full-width">
                         <strong
                           v-text="
                             utils.formatBalance(g.wallet.sat, g.denomination)
@@ -83,11 +77,7 @@
                     <div class="col-auto">
                       <div
                         v-if="g.fiatTracking"
-                        class="text-h3 q-my-none text-no-wrap cursor-pointer"
-                        role="button"
-                        tabindex="0"
-                        @click="showWalletTotalBreakdown"
-                        @keyup.enter="showWalletTotalBreakdown"
+                        class="text-h3 q-my-none text-no-wrap"
                       >
                         <strong v-text="formattedFiatAmount"></strong>
                       </div>
@@ -238,113 +228,6 @@
     </div>
   </div>
 
-  <q-dialog v-model="totalBreakdown.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-card-section>
-        <div class="row items-start q-mb-md">
-          <div class="col">
-            <div
-              class="text-h4 text-bold"
-              v-text="primaryTotalBreakdownValue"
-            ></div>
-            <div
-              v-if="secondaryTotalBreakdownValue"
-              class="text-h6 text-italic"
-              style="opacity: 0.75"
-              v-text="secondaryTotalBreakdownValue"
-            ></div>
-            <div
-              class="text-caption text-grey-5"
-              v-text="selectedTotalBreakdownCount + ' payments'"
-            ></div>
-          </div>
-          <q-btn
-            flat
-            dense
-            round
-            color="grey"
-            icon="refresh"
-            :loading="totalBreakdown.loading"
-            @click="fetchTotalBreakdown"
-          >
-            <q-tooltip>Refresh</q-tooltip>
-          </q-btn>
-        </div>
-
-        <q-inner-loading :showing="totalBreakdown.loading"></q-inner-loading>
-
-        <div v-if="hasFiatTotalBreakdown" class="q-mb-md">
-          <q-checkbox
-            v-model="totalBreakdown.selectedTypes"
-            val="bitcoin"
-            label="Bitcoin"
-          ></q-checkbox>
-          <q-checkbox
-            v-model="totalBreakdown.selectedTypes"
-            val="fiat"
-            label="Fiat"
-          ></q-checkbox>
-        </div>
-
-        <q-separator v-if="hasFiatTotalBreakdown" class="q-mb-md"></q-separator>
-
-        <div style="max-height: min(52vh, 420px); overflow-y: auto">
-          <q-list dense>
-            <q-item
-              v-for="tag in totalBreakdownTags"
-              :key="totalBreakdownTagKey(tag)"
-              tag="label"
-              v-ripple
-            >
-              <q-item-section side>
-                <q-checkbox
-                  v-model="totalBreakdown.selectedTags"
-                  :val="totalBreakdownTagKey(tag)"
-                ></q-checkbox>
-              </q-item-section>
-              <q-item-section>
-                <q-item-label>
-                  <q-badge
-                    v-if="tag"
-                    color="yellow"
-                    text-color="black"
-                    v-text="'#' + tag"
-                  ></q-badge>
-                  <span v-else v-text="totalBreakdownTagLabel(tag)"></span>
-                </q-item-label>
-                <q-item-label
-                  caption
-                  v-text="totalBreakdownTagCount(tag) + ' payments'"
-                ></q-item-label>
-              </q-item-section>
-              <q-item-section side>
-                <span
-                  v-text="formatTotalBreakdownMsat(totalBreakdownTagMsat(tag))"
-                ></span>
-              </q-item-section>
-            </q-item>
-          </q-list>
-        </div>
-
-        <div v-if="!totalBreakdown.loading && !totalBreakdown.rows.length">
-          <q-banner class="bg-transparent text-grey-5">
-            No completed payments.
-          </q-banner>
-        </div>
-
-        <div class="row q-mt-md">
-          <q-btn
-            v-close-popup
-            flat
-            color="grey"
-            class="q-ml-auto"
-            :label="$t('close')"
-          ></q-btn>
-        </div>
-      </q-card-section>
-    </q-card>
-  </q-dialog>
-
   <q-dialog v-model="receive.show" position="top" @hide="onReceiveDialogHide">
     <q-card
       v-if="!receive.paymentReq"

lnbits/utils/electrum.py

@@ -1,439 +0,0 @@
-"""
-Electrum protocol client (https://github.com/spesmilo/electrum-protocol).
-
-JSON-RPC 2.0 over TCP / SSL (newline-delimited), with request/response
-correlation, subscription dispatch, and automatic keepalive pings.
-server.version is sent automatically on connect as required by the spec.
-"""
-
-import asyncio
-import hashlib
-import itertools
-import json
-import ssl
-from collections.abc import Callable
-from typing import Any
-from urllib.parse import urlparse
-
-from loguru import logger
-from pydantic import BaseModel
-
-
-class ElectrumError(Exception):
-    pass
-
-
-def scripthash_from_scriptpubkey(scriptpubkey: bytes) -> str:
-    """Electrum script hash: SHA-256 of scriptPubKey, byte-reversed to hex."""
-    return hashlib.sha256(scriptpubkey).digest()[::-1].hex()
-
-
-# ---------------------------------------------------------------------------
-# Response models
-# ---------------------------------------------------------------------------
-
-
-class Balance(BaseModel):
-    confirmed: int
-    unconfirmed: int
-
-
-class HistoryEntry(BaseModel):
-    tx_hash: str
-    height: int
-    fee: int | None = None  # present for mempool entries
-
-
-class MempoolEntry(BaseModel):
-    tx_hash: str
-    height: int
-    fee: int
-
-
-class UTXO(BaseModel):
-    tx_hash: str
-    tx_pos: int
-    height: int
-    value: int  # satoshis
-
-
-class BlockHeader(BaseModel):
-    height: int
-    hex: str
-
-
-class BlockHeaderProof(BaseModel):
-    """Returned by get_block_header when cp_height > 0."""
-
-    branch: list[str]
-    header: str
-    root: str
-
-
-class BlockHeaders(BaseModel):
-    count: int
-    hex: str
-    max: int
-
-
-class MerkleProof(BaseModel):
-    block_height: int
-    merkle: list[str]
-    pos: int
-
-
-class TxIdWithMerkle(BaseModel):
-    tx_hash: str
-    merkle: list[str]
-
-
-class FeeHistogramEntry(BaseModel):
-    fee_rate: float
-    vsize: float
-
-
-class ServerFeatures(BaseModel):
-    class Config:
-        extra = "allow"
-
-    genesis_hash: str = ""
-    protocol_max: str = ""
-    protocol_min: str = ""
-    server_version: str = ""
-    pruning: int | None = None
-    hash_function: str = "sha256d"
-    hosts: dict[str, Any] = {}
-
-
-# ---------------------------------------------------------------------------
-# Client
-# ---------------------------------------------------------------------------
-
-
-class ElectrumClient:
-    """
-    Async Electrum protocol client over plain TCP or SSL.
-
-    Messages are newline-terminated JSON-RPC 2.0, as required by the spec.
-    Handles request/response correlation by id, routes push notifications to
-    registered callbacks, and sends periodic pings to keep the connection alive.
-
-    Usage::
-
-        # Plain TCP
-        async with ElectrumClient("tcp://blockstream.info:110") as client:
-            height = await client.get_height()
-
-        # SSL
-        async with ElectrumClient("ssl://electrum.blockstream.info:50002") as c:
-            height = await c.get_height()
-    """
-
-    def __init__(
-        self,
-        url: str,
-        client_name: str = "lnbits",
-        protocol_version: str = "1.4",
-        ping_interval: float = 60.0,
-    ) -> None:
-        parsed = urlparse(url)
-        self.host = parsed.hostname or ""
-        self.port = parsed.port or (
-            50002 if parsed.scheme in ("ssl", "https") else 50001
-        )
-        self.use_ssl = parsed.scheme in ("ssl", "https")
-        self.client_name = client_name
-        self.protocol_version = protocol_version
-        self.ping_interval = ping_interval
-        self._counter = itertools.count(1)
-        self._pending: dict[int, asyncio.Future[Any]] = {}
-        self._subscriptions: dict[str, list[Callable[[list[Any]], Any]]] = {}
-        self._recv_task: asyncio.Task[None] | None = None
-        self._ping_task: asyncio.Task[None] | None = None
-        self._reader: asyncio.StreamReader | None = None
-        self._writer: asyncio.StreamWriter | None = None
-        self.server_version: str = ""
-        self.negotiated_protocol: str = ""
-
-    async def connect(self, timeout: float = 10.0) -> None:
-        ssl_ctx: ssl.SSLContext | None = None
-        if self.use_ssl:
-            ssl_ctx = ssl.create_default_context()
-        self._reader, self._writer = await asyncio.wait_for(
-            asyncio.open_connection(
-                self.host, self.port, ssl=ssl_ctx, limit=4 * 1024 * 1024
-            ),
-            timeout=timeout,
-        )
-        self._recv_task = asyncio.create_task(self._recv_loop())
-        result = await self._call(
-            "server.version", [self.client_name, self.protocol_version], timeout=timeout
-        )
-        self.server_version, self.negotiated_protocol = result[0], result[1]
-        logger.debug(
-            f"Electrum connected: server={self.server_version}"
-            f" protocol={self.negotiated_protocol}"
-        )
-        if self.ping_interval > 0:
-            self._ping_task = asyncio.create_task(self._ping_loop())
-
-    async def close(self) -> None:
-        for task in (self._ping_task, self._recv_task):
-            if task:
-                task.cancel()
-                try:
-                    await task
-                except asyncio.CancelledError:
-                    pass
-                except Exception:
-                    logger.debug("Electrum: error while cancelling task")
-        self._ping_task = None
-        self._recv_task = None
-        if self._writer:
-            self._writer.close()
-            try:
-                await asyncio.wait_for(self._writer.wait_closed(), timeout=5.0)
-            except Exception:
-                logger.debug("Electrum: error while closing writer")
-        self._reader = None
-        self._writer = None
-
-    async def __aenter__(self) -> "ElectrumClient":
-        try:
-            await self.connect()
-        except BaseException:
-            await self.close()
-            raise
-        return self
-
-    async def __aexit__(self, *_: Any) -> None:
-        await self.close()
-
-    # ---- internal plumbing ----
-
-    async def _call(
-        self,
-        method: str,
-        params: list[Any] | dict[str, Any] | None = None,
-        timeout: float = 30.0,
-    ) -> Any:
-        if not self._writer:
-            raise ElectrumError("Not connected")
-        req_id = next(self._counter)
-        fut: asyncio.Future[Any] = asyncio.get_running_loop().create_future()
-        self._pending[req_id] = fut
-        self._writer.write(
-            json.dumps(
-                {
-                    "jsonrpc": "2.0",
-                    "id": req_id,
-                    "method": method,
-                    "params": params if params is not None else [],
-                }
-            ).encode()
-            + b"\n"
-        )
-        await self._writer.drain()
-        try:
-            return await asyncio.wait_for(asyncio.shield(fut), timeout=timeout)
-        except asyncio.TimeoutError as exc:
-            self._pending.pop(req_id, None)
-            raise ElectrumError(f"Timeout waiting for response to {method!r}") from exc
-
-    def _dispatch(self, msg: dict[str, Any]) -> None:
-        msg_id = msg.get("id")
-        if msg_id is not None:
-            fut = self._pending.pop(msg_id, None)
-            if fut and not fut.done():
-                err = msg.get("error")
-                if err:
-                    fut.set_exception(ElectrumError(err))
-                else:
-                    fut.set_result(msg.get("result"))
-        else:
-            method = msg.get("method", "")
-            params = msg.get("params", [])
-            for cb in list(self._subscriptions.get(method, [])):
-                try:
-                    result = cb(params)
-                    if asyncio.iscoroutine(result):
-                        self._bg_tasks.add(asyncio.create_task(result))
-                except Exception:
-                    logger.exception(f"Electrum: callback error for {method!r}")
-
-    async def _recv_loop(self) -> None:
-        assert self._reader
-        self._bg_tasks: set[asyncio.Task[Any]] = set()
-        buf = b""
-        try:
-            while True:
-                chunk = await self._reader.read(65536)
-                if not chunk:
-                    break
-                buf += chunk
-                while b"\n" in buf:
-                    line, buf = buf.split(b"\n", 1)
-                    if not line.strip():
-                        continue
-                    try:
-                        msg: dict[str, Any] = json.loads(line)
-                    except json.JSONDecodeError:
-                        logger.warning(f"Electrum: invalid JSON: {line!r}")
-                        continue
-                    self._dispatch(msg)
-        except asyncio.CancelledError:
-            pass
-        except Exception:
-            logger.exception("Electrum: recv loop error")
-        finally:
-            for fut in self._pending.values():
-                if not fut.done():
-                    fut.set_exception(ElectrumError("Connection closed"))
-            self._pending.clear()
-
-    async def _ping_loop(self) -> None:
-        try:
-            while True:
-                await asyncio.sleep(self.ping_interval)
-                await self._call("server.ping")
-        except asyncio.CancelledError:
-            pass
-        except Exception:
-            logger.exception("Electrum: ping loop error")
-
-    # ---- subscription management ----
-
-    def on(self, method: str, callback: Callable[[list[Any]], Any]) -> None:
-        """Register a notification callback for a subscription method."""
-        self._subscriptions.setdefault(method, []).append(callback)
-
-    def off(self, method: str, callback: Callable[[list[Any]], Any]) -> None:
-        """Remove a previously registered notification callback."""
-        cbs = self._subscriptions.get(method)
-        if cbs and callback in cbs:
-            cbs.remove(callback)
-
-    # ---- server methods ----
-
-    async def server_ping(self) -> None:
-        await self._call("server.ping")
-
-    async def server_banner(self) -> str:
-        return await self._call("server.banner")
-
-    async def server_features(self) -> ServerFeatures:
-        data = await self._call("server.features")
-        return ServerFeatures.parse_obj(data)
-
-    async def server_peers(self) -> list[Any]:
-        return await self._call("server.peers.subscribe")
-
-    # ---- scripthash methods ----
-
-    async def get_balance(self, scripthash: str) -> Balance:
-        data = await self._call("blockchain.scripthash.get_balance", [scripthash])
-        return Balance.parse_obj(data)
-
-    async def get_history(self, scripthash: str) -> list[HistoryEntry]:
-        data = await self._call("blockchain.scripthash.get_history", [scripthash])
-        return [HistoryEntry.parse_obj(e) for e in data]
-
-    async def get_mempool(self, scripthash: str) -> list[MempoolEntry]:
-        data = await self._call("blockchain.scripthash.get_mempool", [scripthash])
-        return [MempoolEntry.parse_obj(e) for e in data]
-
-    async def listunspent(self, scripthash: str) -> list[UTXO]:
-        data = await self._call("blockchain.scripthash.listunspent", [scripthash])
-        return [UTXO.parse_obj(e) for e in data]
-
-    async def subscribe_scripthash(
-        self,
-        scripthash: str,
-        callback: Callable[[list[Any]], Any] | None = None,
-    ) -> str | None:
-        """Subscribe to status changes; returns current status hash or None."""
-        if callback:
-            self.on("blockchain.scripthash.subscribe", callback)
-        return await self._call("blockchain.scripthash.subscribe", [scripthash])
-
-    async def unsubscribe_scripthash(
-        self,
-        scripthash: str,
-        callback: Callable[[list[Any]], Any] | None = None,
-    ) -> bool:
-        if callback:
-            self.off("blockchain.scripthash.subscribe", callback)
-        return await self._call("blockchain.scripthash.unsubscribe", [scripthash])
-
-    async def subscribe_headers(
-        self,
-        callback: Callable[[list[Any]], Any] | None = None,
-    ) -> BlockHeader:
-        """Subscribe to new block headers; returns current tip."""
-        if callback:
-            self.on("blockchain.headers.subscribe", callback)
-        data = await self._call("blockchain.headers.subscribe")
-        return BlockHeader.parse_obj(data)
-
-    # ---- transaction methods ----
-
-    async def broadcast(self, raw_tx: str) -> str:
-        """Broadcast a raw transaction hex; returns txid on success."""
-        return await self._call("blockchain.transaction.broadcast", [raw_tx])
-
-    async def get_transaction(
-        self, txid: str, verbose: bool = False
-    ) -> str | dict[str, Any]:
-        return await self._call("blockchain.transaction.get", [txid, verbose])
-
-    async def get_merkle(self, txid: str, height: int) -> MerkleProof:
-        data = await self._call("blockchain.transaction.get_merkle", [txid, height])
-        return MerkleProof.parse_obj(data)
-
-    async def get_tx_id_from_pos(
-        self, height: int, tx_pos: int, merkle: bool = False
-    ) -> str | TxIdWithMerkle:
-        data = await self._call(
-            "blockchain.transaction.id_from_pos", [height, tx_pos, merkle]
-        )
-        if isinstance(data, dict):
-            return TxIdWithMerkle.parse_obj(data)
-        return data
-
-    # ---- block methods ----
-
-    async def get_tip(self) -> BlockHeader:
-        """Returns current chain tip."""
-        data = await self._call("blockchain.headers.subscribe")
-        return BlockHeader.parse_obj(data)
-
-    async def get_height(self) -> int:
-        """Returns the current best block height."""
-        return (await self.get_tip()).height
-
-    async def get_block_header(
-        self, height: int, cp_height: int = 0
-    ) -> str | BlockHeaderProof:
-        data = await self._call("blockchain.block.header", [height, cp_height])
-        if isinstance(data, dict):
-            return BlockHeaderProof.parse_obj(data)
-        return data
-
-    async def get_block_headers(
-        self, start_height: int, count: int, cp_height: int = 0
-    ) -> BlockHeaders:
-        data = await self._call(
-            "blockchain.block.headers", [start_height, count, cp_height]
-        )
-        return BlockHeaders.parse_obj(data)
-
-    # ---- fee methods ----
-
-    async def estimate_fee(self, num_blocks: int) -> float:
-        """Returns estimated fee rate in BTC/kB for confirmation within num_blocks."""
-        return await self._call("blockchain.estimatefee", [num_blocks])
-
-    async def fee_histogram(self) -> list[FeeHistogramEntry]:
-        """Returns mempool fee histogram as FeeHistogramEntry(fee_rate, vsize) list."""
-        data = await self._call("mempool.get_fee_histogram")
-        return [FeeHistogramEntry(fee_rate=r[0], vsize=r[1]) for r in data]

lnbits/wallets/base.py

@@ -94,15 +94,15 @@ class PaymentStatus(NamedTuple):
 
 
 class PaymentSuccessStatus(PaymentStatus):
-    paid = True  # type: ignore[reportIncompatibleVariableOverride]
+    paid = True
 
 
 class PaymentFailedStatus(PaymentStatus):
-    paid = False  # type: ignore[reportIncompatibleVariableOverride]
+    paid = False
 
 
 class PaymentPendingStatus(PaymentStatus):
-    paid = None  # type: ignore[reportIncompatibleVariableOverride]
+    paid = None
 
 
 class Wallet(ABC):

lnbits/wallets/blink.py

@@ -8,7 +8,7 @@ from loguru import logger
 from pydantic import BaseModel
 from websockets import Subprotocol, connect
 
-from lnbits import bolt11 as bolt11_lib
+from lnbits import bolt11
 from lnbits.helpers import normalize_endpoint
 from lnbits.settings import settings
 
@@ -164,13 +164,15 @@ class BlinkWallet(Wallet):
                 ok=False, error_message=f"Unable to connect to {self.endpoint}."
             )
 
-    async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
+    async def pay_invoice(
+        self, bolt11_invoice: str, fee_limit_msat: int
+    ) -> PaymentResponse:
         # https://dev.blink.sv/api/btc-ln-send
         # Future: add check fee estimate is < fee_limit_msat before paying invoice
 
         payment_variables = {
             "input": {
-                "paymentRequest": bolt11,
+                "paymentRequest": bolt11_invoice,
                 "walletId": self.wallet_id,
                 "memo": "Payment memo",
             }
@@ -188,7 +190,7 @@ class BlinkWallet(Wallet):
                 error_message = errors[0].get("message")
                 return PaymentResponse(ok=False, error_message=error_message)
 
-            checking_id = bolt11_lib.decode(bolt11).payment_hash
+            checking_id = bolt11.decode(bolt11_invoice).payment_hash
 
             payment_status = await self.get_payment_status(checking_id)
             fee_msat = payment_status.fee_msat
@@ -197,7 +199,7 @@ class BlinkWallet(Wallet):
                 ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
             )
         except Exception as exc:
-            logger.info(f"Failed to pay invoice {bolt11}")
+            logger.info(f"Failed to pay invoice {bolt11_invoice}")
             logger.warning(exc)
             return PaymentResponse(
                 error_message=f"Unable to connect to {self.endpoint}."

lnbits/wallets/breez.py

@@ -19,7 +19,7 @@ else:
 
     from bolt11 import Bolt11Exception
     from bolt11 import decode as bolt11_decode
-    from breez_sdk import (  # type: ignore[reportMissingImports]
+    from breez_sdk import (
         BreezEvent,
         ConnectRequest,
         EnvironmentType,
@@ -39,9 +39,7 @@ else:
         default_config,
         mnemonic_to_seed,
     )
-    from breez_sdk import (
-        PaymentStatus as BreezPaymentStatus,  # type: ignore[reportMissingImports]
-    )
+    from breez_sdk import PaymentStatus as BreezPaymentStatus
     from loguru import logger
 
     from lnbits.settings import settings

lnbits/wallets/breez_liquid.py

@@ -18,7 +18,7 @@ else:
     from pathlib import Path
 
     from bolt11 import decode as bolt11_decode
-    from breez_sdk_liquid import (  # type: ignore[reportMissingImports]
+    from breez_sdk_liquid import (
         ConnectRequest,
         EventListener,
         GetInfoResponse,

lnbits/wallets/fake.py

@@ -103,7 +103,7 @@ class FakeWallet(Wallet):
             preimage=preimage.hex(),
         )
 
-    async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
+    async def pay_invoice(self, bolt11: str, _: int) -> PaymentResponse:
         try:
             invoice = decode(bolt11)
         except Bolt11Exception as exc:
@@ -130,7 +130,7 @@ class FakeWallet(Wallet):
             return PaymentPendingStatus()
         return PaymentFailedStatus()
 
-    async def get_payment_status(self, checking_id: str) -> PaymentStatus:
+    async def get_payment_status(self, _: str) -> PaymentStatus:
         return PaymentPendingStatus()
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:

lnbits/wallets/lndgrpc.py

@@ -118,7 +118,7 @@ class LndWallet(Wallet):
 
         cert = open(cert_path, "rb").read()
         creds = grpc.ssl_channel_credentials(cert)
-        auth_creds = grpc.metadata_call_credentials(self.metadata_callback)  # type: ignore[reportArgumentType]
+        auth_creds = grpc.metadata_call_credentials(self.metadata_callback)
         composite_creds = grpc.composite_channel_credentials(creds, auth_creds)
         channel = grpc.aio.secure_channel(
             f"{self.endpoint}:{self.port}", composite_creds
@@ -192,8 +192,6 @@ class LndWallet(Wallet):
             fee_limit_msat=fee_limit_msat,
             timeout_seconds=30,
             no_inflight_updates=True,
-            max_parts=16,
-            time_pref=0.9,
         )
         try:
             res: Payment = await self.router_rpc.SendPaymentV2(req).read()

lnbits/wallets/lndrest.py

@@ -3,7 +3,6 @@ import base64
 import hashlib
 import json
 from collections.abc import AsyncGenerator
-from typing import Any
 
 import httpx
 from loguru import logger
@@ -124,8 +123,8 @@ class LndRestWallet(Wallet):
                 hashlib.sha256(unhashed_description).digest()
             ).decode("ascii")
 
-        preimage, payment_hash = random_secret_and_hash()
-        _data["r_hash"] = base64.b64encode(bytes.fromhex(payment_hash)).decode()
+        preimage, _payment_hash = random_secret_and_hash()
+        _data["r_hash"] = base64.b64encode(bytes.fromhex(_payment_hash)).decode()
         _data["r_preimage"] = base64.b64encode(bytes.fromhex(preimage)).decode()
 
         try:
@@ -133,7 +132,34 @@ class LndRestWallet(Wallet):
             r.raise_for_status()
             data = r.json()
 
-            return self._parse_create_invoice_response(r, data, preimage)
+            if len(data) == 0:
+                return InvoiceResponse(ok=False, error_message="no data")
+
+            if "error" in data:
+                return InvoiceResponse(
+                    ok=False, error_message=f"""Server error: '{data["error"]}'"""
+                )
+
+            if r.is_error:
+                return InvoiceResponse(
+                    ok=False, error_message=f"Server error: '{r.text}'"
+                )
+
+            if "payment_request" not in data or "r_hash" not in data:
+                return InvoiceResponse(
+                    ok=False, error_message="Server error: 'missing required fields'"
+                )
+
+            payment_request = data["payment_request"]
+            payment_hash = base64.b64decode(data["r_hash"]).hex()
+            checking_id = payment_hash
+            return InvoiceResponse(
+                ok=True,
+                checking_id=checking_id,
+                payment_request=payment_request,
+                preimage=preimage,
+            )
+
         except json.JSONDecodeError:
             return InvoiceResponse(
                 ok=False, error_message="Server error: 'invalid json response'"
@@ -216,13 +242,12 @@ class LndRestWallet(Wallet):
             logger.warning(f"Error getting invoice status: {e}")
             return PaymentPendingStatus()
 
-        if r.is_error or data.get("state") is None:
+        if r.is_error or data.get("settled") is None:
             # this must also work when checking_id is not a hex recognizable by lnd
-            # it will return an error and no "state" attribute on the object
-            logger.warning(f"Error checking invoice from LND REST API: {r.text}")
+            # it will return an error and no "settled" attribute on the object
             return PaymentPendingStatus()
 
-        if data.get("state") == "SETTLED":
+        if data.get("settled") is True:
             return PaymentSuccessStatus()
 
         if data.get("state") == "CANCELED":
@@ -239,11 +264,10 @@ class LndRestWallet(Wallet):
                 "ascii"
             )
         except ValueError:
-            logger.warning("Invalid checking_id format, must be hex: {checking_id}")
             return PaymentPendingStatus()
 
         url = f"/v2/router/track/{checking_id}"
-        async with self.client.stream("GET", url, timeout=30) as r:
+        async with self.client.stream("GET", url, timeout=None) as r:
             async for json_line in r.aiter_lines():
                 try:
                     line = json.loads(json_line)
@@ -274,7 +298,7 @@ class LndRestWallet(Wallet):
                     return PaymentFailedStatus()
                 elif status == "IN_FLIGHT":
                     logger.info(f"LNDRest Payment in flight: {checking_id}")
-                    continue
+                    return PaymentPendingStatus()
 
         logger.info(f"LNDRest Payment non-existent: {checking_id}")
         return PaymentPendingStatus()
@@ -287,12 +311,13 @@ class LndRestWallet(Wallet):
                     async for line in r.aiter_lines():
                         try:
                             inv = json.loads(line)["result"]
-                            if not inv.get("state") == "SETTLED":
+                            if not inv["settled"]:
                                 continue
-                            payment_hash = base64.b64decode(inv.get("r_hash")).hex()
                         except Exception as exc:
                             logger.debug(exc)
                             continue
+
+                        payment_hash = base64.b64decode(inv["r_hash"]).hex()
                         yield payment_hash
             except Exception as exc:
                 logger.warning(
@@ -338,6 +363,8 @@ class LndRestWallet(Wallet):
             return InvoiceResponse(ok=False, error_message=str(exc))
 
         payment_request = data["payment_request"]
+        payment_hash = base64.b64encode(bytes.fromhex(payment_hash)).decode("ascii")
+
         return InvoiceResponse(
             ok=True, checking_id=payment_hash, payment_request=payment_request
         )
@@ -372,31 +399,3 @@ class LndRestWallet(Wallet):
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(ok=False, error_message=str(exc))
-
-    def _parse_create_invoice_response(
-        self, r: Any, data: dict, preimage: str
-    ) -> InvoiceResponse:
-        if not data:
-            return InvoiceResponse(ok=False, error_message="no data")
-        if "error" in data:
-            return InvoiceResponse(
-                ok=False, error_message=f"Server error: '{data['error']}'"
-            )
-        if r.is_error:
-            return InvoiceResponse(ok=False, error_message=f"Server error: '{r.text}'")
-        if "payment_request" not in data or "r_hash" not in data:
-            return InvoiceResponse(
-                ok=False, error_message="Server error: 'missing required fields'"
-            )
-        try:
-            payment_hash = base64.b64decode(data["r_hash"]).hex()
-        except Exception:
-            return InvoiceResponse(
-                ok=False, error_message=f"Unable to b64decode to {data['r_hash']}."
-            )
-        return InvoiceResponse(
-            ok=True,
-            checking_id=payment_hash,
-            payment_request=data["payment_request"],
-            preimage=preimage,
-        )

lnbits/wallets/nwc.py

@@ -88,8 +88,6 @@ class NWCWallet(Wallet):
                         payment_data = await self.conn.call(
                             "lookup_invoice", {"payment_hash": payment["checking_id"]}
                         )
-                        if payment_data.get("payment_hash") != payment["checking_id"]:
-                            raise Exception("Mismatched payment hash")
                         settled = (
                             "settled_at" in payment_data
                             and payment_data["settled_at"]
@@ -266,8 +264,6 @@ class NWCWallet(Wallet):
                 payment_data = await self.conn.call(
                     "lookup_invoice", {"payment_hash": checking_id}
                 )
-                if payment_data.get("payment_hash") != checking_id:
-                    raise Exception("Mismatched payment hash")
                 settled = payment_data.get("settled_at", None) and payment_data.get(
                     "preimage", None
                 )
@@ -524,9 +520,8 @@ class NWCConnection:
         """
         sub_id = cast(str, msg[1])
         event = cast(dict, msg[2])
-        # Ensure the event is valid (do not trust relays)
-        if not verify_event(event) or event.get("pubkey") != self.service_pubkey_hex:
-            raise Exception("Invalid event")
+        if not verify_event(event):  # Ensure the event is valid (do not trust relays)
+            raise Exception("Invalid event signature")
         tags = event["tags"]
         if event["kind"] == 13194:  # An info event
             # info events are handled specially,
@@ -692,7 +687,6 @@ class NWCConnection:
             "#p": [self.account_public_key_hex],
             "#e": [event["id"]],
             "since": event["created_at"],
-            "authors": [self.service_pubkey_hex],
         }
         sub_id = self._get_new_subid()
         # register a future to receive the response asynchronously

lnbits/wallets/phoenixd.py

@@ -117,12 +117,11 @@ class PhoenixdWallet(Wallet):
             # PhoenixD description limited to 128 characters
             if description_hash:
                 data["descriptionHash"] = description_hash.hex()
-            elif unhashed_description:
-                data["descriptionHash"] = hashlib.sha256(
-                    unhashed_description
-                ).hexdigest()
             else:
-                desc = memo or ""
+                desc = memo
+                if desc is None and unhashed_description:
+                    desc = unhashed_description.decode()
+                desc = desc or ""
                 if len(desc) > 128:
                     data["descriptionHash"] = hashlib.sha256(desc.encode()).hexdigest()
                 else:

package.json

@@ -15,24 +15,24 @@
   "devDependencies": {
     "clean-css-cli": "^5.6.3",
     "concat": "^1.0.3",
-    "prettier": "^3.8.3",
-    "pyright": "1.1.409",
-    "sass": "^1.99.0",
-    "terser": "^5.47.1"
+    "prettier": "^3.7.4",
+    "pyright": "1.1.289",
+    "sass": "^1.94.2",
+    "terser": "^5.44.1"
   },
   "dependencies": {
-    "axios": "^1.16.0",
+    "axios": "^1.15.0",
     "chart.js": "^4.5.1",
     "moment": "^2.30.1",
-    "nostr-tools": "^2.23.3",
-    "qrcode.vue": "^3.9.0",
-    "quasar": "2.19.3",
+    "nostr-tools": "^2.18.2",
+    "qrcode.vue": "^3.6.0",
+    "quasar": "2.18.6",
     "showdown": "^2.1.0",
     "underscore": "^1.13.8",
-    "vue": "3.5.34",
-    "vue-i18n": "^11.4.2",
+    "vue": "3.5.25",
+    "vue-i18n": "^11.2.2",
     "vue-qrcode-reader": "^5.7.3",
-    "vue-router": "5.0.6",
+    "vue-router": "4.6.3",
     "vuex": "4.1.0"
   },
   "vendor": [

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.4.0 and should not be changed by hand.
 
 [[package]]
 name = "aiohappyeyeballs"
@@ -665,19 +665,6 @@ bitstring = "*"
 click = "*"
 coincurve = "*"
 
-[[package]]
-name = "boltz-client"
-version = "0.4.0"
-description = "Boltz Swap library"
-optional = true
-python-versions = ">=3.10"
-groups = ["main"]
-markers = "extra == \"liquid\""
-files = [
-    {file = "boltz_client-0.4.0-py3-none-manylinux_2_34_x86_64.whl", hash = "sha256:ed0b520209cf1b05a8523002f5d8f26fa29c04d2faecc9cbde3621b4ddc417e6"},
-    {file = "boltz_client-0.4.0.tar.gz", hash = "sha256:a3f5a6b637350267856e3ab680cd92158de720fa2d5805fc075e4583d020cb2a"},
-]
-
 [[package]]
 name = "breez-sdk"
 version = "0.8.0"
@@ -2147,7 +2134,7 @@ files = [
 
 [package.dependencies]
 attrs = ">=22.2.0"
-jsonschema-specifications = ">=2023.03.6"
+jsonschema-specifications = ">=2023.3.6"
 referencing = ">=0.28.4"
 rpds-py = ">=0.25.0"
 
@@ -2308,7 +2295,7 @@ colorama = {version = ">=0.3.4", markers = "sys_platform == \"win32\""}
 win32-setctime = {version = ">=1.0.0", markers = "sys_platform == \"win32\""}
 
 [package.extras]
-dev = ["Sphinx (==8.1.3) ; python_version >= \"3.11\"", "build (==1.2.2) ; python_version >= \"3.11\"", "colorama (==0.4.5) ; python_version < \"3.8\"", "colorama (==0.4.6) ; python_version >= \"3.8\"", "exceptiongroup (==1.1.3) ; python_version >= \"3.7\" and python_version < \"3.11\"", "freezegun (==1.1.0) ; python_version < \"3.8\"", "freezegun (==1.5.0) ; python_version >= \"3.8\"", "mypy (==v0.910) ; python_version < \"3.6\"", "mypy (==v0.971) ; python_version == \"3.6\"", "mypy (==v1.13.0) ; python_version >= \"3.8\"", "mypy (==v1.4.1) ; python_version == \"3.7\"", "myst-parser (==4.0.0) ; python_version >= \"3.11\"", "pre-commit (==4.0.1) ; python_version >= \"3.9\"", "pytest (==6.1.2) ; python_version < \"3.8\"", "pytest (==8.3.2) ; python_version >= \"3.8\"", "pytest-cov (==2.12.1) ; python_version < \"3.8\"", "pytest-cov (==5.0.0) ; python_version == \"3.8\"", "pytest-cov (==6.0.0) ; python_version >= \"3.9\"", "pytest-mypy-plugins (==1.9.3) ; python_version >= \"3.6\" and python_version < \"3.8\"", "pytest-mypy-plugins (==3.1.0) ; python_version >= \"3.8\"", "sphinx-rtd-theme (==3.0.2) ; python_version >= \"3.11\"", "tox (==3.27.1) ; python_version < \"3.8\"", "tox (==4.23.2) ; python_version >= \"3.8\"", "twine (==6.0.1) ; python_version >= \"3.11\""]
+dev = ["Sphinx (==8.1.3) ; python_version >= \"3.11\"", "build (==1.2.2) ; python_version >= \"3.11\"", "colorama (==0.4.5) ; python_version < \"3.8\"", "colorama (==0.4.6) ; python_version >= \"3.8\"", "exceptiongroup (==1.1.3) ; python_version >= \"3.7\" and python_version < \"3.11\"", "freezegun (==1.1.0) ; python_version < \"3.8\"", "freezegun (==1.5.0) ; python_version >= \"3.8\"", "mypy (==0.910) ; python_version < \"3.6\"", "mypy (==0.971) ; python_version == \"3.6\"", "mypy (==1.13.0) ; python_version >= \"3.8\"", "mypy (==1.4.1) ; python_version == \"3.7\"", "myst-parser (==4.0.0) ; python_version >= \"3.11\"", "pre-commit (==4.0.1) ; python_version >= \"3.9\"", "pytest (==6.1.2) ; python_version < \"3.8\"", "pytest (==8.3.2) ; python_version >= \"3.8\"", "pytest-cov (==2.12.1) ; python_version < \"3.8\"", "pytest-cov (==5.0.0) ; python_version == \"3.8\"", "pytest-cov (==6.0.0) ; python_version >= \"3.9\"", "pytest-mypy-plugins (==1.9.3) ; python_version >= \"3.6\" and python_version < \"3.8\"", "pytest-mypy-plugins (==3.1.0) ; python_version >= \"3.8\"", "sphinx-rtd-theme (==3.0.2) ; python_version >= \"3.11\"", "tox (==3.27.1) ; python_version < \"3.8\"", "tox (==4.23.2) ; python_version >= \"3.8\"", "twine (==6.0.1) ; python_version >= \"3.11\""]
 
 [[package]]
 name = "markdown-it-py"
@@ -3407,7 +3394,7 @@ version = "5.1.2"
 description = "Call stack profiler for Python. Shows you why your code is slow!"
 optional = false
 python-versions = ">=3.8"
-groups = ["main"]
+groups = ["dev"]
 files = [
     {file = "pyinstrument-5.1.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f224fe80ba288a00980af298d3808219f9d246fd95b4f91729c9c33a0dc54fe6"},
     {file = "pyinstrument-5.1.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7df09fc0d5b72daf48b73cdf07738761bff7f656c81aff686b3ccdd7d2abe236"},
@@ -4573,14 +4560,14 @@ files = [
 
 [[package]]
 name = "urllib3"
-version = "2.7.0"
+version = "2.6.3"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
-python-versions = ">=3.10"
+python-versions = ">=3.9"
 groups = ["main", "dev"]
 files = [
-    {file = "urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897"},
-    {file = "urllib3-2.7.0.tar.gz", hash = "sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c"},
+    {file = "urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4"},
+    {file = "urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed"},
 ]
 
 [package.extras]
@@ -5117,10 +5104,10 @@ propcache = ">=0.2.1"
 
 [extras]
 breez = ["breez-sdk", "breez-sdk-liquid"]
-liquid = ["boltz-client", "wallycore"]
+liquid = ["wallycore"]
 migration = ["psycopg2-binary"]
 
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10,<3.13"
-content-hash = "7c70bdad0089089d383cf8f54c37c4473180cea175689b91322beaed1ab42e94"
+content-hash = "0879a6230bbc0d0e1d8d7d090e1572ba863078b18e0d78478baf2100aa245e08"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lnbits"
-version = "1.5.5-rc3"
+version = "1.5.4"
 requires-python = ">=3.10,<3.13"
 description = "LNbits, free and open-source Lightning wallet and accounts system."
 authors = [{ name = "Alan Bits", email = "alan@lnbits.com" }]
@@ -51,8 +51,6 @@ dependencies = [
     "pillow~=12.1.0",
     "python-dotenv~=1.2.1",
     "greenlet~=3.3.0",
-    "urllib3>=2.7.0",
-    "pyinstrument>=5.1.2",
 ]
 
 [project.scripts]
@@ -61,7 +59,7 @@ lnbits-cli = "lnbits.commands:main"
 
 [project.optional-dependencies]
 breez = ["breez-sdk~=0.8.0", "breez-sdk-liquid~=0.11.11"]
-liquid = ["wallycore~=1.5.1", "boltz-client==0.4.0"]
+liquid = ["wallycore~=1.5.1"]
 migration = ["psycopg2-binary~=2.9.11"]
 
 [dependency-groups]
@@ -85,11 +83,9 @@ dev = [
   "types-mock~=5.2.0.20250924",
   "mock~=5.2.0",
   "grpcio-tools~=1.76.0",
+  "pyinstrument>=5.1.2",
 ]
 
-[tool.uv]
-exclude-newer = "1 week"
-
 [tool.poetry]
 packages = [
   {include = "lnbits"},

tests/api/test_asset_api.py

@@ -13,15 +13,14 @@ async def test_asset_api_upload_list_update_and_delete(
     client: AsyncClient,
     user_headers_from: dict[str, str],
 ):
-    payload = get_png_bytes()
     upload = await client.post(
         "/api/v1/assets?public_asset=false",
         headers={"Authorization": user_headers_from["Authorization"]},
-        files={"file": ("note.png", payload, "image/png")},
+        files={"file": ("note.txt", b"hello world", "text/plain")},
     )
     assert upload.status_code == 200
     asset = upload.json()
-    assert asset["name"] == "note.png"
+    assert asset["name"] == "note.txt"
     assert asset["is_public"] is False
 
     page = await client.get("/api/v1/assets/paginated", headers=user_headers_from)
@@ -30,30 +29,27 @@ async def test_asset_api_upload_list_update_and_delete(
 
     info = await client.get(f"/api/v1/assets/{asset['id']}", headers=user_headers_from)
     assert info.status_code == 200
-    assert info.json()["name"] == "note.png"
+    assert info.json()["name"] == "note.txt"
 
     data = await client.get(
         f"/api/v1/assets/{asset['id']}/data", headers=user_headers_from
     )
     assert data.status_code == 200
-    assert data.content == payload
-    assert data.headers["content-type"] == "image/png"
-    assert data.headers["content-disposition"] == 'inline; filename="note.png"'
-    assert data.headers["x-content-type-options"] == "nosniff"
-    assert data.headers["content-security-policy"].startswith("sandbox")
+    assert data.content == b"hello world"
+    assert data.headers["content-disposition"] == 'inline; filename="note.txt"'
 
     updated = await client.put(
         f"/api/v1/assets/{asset['id']}",
         headers=user_headers_from,
-        json={"name": "renamed.png", "is_public": True},
+        json={"name": "renamed.txt", "is_public": True},
     )
     assert updated.status_code == 200
-    assert updated.json()["name"] == "renamed.png"
+    assert updated.json()["name"] == "renamed.txt"
     assert updated.json()["is_public"] is True
 
     public_data = await client.get(f"/api/v1/assets/{asset['id']}/data")
     assert public_data.status_code == 200
-    assert public_data.content == payload
+    assert public_data.content == b"hello world"
 
     deleted = await client.delete(
         f"/api/v1/assets/{asset['id']}", headers=user_headers_from
@@ -102,51 +98,15 @@ async def test_asset_api_enforces_visibility_and_supports_admin_updates(
     assert admin_updated.json()["is_public"] is True
     assert admin_updated.json()["name"] == "admin-visible.png"
 
-    image_data = await client.get(f"/api/v1/assets/{private_asset.id}/data")
-    assert image_data.status_code == 200
-    assert image_data.headers["content-type"] == "image/png"
-    assert image_data.headers["content-disposition"] == (
-        'inline; filename="admin-visible.png"'
-    )
-    assert image_data.headers["x-content-type-options"] == "nosniff"
-
     thumbnail = await client.get(f"/api/v1/assets/{private_asset.id}/thumbnail")
     assert thumbnail.status_code == 200
     assert thumbnail.content
     assert thumbnail.headers["content-type"] == "image/png"
-    assert thumbnail.headers["content-disposition"] == (
-        'inline; filename="admin-visible.png"'
-    )
-
-
-@pytest.mark.anyio
-async def test_asset_api_blocks_non_image_uploads(
-    client: AsyncClient,
-    user_headers_from: dict[str, str],
-):
-    payload = (
-        b'<?xml version="1.0"?>'
-        b'<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">'
-        b'<xsl:template match="/">'
-        b"<script>alert(1)</script>"
-        b"</xsl:template>"
-        b"</xsl:stylesheet>"
-    )
-
-    blocked = await client.post(
-        "/api/v1/assets",
-        headers={"Authorization": user_headers_from["Authorization"]},
-        files={"file": ("payload.xsl", payload, "text/xml")},
-    )
-
-    assert blocked.status_code == 400
-    assert blocked.json()["detail"] == "File type 'text/xml' not allowed."
 
 
 @pytest.mark.anyio
 async def test_asset_api_validates_uploads_and_missing_assets(
     client: AsyncClient,
-    to_user,
     user_headers_from: dict[str, str],
 ):
     invalid = await client.post(
@@ -157,15 +117,6 @@ async def test_asset_api_validates_uploads_and_missing_assets(
     assert invalid.status_code == 400
     assert "not allowed" in invalid.json()["detail"]
 
-    fake_image_headers = await get_user_token_headers(client, to_user.id)
-    fake_image = await client.post(
-        "/api/v1/assets",
-        headers={"Authorization": fake_image_headers["Authorization"]},
-        files={"file": ("fake.png", b"<root></root>", "image/png")},
-    )
-    assert fake_image.status_code == 400
-    assert "does not match declared file type" in fake_image.json()["detail"]
-
     missing = await client.delete(
         f"/api/v1/assets/{uuid4().hex}",
         headers=user_headers_from,
@@ -177,9 +128,7 @@ async def test_asset_api_validates_uploads_and_missing_assets(
 
     stored = await create_user_asset(
         "missing-user-check",
-        make_upload_file(
-            get_png_bytes(), filename="content.png", content_type="image/png"
-        ),
+        make_upload_file(b"content", filename="content.txt", content_type="text/plain"),
         is_public=True,
     )
     fetched = await get_user_asset("missing-user-check", stored.id)

tests/api/test_auth_api.py

@@ -72,42 +72,8 @@ async def test_auth_api_sso_login_and_callback(http_client: AsyncClient, mocker)
     login_sso = _FakeSSO()
     mocker.patch("lnbits.core.views.auth_api._new_sso", return_value=login_sso)
 
-    unauthenticated = await http_client.get(
-        f"/api/v1/auth/{provider}", params={"user_id": user.id}
-    )
-    assert unauthenticated.status_code == 403
-    assert unauthenticated.json()["detail"] == "User ID mismatch."
-
-    other_user = await create_user_account(
-        Account(
-            id=uuid4().hex,
-            username=f"user_{uuid4().hex[:8]}",
-            email=f"user_{uuid4().hex[:8]}@lnbits.com",
-        )
-    )
-    other_login = await http_client.post(
-        "/api/v1/auth/usr", json={"usr": other_user.id}
-    )
-    http_client.cookies.clear()
-    assert other_login.status_code == 200
-    other_headers = {
-        "Authorization": f"Bearer {other_login.json()['access_token']}",
-    }
-    wrong_user = await http_client.get(
-        f"/api/v1/auth/{provider}",
-        params={"user_id": user.id},
-        headers=other_headers,
-    )
-    assert wrong_user.status_code == 403
-    assert wrong_user.json()["detail"] == "User ID mismatch."
-
-    login = await http_client.post("/api/v1/auth/usr", json={"usr": user.id})
-    http_client.cookies.clear()
-    assert login.status_code == 200
-    headers = {"Authorization": f"Bearer {login.json()['access_token']}"}
-
     response = await http_client.get(
-        f"/api/v1/auth/{provider}", params={"user_id": user.id}, headers=headers
+        f"/api/v1/auth/{provider}", params={"user_id": user.id}
     )
     assert response.status_code == 307
     assert response.headers["location"] == "https://example.com/sso/login"

tests/api/test_callback_api.py

@@ -185,16 +185,23 @@ async def test_callback_api_handles_revolut_paid_events(mocker):
 async def test_callback_api_handles_revolut_subscription_event(
     mocker, settings: Settings
 ):
-    wallet_id = "wallet_1"
-    payment = mocker.Mock()
-    payment.extra = {}
-    payment.msat = 925_000
+    user = await create_user_account(
+        Account(
+            id=uuid4().hex,
+            username=f"user_{uuid4().hex[:8]}",
+            email=f"user_{uuid4().hex[:8]}@lnbits.com",
+        )
+    )
+    wallet = user.wallets[0]
+    payment = await create_wallet_invoice(
+        wallet.id, CreateInvoice(out=False, amount=15, memo="subscription")
+    )
 
     settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
     settings.revolut_api_secret_key = "revolut-secret"
     settings.revolut_api_version = "2026-04-20"
     revolut_provider = RevolutWallet()
-    get_subscription_mock = mocker.patch.object(
+    mocker.patch.object(
         revolut_provider,
         "get_subscription",
         return_value={
@@ -202,7 +209,7 @@ async def test_callback_api_handles_revolut_subscription_event(
             "current_cycle_id": "CYCLE_1",
             "external_reference": json.dumps(
                 {
-                    "wallet_id": wallet_id,
+                    "wallet_id": wallet.id,
                     "tag": "members",
                     "subscription_request_id": "request_1",
                     "extra": {"link": "link-1", "customer_id": "customer_1"},
@@ -234,14 +241,10 @@ async def test_callback_api_handles_revolut_subscription_event(
         "lnbits.core.views.callback_api.get_standalone_payment",
         mocker.AsyncMock(side_effect=[None]),
     )
-    create_wallet_invoice_mock = mocker.patch(
-        "lnbits.core.views.callback_api.create_wallet_invoice",
+    create_fiat_invoice_mock = mocker.patch(
+        "lnbits.core.views.callback_api.create_fiat_invoice",
         mocker.AsyncMock(return_value=payment),
     )
-    mocker.patch("lnbits.core.views.callback_api.service_fee_fiat", return_value=2)
-    update_payment_mock = mocker.patch(
-        "lnbits.core.views.callback_api.update_payment", mocker.AsyncMock()
-    )
     fiat_status_mock = mocker.patch(
         "lnbits.core.views.callback_api.check_fiat_status", mocker.AsyncMock()
     )
@@ -253,113 +256,16 @@ async def test_callback_api_handles_revolut_subscription_event(
         }
     )
 
-    get_subscription_mock.assert_not_awaited()
-    create_wallet_invoice_mock.assert_not_awaited()
-    update_payment_mock.assert_not_awaited()
-    fiat_status_mock.assert_not_awaited()
-
-
-@pytest.mark.anyio
-async def test_callback_api_handles_revolut_subscription_order_event(
-    mocker, settings: Settings
-):
-    wallet_id = "wallet_1"
-    payment = mocker.Mock()
-    payment.extra = {}
-    payment.msat = 925_000
-
-    settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
-    settings.revolut_api_secret_key = "revolut-secret"
-    settings.revolut_api_version = "2026-04-20"
-    revolut_provider = RevolutWallet()
-    subscription = {
-        "id": "SUBSCRIPTION_1",
-        "state": "active",
-        "current_cycle_id": "CYCLE_1",
-        "external_reference": json.dumps(
-            {
-                "wallet_id": wallet_id,
-                "tag": "members",
-                "subscription_request_id": "request_1",
-                "extra": {"link": "link-1"},
-                "memo": "Revolut Members",
-            }
-        ),
-    }
-    order = {
-        "id": "ORDER_SUB_1",
-        "type": "payment",
-        "state": "completed",
-        "amount": 925,
-        "currency": "USD",
-        "checkout_url": "https://checkout.revolut.com/payment-link/sub_1",
-        "channel_data": {
-            "subscription_id": "SUBSCRIPTION_1",
-            "subscription_cycle_id": "CYCLE_1",
-        },
-    }
-    get_order_mock = mocker.patch.object(
-        revolut_provider, "get_order", side_effect=[order, order]
-    )
-    get_subscription_mock = mocker.patch.object(
-        revolut_provider,
-        "get_subscription",
-        return_value=subscription,
-    )
-    mocker.patch.object(
-        revolut_provider,
-        "get_subscription_cycle",
-        return_value={"id": "CYCLE_1", "order_id": "ORDER_SUB_1"},
-    )
-    mocker.patch(
-        "lnbits.core.views.callback_api.get_fiat_provider",
-        mocker.AsyncMock(return_value=revolut_provider),
-    )
-    get_payment_mock = mocker.patch(
-        "lnbits.core.views.callback_api.get_standalone_payment",
-        mocker.AsyncMock(side_effect=[None, None]),
-    )
-    create_wallet_invoice_mock = mocker.patch(
-        "lnbits.core.views.callback_api.create_wallet_invoice",
-        mocker.AsyncMock(return_value=payment),
-    )
-    mocker.patch("lnbits.core.views.callback_api.service_fee_fiat", return_value=2)
-    update_payment_mock = mocker.patch(
-        "lnbits.core.views.callback_api.update_payment", mocker.AsyncMock()
-    )
-    fiat_status_mock = mocker.patch(
-        "lnbits.core.views.callback_api.check_fiat_status", mocker.AsyncMock()
-    )
-
-    await handle_revolut_event(
-        {
-            "event": "ORDER_COMPLETED",
-            "order_id": "ORDER_SUB_1",
-        }
-    )
-
-    assert get_payment_mock.await_count == 2
-    get_payment_mock.assert_any_await("fiat_revolut_order_ORDER_SUB_1")
-    assert get_order_mock.await_count == 1
-    assert [call.args for call in get_subscription_mock.await_args_list] == [
-        ("SUBSCRIPTION_1",),
-    ]
-    assert create_wallet_invoice_mock.await_count == 1
-    called_wallet_id, invoice = create_wallet_invoice_mock.await_args.args
-    assert called_wallet_id == "wallet_1"
+    assert create_fiat_invoice_mock.await_count == 1
+    revolut_call = create_fiat_invoice_mock.await_args.kwargs
+    assert revolut_call["wallet_id"] == wallet.id
+    invoice = revolut_call["invoice_data"]
+    assert invoice.fiat_provider == "revolut"
     assert invoice.amount == 9.25
     assert invoice.memo == "Revolut Members"
     assert invoice.external_id == "SUBSCRIPTION_1"
-    assert invoice.internal is True
     assert invoice.extra["fiat_method"] == "subscription"
     assert invoice.extra["subscription"]["checking_id"] == "order_ORDER_SUB_1"
-    assert payment.fiat_provider == "revolut"
-    assert payment.fee == -2
-    assert payment.extra["fiat_checking_id"] == "order_ORDER_SUB_1"
-    assert payment.checking_id == "fiat_revolut_order_ORDER_SUB_1"
-    update_payment_mock.assert_awaited_once_with(
-        payment, "fiat_revolut_order_ORDER_SUB_1"
-    )
     fiat_status_mock.assert_awaited_once_with(payment)
 
 

tests/api/test_lnurl_api.py

@@ -1,4 +1,3 @@
-from typing import cast
 from uuid import uuid4
 
 import pytest
@@ -107,7 +106,7 @@ async def test_lnurl_api_auth_and_pay_flow(mocker):
         await api_perform_lnurlauth(auth_response, wallet_info)
 
     action_response = LnurlPayActionResponse(
-        pr=cast(LightningInvoice, LightningInvoice(TEST_BOLT11)),
+        pr=LightningInvoice(TEST_BOLT11),
         disposable=False,
         successAction=parse_obj_as(MessageAction, {"message": "paid"}),
     )

tests/api/test_payment_api.py

@@ -6,16 +6,11 @@ import pytest
 from fastapi import HTTPException
 from pydantic import ValidationError
 
-from lnbits.core.crud.payments import (
-    create_payment,
-    get_payment,
-    get_payments,
-    update_payment,
-)
+from lnbits.core.crud.payments import create_payment, get_payments
 from lnbits.core.models import Account, CreateInvoice, PaymentFilters, PaymentState
 from lnbits.core.models.payments import CancelInvoice, CreatePayment, SettleInvoice
 from lnbits.core.models.users import AccountId
-from lnbits.core.models.wallets import BaseWalletTypeInfo, KeyType, WalletTypeInfo
+from lnbits.core.models.wallets import KeyType, WalletTypeInfo
 from lnbits.core.services.payments import create_wallet_invoice
 from lnbits.core.services.users import create_user_account
 from lnbits.core.views.payment_api import (
@@ -25,7 +20,6 @@ from lnbits.core.views.payment_api import (
     api_payments_daily_stats,
     api_payments_fee_reserve,
     api_payments_settle,
-    api_payments_total_breakdown,
     api_payments_wallets_stats,
 )
 from lnbits.db import Filter, Filters
@@ -152,61 +146,6 @@ async def test_payment_external_id_is_stored_and_validated():
         CreateInvoice(out=False, amount=21, external_id="provider payment 123")
 
 
-@pytest.mark.anyio
-async def test_payment_api_total_breakdown_groups_wallet_tags_and_fiat():
-    first_user = await create_user_account(
-        Account(
-            id=uuid4().hex,
-            username=f"user_{uuid4().hex[:8]}",
-            email=f"user_{uuid4().hex[:8]}@lnbits.com",
-        )
-    )
-    second_user = await create_user_account(
-        Account(
-            id=uuid4().hex,
-            username=f"user_{uuid4().hex[:8]}",
-            email=f"user_{uuid4().hex[:8]}@lnbits.com",
-        )
-    )
-    first_wallet = first_user.wallets[0]
-    second_wallet = second_user.wallets[0]
-
-    await _create_payment(first_wallet.id, amount_msat=2_000, tag="coffee")
-    await _create_payment(
-        first_wallet.id,
-        amount_msat=4_000,
-        tag="coffee",
-        fiat_provider="stripe",
-        extra={"fiat_payment_request": "https://stripe.test/session"},
-    )
-    await _create_payment(first_wallet.id, amount_msat=-1_000)
-    await _create_payment(second_wallet.id, amount_msat=8_000, tag="books")
-
-    breakdown = await api_payments_total_breakdown(
-        BaseWalletTypeInfo(key_type=KeyType.invoice, wallet=first_wallet)
-    )
-
-    assert any(
-        item.tag == "coffee"
-        and item.is_fiat is False
-        and item.total == 2_000
-        and item.payments_count == 1
-        for item in breakdown
-    )
-    assert any(
-        item.tag == "coffee"
-        and item.is_fiat is True
-        and item.total == 4_000
-        and item.payments_count == 1
-        for item in breakdown
-    )
-    assert any(
-        item.tag is None and item.is_fiat is False and item.total == -1_000
-        for item in breakdown
-    )
-    assert all(item.tag != "books" for item in breakdown)
-
-
 @pytest.mark.anyio
 async def test_payment_api_fee_reserve_and_hold_invoice_actions(mocker):
     user = await create_user_account(
@@ -222,7 +161,7 @@ async def test_payment_api_fee_reserve_and_hold_invoice_actions(mocker):
         wallet.id, CreateInvoice(out=False, amount=42, memo="reserve")
     )
     reserve = await api_payments_fee_reserve(invoice.bolt11)
-    assert json.loads(bytes(reserve.body))["fee_reserve"] >= 0
+    assert json.loads(reserve.body)["fee_reserve"] >= 0
 
     with pytest.raises(HTTPException, match="Invoice has no amount."):
         await api_payments_fee_reserve(ZERO_AMOUNT_INVOICE)
@@ -279,164 +218,6 @@ async def test_payment_api_fee_reserve_and_hold_invoice_actions(mocker):
     cancel_mock.assert_awaited_once()
 
 
-@pytest.mark.anyio
-async def test_payment_extra_update_appends_new_keys(
-    client,
-    to_wallet,
-    adminkey_headers_to,
-):
-    payment_hash = uuid4().hex
-    checking_id = await _create_payment(
-        to_wallet.id,
-        amount_msat=1_000,
-        payment_hash=payment_hash,
-        tag="splitpayments",
-    )
-
-    response = await client.patch(
-        "/api/v1/payments/extra",
-        headers=adminkey_headers_to,
-        json={
-            "payment_hash": payment_hash,
-            "extra": {"child": "daughter", "compliance_note": "reviewed"},
-        },
-    )
-
-    assert response.status_code == 200
-    extra = response.json()["extra"]
-    assert extra["tag"] == "splitpayments"
-    assert extra["child"] == "daughter"
-    assert extra["compliance_note"] == "reviewed"
-
-    payment = await get_payment(checking_id)
-    assert payment.extra == extra
-
-
-@pytest.mark.anyio
-async def test_payment_extra_update_creates_extra_when_missing(
-    client,
-    to_wallet,
-    adminkey_headers_to,
-):
-    payment_hash = uuid4().hex
-    checking_id = await _create_payment(
-        to_wallet.id,
-        amount_msat=1_000,
-        payment_hash=payment_hash,
-    )
-
-    response = await client.patch(
-        "/api/v1/payments/extra",
-        headers=adminkey_headers_to,
-        json={"payment_hash": payment_hash, "extra": {"note": "reviewed"}},
-    )
-
-    assert response.status_code == 200
-    assert response.json()["extra"] == {"note": "reviewed"}
-
-    payment = await get_payment(checking_id)
-    assert payment.extra == {"note": "reviewed"}
-
-
-@pytest.mark.anyio
-async def test_payment_extra_update_rejects_existing_keys(
-    client,
-    to_wallet,
-    adminkey_headers_to,
-):
-    payment_hash = uuid4().hex
-    checking_id = await _create_payment(
-        to_wallet.id,
-        amount_msat=1_000,
-        payment_hash=payment_hash,
-        tag="original",
-    )
-
-    response = await client.patch(
-        "/api/v1/payments/extra",
-        headers=adminkey_headers_to,
-        json={"payment_hash": payment_hash, "extra": {"tag": "overwritten"}},
-    )
-
-    assert response.status_code == 400
-    assert response.json()["detail"] == "Extra keys already exist: tag."
-
-    payment = await get_payment(checking_id)
-    assert payment.extra == {"tag": "original"}
-
-
-@pytest.mark.anyio
-async def test_payment_extra_update_requires_admin_key(
-    client,
-    to_wallet,
-    inkey_headers_to,
-):
-    payment_hash = uuid4().hex
-    await _create_payment(
-        to_wallet.id,
-        amount_msat=1_000,
-        payment_hash=payment_hash,
-    )
-
-    response = await client.patch(
-        "/api/v1/payments/extra",
-        headers=inkey_headers_to,
-        json={"payment_hash": payment_hash, "extra": {"note": "invoice key"}},
-    )
-
-    assert response.status_code == 403
-    assert response.json()["detail"] == "Invalid adminkey."
-
-
-@pytest.mark.anyio
-async def test_payment_extra_update_is_wallet_scoped(
-    client,
-    from_wallet,
-    adminkey_headers_to,
-):
-    payment_hash = uuid4().hex
-    await _create_payment(
-        from_wallet.id,
-        amount_msat=1_000,
-        payment_hash=payment_hash,
-    )
-
-    response = await client.patch(
-        "/api/v1/payments/extra",
-        headers=adminkey_headers_to,
-        json={"payment_hash": payment_hash, "extra": {"note": "wrong wallet"}},
-    )
-
-    assert response.status_code == 404
-    assert response.json()["detail"] == "Payment does not exist."
-
-
-@pytest.mark.anyio
-async def test_payment_extra_update_requires_successful_payment(
-    client,
-    to_wallet,
-    adminkey_headers_to,
-):
-    payment_hash = uuid4().hex
-    await _create_payment(
-        to_wallet.id,
-        amount_msat=1_000,
-        payment_hash=payment_hash,
-        status=PaymentState.PENDING,
-    )
-
-    response = await client.patch(
-        "/api/v1/payments/extra",
-        headers=adminkey_headers_to,
-        json={"payment_hash": payment_hash, "extra": {"note": "too early"}},
-    )
-
-    assert response.status_code == 400
-    assert (
-        response.json()["detail"] == "Payment extra can only be updated after success."
-    )
-
-
 async def _create_payment(
     wallet_id: str,
     *,
@@ -444,13 +225,8 @@ async def _create_payment(
     status: PaymentState = PaymentState.SUCCESS,
     payment_hash: str | None = None,
     tag: str | None = None,
-    fiat_provider: str | None = None,
-    extra: dict | None = None,
 ) -> str:
     checking_id = f"checking_{uuid4().hex[:8]}"
-    payment_extra = extra or {}
-    if tag:
-        payment_extra["tag"] = tag
     await create_payment(
         checking_id=checking_id,
         data=CreatePayment(
@@ -459,12 +235,8 @@ async def _create_payment(
             bolt11=f"bolt11_{checking_id}",
             amount_msat=amount_msat,
             memo=f"payment_{checking_id}",
-            extra=payment_extra,
+            extra={"tag": tag} if tag else {},
         ),
         status=status,
     )
-    if fiat_provider:
-        payment = await get_payment(checking_id)
-        payment.fiat_provider = fiat_provider
-        await update_payment(payment)
     return checking_id

tests/data_revolut_api/.lnbits_auth_key

@@ -0,0 +1 @@
+98ae578877a3479bb0424d2e418b427a

tests/data_revolut_api2/.lnbits_auth_key

@@ -0,0 +1 @@
+6355d3c6c5df49dbb562a74f9deb19ce

tests/regtest/helpers.py

@@ -26,6 +26,8 @@ docker_bitcoin_cli = [
     "exec",
     "lnbits-bitcoind-1",
     "bitcoin-cli",
+    "-rpcuser=lnbits",
+    "-rpcpassword=lnbits",
     "-regtest",
 ]
 

tests/regtest/test_electrum.py

@@ -1,184 +0,0 @@
-"""
-Electrum client integration tests against the regtest electrs container.
-Requires the regtest docker-compose stack (docker/regtest/docker-compose.yml).
-electrs is exposed on localhost:19001 (plain TCP) and localhost:3002 (HTTP).
-"""
-
-import asyncio
-
-import httpx
-import pytest
-from loguru import logger
-
-from lnbits.utils.electrum import ElectrumClient, scripthash_from_scriptpubkey
-
-from .helpers import docker_bitcoin_cli, run_cmd, run_cmd_json
-
-ELECTRS_HOST = "localhost"
-ELECTRS_PORT = 19001
-ELECTRS_HTTP = "http://localhost:3002"
-
-
-def bitcoin_height() -> int:
-    return run_cmd_json([*docker_bitcoin_cli, "getblockchaininfo"])["blocks"]
-
-
-def mine_blocks(n: int = 1) -> int:
-    """Mine n blocks and return the new chain height."""
-    run_cmd([*docker_bitcoin_cli, "-generate", str(n)])
-    return bitcoin_height()
-
-
-def new_address() -> str:
-    return run_cmd([*docker_bitcoin_cli, "getnewaddress", "bech32"])
-
-
-def get_scriptpubkey(address: str) -> bytes:
-    info = run_cmd_json([*docker_bitcoin_cli, "getaddressinfo", address])
-    return bytes.fromhex(info["scriptPubKey"])
-
-
-def send_to_address(address: str, sats: int) -> str:
-    btc = f"{sats * 1e-8:.8f}"
-    return run_cmd([*docker_bitcoin_cli, "sendtoaddress", address, btc])
-
-
-async def wait_for_electrs(height: int, timeout: float = 15.0) -> None:
-    """Poll electrs HTTP until it has indexed up to `height`."""
-    loop = asyncio.get_running_loop()
-    deadline = loop.time() + timeout
-    async with httpx.AsyncClient() as http:
-        while loop.time() < deadline:
-            try:
-                r = await http.get(f"{ELECTRS_HTTP}/blocks/tip/height", timeout=2)
-                if int(r.text) >= height:
-                    return
-            except Exception:
-                logger.debug("electrs not ready yet")
-            await asyncio.sleep(0.25)
-    raise TimeoutError(f"electrs did not reach height {height} within {timeout}s")
-
-
-@pytest.fixture(scope="module", autouse=True)
-async def wait_after_electrum_tests():
-    yield
-    await asyncio.sleep(1)
-
-
-@pytest.mark.anyio
-async def test_connect_and_height():
-    async with ElectrumClient(f"tcp://{ELECTRS_HOST}:{ELECTRS_PORT}") as client:
-        before = await client.get_height()
-
-    target = mine_blocks(3)
-    await wait_for_electrs(target)
-
-    async with ElectrumClient(f"tcp://{ELECTRS_HOST}:{ELECTRS_PORT}") as client:
-        after = await client.get_height()
-
-    assert isinstance(before, int) and before >= 0
-    assert after == before + 3
-
-
-@pytest.mark.anyio
-async def test_get_tip():
-    async with ElectrumClient(f"tcp://{ELECTRS_HOST}:{ELECTRS_PORT}") as client:
-        tip = await client.get_tip()
-        assert isinstance(tip.height, int)
-        assert isinstance(tip.hex, str)
-        assert len(tip.hex) == 160  # 80-byte serialised header
-
-
-@pytest.mark.anyio
-async def test_server_banner():
-    async with ElectrumClient(f"tcp://{ELECTRS_HOST}:{ELECTRS_PORT}") as client:
-        banner = await client.server_banner()
-        assert isinstance(banner, str)
-
-
-@pytest.mark.anyio
-async def test_balance_after_payment():
-    address = new_address()
-    scripthash = scripthash_from_scriptpubkey(get_scriptpubkey(address))
-
-    async with ElectrumClient(f"tcp://{ELECTRS_HOST}:{ELECTRS_PORT}") as client:
-        empty = await client.get_balance(scripthash)
-        assert empty.confirmed == 0
-        assert empty.unconfirmed == 0
-
-    send_to_address(address, 500_000)
-    target = mine_blocks(1)
-    await wait_for_electrs(target)
-
-    async with ElectrumClient(f"tcp://{ELECTRS_HOST}:{ELECTRS_PORT}") as client:
-        confirmed = await client.get_balance(scripthash)
-        assert confirmed.confirmed == 500_000
-        assert confirmed.unconfirmed == 0
-
-
-@pytest.mark.anyio
-async def test_history_and_utxos():
-    address = new_address()
-    scripthash = scripthash_from_scriptpubkey(get_scriptpubkey(address))
-
-    send_to_address(address, 250_000)
-    target = mine_blocks(1)
-    await wait_for_electrs(target)
-
-    async with ElectrumClient(f"tcp://{ELECTRS_HOST}:{ELECTRS_PORT}") as client:
-        history = await client.get_history(scripthash)
-        assert len(history) >= 1
-        assert history[0].tx_hash
-        assert history[0].height > 0
-
-        utxos = await client.listunspent(scripthash)
-        assert len(utxos) == 1
-        assert utxos[0].value == 250_000
-
-        raw_tx = await client.get_transaction(utxos[0].tx_hash)
-        assert isinstance(raw_tx, str) and len(raw_tx) > 0
-
-
-@pytest.mark.anyio
-async def test_subscribe_scripthash_payment():
-    address = new_address()
-    scripthash = scripthash_from_scriptpubkey(get_scriptpubkey(address))
-
-    received: list = []
-    event = asyncio.Event()
-
-    def on_change(params: list) -> None:
-        received.append(params)
-        event.set()
-
-    async with ElectrumClient(f"tcp://{ELECTRS_HOST}:{ELECTRS_PORT}") as client:
-        initial_status = await client.subscribe_scripthash(
-            scripthash, callback=on_change
-        )
-        assert initial_status is None  # fresh address has no history
-
-        send_to_address(address, 777_000)
-        target = mine_blocks(1)
-        await wait_for_electrs(target)
-
-        await asyncio.wait_for(event.wait(), timeout=10)
-
-        assert len(received) == 1
-        assert received[0][0] == scripthash  # first param is the scripthash
-        assert received[0][1] is not None  # second param is the new status hash
-
-        balance = await client.get_balance(scripthash)
-        assert balance.confirmed == 777_000
-
-
-@pytest.mark.anyio
-async def test_subscribe_headers():
-    async with ElectrumClient(f"tcp://{ELECTRS_HOST}:{ELECTRS_PORT}") as client:
-        notifications: list = []
-        tip = await client.subscribe_headers(callback=lambda p: notifications.append(p))
-        height_before = tip.height
-
-        target = mine_blocks(1)
-        await wait_for_electrs(target)
-
-        assert await client.get_height() == height_before + 1

tests/unit/test_fiat_providers.py

@@ -8,7 +8,7 @@ from unittest.mock import AsyncMock
 import pytest
 from pytest_mock.plugin import MockerFixture
 
-from lnbits.core.crud.payments import get_payment, get_payments
+from lnbits.core.crud.payments import get_payments
 from lnbits.core.crud.users import get_user
 from lnbits.core.crud.wallets import create_wallet
 from lnbits.core.models.payments import CreateInvoice, Payment, PaymentState
@@ -74,7 +74,6 @@ class MockHTTPClient:
 
 @pytest.fixture(autouse=True)
 def fiat_provider_test_settings(settings: Settings):
-    original_lnbits_running = settings.lnbits_running
     original_allowed_currencies = settings.lnbits_allowed_currencies
     original_paypal_enabled = settings.paypal_enabled
     original_square_enabled = settings.square_enabled
@@ -99,7 +98,6 @@ def fiat_provider_test_settings(settings: Settings):
     settings.square_enabled = False
     settings.revolut_enabled = False
     yield
-    settings.lnbits_running = original_lnbits_running
     settings.lnbits_allowed_currencies = original_allowed_currencies
     settings.paypal_enabled = original_paypal_enabled
     settings.square_enabled = original_square_enabled
@@ -447,7 +445,6 @@ async def test_square_wallet_create_invoice(settings: Settings):
 
 @pytest.mark.anyio
 async def test_square_wallet_create_subscription(settings: Settings):
-    settings.lnbits_running = False
     settings.square_api_endpoint = "https://connect.squareupsandbox.com"
     settings.square_access_token = "square-token"
     settings.square_location_id = "LOC123"
@@ -523,7 +520,6 @@ async def test_square_wallet_create_subscription(settings: Settings):
 
 @pytest.mark.anyio
 async def test_square_wallet_create_subscription_from_plan_id(settings: Settings):
-    settings.lnbits_running = False
     settings.square_api_endpoint = "https://connect.squareupsandbox.com"
     settings.square_access_token = "square-token"
     settings.square_location_id = "LOC123"
@@ -812,48 +808,6 @@ async def test_revolut_wallet_create_invoice(settings: Settings):
     assert payload["redirect_url"] == "https://lnbits.example/success"
 
 
-@pytest.mark.anyio
-async def test_revolut_wallet_create_invoice_uses_currency_minor_units(
-    settings: Settings,
-):
-    settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
-    settings.revolut_api_secret_key = "revolut-secret"
-    settings.revolut_api_version = "2026-04-20"
-
-    wallet = RevolutWallet()
-    client = MockHTTPClient(
-        [
-            MockHTTPResponse(
-                json_data={
-                    "id": "ORDER_JPY",
-                    "checkout_url": "https://checkout.revolut.com/payment-link/jpy",
-                }
-            ),
-            MockHTTPResponse(
-                json_data={
-                    "id": "ORDER_KWD",
-                    "checkout_url": "https://checkout.revolut.com/payment-link/kwd",
-                }
-            ),
-        ]
-    )
-    wallet.client = client  # type: ignore[assignment]
-
-    await wallet.create_invoice(
-        amount=123,
-        payment_hash="hash_jpy",
-        currency="JPY",
-    )
-    await wallet.create_invoice(
-        amount=1.234,
-        payment_hash="hash_kwd",
-        currency="KWD",
-    )
-
-    assert client.calls[0][1]["json"]["amount"] == 123
-    assert client.calls[1][1]["json"]["amount"] == 1234
-
-
 @pytest.mark.anyio
 async def test_revolut_wallet_get_invoice_status(settings: Settings):
     settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
@@ -880,16 +834,6 @@ async def test_revolut_wallet_create_subscription(settings: Settings):
     wallet = RevolutWallet()
     client = MockHTTPClient(
         [
-            MockHTTPResponse(
-                json_data={
-                    "customers": [
-                        {
-                            "id": "CUSTOMER123",
-                            "email": "customer@example.com",
-                        }
-                    ]
-                }
-            ),
             MockHTTPResponse(
                 json_data={
                     "id": "SUBSCRIPTION123",
@@ -910,8 +854,7 @@ async def test_revolut_wallet_create_subscription(settings: Settings):
         wallet_id="wallet_1",
         memo="Monthly Gold",
         tag="gold",
-        customer_email="customer@example.com",
-        extra={"link": "link-1"},
+        extra={"customer_id": "CUSTOMER123", "link": "link-1"},
         success_url="https://lnbits.example/subscription-success",
     )
 
@@ -919,313 +862,25 @@ async def test_revolut_wallet_create_subscription(settings: Settings):
         "PLAN_VARIATION_123", 1, payment_options
     )
 
-    subscription_request_id = payment_options.subscription_request_id
     assert response.ok is True
     assert response.subscription_request_id == "SUBSCRIPTION123"
-    assert subscription_request_id is not None
     assert (
         response.checkout_session_url
         == "https://checkout.revolut.com/payment-link/sub_123"
     )
-    assert client.calls[0][0] == "/api/customers"
-    assert client.calls[0][1]["params"] == {"limit": 500}
-    assert client.calls[0][1]["timeout"] == 30
-    assert client.calls[1][0] == "/api/subscriptions"
-    payload = client.calls[1][1]["json"]
+    assert client.calls[0][0] == "/api/subscriptions"
+    payload = client.calls[0][1]["json"]
     assert payload["plan_variation_id"] == "PLAN_VARIATION_123"
     assert payload["customer_id"] == "CUSTOMER123"
-    assert client.calls[1][1]["timeout"] == 30
-    assert client.calls[1][1]["headers"]["Idempotency-Key"] == (subscription_request_id)
     assert payload["setup_order_redirect_url"] == (
         "https://lnbits.example/subscription-success"
     )
     reference = json.loads(payload["external_reference"])
     assert reference["wallet_id"] == "wallet_1"
     assert reference["tag"] == "gold"
-    assert reference["subscription_request_id"] == subscription_request_id
     assert reference["memo"] == "Monthly Gold"
-    assert reference["extra"]["link"] == "link-1"
-    assert client.calls[2][0] == "/api/orders/ORDER123"
-
-
-@pytest.mark.anyio
-async def test_revolut_wallet_create_subscription_uses_customer_email(
-    settings: Settings,
-):
-    settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
-    settings.revolut_api_secret_key = "revolut-secret"
-    settings.revolut_api_version = "2026-04-20"
-
-    wallet = RevolutWallet()
-    client = MockHTTPClient(
-        [
-            MockHTTPResponse(
-                json_data={
-                    "customers": [
-                        {
-                            "id": "CUSTOMER123",
-                            "email": "customer@example.com",
-                        }
-                    ]
-                }
-            ),
-            MockHTTPResponse(
-                json_data={
-                    "id": "SUBSCRIPTION123",
-                    "setup_order_id": "ORDER123",
-                }
-            ),
-            MockHTTPResponse(
-                json_data={
-                    "id": "ORDER123",
-                    "checkout_url": "https://checkout.revolut.com/payment-link/sub_123",
-                }
-            ),
-        ]
-    )
-    wallet.client = client  # type: ignore[assignment]
-
-    payment_options = FiatSubscriptionPaymentOptions(
-        wallet_id="wallet_1",
-        customer_email="customer@example.com",
-    )
-
-    response = await wallet.create_subscription(
-        "PLAN_VARIATION_123", 1, payment_options
-    )
-
-    assert response.ok is True
-    assert client.calls[0][0] == "/api/customers"
-    assert client.calls[0][1]["params"] == {"limit": 500}
-    assert client.calls[0][1]["timeout"] == 30
-    assert client.calls[1][0] == "/api/subscriptions"
-    assert client.calls[1][1]["json"]["customer_id"] == "CUSTOMER123"
-    assert client.calls[1][1]["timeout"] == 30
-    assert client.calls[2][0] == "/api/orders/ORDER123"
-    assert client.calls[2][1]["timeout"] == 30
-
-
-@pytest.mark.anyio
-async def test_revolut_wallet_create_subscription_uses_paginated_customer_email(
-    settings: Settings,
-):
-    settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
-    settings.revolut_api_secret_key = "revolut-secret"
-    settings.revolut_api_version = "2026-04-20"
-
-    wallet = RevolutWallet()
-    client = MockHTTPClient(
-        [
-            MockHTTPResponse(
-                json_data={
-                    "next_page_token": "PAGE2",
-                    "customers": [
-                        {
-                            "id": "OTHER_CUSTOMER",
-                            "email": "other@example.com",
-                        }
-                    ],
-                }
-            ),
-            MockHTTPResponse(
-                json_data={
-                    "customers": [
-                        {
-                            "id": "CUSTOMER123",
-                            "email": "customer@example.com",
-                        }
-                    ],
-                }
-            ),
-            MockHTTPResponse(
-                json_data={
-                    "id": "SUBSCRIPTION123",
-                    "setup_order_id": "ORDER123",
-                }
-            ),
-            MockHTTPResponse(
-                json_data={
-                    "id": "ORDER123",
-                    "checkout_url": "https://checkout.revolut.com/payment-link/sub_123",
-                }
-            ),
-        ]
-    )
-    wallet.client = client  # type: ignore[assignment]
-
-    payment_options = FiatSubscriptionPaymentOptions(
-        wallet_id="wallet_1",
-        customer_email="customer@example.com",
-    )
-
-    response = await wallet.create_subscription(
-        "PLAN_VARIATION_123", 1, payment_options
-    )
-
-    assert response.ok is True
-    assert client.calls[0][0] == "/api/customers"
-    assert client.calls[0][1]["params"] == {"limit": 500}
-    assert client.calls[1][0] == "/api/customers"
-    assert client.calls[1][1]["params"] == {
-        "limit": 500,
-        "page_token": "PAGE2",
-    }
-    assert client.calls[1][1]["timeout"] == 30
-    assert client.calls[2][0] == "/api/subscriptions"
-    assert client.calls[2][1]["json"]["customer_id"] == "CUSTOMER123"
-    assert client.calls[3][0] == "/api/orders/ORDER123"
-
-
-@pytest.mark.anyio
-async def test_revolut_wallet_create_subscription_creates_customer(settings: Settings):
-    settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
-    settings.revolut_api_secret_key = "revolut-secret"
-    settings.revolut_api_version = "2026-04-20"
-
-    wallet = RevolutWallet()
-    client = MockHTTPClient(
-        [
-            MockHTTPResponse(
-                json_data={
-                    "next_page_token": "PAGE2",
-                    "customers": [
-                        {
-                            "id": "OTHER_CUSTOMER",
-                            "email": "other@example.com",
-                        }
-                    ],
-                }
-            ),
-            MockHTTPResponse(json_data={"customers": []}),
-            MockHTTPResponse(json_data={"id": "CUSTOMER123"}),
-            MockHTTPResponse(
-                json_data={
-                    "id": "SUBSCRIPTION123",
-                    "setup_order_id": "ORDER123",
-                }
-            ),
-            MockHTTPResponse(
-                json_data={
-                    "id": "ORDER123",
-                    "checkout_url": "https://checkout.revolut.com/payment-link/sub_123",
-                }
-            ),
-        ]
-    )
-    wallet.client = client  # type: ignore[assignment]
-
-    payment_options = FiatSubscriptionPaymentOptions(
-        wallet_id="wallet_1",
-        customer_email="customer@example.com",
-    )
-
-    response = await wallet.create_subscription(
-        "PLAN_VARIATION_123", 1, payment_options
-    )
-
-    assert response.ok is True
-    assert client.calls[0][0] == "/api/customers"
-    assert client.calls[0][1]["params"] == {"limit": 500}
-    assert client.calls[1][0] == "/api/customers"
-    assert client.calls[1][1]["params"] == {
-        "limit": 500,
-        "page_token": "PAGE2",
-    }
-    assert client.calls[2][0] == "/api/customers"
-    assert client.calls[2][1]["json"] == {"email": "customer@example.com"}
-    assert client.calls[2][1]["timeout"] == 30
-    assert client.calls[3][0] == "/api/subscriptions"
-    assert client.calls[3][1]["json"]["customer_id"] == "CUSTOMER123"
-    assert client.calls[4][0] == "/api/orders/ORDER123"
-
-
-@pytest.mark.anyio
-async def test_revolut_wallet_create_subscription_stops_customer_lookup_after_20_pages(
-    settings: Settings,
-):
-    settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
-    settings.revolut_api_secret_key = "revolut-secret"
-    settings.revolut_api_version = "2026-04-20"
-
-    wallet = RevolutWallet()
-    customer_pages = [
-        MockHTTPResponse(
-            json_data={
-                "next_page_token": f"PAGE{page + 2}",
-                "customers": [
-                    {
-                        "id": f"OTHER_CUSTOMER_{page}",
-                        "email": f"other-{page}@example.com",
-                    }
-                ],
-            }
-        )
-        for page in range(20)
-    ]
-    client = MockHTTPClient(
-        [
-            *customer_pages,
-            MockHTTPResponse(json_data={"id": "CUSTOMER123"}),
-            MockHTTPResponse(
-                json_data={
-                    "id": "SUBSCRIPTION123",
-                    "setup_order_id": "ORDER123",
-                }
-            ),
-            MockHTTPResponse(
-                json_data={
-                    "id": "ORDER123",
-                    "checkout_url": "https://checkout.revolut.com/payment-link/sub_123",
-                }
-            ),
-        ]
-    )
-    wallet.client = client  # type: ignore[assignment]
-
-    payment_options = FiatSubscriptionPaymentOptions(
-        wallet_id="wallet_1",
-        customer_email="customer@example.com",
-    )
-
-    response = await wallet.create_subscription(
-        "PLAN_VARIATION_123", 1, payment_options
-    )
-
-    assert response.ok is True
-    assert [call[0] for call in client.calls[:20]] == ["/api/customers"] * 20
-    assert client.calls[0][1]["params"] == {"limit": 500}
-    assert client.calls[19][1]["params"] == {
-        "limit": 500,
-        "page_token": "PAGE20",
-    }
-    assert client.calls[20][0] == "/api/customers"
-    assert client.calls[20][1]["json"] == {"email": "customer@example.com"}
-    assert client.calls[21][0] == "/api/subscriptions"
-    assert client.calls[21][1]["json"]["customer_id"] == "CUSTOMER123"
-    assert client.calls[22][0] == "/api/orders/ORDER123"
-
-
-@pytest.mark.anyio
-async def test_revolut_wallet_create_subscription_requires_customer_email(
-    settings: Settings,
-):
-    settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
-    settings.revolut_api_secret_key = "revolut-secret"
-    settings.revolut_api_version = "2026-04-20"
-
-    wallet = RevolutWallet()
-    client = MockHTTPClient([])
-    wallet.client = client  # type: ignore[assignment]
-
-    payment_options = FiatSubscriptionPaymentOptions(wallet_id="wallet_1")
-
-    response = await wallet.create_subscription(
-        "PLAN_VARIATION_123", 1, payment_options
-    )
-
-    assert response.ok is False
-    assert response.error_message == "Revolut subscriptions require customer_email."
-    assert client.calls == []
+    assert reference["extra"]["customer_id"] == "CUSTOMER123"
+    assert client.calls[1][0] == "/api/orders/ORDER123"
 
 
 @pytest.mark.anyio
@@ -1235,55 +890,13 @@ async def test_revolut_wallet_cancel_subscription(settings: Settings):
     settings.revolut_api_version = "2026-04-20"
 
     wallet = RevolutWallet()
-    client = MockHTTPClient(
-        [
-            MockHTTPResponse(
-                json_data={
-                    "external_reference": json.dumps({"wallet_id": "wallet_1"}),
-                }
-            ),
-            MockHTTPResponse(json_data={}),
-        ]
-    )
+    client = MockHTTPClient([MockHTTPResponse(json_data={})])
     wallet.client = client  # type: ignore[assignment]
 
     response = await wallet.cancel_subscription("SUBSCRIPTION123", "wallet_1")
 
     assert response.ok is True
-    assert client.calls[0][0] == "/api/subscriptions/SUBSCRIPTION123"
-    assert client.calls[1][0] == "/api/subscriptions/SUBSCRIPTION123/cancel"
-
-
-@pytest.mark.anyio
-async def test_revolut_wallet_cancel_subscription_checks_wallet_id(
-    settings: Settings,
-):
-    settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
-    settings.revolut_api_secret_key = "revolut-secret"
-    settings.revolut_api_version = "2026-04-20"
-
-    wallet = RevolutWallet()
-    client = MockHTTPClient(
-        [
-            MockHTTPResponse(
-                json_data={
-                    "external_reference": json.dumps({"wallet_id": "wallet_2"}),
-                }
-            ),
-        ]
-    )
-    wallet.client = client  # type: ignore[assignment]
-
-    response = await wallet.cancel_subscription("SUBSCRIPTION123", "wallet_1")
-
-    assert response.ok is False
-    assert response.error_message == "Subscription not found."
-    assert client.calls == [
-        (
-            "/api/subscriptions/SUBSCRIPTION123",
-            {"timeout": 30},
-        )
-    ]
+    assert client.calls[0][0] == "/api/subscriptions/SUBSCRIPTION123/cancel"
 
 
 @pytest.mark.anyio
@@ -1323,7 +936,7 @@ async def test_revolut_wallet_create_webhook(mocker: MockerFixture):
         (
             "/api/webhooks",
             {
-                "timeout": 30,
+                "timeout": 15,
             },
         ),
         (
@@ -1333,7 +946,7 @@ async def test_revolut_wallet_create_webhook(mocker: MockerFixture):
                     "url": "https://lnbits.example/api/v1/callback/revolut",
                     "events": REVOLUT_WEBHOOK_EVENTS,
                 },
-                "timeout": 30,
+                "timeout": 15,
             },
         ),
     ]
@@ -1373,7 +986,7 @@ async def test_revolut_wallet_reuses_existing_webhook(mocker: MockerFixture):
         (
             "/api/webhooks",
             {
-                "timeout": 30,
+                "timeout": 15,
             },
         )
     ]
@@ -1392,22 +1005,20 @@ async def test_revolut_wallet_rejects_local_webhook_url():
 
 def test_check_revolut_signature():
     payload = b'{"event":"ORDER_COMPLETED","order_id":"ORDER123"}'
-    timestamp = str(int(time.time() * 1000))
+    timestamp = str(int(time.time()))
     secret = "revolut-secret"
-    signed_payload = b"v1." + timestamp.encode() + b"." + payload
-    sig = "v1=" + hmac.new(secret.encode(), signed_payload, hashlib.sha256).hexdigest()
+    sig = hmac.new(secret.encode(), payload, hashlib.sha256).hexdigest()
 
     check_revolut_signature(payload, sig, timestamp, secret)
 
 
-def test_check_revolut_signature_rejects_payload_only_signature():
+def test_check_revolut_signature_millisecond_timestamp():
     payload = b'{"event":"ORDER_COMPLETED","order_id":"ORDER123"}'
     timestamp = str(int(time.time() * 1000))
     secret = "revolut-secret"
     sig = hmac.new(secret.encode(), payload, hashlib.sha256).hexdigest()
 
-    with pytest.raises(ValueError, match="signature verification failed"):
-        check_revolut_signature(payload, sig, timestamp, secret)
+    check_revolut_signature(payload, sig, timestamp, secret)
 
 
 def test_check_revolut_signature_v1_header():
@@ -1744,59 +1355,15 @@ async def test_check_fiat_status_handles_internal_states(mocker: MockerFixture):
             amount=1000,
             fee=0,
             bolt11="bolt11",
-            status=PaymentState.SUCCESS,
+            status=PaymentState.PENDING,
             fiat_provider="stripe",
             extra={"fiat_checking_id": "stripe_checking_id"},
-        )
+        ),
+        skip_internal_payment_notifications=True,
     )
     assert queue_put.await_count == 1
 
 
-@pytest.mark.anyio
-async def test_check_fiat_status_persists_successful_payment(
-    to_wallet: Wallet, settings: Settings, mocker: MockerFixture
-):
-    settings.stripe_enabled = True
-    settings.stripe_api_secret_key = "mock_sk_test_4eC39HqLyjWDarjtT1zdp7dc"
-    settings.stripe_limits.service_min_amount_sats = 0
-    settings.stripe_limits.service_max_amount_sats = 0
-    settings.stripe_limits.service_fee_wallet_id = None
-    settings.stripe_limits.service_faucet_wallet_id = None
-
-    invoice_data = CreateInvoice(
-        unit="USD", amount=1.0, memo="Test", fiat_provider="stripe"
-    )
-    fiat_mock_response = FiatInvoiceResponse(
-        ok=True,
-        checking_id=f"session_paid_{get_random_string(10)}",
-        payment_request="https://stripe.com/pay/session_paid",
-    )
-    mocker.patch(
-        "lnbits.fiat.StripeWallet.create_invoice",
-        AsyncMock(return_value=fiat_mock_response),
-    )
-    mocker.patch(
-        "lnbits.utils.exchange_rates.get_fiat_rate_satoshis",
-        AsyncMock(return_value=1000),
-    )
-    payment = await payments.create_fiat_invoice(to_wallet.id, invoice_data)
-    assert payment.status == PaymentState.PENDING
-
-    mocker.patch(
-        "lnbits.fiat.StripeWallet.get_invoice_status",
-        AsyncMock(return_value=FiatPaymentStatus(paid=True)),
-    )
-    queue_put = mocker.patch("lnbits.tasks.internal_invoice_queue.put", AsyncMock())
-
-    status = await check_fiat_status(payment)
-
-    assert status.success is True
-    assert payment.status == PaymentState.SUCCESS
-    updated_payment = await get_payment(payment.checking_id)
-    assert updated_payment.status == PaymentState.SUCCESS
-    queue_put.assert_awaited_once_with(payment.checking_id)
-
-
 @pytest.mark.anyio
 async def test_verify_paypal_webhook_requires_configuration(settings: Settings):
     settings.paypal_webhook_id = None

tests/unit/test_pay_invoice.py

@@ -15,12 +15,7 @@ from lnbits.core.services import create_invoice, create_user_account, pay_invoic
 from lnbits.core.services.payments import update_wallet_balance
 from lnbits.exceptions import InvoiceError, PaymentError
 from lnbits.settings import Settings
-from lnbits.tasks import (
-    create_task,
-    internal_invoice_listener,
-    internal_invoice_queue,
-    wait_for_paid_invoices,
-)
+from lnbits.tasks import create_task, wait_for_paid_invoices
 from lnbits.wallets.base import PaymentResponse
 from lnbits.wallets.fake import FakeWallet
 
@@ -236,15 +231,7 @@ async def test_notification_for_internal_payment(
 ):
     test_name = "test_notification_for_internal_payment"
 
-    # Drain stale items left by session-scoped fixtures (e.g. update_wallet_balance)
-    while not internal_invoice_queue.empty():
-        try:
-            internal_invoice_queue.get_nowait()
-        except asyncio.QueueEmpty:
-            break
-
     on_paid_mock = mocker.AsyncMock()
-    create_task(internal_invoice_listener())
     create_task(wait_for_paid_invoices(test_name, on_paid_mock)())
     payment = await create_invoice(
         wallet_id=to_wallet.id,

tests/unit/test_services_assets.py

@@ -15,7 +15,7 @@ from tests.helpers import make_upload_file
 
 @pytest.mark.anyio
 async def test_create_user_asset_validates_upload_constraints(
-    app, settings: Settings, mocker: MockerFixture
+    settings: Settings, mocker: MockerFixture
 ):
     file_without_type = make_upload_file(b"hello", filename="a.txt", content_type=None)
     with pytest.raises(ValueError, match="File must have a content type."):
@@ -31,40 +31,6 @@ async def test_create_user_asset_validates_upload_constraints(
     ):
         await create_user_asset("user-1", bad_type, is_public=False)
 
-    xsl_upload = make_upload_file(
-        b"hello",
-        filename="style.xsl",
-        content_type="text/xml",
-    )
-    with pytest.raises(ValueError, match="File type 'text/xml' not allowed."):
-        await create_user_asset("user-1", xsl_upload, is_public=False)
-
-    original_allowed_mime_types = list(settings.lnbits_assets_allowed_mime_types)
-    try:
-        settings.lnbits_assets_allowed_mime_types = [
-            *original_allowed_mime_types,
-            "text/xml",
-        ]
-        xsl_content = make_upload_file(
-            b'<stylesheet xmlns="http://www.w3.org/1999/XSL/Transform"></stylesheet>',
-            filename="style.xml",
-            content_type="text/xml",
-        )
-        with pytest.raises(ValueError, match="File type 'text/xml' not allowed."):
-            await create_user_asset("user-1", xsl_content, is_public=False)
-    finally:
-        settings.lnbits_assets_allowed_mime_types = original_allowed_mime_types
-
-    fake_image = make_upload_file(
-        b"<?xml version='1.0'?><root></root>",
-        filename="fake.png",
-        content_type="image/png",
-    )
-    with pytest.raises(
-        ValueError, match="Image file content does not match declared file type."
-    ):
-        await create_user_asset("user-1", fake_image, is_public=False)
-
     original_max_assets = settings.lnbits_max_assets_per_user
     original_max_size = settings.lnbits_max_asset_size_mb
     original_no_limit_users = list(settings.lnbits_assets_no_limit_users)
@@ -74,14 +40,14 @@ async def test_create_user_asset_validates_upload_constraints(
         settings.lnbits_assets_no_limit_users = []
         limited_user = await _create_user()
         allowed_type = make_upload_file(
-            _png_bytes(), filename="ok.png", content_type="image/png"
+            b"hello", filename="ok.txt", content_type="text/plain"
         )
         await create_user_asset(limited_user, allowed_type, is_public=False)
 
         blocked_by_count = make_upload_file(
-            _png_bytes(),
-            filename="again.png",
-            content_type="image/png",
+            b"again",
+            filename="again.txt",
+            content_type="text/plain",
         )
         with pytest.raises(ValueError, match="Max upload count of 1 exceeded."):
             await create_user_asset(limited_user, blocked_by_count, is_public=False)
@@ -89,9 +55,9 @@ async def test_create_user_asset_validates_upload_constraints(
         settings.lnbits_max_asset_size_mb = 0.000001
         oversized_user = await _create_user()
         large_file = make_upload_file(
-            _png_bytes(),
-            filename="ok.png",
-            content_type="image/png",
+            b"0123456789",
+            filename="ok.txt",
+            content_type="text/plain",
         )
         with pytest.raises(ValueError, match="File limit of 1e-06MB exceeded."):
             await create_user_asset(oversized_user, large_file, is_public=False)
@@ -102,66 +68,29 @@ async def test_create_user_asset_validates_upload_constraints(
 
 
 @pytest.mark.anyio
-async def test_create_user_asset_success(app, mocker: MockerFixture):
+async def test_create_user_asset_success(mocker: MockerFixture):
     user_id = await _create_user()
     mocker.patch(
         "lnbits.core.services.assets.thumbnail_from_bytes",
         return_value=None,
     )
-    contents = _png_bytes()
-    file = make_upload_file(contents, filename="hello.png", content_type="image/png")
+    file = make_upload_file(b"hello", filename="hello.txt", content_type="text/plain")
 
     asset = await create_user_asset(user_id, file, is_public=True)
     stored = await get_user_asset(user_id, asset.id)
 
     assert asset.id
     assert asset.user_id == user_id
-    assert asset.name == "hello.png"
-    assert asset.size_bytes == len(contents)
-    assert asset.data == contents
+    assert asset.name == "hello.txt"
+    assert asset.size_bytes == 5
+    assert asset.data == b"hello"
     assert asset.is_public is True
     assert stored is not None
     assert stored.id == asset.id
-    assert stored.data == contents
+    assert stored.data == b"hello"
     assert await get_user_assets_count(user_id) == 1
 
 
-@pytest.mark.anyio
-async def test_create_user_asset_stores_detected_image_mime_type(app):
-    user_id = await _create_user()
-    buffer = BytesIO()
-    Image.new("RGB", (32, 32), color="blue").save(buffer, format="JPEG")
-    file = make_upload_file(
-        buffer.getvalue(), filename="photo.jpg", content_type="image/jpg"
-    )
-
-    asset = await create_user_asset(user_id, file, is_public=True)
-    stored = await get_user_asset(user_id, asset.id)
-
-    assert asset.mime_type == "image/jpeg"
-    assert stored is not None
-    assert stored.mime_type == "image/jpeg"
-
-
-@pytest.mark.anyio
-async def test_create_user_asset_rejects_mismatched_image_content(app):
-    user_id = await _create_user()
-    buffer = BytesIO()
-    Image.new("RGB", (32, 32), color="blue").save(buffer, format="JPEG")
-    file = make_upload_file(
-        buffer.getvalue(), filename="photo.png", content_type="image/png"
-    )
-
-    with pytest.raises(
-        ValueError,
-        match=(
-            "Image file content does not match declared file type. "
-            "Declared: 'image/png', detected: 'image/jpeg'."
-        ),
-    ):
-        await create_user_asset(user_id, file, is_public=False)
-
-
 def test_thumbnail_from_bytes_success_and_failure():
     image = Image.new("RGB", (512, 512), color="red")
     buffer = BytesIO()
@@ -178,9 +107,3 @@ async def _create_user() -> str:
     user_id = uuid4().hex
     await create_account(Account(id=user_id, username=f"user_{user_id[:8]}"))
     return user_id
-
-
-def _png_bytes() -> bytes:
-    buffer = BytesIO()
-    Image.new("RGB", (32, 32), color="green").save(buffer, format="PNG")
-    return buffer.getvalue()

tests/unit/test_services_lnurl.py

@@ -1,4 +1,3 @@
-from typing import cast
 from uuid import uuid4
 
 import pytest
@@ -87,9 +86,7 @@ async def test_get_pr_from_lnurl_success_and_error(mocker: MockerFixture):
     mocker.patch(
         "lnbits.core.services.lnurl.execute_pay_request",
         mocker.AsyncMock(
-            return_value=LnurlPayActionResponse(
-                pr=cast(LightningInvoice, LightningInvoice(TEST_BOLT11))
-            )
+            return_value=LnurlPayActionResponse(pr=LightningInvoice(TEST_BOLT11))
         ),
     )
 
@@ -109,7 +106,7 @@ async def test_fetch_lnurl_pay_request_converts_currency_and_stores_paylink(
 ):
     pay_response = make_lnurl_pay_response(min_sendable_msat=1, text="Test")
     action_response = LnurlPayActionResponse(
-        pr=cast(LightningInvoice, LightningInvoice(TEST_BOLT11)), disposable=False
+        pr=LightningInvoice(TEST_BOLT11), disposable=False
     )
     mocker.patch(
         "lnbits.core.services.lnurl.fiat_amount_as_satoshis",
@@ -146,7 +143,7 @@ async def test_store_paylink_appends_and_updates_existing():
     wallet = await _create_wallet()
     pay_response = make_lnurl_pay_response(min_sendable_msat=1, text="Test")
     action_response = LnurlPayActionResponse(
-        pr=cast(LightningInvoice, LightningInvoice(TEST_BOLT11)), disposable=False
+        pr=LightningInvoice(TEST_BOLT11), disposable=False
     )
 
     await store_paylink(

tests/unit/test_services_notifications.py

@@ -39,7 +39,6 @@ from lnbits.core.services.notifications import (
     send_nostr_notification,
     send_nostr_notifications,
     send_notification,
-    send_notification_in_background,
     send_payment_notification,
     send_payment_push_notification,
     send_push_notification,
@@ -118,7 +117,7 @@ async def test_send_admin_and_user_notification_use_expected_targets(
     settings: Settings, mocker: MockerFixture
 ):
     send_mock = mocker.patch(
-        "lnbits.core.services.notifications.send_notification_in_background",
+        "lnbits.core.services.notifications.send_notification",
         mocker.AsyncMock(),
     )
     original_chat_id = settings.lnbits_telegram_notifications_chat_id
@@ -160,45 +159,6 @@ async def test_send_admin_and_user_notification_use_expected_targets(
     )
 
 
-@pytest.mark.anyio
-async def test_send_notification_in_background_schedules_notification(
-    mocker: MockerFixture,
-):
-    scheduled = []
-
-    def create_task(coro):
-        scheduled.append(coro)
-        coro.close()
-        return mocker.Mock()
-
-    create_task_mock = mocker.patch(
-        "lnbits.core.services.notifications.create_task",
-        side_effect=create_task,
-    )
-    send_mock = mocker.patch(
-        "lnbits.core.services.notifications.send_notification",
-        mocker.AsyncMock(),
-    )
-
-    await send_notification_in_background(
-        "chat-id",
-        ["alice@example.com"],
-        ["admin@example.com"],
-        "hello",
-        "settings_update",
-    )
-
-    create_task_mock.assert_called_once()
-    send_mock.assert_called_once_with(
-        "chat-id",
-        ["alice@example.com"],
-        ["admin@example.com"],
-        "hello",
-        "settings_update",
-    )
-    assert len(scheduled) == 1
-
-
 @pytest.mark.anyio
 async def test_send_notification_uses_available_channels_and_swallows_exceptions(
     settings: Settings, mocker: MockerFixture

tests/unit/test_services_settings.py

@@ -37,14 +37,12 @@ def test_dict_to_settings_parses_known_values():
         {
             "lnbits_site_title": "Test Title",
             "lnbits_service_fee": 5,
-            "lnbits_default_burger_menu_background": False,
             "ignored_field": "ignored",
         }
     )
 
     assert parsed.lnbits_site_title == "Test Title"
     assert parsed.lnbits_service_fee == 5
-    assert parsed.lnbits_default_burger_menu_background is False
     assert not hasattr(parsed, "ignored_field")
 
 

tests/unit/test_services_users.py

@@ -1,4 +1,3 @@
-from typing import Any
 from uuid import uuid4
 
 import pytest
@@ -67,7 +66,7 @@ async def test_create_user_account_no_check_rejects_duplicate_identity_fields(
     existing = _account(**existing_data)
     await create_account(existing)
 
-    resolved: dict[str, Any] = {
+    resolved = {
         key: (value(existing) if callable(value) else value)
         for key, value in new_data.items()
     }

tests/unit/test_settings.py

@@ -1,5 +1,3 @@
-from typing import Any
-
 import pytest
 from pytest_mock.plugin import MockerFixture
 
@@ -16,22 +14,22 @@ from lnbits.settings import (
     set_cli_settings,
 )
 
-lnurlp_redirect_path: dict[str, Any] = {
+lnurlp_redirect_path = {
     "from_path": "/.well-known/lnurlp",
     "redirect_to_path": "/api/v1/well-known",
 }
-lnurlp_redirect_path_with_headers: dict[str, Any] = {
+lnurlp_redirect_path_with_headers = {
     "from_path": "/.well-known/lnurlp",
     "redirect_to_path": "/api/v1/well-known",
     "header_filters": {"accept": "application/nostr+json"},
 }
 
-lnaddress_redirect_path: dict[str, Any] = {
+lnaddress_redirect_path = {
     "from_path": "/.well-known/lnurlp",
     "redirect_to_path": "/api/v1/well-known",
 }
 
-nostrrelay_redirect_path: dict[str, Any] = {
+nostrrelay_redirect_path = {
     "from_path": "/",
     "redirect_to_path": "/api/v1/relay-info",
     "header_filters": {"accept": "application/nostr+json"},
@@ -234,14 +232,6 @@ def test_installed_extensions_settings_activate_and_deactivate_paths():
     assert installed.find_extension_redirect("/.well-known/lnurlp", []) is None
 
 
-def test_public_settings_include_burger_menu_background(settings: Settings):
-    settings.lnbits_default_burger_menu_background = False
-
-    public_settings = PublicSettings.from_settings(settings)
-
-    assert public_settings.default_burger_menu_background is False
-
-
 def test_installed_extensions_settings_detects_conflicting_redirects():
     installed = InstalledExtensionsSettings(
         lnbits_extensions_redirects=[

tests/wallets/fixtures/json/fixtures_rest.json

@@ -2073,7 +2073,7 @@
                 {
                   "response_type": "json",
                   "response": {
-                    "state": "SETTLED"
+                    "settled": true
                   }
                 }
               ]
@@ -2155,15 +2155,8 @@
               ]
             },
             "lndrest": {
-              "get_invoice_status_endpoint": [
-                {
-                  "description": "error status",
-                  "response_type": "json",
-                  "response": {
-                    "state": "CANCELED"
-                  }
-                }
-              ]
+              "description": "lndrest.py doesn't handle the 'failed' status for `get_invoice_status`",
+              "get_invoice_status_endpoint": []
             },
             "alby": {
               "description": "alby.py doesn't handle the 'failed' status for `get_invoice_status`",
@@ -2250,6 +2243,13 @@
                   "response_type": "json",
                   "response": {}
                 },
+                {
+                  "description": "error status",
+                  "response_type": "json",
+                  "response": {
+                    "seetled": false
+                  }
+                },
                 {
                   "description": "bad json",
                   "response_type": "data",

tests/wallets/test_blink.py

@@ -1,5 +1,4 @@
 import os
-from typing import cast
 
 import pytest
 from loguru import logger
@@ -30,7 +29,7 @@ logger.info(f"settings.blink_api_endpoint: {settings.blink_api_endpoint}")
 logger.info(f"settings.blink_token: {settings.blink_token}")
 
 set_funding_source()
-funding_source = cast(BlinkWallet, get_funding_source())
+funding_source = get_funding_source()
 assert isinstance(funding_source, BlinkWallet)
 
 

tests/wallets/test_rpc_wallets.py

@@ -1,5 +1,4 @@
 import importlib
-from typing import Any
 from unittest.mock import AsyncMock, Mock
 
 import pytest
@@ -81,9 +80,7 @@ def _check_calls(expected_calls):
         for func_call in func_calls:
             req = func_call["request_data"]
             args = req["args"] if "args" in req else {}
-            kwargs: dict[str, Any] = (
-                _eval_dict(req["kwargs"]) or {} if "kwargs" in req else {}
-            )
+            kwargs = _eval_dict(req["kwargs"]) if "kwargs" in req else {}
 
             if "klass" in req:
                 *rest, cls = req["klass"].split(".")
@@ -169,7 +166,7 @@ def _mock_field(field):
     return response
 
 
-def _eval_dict(data: dict | None) -> dict[str, Any] | None:
+def _eval_dict(data: dict | None) -> dict | None:
     fn_prefix = "__eval__:"
     if not data:
         return data
@@ -218,9 +215,9 @@ def _data_mock(data: dict) -> Mock:
 def _raise(error: dict | None):
     if not error:
         return Exception()
-    data: dict[str, Any] = error["data"] if "data" in error else {}
+    data = error["data"] if "data" in error else None
     if "module" not in error or "class" not in error:
-        return Exception(data or None)
+        return Exception(data)
 
     error_module = importlib.import_module(error["module"])
     error_class = getattr(error_module, error["class"])