fix: dependencies

This reverts commit e7c359c1e0e21a8aeea391fd5b2cd6316526d42c.

.github/workflows/appimage.yml

@@ -7,10 +7,6 @@ on:
         description: 'The tag name for the release'
         required: true
         type: string
-      upload_url:
-        description: 'The upload URL for the release'
-        required: true
-        type: string
 
   workflow_dispatch:
     inputs:
@@ -18,10 +14,6 @@ on:
         description: 'The tag name for the release'
         required: true
         type: string
-      upload_url:
-        description: 'The upload URL for the release'
-        required: true
-        type: string
 
 jobs:
   build-linux-package:
@@ -113,11 +105,6 @@ jobs:
         shell: bash
 
       - name: Upload Linux Release Asset
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ inputs.upload_url }}
-          asset_path: ${{ env.APPIMAGE_NAME }}
-          asset_name: ${{ env.APPIMAGE_NAME }}
-          asset_content_type: application/octet-stream
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh release upload "${{ inputs.tag_name }}" "${{ env.APPIMAGE_NAME }}" --clobber

.github/workflows/ci.yml

@@ -64,13 +64,6 @@ jobs:
     with:
       make: openapi
 
-  test-wasm-e2e:
-    needs: [ lint ]
-    uses: ./.github/workflows/make.yml
-    with:
-      make: test-wasm-e2e
-      playwright-browser: chromium
-
   regtest:
     needs: [ lint ]
     uses: ./.github/workflows/regtest.yml
@@ -102,5 +95,5 @@ jobs:
       python-version: ${{ matrix.python-version }}
 
   bundle:
-    needs: [ lint, test-api, test-wallets, test-unit, migration, openapi, test-wasm-e2e, regtest, jmeter ]
+    needs: [ lint, test-api, test-wallets, test-unit, migration, openapi, regtest, jmeter ]
     uses: ./.github/workflows/bundle.yml

.github/workflows/make.yml

@@ -15,10 +15,6 @@ on:
         description: "python version"
         type: string
         default: "3.12"
-      playwright-browser:
-        description: "Playwright browser to install before running make"
-        default: ""
-        type: string
 
 jobs:
   make:
@@ -35,7 +31,4 @@ jobs:
           python-version: ${{ inputs.python-version }}
           node-version: ${{ matrix.node-version }}
           npm: ${{ inputs.npm }}
-      - name: Install Playwright browser
-        if: ${{ inputs.playwright-browser != '' }}
-        run: uv run playwright install --with-deps ${{ inputs.playwright-browser }}
       - run: make ${{ inputs.make }}

.github/workflows/release-rc.yml

@@ -12,8 +12,6 @@ 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
@@ -22,14 +20,6 @@ jobs:
           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'
@@ -74,4 +64,3 @@ jobs:
     uses: ./.github/workflows/appimage.yml
     with:
       tag_name: ${{ github.ref_name }}
-      upload_url: ${{ needs.release.outputs.upload_url }}

.github/workflows/release.yml

@@ -13,8 +13,6 @@ 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 release
@@ -23,14 +21,6 @@ jobs:
           tag: ${{ github.ref_name }}
         run: |
           gh release create "$tag" --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'
@@ -85,4 +75,3 @@ jobs:
     uses: ./.github/workflows/appimage.yml
     with:
       tag_name: ${{ github.ref_name }}
-      upload_url: ${{ needs.release.outputs.upload_url }}

.prettierignore

@@ -16,5 +16,3 @@
 flake.lock
 
 .venv
-
-tests/fixtures/lnbits-wasm-test-extension/static/html-like.js

Makefile

@@ -62,12 +62,6 @@ test-api:
 	DEBUG=true \
 	uv run pytest tests/api
 
-test-wasm-e2e:
-	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
-	PYTHONUNBUFFERED=1 \
-	DEBUG=true \
-	uv run pytest tests/wasm_ext --browser chromium
-
 test-regtest:
 	LNBITS_DATA_FOLDER="./tests/data" \
 	PYTHONUNBUFFERED=1 \

lnbits/core/helpers.py

@@ -27,7 +27,13 @@ async def migrate_extension_database(
     if is_wasm_extension_id(ext.id):
         await migrate_wasm_extension_database(ext, current_version)
         return
+    else:
+        await migrate_py_extension_database(ext, current_version)
 
+
+async def migrate_py_extension_database(
+    ext: InstallableExtension, current_version: DbVersion | None = None
+):
     try:
         ext_migrations = importlib.import_module(f"{ext.module_name}.migrations")
         ext_db = importlib.import_module(ext.module_name).db

lnbits/core/models/extensions.py

@@ -179,6 +179,8 @@ class Extension(BaseModel):
 
     @property
     def is_upgrade_extension(self) -> bool:
+        if self.is_wasm:
+            return False
         return self.upgrade_hash != ""
 
     @classmethod
@@ -189,19 +191,11 @@ class Extension(BaseModel):
             is_wasm=ext_info.is_wasm,
             name=ext_info.name,
             short_description=ext_info.short_description,
-            tile=(
-                wasm_extension_icon_url(ext_info.id)
-                if ext_info.is_wasm
-                else ext_info.icon
-            ),
+            tile=_extension_tile(ext_info),
             upgrade_hash=ext_info.hash if ext_info.ext_upgrade_dir.is_dir() else "",
         )
 
 
-def wasm_extension_icon_url(ext_id: str) -> str:
-    return f"/ext-assets/{ext_id}/assets/icon.png"
-
-
 class ExtensionRelease(BaseModel):
     name: str
     version: str
@@ -479,7 +473,7 @@ class InstallableExtension(BaseModel):
 
         try:
             with zipfile.ZipFile(self.zip_path, "r") as archive:
-                config_name = self._archive_config_name(archive.namelist())
+                config_name = _archive_config_name(archive.namelist())
                 if not config_name:
                     return {}
                 with archive.open(config_name) as config_file:
@@ -489,14 +483,6 @@ class InstallableExtension(BaseModel):
 
         return config if isinstance(config, dict) else {}
 
-    @staticmethod
-    def _archive_config_name(names: list[str]) -> str | None:
-        for name in names:
-            path = PurePosixPath(name)
-            if len(path.parts) == 2 and path.name == "config.json":
-                return name
-        return None
-
     def extract_archive(self):
         logger.info(f"Extracting extension {self.name} ({self.installed_version}).")
         Path(settings.lnbits_extensions_upgrade_path).mkdir(parents=True, exist_ok=True)
@@ -919,3 +905,21 @@ def icon_to_github_url(source_repo: str, path: str | None) -> str:
     _, _, *rest = path.split("/")
     tail = "/".join(rest)
     return f"https://github.com/{source_repo}/raw/main/{tail}"
+
+
+def wasm_extension_icon_url(ext_id: str) -> str:
+    return f"/ext-assets/{ext_id}/assets/icon.png"
+
+
+def _extension_tile(ext_info: InstallableExtension) -> str | None:
+    if ext_info.is_wasm:
+        return wasm_extension_icon_url(ext_info.id)
+    return ext_info.icon
+
+
+def _archive_config_name(names: list[str]) -> str | None:
+    for name in names:
+        path = PurePosixPath(name)
+        if len(path.parts) == 2 and path.name == "config.json":
+            return name
+    return None

lnbits/core/services/extensions.py

@@ -71,7 +71,7 @@ async def install_extension(
         await update_installed_extension(ext_info)
 
     extension = Extension.from_installable_ext(ext_info)
-    if extension.is_upgrade_extension and not extension.is_wasm:
+    if extension.is_upgrade_extension:
         # call stop while the old routes are still active
         await stop_extension_background_work(ext_info.id)
 

lnbits/core/tasks.py

@@ -27,7 +27,7 @@ from lnbits.core.services.notifications import (
 from lnbits.db import Filters
 from lnbits.settings import settings
 from lnbits.utils.cache import cache
-from lnbits.utils.exchange_rates import btc_rates
+from lnbits.utils.exchange_rates import btc_price_from_aggregator, btc_rates
 
 audit_queue: asyncio.Queue[AuditEntry] = asyncio.Queue()
 
@@ -153,17 +153,34 @@ async def collect_exchange_rates_data() -> None:
 
         if sleep_time > 0:
             try:
-                rates = await btc_rates(currency)
-                if rates:
-                    rates_values = [r[1] for r in rates]
-                    lnbits_rate = sum(rates_values) / len(rates_values)
-                    rates.append(("LNbits", lnbits_rate))
-                    cache.set(
-                        f"btc-price-{currency}",
-                        lnbits_rate,
-                        expiry=settings.lnbits_exchange_rate_cache_seconds,
+                if (
+                    settings.lnbits_price_aggregator_enabled
+                    and settings.lnbits_price_aggregator_url
+                ):
+                    price = await btc_price_from_aggregator(currency)
+                    if price:
+                        cache.set(
+                            f"btc-price-{currency}",
+                            price,
+                            expiry=settings.lnbits_exchange_rate_cache_seconds,
+                        )
+                        settings.append_exchange_rate_datapoint(
+                            {"Aggregator": price}, max_history_size
+                        )
+                else:
+                    rates = await btc_rates(currency)
+                    if rates:
+                        rates_values = [r[1] for r in rates]
+                        lnbits_rate = sum(rates_values) / len(rates_values)
+                        rates.append(("LNbits", lnbits_rate))
+                        cache.set(
+                            f"btc-price-{currency}",
+                            lnbits_rate,
+                            expiry=settings.lnbits_exchange_rate_cache_seconds,
+                        )
+                    settings.append_exchange_rate_datapoint(
+                        dict(rates), max_history_size
                     )
-                settings.append_exchange_rate_datapoint(dict(rates), max_history_size)
             except Exception as ex:
                 logger.warning(ex)
         else:

lnbits/core/wasm_ext/api/host.py

@@ -9,6 +9,7 @@ from typing import Any
 
 from lnbits.helpers import sha256s
 
+from ..client.extensions import send_extension_api_request
 from ..storage.crud import (
     storage_delete_row,
     storage_get_paginated_rows,
@@ -68,7 +69,7 @@ class ExtensionHostAPI:
         self.owner_id = sha256s(user_id) if user_id else owner_id
         from .utils import ExtensionAPIUtils
 
-        self.utils = ExtensionAPIUtils(self)
+        self.utils = ExtensionAPIUtils(self.extension_id, self.permissions)
 
     @extension_api_method(
         method_id="storage.get",
@@ -425,7 +426,6 @@ class ExtensionHostAPI:
         require_auth=True,
     )
     async def extension_api_request(self, request: ExtensionApiRequest) -> HttpResponse:
-        from ..client.extensions import send_extension_api_request
 
         policies = self.permission_policies.get("extension.api.request") or []
         return await send_extension_api_request(

lnbits/core/wasm_ext/api/utils.py

@@ -1,8 +1,19 @@
 from __future__ import annotations
 
 import time
+from collections.abc import Iterable
 from datetime import datetime
-from typing import TYPE_CHECKING, Any
+from typing import Any
+
+from lnbits import bolt11
+from lnbits.settings import settings
+from lnbits.utils.crypto import random_secret_and_hash, verify_preimage
+from lnbits.utils.exchange_rates import (
+    allowed_currencies,
+    fiat_amount_as_satoshis,
+    get_fiat_rate_and_price_satoshis,
+    satoshis_amount_as_fiat,
+)
 
 from .models import (
     Bolt11Request,
@@ -30,21 +41,28 @@ from .models import (
 )
 from .registry import extension_api_method
 
-if TYPE_CHECKING:
-    from .host import ExtensionHostAPI
-
 
 class ExtensionAPIUtils:
-    def __init__(self, api: ExtensionHostAPI) -> None:
-        self.api = api
-        self.currencies = ExtensionCurrencyUtils(api)
-        self.server = ExtensionServerUtils(api)
-        self.lightning = ExtensionLightningUtils(api)
+    def __init__(self, extension_id: str, permissions: Iterable[str]) -> None:
+        permission_set = set(permissions)
+        self.currencies = ExtensionCurrencyUtils(extension_id, permission_set)
+        self.server = ExtensionServerUtils(extension_id, permission_set)
+        self.lightning = ExtensionLightningUtils(extension_id, permission_set)
 
 
 class _ExtensionAPIUtilsGroup:
-    def __init__(self, api: ExtensionHostAPI) -> None:
-        self.api = api
+    def __init__(self, extension_id: str, permissions: Iterable[str]) -> None:
+        self.extension_id = extension_id
+        self.permissions = set(permissions)
+
+    def require_permission(self, permission: str | None) -> None:
+        if permission and permission not in self.permissions:
+            raise PermissionError(
+                f"Extension '{self.extension_id}' is missing permission '{permission}'."
+            )
+
+    def has_authenticated_context(self) -> bool:
+        return False
 
 
 class ExtensionCurrencyUtils(_ExtensionAPIUtilsGroup):
@@ -60,7 +78,6 @@ class ExtensionCurrencyUtils(_ExtensionAPIUtilsGroup):
         require_auth=False,
     )
     async def list(self, request: EmptyRequest) -> CurrencyListResponse:
-        from lnbits.utils.exchange_rates import allowed_currencies
 
         return CurrencyListResponse(currencies=allowed_currencies())
 
@@ -76,7 +93,6 @@ class ExtensionCurrencyUtils(_ExtensionAPIUtilsGroup):
         require_auth=False,
     )
     async def rate(self, request: CurrencyRateRequest) -> CurrencyRateResponse:
-        from lnbits.utils.exchange_rates import get_fiat_rate_and_price_satoshis
 
         rate, price = await get_fiat_rate_and_price_satoshis(request.currency)
         return CurrencyRateResponse(rate=rate, price=price)
@@ -93,10 +109,6 @@ class ExtensionCurrencyUtils(_ExtensionAPIUtilsGroup):
         require_auth=False,
     )
     async def convert(self, request: CurrencyConvertRequest) -> CurrencyConvertResponse:
-        from lnbits.utils.exchange_rates import (
-            fiat_amount_as_satoshis,
-            satoshis_amount_as_fiat,
-        )
 
         from_currency = request.from_currency
         if from_currency == "sats":
@@ -135,7 +147,6 @@ class ExtensionCurrencyUtils(_ExtensionAPIUtilsGroup):
         require_auth=False,
     )
     async def fiat_to_sats(self, request: FiatToSatsRequest) -> FiatToSatsResponse:
-        from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
 
         return FiatToSatsResponse(
             amount_sat=await fiat_amount_as_satoshis(
@@ -156,7 +167,6 @@ class ExtensionCurrencyUtils(_ExtensionAPIUtilsGroup):
         require_auth=False,
     )
     async def sats_to_fiat(self, request: SatsToFiatRequest) -> SatsToFiatResponse:
-        from lnbits.utils.exchange_rates import satoshis_amount_as_fiat
 
         return SatsToFiatResponse(
             amount=await satoshis_amount_as_fiat(request.amount, request.currency)
@@ -176,7 +186,6 @@ class ExtensionServerUtils(_ExtensionAPIUtilsGroup):
         require_auth=False,
     )
     async def health(self, request: EmptyRequest) -> ServerHealthResponse:
-        from lnbits.settings import settings
 
         return ServerHealthResponse(
             server_time=int(time.time()),
@@ -298,7 +307,6 @@ class ExtensionLightningUtils(_ExtensionAPIUtilsGroup):
     async def verify_preimage(
         self, request: VerifyPreimageRequest
     ) -> VerifyPreimageResponse:
-        from lnbits.utils.crypto import verify_preimage
 
         return VerifyPreimageResponse(
             valid=verify_preimage(request.preimage, request.payment_hash)
@@ -318,7 +326,6 @@ class ExtensionLightningUtils(_ExtensionAPIUtilsGroup):
     async def random_secret_and_hash(
         self, request: RandomSecretAndHashRequest
     ) -> RandomSecretAndHashResponse:
-        from lnbits.utils.crypto import random_secret_and_hash
 
         secret, payment_hash = random_secret_and_hash(request.length)
         return RandomSecretAndHashResponse(secret=secret, hash=payment_hash)
@@ -333,7 +340,6 @@ def extension_api_utils_method_classes() -> dict[str, type[_ExtensionAPIUtilsGro
 
 
 def _decode_bolt11(payment_request: str) -> Any:
-    from lnbits import bolt11
 
     return bolt11.decode(payment_request)
 

lnbits/core/wasm_ext/wasm/component.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 from functools import lru_cache
 from typing import Any
 
+from wasmtime import Config, Engine
+
 from .loader import WasmExtension
 
 
@@ -12,14 +14,6 @@ def warm_wasm_extension(extension: WasmExtension) -> None:
 
 @lru_cache(maxsize=1)
 def _wasm_engine() -> Any:
-    try:
-        from wasmtime import Config, Engine
-    except ImportError as exc:
-        raise RuntimeError(
-            "WASM extension runtime is not installed. Install the 'wasmtime' "
-            "Python package to run WASM extensions."
-        ) from exc
-
     config = Config()
     config.wasm_component_model = True
     return Engine(config)

lnbits/core/wasm_ext/wasm/events.py

@@ -4,6 +4,8 @@ from typing import Any
 from loguru import logger
 
 from lnbits.core.db import core_app_extra
+from lnbits.core.wasm_ext.storage.crud import storage_get_row_owner_id
+from lnbits.core.wasm_ext.wasm.invoke import invoke_wasm_extension_export
 
 
 async def dispatch_wasm_invoice_paid(payment: Any) -> None:
@@ -27,8 +29,6 @@ async def dispatch_wasm_invoice_paid(payment: Any) -> None:
         return
 
     try:
-        from lnbits.core.wasm_ext.wasm.invoke import invoke_wasm_extension_export
-
         await invoke_wasm_extension_export(
             extension.id,
             export_name,
@@ -58,8 +58,6 @@ async def _wasm_invoice_paid_owner_id(extension: Any, payment: Any) -> str | Non
     if not source_id or not source_tables:
         return None
 
-    from lnbits.core.wasm_ext.storage.crud import storage_get_row_owner_id
-
     for source_table in source_tables:
         owner_id = await storage_get_row_owner_id(extension.id, source_table, source_id)
         if owner_id:

lnbits/core/wasm_ext/wasm/host.py

@@ -5,6 +5,8 @@ import re
 from collections.abc import Mapping
 from typing import Any
 
+from wasmtime import component
+
 from ..api.models import EmptyRequest
 from ..api.registry import list_extension_api_methods
 from ..api.runtime import ExtensionAPIHost
@@ -73,7 +75,6 @@ def _component_payload_to_dict(value: Any) -> dict[str, Any]:
 
 
 def _dict_to_component_record(value: Mapping[str, Any]) -> Any:
-    from wasmtime import component
 
     record = component.Record()
     for key, item in value.items():

lnbits/core/wasm_ext/wasm/invoke.py

@@ -5,6 +5,8 @@ import json
 from collections.abc import Mapping
 from typing import Any
 
+from wasmtime import Store, WasiConfig, component
+
 from lnbits.core.crud.extensions import get_installed_extension
 from lnbits.core.db import core_app_extra
 
@@ -54,13 +56,6 @@ def _invoke_wasm_extension_export_sync(
     api: ExtensionHostAPI,
     event_loop: asyncio.AbstractEventLoop,
 ) -> dict[str, Any]:
-    try:
-        from wasmtime import Store, WasiConfig, component
-    except ImportError as exc:
-        raise RuntimeError(
-            "WASM extension runtime is not installed. Install the 'wasmtime' "
-            "Python package to run WASM extensions."
-        ) from exc
 
     engine = _wasm_engine()
     store = Store(engine)

lnbits/settings.py

@@ -362,6 +362,8 @@ class ExchangeProvidersSettings(LNbitsSettings):
     lnbits_exchange_rate_cache_seconds: int = Field(default=60, ge=0)
     lnbits_exchange_history_size: int = Field(default=60, ge=0)
     lnbits_exchange_history_refresh_interval_seconds: int = Field(default=300, ge=0)
+    lnbits_price_aggregator_enabled: bool = Field(default=True)
+    lnbits_price_aggregator_url: str = Field(default="https://price.lnbits.com")
 
     lnbits_exchange_rate_providers: list[ExchangeRateProvider] = Field(
         default=[

lnbits/static/i18n/en.js

@@ -520,7 +520,6 @@ window.localisation.en = {
   extension_cost: 'This release requires a payment of minimum {cost} sats.',
   extension_paid_sats: 'You have already paid {paid_sats} sats.',
   extension_permissions_title: 'Grant extension permissions',
-  extension_permissions_request: 'This extension requests these permissions:',
   extension_permissions_grant_install: 'Grant and install',
   extension_permissions_high_risk_warning:
     'This extension requests permissions that can move funds.',
@@ -531,41 +530,25 @@ window.localisation.en = {
     'Can spend funds from wallets available to your account.',
   extension_permission_warning_extension_api_request_write:
     'Can write data or trigger actions in approved extensions.',
-  extension_permission_warning_http_request:
-    'Can send data to external services.',
   extension_permission_ext_storage_read: 'Read extension storage',
   extension_permission_ext_storage_read_public: 'Read public extension storage',
   extension_permission_ext_storage_write: 'Write extension storage',
   extension_permission_ext_storage_read_write: 'Read & Write extension storage',
   extension_permission_extension_api_request: 'Use other extensions',
-  extension_permission_extension_api_request_desc:
-    'Call approved installed extensions using your account permissions.',
   extension_permission_extension_api_request_extensions: 'Allowed extensions',
   extension_permission_access_read: 'Read',
   extension_permission_access_write: 'Write',
   extension_permission_http_request: 'Connect to external websites',
-  extension_permission_http_request_desc:
-    'Make HTTP requests to approved external hosts.',
   extension_permission_http_request_hosts: 'Allowed hosts',
   extension_permission_utils_basic: 'Use basic LNbits utilities',
-  extension_permission_utils_basic_desc:
-    'Use public currency conversion, server health, and Lightning invoice helper functions.',
   extension_permission_ui_camera_scan_qr: 'Scan QR codes',
-  extension_permission_ui_camera_scan_qr_desc:
-    'Use the LNbits scanner to read QR codes when you choose to scan.',
   extension_permission_payments_watch: 'Watch payments',
   extension_permission_wallet_create_invoice: 'Create invoices',
   extension_permission_wallet_create_invoice_public:
     'Create Lightning invoices from public pages',
-  extension_permission_wallet_create_invoice_public_desc:
-    'Create incoming Lightning invoices from public pages.',
   extension_permission_wallet_balance_read: 'View wallet balances',
-  extension_permission_wallet_balance_read_desc:
-    'Read balances of wallets available to your account.',
   extension_permission_wallet_list: 'List wallets',
   extension_permission_wallet_pay_invoice: 'Pay invoices',
-  extension_permission_wallet_pay_invoice_desc:
-    'Send Lightning payments from wallets available to your account.',
   create_extension: 'Create Extension',
   release_details_error: 'Cannot get the release details.',
   pay_from_wallet: 'Pay from Wallet',

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

@@ -62,12 +62,6 @@ window.app.component('lnbits-admin-exchange-providers', {
   mounted() {
     this.getExchangeRateHistory()
   },
-  created() {
-    const hash = window.location.hash.replace('#', '')
-    if (hash === 'exchange_providers') {
-      this.showExchangeProvidersTab(hash)
-    }
-  },
   methods: {
     getDefaultSetting(fieldName) {
       LNbits.api.getDefaultSetting(fieldName).then(response => {
@@ -127,18 +121,21 @@ window.app.component('lnbits-admin-exchange-providers', {
       this.exchangeData.showTickerConversion = true
     },
     initExchangeChart(data) {
+      if (this.exchangeRatesChart) {
+        this.exchangeRatesChart.destroy()
+        this.exchangeRatesChart = null
+      }
       const xValues = data.map(d =>
         this.utils.formatTimestamp(d.timestamp, 'HH:mm')
       )
-      const exchanges = [
-        ...this.formData.lnbits_exchange_rate_providers,
-        {name: 'LNbits'}
-      ]
+      const exchanges = this.formData.lnbits_price_aggregator_enabled
+        ? [{name: 'Aggregator'}]
+        : [...this.formData.lnbits_exchange_rate_providers, {name: 'LNbits'}]
       const datasets = exchanges.map(exchange => ({
         label: exchange.name,
         data: data.map(d => d.rates[exchange.name]),
         pointStyle: true,
-        borderWidth: exchange.name === 'LNbits' ? 4 : 1,
+        borderWidth: exchange.name === 'LNbits' ? 4 : 2,
         tension: 0.4
       }))
       this.exchangeRatesChart = new Chart(
@@ -148,7 +145,11 @@ window.app.component('lnbits-admin-exchange-providers', {
           options: {
             plugins: {
               legend: {
-                display: false
+                display: true
+              },
+              title: {
+                display: true,
+                text: 'Bitcoin Price History'
               }
             }
           },

lnbits/static/js/components/lnbits-extension-permissions.js

@@ -0,0 +1,324 @@
+;(function () {
+  function translate(translateFn, key) {
+    return translateFn ? translateFn(key) : key
+  }
+
+  function permissionI18nKey(permission) {
+    return `extension_permission_${permission.id.replace(/[^A-Za-z0-9]/g, '_')}`
+  }
+
+  function permissionLabel(permission, translateFn) {
+    const key = permissionI18nKey(permission)
+    const label = translate(translateFn, key)
+    return label === key ? permission.id : label
+  }
+
+  function permissionManifestDescription(permission) {
+    return typeof permission.description === 'string'
+      ? permission.description
+      : ''
+  }
+
+  function lowRisk(translateFn) {
+    return {
+      level: 'low',
+      color: 'grey-6',
+      label: translate(translateFn, 'extension_permission_risk_low'),
+      warning: ''
+    }
+  }
+
+  function mediumRisk(translateFn) {
+    return {
+      level: 'medium',
+      color: 'warning',
+      label: translate(translateFn, 'extension_permission_risk_medium'),
+      warning: ''
+    }
+  }
+
+  function highRisk(translateFn, warningKey) {
+    return {
+      level: 'high',
+      color: 'negative',
+      label: translate(translateFn, 'extension_permission_risk_high'),
+      warning: translate(translateFn, warningKey)
+    }
+  }
+
+  function extensionDisplayName(extensions, extensionId) {
+    const extension = (extensions || []).find(
+      extension => extension.id === extensionId
+    )
+    return extension?.name || extensionId
+  }
+
+  function extensionApiPermissionTargets(permission, extensions) {
+    const extensionPolicies = permission.policies
+    if (!Array.isArray(extensionPolicies)) return []
+    return extensionPolicies
+      .map(extension => {
+        const extensionId =
+          typeof extension === 'string' ? extension : extension?.id
+        if (!extensionId) return null
+        const access =
+          typeof extension === 'string'
+            ? ['read']
+            : Array.isArray(extension.access) && extension.access.length
+              ? extension.access
+              : ['read']
+        return {
+          id: extensionId,
+          name: extensionDisplayName(extensions, extensionId),
+          access
+        }
+      })
+      .filter(Boolean)
+  }
+
+  function permissionRiskForPermission(permission, extensions, translateFn) {
+    if (permission.id === 'wallet.pay_invoice') {
+      return highRisk(
+        translateFn,
+        'extension_permission_warning_wallet_pay_invoice'
+      )
+    }
+    if (permission.id === 'extension.api.request') {
+      const hasWriteAccess = extensionApiPermissionTargets(
+        permission,
+        extensions
+      ).some(target => target.access.includes('write'))
+      return hasWriteAccess
+        ? highRisk(
+            translateFn,
+            'extension_permission_warning_extension_api_request_write'
+          )
+        : mediumRisk(translateFn)
+    }
+    if (permission.id === 'http.request') {
+      return mediumRisk(translateFn)
+    }
+    if (
+      [
+        'wallet.list',
+        'wallet.balance.read',
+        'wallet.create_invoice_public',
+        'ext.storage.read_public',
+        'payments.watch'
+      ].includes(permission.id)
+    ) {
+      return mediumRisk(translateFn)
+    }
+    return lowRisk(translateFn)
+  }
+
+  function permissionRisk(permissions, extensions, translateFn) {
+    const risks = permissions.map(permission =>
+      permissionRiskForPermission(permission, extensions, translateFn)
+    )
+    const highestRisk = risks.find(risk => risk.level === 'high')
+    if (highestRisk) return highestRisk
+    return risks.find(risk => risk.level === 'medium') || lowRisk(translateFn)
+  }
+
+  function permissionOrderIndex(permissionId) {
+    const order = [
+      'wallet.pay_invoice',
+      'wallet.list',
+      'wallet.balance.read',
+      'extension.api.request',
+      'http.request',
+      'ui.camera.scan_qr',
+      'ext.storage.read',
+      'ext.storage.write',
+      'ext.storage.read_public',
+      'wallet.create_invoice_public',
+      'wallet.create_invoice',
+      'utils.basic'
+    ]
+    const index = order.indexOf(permissionId)
+    return index === -1 ? order.length : index
+  }
+
+  function publicStorageFieldGroups(permission) {
+    const tables = permission.policies
+    if (!Array.isArray(tables)) return []
+    return tables
+      .map(table => {
+        const tableName =
+          typeof table === 'string' ? table : table?.table_name || ''
+        const fields =
+          typeof table === 'string' || !Array.isArray(table?.public_fields)
+            ? []
+            : table.public_fields.filter(
+                field => typeof field === 'string' && field
+              )
+        return tableName ? {table: tableName, fields} : null
+      })
+      .filter(Boolean)
+  }
+
+  function httpRequestPermissionHosts(permission) {
+    const hosts = permission.policies
+    if (!Array.isArray(hosts)) return []
+    return hosts
+      .map(host => (typeof host === 'string' ? host : host?.host || ''))
+      .filter(host => typeof host === 'string' && host)
+  }
+
+  function publicInvoicePolicies(permission) {
+    const policies = permission.policies
+    if (!Array.isArray(policies)) return []
+    return policies
+      .map(policy => {
+        if (!policy || typeof policy !== 'object') return null
+        const table = policy.table
+        const walletField = policy.wallet_field
+        if (typeof table !== 'string' || !table) return null
+        if (typeof walletField !== 'string' || !walletField) return null
+        return {table, walletField}
+      })
+      .filter(Boolean)
+  }
+
+  function permissionDisplayItem(permissions, extensions, translateFn) {
+    const permission = permissions[0]
+    const isReadWriteStorage =
+      permissions.length === 2 &&
+      permissions.some(permission => permission.id === 'ext.storage.read') &&
+      permissions.some(permission => permission.id === 'ext.storage.write')
+    const descriptions = permissions
+      .map(permission => permissionManifestDescription(permission))
+      .filter(Boolean)
+    const item = {
+      id: isReadWriteStorage ? 'ext.storage.read_write' : permission.id,
+      label: isReadWriteStorage
+        ? translate(translateFn, 'extension_permission_ext_storage_read_write')
+        : permissionLabel(permission, translateFn),
+      risk: permissionRisk(permissions, extensions, translateFn),
+      badges: [],
+      descriptions,
+      fieldGroups: [],
+      invoicePolicies: [],
+      extensionAccess: [],
+      httpHosts: []
+    }
+
+    if (permission.id === 'ext.storage.read_public') {
+      item.fieldGroups = publicStorageFieldGroups(permission)
+      item.badges = item.fieldGroups.map(group => ({
+        key: group.table,
+        label: group.table
+      }))
+    }
+
+    if (permission.id === 'extension.api.request') {
+      item.extensionAccess = extensionApiPermissionTargets(
+        permission,
+        extensions
+      )
+      item.badges = item.extensionAccess.map(target => ({
+        key: target.id,
+        label: target.name
+      }))
+    }
+
+    if (permission.id === 'http.request') {
+      item.httpHosts = httpRequestPermissionHosts(permission)
+    }
+
+    if (permission.id === 'wallet.create_invoice_public') {
+      item.invoicePolicies = publicInvoicePolicies(permission)
+    }
+
+    return item
+  }
+
+  function displayItems({permissions, extensions, translate}) {
+    const permissionList = permissions || []
+    const permissionsById = new Map(
+      permissionList.map(permission => [permission.id, permission])
+    )
+    const hasReadWriteStorage =
+      permissionsById.has('ext.storage.read') &&
+      permissionsById.has('ext.storage.write')
+    let addedReadWriteStorage = false
+
+    return permissionList
+      .map((permission, index) => {
+        if (
+          hasReadWriteStorage &&
+          ['ext.storage.read', 'ext.storage.write'].includes(permission.id)
+        ) {
+          if (addedReadWriteStorage) return null
+          addedReadWriteStorage = true
+          return {
+            index,
+            orderId: 'ext.storage.read',
+            permissions: [
+              permissionsById.get('ext.storage.read'),
+              permissionsById.get('ext.storage.write')
+            ]
+          }
+        }
+        return {
+          index,
+          orderId: permission.id,
+          permissions: [permission]
+        }
+      })
+      .filter(Boolean)
+      .sort((left, right) => {
+        const leftOrder = permissionOrderIndex(left.orderId)
+        const rightOrder = permissionOrderIndex(right.orderId)
+        return leftOrder === rightOrder
+          ? left.index - right.index
+          : leftOrder - rightOrder
+      })
+      .map(group =>
+        permissionDisplayItem(group.permissions, extensions || [], translate)
+      )
+  }
+
+  window.LNbitsExtensionPermissions = {
+    displayItems,
+    hasHighRisk({permissions, extensions, translate}) {
+      return displayItems({permissions, extensions, translate}).some(
+        permission => permission.risk.level === 'high'
+      )
+    }
+  }
+
+  window.app.component('lnbits-extension-permissions', {
+    template: '#lnbits-extension-permissions',
+    props: {
+      permissions: {
+        type: Array,
+        default: () => []
+      },
+      extensions: {
+        type: Array,
+        default: () => []
+      }
+    },
+    computed: {
+      displayItems() {
+        return window.LNbitsExtensionPermissions.displayItems({
+          permissions: this.permissions,
+          extensions: this.extensions,
+          translate: key => this.$t(key)
+        })
+      }
+    },
+    methods: {
+      publicInvoicePolicySentence(policy) {
+        return `Invoices will be created using ${policy.walletField} from ${policy.table}.`
+      },
+      permissionAccessLabel(access) {
+        const key = `extension_permission_access_${access}`
+        const label = this.$t(key)
+        return label === key ? access : label
+      }
+    }
+  })
+})()

lnbits/static/js/pages/extensions.js

@@ -725,268 +725,11 @@ window.PageExtensions = {
       }
     },
     permissionGrantHasHighRisk() {
-      return this.permissionGrantDisplayItems().some(
-        permission => permission.risk.level === 'high'
-      )
-    },
-    permissionGrantDisplayItems() {
-      const permissions = this.permissionGrant.permissions || []
-      const permissionsById = new Map(
-        permissions.map(permission => [permission.id, permission])
-      )
-      const hasReadWriteStorage =
-        permissionsById.has('ext.storage.read') &&
-        permissionsById.has('ext.storage.write')
-      let addedReadWriteStorage = false
-
-      return permissions
-        .map((permission, index) => {
-          if (
-            hasReadWriteStorage &&
-            ['ext.storage.read', 'ext.storage.write'].includes(permission.id)
-          ) {
-            if (addedReadWriteStorage) return null
-            addedReadWriteStorage = true
-            return {
-              index,
-              orderId: 'ext.storage.read',
-              permissions: [
-                permissionsById.get('ext.storage.read'),
-                permissionsById.get('ext.storage.write')
-              ]
-            }
-          }
-          return {
-            index,
-            orderId: permission.id,
-            permissions: [permission]
-          }
-        })
-        .filter(Boolean)
-        .sort((left, right) => {
-          const leftOrder = this.permissionOrderIndex(left.orderId)
-          const rightOrder = this.permissionOrderIndex(right.orderId)
-          return leftOrder === rightOrder
-            ? left.index - right.index
-            : leftOrder - rightOrder
-        })
-        .map(group => this.permissionDisplayItem(group.permissions))
-    },
-    permissionDisplayItem(permissions) {
-      const permission = permissions[0]
-      const isReadWriteStorage =
-        permissions.length === 2 &&
-        permissions.some(permission => permission.id === 'ext.storage.read') &&
-        permissions.some(permission => permission.id === 'ext.storage.write')
-      const descriptions = permissions
-        .map(permission => this.permissionManifestDescription(permission))
-        .filter(Boolean)
-      const item = {
-        id: isReadWriteStorage ? 'ext.storage.read_write' : permission.id,
-        label: isReadWriteStorage
-          ? this.$t('extension_permission_ext_storage_read_write')
-          : this.permissionLabel(permission),
-        risk: this.permissionRisk(permissions),
-        badges: [],
-        descriptions,
-        fieldGroups: [],
-        invoicePolicies: [],
-        extensionAccess: [],
-        httpHosts: []
-      }
-
-      if (permission.id === 'ext.storage.read_public') {
-        item.fieldGroups = this.publicStorageFieldGroups(permission)
-        item.badges = item.fieldGroups.map(group => ({
-          key: group.table,
-          label: group.table
-        }))
-      }
-
-      if (permission.id === 'extension.api.request') {
-        item.extensionAccess = this.extensionApiPermissionTargets(permission)
-        item.badges = item.extensionAccess.map(target => ({
-          key: target.id,
-          label: target.name
-        }))
-      }
-
-      if (permission.id === 'http.request') {
-        item.httpHosts = this.httpRequestPermissionHosts(permission)
-      }
-
-      if (permission.id === 'wallet.create_invoice_public') {
-        item.invoicePolicies = this.publicInvoicePolicies(permission)
-      }
-
-      return item
-    },
-    permissionRisk(permissions) {
-      const risks = permissions.map(permission =>
-        this.permissionRiskForPermission(permission)
-      )
-      const highestRisk = risks.find(risk => risk.level === 'high')
-      if (highestRisk) return highestRisk
-      return risks.find(risk => risk.level === 'medium') || this.lowRisk()
-    },
-    permissionRiskForPermission(permission) {
-      if (permission.id === 'wallet.pay_invoice') {
-        return this.highRisk('extension_permission_warning_wallet_pay_invoice')
-      }
-      if (permission.id === 'extension.api.request') {
-        const hasWriteAccess = this.extensionApiPermissionTargets(
-          permission
-        ).some(target => target.access.includes('write'))
-        return hasWriteAccess
-          ? this.highRisk(
-              'extension_permission_warning_extension_api_request_write'
-            )
-          : this.mediumRisk()
-      }
-      if (permission.id === 'http.request') {
-        return this.mediumRisk()
-      }
-      if (
-        [
-          'wallet.list',
-          'wallet.balance.read',
-          'wallet.create_invoice_public',
-          'ext.storage.read_public',
-          'payments.watch'
-        ].includes(permission.id)
-      ) {
-        return this.mediumRisk()
-      }
-      return this.lowRisk()
-    },
-    lowRisk() {
-      return {
-        level: 'low',
-        color: 'grey-6',
-        label: this.$t('extension_permission_risk_low'),
-        warning: ''
-      }
-    },
-    mediumRisk() {
-      return {
-        level: 'medium',
-        color: 'warning',
-        label: this.$t('extension_permission_risk_medium'),
-        warning: ''
-      }
-    },
-    highRisk(warningKey) {
-      return {
-        level: 'high',
-        color: 'negative',
-        label: this.$t('extension_permission_risk_high'),
-        warning: this.$t(warningKey)
-      }
-    },
-    permissionOrderIndex(permissionId) {
-      const order = [
-        'wallet.pay_invoice',
-        'wallet.list',
-        'wallet.balance.read',
-        'extension.api.request',
-        'http.request',
-        'ui.camera.scan_qr',
-        'ext.storage.read',
-        'ext.storage.write',
-        'ext.storage.read_public',
-        'wallet.create_invoice_public',
-        'wallet.create_invoice',
-        'utils.basic'
-      ]
-      const index = order.indexOf(permissionId)
-      return index === -1 ? order.length : index
-    },
-    publicStorageFieldGroups(permission) {
-      const tables = permission.policies
-      if (!Array.isArray(tables)) return []
-      return tables
-        .map(table => {
-          const tableName =
-            typeof table === 'string' ? table : table?.table_name || ''
-          const fields =
-            typeof table === 'string' || !Array.isArray(table?.public_fields)
-              ? []
-              : table.public_fields.filter(
-                  field => typeof field === 'string' && field
-                )
-          return tableName ? {table: tableName, fields} : null
-        })
-        .filter(Boolean)
-    },
-    httpRequestPermissionHosts(permission) {
-      const hosts = permission.policies
-      if (!Array.isArray(hosts)) return []
-      return hosts
-        .map(host => (typeof host === 'string' ? host : host?.host || ''))
-        .filter(host => typeof host === 'string' && host)
-    },
-    publicInvoicePolicies(permission) {
-      const policies = permission.policies
-      if (!Array.isArray(policies)) return []
-      return policies
-        .map(policy => {
-          if (!policy || typeof policy !== 'object') return null
-          const table = policy.table
-          const walletField = policy.wallet_field
-          if (typeof table !== 'string' || !table) return null
-          if (typeof walletField !== 'string' || !walletField) return null
-          return {table, walletField}
-        })
-        .filter(Boolean)
-    },
-    publicInvoicePolicySentence(policy) {
-      return `Invoices will be created using ${policy.walletField} from ${policy.table}.`
-    },
-    extensionApiPermissionTargets(permission) {
-      const extensions = permission.policies
-      if (!Array.isArray(extensions)) return []
-      return extensions
-        .map(extension => {
-          const extensionId =
-            typeof extension === 'string' ? extension : extension?.id
-          if (!extensionId) return null
-          const access =
-            typeof extension === 'string'
-              ? ['read']
-              : Array.isArray(extension.access) && extension.access.length
-                ? extension.access
-                : ['read']
-          return {
-            id: extensionId,
-            name: this.extensionDisplayName(extensionId),
-            access
-          }
-        })
-        .filter(Boolean)
-    },
-    extensionDisplayName(extensionId) {
-      const extension = (this.extensions || []).find(
-        extension => extension.id === extensionId
-      )
-      return extension?.name || extensionId
-    },
-    permissionAccessLabel(access) {
-      const key = `extension_permission_access_${access}`
-      const label = this.$t(key)
-      return label === key ? access : label
-    },
-    permissionManifestDescription(permission) {
-      return typeof permission.description === 'string'
-        ? permission.description
-        : ''
-    },
-    permissionI18nKey(permission) {
-      return `extension_permission_${permission.id.replace(/[^A-Za-z0-9]/g, '_')}`
-    },
-    permissionLabel(permission) {
-      const key = this.permissionI18nKey(permission)
-      const label = this.$t(key)
-      return label === key ? permission.id : label
+      return window.LNbitsExtensionPermissions.hasHighRisk({
+        permissions: this.permissionGrant.permissions,
+        extensions: this.extensions,
+        translate: key => this.$t(key)
+      })
     },
     async selectAllUpdatableExtensionss() {
       this.updatableExtensions.forEach(e => (e.selectedForUpdate = true))

lnbits/static/vendor.json

@@ -89,6 +89,7 @@
     "js/components/lnbits-theme.js",
     "js/components/lnbits-qrcode-scanner.js",
     "js/components/lnbits-manage-extension-list.js",
+    "js/components/lnbits-extension-permissions.js",
     "js/components/lnbits-manage-wallet-list.js",
     "js/components/lnbits-language-dropdown.js",
     "js/components/lnbits-payment-list.js",

lnbits/templates/components.vue

@@ -19,6 +19,7 @@ include('components/lnbits-header-wallets.vue') %} {%
 include('components/lnbits-drawer.vue') %} {%
 include('components/lnbits-home-logos.vue') %} {%
 include('components/lnbits-manage-extension-list.vue') %} {%
+include('components/lnbits-extension-permissions.vue') %} {%
 include('components/lnbits-manage-wallet-list.vue') %} {%
 include('components/lnbits-language-dropdown.vue') %} {%
 include('components/lnbits-payment-list.vue') %} {%

lnbits/templates/components/admin/exchange_providers.vue

@@ -1,7 +1,46 @@
 <template id="lnbits-admin-exchange-providers">
-  <h6 class="q-my-none q-mb-sm">
-    <span v-text="$t('exchange_providers')"></span>
-  </h6>
+  <h6 class="q-my-none q-mb-xs">LNbits Price Aggregator</h6>
+  <p class="q-mb-md text-caption text-grey">
+    A privacy-friendly, open-source Bitcoin price aggregator maintained by the
+    LNbits team. Aggregates prices from multiple exchanges and returns a median,
+    no API keys required.
+    <a href="https://price.lnbits.com" target="_blank" rel="noopener"
+      >price.lnbits.com</a
+    >
+    &mdash;
+    <a
+      href="https://github.com/lnbits/lnbits-price-aggregator"
+      target="_blank"
+      rel="noopener"
+      >GitHub</a
+    >
+  </p>
+
+  <div class="row q-mb-md items-start">
+    <div class="col-auto q-mr-md q-mt-sm">
+      <q-toggle
+        v-model="formData.lnbits_price_aggregator_enabled"
+        @update:model-value="formData.touch = null"
+        label="Use Price Aggregator"
+      >
+      </q-toggle>
+    </div>
+    <div class="col-12 col-md-7">
+      <q-input
+        filled
+        v-model="formData.lnbits_price_aggregator_url"
+        type="text"
+        label="Price Aggregator URL"
+        hint="Fetch BTC price from this aggregator instead of individual providers below."
+        :disable="!formData.lnbits_price_aggregator_enabled"
+        @update:model-value="formData.touch = null"
+      >
+      </q-input>
+    </div>
+  </div>
+
+  <q-separator class="q-my-md"></q-separator>
+  <h6 class="q-my-none q-mb-sm">Bitcoin Price History</h6>
 
   <div class="row">
     <div class="col-12 col-md-8">
@@ -53,6 +92,11 @@
     </div>
   </div>
 
+  <q-separator class="q-my-md"></q-separator>
+  <h6 class="q-my-none q-mb-sm">
+    <span v-text="$t('exchange_providers')"></span>
+  </h6>
+
   <div class="row q-mt-md">
     <div class="col-6">
       <q-btn
@@ -60,6 +104,7 @@
         label="Add Exchange Provider"
         color="primary"
         class="q-mb-md"
+        :disable="formData.lnbits_price_aggregator_enabled"
       >
       </q-btn>
     </div>
@@ -70,12 +115,20 @@
         :label="$t('reset_defaults')"
         color="primary"
         class="float-right"
+        :disable="formData.lnbits_price_aggregator_enabled"
       >
       </q-btn>
     </div>
   </div>
 
-  <div class="overflow-auto">
+  <div
+    class="overflow-auto"
+    :style="
+      formData.lnbits_price_aggregator_enabled
+        ? 'opacity:0.4;pointer-events:none'
+        : ''
+    "
+  >
     <q-table
       row-key="name"
       :rows="formData.lnbits_exchange_rate_providers"

lnbits/templates/components/lnbits-extension-permissions.vue

@@ -0,0 +1,105 @@
+<template id="lnbits-extension-permissions">
+  <q-list bordered separator>
+    <q-expansion-item
+      v-for="permission of displayItems"
+      :key="permission.id"
+      dense
+      expand-separator
+      class="q-pt-xs"
+    >
+      <template v-slot:header>
+        <q-item-section>
+          <q-item-label class="text-weight-medium">
+            <span v-text="permission.label"></span>
+          </q-item-label>
+        </q-item-section>
+        <q-item-section
+          v-if="permission.risk.level !== 'low' || permission.badges.length"
+          side
+          top
+        >
+          <div class="row items-center justify-end q-gutter-xs">
+            <q-badge
+              v-for="badge of permission.badges"
+              :key="badge.key"
+              outline
+              color="primary"
+              v-text="badge.label"
+            ></q-badge>
+            <q-badge
+              v-if="permission.risk.level !== 'low'"
+              :color="permission.risk.color"
+              v-text="permission.risk.label"
+            ></q-badge>
+          </div>
+        </q-item-section>
+      </template>
+
+      <div class="q-px-md q-pb-sm">
+        <div
+          v-if="permission.risk.warning"
+          class="row items-center text-negative text-caption q-mb-xs"
+        >
+          <q-icon name="warning" size="16px" class="q-mr-xs"></q-icon>
+          <span v-text="permission.risk.warning"></span>
+        </div>
+        <p
+          v-for="description of permission.descriptions"
+          :key="description"
+          class="text-caption q-mb-xs"
+          v-text="description"
+        ></p>
+        <p
+          v-for="policy of permission.invoicePolicies"
+          :key="policy.table + ':' + policy.walletField"
+          class="text-caption q-mb-xs"
+          v-text="publicInvoicePolicySentence(policy)"
+        ></p>
+        <ul v-if="permission.fieldGroups.length" class="q-my-sm q-pl-md">
+          <li v-for="group of permission.fieldGroups" :key="group.table">
+            <span v-text="group.table"></span>
+            <ul v-if="group.fields.length" class="q-pl-md">
+              <li
+                v-for="field of group.fields"
+                :key="group.table + ':' + field"
+                v-text="field"
+              ></li>
+            </ul>
+          </li>
+        </ul>
+        <div v-if="permission.extensionAccess.length" class="q-mt-sm">
+          <div
+            class="text-caption text-grey"
+            v-text="$t('extension_permission_extension_api_request_extensions')"
+          ></div>
+          <div
+            v-for="target of permission.extensionAccess"
+            :key="target.id"
+            class="row items-center q-gutter-xs q-mt-xs"
+          >
+            <span class="text-caption" v-text="target.name"></span>
+            <q-badge
+              v-for="access of target.access"
+              :key="target.id + access"
+              color="grey-7"
+              v-text="permissionAccessLabel(access)"
+            ></q-badge>
+          </div>
+        </div>
+        <div v-if="permission.httpHosts.length" class="q-mt-sm">
+          <div
+            class="text-caption text-grey"
+            v-text="$t('extension_permission_http_request_hosts')"
+          ></div>
+          <ul class="q-my-sm q-pl-md">
+            <li
+              v-for="host of permission.httpHosts"
+              :key="host"
+              v-text="host"
+            ></li>
+          </ul>
+        </div>
+      </div>
+    </q-expansion-item>
+  </q-list>
+</template>

lnbits/templates/pages/extensions.vue

@@ -463,10 +463,6 @@
     <q-card v-if="permissionGrant.show" class="q-pa-md lnbits__dialog-card">
       <q-card-section>
         <div class="text-h6" v-text="$t('extension_permissions_title')"></div>
-        <div
-          class="text-body2 q-mt-sm"
-          v-text="$t('extension_permissions_request')"
-        ></div>
         <q-banner
           v-if="permissionGrantHasHighRisk()"
           dense
@@ -479,111 +475,11 @@
         </q-banner>
       </q-card-section>
 
-      <q-list bordered separator class="q-mt-md">
-        <q-expansion-item
-          v-for="permission of permissionGrantDisplayItems()"
-          :key="permission.id"
-          dense
-          expand-separator
-          class="q-pt-xs"
-        >
-          <template v-slot:header>
-            <q-item-section>
-              <q-item-label class="text-weight-medium">
-                <span v-text="permission.label"></span>
-              </q-item-label>
-            </q-item-section>
-            <q-item-section
-              v-if="permission.risk.level !== 'low' || permission.badges.length"
-              side
-              top
-            >
-              <div class="row items-center justify-end q-gutter-xs">
-                <q-badge
-                  v-for="badge of permission.badges"
-                  :key="badge.key"
-                  outline
-                  color="primary"
-                  v-text="badge.label"
-                ></q-badge>
-                <q-badge
-                  v-if="permission.risk.level !== 'low'"
-                  :color="permission.risk.color"
-                  v-text="permission.risk.label"
-                ></q-badge>
-              </div>
-            </q-item-section>
-          </template>
-
-          <div class="q-px-md q-pb-sm">
-            <div
-              v-if="permission.risk.warning"
-              class="row items-center text-negative text-caption q-mb-xs"
-            >
-              <q-icon name="warning" size="16px" class="q-mr-xs"></q-icon>
-              <span v-text="permission.risk.warning"></span>
-            </div>
-            <p
-              v-for="description of permission.descriptions"
-              :key="description"
-              class="text-caption q-mb-xs"
-              v-text="description"
-            ></p>
-            <p
-              v-for="policy of permission.invoicePolicies"
-              :key="policy.table + ':' + policy.walletField"
-              class="text-caption q-mb-xs"
-              v-text="publicInvoicePolicySentence(policy)"
-            ></p>
-            <ul v-if="permission.fieldGroups.length" class="q-my-sm q-pl-md">
-              <li v-for="group of permission.fieldGroups" :key="group.table">
-                <span v-text="group.table"></span>
-                <ul v-if="group.fields.length" class="q-pl-md">
-                  <li
-                    v-for="field of group.fields"
-                    :key="group.table + ':' + field"
-                    v-text="field"
-                  ></li>
-                </ul>
-              </li>
-            </ul>
-            <div v-if="permission.extensionAccess.length" class="q-mt-sm">
-              <div
-                class="text-caption text-grey"
-                v-text="
-                  $t('extension_permission_extension_api_request_extensions')
-                "
-              ></div>
-              <div
-                v-for="target of permission.extensionAccess"
-                :key="target.id"
-                class="row items-center q-gutter-xs q-mt-xs"
-              >
-                <span class="text-caption" v-text="target.name"></span>
-                <q-badge
-                  v-for="access of target.access"
-                  :key="target.id + access"
-                  color="grey-7"
-                  v-text="permissionAccessLabel(access)"
-                ></q-badge>
-              </div>
-            </div>
-            <div v-if="permission.httpHosts.length" class="q-mt-sm">
-              <div
-                class="text-caption text-grey"
-                v-text="$t('extension_permission_http_request_hosts')"
-              ></div>
-              <ul class="q-my-sm q-pl-md">
-                <li
-                  v-for="host of permission.httpHosts"
-                  :key="host"
-                  v-text="host"
-                ></li>
-              </ul>
-            </div>
-          </div>
-        </q-expansion-item>
-      </q-list>
+      <lnbits-extension-permissions
+        class="q-mt-md"
+        :permissions="permissionGrant.permissions"
+        :extensions="extensions"
+      ></lnbits-extension-permissions>
 
       <div class="row q-mt-lg">
         <q-btn

lnbits/utils/exchange_rates.py

@@ -289,7 +289,32 @@ async def btc_rates(currency: str) -> list[tuple[str, float]]:
     return apply_trimmed_mean_filter(all_rates)
 
 
+async def btc_price_from_aggregator(currency: str) -> float | None:
+    url = settings.lnbits_price_aggregator_url.rstrip("/")
+    try:
+        headers = {"User-Agent": settings.user_agent}
+        async with httpx.AsyncClient(headers=headers) as client:
+            r = await client.get(f"{url}/rate/{currency.upper()}", timeout=3)
+            r.raise_for_status()
+            data = r.json()
+            median = data.get("rates", {}).get("median")
+            if median:
+                return float(median)
+    except Exception as e:
+        logger.warning(f"Failed to fetch price from aggregator {url}: {e}")
+    return None
+
+
 async def btc_price(currency: str) -> float:
+    if (
+        settings.lnbits_price_aggregator_enabled
+        and settings.lnbits_price_aggregator_url
+    ):
+        price = await btc_price_from_aggregator(currency)
+        if price:
+            return price
+        logger.warning("Price aggregator failed, falling back to exchange providers.")
+
     rates = await btc_rates(currency)
     if not rates:
         logger.warning("Could not fetch any Bitcoin price.")

package.json

@@ -142,6 +142,7 @@
       "js/components/lnbits-theme.js",
       "js/components/lnbits-qrcode-scanner.js",
       "js/components/lnbits-manage-extension-list.js",
+      "js/components/lnbits-extension-permissions.js",
       "js/components/lnbits-manage-wallet-list.js",
       "js/components/lnbits-language-dropdown.js",
       "js/components/lnbits-payment-list.js",

poetry.lock

@@ -1633,7 +1633,7 @@ version = "3.3.2"
 description = "Lightweight in-process concurrent programming"
 optional = false
 python-versions = ">=3.10"
-groups = ["main", "dev"]
+groups = ["main"]
 files = [
     {file = "greenlet-3.3.2-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:9bc885b89709d901859cf95179ec9f6bb67a3d2bb1f0e88456461bd4b7f8fd0d"},
     {file = "greenlet-3.3.2-cp310-cp310-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b568183cf65b94919be4438dc28416b234b678c608cafac8874dfeeb2a9bbe13"},
@@ -2972,28 +2972,6 @@ files = [
     {file = "platformdirs-4.9.4.tar.gz", hash = "sha256:1ec356301b7dc906d83f371c8f487070e99d3ccf9e501686456394622a01a934"},
 ]
 
-[[package]]
-name = "playwright"
-version = "1.61.0"
-description = "A high-level API to automate web browsers"
-optional = false
-python-versions = ">=3.10"
-groups = ["dev"]
-files = [
-    {file = "playwright-1.61.0-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:ff138c3a604f69911e9d42fd036e55c2a171e5616edf04c1e7f60a2a285540b0"},
-    {file = "playwright-1.61.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:009588c2a7e499bc5a8b425b61fa65490968bbda9cd69e0cf2cff10f8304659a"},
-    {file = "playwright-1.61.0-py3-none-macosx_11_0_universal2.whl", hash = "sha256:9f7de4536088d12037c13a52b7ea34b59270b78926bb56935070597ffac6b1af"},
-    {file = "playwright-1.61.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:54f3b39f6eab832e33458c1dd7da0b5682aedab3b09ae731b5c59fa12fd2024e"},
-    {file = "playwright-1.61.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:93454322ade8c11d5d6c211bfd91bdfb9ffb4810e3e026371bcbc4bec1b7ee4c"},
-    {file = "playwright-1.61.0-py3-none-win32.whl", hash = "sha256:372d55a6f1248fa1dd47599686980cb8fb5bbe6fcda59eab793eb657c11d8a9b"},
-    {file = "playwright-1.61.0-py3-none-win_amd64.whl", hash = "sha256:35c6cc4589a5d00964a59d7b3e59641e0aac0c02f15479a7af77d20f6bc79597"},
-    {file = "playwright-1.61.0-py3-none-win_arm64.whl", hash = "sha256:e9fcbffcf557a8620fdedd92491eb59a32d18e23d6f3b4f6214b952be324fe51"},
-]
-
-[package.dependencies]
-greenlet = ">=3.1.1,<4.0.0"
-pyee = ">=13,<14"
-
 [[package]]
 name = "pluggy"
 version = "1.6.0"
@@ -3408,24 +3386,6 @@ typing-extensions = ">=4.2.0"
 dotenv = ["python-dotenv (>=0.10.4)"]
 email = ["email-validator (>=1.0.3)"]
 
-[[package]]
-name = "pyee"
-version = "13.0.1"
-description = "A rough port of Node.js's EventEmitter to Python with a few tricks of its own"
-optional = false
-python-versions = ">=3.8"
-groups = ["dev"]
-files = [
-    {file = "pyee-13.0.1-py3-none-any.whl", hash = "sha256:af2f8fede4171ef667dfded53f96e2ed0d6e6bd7ee3bb46437f77e3b57689228"},
-    {file = "pyee-13.0.1.tar.gz", hash = "sha256:0b931f7c14535667ed4c7e0d531716368715e860b988770fc7eb8578d1f67fc8"},
-]
-
-[package.dependencies]
-typing-extensions = "*"
-
-[package.extras]
-dev = ["black", "build", "flake8", "flake8-black", "isort", "jupyter-console", "mkdocs", "mkdocs-include-markdown-plugin", "mkdocstrings[python]", "mypy", "pytest", "pytest-asyncio ; python_version >= \"3.4\"", "pytest-trio ; python_version >= \"3.7\"", "sphinx", "toml", "tox", "trio", "trio ; python_version > \"3.6\"", "trio-typing ; python_version > \"3.6\"", "twine", "twisted", "validate-pyproject[all]"]
-
 [[package]]
 name = "pygments"
 version = "2.19.2"
@@ -3667,25 +3627,6 @@ tomli = {version = ">=1", markers = "python_version < \"3.11\""}
 [package.extras]
 dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "requests", "setuptools", "xmlschema"]
 
-[[package]]
-name = "pytest-base-url"
-version = "2.1.0"
-description = "pytest plugin for URL based testing"
-optional = false
-python-versions = ">=3.8"
-groups = ["dev"]
-files = [
-    {file = "pytest_base_url-2.1.0-py3-none-any.whl", hash = "sha256:3ad15611778764d451927b2a53240c1a7a591b521ea44cebfe45849d2d2812e6"},
-    {file = "pytest_base_url-2.1.0.tar.gz", hash = "sha256:02748589a54f9e63fcbe62301d6b0496da0d10231b753e950c63e03aee745d45"},
-]
-
-[package.dependencies]
-pytest = ">=7.0.0"
-requests = ">=2.9"
-
-[package.extras]
-test = ["black (>=22.1.0)", "flake8 (>=4.0.1)", "pre-commit (>=2.17.0)", "pytest-localserver (>=0.7.1)", "tox (>=3.24.5)"]
-
 [[package]]
 name = "pytest-cov"
 version = "7.0.0"
@@ -3754,24 +3695,6 @@ pytest = ">=6.2.5"
 [package.extras]
 dev = ["pre-commit", "pytest-asyncio", "tox"]
 
-[[package]]
-name = "pytest-playwright"
-version = "0.8.0"
-description = "A pytest wrapper with fixtures for Playwright to automate web browsers"
-optional = false
-python-versions = ">=3.10"
-groups = ["dev"]
-files = [
-    {file = "pytest_playwright-0.8.0-py3-none-any.whl", hash = "sha256:856aae6efd4bc055f2ef229c647768760bcaad5cd3a5983c314ac260a974a933"},
-    {file = "pytest_playwright-0.8.0.tar.gz", hash = "sha256:7888d4a2443160c82e0c506c437076679f86b36d1910427250d90fbf1843a981"},
-]
-
-[package.dependencies]
-playwright = ">=1.18"
-pytest = ">=6.2.4,<10.0.0"
-pytest-base-url = ">=1.0.0,<3.0.0"
-python-slugify = ">=6.0.0,<9.0.0"
-
 [[package]]
 name = "python-crontab"
 version = "3.3.0"
@@ -3835,24 +3758,6 @@ files = [
     {file = "python_multipart-0.0.22.tar.gz", hash = "sha256:7340bef99a7e0032613f56dc36027b959fd3b30a787ed62d310e951f7c3a3a58"},
 ]
 
-[[package]]
-name = "python-slugify"
-version = "8.0.4"
-description = "A Python slugify application that also handles Unicode"
-optional = false
-python-versions = ">=3.7"
-groups = ["dev"]
-files = [
-    {file = "python-slugify-8.0.4.tar.gz", hash = "sha256:59202371d1d05b54a9e7720c5e038f928f45daaffe41dd10822f3907b937c856"},
-    {file = "python_slugify-8.0.4-py2.py3-none-any.whl", hash = "sha256:276540b79961052b66b7d116620b36518847f52d5fd9e3a70164fc8c50faa6b8"},
-]
-
-[package.dependencies]
-text-unidecode = ">=1.3"
-
-[package.extras]
-unidecode = ["Unidecode (>=1.1.1)"]
-
 [[package]]
 name = "pytokens"
 version = "0.4.1"
@@ -4445,18 +4350,6 @@ typing-extensions = {version = ">=4.10.0", markers = "python_version < \"3.13\""
 [package.extras]
 full = ["httpx (>=0.27.0,<0.29.0)", "itsdangerous", "jinja2", "python-multipart (>=0.0.18)", "pyyaml"]
 
-[[package]]
-name = "text-unidecode"
-version = "1.3"
-description = "The most basic Text::Unidecode port"
-optional = false
-python-versions = "*"
-groups = ["dev"]
-files = [
-    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
-    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
-]
-
 [[package]]
 name = "tibs"
 version = "0.5.7"
@@ -5255,4 +5148,4 @@ migration = ["psycopg2-binary"]
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10,<3.13"
-content-hash = "09f0ddc9546d2ea7e6fb686200e3e15ab7e8db0f1ac33d49c94afe1cbd701fe8"
+content-hash = "3097673d0cd279b0bf2b8fa59c1e523273f63d430f2c68ccc268a3cf232068af"

pyproject.toml

@@ -86,7 +86,6 @@ dev = [
   "types-mock~=5.2.0.20250924",
   "mock~=5.2.0",
   "grpcio-tools~=1.76.0",
-  "pytest-playwright>=0.8.0",
 ]
 
 [tool.uv]

tests/fixtures/lnbits-wasm-test-extension/config.json

@@ -1,170 +0,0 @@
-{
-  "id": "lnbits-wasm-test-extension",
-  "name": "WASM Test Extension",
-  "short_description": "Minimal WASM extension used by LNbits e2e tests.",
-  "version": "0.0.1",
-  "min_lnbits_version": "1.5.5",
-  "extension_type": "wasm",
-  "wasm": {
-    "module": "wasm/module.wasm",
-    "exports": [
-      {
-        "name": "list-wallets",
-        "visibility": "authenticated"
-      },
-      {
-        "name": "invoice-details",
-        "visibility": "authenticated"
-      },
-      {
-        "name": "get-selection",
-        "visibility": "authenticated"
-      },
-      {
-        "name": "save-selection",
-        "visibility": "authenticated"
-      },
-      {
-        "name": "pay-large-invoice",
-        "visibility": "authenticated"
-      },
-      {
-        "name": "create-tip-jar",
-        "visibility": "authenticated"
-      },
-      {
-        "name": "list-tip-jars",
-        "visibility": "authenticated"
-      },
-      {
-        "name": "get-public-tip-jar",
-        "visibility": "public"
-      },
-      {
-        "name": "create-tip-invoice",
-        "visibility": "public"
-      },
-      {
-        "name": "record-payment",
-        "visibility": "event"
-      }
-    ]
-  },
-  "events": {
-    "onInvoicePaid": "record-payment"
-  },
-  "ui_routes": [
-    {
-      "path": "/lnbits-wasm-test-extension",
-      "entrypoint": "ui/admin.html",
-      "auth": "user"
-    },
-    {
-      "path": "/lnbits-wasm-test-extension/public/{item_id}",
-      "entrypoint": "ui/public.html",
-      "auth": "public",
-      "path_params": {
-        "item_id": "itemId"
-      }
-    }
-  ],
-  "api_routes": [
-    {
-      "method": "GET",
-      "path": "/wallets",
-      "export": "list-wallets",
-      "auth": "user"
-    },
-    {
-      "method": "POST",
-      "path": "/payments",
-      "export": "pay-large-invoice",
-      "auth": "user"
-    },
-    {
-      "method": "GET",
-      "path": "/jars/{jar_id}",
-      "export": "get-public-tip-jar",
-      "auth": "public",
-      "path_params": {
-        "jar_id": "jarId"
-      }
-    },
-    {
-      "method": "POST",
-      "path": "/invoice",
-      "export": "create-tip-invoice",
-      "auth": "public"
-    }
-  ],
-  "permissions": [
-    {
-      "id": "wallet.pay_invoice",
-      "description": "Pay Lightning invoices from selected wallets."
-    },
-    {
-      "id": "wallet.list",
-      "description": "List wallets available to the installing user."
-    },
-    {
-      "id": "wallet.balance.read",
-      "description": "Read wallet balances for payment selection."
-    },
-    {
-      "id": "extension.api.request",
-      "description": "Call APIs exposed by another installed extension.",
-      "policies": [
-        {
-          "id": "watchonly",
-          "access": ["read", "write"]
-        }
-      ]
-    },
-    {
-      "id": "ui.camera.scan_qr",
-      "description": "Use the LNbits scanner to read QR codes when requested."
-    },
-    {
-      "id": "ext.storage.read",
-      "description": "Read extension storage rows."
-    },
-    {
-      "id": "ext.storage.write",
-      "description": "Write extension storage rows."
-    },
-    {
-      "id": "ext.storage.read_public",
-      "description": "Read public extension storage fields.",
-      "policies": [
-        {
-          "table_name": "tip_jars",
-          "public_fields": [
-            "id",
-            "title",
-            "description",
-            "currency",
-            "suggested_amounts"
-          ]
-        }
-      ]
-    },
-    {
-      "id": "wallet.create_invoice",
-      "description": "Create incoming Lightning invoices from authenticated pages."
-    },
-    {
-      "id": "wallet.create_invoice_public",
-      "description": "Create incoming Lightning invoices from public pages.",
-      "policies": [
-        {
-          "table": "tip_jars",
-          "wallet_field": "wallet_id"
-        }
-      ]
-    },
-    {
-      "id": "utils.basic",
-      "description": "Use LNbits utility functions."
-    }
-  ]
-}

tests/fixtures/lnbits-wasm-test-extension/static/app.js

@@ -1,49 +0,0 @@
-window.__lnbitsWasmTestExtensionLoaded = true
-;(function () {
-  const channel = new MessageChannel()
-  const pending = new Map()
-  let counter = 0
-
-  const ready = new Promise(resolve => {
-    channel.port1.addEventListener('message', event => {
-      const message = event.data || {}
-
-      if (message.type === 'lnbits-extension:connected') {
-        resolve(true)
-        return
-      }
-
-      if (message.type !== 'lnbits-extension:response') return
-      const callback = pending.get(message.id)
-      if (!callback) return
-
-      pending.delete(message.id)
-      callback(message)
-    })
-    channel.port1.start()
-    window.parent.postMessage(
-      {type: 'lnbits-extension:connect', id: 'wasm-test-extension'},
-      '*',
-      [channel.port2]
-    )
-  })
-
-  window.lnbitsWasmTestBridge = {
-    ready() {
-      return ready
-    },
-    request(message) {
-      return ready.then(() => {
-        return new Promise(resolve => {
-          const id = `wasm-test-${++counter}`
-          pending.set(id, resolve)
-          channel.port1.postMessage({
-            type: 'lnbits-extension:request',
-            id,
-            ...message
-          })
-        })
-      })
-    }
-  }
-})()

tests/fixtures/lnbits-wasm-test-extension/static/data.json

@@ -1 +0,0 @@
-{"unsafe": true}

tests/fixtures/lnbits-wasm-test-extension/static/html-like.js

@@ -1,4 +0,0 @@
-<!doctype html>
-<html>
-  <body>This must not be served as JavaScript.</body>
-</html>

tests/fixtures/lnbits-wasm-test-extension/ui/admin.html

@@ -1,11 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>WASM Test Extension Admin</title>
-    <script src="/ext-assets/lnbits-wasm-test-extension/app.js"></script>
-  </head>
-  <body>
-    <main id="wasm-test-admin">WASM Test Admin</main>
-  </body>
-</html>

tests/fixtures/lnbits-wasm-test-extension/ui/public.html

@@ -1,11 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>WASM Test Extension Public</title>
-    <script src="/ext-assets/lnbits-wasm-test-extension/app.js"></script>
-  </head>
-  <body>
-    <main id="wasm-test-public">WASM Test Public</main>
-  </body>
-</html>

tests/unit/test_exchange_rates.py

@@ -275,6 +275,10 @@ async def test_btc_rates_skips_unsupported_and_failing_providers(
 
 @pytest.mark.anyio
 async def test_btc_price_handles_empty_single_and_multiple_rates(mocker: MockerFixture):
+    mocker.patch(
+        "lnbits.utils.exchange_rates.btc_price_from_aggregator",
+        AsyncMock(return_value=None),
+    )
     mocker.patch("lnbits.utils.exchange_rates.btc_rates", AsyncMock(return_value=[]))
     assert await btc_price("usd") == 0.0
 

tests/unit/test_wasm_extension_permissions.py

@@ -1,70 +0,0 @@
-from __future__ import annotations
-
-import pytest
-
-from lnbits.core.models.extensions import ExtensionPermission, InstallableExtension
-from lnbits.core.wasm_ext.api.permissions import (
-    validate_extension_permissions,
-    validate_wasm_extension_permissions,
-)
-
-
-def test_validate_extension_permissions_rejects_unknown_permission() -> None:
-    permissions = [
-        ExtensionPermission(id="wallet.list"),
-        ExtensionPermission(id="unknown.permission"),
-    ]
-
-    with pytest.raises(ValueError, match="unknown.permission"):
-        validate_extension_permissions("demo", permissions)
-
-
-def test_validate_wasm_extension_permissions_requires_grant() -> None:
-    extension = InstallableExtension(id="demo", name="Demo", version="0.0.1")
-    config = {
-        "extension_type": "wasm",
-        "permissions": [{"id": "wallet.list"}],
-    }
-
-    with pytest.raises(ValueError, match="requires permission approval"):
-        validate_wasm_extension_permissions(extension, None, config)
-
-
-def test_validate_wasm_extension_permissions_requires_exact_grants() -> None:
-    extension = InstallableExtension(id="demo", name="Demo", version="0.0.1")
-    config = {
-        "extension_type": "wasm",
-        "permissions": [{"id": "wallet.list"}, {"id": "utils.basic"}],
-    }
-
-    with pytest.raises(ValueError, match="was not granted all requested permissions"):
-        validate_wasm_extension_permissions(
-            extension,
-            [ExtensionPermission(id="wallet.list")],
-            config,
-        )
-
-
-def test_validate_wasm_extension_permissions_returns_core_normalized_grants() -> None:
-    extension = InstallableExtension(id="demo", name="Demo", version="0.0.1")
-    config = {
-        "extension_type": "wasm",
-        "permissions": [
-            {
-                "id": "wallet.list",
-                "label": "Extension supplied label",
-                "description": "Show wallets.",
-            }
-        ],
-    }
-
-    permissions = validate_wasm_extension_permissions(
-        extension,
-        [ExtensionPermission(id="wallet.list", label="Extension supplied label")],
-        config,
-    )
-
-    assert len(permissions) == 1
-    assert permissions[0].id == "wallet.list"
-    assert permissions[0].label is None
-    assert permissions[0].description == "Show wallets."

tests/wallets/test_nwc_wallets.py

@@ -1,3 +1,4 @@
+import asyncio
 import base64
 import hashlib
 import json
@@ -12,7 +13,7 @@ from Cryptodome.Util.Padding import pad, unpad
 from websockets import ServerConnection
 from websockets import serve as ws_serve
 
-from lnbits.wallets.nwc import NWCWallet
+from lnbits.wallets.nwc import NWCConnection, NWCWallet
 from tests.wallets.helpers import (
     WalletTest,
     build_test_id,
@@ -99,6 +100,8 @@ async def handle(  # noqa: C901
                     event,
                 )
                 await websocket.send(json.dumps(["EVENT", sub_id, event]))
+            elif 23195 in kinds:
+                assert sub_filter["authors"] == [mock_settings["service_public_key"]]
         elif msg[0] == "EVENT":
             event = msg[1]
             decrypted_content = decrypt_content(
@@ -177,6 +180,129 @@ async def run(data: WalletTest):
             await nwcwallet.cleanup()
 
 
+@pytest.mark.anyio
+async def test_nwc_rejects_event_from_unexpected_pubkey(mocker):
+    async def _noop(*args, **kwargs):
+        return None
+
+    mocker.patch("lnbits.wallets.nwc.NWCConnection._connect_to_relay", new=_noop)
+    mocker.patch("lnbits.wallets.nwc.NWCConnection._handle_timeouts", new=_noop)
+
+    service_private_key = PrivateKey()
+    service_public_key = service_private_key.public_key.format().hex()[2:]
+    attacker_private_key = PrivateKey()
+    attacker_public_key = attacker_private_key.public_key.format().hex()[2:]
+    account_private_key = PrivateKey()
+
+    conn = NWCConnection(
+        service_public_key,
+        account_private_key.secret.hex(),
+        "ws://127.0.0.1:8555",
+    )
+    try:
+        event = {
+            "kind": 23195,
+            "content": "{}",
+            "created_at": int(time.time()),
+            "tags": [["e", "request-event-id"]],
+        }
+        sign_event(attacker_public_key, attacker_private_key.secret.hex(), event)
+
+        with pytest.raises(Exception, match="Invalid event signature"):
+            await conn._on_event_message(["EVENT", "subid", event])
+    finally:
+        await conn.close()
+
+
+@pytest.mark.anyio
+async def test_nwc_marks_pending_invoice_settled_only_once():
+    wallet = NWCWallet.__new__(NWCWallet)
+    wallet.pending_invoice_details = {"checking-id": {"checking_id": "checking-id"}}
+    wallet.pending_invoices = ["checking-id"]
+    wallet.paid_invoices_queue = asyncio.Queue(0)
+
+    wallet._mark_invoice_settled("checking-id", source="notification")
+    wallet._mark_invoice_settled("checking-id", source="notification")
+
+    assert wallet.paid_invoices_queue.qsize() == 1
+    assert await wallet.paid_invoices_queue.get() == "checking-id"
+
+
+@pytest.mark.anyio
+async def test_nwc_registers_notification_subscriptions(mocker):
+    async def _noop(*args, **kwargs):
+        return None
+
+    mocker.patch("lnbits.wallets.nwc.NWCConnection._connect_to_relay", new=_noop)
+    mocker.patch("lnbits.wallets.nwc.NWCConnection._handle_timeouts", new=_noop)
+
+    service_private_key = PrivateKey()
+    service_public_key = service_private_key.public_key.format().hex()[2:]
+    account_private_key = PrivateKey()
+
+    conn = NWCConnection(
+        service_public_key,
+        account_private_key.secret.hex(),
+        "ws://127.0.0.1:8555",
+    )
+    send_mock = mocker.patch.object(conn, "_send", mocker.AsyncMock())
+
+    try:
+        await conn._subscribe_to_notifications()
+
+        assert len(conn.notification_subscription_ids) == 2
+        assert len(conn.subscriptions) == 2
+        assert set(conn.subscriptions.keys()) == conn.notification_subscription_ids
+        assert all(
+            subscription["method"] == "notification_sub"
+            and subscription["event_id"] == subscription["sub_id"]
+            for subscription in conn.subscriptions.values()
+        )
+        assert send_mock.await_count == 2
+    finally:
+        await conn.close()
+
+
+@pytest.mark.anyio
+async def test_nwc_spreads_fallback_lookups_with_cooldown(mocker):
+    def _schedule_next_lookup(
+        invoice: dict[str, object], now: float | None = None
+    ) -> None:
+        assert now is not None
+        invoice["next_lookup_at"] = now + 1
+
+    wallet = NWCWallet.__new__(NWCWallet)
+    wallet.shutdown = False
+    wallet.pending_invoices = ["checking-1", "checking-2"]
+    wallet.pending_invoice_details = {
+        "checking-1": {
+            "checking_id": "checking-1",
+            "next_lookup_at": 0.0,
+            "lookup_attempts": 0,
+        },
+        "checking-2": {
+            "checking_id": "checking-2",
+            "next_lookup_at": 0.0,
+            "lookup_attempts": 0,
+        },
+    }
+    wallet.pending_invoices_lookup_cooldown = 1.0
+    wallet._is_shutting_down = lambda: False
+    wallet._payment_data_is_settled = lambda payment_data: False
+    wallet._cache_payment_data = lambda *args, **kwargs: None
+    wallet._schedule_next_lookup = _schedule_next_lookup
+    wallet.conn = mocker.Mock()
+    wallet.conn.get_info = mocker.AsyncMock()
+    wallet.conn.supports_method = mocker.Mock(return_value=True)
+    wallet.conn.call = mocker.AsyncMock(return_value={"settled_at": None})
+    sleep_mock = mocker.patch("lnbits.wallets.nwc.asyncio.sleep", mocker.AsyncMock())
+
+    await wallet._run_fallback_lookups(100.0)
+
+    assert wallet.conn.call.await_count == 2
+    sleep_mock.assert_awaited_once_with(1.0)
+
+
 @pytest.mark.anyio
 @pytest.mark.parametrize(
     "test_data",

tests/wasm_ext/__init__.py

@@ -1 +0,0 @@
-

tests/wasm_ext/conftest.py

@@ -1,151 +0,0 @@
-from __future__ import annotations
-
-import os
-import shutil
-import socket
-import subprocess
-import sys
-import time
-from collections.abc import Iterator
-from typing import Any
-
-import httpx
-import pytest
-
-from tests.wasm_ext.helpers import (
-    EXTENSION_ID,
-    REPO_ROOT,
-    SERVER_HOST,
-    LiveLNbitsServer,
-)
-
-
-@pytest.fixture(scope="session")
-def browser_name() -> str:
-    return "chromium"
-
-
-@pytest.fixture(scope="session")
-def lnbits_server(
-    tmp_path_factory: pytest.TempPathFactory,
-) -> Iterator[LiveLNbitsServer]:
-    run_root = tmp_path_factory.mktemp("wasm_ext_e2e")
-    data_dir = run_root / "data"
-    extensions_root = run_root / "extensions-root"
-    extension_target = extensions_root / "extensions" / EXTENSION_ID
-    fixture_extension = REPO_ROOT / "tests" / "fixtures" / EXTENSION_ID
-
-    shutil.copytree(fixture_extension, extension_target)
-
-    port = _free_tcp_port()
-    base_url = f"http://{SERVER_HOST}:{port}"
-    env = {
-        **os.environ,
-        "AUTH_HTTPS_ONLY": "false",
-        "DEBUG": "true",
-        "HOST": SERVER_HOST,
-        "LNBITS_ADMIN_UI": "true",
-        "LNBITS_BACKEND_WALLET_CLASS": "FakeWallet",
-        "LNBITS_DATA_FOLDER": str(data_dir),
-        "LNBITS_EXTENSIONS_DEACTIVATE_ALL": "false",
-        "LNBITS_EXTENSIONS_PATH": str(extensions_root),
-        "LNBITS_PATH": str(REPO_ROOT),
-        "PORT": str(port),
-        "PYTHONUNBUFFERED": "1",
-    }
-
-    process = subprocess.Popen(  # noqa: S603
-        [
-            sys.executable,
-            "-m",
-            "uvicorn",
-            "lnbits.__main__:app",
-            "--host",
-            SERVER_HOST,
-            "--port",
-            str(port),
-            "--loop",
-            "asyncio",
-            "--log-level",
-            "warning",
-        ],
-        cwd=REPO_ROOT,
-        env=env,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-        text=True,
-    )
-
-    try:
-        _wait_for_first_install_page(process, base_url)
-        auth_cookies = _complete_first_install(base_url)
-        yield LiveLNbitsServer(base_url=base_url, auth_cookies=auth_cookies)
-    finally:
-        process.terminate()
-        try:
-            process.wait(timeout=10)
-        except subprocess.TimeoutExpired:
-            process.kill()
-            process.wait(timeout=10)
-
-
-@pytest.fixture
-def authenticated_page(page: Any, lnbits_server: LiveLNbitsServer) -> Any:
-    page.context.add_cookies(lnbits_server.auth_cookies)
-    return page
-
-
-def _free_tcp_port() -> int:
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
-        sock.bind((SERVER_HOST, 0))
-        return int(sock.getsockname()[1])
-
-
-def _wait_for_first_install_page(
-    process: subprocess.Popen[str],
-    base_url: str,
-) -> None:
-    deadline = time.monotonic() + 60
-    last_error: Exception | None = None
-    with httpx.Client(follow_redirects=False, timeout=2) as client:
-        while time.monotonic() < deadline:
-            if process.poll() is not None:
-                output = process.stdout.read() if process.stdout else ""
-                raise RuntimeError(f"LNbits exited before startup:\n{output}")
-            try:
-                response = client.get(f"{base_url}/first_install")
-                if response.status_code == 200:
-                    return
-            except httpx.HTTPError as exc:
-                last_error = exc
-            time.sleep(0.25)
-
-    output = process.stdout.read() if process.stdout else ""
-    raise TimeoutError(f"LNbits did not start: {last_error}\n{output}")
-
-
-def _complete_first_install(base_url: str) -> list[dict[str, Any]]:
-    with httpx.Client(base_url=base_url, follow_redirects=False, timeout=10) as client:
-        response = client.put(
-            "/api/v1/auth/first_install",
-            json={
-                "username": "wasmtest-admin",
-                "password": "secret1234",
-                "password_repeat": "secret1234",
-            },
-        )
-        response.raise_for_status()
-
-        enable_response = client.put(f"/api/v1/extension/{EXTENSION_ID}/enable")
-        enable_response.raise_for_status()
-
-        return [
-            {
-                "name": cookie.name,
-                "value": cookie.value,
-                "url": base_url,
-                "secure": cookie.secure,
-                "sameSite": "Lax",
-            }
-            for cookie in client.cookies.jar
-        ]

tests/wasm_ext/helpers.py

@@ -1,16 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Any
-
-EXTENSION_ID = "lnbits-wasm-test-extension"
-REPO_ROOT = Path(__file__).resolve().parents[2]
-SERVER_HOST = "127.0.0.1"
-
-
-@dataclass(frozen=True)
-class LiveLNbitsServer:
-    base_url: str
-    auth_cookies: list[dict[str, Any]]
-    extension_id: str = EXTENSION_ID

tests/wasm_ext/test_wasm_extension_e2e.py

@@ -1,385 +0,0 @@
-from __future__ import annotations
-
-import json
-import re
-from re import Pattern
-from typing import Any
-
-from playwright.sync_api import Frame, Page, expect
-
-from tests.wasm_ext.helpers import EXTENSION_ID, REPO_ROOT, LiveLNbitsServer
-
-
-def test_permission_grant_dialog_logic_is_compact_and_explicit(page: Page) -> None:
-    permissions = _fixture_permissions()
-    page.goto("about:blank")
-    page.add_script_tag(path=str(REPO_ROOT / "lnbits/static/js/pages/extensions.js"))
-
-    result = page.evaluate(
-        """
-        ({permissions, translations}) => {
-          const methods = window.PageExtensions.methods
-          const context = {
-            extensions: [{id: 'watchonly', name: 'Watchonly'}],
-            permissionGrant: {show: false, permissions: [], resolve: null},
-            selectedExtension: {isWasm: true},
-            selectedRelease: null,
-            showManageExtensionDialog: false,
-            $t: key => translations[key] || key
-          }
-          Object.assign(context, methods)
-
-          const release = {extension_type: 'wasm', permissions}
-          const pendingGrant = context.resolveExtensionPermissionGrant(release)
-          const opened =
-            context.permissionGrant.show === true &&
-            context.showManageExtensionDialog === true
-          const items = context.permissionGrantDisplayItems()
-          context.grantExtensionPermissions()
-
-          return pendingGrant.then(grantedPermissions => ({
-            opened,
-            closed:
-              context.permissionGrant.show === false &&
-              context.showManageExtensionDialog === false,
-            grantedPermissionIds: grantedPermissions.map(permission => permission.id),
-            items
-          }))
-        }
-        """,
-        {"permissions": permissions, "translations": _permission_translations()},
-    )
-
-    assert result["opened"] is True
-    assert result["closed"] is True
-    assert result["grantedPermissionIds"] == [
-        permission["id"] for permission in permissions
-    ]
-
-    items = result["items"]
-    assert [item["id"] for item in items] == [
-        "wallet.pay_invoice",
-        "wallet.list",
-        "wallet.balance.read",
-        "extension.api.request",
-        "ui.camera.scan_qr",
-        "ext.storage.read_write",
-        "ext.storage.read_public",
-        "wallet.create_invoice_public",
-        "wallet.create_invoice",
-        "utils.basic",
-    ]
-
-    by_id = {item["id"]: item for item in items}
-    assert by_id["wallet.pay_invoice"]["risk"]["level"] == "high"
-    assert by_id["extension.api.request"]["risk"]["level"] == "high"
-    assert by_id["ext.storage.read_write"]["risk"]["level"] == "low"
-    assert by_id["wallet.create_invoice"]["risk"]["level"] == "low"
-    assert by_id["ui.camera.scan_qr"]["risk"]["level"] == "low"
-
-    assert by_id["ext.storage.read_write"]["label"] == (
-        "Read & Write extension storage"
-    )
-    assert by_id["ext.storage.read_public"]["badges"] == [
-        {"key": "tip_jars", "label": "tip_jars"}
-    ]
-    assert by_id["ext.storage.read_public"]["fieldGroups"] == [
-        {
-            "table": "tip_jars",
-            "fields": [
-                "id",
-                "title",
-                "description",
-                "currency",
-                "suggested_amounts",
-            ],
-        }
-    ]
-    assert by_id["extension.api.request"]["badges"] == [
-        {"key": "watchonly", "label": "Watchonly"}
-    ]
-    assert by_id["extension.api.request"]["extensionAccess"] == [
-        {"id": "watchonly", "name": "Watchonly", "access": ["read", "write"]}
-    ]
-    assert by_id["wallet.create_invoice_public"]["invoicePolicies"] == [
-        {"table": "tip_jars", "walletField": "wallet_id"}
-    ]
-
-
-def test_public_wasm_page_loads_sandboxed_frame(
-    page: Page,
-    lnbits_server: LiveLNbitsServer,
-) -> None:
-    public_url = (
-        f"{lnbits_server.base_url}/ext/{lnbits_server.extension_id}/public/item-123"
-        "?source=test"
-    )
-    frame_url_part = f"/ext-frame/{lnbits_server.extension_id}/1"
-
-    with page.expect_response(lambda response: frame_url_part in response.url) as info:
-        page.goto(public_url)
-
-    frame_response = info.value
-    assert frame_response.status == 200
-    assert "sandbox allow-scripts" in frame_response.headers["content-security-policy"]
-    assert frame_response.headers["cache-control"] == "no-store"
-    assert frame_response.headers["x-content-type-options"] == "nosniff"
-
-    frame = page.locator("iframe.wasm-extension-frame")
-    expect(frame).to_have_attribute("sandbox", "allow-scripts")
-    expect(frame).to_have_attribute("allow", "clipboard-write")
-    expect(frame).to_have_attribute("referrerpolicy", "no-referrer")
-    expect(frame).to_have_attribute("src", _frame_src_pattern(frame_url_part))
-    expect(
-        page.frame_locator("iframe.wasm-extension-frame").locator("body")
-    ).to_contain_text("WASM Test Public")
-
-
-def test_static_assets_are_strictly_whitelisted(
-    page: Page,
-    lnbits_server: LiveLNbitsServer,
-) -> None:
-    assets_base = f"{lnbits_server.base_url}/ext-assets/{lnbits_server.extension_id}"
-
-    script = page.request.get(f"{assets_base}/app.js")
-    assert script.status == 200
-    assert script.headers["content-type"].startswith("text/javascript")
-    assert script.headers["x-content-type-options"] == "nosniff"
-    assert script.headers["cache-control"] == "no-store"
-
-    core_script = page.request.get(f"{assets_base}/_lnbits/vue.global.prod.js")
-    assert core_script.status == 200
-    assert core_script.headers["content-type"].startswith("text/javascript")
-    assert core_script.headers["x-content-type-options"] == "nosniff"
-
-    unsupported_extension = page.request.get(f"{assets_base}/data.json")
-    assert unsupported_extension.status == 404
-
-    html_like_javascript = page.request.get(f"{assets_base}/html-like.js")
-    assert html_like_javascript.status == 404
-
-
-def test_frame_config_exposes_permissions_and_filters_public_routes(
-    authenticated_page: Page,
-    lnbits_server: LiveLNbitsServer,
-) -> None:
-    public_config = authenticated_page.request.post(
-        _frame_config_url(lnbits_server),
-        data={
-            "path": f"/ext/{lnbits_server.extension_id}/public/item-123",
-            "query": {"source_id": "abc", "empty": None},
-        },
-    )
-    assert public_config.status == 200
-    public_bridge = public_config.json()["bridge"]
-    assert public_bridge["public"] is True
-    assert public_bridge["routeParams"] == {"itemId": "item-123"}
-    assert public_bridge["query"] == {"sourceId": "abc"}
-    assert {route["path"] for route in public_bridge["apiRoutes"]} == {
-        f"/api/v1/ext/{lnbits_server.extension_id}/jars/{{jar_id}}",
-        f"/api/v1/ext/{lnbits_server.extension_id}/invoice",
-    }
-
-    private_config = authenticated_page.request.post(
-        _frame_config_url(lnbits_server),
-        data={"path": f"/ext/{lnbits_server.extension_id}", "query": {}},
-    )
-    assert private_config.status == 200
-    private_bridge = private_config.json()["bridge"]
-    assert private_bridge["public"] is False
-    assert set(private_bridge["permissions"]) == {
-        permission["id"] for permission in _fixture_permissions()
-    }
-    assert {route["path"] for route in private_bridge["apiRoutes"]} == {
-        f"/api/v1/ext/{lnbits_server.extension_id}/wallets",
-        f"/api/v1/ext/{lnbits_server.extension_id}/payments",
-        f"/api/v1/ext/{lnbits_server.extension_id}/jars/{{jar_id}}",
-        f"/api/v1/ext/{lnbits_server.extension_id}/invoice",
-    }
-
-
-def test_private_frame_config_and_api_routes_require_auth(
-    page: Page,
-    lnbits_server: LiveLNbitsServer,
-) -> None:
-    private_config = page.request.post(
-        _frame_config_url(lnbits_server),
-        data={"path": f"/ext/{lnbits_server.extension_id}", "query": {}},
-    )
-    assert private_config.status == 401
-
-    private_api = page.request.get(
-        f"{lnbits_server.base_url}/api/v1/ext/{lnbits_server.extension_id}/wallets"
-    )
-    assert private_api.status == 401
-
-    public_config = page.request.post(
-        _frame_config_url(lnbits_server),
-        data={
-            "path": f"/ext/{lnbits_server.extension_id}/public/item-123",
-            "query": {},
-        },
-    )
-    assert public_config.status == 200
-
-
-def test_bridge_context_and_denied_api_request(
-    page: Page,
-    lnbits_server: LiveLNbitsServer,
-) -> None:
-    frame_url_part = f"/ext-frame/{lnbits_server.extension_id}/1"
-
-    with page.expect_response(lambda response: frame_url_part in response.url):
-        page.goto(
-            f"{lnbits_server.base_url}/ext/{lnbits_server.extension_id}"
-            "/public/item-123?source=test"
-        )
-
-    frame = _wasm_frame(page, frame_url_part)
-    assert frame.evaluate("() => window.lnbitsWasmTestBridge.ready()") is True
-
-    context_response = frame.evaluate("""
-        () => window.lnbitsWasmTestBridge.request({
-          action: 'context'
-        })
-        """)
-    assert context_response == {
-        "type": "lnbits-extension:response",
-        "id": "wasm-test-1",
-        "ok": True,
-        "data": {
-            "extensionId": EXTENSION_ID,
-            "public": True,
-            "routeParams": {"itemId": "item-123"},
-            "query": {"source": "test"},
-        },
-    }
-
-    denied_response = frame.evaluate("""
-        () => window.lnbitsWasmTestBridge.request({
-          action: 'api',
-          method: 'GET',
-          path: '/api/v1/wallets'
-        })
-        """)
-    assert denied_response["ok"] is False
-    assert denied_response["error"] == "Extension API route is not allowed."
-
-    unknown_response = frame.evaluate("""
-        () => window.lnbitsWasmTestBridge.request({
-          action: 'unknown'
-        })
-        """)
-    assert unknown_response["ok"] is False
-    assert unknown_response["error"] == "Unknown extension bridge action."
-
-
-def test_frame_token_is_route_bound_required_and_single_use(
-    page: Page,
-    lnbits_server: LiveLNbitsServer,
-) -> None:
-    frame_config = page.request.post(
-        f"{lnbits_server.base_url}/api/v1/ext/"
-        f"{lnbits_server.extension_id}/_ui/frame",
-        data={
-            "path": f"/ext/{lnbits_server.extension_id}/public/item-123",
-            "query": {"source": "test"},
-        },
-    )
-    assert frame_config.status == 200
-    frame_url = frame_config.json()["frameUrl"]
-
-    missing_token = page.request.get(
-        f"{lnbits_server.base_url}/ext-frame/{lnbits_server.extension_id}/1"
-    )
-    assert missing_token.status == 404
-
-    wrong_route = page.request.get(
-        f"{lnbits_server.base_url}{frame_url.replace('/1?', '/0?')}"
-    )
-    assert wrong_route.status == 404
-
-    first_use = page.request.get(f"{lnbits_server.base_url}{frame_url}")
-    assert first_use.status == 200
-    assert "form-action 'none'" in first_use.headers["content-security-policy"]
-
-    second_use = page.request.get(f"{lnbits_server.base_url}{frame_url}")
-    assert second_use.status == 404
-
-
-def test_private_wasm_page_uses_lnbits_shell_and_private_frame(
-    authenticated_page: Page,
-    lnbits_server: LiveLNbitsServer,
-) -> None:
-    page = authenticated_page
-    frame_url_part = f"/ext-frame/{lnbits_server.extension_id}/0"
-
-    with page.expect_response(lambda response: frame_url_part in response.url) as info:
-        page.goto(f"{lnbits_server.base_url}/ext/{lnbits_server.extension_id}")
-
-    assert info.value.status == 200
-    expect(page.locator("body")).to_contain_text("LNbits")
-    frame = page.locator("iframe.wasm-extension-frame")
-    expect(frame).to_have_attribute("sandbox", "allow-scripts")
-    expect(frame).to_have_attribute("src", _frame_src_pattern(frame_url_part))
-    expect(
-        page.frame_locator("iframe.wasm-extension-frame").locator("body")
-    ).to_contain_text("WASM Test Admin")
-
-
-def _frame_src_pattern(frame_url_part: str) -> Pattern[str]:
-    return re.compile(f"^{re.escape(frame_url_part)}\\?frame_token=[a-f0-9]{{32}}$")
-
-
-def _frame_config_url(lnbits_server: LiveLNbitsServer) -> str:
-    return (
-        f"{lnbits_server.base_url}/api/v1/ext/"
-        f"{lnbits_server.extension_id}/_ui/frame"
-    )
-
-
-def _fixture_permissions() -> list[dict[str, Any]]:
-    config = json.loads(
-        (REPO_ROOT / "tests/fixtures" / EXTENSION_ID / "config.json").read_text()
-    )
-    permissions = config["permissions"]
-    assert isinstance(permissions, list)
-    return permissions
-
-
-def _permission_translations() -> dict[str, str]:
-    return {
-        "extension_permission_access_read": "Read",
-        "extension_permission_access_write": "Write",
-        "extension_permission_ext_storage_read_public": (
-            "Read public extension storage"
-        ),
-        "extension_permission_ext_storage_read_write": (
-            "Read & Write extension storage"
-        ),
-        "extension_permission_extension_api_request": "Use other extensions",
-        "extension_permission_risk_high": "High risk",
-        "extension_permission_risk_low": "Low risk",
-        "extension_permission_risk_medium": "Medium risk",
-        "extension_permission_ui_camera_scan_qr": "Scan QR codes",
-        "extension_permission_utils_basic": "Use basic LNbits utilities",
-        "extension_permission_wallet_balance_read": "View wallet balances",
-        "extension_permission_wallet_create_invoice": "Create invoices",
-        "extension_permission_wallet_create_invoice_public": (
-            "Create Lightning invoices from public pages"
-        ),
-        "extension_permission_wallet_list": "List wallets",
-        "extension_permission_wallet_pay_invoice": "Pay invoices",
-        "extension_permission_warning_extension_api_request_write": (
-            "This extension can write to another extension."
-        ),
-        "extension_permission_warning_wallet_pay_invoice": (
-            "This extension can spend from selected wallets."
-        ),
-    }
-
-
-def _wasm_frame(page: Page, frame_url_part: str) -> Frame:
-    frame = page.frame(url=lambda url: frame_url_part in url)
-    assert frame is not None
-    return frame

uv.lock

@@ -1368,7 +1368,6 @@ dev = [
     { name = "pytest-httpserver" },
     { name = "pytest-md" },
     { name = "pytest-mock" },
-    { name = "pytest-playwright" },
     { name = "ruff" },
     { name = "types-mock" },
     { name = "types-passlib" },
@@ -1447,7 +1446,6 @@ dev = [
     { name = "pytest-httpserver", specifier = "~=1.1.3" },
     { name = "pytest-md", specifier = "~=0.2.0" },
     { name = "pytest-mock", specifier = "~=3.15.1" },
-    { name = "pytest-playwright", specifier = ">=0.8.0" },
     { name = "ruff", specifier = "~=0.14.10" },
     { name = "types-mock", specifier = "~=5.2.0.20250924" },
     { name = "types-passlib", specifier = "~=1.7.7.20250602" },
@@ -1834,25 +1832,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/75/a6/a0a304dc33b49145b21f4808d763822111e67d1c3a32b524a1baf947b6e1/platformdirs-4.9.6-py3-none-any.whl", hash = "sha256:e61adb1d5e5cb3441b4b7710bea7e4c12250ca49439228cc1021c00dcfac0917", size = 21348, upload-time = "2026-04-09T00:04:09.463Z" },
 ]
 
-[[package]]
-name = "playwright"
-version = "1.61.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "greenlet" },
-    { name = "pyee" },
-]
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/44/ee/31e4e0db36588b817a10b299a0285082545fde7d36543c2abe498bb3d61a/playwright-1.61.0-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:ff138c3a604f69911e9d42fd036e55c2a171e5616edf04c1e7f60a2a285540b0", size = 43421877, upload-time = "2026-06-29T10:32:48.428Z" },
-    { url = "https://files.pythonhosted.org/packages/42/35/71395dd3ecc798965be4a3ef8c443217d4abca168e7cb34536304f9489e6/playwright-1.61.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:009588c2a7e499bc5a8b425b61fa65490968bbda9cd69e0cf2cff10f8304659a", size = 42205016, upload-time = "2026-06-29T10:32:52.104Z" },
-    { url = "https://files.pythonhosted.org/packages/f4/44/323164cf5cd1647bdefce76ffce27651aadb959d089b48f53ea40918276e/playwright-1.61.0-py3-none-macosx_11_0_universal2.whl", hash = "sha256:9f7de4536088d12037c13a52b7ea34b59270b78926bb56935070597ffac6b1af", size = 43421884, upload-time = "2026-06-29T10:32:55.773Z" },
-    { url = "https://files.pythonhosted.org/packages/ab/f8/a35bf179e4ba2522c1893635094a64e407572547bd61528820fc0abc87fe/playwright-1.61.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:54f3b39f6eab832e33458c1dd7da0b5682aedab3b09ae731b5c59fa12fd2024e", size = 47421381, upload-time = "2026-06-29T10:32:59.903Z" },
-    { url = "https://files.pythonhosted.org/packages/b7/eb/e3f922348ec17c315f98c463f72faa1181a1c3de0bfe31a8d2edf6561723/playwright-1.61.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:93454322ade8c11d5d6c211bfd91bdfb9ffb4810e3e026371bcbc4bec1b7ee4c", size = 47120545, upload-time = "2026-06-29T10:33:03.574Z" },
-    { url = "https://files.pythonhosted.org/packages/c2/a6/5be4e52b40a9c0c8a073e7c5b0785c05cf5a9ea8f8a7b5b260e32d970342/playwright-1.61.0-py3-none-win32.whl", hash = "sha256:372d55a6f1248fa1dd47599686980cb8fb5bbe6fcda59eab793eb657c11d8a9b", size = 37844841, upload-time = "2026-06-29T10:33:07.361Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/fd/2b78036e5fbe9d5f5645bbe08a1eac7160c51243c0093963edbcf67c35d9/playwright-1.61.0-py3-none-win_amd64.whl", hash = "sha256:35c6cc4589a5d00964a59d7b3e59641e0aac0c02f15479a7af77d20f6bc79597", size = 37844846, upload-time = "2026-06-29T10:33:10.637Z" },
-    { url = "https://files.pythonhosted.org/packages/27/0d/1b0f3c4ee4eb0514bc805b5c2f9a223e5b6de4f11a926f5235d51d0fc81b/playwright-1.61.0-py3-none-win_arm64.whl", hash = "sha256:e9fcbffcf557a8620fdedd92491eb59a32d18e23d6f3b4f6214b952be324fe51", size = 33955127, upload-time = "2026-06-29T10:33:14.008Z" },
-]
-
 [[package]]
 name = "pluggy"
 version = "1.6.0"
@@ -2080,18 +2059,6 @@ email = [
     { name = "email-validator" },
 ]
 
-[[package]]
-name = "pyee"
-version = "13.0.1"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "typing-extensions" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/8b/04/e7c1fe4dc78a6fdbfd6c337b1c3732ff543b8a397683ab38378447baa331/pyee-13.0.1.tar.gz", hash = "sha256:0b931f7c14535667ed4c7e0d531716368715e860b988770fc7eb8578d1f67fc8", size = 31655, upload-time = "2026-02-14T21:12:28.044Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/a0/c4/b4d4827c93ef43c01f599ef31453ccc1c132b353284fc6c87d535c233129/pyee-13.0.1-py3-none-any.whl", hash = "sha256:af2f8fede4171ef667dfded53f96e2ed0d6e6bd7ee3bb46437f77e3b57689228", size = 15659, upload-time = "2026-02-14T21:12:26.263Z" },
-]
-
 [[package]]
 name = "pygments"
 version = "2.20.0"
@@ -2234,19 +2201,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" },
 ]
 
-[[package]]
-name = "pytest-base-url"
-version = "2.1.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "pytest" },
-    { name = "requests" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/ae/1a/b64ac368de6b993135cb70ca4e5d958a5c268094a3a2a4cac6f0021b6c4f/pytest_base_url-2.1.0.tar.gz", hash = "sha256:02748589a54f9e63fcbe62301d6b0496da0d10231b753e950c63e03aee745d45", size = 6702, upload-time = "2024-01-31T22:43:00.81Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/98/1c/b00940ab9eb8ede7897443b771987f2f4a76f06be02f1b3f01eb7567e24a/pytest_base_url-2.1.0-py3-none-any.whl", hash = "sha256:3ad15611778764d451927b2a53240c1a7a591b521ea44cebfe45849d2d2812e6", size = 5302, upload-time = "2024-01-31T22:42:58.897Z" },
-]
-
 [[package]]
 name = "pytest-cov"
 version = "7.0.0"
@@ -2297,21 +2251,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/5a/cc/06253936f4a7fa2e0f48dfe6d851d9c56df896a9ab09ac019d70b760619c/pytest_mock-3.15.1-py3-none-any.whl", hash = "sha256:0a25e2eb88fe5168d535041d09a4529a188176ae608a6d249ee65abc0949630d", size = 10095, upload-time = "2025-09-16T16:37:25.734Z" },
 ]
 
-[[package]]
-name = "pytest-playwright"
-version = "0.8.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "playwright" },
-    { name = "pytest" },
-    { name = "pytest-base-url" },
-    { name = "python-slugify" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/58/ef/172eb8e23c80491fc72f1401c72f9305663873649351306a38b18406b0c9/pytest_playwright-0.8.0.tar.gz", hash = "sha256:7888d4a2443160c82e0c506c437076679f86b36d1910427250d90fbf1843a981", size = 17132, upload-time = "2026-05-18T10:16:15.919Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/fe/71/1c545fac6a9054b52b3771238fb2dc6e8f1d0ccec116e1c7786ec191887c/pytest_playwright-0.8.0-py3-none-any.whl", hash = "sha256:856aae6efd4bc055f2ef229c647768760bcaad5cd3a5983c314ac260a974a933", size = 17143, upload-time = "2026-05-18T10:16:18.226Z" },
-]
-
 [[package]]
 name = "python-crontab"
 version = "3.3.0"
@@ -2352,18 +2291,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/5e/1e/7f7f299527a5a8ad90acd5f2f78dfa6c8495c6301a3205106ea68a84de96/python_multipart-0.0.31-py3-none-any.whl", hash = "sha256:8408153d68a9773291fc1da39a8b85a50044bddbabd2dd72e9229776b7b15e28", size = 29996, upload-time = "2026-06-04T08:27:47.804Z" },
 ]
 
-[[package]]
-name = "python-slugify"
-version = "8.0.4"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "text-unidecode" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/87/c7/5e1547c44e31da50a460df93af11a535ace568ef89d7a811069ead340c4a/python-slugify-8.0.4.tar.gz", hash = "sha256:59202371d1d05b54a9e7720c5e038f928f45daaffe41dd10822f3907b937c856", size = 10921, upload-time = "2024-02-08T18:32:45.488Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/a4/62/02da182e544a51a5c3ccf4b03ab79df279f9c60c5e82d5e8bec7ca26ac11/python_slugify-8.0.4-py2.py3-none-any.whl", hash = "sha256:276540b79961052b66b7d116620b36518847f52d5fd9e3a70164fc8c50faa6b8", size = 10051, upload-time = "2024-02-08T18:32:43.911Z" },
-]
-
 [[package]]
 name = "pytokens"
 version = "0.4.1"
@@ -2703,15 +2630,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ce/fd/901cfa59aaa5b30a99e16876f11abe38b59a1a2c51ffb3d7142bb6089069/starlette-0.47.3-py3-none-any.whl", hash = "sha256:89c0778ca62a76b826101e7c709e70680a1699ca7da6b44d38eb0a7e61fe4b51", size = 72991, upload-time = "2025-08-24T13:36:40.887Z" },
 ]
 
-[[package]]
-name = "text-unidecode"
-version = "1.3"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ab/e2/e9a00f0ccb71718418230718b3d900e71a5d16e701a3dae079a21e9cd8f8/text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93", size = 76885, upload-time = "2019-08-30T21:36:45.405Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/a6/a5/c0b6468d3824fe3fde30dbb5e1f687b291608f9473681bbf7dabbf5a87d7/text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8", size = 78154, upload-time = "2019-08-30T21:37:03.543Z" },
-]
-
 [[package]]
 name = "tibs"
 version = "0.5.7"