defaults

Users should be able to have a seed created or replace with their own

.dockerignore

@@ -23,10 +23,3 @@ mypy.ini
 package-lock.json
 package.json
 pytest.ini
-
-.mypy_cache
-.github
-.pytest_cache
-.vscode
-bin
-dist

.env.example

@@ -18,6 +18,7 @@ ENABLE_LOG_TO_FILE=true
 # https://loguru.readthedocs.io/en/stable/api/logger.html#file
 LOG_ROTATION="100 MB"
 LOG_RETENTION="3 months"
+    
 # for database cleanup commands
 # CLEANUP_WALLETS_DAYS=90
 
@@ -55,7 +56,7 @@ LNBITS_EXTENSIONS_DEFAULT_INSTALL="tpos"
 # LNBITS_EXT_GITHUB_TOKEN=github_pat_xxxxxxxxxxxxxxxxxx
 
 # which fundingsources are allowed in the admin ui
-# LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, BlinkWallet, AlbyWallet, ZBDWallet, PhoenixdWallet, OpenNodeWallet, NWCWallet, BreezSdkWallet, BoltzWallet, StrikeWallet, CLNRestWallet, SparkWallet, LightsparkSparkWallet"
+# LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, BlinkWallet, AlbyWallet, ZBDWallet, PhoenixdWallet, OpenNodeWallet, NWCWallet, BreezSdkWallet, BoltzWallet, StrikeWallet, CLNRestWallet"
 
 # uvicorn variable, allow https behind a proxy
 # IMPORTANT: this also needs the webserver to be configured to forward the headers
@@ -186,8 +187,7 @@ BOLTZ_CLIENT_ENDPOINT=127.0.0.1:9002
 BOLTZ_CLIENT_MACAROON="/home/bob/.boltz/macaroons/admin.macaroon"
 # HEXSTRING instead of path also possible
 BOLTZ_CLIENT_CERT="/home/bob/.boltz/tls.cert"
-
+BOLTZ_CLIENT_WALLET="lnbits"
-# TODO: add Spark
 
 # StrikeWallet
 STRIKE_API_ENDPOINT=https://api.strike.me/v1
@@ -333,3 +333,4 @@ LNBITS_RESERVE_FEE_PERCENT=1.0
 ######################################
 ###### Logging and Development #######
 ######################################
+

.github/workflows/ci.yml

@@ -75,14 +75,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10"]
-        backend-wallet-class:
+        backend-wallet-class: ["LndRestWallet", "LndWallet", "CoreLightningWallet", "CoreLightningRestWallet", "LNbitsWallet", "EclairWallet"]
-          - BoltzWallet
-          - LndRestWallet
-          - LndWallet
-          - CoreLightningWallet
-          - CoreLightningRestWallet
-          - LNbitsWallet
-          - EclairWallet
     with:
       custom-pytest: "uv run pytest tests/regtest"
       python-version: ${{ matrix.python-version }}

.github/workflows/docker.yml

@@ -62,4 +62,3 @@ jobs:
             platforms: linux/amd64,linux/arm64
             cache-from: type=local,src=/tmp/.buildx-cache
             cache-to: type=local,dest=/tmp/.buildx-cache
-            build-args: LNBITS_TAG=${{ inputs.tag }}

.github/workflows/regtest.yml

@@ -40,8 +40,8 @@ jobs:
         run: |
           git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
           cd docker
-          chmod +x ./start-regtest
+          chmod +x ./tests
-          ./start-regtest
+          ./tests
           sudo chmod -R a+rwx .
 
       - name: Run pytest
@@ -63,8 +63,6 @@ jobs:
           LNBITS_ENDPOINT: http://localhost:5001
           LNBITS_KEY: "d08a3313322a4514af75d488bcc27eee"
           ECLAIR_URL: http://127.0.0.1:8082
-          BOLTZ_CLIENT_ENDPOINT: 127.0.0.1:9002
-          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
           ECLAIR_PASS: lnbits

.github/workflows/release-rc.yml

@@ -10,29 +10,7 @@ permissions:
 
 jobs:
 
-  release:
-    runs-on: ubuntu-24.04
-    outputs:
-      upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Create github pre-release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref_name }}
-        run: |
-          gh release create "$tag" --prerelease --generate-notes --draft
-      - id: get_upload_url
-        name: Get upload url of Github release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref_name }}
-        run: |
-          upload_url=$(gh release view "$tag" --json uploadUrl -q ".uploadUrl")
-          echo "upload_url=$upload_url" >> "$GITHUB_OUTPUT"
-
   docker:
-    if: github.repository == 'lnbits/lnbits'
     uses: ./.github/workflows/docker.yml
     with:
       tag: ${{ github.ref_name }}
@@ -41,7 +19,6 @@ jobs:
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
   pypi:
-    if: github.repository == 'lnbits/lnbits'
     runs-on: ubuntu-24.04
     steps:
       - name: Install dependencies for building secp256k1
@@ -53,10 +30,3 @@ jobs:
         uses: JRubics/poetry-publish@v1.15
         with:
           pypi_token: ${{ secrets.PYPI_API_KEY }}
-
-  appimage:
-    needs: [ release ]
-    uses: ./.github/workflows/appimage.yml
-    with:
-      tag_name: ${{ github.ref_name }}
-      upload_url: ${{ needs.release.outputs.upload_url }}

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
   release:
     runs-on: ubuntu-24.04
     outputs:
-      upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
       - uses: actions/checkout@v4
       - name: Create github release
@@ -23,13 +23,7 @@ jobs:
           tag: ${{ github.ref_name }}
         run: |
           gh release create "$tag" --generate-notes --draft
-      - id: get_upload_url
+          upload_url=$(gh release view "$tag" --repo "${{ github.repository }}" --json uploadUrl -q ".uploadUrl")
-        name: Get upload url of Github release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref_name }}
-        run: |
-          upload_url=$(gh release view "$tag" --json uploadUrl -q ".uploadUrl")
           echo "upload_url=$upload_url" >> "$GITHUB_OUTPUT"
 
   docker:

Dockerfile.boltz

@@ -1,7 +1,6 @@
-ARG LNBITS_TAG=latest
-
 FROM boltz/boltz-client:latest AS boltz
-FROM lnbits/lnbits:${LNBITS_TAG}
+
+FROM lnbits/lnbits:latest
 
 COPY --from=boltz /bin/boltzd /bin/boltzcli /usr/local/bin/
 RUN ls -l /usr/local/bin/boltzd

docs/guide/funding-sources-table.md

@@ -57,7 +57,7 @@ Below is a side-by-side comparison of Lightning funding sources you can use with
 | **LN.tips**                    | Custodial/Self-Custodial | Depends on provider | Medium                         | ❌                        | Low               | Provider-managed         | Moderate          | Low                    | Transaction fees may apply                   | Medium          | Simple hosted service; use LN.tips API as your backend.                                    |
 | **Fake Wallet**                | Testing (simulated)      | ❌                  | Low                            | ❌                        | N/A               | N/A                      | Easy              | Low                    | None (test only)                             | N/A             | For testing only; mints accounting units in LNbits (no real sats, unit name configurable). |
 
-## TODO: add Spark
+---
 
 ### Notes for readers
 

docs/guide/wallets.md

@@ -338,8 +338,6 @@ Configure in the admin UI or via env vars:
 
 <a id="strike"></a>
 
-## TODO: add Spark
-
 ## Strike (alpha)
 
 Custodial provider integrated via **Strike OAuth Connect** (OAuth 2.0 / OIDC). Authenticate a Strike user in your app, then call Strike APIs on the user’s behalf once scopes are granted. Requires a Strike business account, registered OAuth client, minimal scopes, and login/logout redirect URLs.

lnbits/core/crud/payments.py

@@ -1,4 +1,3 @@
-from datetime import datetime, timezone
 from time import time
 from typing import Any
 
@@ -305,16 +304,8 @@ async def update_payment_checking_id(
     checking_id: str, new_checking_id: str, conn: Connection | None = None
 ) -> None:
     await (conn or db).execute(
-        f"""
+        "UPDATE apipayments SET checking_id = :new_id WHERE checking_id = :old_id",
-            UPDATE apipayments
+        {"new_id": new_checking_id, "old_id": checking_id},
-            SET checking_id = :new_id, updated_at = {db.timestamp_placeholder('now')}
-            WHERE checking_id = :old_id
-        """,  # noqa: S608
-        {
-            "new_id": new_checking_id,
-            "old_id": checking_id,
-            "now": int(time()),
-        },
     )
 
 
@@ -323,7 +314,6 @@ async def update_payment(
     new_checking_id: str | None = None,
     conn: Connection | None = None,
 ) -> None:
-    payment.updated_at = datetime.now(timezone.utc)
     await (conn or db).update(
         "apipayments", payment, "WHERE checking_id = :checking_id"
     )

lnbits/core/crud/wallets.py

@@ -45,13 +45,17 @@ async def update_wallet(
 
 
 async def delete_wallet(
+    *,
     user_id: str,
     wallet_id: str,
     deleted: bool = True,
     conn: Connection | None = None,
 ) -> None:
-    _clear_wallet_cache(wallet_id)
     now = int(time())
+    cached_wallet: BaseWallet | None = cache.pop(f"auth:wallet:{wallet_id}")
+    if cached_wallet:
+        cache.pop(f"auth:x-api-key:{cached_wallet.adminkey}")
+        cache.pop(f"auth:x-api-key:{cached_wallet.inkey}")
 
     await (conn or db).execute(
         # Timestamp placeholder is safe from SQL injection (not user input)
@@ -65,7 +69,6 @@ async def delete_wallet(
 
 
 async def force_delete_wallet(wallet_id: str, conn: Connection | None = None) -> None:
-    _clear_wallet_cache(wallet_id)
     await (conn or db).execute(
         "DELETE FROM wallets WHERE id = :wallet",
         {"wallet": wallet_id},
@@ -75,7 +78,6 @@ async def force_delete_wallet(wallet_id: str, conn: Connection | None = None) ->
 async def delete_wallet_by_id(
     wallet_id: str, conn: Connection | None = None
 ) -> int | None:
-    _clear_wallet_cache(wallet_id)
     now = int(time())
     result = await (conn or db).execute(
         # Timestamp placeholder is safe from SQL injection (not user input)
@@ -292,10 +294,3 @@ async def get_total_balance(conn: Connection | None = None):
     result = await (conn or db).execute("SELECT SUM(balance) as balance FROM balances")
     row = result.mappings().first()
     return row.get("balance", 0) or 0
-
-
-def _clear_wallet_cache(wallet_id):
-    cached_wallet: BaseWallet | None = cache.pop(f"auth:wallet:{wallet_id}")
-    if cached_wallet:
-        cache.pop(f"auth:x-api-key:{cached_wallet.adminkey}")
-        cache.pop(f"auth:x-api-key:{cached_wallet.inkey}")

lnbits/core/models/extensions.py

@@ -12,7 +12,7 @@ from typing import Any
 
 import httpx
 from loguru import logger
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 
 from lnbits.helpers import (
     download_url,
@@ -269,30 +269,10 @@ class ExtensionRelease(BaseModel):
     async def get_github_releases(cls, org: str, repo: str) -> list[ExtensionRelease]:
         try:
             github_releases = await cls.fetch_github_releases(org, repo)
-            extension_releases = [
+            return [
                 ExtensionRelease.from_github_release(f"{org}/{repo}", r)
                 for r in github_releases
             ]
-            for release in extension_releases:
-                if not release.details_link:
-                    continue
-                try:
-                    config = await ExtensionConfig.fetch_github_release_config(
-                        org, repo, release.version
-                    )
-                except Exception as e:
-                    logger.warning(e)
-                    config = None
-                if not config:
-                    continue
-
-                release.min_lnbits_version = config.min_lnbits_version
-                release.max_lnbits_version = config.max_lnbits_version
-                release.is_version_compatible = config.is_version_compatible()
-
-                release.icon = icon_to_github_url(f"{org}/{repo}", config.tile)
-
-            return extension_releases
         except Exception as e:
             logger.warning(e)
             return []
@@ -797,32 +777,6 @@ class ExtensionDetailsRequest(BaseModel):
     version: str
 
 
-class ExtensionReviewsStatus(BaseModel):
-    tag: str
-    avg_rating: float
-    review_count: int
-
-
-class CreateExtensionReview(BaseModel):
-    tag: str
-    name: str | None = Field(None)
-    rating: int = Field(..., ge=0, le=1000)
-    comment: str | None = Field(None)
-
-
-class ExtensionReviewPaymentRequest(BaseModel):
-    payment_hash: str
-    payment_request: str
-
-
-class ExtensionReview(BaseModel):
-    id: str
-    name: str | None = Field(default=None)
-    tag: str | None = Field(default=None)
-    rating: int = Field(default=0, ge=0, le=1000)
-    comment: str | None = Field(default=None)
-
-
 async def github_api_get(url: str, error_msg: str | None) -> Any:
     headers = {"User-Agent": settings.user_agent}
     if settings.lnbits_ext_github_token:

lnbits/core/models/extensions_builder.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
 import json
-import random
-import uuid
 from datetime import datetime, timedelta, timezone
 from typing import Any, Literal
 
@@ -57,29 +55,6 @@ class DataField(BaseModel):
             field_type += ' = "sat"'
         return f"{field_name}: {field_type}"
 
-    def field_to_random_value(self) -> str:
-        field_name = camel_to_snake(self.name)
-        field_value: Any = f'"{self.type}"'
-        if self.type == "json":
-            field_value = '"{}"'
-        elif self.type == "wallet":
-            field_value = f'"{uuid.uuid4()}"'
-        elif self.type == "currency":
-            field_value = '"sat"'
-        elif self.type in ["str", "text"]:
-            field_value = f'"{field_name}_{urlsafe_short_hash()}"'
-        elif self.type == "int":
-            field_value = random.randint(1, 100)  # noqa: S311
-        elif self.type == "float":
-            field_value = random.uniform(1.0, 100.0)  # noqa: S311
-        elif self.type == "bool":
-            field_value = random.choice([True, False])  # noqa: S311
-        elif self.type == "datetime":
-            random_days = random.randint(-30, 30)  # noqa: S311
-            random_date = datetime.now(timezone.utc) - timedelta(days=random_days)
-            field_value = f"""datetime.fromisoformat("{random_date.isoformat()}")"""
-        return f"{field_name} = {field_value},"
-
     def field_to_js(self) -> str:
         field_name = camel_to_snake(self.name)
         default_value = "null"

lnbits/core/services/assets.py

@@ -3,7 +3,6 @@ import io
 from uuid import uuid4
 
 from fastapi import UploadFile
-from loguru import logger
 from PIL import Image
 
 from lnbits.core.crud.assets import create_asset, get_user_assets_count
@@ -17,7 +16,7 @@ async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) ->
     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):
+    if user_id not in settings.lnbits_assets_no_limit_users:
         user_assets_count = await get_user_assets_count(user_id)
         if user_assets_count >= settings.lnbits_max_assets_per_user:
             raise ValueError(
@@ -30,7 +29,17 @@ 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."
         )
 
-    thumb_buffer = thumbnail_from_bytes(contents)
+    image = Image.open(io.BytesIO(contents))
+
+    thumbnail_width = min(256, settings.lnbits_asset_thumbnail_width)
+    thumbnail_height = min(256, settings.lnbits_asset_thumbnail_height)
+    image.thumbnail((thumbnail_width, thumbnail_height))
+
+    # Save thumbnail to an in-memory buffer
+    thumb_buffer = io.BytesIO()
+    thumbnail_format = settings.lnbits_asset_thumbnail_format or "PNG"
+    image.save(thumb_buffer, format=thumbnail_format)
+    thumb_buffer.seek(0)
 
     asset = Asset(
         id=uuid4().hex,
@@ -39,32 +48,9 @@ async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) ->
         is_public=is_public,
         name=file.filename or "unnamed",
         size_bytes=len(contents),
-        thumbnail_base64=(
+        thumbnail_base64=base64.b64encode(thumb_buffer.getvalue()).decode("utf-8"),
-            base64.b64encode(thumb_buffer.getvalue()).decode("utf-8")
-            if thumb_buffer
-            else None
-        ),
         data=contents,
     )
 
     await create_asset(asset)
     return asset
-
-
-def thumbnail_from_bytes(contents: bytes) -> io.BytesIO | None:
-    try:
-        image = Image.open(io.BytesIO(contents))
-
-        thumbnail_width = min(256, settings.lnbits_asset_thumbnail_width)
-        thumbnail_height = min(256, settings.lnbits_asset_thumbnail_height)
-        image.thumbnail((thumbnail_width, thumbnail_height))
-
-        # Save thumbnail to an in-memory buffer
-        thumb_buffer = io.BytesIO()
-        thumbnail_format = settings.lnbits_asset_thumbnail_format or "PNG"
-        image.save(thumb_buffer, format=thumbnail_format)
-        thumb_buffer.seek(0)
-        return thumb_buffer
-    except Exception as exc:
-        logger.warning(f"Failed to create thumbnail: {exc}")
-        return None

lnbits/core/services/extensions_builder.py

@@ -20,7 +20,6 @@ from lnbits.helpers import (
     camel_to_words,
     download_url,
     lowercase_first_letter,
-    snake_to_camel,
 )
 from lnbits.settings import settings
 
@@ -196,29 +195,13 @@ def _copy_ext_stub_to_build_dir(
     ext_build_dir = Path(working_dir, new_ext_id, working_dir_name, new_ext_id)
     shutil.rmtree(ext_build_dir, True)
 
-    shutil.copytree(
+    shutil.copytree(ext_stub_cache_dir, ext_build_dir)
-        ext_stub_cache_dir,
-        ext_build_dir,
-        ignore=shutil.ignore_patterns(
-            "__pycache__",
-            ".git",
-            ".env",
-            ".venv",
-            "*.env",
-            "*.log",
-            "node_modules",
-            ".mypy_cache",
-            ".pytest_cache",
-            ".ruff_cache",
-        ),
-    )
     return ext_build_dir
 
 
 def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None:
     parsed_data = _parse_extension_data(data)
-    test_files = [f"tests/{p.name}" for p in Path(ext_stub_dir, "tests").glob("*.py")]
+    for py_file in py_files:
-    for py_file in py_files + test_files:
         template_path = Path(ext_stub_dir, py_file).as_posix()
         rederer = _render_file(template_path, parsed_data)
         with open(template_path, "w", encoding="utf-8") as f:
@@ -226,7 +209,7 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
 
         _remove_lines_with_string(template_path, remove_line_marker)
 
-    template_path = Path(ext_stub_dir, "static", "index.js").as_posix()
+    template_path = Path(ext_stub_dir, "static", "js", "index.js").as_posix()
     rederer = _render_file(
         template_path, {"preview": data.preview_action, **parsed_data}
     )
@@ -251,7 +234,9 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
         "settingsFormDialog.data",
         ext_stub_dir,
     )
-    template_path = Path(ext_stub_dir, "static", "index.vue").as_posix()
+    template_path = Path(
+        ext_stub_dir, "templates", "extension_builder_stub", "index.html"
+    ).as_posix()
     rederer = _render_file(
         template_path,
         {
@@ -278,12 +263,12 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
         "publicClientData",
         ext_stub_dir,
     )
-    public_template_path = Path(ext_stub_dir, "static", "public_page.vue")
+    public_template_path = Path(
-    public_component_path = Path(ext_stub_dir, "static", "public_page.js")
+        ext_stub_dir, "templates", "extension_builder_stub", "public_page.html"
+    )
     template_path = public_template_path.as_posix()
     if not data.public_page.has_public_page:
         public_template_path.unlink(missing_ok=True)
-        public_component_path.unlink(missing_ok=True)
     else:
         rederer = _render_file(
             template_path,
@@ -323,10 +308,8 @@ def zip_directory(source_dir, zip_path):
 
 def _rename_extension_builder_stub(data: ExtensionData, extension_dir: Path) -> None:
     extension_dir_path = extension_dir.as_posix()
-    # the order of fields is important, do not chage
     rename_values = {
         "extension_builder_stub_name": data.name,
-        "extension_builder_stub_camel_name": snake_to_camel(data.id, True),
         "extension_builder_stub_short_description": data.short_description or "",
         "extension_builder_stub": data.id,
         "OwnerData": data.owner_data.name,
@@ -345,7 +328,7 @@ def _rename_extension_builder_stub(data: ExtensionData, extension_dir: Path) ->
             directory=extension_dir_path,
             old_text=old_text,
             new_text=new_text,
-            file_extensions=[".py", ".js", ".vue", ".html", ".md", ".json", ".toml"],
+            file_extensions=[".py", ".js", ".html", ".md", ".json", ".toml"],
         )
 
     _rename_files_and_dirs_in_directory(
@@ -423,7 +406,6 @@ def _parse_extension_data(data: ExtensionData) -> dict:
         "owner_data": {
             "name": data.owner_data.name,
             "editable": data.owner_data.editable,
-            "fields": [field.name for field in data.owner_data.fields],
             "js_fields": [
                 field.field_to_js()
                 for field in data.owner_data.fields
@@ -450,18 +432,6 @@ def _parse_extension_data(data: ExtensionData) -> dict:
             ],
             "db_fields": [field.field_to_db() for field in data.owner_data.fields],
             "all_fields": [field.field_to_py() for field in data.owner_data.fields],
-            "random_fields_values": [
-                field.field_to_random_value() for field in data.owner_data.fields
-            ],
-            "public_fields": [
-                field.field_to_py()
-                for field in data.owner_data.fields
-                if field.name
-                in [
-                    data.public_page.owner_data_fields.name,
-                    data.public_page.owner_data_fields.description,
-                ]
-            ],
         },
         "client_data": {
             "name": data.client_data.name,
@@ -487,9 +457,6 @@ def _parse_extension_data(data: ExtensionData) -> dict:
             ],
             "db_fields": [field.field_to_db() for field in data.client_data.fields],
             "all_fields": [field.field_to_py() for field in data.client_data.fields],
-            "random_fields_values": [
-                field.field_to_random_value() for field in data.client_data.fields
-            ],
         },
         "settings_data": {
             "enabled": data.settings_data.enabled,
@@ -569,7 +536,7 @@ def _rename_files_and_dirs_in_directory(directory, old_text, new_text):
                     logger.warning(f"Failed to rename directory {old_dir_path}: {e}")
 
 
-def _is_excluded_dir(path: str) -> bool:
+def _is_excluded_dir(path):
     for excluded_dir in excluded_dirs:
         if path.startswith(excluded_dir):
             return True

lnbits/core/views/asset_api.py

@@ -57,11 +57,11 @@ async def api_get_asset(
 
 
 @asset_router.get(
-    "/{asset_id}/data",
+    "/{asset_id}/binary",
-    name="Get user asset data",
+    name="Get user asset binary",
-    summary="Get user asset data data by ID",
+    summary="Get user asset binary data by ID",
 )
-async def api_get_asset_data(
+async def api_get_asset_binary(
     asset_id: str,
     user_id: str | None = Depends(optional_user_id),
 ) -> Response:

lnbits/core/views/auth_api.py

@@ -4,10 +4,9 @@ import json
 from collections.abc import Callable
 from http import HTTPStatus
 from time import time
-from typing import Annotated
 from uuid import uuid4
 
-from fastapi import APIRouter, Cookie, Depends, HTTPException, Request
+from fastapi import APIRouter, Depends, HTTPException, Request
 from fastapi.responses import JSONResponse, RedirectResponse
 from fastapi_sso.sso.base import OpenID, SSOBase
 from loguru import logger
@@ -30,7 +29,6 @@ from lnbits.core.services.users import update_user_account
 from lnbits.decorators import (
     access_token_payload,
     check_account_exists,
-    check_admin,
     check_user_exists,
 )
 from lnbits.helpers import (
@@ -122,63 +120,6 @@ async def login_usr(data: LoginUsr) -> JSONResponse:
     return _auth_success_response(account.username, account.id, account.email)
 
 
-@auth_router.post("/impersonate", description="Login via the User ID of another user")
-async def impersonate_user(
-    data: LoginUsr,
-    user: User = Depends(check_admin),
-    cookie_access_token: Annotated[str | None, Cookie()] = None,
-) -> JSONResponse:
-    if not cookie_access_token:
-        raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "Only cookie based impersonation is allowed."
-        )
-    if data.usr == user.id:
-        raise HTTPException(HTTPStatus.FORBIDDEN, "You cannot impersonate yourself.")
-    if settings.is_admin_user(data.usr):
-        # this check includes the superuser
-        raise HTTPException(
-            HTTPStatus.FORBIDDEN, "You cannot impersonate another admin user."
-        )
-
-    account = await get_account(data.usr)
-    if not account:
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User ID does not exist.")
-
-    response = _auth_success_response(account.username, account.id, account.email)
-
-    max_age = settings.auth_token_expire_minutes * 60
-    response.set_cookie(
-        "admin_access_token", cookie_access_token, httponly=True, max_age=max_age
-    )
-    response.set_cookie("is_lnbits_user_impersonated", "true", max_age=max_age)
-    return response
-
-
-@auth_router.delete(
-    "/impersonate", description="Stop impersonation and go back to admin"
-)
-async def stop_impersonate_user(
-    user: User = Depends(check_user_exists),
-    admin_access_token: Annotated[str | None, Cookie()] = None,
-) -> JSONResponse:
-    if not admin_access_token:
-        raise HTTPException(
-            HTTPStatus.UNAUTHORIZED,
-            "No admin access token found to stop impersonation.",
-        )
-    response = JSONResponse(
-        {"access_token": admin_access_token, "token_type": "bearer"}
-    )
-    max_age = settings.auth_token_expire_minutes * 60
-    response.set_cookie(
-        "cookie_access_token", admin_access_token, httponly=True, max_age=max_age
-    )
-    response.delete_cookie("admin_access_token")
-    response.delete_cookie("is_access_token_expired")
-    response.delete_cookie("is_lnbits_user_impersonated")
-    return response
-
-
 @auth_router.get("/acl")
 async def api_get_user_acls(
     request: Request,

lnbits/core/views/extension_api.py

@@ -2,10 +2,8 @@ import sys
 import traceback
 from http import HTTPStatus
 
-import httpx
 from bolt11 import decode as bolt11_decode
 from fastapi import APIRouter, Depends, HTTPException
-from fastapi.requests import Request
 from loguru import logger
 
 from lnbits.core.crud.extensions import get_user_extensions
@@ -16,14 +14,10 @@ from lnbits.core.models import (
 )
 from lnbits.core.models.extensions import (
     CreateExtension,
-    CreateExtensionReview,
     Extension,
     ExtensionConfig,
     ExtensionMeta,
     ExtensionRelease,
-    ExtensionReview,
-    ExtensionReviewPaymentRequest,
-    ExtensionReviewsStatus,
     InstallableExtension,
     PayToEnableInfo,
     ReleasePaymentInfo,
@@ -40,7 +34,6 @@ from lnbits.core.services.extensions import (
     install_extension,
     uninstall_extension,
 )
-from lnbits.db import Page
 from lnbits.decorators import (
     check_account_exists,
     check_account_id_exists,
@@ -596,49 +589,3 @@ async def extensions(account_id: AccountId = Depends(check_account_id_exists)):
         for ext in installable_exts
     ]
     return extension_data
-
-
-@extension_router.get(
-    "/reviews/tags",
-    dependencies=[Depends(check_account_exists)],
-)
-async def get_extension_reviews_tags() -> list[ExtensionReviewsStatus]:
-    async with httpx.AsyncClient() as client:
-        resp = await client.get(settings.lnbits_extensions_reviews_url + "/tags")
-        resp.raise_for_status()
-        data = resp.json()
-        return [ExtensionReviewsStatus(**item) for item in data]
-
-
-@extension_router.get(
-    "/reviews/{ext_id}",
-    dependencies=[Depends(check_account_exists)],
-)
-async def get_extension_reviews(ext_id: str, request: Request) -> Page[ExtensionReview]:
-    async with httpx.AsyncClient() as client:
-        query_string = str(request.query_params)
-        resp = await client.get(
-            settings.lnbits_extensions_reviews_url + f"/reviews/{ext_id}?{query_string}"
-        )
-        resp.raise_for_status()
-        reviews = resp.json()
-        return Page(
-            data=[ExtensionReview(**item) for item in reviews["data"]],
-            total=reviews["total"],
-        )
-
-
-@extension_router.put(
-    "/reviews",
-    dependencies=[Depends(check_account_exists)],
-)
-async def create_extension_review(
-    data: CreateExtensionReview,
-) -> ExtensionReviewPaymentRequest:
-    async with httpx.AsyncClient() as client:
-        resp = await client.post(
-            settings.lnbits_extensions_reviews_url + "/reviews", json=data.dict()
-        )
-        resp.raise_for_status()
-        payment_request = resp.json()
-        return ExtensionReviewPaymentRequest(**payment_request)

lnbits/core/views/generic.py

@@ -42,38 +42,54 @@ async def robots():
 
 
 @generic_router.get(
-    "/extensions/builder/preview/{ext_id}/{resource}",
+    "/extensions/builder/preview/{ext_id}",
     name="extensions builder",
     dependencies=[Depends(check_extension_builder)],
 )
 async def extensions_builder_preview(
+    request: Request,
     ext_id: str,
-    resource: str | None = None,
     page_name: str | None = None,
     user: User = Depends(check_user_exists),
-) -> FileResponse:
+) -> HTMLResponse:
     working_dir_name = "preview_" + sha256(user.id.encode("utf-8")).hexdigest()
-
+    html_file_name = "index.html"
-    file_name = "index"
     if page_name == "public_page":
-        file_name = "public_page"
+        html_file_name = "public_page.html"
 
-    resource_path = Path(
+    html_file_path = Path(
-        settings.extension_builder_working_dir_path,
         "extension_builder_stub",
         ext_id,
         working_dir_name,
         ext_id,
-        "static",
+        "templates",
+        ext_id,
+        html_file_name,
     )
 
-    file_ext = ".vue" if resource == "template" else ".js"
+    html_file_full_path = Path(
-    file_full_path = Path(resource_path, file_name + file_ext)
+        settings.extension_builder_working_dir_path, html_file_path
+    )
 
-    if not file_full_path.is_file():
+    if not html_file_full_path.is_file():
-        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
+        return template_renderer().TemplateResponse(
+            request,
+            "error.html",
+            {
+                "status_code": 404,
+                "message": f"Extension {ext_id} not found, refresh Preview.",
+            },
+            status_code=HTTPStatus.NOT_FOUND,
+        )
+
+    response = template_renderer().TemplateResponse(
+        request,
+        html_file_path.as_posix(),
+        {
+            "user": user.json(),
+        },
+    )
 
-    response = FileResponse(file_full_path.absolute().as_posix())
     response.headers["Content-Security-Policy"] = (
         "default-src 'self'; "
         "style-src 'self' 'unsafe-inline'; "
@@ -192,9 +208,6 @@ admin_ui_checks = [Depends(check_admin), Depends(check_admin_ui)]
 @generic_router.get(
     "/extensions/builder", dependencies=[Depends(check_extension_builder)]
 )
-@generic_router.get(
-    "/extensions/builder/preview", dependencies=[Depends(check_extension_builder)]
-)
 async def index(
     request: Request, user: User = Depends(check_user_exists)
 ) -> HTMLResponse:

lnbits/core/views/payment_api.py

@@ -337,7 +337,7 @@ async def api_payment(payment_hash, x_api_key: str | None = Header(None)):
         return {"paid": False, "status": "failed"}
 
     try:
-        payment = await update_pending_payment(payment)
+        status = await payment.check_status()
     except Exception:
         if wallet and wallet.id == payment.wallet_id:
             return {"paid": False, "details": payment}
@@ -346,7 +346,7 @@ async def api_payment(payment_hash, x_api_key: str | None = Header(None)):
     if wallet and wallet.id == payment.wallet_id:
         return {
             "paid": payment.success,
-            "status": f"{payment.status!s}",
+            "status": f"{status!s}",
             "preimage": payment.preimage,
             "details": payment,
         }

lnbits/core/views/user_api.py

@@ -20,7 +20,6 @@ from lnbits.core.crud import (
     update_admin_settings,
     update_wallet,
 )
-from lnbits.core.crud.wallets import delete_wallet_by_id
 from lnbits.core.models import (
     AccountFilters,
     AccountOverview,
@@ -158,8 +157,11 @@ async def api_users_delete_user(
     user_id: str, account: Account = Depends(check_admin)
 ) -> SimpleStatus:
     wallets = await get_wallets(user_id, deleted=False)
-    for wallet in wallets:
+    if len(wallets) > 0:
-        await delete_wallet_by_id(wallet.id)
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Cannot delete user with wallets.",
+        )
 
     if user_id == settings.super_user:
         raise HTTPException(
@@ -222,7 +224,7 @@ async def api_users_toggle_admin(user_id: str) -> SimpleStatus:
 
 @users_router.get("/user/{user_id}/wallet", name="Get wallets for user")
 async def api_users_get_user_wallet(user_id: str) -> list[Wallet]:
-    return await get_wallets(user_id, deleted=None)
+    return await get_wallets(user_id)
 
 
 @users_router.post("/user/{user_id}/wallet", name="Create a new wallet for user")
@@ -245,7 +247,7 @@ async def api_users_create_user_wallet(
     "/user/{user_id}/wallet/{wallet}/undelete", name="Reactivate deleted wallet"
 )
 async def api_users_undelete_user_wallet(user_id: str, wallet: str) -> SimpleStatus:
-    wal = await get_wallet(wallet, deleted=True)
+    wal = await get_wallet(wallet)
     if not wal:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND,

lnbits/db.py

@@ -337,8 +337,7 @@ class Database(Compat):
                     f = "%Y-%m-%d %H:%M:%S.%f"
                     if "." not in value:
                         f = "%Y-%m-%d %H:%M:%S"
-                    # Parse and add UTC timezone info
+                    return datetime.strptime(value, f)
-                    return datetime.strptime(value, f).replace(tzinfo=timezone.utc)
 
                 dbapi_connection.run_async(
                     lambda connection: connection.set_type_codec(
@@ -757,11 +756,7 @@ def dict_to_model(_row: dict, model: type[TModel]) -> TModel:  # noqa: C901
             if DB_TYPE == SQLITE:
                 _dict[key] = datetime.fromtimestamp(value, timezone.utc)
             else:
-                # Ensure PostgreSQL datetime values have timezone info
+                _dict[key] = value
-                if isinstance(value, datetime) and value.tzinfo is None:
-                    _dict[key] = value.replace(tzinfo=timezone.utc)
-                else:
-                    _dict[key] = value
             continue
         if issubclass(type_, BaseModel):
             _dict[key] = dict_to_submodel(type_, value)

lnbits/decorators.py

@@ -249,7 +249,7 @@ async def check_account_id_exists(
             account_id = cache.get(cache_key)
             if account_id:
                 r.scope["user_id"] = account_id.id
-                await _check_user_access(r, account_id.id, conn=conn)
+                await _check_user_access(r, account_id, conn=conn)
                 return account_id
 
         account = await _check_account_exists(r, access_token, usr, conn=conn)

lnbits/exceptions.py

@@ -109,7 +109,7 @@ def register_exception_handlers(app: FastAPI):  # noqa: C901
         logger.error(f"RequestValidationError: {exc!s}")
         return render_html_error(request, exc) or JSONResponse(
             status_code=HTTPStatus.BAD_REQUEST,
-            content={"detail": [dict(e) for e in exc.errors()]},
+            content={"detail": str(exc)},
         )
 
     @app.exception_handler(HTTPException)

lnbits/fiat/stripe.py

@@ -35,7 +35,6 @@ class StripeTerminalOptions(BaseModel):
 
     capture_method: Literal["automatic", "manual"] = "automatic"
     metadata: dict[str, str] = Field(default_factory=dict)
-    reader_id: str | None = None
 
 
 class StripeCheckoutOptions(BaseModel):
@@ -296,15 +295,6 @@ class StripeWallet(FiatProvider):
         r.raise_for_status()
         return r.json()
 
-    async def _process_terminal_payment_intent(
-        self, reader_id: str, payment_intent_id: str
-    ) -> None:
-        data = {"payment_intent": payment_intent_id}
-        r = await self.client.post(
-            f"/v1/terminal/readers/{reader_id}/process_payment_intent", data=data
-        )
-        r.raise_for_status()
-
     async def _create_checkout_invoice(
         self,
         amount_cents: int,
@@ -388,17 +378,6 @@ class StripeWallet(FiatProvider):
                     ok=False,
                     error_message="Error: missing PaymentIntent or client_secret",
                 )
-            if term.reader_id:
-                try:
-                    await self._process_terminal_payment_intent(term.reader_id, pi_id)
-                except Exception as exc:
-                    logger.warning(exc)
-                    return FiatInvoiceResponse(
-                        ok=False,
-                        error_message=(
-                            "Error: unable to process PaymentIntent on reader"
-                        ),
-                    )
             return FiatInvoiceResponse(
                 ok=True, checking_id=pi_id, payment_request=client_secret
             )

lnbits/helpers.py

@@ -107,7 +107,6 @@ def template_renderer(additional_folders: list | None = None) -> Jinja2Templates
         "LNBITS_DEFAULT_BGIMAGE": settings.lnbits_default_bgimage,
         "VOIDWALLET": settings.lnbits_backend_wallet_class == "VoidWallet",
         "WEBPUSH_PUBKEY": settings.lnbits_webpush_pubkey,
-        "LNBITS_EXTENSIONS_REVIEWS_URL": settings.lnbits_extensions_reviews_url,
         "LNBITS_DENOMINATION": settings.lnbits_denomination,
         "has_holdinvoice": settings.has_holdinvoice,
         "LNBITS_NOSTR_CONFIGURED": settings.is_nostr_notifications_configured(),
@@ -391,14 +390,6 @@ def camel_to_snake(name: str) -> str:
     return name.lower()
 
 
-def snake_to_camel(name: str, capitalize_first: bool | None = False) -> str:
-    components = name.split("_")
-    camel = components[0] + "".join(x.capitalize() for x in components[1:])
-    if capitalize_first:
-        camel = camel[0].upper() + camel[1:]
-    return camel
-
-
 def is_camel_case(v: str) -> bool:
     return re.match(r"^[A-Z][a-z0-9]+([A-Z][a-z0-9]+)*$", v) is not None
 

lnbits/settings.py

@@ -6,6 +6,7 @@ import inspect
 import json
 import os
 import re
+import secrets
 from datetime import datetime, timezone
 from enum import Enum
 from os import path
@@ -18,6 +19,21 @@ from loguru import logger
 from pydantic import BaseModel, BaseSettings, Extra, Field, validator
 
 
+def generate_default_boltz_mnemonic() -> str | None:
+    """
+    Generate a BIP39 mnemonic using the bundled embit dependency.
+    If embit is unavailable at runtime, return None to avoid blocking startup.
+    """
+    try:
+        from embit import bip39
+    except Exception as exc:  # pragma: no cover - dependency missing at runtime
+        logger.warning(f"Unable to generate Boltz mnemonic (embit missing): {exc}")
+        return None
+
+    entropy = secrets.token_bytes(16)  # 128 bits -> 12-word mnemonic
+    return bip39.mnemonic_from_bytes(entropy)
+
+
 def list_parse_fallback(v: str):
     v = v.replace(" ", "")
     if len(v) > 0:
@@ -52,13 +68,6 @@ class ExtensionsSettings(LNbitsSettings):
     lnbits_user_default_extensions: list[str] = Field(default=[])
     lnbits_extensions_deactivate_all: bool = Field(default=False)
     lnbits_extensions_builder_activate_non_admins: bool = Field(default=False)
-    lnbits_extensions_reviews_url: str = Field(
-        default="https://demo.lnbits.com/paidreviews/api/v1/AdFzLjzuKFLsdk4Bcnff6r",
-        description="""
-            URL for the paid reviews.
-            Regular users can view this URL (not secret).
-            """,
-    )
     lnbits_extensions_manifests: list[str] = Field(
         default=[
             "https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions.json"
@@ -306,10 +315,6 @@ 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)
@@ -319,12 +324,6 @@ class AssetSettings(LNbitsSettings):
     lnbits_max_assets_per_user: int = Field(default=1, ge=0)
     lnbits_assets_no_limit_users: list[str] = Field(default=[])
 
-    def is_unlimited_assets_user(self, user_id: str) -> bool:
-        return (
-            settings.is_admin_user(user_id)
-            or user_id in self.lnbits_assets_no_limit_users
-        )
-
 
 class FeeSettings(LNbitsSettings):
     lnbits_reserve_fee_min: int = Field(default=2000, ge=0)
@@ -589,17 +588,6 @@ class SparkFundingSource(LNbitsSettings):
     spark_token: str | None = Field(default=None)
 
 
-class SparkL2FundingSource(LNbitsSettings):
-    spark_l2_mnemonic: str | None = Field(default=None)
-    spark_l2_network: str = Field(default="MAINNET")
-    spark_l2_internal_sidecar_version: str | None = Field(default="0.1.1")
-    spark_l2_external_endpoint: str | None = Field(default=None)
-    spark_l2_external_api_key: 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)
-
-
 class LnTipsFundingSource(LNbitsSettings):
     lntips_api_endpoint: str | None = Field(default=None)
     lntips_api_key: str | None = Field(default=None)
@@ -629,9 +617,12 @@ class BreezLiquidSdkFundingSource(LNbitsSettings):
 class BoltzFundingSource(LNbitsSettings):
     boltz_client_endpoint: str | None = Field(default="127.0.0.1:9002")
     boltz_client_macaroon: str | None = Field(default=None)
+    boltz_client_wallet: str | None = Field(default="lnbits")
     boltz_client_password: str = Field(default="")
     boltz_client_cert: str | None = Field(default=None)
-    boltz_mnemonic: str | None = Field(default=None)
+    boltz_mnemonic: str | None = Field(
+        default_factory=generate_default_boltz_mnemonic
+    )
 
 
 class StrikeFundingSource(LNbitsSettings):
@@ -705,7 +696,6 @@ class FundingSourcesSettings(
     PhoenixdFundingSource,
     OpenNodeFundingSource,
     SparkFundingSource,
-    SparkL2FundingSource,
     LnTipsFundingSource,
     NWCFundingSource,
     BreezSdkFundingSource,
@@ -1033,7 +1023,6 @@ class SuperUserSettings(LNbitsSettings):
             "FakeWallet",
             "LNPayWallet",
             "LNbitsWallet",
-            "LightsparkSparkWallet",
             "LnTipsWallet",
             "LndRestWallet",
             "LndWallet",

lnbits/static/i18n/en.js

@@ -187,25 +187,6 @@ window.localisation.en = {
     'Only admin accounts can create extensions',
   admin_only: 'Admin Only',
   new_version: 'New Version',
-  reviews_url: 'Reviews URL',
-  reviews_url_label: 'Reviews server URL',
-  reviews_url_hint:
-    'Full PaidReviews URL including the settings id (e.g. https://example.com/paidreviews/SETTINGS_ID)',
-  reviews_open: 'View reviews',
-  reviews_leave: 'Leave a review',
-  reviews_name: 'Your name',
-  reviews_comment: 'Your review',
-  reviews_rating: 'Rating',
-  reviews_submit: 'Submit review',
-  reviews_loading: 'Loading reviews...',
-  reviews_refresh: 'Refresh reviews',
-  reviews_error_load: 'Could not load reviews',
-  reviews_url_not_configured: 'Reviews URL not configured',
-  reviews_pay_invoice: 'Pay invoice',
-  reviews_invoice_paid: 'Invoice paid',
-  reviews_invoice_title: 'Pay this invoice to submit your review',
-  reviews_count: 'Reviews',
-  no_reviews: 'No reviews yet',
   extension_has_free_release: 'Has free releases',
   extension_has_paid_release: 'Has paid releases',
   extension_depends_on: 'Depends on:',
@@ -695,8 +676,6 @@ window.localisation.en = {
   allow_creation_user: 'Allow creation of new users',
   allow_creation_user_desc: 'Allow creation of new users on the index page',
   new_user_not_allowed: 'Registration is disabled.',
-  start_user_impersonation: 'Impersonate this user',
-  stop_user_impersonation: 'Stop User Impersonation',
   components: 'Components',
   long_running_endpoints: 'Top 5 Long Running Endpoints',
   http_request_methods: 'HTTP Request Methods',

lnbits/static/js/api.js

@@ -123,19 +123,6 @@ window._lnbitsApi = {
       url: '/api/v1/auth/logout'
     })
   },
-  impersonateUser(usr) {
-    return axios({
-      method: 'POST',
-      url: '/api/v1/auth/impersonate',
-      data: {usr}
-    })
-  },
-  stopImpersonation() {
-    return axios({
-      method: 'DELETE',
-      url: '/api/v1/auth/impersonate'
-    })
-  },
   getAuthenticatedUser() {
     return this.request('get', '/api/v1/auth')
   },

lnbits/static/js/base.js

@@ -13,8 +13,7 @@ window.LNbits = {
         wallets: data.wallets,
         fiat_providers: data.fiat_providers || [],
         super_user: data.super_user,
-        extra: data.extra ?? {},
+        extra: data.extra ?? {}
-        hasPassword: data.has_password ?? false
       }
       const mapWallet = this.wallet
       obj.wallets = obj.wallets.map(mapWallet).sort((a, b) => {

lnbits/static/js/components.js

@@ -3,37 +3,26 @@ window.app.component(QrcodeVue)
 window.app.component('lnbits-extension-rating', {
   template: '#lnbits-extension-rating',
   name: 'lnbits-extension-rating',
+  props: ['rating']
+})
+
+window.app.component('lnbits-fsat', {
+  template: '<span>{{ fsat }}</span>',
   props: {
-    rating: {
+    amount: {
       type: Number,
       default: 0
-    },
-    count: {
-      type: Number,
-      default: null
-    },
-    clickable: {
-      type: Boolean,
-      default: false
     }
   },
   computed: {
-    displayRating() {
+    fsat() {
-      return Math.round((this.rating || 0) * 2) / 2
+      return LNbits.utils.formatSat(this.amount)
-    },
-    hasData() {
-      return this.count !== null && this.count !== undefined
-    }
-  },
-  methods: {
-    handleClick() {
-      if (!this.clickable) return
-      this.$emit('click')
     }
   }
 })
 
 window.app.component('lnbits-manage', {
+  mixins: [window.windowMixin],
   template: '#lnbits-manage',
   computed: {
     showAdmin() {
@@ -65,8 +54,10 @@ window.app.component('lnbits-manage', {
 })
 
 window.app.component('lnbits-payment-details', {
+  mixins: [window.windowMixin],
   template: '#lnbits-payment-details',
   props: ['payment'],
+  mixins: [window.windowMixin],
   computed: {
     hasPreimage() {
       return (
@@ -110,6 +101,7 @@ window.app.component('lnbits-payment-details', {
 })
 
 window.app.component('lnbits-lnurlpay-success-action', {
+  mixins: [window.windowMixin],
   template: '#lnbits-lnurlpay-success-action',
   props: ['payment', 'success_action'],
   data() {
@@ -129,6 +121,7 @@ window.app.component('lnbits-lnurlpay-success-action', {
 
 window.app.component('lnbits-notifications-btn', {
   template: '#lnbits-notifications-btn',
+  mixins: [window.windowMixin],
   props: ['pubkey'],
   data() {
     return {
@@ -299,6 +292,7 @@ window.app.component('lnbits-notifications-btn', {
 
 window.app.component('lnbits-dynamic-fields', {
   template: '#lnbits-dynamic-fields',
+  mixins: [window.windowMixin],
   props: ['options', 'modelValue'],
   data() {
     return {
@@ -331,6 +325,7 @@ window.app.component('lnbits-dynamic-fields', {
 
 window.app.component('lnbits-dynamic-chips', {
   template: '#lnbits-dynamic-chips',
+  mixins: [window.windowMixin],
   props: ['modelValue'],
   data() {
     return {
@@ -361,6 +356,7 @@ window.app.component('lnbits-dynamic-chips', {
 
 window.app.component('lnbits-update-balance', {
   template: '#lnbits-update-balance',
+  mixins: [window.windowMixin],
   props: ['wallet_id', 'small_btn'],
   computed: {
     admin() {
@@ -399,6 +395,7 @@ window.app.component('lnbits-update-balance', {
 
 window.app.component('user-id-only', {
   template: '#user-id-only',
+  mixins: [window.windowMixin],
   props: {
     allowed_new_users: Boolean,
     authAction: String,
@@ -442,6 +439,7 @@ window.app.component('user-id-only', {
 
 window.app.component('username-password', {
   template: '#username-password',
+  mixins: [window.windowMixin],
   props: {
     allowed_new_users: Boolean,
     authMethods: Array,
@@ -679,6 +677,7 @@ window.app.component('lnbits-stat', {
 
 window.app.component('lnbits-node-qrcode', {
   props: ['info'],
+  mixins: [window.windowMixin],
   template: `
     <q-card class="my-card">
       <q-card-section>
@@ -757,6 +756,7 @@ window.app.component('lnbits-node-info', {
       showDialog: false
     }
   },
+  mixins: [window.windowMixin],
   methods: {
     shortenNodeId(nodeId) {
       return nodeId

lnbits/static/js/components/admin/lnbits-admin-assets-config.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-assets-config', {
   props: ['form-data'],
   template: '#lnbits-admin-assets-config',
+  mixins: [window.windowMixin],
   data() {
     return {
       newAllowedAssetMimeType: '',
@@ -16,7 +17,6 @@ window.app.component('lnbits-admin-assets-config', {
           this.newAllowedAssetMimeType
         )
         this.newAllowedAssetMimeType = ''
-        this.formData.touch = null
       }
     },
     removeAllowedAssetMimeType(type) {
@@ -24,21 +24,18 @@ window.app.component('lnbits-admin-assets-config', {
       if (index !== -1) {
         this.formData.lnbits_assets_allowed_mime_types.splice(index, 1)
       }
-      this.formData.touch = null
     },
     addNewNoLimitUser() {
       if (this.newNoLimitUser) {
         this.removeNoLimitUser(this.newNoLimitUser)
         this.formData.lnbits_assets_no_limit_users.push(this.newNoLimitUser)
         this.newNoLimitUser = ''
-        this.formData.touch = null
       }
     },
     removeNoLimitUser(user) {
       if (user) {
         this.formData.lnbits_assets_no_limit_users =
           this.formData.lnbits_assets_no_limit_users.filter(u => u !== user)
-        this.formData.touch = null
       }
     }
   }

lnbits/static/js/components/admin/lnbits-admin-audit.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-audit', {
   props: ['form-data'],
   template: '#lnbits-admin-audit',
+  mixins: [window.windowMixin],
   data() {
     return {
       formAddIncludePath: '',

lnbits/static/js/components/admin/lnbits-admin-exchange-providers.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-exchange-providers', {
   props: ['form-data'],
   template: '#lnbits-admin-exchange-providers',
+  mixins: [window.windowMixin],
   data() {
     return {
       exchangeData: {

lnbits/static/js/components/admin/lnbits-admin-extensions.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-extensions', {
   props: ['form-data'],
   template: '#lnbits-admin-extensions',
+  mixins: [window.windowMixin],
   data() {
     return {
       formAddExtensionsManifest: ''

lnbits/static/js/components/admin/lnbits-admin-fiat-providers.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-fiat-providers', {
   props: ['form-data'],
   template: '#lnbits-admin-fiat-providers',
+  mixins: [window.windowMixin],
   data() {
     return {
       formAddStripeUser: '',

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

@@ -1,5 +1,6 @@
 window.app.component('lnbits-admin-funding-sources', {
   template: '#lnbits-admin-funding-sources',
+  mixins: [window.windowMixin],
   props: ['form-data', 'allowed-funding-sources'],
   methods: {
     getFundingSourceLabel(item) {
@@ -88,14 +89,8 @@ window.app.component('lnbits-admin-funding-sources', {
             lnd_rest_cert: 'Certificate',
             lnd_rest_macaroon: 'Macaroon',
             lnd_rest_macaroon_encrypted: 'Encrypted Macaroon',
-            lnd_rest_route_hints: {
+            lnd_rest_route_hints: 'Enable Route Hints',
-              advanced: true,
+            lnd_rest_allow_self_payment: 'Allow Self Payment'
-              label: 'Enable Route Hints'
-            },
-            lnd_rest_allow_self_payment: {
-              advanced: true,
-              label: 'Allow Self Payment'
-            }
           }
         ],
         [
@@ -165,27 +160,22 @@ window.app.component('lnbits-admin-funding-sources', {
           'BoltzWallet',
           'Boltz',
           {
-            boltz_client_endpoint: {
+            boltz_client_endpoint: 'Endpoint',
-              label: 'Boltz client endpoint',
-              value: '127.0.0.1:9002'
-            },
             boltz_client_macaroon: {
               label: 'Admin Macaroon path or hex',
-              value: '/home/ubuntu/.boltz/macaroons/admin.macaroon'
+              default: '/home/ubuntu/.boltz/macaroons/admin.macaroon'
             },
             boltz_client_cert: {
               label: 'Certificate path or hex',
-              value: '/home/ubuntu/.boltz/tls.cert'
+              default: '/home/ben/.boltz/tls.cert'
             },
+            boltz_client_wallet: 'Wallet Name',
+            boltz_client_password: 'Wallet Password (can be empty)',
             boltz_mnemonic: {
-              label: 'Liquid seed phrase',
+              label: 'Liquid mnemonic (copy into greenwallet)',
-              hint: 'Boltz will fetch once connected, but you can change later (can be opened in a liquid wallet) ',
               copy: true,
-              qrcode: true
+              qrcode: true,
-            },
+              hint: 'Paste or type your liquid mnemonic'
-            boltz_client_password: {
-              label: 'Wallet Password (optional)',
-              advanced: true
             }
           }
         ],
@@ -228,51 +218,6 @@ window.app.component('lnbits-admin-funding-sources', {
             spark_token: 'Token'
           }
         ],
-        [
-          'LightsparkSparkWallet',
-          'Spark (L2)',
-          {
-            spark_l2_internal_sidecar_version: {
-              label: 'Internal Sidecar Version (eg: 0.1.1).',
-              hint: 'If specified then the sidecar will be downloaded. Alternatively you can specify an External Sidecar endpoint in the Advanced section.',
-              value: ''
-            },
-            spark_l2_mnemonic: {
-              label: 'Mnemonic',
-              hint: 'Only required if Interna Sidecar version is specified.'
-            },
-            spark_l2_network: {
-              label: 'Network',
-              value: 'MAINNET'
-            },
-
-            spark_l2_external_endpoint: {
-              label: 'External Sidecar Endpoint. ',
-              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: '',
-              advanced: true
-            },
-            spark_l2_external_api_key: {
-              label: 'External Sidecar API Key. ',
-              hint: 'API Key for authenticating with the external sidecar if it requires authentication.',
-              value: '',
-              advanced: true
-            },
-
-            spark_l2_pay_wait_ms: {
-              label: 'Pay Wait Time (ms)',
-              advanced: true
-            },
-            spark_l2_pay_poll_ms: {
-              label: 'Pay Poll Time (ms)',
-              advanced: true
-            },
-            spark_l2_stream_keepalive_ms: {
-              label: 'Stream Keepalive Time (ms)',
-              advanced: true
-            }
-          }
-        ],
         [
           'NWCWallet',
           'Nostr Wallet Connect',

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

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-funding', {
   props: ['is-super-user', 'form-data', 'settings'],
   template: '#lnbits-admin-funding',
+  mixins: [window.windowMixin],
   data() {
     return {
       auditData: []

lnbits/static/js/components/admin/lnbits-admin-notifications.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-notifications', {
   props: ['form-data'],
   template: '#lnbits-admin-notifications',
+  mixins: [window.windowMixin],
   data() {
     return {
       nostrNotificationIdentifier: '',

lnbits/static/js/components/admin/lnbits-admin-security.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-security', {
   props: ['form-data'],
   template: '#lnbits-admin-security',
+  mixins: [window.windowMixin],
   data() {
     return {
       logs: [],

lnbits/static/js/components/admin/lnbits-admin-server.js

@@ -1,4 +1,5 @@
 window.app.component('lnbits-admin-server', {
   props: ['form-data'],
-  template: '#lnbits-admin-server'
+  template: '#lnbits-admin-server',
+  mixins: [window.windowMixin]
 })

lnbits/static/js/components/admin/lnbits-admin-site-customisation.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-site-customisation', {
   props: ['form-data'],
   template: '#lnbits-admin-site-customisation',
+  mixins: [window.windowMixin],
   data() {
     return {
       lnbits_theme_options: [

lnbits/static/js/components/admin/lnbits-admin-users.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-users', {
   props: ['form-data'],
   template: '#lnbits-admin-users',
+  mixins: [window.windowMixin],
   data() {
     return {
       formAddUser: '',

lnbits/static/js/components/lnbits-disclaimer.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-disclaimer', {
   template: '#lnbits-disclaimer',
+  mixins: [window.windowMixin],
   computed: {
     showDisclaimer() {
       return !g.disclaimerShown && g.isUserAuthorized

lnbits/static/js/components/lnbits-drawer.js

@@ -1,3 +1,4 @@
 window.app.component('lnbits-drawer', {
-  template: '#lnbits-drawer'
+  template: '#lnbits-drawer',
+  mixins: [window.windowMixin]
 })

lnbits/static/js/components/lnbits-error.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-error', {
   template: '#lnbits-error',
+  mixins: [window.windowMixin],
   props: ['dynamic', 'code', 'message'],
   computed: {
     isExtension() {

lnbits/static/js/components/lnbits-footer.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-footer', {
   template: '#lnbits-footer',
+  mixins: [window.windowMixin],
   computed: {
     version() {
       return this.LNBITS_VERSION || 'unknown version'

lnbits/static/js/components/lnbits-header-wallets.js

@@ -1,3 +1,4 @@
 window.app.component('lnbits-header-wallets', {
-  template: '#lnbits-header-wallets'
+  template: '#lnbits-header-wallets',
+  mixins: [window.windowMixin]
 })

lnbits/static/js/components/lnbits-header.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-header', {
   template: '#lnbits-header',
+  mixins: [window.windowMixin],
   computed: {
     hasServiceFeeMax() {
       return (
@@ -60,17 +61,5 @@ window.app.component('lnbits-header', {
         return 'User'
       }
     }
-  },
-  methods: {
-    async stopImpersonation() {
-      try {
-        await LNbits.api.stopImpersonation()
-        LNbits.utils.restoreLocalStorage('impersonation')
-        window.location = '/users'
-      } catch (e) {
-        console.warn(e)
-        LNbits.utils.notifyApiError(e)
-      }
-    }
   }
 })

lnbits/static/js/components/lnbits-home-logos.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-home-logos', {
   template: '#lnbits-home-logos',
+  mixins: [window.windowMixin],
   data() {
     return {
       logos: [

lnbits/static/js/components/lnbits-label-selector.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-label-selector', {
   template: '#lnbits-label-selector',
   props: ['labels'],
+  mixins: [window.windowMixin],
   data() {
     return {
       labelFilter: '',

lnbits/static/js/components/lnbits-language-dropdown.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-language-dropdown', {
   template: '#lnbits-language-dropdown',
+  mixins: [window.windowMixin],
   methods: {
     activeLanguage(lang) {
       return window.i18n.global.locale === lang

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

@@ -1,4 +1,5 @@
 window.app.component('lnbits-manage-extension-list', {
+  mixins: [window.windowMixin],
   template: '#lnbits-manage-extension-list',
   data() {
     return {

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

@@ -1,5 +1,6 @@
 window.app.component('lnbits-manage-wallet-list', {
   template: '#lnbits-manage-wallet-list',
+  mixins: [window.windowMixin],
   data() {
     return {
       activeWalletId: null

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

@@ -1,6 +1,7 @@
 window.app.component('lnbits-payment-list', {
   template: '#lnbits-payment-list',
   props: ['wallet', 'paymentFilter'],
+  mixins: [window.windowMixin],
   data() {
     return {
       payments: [],

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

@@ -1,5 +1,6 @@
 window.app.component('lnbits-qrcode-lnurl', {
   template: '#lnbits-qrcode-lnurl',
+  mixins: [window.windowMixin],
   props: {
     url: {
       required: true,

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

@@ -1,4 +1,5 @@
 window.app.component('lnbits-qrcode', {
+  mixins: [window.windowMixin],
   template: '#lnbits-qrcode',
   components: {
     QrcodeVue: QrcodeVue.default

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

@@ -1,4 +1,5 @@
 window.app.component('lnbits-theme', {
+  mixins: [window.windowMixin],
   watch: {
     'g.walletFlip'(val) {
       this.$q.localStorage.setItem('lnbits.walletFlip', val)

lnbits/static/js/components/lnbits-wallet-api-docs.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-api-docs', {
   template: '#lnbits-wallet-api-docs',
+  mixins: [window.windowMixin],
   methods: {
     resetKeys() {
       LNbits.utils

lnbits/static/js/components/lnbits-wallet-charts.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-charts', {
   template: '#lnbits-wallet-charts',
+  mixins: [window.windowMixin],
   props: ['paymentFilter', 'chartConfig'],
   data() {
     return {

lnbits/static/js/components/lnbits-wallet-extra.js

@@ -1,10 +1,9 @@
 window.app.component('lnbits-wallet-extra', {
   template: '#lnbits-wallet-extra',
+  mixins: [window.windowMixin],
   props: ['chartConfig'],
-  computed: {
+  data() {
-    exportUrl() {
+    return {}
-      return `${window.location.origin}/wallet?usr=${this.g.user.id}&wal=${this.g.wallet.id}`
-    }
   },
   methods: {
     handleSendLnurl(lnurl) {

lnbits/static/js/components/lnbits-wallet-icon.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-icon', {
   template: '#lnbits-wallet-icon',
+  mixins: [window.windowMixin],
   data() {
     return {
       icon: {

lnbits/static/js/components/lnbits-wallet-new.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-new', {
   template: '#lnbits-wallet-new',
+  mixins: [window.windowMixin],
   data() {
     return {
       walletTypes: [{label: 'Lightning Wallet', value: 'lightning'}],

lnbits/static/js/components/lnbits-wallet-paylinks.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-paylinks', {
   template: '#lnbits-wallet-paylinks',
+  mixins: [window.windowMixin],
   data() {
     return {
       storedPaylinks: []

lnbits/static/js/components/lnbits-wallet-share.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-share', {
   template: '#lnbits-wallet-share',
+  mixins: [window.windowMixin],
   computed: {
     walletApprovedShares() {
       return this.g.wallet.extra.shared_with.filter(

lnbits/static/js/globals.js

@@ -15,7 +15,6 @@ window.g = Vue.reactive({
   wallet: null,
   isPublicPage: true,
   isUserAuthorized: !!Quasar.Cookies.get('is_lnbits_user_authorized'),
-  isUserImpersonated: !!Quasar.Cookies.get('is_lnbits_user_impersonated'),
   offline: !navigator.onLine,
   hasCamera: false,
   visibleDrawer: false,

lnbits/static/js/init-app.js

@@ -106,11 +106,6 @@ const routes = [
     name: 'ExtensionsBuilder',
     component: PageExtensionBuilder
   },
-  {
-    path: '/extensions/builder/preview',
-    name: 'ExtensionsBuilderPreview',
-    component: PageExtensionBuilderPreview
-  },
   {
     path: '/extensions',
     name: 'Extensions',

lnbits/static/js/pages/account.js

@@ -1,5 +1,6 @@
 window.PageAccount = {
   template: '#page-account',
+  mixins: [window.windowMixin],
   data() {
     return {
       untouchedUser: null,
@@ -609,7 +610,7 @@ window.PageAccount = {
       }
     },
     copyAssetLinkToClipboard(asset) {
-      const assetUrl = `${window.location.origin}/api/v1/assets/${asset.id}/data`
+      const assetUrl = `${window.location.origin}/api/v1/assets/${asset.id}/binary`
       this.utils.copyText(assetUrl)
     },
     addUserLabel() {

lnbits/static/js/pages/admin.js

@@ -1,5 +1,6 @@
 window.PageAdmin = {
   template: '#page-admin',
+  mixins: [windowMixin],
   data() {
     return {
       tab: 'funding',

lnbits/static/js/pages/audit.js

@@ -1,5 +1,6 @@
 window.PageAudit = {
   template: '#page-audit',
+  mixins: [window.windowMixin],
   data() {
     return {
       chartsReady: false,

lnbits/static/js/pages/error.js

@@ -1,3 +1,4 @@
 window.PageError = {
-  template: '#page-error'
+  template: '#page-error',
+  mixins: [window.windowMixin]
 }

lnbits/static/js/pages/extensions.js

@@ -1,5 +1,6 @@
 window.PageExtensions = {
   template: '#page-extensions',
+  mixins: [window.windowMixin],
   data() {
     return {
       extbuilderEnabled: false,
@@ -25,63 +26,7 @@ window.PageExtensions = {
       selectedRelease: null,
       uninstallAndDropDb: false,
       maxStars: 5,
-      paylinkWebsocket: null,
+      paylinkWebsocket: null
-      searchToggle: false,
-      reviewsUrl: null,
-      reviewsDialog: {
-        show: false,
-        extension: null,
-        loading: false,
-        submitting: false,
-        form: {
-          name: '',
-          rating: 0,
-          comment: ''
-        },
-        error: null
-      },
-      reviews: [],
-      reviewsTable: {
-        loading: false,
-        columns: [
-          {
-            name: 'name',
-            align: 'left',
-            label: this.$t('Name'),
-            field: 'name',
-            sortable: true
-          },
-          {
-            name: 'comment',
-            align: 'left',
-            label: this.$t('Comment'),
-            field: 'comment'
-          },
-          {
-            name: 'created_at',
-            align: 'left',
-            label: this.$t('Date'),
-            field: 'created_at'
-          },
-          {
-            name: 'rating',
-            align: 'right',
-            label: 'Rating',
-            field: 'rating'
-          }
-        ],
-        pagination: {
-          rowsPerPage: 5,
-          sortBy: 'created_at',
-          descending: true,
-          page: 1
-        }
-      },
-      paymentDialog: {
-        show: false,
-        invoice: '',
-        hash: ''
-      }
     }
   },
   watch: {
@@ -126,6 +71,7 @@ window.PageExtensions = {
       // the install logic has been triggered one way or another
       this.unsubscribeFromPaylinkWs()
 
+      const extension = this.selectedExtension
       this.selectedExtension.inProgress = true
       this.showManageExtensionDialog = false
       release.payment_hash =
@@ -140,7 +86,6 @@ window.PageExtensions = {
           version: release.version
         })
         .then(response => {
-          this.selectedExtension.inProgress = false
           const extension = this.extensions.find(
             ext => ext.id === this.selectedExtension.id
           )
@@ -155,7 +100,7 @@ window.PageExtensions = {
         })
         .catch(err => {
           console.warn(err)
-          this.selectedExtension.inProgress = false
+          extension.inProgress = false
           LNbits.utils.notifyApiError(err)
         })
     },
@@ -339,7 +284,8 @@ window.PageExtensions = {
       try {
         const {data} = await LNbits.api.request(
           'GET',
-          `/api/v1/extension/${extension.id}/releases`
+          `/api/v1/extension/${extension.id}/releases`,
+          this.g.user.wallets[0].adminkey
         )
 
         this.selectedExtensionRepos = data.reduce((repos, release) => {
@@ -377,9 +323,6 @@ window.PageExtensions = {
       if (!detailsLink) {
         return
       }
-      // keep a reference to the extension so we can show rating stats
-      this.selectedExtension =
-        this.extensions.find(ext => ext.id === extId) || this.selectedExtension
       this.selectedExtensionDetails = null
       this.showExtensionDetailsDialog = true
       this.slide = 0
@@ -388,7 +331,8 @@ window.PageExtensions = {
       try {
         const {data} = await LNbits.api.request(
           'GET',
-          `/api/v1/extension/${extId}/details?details_link=${detailsLink}`
+          `/api/v1/extension/${extId}/details?details_link=${detailsLink}`,
+          this.g.user.wallets[0].inkey
         )
 
         this.selectedExtensionDetails = data
@@ -509,7 +453,7 @@ window.PageExtensions = {
       const {data} = await LNbits.api.request(
         'PUT',
         `/api/v1/extension/${extId}/invoice/install`,
-        null,
+        this.g.user.wallets[0].adminkey,
         {
           ext_id: extId,
           archive: release.archive,
@@ -525,7 +469,7 @@ window.PageExtensions = {
       const {data} = await LNbits.api.request(
         'PUT',
         `/api/v1/extension/${extId}/invoice/enable`,
-        null,
+        this.g.user.wallets[0].adminkey,
         {
           amount
         }
@@ -616,7 +560,8 @@ window.PageExtensions = {
       try {
         const {data} = await LNbits.api.request(
           'GET',
-          `/api/v1/extension/release/${org}/${repo}/${release.version}`
+          `/api/v1/extension/release/${org}/${repo}/${release.version}`,
+          this.g.user.wallets[0].adminkey
         )
         release.loaded = true
         release.is_version_compatible = data.is_version_compatible
@@ -641,13 +586,18 @@ window.PageExtensions = {
             continue
           }
           ext.inProgress = true
-          await LNbits.api.request('POST', `/api/v1/extension`, null, {
+          await LNbits.api.request(
-            ext_id: ext.id,
+            'POST',
-            archive: ext.latestRelease.archive,
+            `/api/v1/extension`,
-            source_repo: ext.latestRelease.source_repo,
+            this.g.user.wallets[0].adminkey,
-            payment_hash: ext.latestRelease.payment_hash,
+            {
-            version: ext.latestRelease.version
+              ext_id: ext.id,
-          })
+              archive: ext.latestRelease.archive,
+              source_repo: ext.latestRelease.source_repo,
+              payment_hash: ext.latestRelease.payment_hash,
+              version: ext.latestRelease.version
+            }
+          )
           count++
           ext.isAvailable = true
           ext.isInstalled = true
@@ -672,163 +622,6 @@ window.PageExtensions = {
       })
       this.showUpdateAllDialog = false
     },
-    formatAvg(raw) {
-      const val = Number(raw || 0)
-      return Math.round((val / 2 / 100) * 2) / 2
-    },
-
-    async loadReviewStats() {
-      if (!this.reviewsUrl) {
-        console.info('Extension reviews are not configured')
-        return
-      }
-      try {
-        const {data} = await LNbits.api.request(
-          'GET',
-          `/api/v1/extension/reviews/tags`
-        )
-        const map = {}
-        data.forEach(stat => {
-          map[stat.tag] = stat
-        })
-        this.extensions.forEach(ext => {
-          ext.reviewStats = map[ext.id] || null
-        })
-        this.filterExtensions(this.searchTerm, this.tab)
-      } catch (error) {
-        console.warn(error)
-      }
-    },
-    async openReviews(extension) {
-      const targetExtension =
-        extension ||
-        (this.selectedExtensionDetails
-          ? this.extensions.find(e => e.id === this.selectedExtensionDetails.id)
-          : null)
-      if (!targetExtension) {
-        return
-      }
-      if (!this.reviewsUrl) {
-        Quasar.Notify.create({
-          type: 'warning',
-          message: this.$t('reviews_url_not_configured')
-        })
-        return
-      }
-      this.reviewsDialog.extension = targetExtension
-      this.selectedExtension = extension
-      this.reviewsDialog.show = true
-      await this.getTagReviews()
-    },
-    async getTagReviews(props) {
-      if (!this.reviewsUrl) {
-        Quasar.Notify.create({
-          type: 'warning',
-          message: this.$t('reviews_url_not_configured')
-        })
-        return
-      }
-      try {
-        this.reviewsTable.loading = true
-        const params = LNbits.utils.prepareFilterQuery(this.reviewsTable, props)
-        const {data} = await LNbits.api.request(
-          'GET',
-          `/api/v1/extension/reviews/${this.selectedExtension.id}?${params}`
-        )
-        this.reviews = data.data
-        this.reviewsTable.pagination.rowsNumber = data.total
-      } catch (e) {
-        LNbits.utils.notifyApiError(e)
-      } finally {
-        this.reviewsTable.loading = false
-      }
-    },
-
-    formatReviewDate(val) {
-      if (!val) return ''
-      const numeric = Number(val)
-      if (!Number.isNaN(numeric)) {
-        return this.utils.formatTimestamp(numeric)
-      }
-      return this.utils.formatDate(val)
-    },
-    async submitReview() {
-      if (!this.reviewsDialog.extension || !this.reviewsUrl) {
-        return
-      }
-      this.reviewsDialog.submitting = true
-      try {
-        const payload = {
-          tag: this.reviewsDialog.extension.id,
-          name: this.reviewsDialog.form.name,
-          rating: this.reviewsDialog.form.rating * 100,
-          comment: this.reviewsDialog.form.comment
-        }
-        const {data} = await LNbits.api.request(
-          'PUT',
-          `/api/v1/extension/reviews`,
-          null,
-          payload
-        )
-        if (data.payment_request) {
-          this.openInvoiceDialog(data.payment_request, data.payment_hash)
-        } else {
-          Quasar.Notify.create({
-            type: 'positive',
-            message: 'Review submitted'
-          })
-          this.resetReviewForm()
-          await this.getTagReviews()
-          await this.loadReviewStats()
-        }
-      } catch (error) {
-        LNbits.utils.notifyApiError(error)
-      } finally {
-        this.reviewsDialog.submitting = false
-      }
-    },
-    openInvoiceDialog(invoice, hash) {
-      this.paymentDialog.invoice = invoice
-      this.paymentDialog.hash = hash
-      this.paymentDialog.show = true
-      this.listenForPayment(hash)
-    },
-    resetReviewForm() {
-      this.reviewsDialog.form = {
-        name: '',
-        rating: 0,
-        comment: ''
-      }
-      this.paymentDialog = {
-        show: false,
-        invoice: '',
-        hash: ''
-      }
-    },
-    listenForPayment(hash) {
-      try {
-        const base = new URL(this.reviewsUrl)
-        base.protocol = base.protocol === 'https:' ? 'wss:' : 'ws:'
-        base.pathname = `/api/v1/ws/${hash}`
-        const ws = new WebSocket(base)
-        ws.addEventListener('message', async () => {
-          Quasar.Notify.create({
-            type: 'positive',
-            message: this.$t('reviews_invoice_paid')
-          })
-          this.paymentDialog.show = false
-          this.resetReviewForm()
-          setTimeout(async () => {
-            await this.getTagReviews()
-          }, 1000)
-
-          await this.loadReviewStats()
-          ws.close()
-        })
-      } catch (error) {
-        console.warn(error)
-      }
-    },
     async fetchAllExtensions() {
       try {
         const {data} = await LNbits.api.request('GET', `/api/v1/extension/all`)
@@ -843,7 +636,6 @@ window.PageExtensions = {
   async created() {
     this.extensions = await this.fetchAllExtensions()
     this.extbuilderEnabled = this.g.user.admin || this.LNBITS_EXT_BUILDER
-    this.reviewsUrl = this.LNBITS_EXTENSIONS_REVIEWS_URL
 
     if (this.g.user.extensions.length === 0) {
       this.tab = 'all'
@@ -860,8 +652,6 @@ window.PageExtensions = {
       this.hasNewVersion(ext)
     )
 
-    await this.loadReviewStats()
-
     this.filterExtensions(this.searchTerm, this.tab)
   }
 }

lnbits/static/js/pages/extensions_builder.js

@@ -1,5 +1,6 @@
 window.PageExtensionBuilder = {
   template: '#page-extension-builder',
+  mixins: [windowMixin],
   data() {
     return {
       step: 1,
@@ -287,10 +288,11 @@ window.PageExtensionBuilder = {
           `/api/v1/extension/${stub_ext_id}/releases`
         )
 
-        this.extensionStubVersions = data
+        this.extensionStubVersions = data.sort((a, b) =>
-        const validVersions = data.filter(v => v.is_version_compatible)
+          a.version < b.version ? 1 : -1
-        this.extensionData.stub_version = validVersions[0]
+        )
-          ? validVersions[0].version
+        this.extensionData.stub_version = this.extensionStubVersions[0]
+          ? this.extensionStubVersions[0].version
           : ''
       } catch (error) {
         LNbits.utils.notifyApiError(error)
@@ -309,20 +311,7 @@ window.PageExtensionBuilder = {
         iframeDoc.body.style.transform = 'scale(0.8)'
         iframeDoc.body.style.transformOrigin = 'center top'
       }
-
+      iframe.src = `/extensions/builder/preview/${this.extensionData.id}?page_name=${previewPageName}`
-      let componentName =
-        'Page' +
-        this.extensionData.id
-          .toLowerCase()
-          .split('_')
-          .map(word => word.charAt(0).toUpperCase() + word.slice(1))
-          .join('')
-      if (previewPageName === 'public_page') componentName += 'Public'
-      iframe.src =
-        `/extensions/builder/preview?` +
-        `ext_id=${this.extensionData.id}` +
-        `&page=${previewPageName}` +
-        `&component=${componentName}`
     },
     initBasicData() {
       this.extensionData.owner_data.fields = [

lnbits/static/js/pages/extensions_builder_preview.js

@@ -1,46 +0,0 @@
-window.PageExtensionBuilderPreview = {
-  template: '#page-extension-builder-preview',
-  mixins: [windowMixin],
-  watch: {
-    name: 'reload'
-  },
-  data() {
-    return {
-      extId: '',
-      pageName: '',
-      componentName: null
-    }
-  },
-  methods: {
-    async reload() {
-      await LNbits.utils.loadTemplate(
-        `/extensions/builder/preview/${this.extId}/template?page_name=${this.pageName}`
-      )
-      await LNbits.utils.loadScript(
-        `/extensions/builder/preview/${this.extId}/component?page_name=${this.pageName}`
-      )
-
-      this._component = window[this.componentName]
-      console.log(
-        'LNbits preview reloaded componentName:',
-        this.componentName,
-        !!this._component
-      )
-      this.$forceUpdate()
-    }
-  },
-  async created() {
-    const urlParams = new URLSearchParams(window.location.search)
-    this.extId = urlParams.get('ext_id') || ''
-    this.pageName = urlParams.get('page') || ''
-    this.componentName = urlParams.get('component') || ''
-
-    await this.reload()
-  },
-  render() {
-    if (this._component) {
-      return Vue.h(this._component)
-    }
-    return Vue.h('div', 'Loading...')
-  }
-}

lnbits/static/js/pages/first-install.js

@@ -1,5 +1,6 @@
 window.PageFirstInstall = {
   template: '#page-first-install',
+  mixins: [window.windowMixin],
   data() {
     return {
       loginData: {

lnbits/static/js/pages/home.js

@@ -1,5 +1,6 @@
 window.PageHome = {
   template: '#page-home',
+  mixins: [window.windowMixin],
   data() {
     return {
       lnurl: '',

lnbits/static/js/pages/node-public.js

@@ -1,5 +1,6 @@
 window.PageNodePublic = {
   template: '#page-node-public',
+  mixins: [window.windowMixin],
   data() {
     return {
       enabled: false,

lnbits/static/js/pages/node.js

@@ -1,4 +1,5 @@
 window.PageNode = {
+  mixins: [window.windowMixin],
   template: '#page-node',
   config: {
     globalProperties: {

lnbits/static/js/pages/payments.js

@@ -1,5 +1,6 @@
 window.PagePayments = {
   template: '#page-payments',
+  mixins: [window.windowMixin],
   data() {
     return {
       payments: [],

lnbits/static/js/pages/users.js

@@ -1,5 +1,6 @@
 window.PageUsers = {
   template: '#page-users',
+  mixins: [window.windowMixin],
   data() {
     return {
       paymentsWallet: {},
@@ -438,20 +439,6 @@ window.PageUsers = {
         this.activeUser.show = false
       }
     },
-    async impersonateUser(user_id) {
-      try {
-        await LNbits.api.impersonateUser(user_id)
-        LNbits.utils.backupLocalStorage('impersonation', true)
-        this.$q.localStorage.setItem('lnbits.disclaimerShown', true)
-        window.location = '/wallet'
-      } catch (error) {
-        console.warn(error)
-        Quasar.Notify.create({
-          type: 'warning',
-          message: 'Failed to impersonate user!'
-        })
-      }
-    },
     async showWalletPayments(walletId) {
       this.activeUser.show = false
       await this.fetchWallets(this.users[0].id)

lnbits/static/js/pages/wallet.js

@@ -1,5 +1,6 @@
 window.PageWallet = {
   template: '#page-wallet',
+  mixins: [window.windowMixin],
   data() {
     return {
       parse: {

lnbits/static/js/pages/wallets.js

@@ -1,5 +1,6 @@
 window.PageWallets = {
   template: '#page-wallets',
+  mixins: [window.windowMixin],
   data() {
     return {
       user: null,

lnbits/static/js/utils.js

@@ -67,29 +67,6 @@ window._lnbitsUtils = {
         }
       })
   },
-  backupLocalStorage(backupKey, cleanup = false) {
-    const lnbitsEntries =
-      Object.entries(Quasar.LocalStorage.getAll()).filter(
-        ([k, v]) => k.startsWith('lnbits.') && k !== `lnbits.${backupKey}`
-      ) || []
-
-    Quasar.LocalStorage.setItem(`lnbits.${backupKey}`, lnbitsEntries)
-    if (cleanup) {
-      lnbitsEntries.forEach(([k, v]) => Quasar.LocalStorage.remove(k))
-    }
-  },
-  restoreLocalStorage(backupKey) {
-    Object.entries(Quasar.LocalStorage.getAll())
-      .filter(
-        ([k, v]) => k.startsWith('lnbits.') && k !== `lnbits.${backupKey}`
-      )
-      .forEach(([k, v]) => Quasar.LocalStorage.remove(k))
-
-    const lnbitsEntries =
-      Quasar.LocalStorage.getItem(`lnbits.${backupKey}`) || []
-    lnbitsEntries.forEach(([k, v]) => Quasar.LocalStorage.setItem(k, v))
-    Quasar.LocalStorage.remove(`lnbits.${backupKey}`)
-  },
   async digestMessage(message) {
     const msgUint8 = new TextEncoder().encode(message)
     const hashBuffer = await crypto.subtle.digest('SHA-256', msgUint8)
@@ -137,13 +114,6 @@ window._lnbitsUtils = {
   formatMsat(value) {
     return this.formatSat(value / 1000)
   },
-  parseJSONSafe(str) {
-    try {
-      return JSON.parse(str)
-    } catch (e) {
-      return null
-    }
-  },
   notifyApiError(error) {
     if (!error.response) {
       return console.error(error)
@@ -153,28 +123,17 @@ window._lnbitsUtils = {
       401: 'warning',
       500: 'negative'
     }
-    let messages = error.response.data.detail
+    Quasar.Notify.create({
-    if (messages) {
+      timeout: 5000,
-      messages = Array.isArray(messages)
+      type: types[error.response.status] || 'warning',
-        ? messages.map(e => e.msg + ` (${e.loc?.join('/')})`)
+      message:
-        : (messages = [messages])
+        error.response.data.message || error.response.data.detail || null,
-    } else {
+      caption:
-      messages = [error.response.data.message || error.response.data.detail]
+        [error.response.status, ' ', error.response.statusText]
-    }
+          .join('')
-
+          .toUpperCase() || null,
-    messages.forEach(message =>
+      icon: null
-      Quasar.Notify.create({
+    })
-        timeout: 5000,
-        type: types[error.response.status] || 'warning',
-        message,
-        caption:
-          [error.response.status, ' ', error.response.statusText]
-            .join('')
-            .toUpperCase() || null,
-        icon: null,
-        closeBtn: true
-      })
-    )
   },
   search(data, q, field, separator) {
     try {

lnbits/static/vendor.json

@@ -45,8 +45,6 @@
     "js/pages/error.js",
     "js/pages/home.js",
     "js/pages/extensions_builder.js",
-    "js/pages/extensions_builder.js",
-    "js/pages/extensions_builder_preview.js",
     "js/pages/extensions.js",
     "js/pages/first-install.js",
     "js/pages/payments.js",

lnbits/templates/components.vue

@@ -561,32 +561,11 @@ include('components/lnbits-error.vue') %}
 </template>
 
 <template id="lnbits-extension-rating">
-  <div class="row items-center q-gutter-xs" style="margin-bottom: 3px">
+  <div style="margin-bottom: 3px">
-    <q-rating
+    <q-rating v-model="rating" size="1.5em" :max="5" color="primary"
-      :model-value="displayRating"
+      ><q-tooltip>
-      size="1.4em"
+        <span v-text="$t('extension_rating_soon')"></span> </q-tooltip
-      :max="5"
+    ></q-rating>
-      color="primary"
-      icon="star_border"
-      icon-selected="star"
-      icon-half="star_half"
-      readonly
-      :class="clickable ? 'cursor-pointer' : ''"
-      @click="handleClick"
-    >
-      <q-tooltip v-if="!hasData">
-        <span v-text="$t('extension_rating_soon')"></span>
-      </q-tooltip>
-      <q-tooltip v-else-if="clickable">
-        <span v-text="$t('reviews_open')"></span>
-      </q-tooltip>
-    </q-rating>
-    <div
-      class="text-caption text-grey"
-      v-if="count !== null && count !== undefined"
-    >
-      <span v-text="`(${count})`"></span>
-    </div>
   </div>
 </template>
 

lnbits/templates/components/admin/extensions.vue

@@ -137,19 +137,6 @@
             :hint="$t('extension_builder_manifest_url_hint')"
           ></q-input>
         </div>
-        <div class="col-12 col-md-6">
-          <p>
-            <span v-text="$t('reviews_url')"></span>
-          </p>
-          <q-input
-            filled
-            v-model="formData.lnbits_extensions_reviews_url"
-            :label="$t('reviews_url_label')"
-            :hint="$t('reviews_url_hint')"
-            type="url"
-            autocomplete="off"
-          ></q-input>
-        </div>
       </div>
     </div>
   </q-card-section>

lnbits/templates/components/admin/funding_sources.vue

@@ -35,9 +35,7 @@
       >
         <div
           class="row"
-          v-for="([key, prop], i) in Object.entries(
+          v-for="([key, prop], i) in Object.entries(fundingSources.get(fund))"
-            fundingSources.get(fund)
-          ).filter(([, p]) => !p.advanced)"
           :key="i"
         >
           <div class="col-12">
@@ -48,7 +46,7 @@
               :type="hideInput ? 'password' : 'text'"
               :label="prop.label"
               :hint="prop.hint"
-              :value="prop.value"
+              :readonly="prop.readonly || false"
             >
               <q-btn
                 v-if="prop.copy"
@@ -71,55 +69,6 @@
             </q-input>
           </div>
         </div>
-        <q-expansion-item
-          v-if="
-            Object.entries(fundingSources.get(fund)).some(([, p]) => p.advanced)
-          "
-          dense
-          expand-separator
-          icon="tune"
-          label="Advanced"
-          class="q-mt-sm"
-        >
-          <div
-            class="row"
-            v-for="([key, prop], i) in Object.entries(
-              fundingSources.get(fund)
-            ).filter(([, p]) => p.advanced)"
-            :key="`adv-${i}`"
-          >
-            <div class="col-12">
-              <q-input
-                v-model="formData[key]"
-                filled
-                class="q-mt-sm"
-                :type="hideInput ? 'password' : 'text'"
-                :label="prop.label"
-                :hint="prop.hint"
-                :readonly="prop.readonly || false"
-              >
-                <q-btn
-                  v-if="prop.copy"
-                  @click="utils.copyText(formData[key])"
-                  icon="content_copy"
-                  class="cursor-pointer"
-                  color="grey"
-                  flat
-                  dense
-                ></q-btn>
-                <q-btn
-                  v-if="prop.qrcode"
-                  @click="showQRValue(formData[key])"
-                  icon="qr_code"
-                  class="cursor-pointer"
-                  color="grey"
-                  flat
-                  dense
-                ></q-btn>
-              </q-input>
-            </div>
-          </div>
-        </q-expansion-item>
       </div>
     </q-list>
     <q-dialog v-model="showQRDialog">

lnbits/templates/components/lnbits-header.vue

@@ -72,6 +72,7 @@
       </q-badge>
 
       <lnbits-language-dropdown></lnbits-language-dropdown>
+
       <q-btn-dropdown v-if="g.user" flat rounded size="sm" class="q-pl-sm">
         <template v-slot:label>
           <q-avatar
@@ -135,20 +136,6 @@
           </q-item>
         </q-list>
       </q-btn-dropdown>
-      <q-btn
-        v-if="g.isUserImpersonated"
-        @click="stopImpersonation"
-        rounded
-        size="sm"
-        class="q-pl-sm"
-        color="negative"
-        icon="face_retouching_off"
-        label="Stop"
-      >
-        <q-tooltip
-          ><span v-text="$t('stop_user_impersonation')"></span
-        ></q-tooltip>
-      </q-btn>
     </q-toolbar>
   </q-header>
 </template>

lnbits/templates/components/lnbits-wallet-extra.vue

@@ -83,7 +83,9 @@
                       class="text-center"
                       v-text="$t('export_to_phone_desc')"
                     ></p>
-                    <lnbits-qrcode :value="exportUrl"></lnbits-qrcode>
+                    <lnbits-qrcode
+                      :value="`${baseUrl}wallet?usr=${g.user.id}&wal=${g.wallet.id}`"
+                    ></lnbits-qrcode>
                   </q-card-section>
                 </q-card>
               </q-expansion-item>

lnbits/templates/pages/account.vue

@@ -120,7 +120,7 @@
                         class="q-mb-md"
                       ></q-input>
                       <q-input
-                        v-if="g.user.hasPassword"
+                        v-if="g.user.has_password"
                         v-model="credentialsData.oldPassword"
                         type="password"
                         autocomplete="off"
@@ -941,7 +941,7 @@
                                 v-if="props.row.thumbnail_base64"
                                 target="_blank"
                                 style="color: inherit"
-                                :href="`/api/v1/assets/${props.row.id}/data`"
+                                :href="`/api/v1/assets/${props.row.id}/binary`"
                               >
                                 <q-img
                                   :src="

lnbits/templates/pages/extensions.vue

@@ -15,7 +15,6 @@
               <q-space></q-space>
 
               <q-input
-                v-if="$q.screen.gt.sm"
                 :label="$t('search_extensions')"
                 :dense="dense"
                 class="float-right q-pr-xl"
@@ -34,14 +33,6 @@
                   </q-icon>
                 </template>
               </q-input>
-              <q-btn
-                v-else
-                flat
-                icon="search"
-                @click="searchToggle = !searchToggle"
-                class="q-mr-md"
-              >
-              </q-btn>
               <q-badge
                 v-if="g.user.admin && updatableExtensions?.length"
                 @click="showUpdateAllDialog = true"
@@ -77,25 +68,6 @@
                 ><q-tooltip v-text="$t('admin_settings')"></q-tooltip
               ></q-btn>
             </q-tabs>
-            <div v-if="$q.screen.lt.sm && searchToggle" class="q-pa-sm">
-              <q-input
-                :label="$t('search_extensions')"
-                dense
-                class=""
-                v-model="searchTerm"
-                autofocus
-              >
-                <template v-slot:append>
-                  <q-icon
-                    v-if="searchTerm !== ''"
-                    name="close"
-                    @click="searchTerm = ''"
-                    class="cursor-pointer"
-                  >
-                  </q-icon>
-                </template>
-              </q-input>
-            </div>
           </div>
         </div>
       </q-card>
@@ -163,22 +135,7 @@
                 v-text="extension.name"
               ></div>
               <div style="justify-content: space-between; display: flex">
-                <lnbits-extension-rating
+                <lnbits-extension-rating :rating="0" />
-                  :rating="
-                    formatAvg(
-                      extension.reviewStats
-                        ? extension.reviewStats.avg_rating
-                        : 0
-                    )
-                  "
-                  :count="
-                    extension.reviewStats
-                      ? extension.reviewStats.review_count
-                      : null
-                  "
-                  :clickable="!!reviewsUrl"
-                  @click="openReviews(extension)"
-                />
                 <q-btn-group size="xs" style="margin: 5px 0">
                   <q-btn
                     v-if="extension.hasFreeRelease"
@@ -1013,20 +970,8 @@
           </div>
           <div class="col-sm-12 col-md-4 q-pl-sm">
             <lnbits-extension-rating
-              :rating="
+              :rating="0"
-                formatAvg(
+              size="2.5em"
-                  selectedExtension && selectedExtension.reviewStats
-                    ? selectedExtension.reviewStats.avg_rating
-                    : 0
-                )
-              "
-              :count="
-                selectedExtension && selectedExtension.reviewStats
-                  ? selectedExtension.reviewStats.review_count
-                  : null
-              "
-              :clickable="!!reviewsUrl"
-              @click="openReviews(selectedExtension)"
             ></lnbits-extension-rating>
             <div class="q-mt-md">
               <b>
@@ -1084,182 +1029,6 @@
       </q-card-section>
     </q-card>
   </q-dialog>
-  <q-dialog v-model="reviewsDialog.show" position="top">
-    <q-card
-      class="q-pa-md lnbits__dialog-card"
-      style="width: 900px; max-width: 95vw"
-    >
-      <q-card-section class="q-gutter-y-sm">
-        <div class="row items-center">
-          <div class="col">
-            <div
-              class="text-h6"
-              v-text="
-                (reviewsDialog.extension && reviewsDialog.extension.name) ||
-                (reviewsDialog.extension && reviewsDialog.extension.id)
-              "
-            ></div>
-            <div
-              class="text-caption text-grey"
-              v-text="reviewsDialog.extension && reviewsDialog.extension.id"
-            ></div>
-          </div>
-          <div class="col-auto">
-            <lnbits-extension-rating
-              :rating="
-                formatAvg(
-                  reviewsDialog.extension && reviewsDialog.extension.reviewStats
-                    ? reviewsDialog.extension.reviewStats.avg_rating
-                    : 0
-                )
-              "
-              :count="
-                reviewsDialog.extension && reviewsDialog.extension.reviewStats
-                  ? reviewsDialog.extension.reviewStats.review_count
-                  : null
-              "
-            ></lnbits-extension-rating>
-          </div>
-        </div>
-      </q-card-section>
-      <q-separator></q-separator>
-      <q-card-section v-if="!reviewsUrl">
-        <div
-          class="text-negative"
-          v-text="$t('reviews_url_not_configured')"
-        ></div>
-      </q-card-section>
-      <q-card-section v-else>
-        <div v-if="reviewsDialog.loading" class="row justify-center q-pa-lg">
-          <q-spinner-bars color="primary" size="2.55em"></q-spinner-bars>
-        </div>
-        <div v-else>
-          <div v-if="reviewsDialog.error" class="text-negative q-mb-md">
-            <span v-text="reviewsDialog.error"></span>
-          </div>
-
-          <q-form @submit="submitReview" class="q-gutter-md">
-            <div class="row q-col-gutter-lg">
-              <div class="col-12 col-md-6">
-                <q-input
-                  dense
-                  filled
-                  v-model="reviewsDialog.form.name"
-                  :label="$t('reviews_name')"
-                ></q-input>
-              </div>
-              <div class="col-12 col-md-6">
-                <q-rating
-                  v-model="reviewsDialog.form.rating"
-                  max="10"
-                  icon="star_border"
-                  icon-selected="star"
-                  icon-half="star_half"
-                  color="primary"
-                  class="float-right"
-                ></q-rating>
-              </div>
-              <div class="col-12 col-md-6">
-                <q-input
-                  dense
-                  filled
-                  type="textarea"
-                  autogrow
-                  v-model="reviewsDialog.form.comment"
-                  :label="$t('reviews_comment')"
-                ></q-input>
-              </div>
-
-              <div class="col-12 col-md-6">
-                <q-btn
-                  type="submit"
-                  color="primary"
-                  class="float-right"
-                  unelevated
-                  :loading="reviewsDialog.submitting"
-                  :disable="!reviewsDialog.form.rating"
-                  :label="$t('reviews_submit')"
-                ></q-btn>
-              </div>
-            </div>
-          </q-form>
-          <q-separator class="q-my-md"></q-separator>
-          <div class="row q-col-gutter-lg">
-            <div class="col-12">
-              <div v-if="reviews.length === 0" class="text-grey q-mb-md">
-                <span v-text="$t('no_reviews')"></span>
-              </div>
-              <div v-else>
-                <q-table
-                  :rows="reviews"
-                  :columns="reviewsTable.columns"
-                  v-model:pagination="reviewsTable.pagination"
-                  @request="getTagReviews"
-                  :loading="reviewsTable.loading"
-                  row-key="name"
-                  :filter="reviewsTable.search"
-                >
-                  <template v-slot:body="props">
-                    <q-tr :props="props">
-                      <q-td key="name" :props="props">
-                        <span v-text="props.row.name"></span>
-                      </q-td>
-                      <q-td key="comment" :props="props">
-                        <span v-text="props.row.comment"></span>
-                      </q-td>
-                      <q-td key="created_at" :props="props">
-                        <span
-                          v-text="formatReviewDate(props.row.created_at)"
-                        ></span>
-                      </q-td>
-                      <q-td key="rating" :props="props">
-                        <q-rating
-                          class="float-right q-pt-xs"
-                          readonly
-                          icon="star_border"
-                          icon-selected="star"
-                          icon-half="star_half"
-                          :model-value="formatAvg(props.row.rating)"
-                          size="sm"
-                          color="secondary"
-                        ></q-rating>
-                      </q-td>
-                    </q-tr>
-                  </template>
-                </q-table>
-              </div>
-            </div>
-          </div>
-        </div>
-      </q-card-section>
-      <q-separator v-if="reviews.length"></q-separator>
-      <q-card-section>
-        <q-btn
-          @click="reviewsDialog.show = false"
-          color="grey"
-          outline
-          class="float-right"
-          :label="$t('close')"
-        ></q-btn>
-      </q-card-section>
-    </q-card>
-  </q-dialog>
-  <q-dialog v-model="paymentDialog.show" position="top">
-    <q-card class="q-pa-md lnbits__dialog-card">
-      <q-card-section>
-        <q-responsive :ratio="1" class="q-mx-xl q-mb-xl">
-          <lnbits-qrcode
-            :value="paymentDialog.invoice"
-            :options="{width: 800}"
-            class="rounded-borders"
-          ></lnbits-qrcode>
-        </q-responsive>
-      </q-card-section>
-      <q-card-actions align="between">
-        <q-btn v-close-popup flat color="grey" :label="$t('close')"></q-btn>
-      </q-card-actions>
-    </q-card>
-  </q-dialog>
   <q-dialog v-model="showUpdateAllDialog" position="top">
     <q-card class="q-pa-md q-pt-md lnbits__dialog-card">
       <div class="row">

lnbits/templates/pages/users.vue

@@ -656,20 +656,7 @@
                   </q-btn>
                   <span v-text="shortify(props.row.id)"></span>
                 </q-td>
-                <q-td>
+                <q-td v-text="props.row.username"></q-td>
-                  <q-btn
-                    icon="face"
-                    size="sm"
-                    flat
-                    class="cursor-pointer q-mr-xs"
-                    @click="impersonateUser(props.row.id)"
-                  >
-                    <q-tooltip
-                      ><span v-text="$t('start_user_impersonation')"></span
-                    ></q-tooltip>
-                  </q-btn>
-                  <span v-text="props.row.username"></span>
-                </q-td>
 
                 <q-td v-text="props.row.email"></q-td>
 

lnbits/wallets/__init__.py

@@ -20,7 +20,6 @@ from .corelightning import CoreLightningWallet as CLightningWallet
 from .corelightningrest import CoreLightningRestWallet
 from .eclair import EclairWallet
 from .fake import FakeWallet
-from .lightspark import LightsparkSparkWallet
 from .lnbits import LNbitsWallet
 from .lndgrpc import LndWallet
 from .lndrest import LndRestWallet
@@ -70,7 +69,6 @@ __all__ = [
     "FakeWallet",
     "LNPayWallet",
     "LNbitsWallet",
-    "LightsparkSparkWallet",
     "LnTipsWallet",
     "LndRestWallet",
     "LndWallet",

lnbits/wallets/boltz.py

@@ -5,7 +5,7 @@ from bolt11.decode import decode
 from grpc.aio import AioRpcError
 from loguru import logger
 
-from lnbits.helpers import normalize_endpoint, sha256s
+from lnbits.helpers import normalize_endpoint
 from lnbits.settings import settings
 from lnbits.wallets.boltz_grpc_files import boltzrpc_pb2, boltzrpc_pb2_grpc
 from lnbits.wallets.lnd_grpc_files.lightning_pb2_grpc import grpc
@@ -38,18 +38,21 @@ class BoltzWallet(Wallet):
             raise ValueError(
                 "cannot initialize BoltzWallet: missing boltz_client_endpoint"
             )
+        if not settings.boltz_client_wallet:
+            raise ValueError(
+                "cannot initialize BoltzWallet: missing boltz_client_wallet"
+            )
 
         self.endpoint = normalize_endpoint(
             settings.boltz_client_endpoint, add_proto=True
         )
 
-        self.metadata = None
         if settings.boltz_client_macaroon:
-            try:
+            self.metadata = [
-                macaroon = load_macaroon(settings.boltz_client_macaroon)
+                ("macaroon", load_macaroon(settings.boltz_client_macaroon))
-                self.metadata = [("macaroon", macaroon)]
+            ]
-            except Exception as e:
+        else:
-                logger.error(f"BoltzWallet failed to load macaroon: {e}")
+            self.metadata = None
 
         if settings.boltz_client_cert:
             cert = open(settings.boltz_client_cert, "rb").read()
@@ -60,21 +63,31 @@ class BoltzWallet(Wallet):
 
         self.rpc = boltzrpc_pb2_grpc.BoltzStub(channel)
         self.wallet_id = 0
-        self.wallet_name = "lnbits"
+
-        self.wallet_ready = False
+        # Auto-create wallet if running in Docker mode
+        async def _init_boltz_wallet():
+            try:
+                wallet_name = settings.boltz_client_wallet or "lnbits"
+                mnemonic = await self._fetch_wallet(wallet_name)
+                if mnemonic:
+                    logger.info(
+                        "✅ Mnemonic found for Boltz wallet, saving to settings"
+                    )
+                    settings.boltz_mnemonic = mnemonic
+
+                    from lnbits.core.crud.settings import set_settings_field
+
+                    await set_settings_field("boltz_mnemonic", mnemonic)
+                else:
+                    logger.warning("⚠️ No mnemonic returned from Boltz")
+            except Exception as e:
+                logger.error(f"❌ Failed to auto-create Boltz wallet: {e}")
+
+        self._init_wallet_task = asyncio.create_task(_init_boltz_wallet())
 
     async def status(self) -> StatusResponse:
-        if self.wallet_ready is False:
-            self.wallet_ready = True
-            if settings.boltz_mnemonic:  # restore wallet from mnemonic
-                await self._restore_boltz_wallet(
-                    settings.boltz_mnemonic,
-                    settings.boltz_client_password,
-                )
-            else:  # create new wallet
-                await self._create_boltz_wallet()
         try:
-            request = boltzrpc_pb2.GetWalletRequest(name=self.wallet_name)
+            request = boltzrpc_pb2.GetWalletRequest(name=settings.boltz_client_wallet)
             response: boltzrpc_pb2.Wallet = await self.rpc.GetWallet(
                 request, metadata=self.metadata
             )
@@ -113,18 +126,12 @@ class BoltzWallet(Wallet):
         try:
             response = await self.rpc.CreateReverseSwap(request, metadata=self.metadata)
         except AioRpcError as exc:
-            logger.warning(exc)
             return InvoiceResponse(ok=False, error_message=exc.details())
-        fee_msat = response.routing_fee_milli_sat
         return InvoiceResponse(
-            ok=True,
+            ok=True, checking_id=response.id, payment_request=response.invoice
-            checking_id=response.id,
-            payment_request=response.invoice,
-            fee_msat=fee_msat,
         )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
-
         pair = boltzrpc_pb2.Pair(**{"from": boltzrpc_pb2.LBTC})
         try:
             pair_info: boltzrpc_pb2.PairInfo
@@ -136,9 +143,8 @@ class BoltzWallet(Wallet):
 
             if not invoice.amount_msat:
                 raise ValueError("amountless invoice")
-
             service_fee: float = invoice.amount_msat * pair_info.fees.percentage / 100
-            estimate = int(service_fee + pair_info.fees.miner_fees * 1000)
+            estimate = service_fee + pair_info.fees.miner_fees * 1000
             if estimate > fee_limit_msat:
                 error = f"fee of {estimate} msat exceeds limit of {fee_limit_msat} msat"
 
@@ -160,12 +166,11 @@ class BoltzWallet(Wallet):
             if response.id == "":
                 # note that there is no way to provide a checking id here,
                 # but there is no need since it immediately is considered as successfull
-                logger.warning(
+                return PaymentResponse(
-                    "Boltz invoice paid directly on liquid network using magic routing"
+                    ok=True,
+                    checking_id=response.id,
                 )
-                return PaymentResponse(ok=True, checking_id=invoice.payment_hash)
         except AioRpcError as exc:
-            logger.warning(exc)
             return PaymentResponse(ok=False, error_message=exc.details())
 
         try:
@@ -175,15 +180,10 @@ class BoltzWallet(Wallet):
                 info_request, metadata=self.metadata
             ):
                 if info.swap.state == boltzrpc_pb2.SUCCESSFUL:
-                    fee_msat = (info.swap.onchain_fee + info.swap.service_fee) * 1000
-                    logger.debug(
-                        f"Boltz swap successful, status: {info.swap.status}"
-                        f"fee_msat: {fee_msat}"
-                    )
                     return PaymentResponse(
                         ok=True,
-                        checking_id=invoice.payment_hash,
+                        checking_id=response.id,
-                        fee_msat=fee_msat,
+                        fee_msat=(info.swap.onchain_fee + info.swap.service_fee) * 1000,
                         preimage=info.swap.preimage,
                     )
                 elif info.swap.error != "":
@@ -192,29 +192,21 @@ class BoltzWallet(Wallet):
                 ok=False, error_message="stream stopped unexpectedly"
             )
         except AioRpcError as exc:
-            logger.warning(exc)
             return PaymentResponse(ok=False, error_message=exc.details())
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         try:
-            request = boltzrpc_pb2.GetSwapInfoRequest(id=checking_id)
             response: boltzrpc_pb2.GetSwapInfoResponse = await self.rpc.GetSwapInfo(
-                request,
+                boltzrpc_pb2.GetSwapInfoRequest(id=checking_id), metadata=self.metadata
-                metadata=self.metadata,
             )
             swap = response.reverse_swap
-        except AioRpcError as exc:
+        except AioRpcError:
-            logger.warning(exc)
             return PaymentPendingStatus()
         if swap.state == boltzrpc_pb2.SwapState.SUCCESSFUL:
-            fee_msat = (
-                swap.service_fee + swap.onchain_fee
-            ) * 1000 + swap.routing_fee_msat
-            logger.debug(
-                f"Boltz swap successful, status: {swap.status}, fee_msat: {fee_msat}"
-            )
             return PaymentSuccessStatus(
-                fee_msat=fee_msat,
+                fee_msat=(
+                    (swap.service_fee + swap.onchain_fee) * 1000 + swap.routing_fee_msat
+                ),
                 preimage=swap.preimage,
             )
         elif swap.state == boltzrpc_pb2.SwapState.PENDING:
@@ -224,23 +216,18 @@ class BoltzWallet(Wallet):
 
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         try:
-            checking_id_bytes = bytes.fromhex(checking_id)
-            request = boltzrpc_pb2.GetSwapInfoRequest(payment_hash=checking_id_bytes)
             response: boltzrpc_pb2.GetSwapInfoResponse = await self.rpc.GetSwapInfo(
-                request,
+                boltzrpc_pb2.GetSwapInfoRequest(
+                    payment_hash=bytes.fromhex(checking_id)
+                ),
                 metadata=self.metadata,
             )
             swap = response.swap
-        except AioRpcError as exc:
+        except AioRpcError:
-            logger.warning(exc)
             return PaymentPendingStatus()
         if swap.state == boltzrpc_pb2.SwapState.SUCCESSFUL:
-            fee_msat = (swap.service_fee + swap.onchain_fee) * 1000
-            logger.debug(
-                f"Boltz swap successful, status: {swap.status}, fee_msat: {fee_msat}"
-            )
             return PaymentSuccessStatus(
-                fee_msat=fee_msat,
+                fee_msat=(swap.service_fee + swap.onchain_fee) * 1000,
                 preimage=swap.preimage,
             )
         elif swap.state == boltzrpc_pb2.SwapState.PENDING:
@@ -257,16 +244,7 @@ class BoltzWallet(Wallet):
                     request, metadata=self.metadata
                 ):
                     reverse = info.reverse_swap
-                    if (
+                    if reverse and reverse.state == boltzrpc_pb2.SUCCESSFUL:
-                        reverse
-                        and reverse.state == boltzrpc_pb2.SUCCESSFUL
-                        and reverse.status == "invoice.settled"
-                    ):
-                        fee_msat = ((reverse.service_fee + reverse.onchain_fee) * 1000,)
-                        logger.debug(
-                            f"Boltz reverse swap settled: {reverse.id}, "
-                            f"fee_msat: {fee_msat}"
-                        )
                         yield reverse.id
             except Exception as exc:
                 logger.error(
@@ -275,80 +253,24 @@ class BoltzWallet(Wallet):
                 )
                 await asyncio.sleep(5)
 
-    async def _check_wallet_exists(
+    async def _fetch_wallet(self, wallet_name: str) -> str | None:
-        self, wallet_name: str
-    ) -> boltzrpc_pb2.Wallet | None:
         try:
             request = boltzrpc_pb2.GetWalletRequest(name=wallet_name)
             response = await self.rpc.GetWallet(request, metadata=self.metadata)
-            return response
+            logger.info(f"Wallet '{wallet_name}' already exists with ID {response.id}")
-        except AioRpcError:
+            return settings.boltz_mnemonic
-            return None
+        except AioRpcError as exc:
+            details = exc.details() or "unknown error"
+            if exc.code() != grpc.StatusCode.NOT_FOUND:
+                logger.error(f"Error checking wallet existence: {details}")
+                raise
 
-    async def _delete_wallet(self, wallet_id: int) -> None:
-        logger.info(f"Deleting wallet '{wallet_id}'")
-        delete_request = boltzrpc_pb2.RemoveWalletRequest(id=wallet_id)
-        await self.rpc.RemoveWallet(delete_request, metadata=self.metadata)
-
-    async def _restore_wallet(self, wallet_name: str, mnemonic: str, password: str):
-        logger.info(f"Restoring wallet '{wallet_name}' from mnemonic")
-        credentials = boltzrpc_pb2.WalletCredentials(mnemonic=mnemonic)
-        params = boltzrpc_pb2.WalletParams(
-            name=wallet_name,
-            currency=boltzrpc_pb2.LBTC,
-            password=password,
-        )
-        restore_request = boltzrpc_pb2.ImportWalletRequest(
-            credentials=credentials, params=params
-        )
-        response = await self.rpc.ImportWallet(restore_request, metadata=self.metadata)
-        return response
-
-    async def _create_wallet(self, wallet_name: str, password: str) -> str:
         logger.info(f"Creating new wallet '{wallet_name}'")
         params = boltzrpc_pb2.WalletParams(
             name=wallet_name,
             currency=boltzrpc_pb2.LBTC,
-            password=password,
+            password=settings.boltz_client_password,
         )
         create_request = boltzrpc_pb2.CreateWalletRequest(params=params)
         response = await self.rpc.CreateWallet(create_request, metadata=self.metadata)
         return response.mnemonic
-
-    async def _restore_boltz_wallet(self, mnemonic: str, password: str):
-        try:
-            # delete the wallet with to name without hashing first if it exists
-            wallet = await self._check_wallet_exists(self.wallet_name)
-            if wallet:
-                await self._delete_wallet(wallet.id)
-
-            # recreate the wallet with the hashed name
-            self.wallet_name = sha256s(mnemonic + password)
-            wallet = await self._check_wallet_exists(self.wallet_name)
-            if wallet:
-                logger.success("✅ Boltz wallet exists.")
-                return
-            await self._restore_wallet(self.wallet_name, mnemonic, password)
-            logger.success("✅ Boltz wallet restored from existing mnemonic")
-        except Exception as e:
-            logger.error(f"❌ Failed to restore Boltz wallet: {e}")
-
-    async def _create_boltz_wallet(self):
-        try:
-            # delete the wallet with to name without hashing first if it exists
-            wallet = await self._check_wallet_exists(self.wallet_name)
-            if wallet:
-                await self._delete_wallet(wallet.id)
-
-            logger.info("No Mnemonic found for Boltz wallet, creating wallet...")
-            mnemonic = await self._create_wallet(
-                self.wallet_name, settings.boltz_client_password
-            )
-            logger.success("✅ Boltz wallet created successfully")
-            settings.boltz_mnemonic = mnemonic
-            from lnbits.core.crud.settings import set_settings_field
-
-            await set_settings_field("boltz_mnemonic", mnemonic)
-
-        except Exception as e:
-            logger.error(f"❌ Failed to create Boltz wallet: {e}")

lnbits/wallets/lightspark.py

@@ -1,417 +0,0 @@
-import asyncio
-import hashlib
-import json
-import shutil
-import subprocess
-import uuid
-from collections.abc import AsyncGenerator
-from pathlib import Path
-from typing import Any, cast
-
-import httpx
-from bolt11 import decode as bolt11_decode
-from loguru import logger
-
-from lnbits.helpers import download_url, normalize_endpoint
-from lnbits.settings import settings
-
-from .base import (
-    InvoiceResponse,
-    PaymentFailedStatus,
-    PaymentPendingStatus,
-    PaymentResponse,
-    PaymentStatus,
-    PaymentSuccessStatus,
-    StatusResponse,
-    Wallet,
-)
-
-
-class SparkSidecarError(Exception):
-    pass
-
-
-class LightsparkSparkWallet(Wallet):
-    """
-    Spark L2 funding source via a local sidecar service.
-
-    Required settings/env:
-      - SPARK_L2_ENDPOINT (default http://127.0.0.1:8765)
-    Optional:
-      - SPARK_L2_API_KEY
-    """
-
-    def __init__(self):
-        self._status = "Initializing"
-        self._sidecar_path = Path(settings.lnbits_data_folder, "light_spark")
-
-        self.pending_invoices: list[str] = []
-
-        self.endpoint = "http://127.0.0.1:8765"
-        self._api_key = uuid.uuid4().hex
-        if settings.spark_l2_internal_sidecar_version:
-            self._sidecar_version = settings.spark_l2_internal_sidecar_version
-            self.sidecar_task = asyncio.create_task(self._start_sidecar())
-            logger.info(f"Internal Spark sidecar ({self._sidecar_version}).")
-        elif settings.spark_l2_external_endpoint:
-            self.endpoint = normalize_endpoint(
-                cast(str, settings.spark_l2_external_endpoint)
-            )
-            self._api_key = settings.spark_l2_external_api_key
-            logger.info(f"Using external Spark sidecar endpoint: {self.endpoint}")
-        else:
-            logger.error(
-                "No Spark sidecar configuration found. Please set either "
-                "spark_l2_internal_sidecar_version or spark_l2_external_endpoint."
-            )
-
-        headers = {"User-Agent": settings.user_agent, "X-Api-Key": self._api_key}
-
-        self.client = httpx.AsyncClient(
-            base_url=self.endpoint,
-            headers=headers,
-            timeout=60,
-        )
-
-    async def cleanup(self):
-        try:
-            await self.client.aclose()
-            self.sidecar_task.cancel()
-        except RuntimeError as e:
-            logger.warning(f"Error closing wallet connection: {e}")
-
-    async def _request(
-        self, method: str, path: str, json_data: dict[str, Any] | None = None
-    ) -> dict[str, Any]:
-        error_message = None
-        try:
-            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:
-            if isinstance(exc, httpx.HTTPStatusError) and exc.response is not None:
-                try:
-                    error_json = exc.response.json()
-                    if "error" in error_json:
-                        error_message = error_json["error"]
-                except Exception as json_exc:
-                    logger.error(
-                        f"Failed to parse Spark error response as JSON: {json_exc}"
-                    )
-            raise SparkSidecarError(
-                error_message or f"Spark sidecar request error: '{exc}'"
-            ) from exc
-
-        if error_message or j.get("error"):
-            raise SparkSidecarError(
-                error_message or f"Spark sidecar error: {j['error']}"
-            )
-        return j
-
-    async def status(self) -> StatusResponse:
-        try:
-            res = await self._request("POST", "/v1/balance")
-            balance_msat = res.get("balance_msat")
-            if balance_msat is not None:
-                return StatusResponse(None, int(balance_msat))
-            balance_sats = res.get("balance_sats")
-            if balance_sats is None:
-                return StatusResponse("Spark sidecar: missing balance.", 0)
-            return StatusResponse(None, int(balance_sats) * 1000)
-        except Exception as e:
-            return StatusResponse(f"Spark sidecar status error: {e}", 0)
-
-    async def create_invoice(
-        self,
-        amount: int,
-        memo: str | None = None,
-        description_hash: bytes | None = None,
-        unhashed_description: bytes | None = None,
-        **kwargs,
-    ) -> InvoiceResponse:
-        expiry = kwargs.get("expiry")
-        expiry_secs = int(expiry) if expiry else None
-
-        description_hash_hex = None
-        if description_hash:
-            description_hash_hex = description_hash.hex()
-        elif unhashed_description:
-            description_hash_hex = hashlib.sha256(unhashed_description).hexdigest()
-
-        try:
-            payload = {
-                "amount_sats": int(amount),
-                "memo": (memo or "") if not description_hash_hex else None,
-                "description_hash": description_hash_hex,
-                "expiry_seconds": expiry_secs,
-            }
-            res = await self._request("POST", "/v1/invoices", payload)
-            bolt11 = res.get("payment_request")
-            checking_id = res.get("checking_id")
-            if not bolt11 or not checking_id:
-                raise SparkSidecarError(
-                    "Spark sidecar invoice response missing fields."
-                )
-            self.pending_invoices.append(checking_id)
-
-            return InvoiceResponse(
-                ok=True,
-                payment_request=bolt11,
-                checking_id=checking_id,
-                preimage=res.get("preimage"),
-            )
-        except Exception as e:
-            return InvoiceResponse(ok=False, error_message=str(e))
-
-    async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
-        try:
-            max_fee_sats = (int(fee_limit_msat) + 999) // 1000
-
-            payment_hash = None
-            try:
-                payment_hash = bolt11_decode(bolt11).payment_hash
-            except Exception:
-                payment_hash = None
-            payload = {
-                "bolt11": bolt11,
-                "max_fee_sats": max_fee_sats,
-                "payment_hash": payment_hash,
-            }
-            res = await self._request("POST", "/v1/payments", payload)
-            checking_id = payment_hash or res.get("checking_id")
-            if not checking_id:
-                raise SparkSidecarError(
-                    "Spark sidecar payment response missing checking_id."
-                )
-            status = res.get("status")
-            fee_msat = res.get("fee_msat")
-            ok = None
-            if status:
-                ok = self._map_payment_ok(status)
-            return PaymentResponse(
-                ok=ok,
-                checking_id=checking_id,
-                fee_msat=int(fee_msat) if fee_msat is not None else None,
-                preimage=res.get("preimage"),
-            )
-
-        except Exception as e:
-            return PaymentResponse(ok=False, error_message=str(e))
-
-    async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
-        try:
-            res = await self._request("GET", f"/v1/invoices/{checking_id}")
-            status = res.get("status")
-            if not status:
-                return PaymentPendingStatus()
-            return self._map_invoice_status(status)
-        except Exception:
-            return PaymentPendingStatus()
-
-    async def get_payment_status(self, checking_id: str) -> PaymentStatus:
-        try:
-            res = await self._request("GET", f"/v1/payments/{checking_id}")
-            status = res.get("status")
-            fee_msat = res.get("fee_msat")
-            preimage = res.get("preimage")
-            if not status:
-                return PaymentPendingStatus()
-            mapped = self._map_payment_status(status)
-            if mapped.success:
-                return PaymentSuccessStatus(
-                    fee_msat=int(fee_msat) if fee_msat is not None else None,
-                    preimage=preimage,
-                )
-            if mapped.failed:
-                return PaymentFailedStatus()
-            return PaymentPendingStatus()
-        except Exception:
-            return PaymentPendingStatus()
-
-    def _map_invoice_status(self, status: str) -> PaymentStatus:
-        success = {
-            "LIGHTNING_PAYMENT_RECEIVED",
-            "TRANSFER_COMPLETED",
-            "PAYMENT_PREIMAGE_RECOVERED",
-        }
-        failed = {
-            "TRANSFER_FAILED",
-            "PAYMENT_PREIMAGE_RECOVERING_FAILED",
-            "REFUND_SIGNING_FAILED",
-            "REFUND_SIGNING_COMMITMENTS_QUERYING_FAILED",
-            "TRANSFER_CREATION_FAILED",
-        }
-        if status in success:
-            return PaymentSuccessStatus()
-        if status in failed:
-            return PaymentFailedStatus()
-        return PaymentPendingStatus()
-
-    def _map_payment_status(self, status: str) -> PaymentStatus:
-        success = {
-            "LIGHTNING_PAYMENT_SUCCEEDED",
-            "TRANSFER_COMPLETED",
-            "PREIMAGE_PROVIDED",
-        }
-        failed = {
-            "LIGHTNING_PAYMENT_FAILED",
-            "TRANSFER_FAILED",
-            "PREIMAGE_PROVIDING_FAILED",
-            "USER_TRANSFER_VALIDATION_FAILED",
-            "USER_SWAP_RETURN_FAILED",
-        }
-        if status in success:
-            return PaymentSuccessStatus()
-        if status in failed:
-            return PaymentFailedStatus()
-        return PaymentPendingStatus()
-
-    def _map_payment_ok(self, status: str) -> bool | None:
-        mapped = self._map_payment_status(status)
-        if mapped.success:
-            return True
-        if mapped.failed:
-            return False
-        return None
-
-    async def _poll_pending_invoices(self) -> AsyncGenerator[str, None]:
-        while settings.lnbits_running:
-            for invoice in list(self.pending_invoices):
-                try:
-                    status = await self.get_invoice_status(invoice)
-                    if status.paid:
-                        yield invoice
-                        self.pending_invoices.remove(invoice)
-                    elif status.failed:
-                        self.pending_invoices.remove(invoice)
-                except Exception as exc:
-                    logger.error(f"could not get status of invoice {invoice}: '{exc}' ")
-            await asyncio.sleep(5)
-
-    async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
-        stream_path = "/v1/invoices/stream"
-        while settings.lnbits_running:
-            try:
-                async with self.client.stream("GET", stream_path, timeout=None) as r:
-                    if r.status_code in {404, 405}:
-                        logger.warning(
-                            "Spark sidecar invoice stream not available, "
-                            "falling back to polling."
-                        )
-                        async for checking_id in self._poll_pending_invoices():
-                            yield checking_id
-                        return
-                    r.raise_for_status()
-                    logger.info("connected to Spark sidecar invoice stream.")
-                    async for line in r.aiter_lines():
-                        if not line or not line.startswith("data:"):
-                            continue
-                        data = json.loads(line[5:].strip())
-                        checking_id = data.get("checking_id")
-                        if not checking_id:
-                            continue
-                        yield checking_id
-            except Exception as exc:
-                logger.error(
-                    "lost connection to Spark sidecar invoice stream: "
-                    f"'{exc}' retrying in 5 seconds"
-                )
-                await asyncio.sleep(5)
-
-    async def _start_sidecar(self):
-        logger.info("Starting Spark sidecar")
-        node_path = shutil.which("node")
-        if not node_path:
-            logger.error("Node.js not found in PATH, cannot start Spark sidecar")
-            return
-        logger.info(f"Node.js found: {node_path}")
-
-        repo, version = "spark_sidecar", self._sidecar_version
-        node_modules_path = Path(self._sidecar_path, f"{repo}-{version}")
-        await self._prepare_sidecar(repo, version, node_modules_path)
-
-        await self._start_sidecar_process(node_path, node_modules_path)
-
-    async def _prepare_sidecar(self, repo: str, version: str, node_modules_path: Path):
-        if not Path(node_modules_path, "package.json").is_file():
-            await self._download_sidecar(repo, version)
-        else:
-            logger.info("Spark sidecar already downloaded.")
-
-        if not Path(node_modules_path, "node_modules").is_dir():
-            self._install_sidecar_packages(node_modules_path)
-        else:
-            logger.info("Spark sidecar npm dependencies already installed.")
-
-    def _install_sidecar_packages(self, node_modules_path: Path):
-        logger.info(f"Installing Spark sidecar npm dependencies {node_modules_path}")
-        npm_path = shutil.which("npm")
-        if not npm_path:
-            logger.error("npm not found in PATH, cannot start Spark sidecar")
-            return
-        logger.info(f"npm found: {npm_path}")
-
-        result = subprocess.run(  # noqa: S603
-            [npm_path, "install"],
-            cwd=str(node_modules_path),
-            capture_output=True,
-            text=True,
-            shell=False,
-            check=True,  # raises an exception if npm fails
-        )
-        logger.info("Spark sidecar npm dependencies installed.")
-        logger.info("npm install output:")
-        logger.info(result.stdout)
-        logger.error(result.stderr)
-
-    async def _start_sidecar_process(self, node_path: str, node_modules_path: Path):
-        logger.info("Starting Spark sidecar node process.")
-
-        env = {
-            "SPARK_NETWORK": settings.spark_l2_network,
-            "SPARK_SIDECAR_API_KEY": self._api_key or "",
-            "SPARK_PAY_WAIT_MS": str(settings.spark_l2_pay_wait_ms),
-            "SPARK_MNEMONIC": str(settings.spark_l2_mnemonic),
-        }
-
-        process = subprocess.Popen(  # noqa: S603
-            [node_path, "server.mjs"],
-            env=env,
-            cwd=str(node_modules_path),
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-            shell=False,
-            text=True,
-        )
-
-        logger.info("Started Spark sidecar node process.")
-        await asyncio.to_thread(self._log_process_output, process)
-
-    async def _download_sidecar(self, repo: str, version: str):
-        zip_path = Path(self._sidecar_path, f"{repo}.zip")
-        logger.info(f"⏳ Downloading Spark sidecar to {zip_path}")
-        Path(zip_path).parent.mkdir(parents=True, exist_ok=True)
-
-        await asyncio.to_thread(
-            download_url,
-            f"https://github.com/lnbits/{repo}/archive/refs/tags/v{version}.zip",
-            zip_path,
-        )
-        logger.info("✅ Downloaded Spark sidecar.")
-
-        logger.info("⏳ Extracting Spark sidecar.")
-
-        shutil.unpack_archive(
-            zip_path,
-            self._sidecar_path,
-        )
-        logger.info("✅ Extracted Spark sidecar.")
-        shutil.rmtree(zip_path, ignore_errors=True)
-        # todo: remove zip
-
-    def _log_process_output(self, process: subprocess.Popen):
-        if process.stdout:
-            for line in process.stdout:
-                logger.warning(f"[Lightspark]: {line}", end="")
-        else:
-            logger.error(" No output captured for Spark sidecar.")

lnbits/wallets/lndrest.py

@@ -178,7 +178,7 @@ class LndRestWallet(Wallet):
             "no_inflight_updates": True,
         }
         if settings.lnd_rest_allow_self_payment:
-            req["allow_self_payment"] = True
+            req["allow_self_payment"] = 1
 
         try:
             r = await self.client.post(

package.json

@@ -98,8 +98,6 @@
       "js/pages/error.js",
       "js/pages/home.js",
       "js/pages/extensions_builder.js",
-      "js/pages/extensions_builder.js",
-      "js/pages/extensions_builder_preview.js",
       "js/pages/extensions.js",
       "js/pages/first-install.js",
       "js/pages/payments.js",