feat: for QRs that are not case sensitive make uppercase

Co-authored-by: blackcoffeexbt <87530449+blackcoffeexbt@users.noreply.github.com>
Co-authored-by: Vlad Stan <stan.v.vlad@gmail.com>

.env.example

@@ -191,14 +191,7 @@ BOLTZ_CLIENT_MACAROON="/home/bob/.boltz/macaroons/admin.macaroon"
 # HEXSTRING instead of path also possible
 BOLTZ_CLIENT_CERT="/home/bob/.boltz/tls.cert"
 
-# SparkL2Wallet (external sidecar: https://github.com/lnbits/spark_sidecar)
-SPARK_L2_NETWORK=MAINNET
-SPARK_L2_EXTERNAL_ENDPOINT=http://127.0.0.1:8765
-SPARK_L2_EXTERNAL_API_KEY=
-# optional tuning
-# SPARK_L2_PAY_WAIT_MS=4000
-# SPARK_L2_PAY_POLL_MS=500
-# SPARK_L2_STREAM_KEEPALIVE_MS=15000
+# TODO: add Spark
 
 # StrikeWallet
 STRIKE_API_ENDPOINT=https://api.strike.me/v1

docker/regtest/data/boltz/boltz.conf

@@ -26,10 +26,8 @@ password = "boltz"
   host = "0.0.0.0"
   port = 9005
 
-[swap]
-deferredClaimSymbols = ["BTC", "L-BTC"]
-
 [[pairs]]
+isLegacy = true
 base = "BTC"
 quote = "BTC"
 rate = 1
@@ -46,6 +44,7 @@ minSwapAmount = 50_000
   swapTaproot = 10080
 
 [[pairs]]
+isLegacy = true
 base = "L-BTC"
 quote = "BTC"
 fee = 0.25
@@ -84,7 +83,6 @@ maxZeroConfAmount = 0
   zmqpubrawblock = "tcp://bitcoind:29001"
   port = 18_443
   cookie = "/root/.bitcoin/regtest/.cookie"
-  feeFloor = 0.2
 
   wallet = "lnbits"
 
@@ -103,7 +101,6 @@ maxSwapAmount = 40_294_967
 minSwapAmount = 10_000
 maxZeroConfAmount = 40_294_967
 
-
   [liquid.chain]
   host = "elementsd"
   port = 18884

docker/regtest/docker-compose.yml

@@ -28,7 +28,7 @@ services:
       - lnd-2
       - boltz-postgres
     restart: always
-    image: boltz/boltz:v3.12.1
+    image: boltz/boltz:latest
     ports:
       - 9000:9000
     entrypoint: "sh -c 'sleep 30; /boltz-backend/bin/boltzd'"

docs/guide/funding-sources-table.md

@@ -50,7 +50,7 @@ Below is a side-by-side comparison of Lightning funding sources you can use with
 | **Blink**                      | Custodial                | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Third-party service; focuses on mobile integrations.                                       |
 | **ZBD**                        | Custodial                | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Gaming-focused payment platform.                                                           |
 | **Spark (CLN)**                | Self-custodial           | ❌                  | Higher                         | ✅                        | High              | Manual                   | Moderate          | High                   | Infrastructure cost and channel opening fees | High            | Web interface for CLN; requires Spark server setup.                                        |
-| **Spark (L2)**                 | Self-custodial           | ❌                  | Medium                         | ❌                        | High              | Automatic                | Easy              | Low                    | Minimal fees                                 | Medium          | Runs via Spark sidecar; seed-based self-custody.                                           |
+| **Spark (L2)**                 | Self-custodial           | ❌                  | Medium                         | ❌                        | Medium            | Automatic                | Easy              | Low                    | Minimal fees                                 | Medium          | Runs via Spark sidecar; seed-based self-custody.                                           |
 | **Cliche Wallet**              | Self-custodial           | ❌                  | Medium                         | ❌                        | Medium            | Manual                   | Moderate          | Moderate               | Minimal fees                                 | Medium          | Lightweight wallet; suitable for embedded systems.                                         |
 | **Strike**                     | Custodial                | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Third-party service; suitable for quick setups.                                            |
 | **LNPay**                      | Custodial                | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Third-party service; suitable for quick setups.                                            |
@@ -60,7 +60,7 @@ Below is a side-by-side comparison of Lightning funding sources you can use with
 
 ## Spark (L2)
 
-Spark L2 uses a local Node.js sidecar to expose an HTTP API that LNbits can use as a funding source. It is self-custodial and secured by a standard mnemonic seed. Sidecar repo `https://github.com/lnbits/spark_sidecar`.
+Spark L2 uses a local Node.js sidecar to expose an HTTP API that LNbits can use as a funding source. It is self-custodial and secured by a standard mnemonic seed. You can let LNbits run the sidecar internally or run your own instance (see `https://github.com/lnbits/spark_sidecar`).
 
 ### Notes for readers
 

docs/guide/wallets.md

@@ -41,8 +41,8 @@ A backend wallet is selected and configured entirely through LNbits environment
 | [CoreLightning](#corelightning)                 | [LND (gRPC)](#lnd-grpc)               | [Blink](#blink)                                   |
 | [CoreLightning REST](#corelightning-rest)       | [LNbits](#lnbits)                     | [Alby](#alby)                                     |
 | [Spark (Core Lightning)](#spark-core-lightning) | [LNPay](#lnpay)                       | [Boltz](#boltz)                                   |
-| [Spark L2](#spark-l2)                           | [ZBD](#zbd)                           | [Phoenixd](#phoenixd)                             |
-| [Cliche Wallet](#cliche-wallet)                 |                                       |                                                   |
+| [Spark (L2)](#spark-l2)                         |                                       |                                                   |
+| [Cliche Wallet](#cliche-wallet)                 | [ZBD](#zbd)                           | [Phoenixd](#phoenixd)                             |
 | [Breez SDK](#breez-sdk)                         | [Breez Liquid SDK](#breez-liquid-sdk) | [Nostr Wallet Connect](#nostr-wallet-connect-nwc) |
 | [Strike](#strike)                               | [Eclair (ACINQ)](#eclair-acinq)       | [LN.tips](#lntips)                                |
 | [Fake Wallet](#fake-wallet)                     |                                       |                                                   |
@@ -128,18 +128,32 @@ Old REST interface using [RTL c-lightning-REST](https://github.com/Ride-The-Ligh
 - `SPARK_URL`: `http://10.147.17.230:9737/rpc`
 - `SPARK_TOKEN`: `secret_access_key`
 
-## Spark L2
+## Spark (L2)
 
-Self-custodial funding source using the [Spark L2](https://docs.spark.money/start/overview) network. Requires a Node.js [sidecar](https://github.com/lnbits/spark_sidecar) that bridges lnbits talking to Spark. Works in addition with any Spark-compatible seed (Wallet of Satoshi, BuhoGO, BlitzWallet).
-If the sidecar is started with a `mnemonic` then that mnemonic will be used. Otherwhise if a mnemonic is set for the `Spark L2` LNbits funding source then that mnemonic will be used.
+Spark L2 is a self-custodial funding source that uses a small Node.js sidecar to talk to the Spark network and expose an HTTP API. You can let LNbits run the sidecar internally, or run it yourself and point LNbits at it.
 
-### Optional tuning
+**Required env vars**
 
-- `SPARK_L2_PAY_WAIT_MS`: `4000` _(payment timeout in ms)_
-- `SPARK_L2_PAY_POLL_MS`: `500` _(polling interval in ms)_
-- `SPARK_L2_STREAM_KEEPALIVE_MS`: `15000` _(SSE keepalive in ms)_
+- `LNBITS_BACKEND_WALLET_CLASS`: `SparkL2Wallet`
 
-### Example: run the sidecar
+**Internal sidecar (LNbits-managed)**
+
+- `SPARK_L2_INTERNAL_SIDECAR_VERSION`: `0.1.1`
+- `SPARK_L2_MNEMONIC`: `...` (optional; auto-generated if blank)
+- `SPARK_L2_NETWORK`: `MAINNET`
+
+Optional tuning:
+
+- `SPARK_L2_PAY_WAIT_MS`: `4000`
+- `SPARK_L2_PAY_POLL_MS`: `500`
+- `SPARK_L2_STREAM_KEEPALIVE_MS`: `15000`
+
+**External sidecar**
+
+- `SPARK_L2_EXTERNAL_ENDPOINT`: `http://127.0.0.1:8765`
+- `SPARK_L2_EXTERNAL_API_KEY`: `...` (if your sidecar requires auth)
+
+Example: run the sidecar manually (external mode)
 
 ```bash
 git clone https://github.com/lnbits/spark_sidecar.git
@@ -153,7 +167,7 @@ SPARK_PAY_WAIT_MS=20000 \
 node server.mjs
 ```
 
-For testing, you can generate a 12-word mnemonic at https://iancoleman.io/bip39/. Store it securely — it controls your funds. Then select Spark (L2) as the funding source in LNbits.
+For testing, you can generate a 12-word mnemonic at `https://iancoleman.io/bip39/`. Store it securely — it controls your funds. Then select **Spark (L2)** as the funding source in LNbits.
 
 ## LND (REST)
 

lnbits/core/views/callback_api.py

@@ -24,7 +24,7 @@ callback_router = APIRouter(prefix="/api/v1/callback", tags=["callback"])
 async def api_generic_webhook_handler(
     provider_name: str, request: Request
 ) -> SimpleStatus:
-    logger.info(f"Received callback from provider: '{provider_name}'.")
+
     if provider_name.lower() == "stripe":
         payload = await request.body()
         sig_header = request.headers.get("Stripe-Signature")
@@ -181,10 +181,8 @@ async def _get_stripe_subscription_payment_options(
 
 
 async def handle_paypal_event(event: dict):
-    event_id = event.get("id", "")
     event_type = event.get("event_type", "")
     resource = event.get("resource", {})
-    logger.info(f"Handling PayPal event: '{event_id}'. Type: '{event_type}'.")
 
     if event_type in ("CHECKOUT.ORDER.APPROVED", "PAYMENT.CAPTURE.COMPLETED"):
         payment_hash = _paypal_extract_payment_hash(resource)
@@ -198,17 +196,20 @@ async def handle_paypal_event(event: dict):
         await check_fiat_status(payment)
         return
 
-    if event_type in ("PAYMENT.SALE.COMPLETED"):
+    if event_type in (
+        "PAYMENT.SALE.COMPLETED",
+        "BILLING.SUBSCRIPTION.PAYMENT.SUCCEEDED",
+    ):
         await _handle_paypal_subscription_payment(resource)
         return
 
-    logger.warning(f"Unhandled PayPal event type: '{event_type}'.")
+    logger.info(f"Unhandled PayPal event type: '{event_type}'.")
 
 
 async def _handle_paypal_subscription_payment(resource: dict):
     amount_info = resource.get("amount") or {}
-    currency = (amount_info.get("currency") or "").upper()
-    total = amount_info.get("total")
+    currency = (amount_info.get("currency_code") or "").upper()
+    total = amount_info.get("value")
     if not currency or total is None:
         raise ValueError("PayPal subscription event missing amount.")
 
@@ -216,14 +217,18 @@ async def _handle_paypal_subscription_payment(resource: dict):
     if not custom_id:
         raise ValueError("PayPal subscription event missing custom metadata.")
 
-    payment_options = _deserialize_paypal_metadata(custom_id)
+    try:
+        metadata = json.loads(custom_id)
+    except json.JSONDecodeError:
+        metadata = {}
+
+    payment_options = FiatSubscriptionPaymentOptions(**metadata)
     if not payment_options.wallet_id:
         raise ValueError("PayPal subscription event missing wallet_id.")
 
     memo = payment_options.memo or ""
     extra = {
         **(payment_options.extra or {}),
-        "subscription_request_id": resource.get("billing_agreement_id"),
         "fiat_method": "subscription",
         "tag": payment_options.tag,
         "subscription": {
@@ -254,29 +259,3 @@ def _paypal_extract_payment_hash(resource: dict) -> str | None:
         if pu.get("custom_id"):
             return pu.get("custom_id")
     return None
-
-
-def _deserialize_paypal_metadata(custom_id: str) -> FiatSubscriptionPaymentOptions:
-    try:
-        meta = json.loads(custom_id)
-        wallet_id = meta[0] if len(meta) > 0 else None
-        tag = meta[1] if len(meta) > 1 else None
-        subscription_request_id = meta[2] if len(meta) > 2 else None
-        extra_link = meta[3] if len(meta) > 3 else None
-        memo = meta[4] if len(meta) > 4 else None
-
-        extra = {
-            "link": extra_link,
-            "subscription_request_id": subscription_request_id,
-        }
-
-        return FiatSubscriptionPaymentOptions(
-            wallet_id=wallet_id,
-            tag=tag,
-            subscription_request_id=subscription_request_id,
-            extra=extra,
-            memo=memo,
-        )
-    except (json.JSONDecodeError, IndexError) as e:
-        logger.warning(f"Failed to deserialize PayPal metadata: {e}")
-        return FiatSubscriptionPaymentOptions()

lnbits/core/views/fiat_api.py

@@ -1,7 +1,6 @@
 from http import HTTPStatus
 
 from fastapi import APIRouter, Depends, HTTPException
-from loguru import logger
 
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.core.models.wallets import WalletTypeInfo
@@ -31,11 +30,6 @@ async def create_subscription(
     data: CreateFiatSubscription,
     key_type: WalletTypeInfo = Depends(require_admin_key),
 ) -> FiatSubscriptionResponse:
-    logger.debug(
-        f"Creating subscription with provider '{provider}. '"
-        f"Subscription ID '{data.subscription_id}'."
-    )
-
     fiat_provider = await get_fiat_provider(provider)
     if not fiat_provider:
         raise HTTPException(404, "Fiat provider not found")
@@ -53,12 +47,6 @@ async def create_subscription(
     subscription_response = await fiat_provider.create_subscription(
         data.subscription_id, data.quantity, data.payment_options
     )
-    if subscription_response.error_message:
-        logger.warning(
-            f"Failed to create subscription with provider '{provider}': "
-            f"{subscription_response.error_message}"
-        )
-
     return subscription_response
 
 

lnbits/fiat/paypal.py

@@ -2,7 +2,7 @@ import asyncio
 import json
 import time
 from collections.abc import AsyncGenerator
-from typing import Any, Literal
+from typing import Any
 
 import httpx
 from loguru import logger
@@ -24,8 +24,6 @@ from .base import (
     FiatSubscriptionResponse,
 )
 
-FiatMethod = Literal["checkout", "subscription"]
-
 
 class PayPalCheckoutOptions(BaseModel):
     class Config:
@@ -36,21 +34,11 @@ class PayPalCheckoutOptions(BaseModel):
     metadata: dict[str, Any] = Field(default_factory=dict)
 
 
-class PayPalSubscriptionOptions(BaseModel):
-    class Config:
-        extra = "ignore"
-
-    checking_id: str | None = None
-    payment_request: str | None = None
-
-
 class PayPalCreateInvoiceOptions(BaseModel):
     class Config:
         extra = "ignore"
 
-    fiat_method: FiatMethod = "checkout"
     checkout: PayPalCheckoutOptions | None = None
-    subscription: PayPalSubscriptionOptions | None = None
 
 
 class PayPalWallet(FiatProvider):
@@ -108,14 +96,6 @@ class PayPalWallet(FiatProvider):
         opts = self._parse_create_opts(extra or {})
         if opts is None:
             return FiatInvoiceResponse(ok=False, error_message="Invalid PayPal options")
-        if opts.fiat_method == "subscription":
-            term = opts.subscription or PayPalSubscriptionOptions()
-            checking_id = term.checking_id or urlsafe_short_hash()
-            return FiatInvoiceResponse(
-                ok=True,
-                checking_id=f"subscription_{checking_id}",
-                payment_request=term.payment_request or "",
-            )
 
         try:
             await self._ensure_access_token()
@@ -191,7 +171,6 @@ class PayPalWallet(FiatProvider):
             or "https://lnbits.com"
         )
 
-        logger.debug(f"Creating PayPal subscription with ID '{subscription_id}'")
         if not payment_options.subscription_request_id:
             payment_options.subscription_request_id = urlsafe_short_hash()
         payment_options.extra = payment_options.extra or {}
@@ -203,6 +182,7 @@ class PayPalWallet(FiatProvider):
             await self._ensure_access_token()
             payload = {
                 "plan_id": subscription_id,
+                "quantity": str(quantity),
                 "custom_id": self._serialize_metadata(payment_options),
                 "application_context": {
                     "return_url": success_url,
@@ -225,7 +205,7 @@ class PayPalWallet(FiatProvider):
             return FiatSubscriptionResponse(
                 ok=True,
                 checkout_session_url=approval_url,
-                subscription_request_id=data.get("id"),
+                subscription_request_id=payment_options.subscription_request_id,
             )
         except Exception as exc:
             logger.warning(exc)
@@ -239,10 +219,6 @@ class PayPalWallet(FiatProvider):
         correlation_id: str,
         **kwargs,
     ) -> FiatSubscriptionResponse:
-        logger.debug(
-            f"Cancelling PayPal subscription '{subscription_id}'. "
-            f"Correlation ID '{correlation_id}'."
-        )
         try:
             await self._ensure_access_token()
             r = await self.client.post(
@@ -264,20 +240,12 @@ class PayPalWallet(FiatProvider):
     async def get_invoice_status(self, checking_id: str) -> FiatPaymentStatus:
         try:
             await self._ensure_access_token()
-            paypal_id = self._normalize_paypal_id(checking_id)
-            if paypal_id.startswith("subscription_"):
-                capture_id = paypal_id.replace("subscription_", "", 1)
-                r = await self.client.get(
-                    f"v2/payments/captures/{capture_id}", headers=self._auth_headers()
-                )
-                r.raise_for_status()
-                return self._status_from_capture(r.json())
-            else:
-                r = await self.client.get(
-                    f"/v2/checkout/orders/{paypal_id}", headers=self._auth_headers()
-                )
-                r.raise_for_status()
-                return self._status_from_order(r.json())
+            order_id = self._normalize_paypal_id(checking_id)
+            r = await self.client.get(
+                f"/v2/checkout/orders/{order_id}", headers=self._auth_headers()
+            )
+            r.raise_for_status()
+            return self._status_from_order(r.json())
         except Exception as exc:
             logger.debug(f"Error getting PayPal order status: {exc}")
             return FiatPaymentPendingStatus()
@@ -302,14 +270,6 @@ class PayPalWallet(FiatProvider):
             return FiatPaymentFailedStatus()
         return FiatPaymentPendingStatus()
 
-    def _status_from_capture(self, order: dict[str, Any]) -> FiatPaymentStatus:
-        status = (order.get("status") or "").upper()
-        if status in ["COMPLETED"]:
-            return FiatPaymentSuccessStatus()
-        if status in ["DECLINED", "FAILED", "CANCELLED", "CANCELED"]:
-            return FiatPaymentFailedStatus()
-        return FiatPaymentPendingStatus()
-
     def _normalize_paypal_id(self, checking_id: str) -> str:
         return (
             checking_id.replace("fiat_paypal_", "", 1)
@@ -320,20 +280,15 @@ class PayPalWallet(FiatProvider):
     def _serialize_metadata(
         self, payment_options: FiatSubscriptionPaymentOptions
     ) -> str:
-        meta = [
-            payment_options.wallet_id,
-            payment_options.tag,
-            payment_options.subscription_request_id,
-        ]
-        if payment_options.extra:
-            meta.append(payment_options.extra.get("link", None))
-
-        # Keep custom_id within PayPal's 127-char limit
-        memo_limit = 120 - len(json.dumps(meta))
-        if memo_limit > 0 and payment_options.memo:
-            meta.append(payment_options.memo[:memo_limit])
-
-        return json.dumps(meta)
+        md = {
+            "wallet_id": payment_options.wallet_id,
+            "memo": payment_options.memo,
+            "extra": payment_options.extra,
+            "tag": payment_options.tag,
+            "subscription_request_id": payment_options.subscription_request_id,
+        }
+        raw = json.dumps(md)
+        return raw[:127]  # PayPal custom_id limit
 
     def _parse_create_opts(
         self, raw_opts: dict[str, Any]

lnbits/settings.py

@@ -292,13 +292,13 @@ class ThemesSettings(LNbitsSettings):
     lnbits_qr_logo: str = Field(default="/static/images/favicon_qr_logo.png")
     lnbits_apple_touch_icon: str | None = Field(default=None)
     lnbits_default_reaction: str = Field(default="confettiBothSides")
-    lnbits_default_theme: str = Field(default="bitcoin")
+    lnbits_default_theme: str = Field(default="salvador")
     lnbits_default_border: str = Field(default="hard-border")
     lnbits_default_gradient: bool = Field(default=True)
     lnbits_default_bgimage: str | None = Field(default=None)
     lnbits_default_dark: bool = Field(default=True)
-    lnbits_default_card_rounded: bool = Field(default=True)
-    lnbits_default_card_gradient: bool = Field(default=True)
+    lnbits_default_card_rounded: bool = Field(default=False)
+    lnbits_default_card_gradient: bool = Field(default=False)
     lnbits_default_card_shadow: bool = Field(default=False)
 
 
@@ -610,7 +610,6 @@ class SparkL2FundingSource(LNbitsSettings):
     spark_l2_network: str = Field(default="MAINNET")
     spark_l2_external_endpoint: str | None = Field(default="http://localhost:8765")
     spark_l2_external_api_key: str | None = Field(default=None)
-    spark_l2_mnemonic: str | None = Field(default=None)
     spark_l2_pay_wait_ms: int = Field(default=4000, ge=0)
     spark_l2_pay_poll_ms: int = Field(default=500, ge=0)
     spark_l2_stream_keepalive_ms: int = Field(default=15000, ge=0)

lnbits/static/js/components/admin/lnbits-admin-funding-sources.js

@@ -234,12 +234,7 @@ window.app.component('lnbits-admin-funding-sources', {
           {
             spark_l2_external_endpoint: {
               label: 'External Sidecar Endpoint',
-              hint: 'Make sure to also specify the API key if your sidecar requires authentication.',
-              value: ''
-            },
-            spark_l2_mnemonic: {
-              label: 'External Sidecar Mnemonic',
-              hint: 'Mnemonic for the Spark wallet on the external sidecar. Required if the side car does not have its own mnemonic.',
+              hint: 'If specified then this endpoint will be used instead of the internal sidecar. Make sure to also specify the API key if your sidecar requires authentication.',
               value: ''
             },
             spark_l2_external_api_key: {

lnbits/static/js/components/lnbits-manage-wallet-list.js

@@ -17,13 +17,6 @@ window.app.component('lnbits-manage-wallet-list', {
       } else {
         this.activeWalletId = null
       }
-    },
-    'g.user.wallets': {
-      handler() {
-        this.paymentEvents()
-      },
-      deep: true,
-      immediate: true
     }
   },
   created() {

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

@@ -43,7 +43,52 @@ window.app.component('lnbits-qrcode', {
       nfcSupported: typeof NDEFReader != 'undefined'
     }
   },
+  computed: {
+    qrValue() {
+      return this.normalizeQrValue(this.value)
+    }
+  },
   methods: {
+    normalizeQrValue(value) {
+      if (typeof value !== 'string' || value.length === 0) {
+        return value
+      }
+
+      const lower = value.toLowerCase()
+      const upper = value.toUpperCase()
+      const isMixedCase = value !== lower && value !== upper
+      if (isMixedCase) {
+        return value
+      }
+
+      const prefix = 'lightning:'
+      if (lower.startsWith(prefix)) {
+        const prefixOriginal = value.slice(0, prefix.length)
+        const rest = value.slice(prefix.length)
+        const normalizedRest = this.normalizeBech32IfLower(rest)
+        if (normalizedRest !== rest) {
+          return prefixOriginal.toUpperCase() + normalizedRest
+        }
+        return value
+      }
+
+      return this.normalizeBech32IfLower(value)
+    },
+    normalizeBech32IfLower(value) {
+      if (typeof value !== 'string' || value.length === 0) {
+        return value
+      }
+
+      const lower = value.toLowerCase()
+      if (value !== lower) {
+        return value
+      }
+
+      // Bech32 strings are case-insensitive, but must be all upper or all lower.
+      // Uppercasing enables QR alphanumeric mode and reduces QR size for LN strings.
+      const bech32Like = /^ln[0-9a-z]*1[0-9ac-hj-np-z]+$/
+      return bech32Like.test(value) ? value.toUpperCase() : value
+    },
     printQrCode() {
       const svg = this.$refs.qrCode.$el.outerHTML
       const printWindow = window.open('', '_blank')

lnbits/static/js/utils.js

@@ -131,22 +131,6 @@ window._lnbitsUtils = {
       currency: currency || 'sat'
     }).format(value)
   },
-  getCurrencySymbol(currency) {
-    const code = (currency || '').toUpperCase()
-    if (code === 'BTC' || code === 'XBT' || code === 'SAT' || code === 'SATS') {
-      return '₿'
-    }
-    try {
-      const parts = new Intl.NumberFormat(window.i18n.global.locale, {
-        style: 'currency',
-        currency: code
-      }).formatToParts(0)
-      const symbolPart = parts.find(part => part.type === 'currency')
-      return symbolPart?.value || code || '¤'
-    } catch (e) {
-      return code || '¤'
-    }
-  },
   formatSat(value) {
     return new Intl.NumberFormat(window.i18n.global.locale).format(value)
   },

lnbits/templates/components/admin/fiat_providers.vue

@@ -408,6 +408,7 @@
                   <li><code>CHECKOUT.ORDER.APPROVED</code></li>
                   <li><code>PAYMENT.CAPTURE.COMPLETED</code></li>
                   <li><code>PAYMENT.SALE.COMPLETED</code></li>
+                  <li><code>BILLING.SUBSCRIPTION.PAYMENT.SUCCEEDED</code></li>
                 </ul>
               </q-card-section>
             </q-expansion-item>

lnbits/templates/components/lnbits-header.vue

@@ -27,9 +27,12 @@
       ></q-btn>
       <q-toolbar-title>
         <q-btn flat no-caps dense class="q-mr-sm" size="lg" type="a" href="/">
-          <q-avatar v-if="g.settings.customLogo" height="30px">
-            <img alt="Logo" :src="g.settings.customLogo" />
-          </q-avatar>
+          <q-img
+            v-if="customLogo"
+            height="30px"
+            alt="Logo"
+            :src="customLogo"
+          ></q-img>
           <span v-else-if="g.settings.siteTitle == 'LNbits'"
             ><strong>LN</strong>bits</span
           >

lnbits/templates/components/lnbits-qrcode.vue

@@ -12,7 +12,7 @@
       >
         <qrcode-vue
           ref="qrCode"
-          :value="value"
+          :value="qrValue"
           :margin="margin"
           :size="size"
           level="Q"

lnbits/templates/pages/wallet.vue

@@ -204,7 +204,7 @@
       </q-card>
     </div>
     <div
-      v-show="!g.mobileSimple || !$q.screen.lt.md"
+      v-if="!g.mobileSimple || !$q.screen.lt.md"
       class="col-12 col-md-5 q-gutter-y-md"
     >
       <lnbits-wallet-extra

lnbits/wallets/sparkl2.py

@@ -8,8 +8,6 @@ from typing import Any, cast
 
 import httpx
 from bolt11 import decode as bolt11_decode
-from coincurve.keys import PrivateKey
-from embit.bip39 import mnemonic_from_bytes, mnemonic_is_valid
 from loguru import logger
 
 from lnbits.helpers import normalize_endpoint
@@ -81,11 +79,6 @@ class SparkL2Wallet(Wallet):
     async def status(self) -> StatusResponse:
         try:
             res = await self._request("POST", "/v1/balance")
-            status = res.get("status")
-            if status == "missing_mnemonic":
-                await self._check_sidecar_mnemonic()
-                return StatusResponse("Spark sidecar mnemonic not set", 0)
-
             balance_msat = res.get("balance_msat")
             if balance_msat is not None:
                 return StatusResponse(None, int(balance_msat))
@@ -244,7 +237,7 @@ class SparkL2Wallet(Wallet):
     ) -> dict[str, Any]:
         error_message = None
         try:
-            r = await self.client.request(method, path, json=json_data, timeout=30)
+            r = await self.client.request(method, path, json=json_data)
             r.raise_for_status()
             j = r.json()
         except (httpx.RequestError, httpx.HTTPStatusError, json.JSONDecodeError) as exc:
@@ -326,30 +319,3 @@ class SparkL2Wallet(Wallet):
         if mapped.failed:
             return False
         return None
-
-    async def _check_sidecar_mnemonic(self):
-        if settings.spark_l2_mnemonic:
-            valid = mnemonic_is_valid(settings.spark_l2_mnemonic)
-            if not valid:
-                logger.warning("SPARK_L2_MNEMONIC is set but invalid. Please recheck!")
-                return
-            await self._set_sidecar_mnemonic(settings.spark_l2_mnemonic)
-            return
-
-        logger.info("SPARK_L2_MNEMONIC is not set, one will be generated for you.")
-        mnemonic = mnemonic_from_bytes(PrivateKey().secret)
-        await self._set_sidecar_mnemonic(mnemonic)
-
-    async def _set_sidecar_mnemonic(self, mnemonic: str):
-        logger.info("Checking 'SPARK_L2_MNEMONIC' on the Spark sidecar.")
-        payload = {"mnemonic": mnemonic}
-        resp = await self._request("POST", "/v1/mnemonic", payload)
-        status = resp.get("status")
-        logger.info(f"Spark sidecar mnemonic status: {status}")
-        if status == "set":
-            logger.info("Updating 'SPARK_L2_MNEMONIC' mnemonic settings.")
-            from lnbits.core.crud.settings import set_settings_field
-
-            await set_settings_field("spark_l2_mnemonic", mnemonic)
-        else:
-            logger.info("Nothing to do for 'SPARK_L2_MNEMONIC' on the Spark sidecar.")

package-lock.json

@@ -1386,9 +1386,9 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lnbits"
-version = "1.5.1-rc1"
+version = "1.5.0-rc1"
 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" }]

tests/api/test_users.py

@@ -708,7 +708,7 @@ async def test_user_activation(
         f"/users/api/v1/user/{user_id}/activate",
         headers={"Authorization": f"Bearer {superuser_token}"},
     )
-
+    print("### response", response.text)
     assert response.status_code == 200
     assert response.json().get("message") == "User activated."
 

uv.lock

@@ -1247,7 +1247,7 @@ wheels = [
 
 [[package]]
 name = "lnbits"
-version = "1.5.1rc1"
+version = "1.5.0rc1"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },