fifi

manual testing works
2nd stage draft pydantic
2026-03-25 11:29:03 +01:00 · 2026-03-25 11:14:53 +01:00 · 2026-03-25 10:47:13 +01:00 · 2026-03-25 10:23:35 +01:00 · 2026-03-25 09:39:22 +01:00
192 changed files with 28191 additions and 27854 deletions
@@ -7,20 +7,14 @@
 # They are NOT managed by the Admin UI and are not stored in the database.

 # === First Install Token ===
-# If set the user is required to enter this token on the /first_install page
+# if set the user is required to enter this token on the /first_install page
 # FIRST_INSTALL_TOKEN="myaccesstoken"

-# === Security ===
-# When enabled (recommended), auth cookies require HTTPS and SSO will reject insecure HTTP.
-AUTH_HTTPS_ONLY=true
-
 # === Logging and Development ===

 DEBUG=False
 DEBUG_DATABASE=False
 BUNDLE_ASSETS=True
-# add `?profiler=true` to the url to enable the profiler for that request
-PROFILER=False

 # logging into LNBITS_DATA_FOLDER/logs/
 ENABLE_LOG_TO_FILE=true
@@ -30,10 +24,6 @@ LOG_ROTATION="100 MB"
 LOG_RETENTION="3 months"
 # for database cleanup commands
 # CLEANUP_WALLETS_DAYS=90
-# Hard limit for total created users. Set to 0 to disable the limit.
-# LNBITS_MAX_USERS=0
-# Hard limit for total installed extensions. Set to 0 to disable the limit.
-# LNBITS_MAX_EXTENSIONS=0

 # === Admin Settings ===

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

 ######################################
@@ -7,6 +7,10 @@ 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:
@@ -14,6 +18,10 @@ 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:
@@ -61,10 +69,7 @@ jobs:
            --onefile \
            --name lnbits \
            --hidden-import=embit \
-            --hidden-import=bitstring.bitstore_bitarray \
            --collect-all embit \
-            --collect-all bitstring \
-            --collect-all bitarray \
            --collect-all lnbits \
            --collect-all sqlalchemy \
            --collect-all breez_sdk \
@@ -105,6 +110,11 @@ 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
@@ -10,16 +10,15 @@ jobs:
    steps:
      - uses: actions/checkout@v4
        with:
-          ref: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.head_ref || github.event.pull_request.head.sha }}
+          ref: ${{ github.head_ref }}
      - uses: lnbits/lnbits/.github/actions/prepare@dev
        with:
          python-version: "3.10"
          node-version: "24.x"
          npm: true
-      - name: Build and commit bundle (same-repo PR)
-        if: github.event.pull_request.head.repo.full_name == github.repository
+      - run: make bundle
+      - name: Commit and push bundle changes
        run: |
-          make bundle
          git config user.name "alan"
          git config user.email "alan@lnbits.com"
          git add lnbits/static
@@ -28,6 +27,3 @@ jobs:
          fi
          git commit -m "chore: make bundle [skip ci]"
          git push
-      - name: Check bundle is up-to-date (fork PR)
-        if: github.event.pull_request.head.repo.full_name != github.repository
-        run: make checkbundle
@@ -1,5 +1,9 @@
 name: LNbits CI
 on:
+  push:
+    branches:
+      - main
+      - dev
  pull_request:


@@ -66,7 +66,6 @@ jobs:
          BOLTZ_MNEMONIC: abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about
          LNBITS_MAX_OUTGOING_PAYMENT_AMOUNT_SATS: 1000000000
          LNBITS_MAX_INCOMING_PAYMENT_AMOUNT_SATS: 1000000000
-          LNBITS_FUNDING_SOURCE_PAY_INVOICE_WAIT_SECONDS: ${{ inputs.backend-wallet-class == 'CoreLightningRestWallet' && 60 || 5 }}
          ECLAIR_PASS: lnbits
          PYTHONUNBUFFERED: 1
          DEBUG: true
@@ -12,6 +12,8 @@ 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
@@ -20,6 +22,14 @@ 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'
@@ -64,3 +74,4 @@ jobs:
    uses: ./.github/workflows/appimage.yml
    with:
      tag_name: ${{ github.ref_name }}
+      upload_url: ${{ needs.release.outputs.upload_url }}
@@ -13,6 +13,8 @@ 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
@@ -21,6 +23,14 @@ 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'
@@ -75,3 +85,4 @@ jobs:
    uses: ./.github/workflows/appimage.yml
    with:
      tag_name: ${{ github.ref_name }}
+      upload_url: ${{ needs.release.outputs.upload_url }}
@@ -6,7 +6,6 @@ __pycache__
 *$py.class
 .mypy_cache
 .vscode
-.codex
 *-lock.json
 .python-version

@@ -1 +0,0 @@
-min-release-age=7
@@ -1,60 +0,0 @@
-# AGENTS.md - AI Coding Agent Guide for LNbits
-
-This file guides AI coding agents working on LNbits. Keep changes small, verified, and aligned with existing project patterns.
-
-## Core Behavior
-
- Think before coding. State material assumptions. Ask when ambiguity affects correctness, security, payments, wallets, or data migrations.
- Prefer the simplest implementation that solves the request.
- Make surgical changes. Every changed line should trace back to the task.
- Do not refactor, reformat, rename, or clean adjacent code unless required.
- Remove only dead code or imports created by your own changes.
- Define success criteria for non-trivial work and verify them before reporting done.
-
-## LNbits Architecture
-
- Keep core lean. Prefer/assess extensions for non-core features.
- Preserve compatibility with existing extensions and wallet backends.
- Follow existing patterns in `lnbits/core`, `lnbits/wallets`, `lnbits/extensions`, and frontend code.
- Use existing CRUD, services, settings, and migration patterns.
- Do not edit generated files, bundled vendor files, or unrelated extension code.
-
-## Security-Sensitive Areas
-
-Be extra cautious with payments, wallet balances, admin routes, keys, LNURL, Bolt11, funding sources, migrations, and authentication.
-
-Do not expose raw stack traces or sensitive values. Do not add synchronous blocking work in hot async paths without justification.
-
-## Commands and Verification
-
-Read `Makefile` before running project commands.
-
-Use Makefile targets instead of hand-written commands when available:
-
- `make check` for full checks.
- `make test-unit` for unit tests.
- `make test-api` for API tests.
- `make test-wallets` for wallet tests.
- `make checkbundle` when bundled frontend assets may be affected.
- `make format` only when formatting is intended.
-
-Do not run `make test` by default. Use the targeted tests available in the Makefile that are related to the work done, unless the user explicitly asks for broader test coverage.
-
-## Dependencies
-
-Do not add dependencies without approval. If approved, update the correct project files and explain why the dependency is necessary.
-
-## Maintenance
-
-LNbits maintainers own this file. They should update it when the development workflow, architecture, or verification commands materially change.
-
-Do not edit, commit, push, or include changes to this file in a PR as part of normal feature work unless the user explicitly asks for `AGENTS.md` changes.
-
-## Reporting
-
-When finished, report:
-
- Summary of what changed.
- Files touched.
- Makefile targets or checks run.
- Anything not verified and why.
@@ -43,4 +43,4 @@ ENV LNBITS_HOST="0.0.0.0"

 EXPOSE 5000

-CMD ["sh", "-c", "uv --offline run lnbits --port $LNBITS_PORT --host $LNBITS_HOST --forwarded-allow-ips='*'"]
+CMD ["sh", "-c", "uv run lnbits --port $LNBITS_PORT --host $LNBITS_HOST --forwarded-allow-ips='*'"]
@@ -66,7 +66,6 @@ test-regtest:
 	LNBITS_DATA_FOLDER="./tests/data" \
 	PYTHONUNBUFFERED=1 \
 	DEBUG=true \
-	rm -rf ./tests/data \
 	uv run pytest tests/regtest

 test-migration:
@@ -1,12 +1,12 @@
 <a href="https://lnbits.com" target="_blank" rel="noopener noreferrer">
  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="docs/logos/lnbits-full-inverse.svg">
-    <img src="docs/logos/lnbits-full.svg" alt="LNbits" style="width:300px">
+    <source media="(prefers-color-scheme: dark)" srcset="https://i.imgur.com/QE6SIrs.png">
+    <img src="https://i.imgur.com/fyKPgVT.png" alt="LNbits" style="width:300px">
  </picture>
 </a>

-![phase: stable](https://img.shields.io/badge/phase-stable-2EA043) [![license-badge]](LICENSE) [![docs-badge]][docs] ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-yellow) [![explore: LNbits extensions](https://img.shields.io/badge/explore-LNbits%20extensions-10B981)](https://extensions.lnbits.com/) [![hardware: LNBitsShop](https://img.shields.io/badge/hardware-LNBitsShop-7C3AED)](https://shop.lnbits.com/) [<img src="https://img.shields.io/badge/community_chat-Telegram-24A1DE">](https://t.me/lnbits)  
-<img alt="lnbits_head" src="docs/assets/header.jpg" />  
+![phase: stable](https://img.shields.io/badge/phase-stable-2EA043) [![license-badge]](LICENSE) [![docs-badge]][docs] ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-yellow) [![explore: LNbits extensions](https://img.shields.io/badge/explore-LNbits%20extensions-10B981)](https://extensions.lnbits.com/) [![hardware: LNBitsShop](https://img.shields.io/badge/hardware-LNBitsShop-7C3AED)](https://shop.lnbits.com/) [<img src="https://img.shields.io/badge/community_chat-Telegram-24A1DE">](https://t.me/lnbits) [<img src="https://img.shields.io/badge/supported_by-%3E__OpenSats-f97316">](https://opensats.org)  
+<img width="2000" height="203" alt="lnbits_head" src="https://github.com/user-attachments/assets/77669718-ac10-43c7-ae95-6ce236c77401" />  
 [![tip-hero](https://img.shields.io/badge/TipJar-LNBits%20Hero-9b5cff?labelColor=6b7280&logo=lightning&logoColor=white)](https://demo.lnbits.com/tipjar/DwaUiE4kBX6mUW6pj3X5Kg)

 # LNbits — The most powerful Bitcoin & Lightning toolkit
@@ -46,7 +46,7 @@ Get yourself familiar and test on our demo server [demo.lnbits.com](https://demo

 LNbits is packaged with tools to help manage funds, such as a table of transactions, line chart of spending, export to csv. Each wallet also comes with its own API keys, to help partition the exposure of your funding source.

-<img alt="lnbits_wallet" src="docs/assets/wallet.jpg" />
+<img src="https://i.imgur.com/w8jdGpF.png" style="width:800px">

 ## LNbits extension universe

@@ -54,25 +54,25 @@ Extend YOUR LNbits to meet YOUR needs.

 All non-core features are installed as extensions, reducing your code base and making your LNbits unique to you. Extend your LNbits install in any direction, and even create and share your own extensions.

-<img alt="lnbits_extensions" src="docs/assets/extensions.jpg" />
+<img src="https://i.imgur.com/aEBpwJF.png" style="width:800px">

 ## LNbits API

 LNbits has a powerful API, many projects use LNbits to do the heavy lifting for their bitcoin/lightning services.

-<img alt="lnbits_api" src="docs/assets/api.jpg" />
+<img src="https://i.imgur.com/V742sb9.png" style="width:800px">

 ## LNbits node manager

 LNbits comes packaged with a light node management UI, to make running your node that much easier.

-<img alt="lnbits_api" src="docs/assets/lightning_node.jpg" />
+<img src="https://i.imgur.com/TYqIK60.png" style="width:800px">

-## LNbits merchant tools
+## LNbits across all your devices

-The LNbits stack can process both bitcoin and fiat payments, making it a turnkey, all-in-one solution for merchants. With orders and inventory shared across extensions, and built-in notifications for Nostr, Telegram, and email, LNbits keeps everything in sync, freeing merchants to focus on their business.
+As well as working great in a browser, LNbits has native IoS and Android apps as well as a chrome extension. So you can enjoy the same UI across ALL your devices.

-<img alt="lnbits_merchants" src="docs/assets/merchants_small.webp" />
+<img src="https://i.imgur.com/J96EbRf.png" style="width:800px">

 ## Powered by LNbits

@@ -14,6 +14,7 @@ nav_order: 1
 ![phase: stable](https://img.shields.io/badge/phase-stable-2EA043)
 ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-yellow)
 [<img src="https://img.shields.io/badge/community_chat-Telegram-24A1DE">](https://t.me/lnbits)
+[<img src="https://img.shields.io/badge/supported_by-%3E__OpenSats-f97316">](https://opensats.org)

 # LNBits Admin UI

@@ -14,6 +14,7 @@ nav_order: 1
 ![phase: stable](https://img.shields.io/badge/phase-stable-2EA043)
 ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-yellow)
 [<img src="https://img.shields.io/badge/community_chat-Telegram-24A1DE">](https://t.me/lnbits)
+[<img src="https://img.shields.io/badge/supported_by-%3E__OpenSats-f97316">](https://opensats.org)

 # Backend Wallet Comparison Table

@@ -11,7 +11,7 @@ nav_order: 1
  </picture>
 </a>

-![phase: stable](https://img.shields.io/badge/phase-stable-2EA043) ![License: MIT](https://img.shields.io/badge/License-MIT-blue) ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-yellow) [![explore: LNbits extensions](https://img.shields.io/badge/explore-LNbits%20extensions-10B981)](https://extensions.lnbits.com/) [<img src="https://img.shields.io/badge/community_chat-Telegram-24A1DE">](https://t.me/lnbits)
+![phase: stable](https://img.shields.io/badge/phase-stable-2EA043) ![License: MIT](https://img.shields.io/badge/License-MIT-blue) ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-yellow) [![explore: LNbits extensions](https://img.shields.io/badge/explore-LNbits%20extensions-10B981)](https://extensions.lnbits.com/) [<img src="https://img.shields.io/badge/community_chat-Telegram-24A1DE">](https://t.me/lnbits) <img src="https://img.shields.io/badge/supported_by-%3E__OpenSats-f97316">

 # Basic installation

@@ -51,7 +51,7 @@ nav_order: 1
 sudo apt-get install jq libfuse2
 wget $(curl -s https://api.github.com/repos/lnbits/lnbits/releases/latest | jq -r '.assets[] | select(.name | endswith(".AppImage")) | .browser_download_url') -O LNbits-latest.AppImage
 chmod +x LNbits-latest.AppImage
-LNBITS_ADMIN_UI=true HOST=0.0.0.0 PORT=5000 AUTH_HTTPS_ONLY=false ./LNbits-latest.AppImage # most system settings are now in the admin UI, but pass additional .env variables here
+LNBITS_ADMIN_UI=true HOST=0.0.0.0 PORT=5000 ./LNbits-latest.AppImage # most system settings are now in the admin UI, but pass additional .env variables here
 ```

 - LNbits will create a folder for DB and extension files **in the same directory** as the AppImage.
@@ -285,7 +285,10 @@ but you can also set the env variables or pass command line arguments:

 ```sh
 # .env variables are currently passed when running, but LNbits can be managed with the admin UI.
-LNBITS_ADMIN_UI=true AUTH_HTTPS_ONLY=false ./result/bin/lnbits --port 9000 --host 0.0.0.0
+LNBITS_ADMIN_UI=true ./result/bin/lnbits --port 9000 --host 0.0.0.0
+
+# Once you have created a user, you can set as the super_user
+SUPER_USER=be54db7f245346c8833eaa430e1e0405 LNBITS_ADMIN_UI=true ./result/bin/lnbits --port 9000
 ```

 > ![NOTE](https://img.shields.io/badge/NOTE-3b82f6?labelColor=494949)
@@ -14,6 +14,7 @@ nav_order: 1
 ![phase: stable](https://img.shields.io/badge/phase-stable-2EA043)
 ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-yellow)
 [<img src="https://img.shields.io/badge/community_chat-Telegram-24A1DE">](https://t.me/lnbits)
+[<img src="https://img.shields.io/badge/supported_by-%3E__OpenSats-f97316">](https://opensats.org)

 # LNbits Super User (SU)

@@ -14,6 +14,7 @@ nav_order: 1
 ![phase: stable](https://img.shields.io/badge/phase-stable-2EA043)
 ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-yellow)
 [<img src="https://img.shields.io/badge/community_chat-Telegram-24A1DE">](https://t.me/lnbits)
+[<img src="https://img.shields.io/badge/supported_by-%3E__OpenSats-f97316">](https://opensats.org)

 # LNbits Roles: A Quick Overview

@@ -14,6 +14,7 @@ nav_order: 3
 ![phase: stable](https://img.shields.io/badge/phase-stable-2EA043)
 ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-yellow)
 [<img src="https://img.shields.io/badge/community_chat-Telegram-24A1DE">](https://t.me/lnbits)
+[<img src="https://img.shields.io/badge/supported_by-%3E__OpenSats-f97316">](https://opensats.org)

 # Backend wallets

@@ -40,7 +40,6 @@ from lnbits.core.tasks import (
 )
 from lnbits.exceptions import register_exception_handlers
 from lnbits.helpers import version_parse
-from lnbits.llms_txt import create_llms_txt_route
 from lnbits.settings import settings
 from lnbits.tasks import (
    cancel_all_tasks,
@@ -66,7 +65,6 @@ from .middleware import (
    InstalledExtensionMiddleware,
    add_first_install_middleware,
    add_ip_block_middleware,
-    add_profiler_middleware,
    add_ratelimit_middleware,
 )
 from .tasks import internal_invoice_listener, invoice_listener, run_interval
@@ -103,9 +101,6 @@ async def startup(app: FastAPI):
    # register core routes
    init_core_routers(app)

-    # register llms.txt endpoint for AI agents
-    create_llms_txt_route(app)
-
    # initialize tasks
    register_async_tasks()

@@ -201,9 +196,6 @@ def create_app() -> FastAPI:

    register_exception_handlers(app)

-    if settings.profiler:
-        add_profiler_middleware(app)
-
    return app


@@ -711,7 +711,9 @@ async def _call_install_extension(
        user_id = user_id or get_super_user()
        async with httpx.AsyncClient() as client:
            resp = await client.post(
-                f"{url}/api/v1/extension?usr={user_id}", json=data.dict(), timeout=40
+                f"{url}/api/v1/extension?usr={user_id}",
+                json=data.model_dump(),
+                timeout=40,
            )
            resp.raise_for_status()
    else:
@@ -12,7 +12,6 @@ from .extensions import (
    drop_extension_db,
    get_installed_extension,
    get_installed_extensions,
-    get_installed_extensions_count,
    get_user_active_extensions_ids,
    get_user_extension,
    get_user_extensions,
@@ -59,7 +58,6 @@ from .users import (
    get_account_by_username,
    get_account_by_username_or_email,
    get_accounts,
-    get_accounts_count,
    get_user,
    get_user_access_control_lists,
    get_user_from_account,
@@ -119,13 +117,11 @@ __all__ = [
    "get_account_by_username",
    "get_account_by_username_or_email",
    "get_accounts",
-    "get_accounts_count",
    "get_admin_settings",
    "get_db_version",
    "get_db_versions",
    "get_installed_extension",
    "get_installed_extensions",
-    "get_installed_extensions_count",
    "get_latest_payments_by_extension",
    "get_payment",
    "get_payments",
@@ -90,13 +90,6 @@ async def get_installed_extensions(
    return all_extensions


-async def get_installed_extensions_count(conn: Connection | None = None) -> int:
-    row: dict | None = await (conn or db).fetchone(
-        "SELECT COUNT(*) as count FROM installed_extensions"
-    )
-    return int(row["count"]) if row else 0
-
-
 async def get_user_extension(
    user_id: str, extension: str, conn: Connection | None = None
 ) -> UserExtension | None:
@@ -290,10 +290,8 @@ async def create_payment(
        webhook=data.webhook,
        fee=-abs(data.fee),
        tag=extra.get("tag", None),
-        extension=data.extension,
        extra=extra,
        labels=data.labels or [],
-        external_id=data.external_id,
    )

    await (conn or db).insert("apipayments", payment)
@@ -307,7 +305,7 @@ async def update_payment_checking_id(
    await (conn or db).execute(
        f"""
            UPDATE apipayments
-            SET checking_id = :new_id, updated_at = {db.timestamp_placeholder("now")}
+            SET checking_id = :new_id, updated_at = {db.timestamp_placeholder('now')}
            WHERE checking_id = :old_id
        """,  # noqa: S608
        {
@@ -322,15 +320,13 @@ async def update_payment(
    payment: Payment,
    new_checking_id: str | None = None,
    conn: Connection | None = None,
-) -> Payment:
+) -> None:
    payment.updated_at = datetime.now(timezone.utc)
    await (conn or db).update(
        "apipayments", payment, "WHERE checking_id = :checking_id"
    )
    if new_checking_id and new_checking_id != payment.checking_id:
        await update_payment_checking_id(payment.checking_id, new_checking_id, conn)
-        payment.checking_id = new_checking_id
-    return payment


 async def get_payments_history(
@@ -402,6 +398,7 @@ async def get_payment_count_stats(
    user_id: str | None = None,
    conn: Connection | None = None,
 ) -> list[PaymentCountStat]:
+
    if not filters:
        filters = Filters()
    extra_stmts = []
@@ -434,6 +431,7 @@ async def get_daily_stats(
    user_id: str | None = None,
    conn: Connection | None = None,
 ) -> tuple[list[PaymentDailyStats], list[PaymentDailyStats]]:
+
    if not filters:
        filters = Filters()

@@ -483,6 +481,7 @@ async def get_wallets_stats(
    user_id: str | None = None,
    conn: Connection | None = None,
 ) -> list[PaymentWalletStats]:
+
    if not filters:
        filters = Filters()

@@ -8,18 +8,11 @@ from lnbits.db import dict_to_model
 from lnbits.settings import (
    AdminSettings,
    EditableSettings,
-    FundingSourcesSettings,
    SettingsField,
    SuperSettings,
    settings,
 )

-RESET_PRESERVED_SETTINGS = (
-    "lnbits_webpush_pubkey",
-    "lnbits_webpush_privkey",
-    *FundingSourcesSettings.__fields__,
-)
-

 async def get_super_settings() -> SuperSettings | None:
    data = await get_settings_by_tag("core")
@@ -51,7 +44,7 @@ async def update_admin_settings(
    data: EditableSettings, tag: str | None = "core"
 ) -> None:
    editable_settings = await get_settings_by_tag("core") or {}
-    editable_settings.update(data.dict(exclude_unset=True))
+    editable_settings.update(data.model_dump(exclude_unset=True))
    for key, value in editable_settings.items():
        try:
            await set_settings_field(key, value, tag)
@@ -76,14 +69,16 @@ async def delete_admin_settings(tag: str | None = "core") -> None:


 async def reset_core_settings() -> None:
-    core_settings = await get_settings_by_tag("core") or {}
-    super_user = await get_settings_field("super_user")
-    await delete_admin_settings()
-    if super_user:
-        await set_settings_field("super_user", super_user.value)
-    for field in RESET_PRESERVED_SETTINGS:
-        if field in core_settings:
-            await set_settings_field(field, core_settings[field])
+    await db.execute(
+        """
+        DELETE FROM system_settings WHERE tag = 'core'
+        AND id NOT IN (
+            'super_user',
+            'lnbits_webpush_pubkey',
+            'lnbits_webpush_privkey'
+        )
+        """,
+    )


 async def create_admin_settings(super_user: str, new_settings: dict) -> SuperSettings:
@@ -110,8 +105,7 @@ async def get_settings_field(
    )
    if not row:
        return None
-    value = json.loads(row["value"]) if row["value"] else None
-    return SettingsField(id=row["id"], value=value, tag=row["tag"])
+    return SettingsField(id=row["id"], value=json.loads(row["value"]), tag=row["tag"])


 async def set_settings_field(id_: str, value: Any | None, tag: str | None = "core"):
@@ -37,13 +37,6 @@ async def create_account(
    return account


-async def get_accounts_count(conn: Connection | None = None) -> int:
-    row: dict | None = await (conn or db).fetchone(
-        "SELECT COUNT(*) as count FROM accounts"
-    )
-    return int(row["count"]) if row else 0
-
-
 async def update_account(account: Account, conn: Connection | None = None) -> Account:
    account.updated_at = datetime.now(timezone.utc)
    await (conn or db).update("accounts", account)
@@ -802,16 +802,3 @@ async def m044_add_activated_to_accounts(db: Connection):
    Used for account activation status.
    """
    await db.execute("ALTER TABLE accounts ADD COLUMN activated BOOLEAN DEFAULT true")
-
-
-async def m045_add_external_id_to_payments(db: Connection):
-    """
-    Adds external_id column to apipayments.
-    Used for external payment references.
-    """
-    await db.execute("ALTER TABLE apipayments ADD COLUMN external_id TEXT")
-    logger.debug("Creating index idx_payments_external_id...")
-    await db.execute("""
-        CREATE INDEX IF NOT EXISTS idx_payments_external_id
-        ON apipayments (external_id);
-        """)
@@ -25,7 +25,6 @@ from .payments import (
    PaymentState,
    PaymentWalletStats,
    SettleInvoice,
-    UpdatePaymentExtra,
 )
 from .tinyurl import TinyURL
 from .users import (
@@ -91,7 +90,6 @@ __all__ = [
    "SimpleStatus",
    "TinyURL",
    "UpdateBalance",
-    "UpdatePaymentExtra",
    "UpdateSuperuserPassword",
    "UpdateUser",
    "UpdateUserPassword",
@@ -1,6 +1,7 @@
 from __future__ import annotations

 from datetime import datetime, timedelta, timezone
+from typing import Any

 from pydantic import BaseModel, Field

@@ -21,8 +22,7 @@ class AuditEntry(BaseModel):
    delete_at: datetime | None = None
    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))

-    def __init__(self, **data):
-        super().__init__(**data)
+    def model_post_init(self, __context: Any) -> None:
        retention_days = max(0, settings.lnbits_audit_retention_days) or 365
        self.delete_at = self.created_at + timedelta(days=retention_days)

@@ -55,10 +55,9 @@ class GitHubRelease(BaseModel):


 class Manifest(BaseModel):
+    featured: list[str] = []
    extensions: list[ExplicitRelease] = []
    repos: list[GitHubRelease] = []
-    featured: list[str] = []
-    categories: dict[str, list[str]] = {}


 class GitHubRepoRelease(BaseModel):
@@ -97,7 +96,7 @@ class ExtensionConfig(BaseModel):
        )
        error_msg = "Cannot fetch GitHub extension config"
        config = await github_api_get(config_url, error_msg)
-        return ExtensionConfig.parse_obj(config)
+        return ExtensionConfig.model_validate(config)


 class ReleasePaymentInfo(BaseModel):
@@ -305,10 +304,11 @@ class ExtensionRelease(BaseModel):
        releases_url = f"https://api.github.com/repos/{org}/{repo}/releases"
        error_msg = "Cannot fetch extension releases"
        releases = await github_api_get(releases_url, error_msg)
-        return [GitHubRepoRelease.parse_obj(r) for r in releases]
+        return [GitHubRepoRelease.model_validate(r) for r in releases]

    @classmethod
    async def fetch_release_details(cls, details_link: str) -> dict | None:
+
        try:
            async with httpx.AsyncClient() as client:
                resp = await client.get(details_link)
@@ -333,7 +333,6 @@ class ExtensionMeta(BaseModel):
    dependencies: list[str] = []
    archive: str | None = None
    featured: bool = False
-    categories: list[str] = []
    paid_features: str | None = None
    has_paid_release: bool = False
    has_free_release: bool = False
@@ -681,11 +680,6 @@ class InstallableExtension(BaseModel):

                    meta = ext.meta or ExtensionMeta()
                    meta.featured = ext.id in manifest.featured
-                    meta.categories = [
-                        category
-                        for category, ext_ids in manifest.categories.items()
-                        if ext.id in ext_ids
-                    ]
                    ext.meta = meta
                    extension_list += [ext]

@@ -701,11 +695,6 @@ class InstallableExtension(BaseModel):
                    ext.check_release_updates(release)
                    meta = ext.meta or ExtensionMeta()
                    meta.featured = ext.id in manifest.featured
-                    meta.categories = [
-                        category
-                        for category, ext_ids in manifest.categories.items()
-                        if ext.id in ext_ids
-                    ]
                    ext.meta = meta
                    extension_list += [ext]
            except Exception as e:
@@ -768,7 +757,7 @@ class InstallableExtension(BaseModel):
        repo_url = f"https://api.github.com/repos/{org}/{repository}"
        error_msg = "Cannot fetch extension repo"
        repo = await github_api_get(repo_url, error_msg)
-        github_repo = GitHubRepo.parse_obj(repo)
+        github_repo = GitHubRepo.model_validate(repo)

        lates_release_url = (
            f"https://api.github.com/repos/{org}/{repository}/releases/latest"
@@ -782,15 +771,15 @@ class InstallableExtension(BaseModel):

        return (
            github_repo,
-            GitHubRepoRelease.parse_obj(latest_release),
-            ExtensionConfig.parse_obj(config),
+            GitHubRepoRelease.model_validate(latest_release),
+            ExtensionConfig.model_validate(config),
        )

    @classmethod
    async def fetch_manifest(cls, url) -> Manifest:
        error_msg = "Cannot fetch extensions manifest"
        manifest = await github_api_get(url, error_msg)
-        return Manifest.parse_obj(manifest)
+        return Manifest.model_validate(manifest)


 class CreateExtension(BaseModel):
@@ -6,7 +6,7 @@ import uuid
 from datetime import datetime, timedelta, timezone
 from typing import Any, Literal

-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator

 from lnbits.helpers import (
    camel_to_snake,
@@ -141,7 +141,8 @@ class DataField(BaseModel):
        else:
            return f"{self.name} {index}"

-    @validator("name")
+    @field_validator("name")
+    @classmethod
    def validate_name(cls, v: str) -> str:
        if v.strip() == "":
            raise ValueError("Field name is required.")
@@ -149,7 +150,8 @@ class DataField(BaseModel):
            raise ValueError(f"Field Name must be snake_case. Found: {v}")
        return v

-    @validator("type")
+    @field_validator("type")
+    @classmethod
    def validate_type(cls, v: str) -> str:
        if v.strip() == "":
            raise ValueError("Owner Data type is required")
@@ -171,7 +173,8 @@ class DataField(BaseModel):
            )
        return v

-    @validator("label")
+    @field_validator("label")
+    @classmethod
    def validate_label(cls, v: str | None) -> str | None:
        if v and '"' in v:
            raise ValueError(
@@ -179,7 +182,8 @@ class DataField(BaseModel):
            )
        return v

-    @validator("hint")
+    @field_validator("hint")
+    @classmethod
    def validate_hint(cls, v: str | None) -> str | None:
        if v and '"' in v:
            raise ValueError(f'Field hint cannot contain double quotes ("). Value: {v}')
@@ -191,8 +195,7 @@ class DataFields(BaseModel):
    editable: bool = True
    fields: list[DataField] = []

-    def __init__(self, **data):
-        super().__init__(**data)
+    def model_post_init(self, __context: Any) -> None:
        self.normalize()

    def normalize(self) -> None:
@@ -210,7 +213,8 @@ class DataFields(BaseModel):
                return field
        return None

-    @validator("name")
+    @field_validator("name")
+    @classmethod
    def validate_name(cls, v: str) -> str:
        if v.strip() == "":
            raise ValueError("Data fields name is required")
@@ -223,12 +227,13 @@ class SettingsFields(DataFields):
    enabled: bool = False
    type: str = "user"

-    @validator("type")
+    @field_validator("type")
+    @classmethod
    def validate_type(cls, v: str) -> str:
        if v.strip() == "":
            raise ValueError("Settings type is required")
        if v not in ["user", "admin"]:
-            raise ValueError("Field Type must be one of: user, admin." f" Found: {v}")
+            raise ValueError(f"Field Type must be one of: user, admin. Found: {v}")
        return v


@@ -265,8 +270,7 @@ class PreviewAction(BaseModel):
    is_client_data_preview: bool = False
    is_public_page_preview: bool = False

-    def __init__(self, **data):
-        super().__init__(**data)
+    def model_post_init(self, __context: Any) -> None:
        if not self.is_preview_mode:
            self.is_settings_preview = False
            self.is_owner_data_preview = False
@@ -286,8 +290,7 @@ class ExtensionData(BaseModel):
    public_page: PublicPageFields
    preview_action: PreviewAction = PreviewAction()

-    def __init__(self, **data):
-        super().__init__(**data)
+    def model_post_init(self, __context: Any) -> None:
        self.validate_data()
        self.normalize()

@@ -434,7 +437,8 @@ class ExtensionData(BaseModel):
                    f" Received: {paid_flag_field.type}."
                )

-    @validator("id")
+    @field_validator("id")
+    @classmethod
    def validate_id(cls, v: str) -> str:
        if v.strip() == "":
            raise ValueError("Extension ID is required")
@@ -442,13 +446,15 @@ class ExtensionData(BaseModel):
            raise ValueError(f"Extension Id must be snake_case. Found: {v}")
        return v

-    @validator("name")
+    @field_validator("name")
+    @classmethod
    def validate_name(cls, v: str) -> str:
        if v.strip() == "":
            raise ValueError("Extension name is required")
        return v

-    @validator("stub_version")
+    @field_validator("stub_version")
+    @classmethod
    def validate_stub_version(cls, v: str | None) -> str | None:
        if v and '"' in v:
            raise ValueError(
@@ -456,7 +462,8 @@ class ExtensionData(BaseModel):
            )
        return v

-    @validator("short_description")
+    @field_validator("short_description")
+    @classmethod
    def validate_short_description(cls, v: str | None) -> str | None:
        if v and '"' in v:
            raise ValueError(
@@ -464,7 +471,8 @@ class ExtensionData(BaseModel):
            )
        return v

-    @validator("description")
+    @field_validator("description")
+    @classmethod
    def validate_description(cls, v: str | None) -> str | None:
        if v and '"' in v:
            raise ValueError(
@@ -472,13 +480,15 @@ class ExtensionData(BaseModel):
            )
        return v

-    @validator("owner_data")
+    @field_validator("owner_data")
+    @classmethod
    def validate_owner_data(cls, v: DataFields) -> DataFields:
        if len(v.fields) == 0:
            raise ValueError("At least one owner data field is required")
        return v

-    @validator("client_data")
+    @field_validator("client_data")
+    @classmethod
    def validate_client_data(cls, v: DataFields) -> DataFields:
        if len(v.fields) == 0:
            raise ValueError("At least one client data field is required")
@@ -6,7 +6,7 @@ from pydantic import BaseModel, Field

 class CreateLnurlPayment(BaseModel):
    res: LnurlPayResponse | None = None
-    lnurl: Lnurl | LnAddress | None = None
+    lnurl: Lnurl | None = None
    amount: int
    comment: str | None = None
    unit: str | None = None
@@ -14,7 +14,7 @@ class CreateLnurlPayment(BaseModel):


 class CreateLnurlWithdraw(BaseModel):
-    lnurl_w: Lnurl
+    lnurl_w: Lnurl | LnAddress


 class LnurlScan(BaseModel):
@@ -2,18 +2,17 @@ from __future__ import annotations

 from datetime import datetime, timezone
 from enum import Enum
-from typing import Literal
+from typing import Any, Literal

 from fastapi import Query
 from lnurl import LnurlWithdrawResponse
 from loguru import logger
-from pydantic import BaseModel, Field, validator
+from pydantic import BaseModel, Field, field_validator

 from lnbits.db import FilterModel
 from lnbits.fiat.base import (
    FiatPaymentStatus,
 )
-from lnbits.helpers import is_valid_external_id
 from lnbits.utils.exchange_rates import allowed_currencies
 from lnbits.wallets.base import (
    PaymentStatus,
@@ -35,11 +34,6 @@ class PaymentExtra(BaseModel):
    lnurl_response: str | None = None


-class UpdatePaymentExtra(BaseModel):
-    payment_hash: str
-    extra: dict = Field(default_factory=dict)
-
-
 class PayInvoice(BaseModel):
    payment_request: str
    description: str | None = None
@@ -54,17 +48,11 @@ class CreatePayment(BaseModel):
    amount_msat: int
    memo: str
    extra: dict | None = {}
-    extension: str | None = None
    preimage: str | None = None
    expiry: datetime | None = None
    webhook: str | None = None
    fee: int = 0
    labels: list[str] | None = None
-    external_id: str | None = None
-
-    @validator("external_id")
-    def validate_external_id(cls, external_id):
-        return _validate_external_id(external_id)


 class Payment(BaseModel):
@@ -74,7 +62,10 @@ class Payment(BaseModel):
    amount: int
    fee: int
    bolt11: str
-    payment_request: str | None = Field(default=None, no_database=True)
+    payment_request: str | None = Field(
+        default=None,
+        json_schema_extra={"no_database": True},
+    )
    fiat_provider: str | None = None
    status: str = PaymentState.PENDING
    memo: str | None = None
@@ -89,14 +80,8 @@ class Payment(BaseModel):
    updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
    labels: list[str] = []
    extra: dict = {}
-    external_id: str | None = None

-    @validator("external_id")
-    def validate_external_id(cls, external_id):
-        return _validate_external_id(external_id)
-
-    def __init__(self, **data):
-        super().__init__(**data)
+    def model_post_init(self, __context: Any) -> None:
        if "fiat_payment_request" in self.extra:
            self.payment_request = self.extra["fiat_payment_request"]
        else:
@@ -141,18 +126,22 @@ class Payment(BaseModel):
        )

    # DEPRECATED: in v1.5.0, use service check_payment_status instead
-    async def check_status(self) -> PaymentStatus:
+    async def check_status(
+        self, skip_internal_payment_notifications: bool | None = False
+    ) -> PaymentStatus:
        logger.warning("payment.check_status() is deprecated.")
        from lnbits.core.services.payments import check_payment_status

-        return await check_payment_status(self)
+        return await check_payment_status(self, skip_internal_payment_notifications)

    # DEPRECATED: in v1.5.0, use service check_payment_status instead
-    async def check_fiat_status(self) -> FiatPaymentStatus:
+    async def check_fiat_status(
+        self, skip_internal_payment_notifications: bool | None = False
+    ) -> FiatPaymentStatus:
        logger.warning("payment.check_fiat_status() is deprecated.")
        from lnbits.core.services.fiat_providers import check_fiat_status

-        return await check_fiat_status(self)
+        return await check_fiat_status(self, skip_internal_payment_notifications)


 class PaymentFilters(FilterModel):
@@ -164,7 +153,6 @@ class PaymentFilters(FilterModel):
        "status",
        "time",
        "labels",
-        "external_id",
    ]

    __sort_fields__ = [
@@ -175,13 +163,11 @@ class PaymentFilters(FilterModel):
        "memo",
        "time",
        "tag",
-        "external_id",
    ]

    status: str | None
    tag: str | None
    checking_id: str | None
-    external_id: str | None
    amount: int
    fee: int
    memo: str | None
@@ -260,31 +246,26 @@ class CreateInvoice(BaseModel):
    )
    expiry: int | None = None
    extra: dict | None = None
-    extension: str | None = None
    webhook: str | None = None
    bolt11: str | None = None
    lnurl_withdraw: LnurlWithdrawResponse | None = None
    fiat_provider: str | None = None
    labels: list[str] = []
-    external_id: str | None = Query(default=None, max_length=256)

-    @validator("payment_hash")
+    @field_validator("payment_hash")
+    @classmethod
    def check_hex(cls, v):
        if v:
            _ = bytes.fromhex(v)
        return v

-    @validator("unit")
+    @field_validator("unit")
    @classmethod
    def unit_is_from_allowed_currencies(cls, v):
        if v != "sat" and v not in allowed_currencies():
            raise ValueError("The provided unit is not supported")
        return v

-    @validator("external_id")
-    def validate_external_id(cls, external_id):
-        return _validate_external_id(external_id)
-

 class PaymentsStatusCount(BaseModel):
    incoming: int = 0
@@ -301,7 +282,8 @@ class SettleInvoice(BaseModel):
        max_length=64,
    )

-    @validator("preimage")
+    @field_validator("preimage")
+    @classmethod
    def check_hex(cls, v):
        _ = bytes.fromhex(v)
        return v
@@ -315,7 +297,8 @@ class CancelInvoice(BaseModel):
        max_length=64,
    )

-    @validator("payment_hash")
+    @field_validator("payment_hash")
+    @classmethod
    def check_hex(cls, v):
        _ = bytes.fromhex(v)
        return v
@@ -323,12 +306,3 @@ class CancelInvoice(BaseModel):

 class UpdatePaymentLabels(BaseModel):
    labels: list[str] = []
-
-
-def _validate_external_id(external_id: str | None) -> str | None:
-    if external_id and not is_valid_external_id(external_id):
-        raise ValueError(
-            "Invalid external id. Max length is 256 characters. "
-            "Space and newlines are not allowed."
-        )
-    return external_id
@@ -1,6 +1,4 @@
-from datetime import datetime, timezone
-
-from pydantic import BaseModel, Field
+from pydantic import BaseModel


 class TinyURL(BaseModel):
@@ -8,4 +6,4 @@ class TinyURL(BaseModel):
    url: str
    endless: bool
    wallet: str
-    time: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+    time: float
@@ -1,6 +1,7 @@
 from __future__ import annotations

 from datetime import datetime, timezone
+from typing import Any
 from uuid import UUID

 from bcrypt import checkpw, gensalt, hashpw
@@ -38,11 +39,9 @@ class WalletInviteRequest(BaseModel):


 class UserLabel(BaseModel):
-    name: str = Field(regex=r"([A-Za-z0-9 ._-]{1,100}$)")
+    name: str = Field(pattern=r"([A-Za-z0-9 ._-]{1,100}$)")
    description: str | None = Field(default=None, max_length=250)
-    color: str | None = Field(
-        default=None, regex=r"^#[0-9A-Fa-f]{6}$"
-    )  # e.g., "#RRGGBB"
+    color: str | None = Field(default=None, pattern=r"^#[0-9A-Fa-f]{6}$")


 class UserExtra(BaseModel):
@@ -193,12 +192,20 @@ class Account(AccountId):
    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
    updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))

-    is_super_user: bool = Field(default=False, no_database=True)
-    is_admin: bool = Field(default=False, no_database=True)
-    fiat_providers: list[str] = Field(default=[], no_database=True)
+    is_super_user: bool = Field(
+        default=False,
+        json_schema_extra={"no_database": True},
+    )
+    is_admin: bool = Field(
+        default=False,
+        json_schema_extra={"no_database": True},
+    )
+    fiat_providers: list[str] = Field(
+        default=[],
+        json_schema_extra={"no_database": True},
+    )

-    def __init__(self, **data):
-        super().__init__(**data)
+    def model_post_init(self, __context: Any) -> None:
        self.is_super_user = settings.is_super_user(self.id)
        self.is_admin = settings.is_admin_user(self.id)
        self.fiat_providers = settings.get_fiat_providers_for_user(self.id)
@@ -3,6 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from enum import Enum
+from typing import Any

 from pydantic import BaseModel, Field

@@ -126,14 +127,16 @@ class Wallet(BaseWallet):
    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
    updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
    currency: str | None = None
-    balance_msat: int = Field(default=0, no_database=True)
+    balance_msat: int = Field(default=0, json_schema_extra={"no_database": True})
    extra: WalletExtra = WalletExtra()
-    stored_paylinks: StoredPayLinks = StoredPayLinks()
+    stored_paylinks: StoredPayLinks = Field(default_factory=StoredPayLinks)
    # What permission this wallet has when it's a shared wallet
-    share_permissions: list[WalletPermission] = Field(default=[], no_database=True)
+    share_permissions: list[WalletPermission] = Field(
+        default=[],
+        json_schema_extra={"no_database": True},
+    )

-    def __init__(self, **data):
-        super().__init__(**data)
+    def model_post_init(self, __context: Any) -> None:
        self._validate_data()

    def mirror_shared_wallet(
@@ -1,9 +1,7 @@
 import base64
 import io
-from urllib.parse import quote
 from uuid import uuid4

-import filetype
 from fastapi import UploadFile
 from loguru import logger
 from PIL import Image
@@ -12,48 +10,11 @@ from lnbits.core.crud.assets import create_asset, get_user_assets_count
 from lnbits.core.models.assets import Asset
 from lnbits.settings import settings

-IMAGE_MIME_TYPE_ALIASES = {
-    "heic": "image/heic",
-    "heics": "image/heics",
-    "heif": "image/heif",
-    "image/jpg": "image/jpeg",
-    "jpeg": "image/jpeg",
-    "jpg": "image/jpeg",
-    "png": "image/png",
-}
-PIL_IMAGE_FORMAT_MIME_TYPES = {
-    "JPEG": "image/jpeg",
-    "PNG": "image/png",
-}
-INLINE_ASSET_MIME_TYPES = {
-    "image/heic",
-    "image/heics",
-    "image/heif",
-    "image/jpeg",
-    "image/png",
-}
-ASSET_SECURITY_HEADERS = {
-    "X-Content-Type-Options": "nosniff",
-    "Content-Security-Policy": (
-        "sandbox; default-src 'none'; script-src 'none'; "
-        "object-src 'none'; base-uri 'none'"
-    ),
-}
-THUMBNAIL_FORMAT_MIME_TYPES = {
-    "jpg": "image/jpeg",
-    "jpeg": "image/jpeg",
-    "png": "image/png",
-}
-

 async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) -> Asset:
    if not file.content_type:
        raise ValueError("File must have a content type.")
-
-    content_type = normalize_asset_mime_type(file.content_type)
-    filename = file.filename or "unnamed"
-
-    if content_type not in allowed_asset_mime_types():
+    if file.content_type.lower() not in settings.lnbits_assets_allowed_mime_types:
        raise ValueError(f"File type '{file.content_type}' not allowed.")

    if not settings.is_unlimited_assets_user(user_id):
@@ -69,26 +30,14 @@ async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) ->
            f"File limit of {settings.lnbits_max_asset_size_mb}MB exceeded."
        )

-    stored_mime_type = detect_image_mime_type(contents)
-    if stored_mime_type != content_type:
-        logger.warning(
-            "Image MIME type mismatch: declared={}, detected={}",
-            content_type,
-            stored_mime_type,
-        )
-        raise ValueError(
-            "Image file content does not match declared file type. "
-            f"Declared: '{content_type}', detected: '{stored_mime_type}'."
-        )
-
    thumb_buffer = thumbnail_from_bytes(contents)

    asset = Asset(
        id=uuid4().hex,
        user_id=user_id,
-        mime_type=stored_mime_type,
+        mime_type=file.content_type,
        is_public=is_public,
-        name=filename,
+        name=file.filename or "unnamed",
        size_bytes=len(contents),
        thumbnail_base64=(
            base64.b64encode(thumb_buffer.getvalue()).decode("utf-8")
@@ -102,79 +51,6 @@ async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) ->
    return asset


-def normalize_asset_mime_type(content_type: str) -> str:
-    content_type = content_type.split(";", 1)[0].strip().lower()
-    return IMAGE_MIME_TYPE_ALIASES.get(content_type, content_type)
-
-
-def normalize_media_type(media_type: str) -> str:
-    return media_type.split(";", 1)[0].strip().lower() or "application/octet-stream"
-
-
-def thumbnail_media_type() -> str:
-    thumbnail_format = (settings.lnbits_asset_thumbnail_format or "png").strip().lower()
-    return THUMBNAIL_FORMAT_MIME_TYPES.get(thumbnail_format, "application/octet-stream")
-
-
-def content_disposition(disposition: str, filename: str) -> str:
-    safe_filename = filename or "unnamed"
-    quoted_filename = quote(safe_filename, safe="")
-    if quoted_filename == safe_filename:
-        return f'{disposition}; filename="{safe_filename}"'
-    return f"{disposition}; filename*=utf-8''{quoted_filename}"
-
-
-def allowed_asset_mime_types() -> set[str]:
-    return {
-        mime_type
-        for mime_type in (
-            normalize_asset_mime_type(mime_type)
-            for mime_type in settings.lnbits_assets_allowed_mime_types
-        )
-        if mime_type.startswith("image/")
-    }
-
-
-def detect_image_mime_type(contents: bytes) -> str:
-    kind = filetype.guess(contents)
-    mime_type = normalize_asset_mime_type(kind.mime) if kind else None
-
-    if mime_type and mime_type in PIL_IMAGE_FORMAT_MIME_TYPES.values():
-        verify_pil_image(contents, mime_type)
-        return mime_type
-
-    if mime_type and mime_type.startswith("image/"):
-        return mime_type
-
-    try:
-        with Image.open(io.BytesIO(contents)) as image:
-            image.verify()
-            mime_type = PIL_IMAGE_FORMAT_MIME_TYPES.get(image.format or "")
-    except Exception as exc:
-        raise ValueError(
-            "Image file content does not match declared file type."
-        ) from exc
-
-    if not mime_type:
-        raise ValueError("Image file content does not match declared file type.")
-
-    return mime_type
-
-
-def verify_pil_image(contents: bytes, mime_type: str) -> None:
-    try:
-        with Image.open(io.BytesIO(contents)) as image:
-            image.verify()
-            detected_mime_type = PIL_IMAGE_FORMAT_MIME_TYPES.get(image.format or "")
-    except Exception as exc:
-        raise ValueError(
-            "Image file content does not match declared file type."
-        ) from exc
-
-    if detected_mime_type != mime_type:
-        raise ValueError("Image file content does not match declared file type.")
-
-
 def thumbnail_from_bytes(contents: bytes) -> io.BytesIO | None:
    try:
        image = Image.open(io.BytesIO(contents))
@@ -9,7 +9,6 @@ from lnbits.core.crud import (
    delete_installed_extension,
    get_db_version,
    get_installed_extension,
-    get_installed_extensions_count,
    update_installed_extension_state,
 )
 from lnbits.core.crud.extensions import (
@@ -39,8 +38,6 @@ async def install_extension(
    if installed_ext and installed_ext.meta:
        ext_info.meta.payments = installed_ext.meta.payments

-    await check_extensions_limit(installed_ext)
-
    if not skip_download:
        await ext_info.download_archive()

@@ -66,15 +63,6 @@ async def install_extension(
    return extension


-async def check_extensions_limit(installed_ext: InstallableExtension | None = None):
-    if settings.lnbits_max_extensions == 0 or installed_ext:
-        return
-
-    extensions_count = await get_installed_extensions_count()
-    if extensions_count >= settings.lnbits_max_extensions:
-        raise ValueError("Max amount of extensions have been installed")
-
-
 async def uninstall_extension(ext_id: str):
    await stop_extension_background_work(ext_id)

@@ -97,7 +97,7 @@ def _transform_extension_builder_stub(data: ExtensionData, extension_dir: Path)

 def _export_extension_data_json(data: ExtensionData, build_dir: Path):
    json.dump(
-        data.dict(),
+        data.model_dump(),
        open(Path(build_dir, "builder.json"), "w", encoding="utf-8"),
        indent=4,
    )
@@ -133,7 +133,7 @@ async def _get_extension_stub_release(

    logger.debug(f"Save release cache {stub_ext_id} ({stub_version}).")
    with open(release_cache_file, "w", encoding="utf-8") as f:
-        f.write(json.dumps(release.dict(), indent=4))
+        f.write(json.dumps(release.model_dump(), indent=4))

    return release

@@ -290,7 +290,7 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
            {
                "extension_builder_stub_public_client_inputs": public_client_inputs,
                "preview": data.preview_action,
-                **data.public_page.action_fields.dict(),
+                **data.public_page.action_fields.model_dump(),
                "cancel_comment": remove_line_marker,
            },
        )
@@ -2,13 +2,12 @@ import hashlib
 import hmac
 import json
 import time
-from base64 import b64encode

 import httpx
 from loguru import logger

 from lnbits.core.crud import get_wallet
-from lnbits.core.crud.payments import create_payment, update_payment
+from lnbits.core.crud.payments import create_payment
 from lnbits.core.models import CreatePayment, Payment, PaymentState
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.db import Connection
@@ -36,7 +35,9 @@ async def handle_fiat_payment_confirmation(
        logger.warning(e)


-async def check_fiat_status(payment: Payment) -> FiatPaymentStatus:
+async def check_fiat_status(
+    payment: Payment, skip_internal_payment_notifications: bool | None = False
+) -> FiatPaymentStatus:
    if not payment.is_internal:
        return FiatPaymentPendingStatus()
    if payment.success:
@@ -56,11 +57,10 @@ async def check_fiat_status(payment: Payment) -> FiatPaymentStatus:
        return FiatPaymentPendingStatus()
    fiat_status = await fiat_provider.get_invoice_status(checking_id)

-    if fiat_status.success:
-        payment.status = PaymentState.SUCCESS.value
-        await update_payment(payment)
-        await handle_fiat_payment_confirmation(payment)
+    if skip_internal_payment_notifications:
+        return fiat_status

+    if fiat_status.success:
        # notify receivers asynchronously
        from lnbits.tasks import internal_invoice_queue

@@ -169,82 +169,6 @@ async def verify_paypal_webhook(headers, payload: bytes):
        raise ValueError("PayPal webhook cannot be verified.") from exc


-def check_square_signature(
-    payload: bytes,
-    sig_header: str | None,
-    secret: str | None,
-    notification_url: str | None,
-):
-    if not sig_header:
-        logger.warning("Square signature header is missing.")
-        raise ValueError("Square signature header is missing.")
-
-    if not secret:
-        logger.warning("Square webhook signature key is not set.")
-        raise ValueError("Square webhook cannot be verified.")
-
-    if not notification_url:
-        logger.warning("Square webhook notification URL is not set.")
-        raise ValueError("Square webhook cannot be verified.")
-
-    signed_payload = notification_url.encode() + payload
-    computed_signature = b64encode(
-        hmac.new(
-            key=secret.encode(), msg=signed_payload, digestmod=hashlib.sha256
-        ).digest()
-    ).decode()
-
-    if hmac.compare_digest(computed_signature, sig_header) is not True:
-        logger.warning("Square signature verification failed.")
-        raise ValueError("Square signature verification failed.")
-
-
-def check_revolut_signature(
-    payload: bytes,
-    sig_header: str | None,
-    timestamp_header: str | None,
-    secret: str | None,
-    tolerance_seconds=300,
-):
-    if not sig_header:
-        logger.warning("Revolut signature header is missing.")
-        raise ValueError("Revolut signature header is missing.")
-
-    if not timestamp_header:
-        logger.warning("Revolut timestamp header is missing.")
-        raise ValueError("Revolut timestamp header is missing.")
-
-    if not secret:
-        logger.warning("Revolut webhook signing secret is not set.")
-        raise ValueError("Revolut webhook cannot be verified.")
-
-    try:
-        timestamp = int(timestamp_header)
-    except ValueError as exc:
-        logger.warning("Invalid Revolut timestamp.")
-        raise ValueError("Invalid Revolut timestamp.") from exc
-
-    timestamp_seconds = timestamp / 1000 if timestamp > 9999999999 else timestamp
-
-    if abs(time.time() - timestamp_seconds) > tolerance_seconds:
-        logger.warning("Timestamp outside tolerance.")
-        raise ValueError("Timestamp outside tolerance." f"Timestamp: {timestamp}")
-
-    signed_payload = b"v1." + timestamp_header.encode() + b"." + payload
-    digest = hmac.new(
-        key=secret.encode(), msg=signed_payload, digestmod=hashlib.sha256
-    ).hexdigest()
-    expected_signature = f"v1={digest}"
-
-    provided_signatures = [sig.strip() for sig in sig_header.split(",") if sig.strip()]
-    if not any(
-        hmac.compare_digest(expected_signature, provided)
-        for provided in provided_signatures
-    ):
-        logger.warning("Revolut signature verification failed.")
-        raise ValueError("Revolut signature verification failed.")
-
-
 async def test_connection(provider: str) -> SimpleStatus:
    """
    Test the connection to Stripe by checking if the API key is valid.
@@ -74,7 +74,7 @@ async def send_admin_notification(
    message: str,
    message_type: str | None = None,
 ) -> None:
-    return await send_notification_in_background(
+    return await send_notification(
        settings.lnbits_telegram_notifications_chat_id,
        settings.lnbits_nostr_notifications_identifiers,
        settings.lnbits_email_notifications_to_emails,
@@ -97,7 +97,7 @@ async def send_user_notification(
        if user_notifications.nostr_identifier
        else []
    )
-    return await send_notification_in_background(
+    return await send_notification(
        user_notifications.telegram_chat_id,
        nostr_identifiers,
        email_address,
@@ -222,20 +222,12 @@ async def send_email(
    msg["Subject"] = subject
    msg.attach(MIMEText(message, "plain"))
    username = username if len(username) > 0 else from_email
-
-    def _send() -> bool:
-        with smtplib.SMTP(server, port) as smtp_server:
-            smtp_server.starttls()
-            smtp_server.login(username, password)
-            smtp_server.sendmail(from_email, to_emails, msg.as_string())
+    with smtplib.SMTP(server, port) as smtp_server:
+        smtp_server.starttls()
+        smtp_server.login(username, password)
+        smtp_server.sendmail(from_email, to_emails, msg.as_string())
        return True

-    try:
-        return await asyncio.to_thread(_send)
-    except Exception as e:
-        logger.warning(f"Sending Email failed. {e!s}")
-        return False
-

 async def dispatch_webhook(payment: Payment):
    """
@@ -302,27 +294,6 @@ def send_payment_notification_in_background(wallet: Wallet, payment: Payment):
        logger.warning(f"Error sending payment notification: {e}")


-async def send_notification_in_background(
-    telegram_chat_id: str | None,
-    nostr_identifiers: list[str] | None,
-    email_addresses: list[str] | None,
-    message: str,
-    message_type: str | None = None,
-):
-    try:
-        create_task(
-            send_notification(
-                telegram_chat_id,
-                nostr_identifiers,
-                email_addresses,
-                message,
-                message_type,
-            )
-        )
-    except Exception as e:
-        logger.warning(f"Error sending notification in background: {e}")
-
-
 async def send_ws_payment_notification(wallet: Wallet, payment: Payment):
    # TODO: websocket message should be a clean payment model
    # await websocket_manager.send(wallet.inkey, payment.json())
@@ -19,6 +19,7 @@ from lnbits.exceptions import InvoiceError, PaymentError, UnsupportedError
 from lnbits.fiat import get_fiat_provider
 from lnbits.helpers import check_callback_url
 from lnbits.settings import settings
+from lnbits.tasks import create_task, internal_invoice_queue_put
 from lnbits.utils.crypto import fake_privkey, random_secret_and_hash, verify_preimage
 from lnbits.utils.exchange_rates import fiat_amount_as_satoshis, satoshis_amount_as_fiat
 from lnbits.wallets import fake_wallet, get_funding_source
@@ -63,7 +64,6 @@ async def pay_invoice(
    description: str = "",
    tag: str = "",
    labels: list[str] | None = None,
-    external_id: str | None = None,
    conn: Connection | None = None,
 ) -> Payment:
    if settings.lnbits_only_allow_incoming_payments:
@@ -97,7 +97,6 @@ async def pay_invoice(
            memo=description or invoice.description or "",
            extra=extra,
            labels=labels,
-            external_id=external_id,
        )

    async with db.reuse_conn(conn) if conn else db.connect() as new_conn:
@@ -170,15 +169,15 @@ async def create_fiat_invoice(

    internal_payment.fiat_provider = fiat_provider_name
    internal_payment.extra["fiat_checking_id"] = fiat_invoice.checking_id
-    # TODO: move to payment
+    # todo: move to payent
    internal_payment.extra["fiat_payment_request"] = fiat_invoice.payment_request
    new_checking_id = (
        f"fiat_{fiat_provider_name}_"
        f"{fiat_invoice.checking_id or internal_payment.checking_id}"
    )
-    internal_payment = await update_payment(
-        internal_payment, new_checking_id, conn=conn
-    )
+    await update_payment(internal_payment, new_checking_id, conn=conn)
+    internal_payment.checking_id = new_checking_id
+
    return internal_payment


@@ -214,12 +213,10 @@ async def create_wallet_invoice(wallet_id: str, data: CreateInvoice) -> Payment:
            unhashed_description=unhashed_description,
            expiry=data.expiry,
            extra=data.extra,
-            extension=data.extension,
            webhook=data.webhook,
            internal=data.internal,
            payment_hash=data.payment_hash,
            labels=data.labels,
-            external_id=data.external_id,
            conn=conn,
        )

@@ -260,9 +257,7 @@ async def create_invoice(
    webhook: str | None = None,
    internal: bool | None = False,
    payment_hash: str | None = None,
-    extension: str | None = None,
    labels: list[str] | None = None,
-    external_id: str | None = None,
    conn: Connection | None = None,
 ) -> Payment:
    if not amount > 0:
@@ -344,11 +339,9 @@ async def create_invoice(
        expiry=invoice.expiry_date,
        memo=memo,
        extra=extra,
-        extension=extension,
        webhook=webhook,
        fee=invoice_response.fee_msat or 0,
        labels=labels,
-        external_id=external_id,
    )

    payment = await create_payment(
@@ -376,7 +369,7 @@ async def update_pending_payment(
    status = await check_payment_status(payment)
    if status.failed:
        payment.status = PaymentState.FAILED
-        payment = await update_payment(payment, conn=conn)
+        await update_payment(payment, conn=conn)
    elif status.success:
        payment = await update_payment_success_status(payment, status, conn=conn)
    return payment
@@ -516,8 +509,6 @@ async def update_wallet_balance(
        )
        payment.status = PaymentState.SUCCESS
        await update_payment(payment, conn=conn)
-        from lnbits.tasks import internal_invoice_queue_put
-
        await internal_invoice_queue_put(payment.checking_id)


@@ -632,14 +623,18 @@ async def check_transaction_status(
    return await check_payment_status(payment)


-async def check_payment_status(payment: Payment) -> PaymentStatus:
+async def check_payment_status(
+    payment: Payment, skip_internal_payment_notifications: bool | None = False
+) -> PaymentStatus:
    if payment.is_internal:
        if payment.success:
            return PaymentSuccessStatus()
        if payment.failed:
            return PaymentFailedStatus()
        if payment.is_in and payment.fiat_provider:
-            fiat_status = await check_fiat_status(payment)
+            fiat_status = await check_fiat_status(
+                payment, skip_internal_payment_notifications
+            )
            return PaymentStatus(paid=fiat_status.paid)
        return PaymentPendingStatus()
    funding_source = get_funding_source()
@@ -781,14 +776,9 @@ async def _pay_internal_invoice(
    await update_payment(internal_payment, conn=conn)
    logger.success(f"internal payment successful {internal_payment.checking_id}")

-    await _send_payment_notification_in_background(
-        wallet.id, payment, conn=conn
-    )  # notify the sender
-    await _send_payment_notification_in_background(
-        internal_payment.wallet_id, internal_payment, conn=conn
-    )  # notify the receiver
+    await _send_payment_notification_in_background(wallet.id, payment, conn=conn)

-    # notify receiver asynchronously (extension listeners)
+    # notify receiver asynchronously
    from lnbits.tasks import internal_invoice_queue

    logger.debug(f"enqueuing internal invoice {internal_payment.checking_id}")
@@ -829,8 +819,6 @@ async def _pay_external_invoice(

    fee_reserve_msat = fee_reserve(amount_msat, internal=False)

-    from lnbits.tasks import create_task
-
    task = create_task(
        _fundingsource_pay_invoice(checking_id, payment.bolt11, fee_reserve_msat)
    )
@@ -879,7 +867,7 @@ async def update_payment_success_status(
        payment.status = PaymentState.SUCCESS
        payment.fee = -(abs(status.fee_msat or 0) + abs(service_fee_msat))
        payment.preimage = payment.preimage or status.preimage
-        payment = await update_payment(payment, conn=conn)
+        await update_payment(payment, conn=conn)
    return payment


@@ -1080,31 +1068,3 @@ async def _send_payment_notification_in_background(
    if not wallet:
        raise PaymentError(f"Could not fetch wallet '{wallet_id}'.", status="failed")
    send_payment_notification_in_background(wallet, payment)
-
-
-async def update_invoice_from_paid_invoices_stream(checking_id: str) -> Payment | None:
-    """
-    Takes a checking_id of an incoming payment from paid_invoices_stream()
-    Checks its status, updates its status and returns it.
-    returns None if no incoming payment was found or the status is not successful
-    """
-    payment = await get_standalone_payment(checking_id, incoming=True)
-    if not payment:
-        logger.warning(f"No incoming payment found for '{checking_id}'.")
-        return None
-
-    status = await check_payment_status(payment)
-
-    if not status.success:
-        logger.error(
-            "Unexpected status response from paid_invoices_stream. Skipping update."
-        )
-        return None
-
-    payment.fee = status.fee_msat or payment.fee
-    # only overwrite preimage if status.preimage provides it
-    payment.preimage = status.preimage or payment.preimage
-    payment.status = PaymentState.SUCCESS
-    payment = await update_payment(payment)
-
-    return payment
@@ -45,10 +45,11 @@ def dict_to_settings(sets_dict: dict) -> UpdateSettings:

 def update_cached_settings(sets_dict: dict):
    editable_settings = dict_to_settings(sets_dict)
+    settings_keys = settings.model_dump().keys()
    for key in sets_dict.keys():
        if key in readonly_variables:
            continue
-        if key not in settings.dict().keys():
+        if key not in settings_keys:
            continue
        try:
            value = getattr(editable_settings, key)
@@ -23,7 +23,6 @@ from ..crud import (
    get_account_by_email,
    get_account_by_pubkey,
    get_account_by_username,
-    get_accounts_count,
    get_super_settings,
    get_user_extensions,
    get_user_from_account,
@@ -56,8 +55,6 @@ async def create_user_account_no_ckeck(
    conn: Connection | None = None,
 ) -> User:
    async with db.reuse_conn(conn) if conn else db.connect() as conn:
-        await check_users_limit(conn)
-
        if account:
            account.validate_fields()
            if account.username and await get_account_by_username(
@@ -98,15 +95,6 @@ async def create_user_account_no_ckeck(
    return user


-async def check_users_limit(conn: Connection | None = None):
-    if settings.lnbits_max_users == 0:
-        return
-
-    users_count = await get_accounts_count(conn=conn)
-    if users_count >= settings.lnbits_max_users:
-        raise ValueError("Max amount of users have been created")
-
-
 async def update_user_account(account: Account) -> Account:
    account.validate_fields()

@@ -175,7 +163,7 @@ async def check_admin_settings():
            # .env super_user overwrites DB super_user
            settings_db = await update_super_user(settings.super_user)

-        update_cached_settings(settings_db.dict())
+        update_cached_settings(settings_db.model_dump())

        # saving superuser to {data_dir}/.super_user file
        with open(Path(settings.lnbits_data_folder) / ".super_user", "w") as file:
@@ -185,12 +173,6 @@ async def check_admin_settings():
        if account and account.extra and account.extra.provider == "env":
            settings.first_install = True

-        if settings.has_first_install_token_changed():
-            logger.warning("First install token is changed. Resetting admin settings.")
-            new_settings = await init_admin_settings()
-            settings.super_user = new_settings.super_user
-            settings.first_install = True
-
        logger.success(
            "✔️ Admin UI is enabled. run `uv run lnbits-cli superuser` "
            "to get the superuser."
@@ -210,8 +192,8 @@ async def init_admin_settings(super_user: str | None = None) -> SuperSettings:
        await create_account(account)
        await create_wallet(user_id=account.id)

-    editable_settings = EditableSettings.from_dict(settings.dict())
-    return await create_admin_settings(account.id, editable_settings.dict())
+    editable_settings = EditableSettings.from_dict(settings.model_dump())
+    return await create_admin_settings(account.id, editable_settings.model_dump())


 async def check_register_activation_settings(data: RegisterUser):
@@ -25,8 +25,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_price_from_aggregator, btc_rates
+from lnbits.utils.exchange_rates import btc_rates

 audit_queue: asyncio.Queue[AuditEntry] = asyncio.Queue()

@@ -151,34 +150,12 @@ async def collect_exchange_rates_data() -> None:

        if sleep_time > 0:
            try:
-                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
-                    )
+                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))
+                settings.append_exchange_rate_datapoint(dict(rates), max_history_size)
            except Exception as ex:
                logger.warning(ex)
        else:
@@ -87,7 +87,7 @@ async def api_update_settings(
    admin_settings = await get_admin_settings(account.is_super_user)
    if not admin_settings:
        raise ValueError("Updated admin settings not found.")
-    update_cached_settings(admin_settings.dict())
+    update_cached_settings(admin_settings.model_dump())
    core_app_extra.register_new_ratelimiter()
    return {"status": "Success"}

@@ -99,7 +99,7 @@ async def api_update_settings(
 async def api_update_settings_partial(
    data: dict, account: Account = Depends(check_admin)
 ):
-    updatable_settings = dict_to_settings({**settings.dict(), **data})
+    updatable_settings = dict_to_settings({**settings.model_dump(), **data})
    return await api_update_settings(updatable_settings, account)


@@ -16,14 +16,7 @@ from lnbits.core.crud.assets import (
 from lnbits.core.models.assets import AssetFilters, AssetInfo, AssetUpdate
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.core.models.users import AccountId
-from lnbits.core.services.assets import (
-    ASSET_SECURITY_HEADERS,
-    INLINE_ASSET_MIME_TYPES,
-    content_disposition,
-    create_user_asset,
-    normalize_media_type,
-    thumbnail_media_type,
-)
+from lnbits.core.services.assets import create_user_asset
 from lnbits.db import Filters, Page
 from lnbits.decorators import (
    check_account_id_exists,
@@ -82,7 +75,11 @@ async def api_get_asset_data(
    if not asset:
        raise HTTPException(HTTPStatus.NOT_FOUND, "Asset not found.")

-    return asset_response(asset.data, asset.mime_type, asset.name)
+    return Response(
+        content=asset.data,
+        media_type=asset.mime_type,
+        headers={"Content-Disposition": f'inline; filename="{asset.name}"'},
+    )


@asset_router.get(
@@ -104,14 +101,14 @@ async def api_get_asset_thumbnail(
    if not asset_info:
        raise HTTPException(HTTPStatus.NOT_FOUND, "Asset not found.")

-    return asset_response(
+    return Response(
        content=(
            base64.b64decode(asset_info.thumbnail_base64)
            if asset_info.thumbnail_base64
            else b""
        ),
-        media_type=thumbnail_media_type(),
-        filename=asset_info.name,
+        media_type=asset_info.mime_type,
+        headers={"Content-Disposition": f'inline; filename="{asset_info.name}"'},
    )


@@ -175,16 +172,3 @@ async def api_delete_asset(

    await delete_user_asset(account_id.id, asset_id)
    return SimpleStatus(success=True, message="Asset deleted successfully.")
-
-
-def asset_response(content: bytes, media_type: str, filename: str) -> Response:
-    media_type = normalize_media_type(media_type)
-    disposition = "inline" if media_type in INLINE_ASSET_MIME_TYPES else "attachment"
-    return Response(
-        content=content,
-        media_type=media_type,
-        headers={
-            **ASSET_SECURITY_HEADERS,
-            "Content-Disposition": content_disposition(disposition, filename),
-        },
-    )
@@ -12,7 +12,6 @@ from fastapi.responses import JSONResponse, RedirectResponse
 from fastapi_sso.sso.base import OpenID, SSOBase
 from loguru import logger

-from lnbits.core.crud.settings import set_settings_field
 from lnbits.core.crud.users import (
    get_user_access_control_lists,
    update_user_access_control_list,
@@ -36,7 +35,6 @@ from lnbits.decorators import (
    check_account_exists,
    check_admin,
    check_user_exists,
-    optional_user_id,
 )
 from lnbits.helpers import (
    create_access_token,
@@ -321,10 +319,7 @@ async def api_delete_user_api_token(

@auth_router.get("/{provider}", description="SSO Provider")
 async def login_with_sso_provider(
-    request: Request,
-    provider: str,
-    user_id: str | None,
-    auth_user_id: str | None = Depends(optional_user_id),
+    request: Request, provider: str, user_id: str | None = None
 ):
    provider_sso = _new_sso(provider)
    if not provider_sso:
@@ -332,8 +327,6 @@ async def login_with_sso_provider(
            HTTPStatus.FORBIDDEN,
            f"Login by '{provider}' not allowed.",
        )
-    if user_id and user_id != auth_user_id:
-        raise HTTPException(HTTPStatus.FORBIDDEN, "User ID mismatch.")

    provider_sso.redirect_uri = str(request.base_url) + f"api/v1/auth/{provider}/token"
    with provider_sso:
@@ -354,11 +347,7 @@ async def handle_oauth_token(request: Request, provider: str) -> RedirectRespons
        userinfo = await provider_sso.verify_and_process(request)
        if not userinfo:
            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid user info.")
-        if provider_sso.state is None or provider_sso.state == "null":
-            user_id = None
-        else:
-            user_id = decrypt_internal_message(provider_sso.state)
-
+        user_id = decrypt_internal_message(provider_sso.state)
    request.session.pop("user", None)
    return await _handle_sso_login(userinfo, user_id)

@@ -559,13 +548,6 @@ async def first_install(data: UpdateSuperuserPassword) -> JSONResponse:
    account.hash_password(data.password)
    await update_account(account)
    settings.first_install = False
-
-    # only confrm it after the super user has been successfully updated
-    if settings.first_install_token:
-        settings.first_install_token_confirmed = data.first_install_token
-        await set_settings_field(
-            "first_install_token_confirmed", data.first_install_token
-        )
    return _auth_success_response(account.username, account.id, account.email)


@@ -605,7 +587,7 @@ def _auth_success_response(
    payload = AccessTokenPayload(
        sub=username or "", usr=user_id, email=email, auth_time=int(time())
    )
-    access_token = create_access_token(data=payload.dict())
+    access_token = create_access_token(data=payload.model_dump())
    max_age = settings.auth_token_expire_minutes * 60
    response = JSONResponse({"access_token": access_token, "token_type": "bearer"})
    response.set_cookie(
@@ -635,7 +617,7 @@ def _auth_api_token_response(
        sub=username, api_token_id=api_token_id, auth_time=int(time())
    )
    return create_access_token(
-        data=payload.dict(), token_expire_minutes=token_expire_minutes
+        data=payload.model_dump(), token_expire_minutes=token_expire_minutes
    )


@@ -643,7 +625,7 @@ def _auth_redirect_response(path: str, user_id: str, email: str) -> RedirectResp
    payload = AccessTokenPayload(
        usr=user_id, sub="", email=email, auth_time=int(time())
    )
-    access_token = create_access_token(data=payload.dict())
+    access_token = create_access_token(data=payload.model_dump())
    max_age = settings.auth_token_expire_minutes * 60
    response = RedirectResponse(path)
    response.set_cookie(
@@ -4,30 +4,17 @@ from fastapi import APIRouter, Request
 from loguru import logger

 from lnbits.core.crud.payments import (
-    get_payments,
    get_standalone_payment,
-    update_payment,
 )
-from lnbits.core.models import Payment, PaymentFilters
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.core.models.payments import CreateInvoice
 from lnbits.core.services.fiat_providers import (
    check_fiat_status,
-    check_revolut_signature,
-    check_square_signature,
    check_stripe_signature,
    verify_paypal_webhook,
 )
-from lnbits.core.services.payments import (
-    create_fiat_invoice,
-    create_wallet_invoice,
-    service_fee_fiat,
-)
-from lnbits.db import Filter, Filters
-from lnbits.fiat import get_fiat_provider
+from lnbits.core.services.payments import create_fiat_invoice
 from lnbits.fiat.base import FiatSubscriptionPaymentOptions
-from lnbits.fiat.revolut import RevolutWallet
-from lnbits.fiat.square import SquareWallet
 from lnbits.settings import settings

 callback_router = APIRouter(prefix="/api/v1/callback", tags=["callback"])
@@ -63,41 +50,6 @@ async def api_generic_webhook_handler(
            message=f"Callback received successfully from '{provider_name}'.",
        )

-    if provider_name.lower() == "square":
-        payload = await request.body()
-        sig_header = request.headers.get("x-square-hmacsha256-signature")
-        check_square_signature(
-            payload,
-            sig_header,
-            settings.square_webhook_signature_key,
-            settings.square_payment_webhook_url,
-        )
-        event = await request.json()
-        await handle_square_event(event)
-
-        return SimpleStatus(
-            success=True,
-            message=f"Callback received successfully from '{provider_name}'.",
-        )
-
-    if provider_name.lower() == "revolut":
-        payload = await request.body()
-        sig_header = request.headers.get("Revolut-Signature")
-        timestamp_header = request.headers.get("Revolut-Request-Timestamp")
-        check_revolut_signature(
-            payload,
-            sig_header,
-            timestamp_header,
-            settings.revolut_webhook_signing_secret,
-        )
-        event = await request.json()
-        await handle_revolut_event(event)
-
-        return SimpleStatus(
-            success=True,
-            message=f"Callback received successfully from '{provider_name}'.",
-        )
-
    return SimpleStatus(
        success=False,
        message=f"Unknown fiat provider '{provider_name}'.",
@@ -328,382 +280,3 @@ def _deserialize_paypal_metadata(custom_id: str) -> FiatSubscriptionPaymentOptio
    except (json.JSONDecodeError, IndexError) as e:
        logger.warning(f"Failed to deserialize PayPal metadata: {e}")
        return FiatSubscriptionPaymentOptions()
-
-
-async def handle_square_event(event: dict):
-    event_id = event.get("event_id") or event.get("id", "")
-    event_type = event.get("type", "")
-    logger.info(f"Handling Square event: '{event_id}'. Type: '{event_type}'.")
-
-    if event_type == "payment.updated":
-        await _handle_square_payment_event(event)
-        return
-
-    if event_type == "invoice.payment_made":
-        await _handle_square_invoice_payment_made(event)
-        return
-
-    logger.warning(f"Unhandled Square event type: '{event_type}'.")
-
-
-async def handle_revolut_event(event: dict):
-    event_type = event.get("event", "")
-    order_id = event.get("order_id")
-    logger.info(f"Handling Revolut event: '{event_type}'. Order ID: '{order_id}'.")
-
-    if event_type in ["ORDER_AUTHORISED", "ORDER_COMPLETED"]:
-        if not order_id:
-            logger.warning("Revolut event missing order_id.")
-            return
-
-        payment = await get_standalone_payment(f"fiat_revolut_order_{order_id}")
-        if payment:
-            await check_fiat_status(payment)
-            return
-
-        if event_type == "ORDER_COMPLETED":
-            logger.warning(f"No payment found for Revolut order: '{order_id}'.")
-            await _handle_revolut_subscription_order_paid(order_id)
-            return
-
-        logger.info(f"Ignoring Revolut authorised order without payment: '{order_id}'.")
-        return
-
-    if event_type == "SUBSCRIPTION_INITIATED":
-        logger.info("Revolut subscription initiated event received.")
-        return
-
-    if event_type in [
-        "SUBSCRIPTION_CANCELLED",
-        "SUBSCRIPTION_FINISHED",
-        "SUBSCRIPTION_OVERDUE",
-    ]:
-        logger.info(f"Revolut subscription lifecycle event received: '{event_type}'.")
-        return
-
-    logger.warning(f"Unhandled Revolut event type: '{event_type}'.")
-
-
-async def _get_revolut_provider() -> RevolutWallet | None:
-    fiat_provider = await get_fiat_provider("revolut")
-    if not isinstance(fiat_provider, RevolutWallet):
-        logger.warning("Revolut fiat provider is not configured.")
-        return None
-    return fiat_provider
-
-
-async def _handle_revolut_subscription(
-    subscription: dict,
-    fiat_provider: RevolutWallet,
-    order_id: str | None = None,
-    order: dict | None = None,
-):
-    subscription_id = subscription.get("id")
-    if not subscription_id:
-        logger.warning("Revolut subscription missing id.")
-        return
-
-    reference = fiat_provider.deserialize_subscription_reference(
-        subscription.get("external_reference")
-    )
-    if not reference:
-        logger.warning("Revolut subscription event missing LNbits metadata.")
-        return
-
-    if not order_id:
-        cycle_id = subscription.get("current_cycle_id")
-        if not cycle_id:
-            logger.warning("Revolut subscription missing current_cycle_id.")
-            return
-
-        cycle = await fiat_provider.get_subscription_cycle(subscription_id, cycle_id)
-        order_id = cycle.get("order_id")
-        if not order_id:
-            logger.warning("Revolut subscription cycle missing order_id.")
-            return
-
-    existing_payment = await get_standalone_payment(f"fiat_revolut_order_{order_id}")
-    if existing_payment:
-        if existing_payment.external_id != subscription_id:
-            existing_payment.external_id = subscription_id
-            await update_payment(existing_payment)
-        await check_fiat_status(existing_payment)
-        return
-
-    if not order:
-        order = await fiat_provider.get_order(order_id)
-    amount_minor = order.get("amount")
-    currency = (order.get("currency") or "").upper()
-    if amount_minor is None or not currency:
-        raise ValueError("Revolut subscription order missing amount or currency.")
-
-    extra = {
-        **(reference.extra or {}),
-        "subscription_request_id": subscription_id,
-        "fiat_method": "subscription",
-        "tag": reference.tag,
-        "subscription": {
-            "checking_id": f"order_{order_id}",
-            "payment_request": order.get("checkout_url") or "",
-        },
-    }
-    lnbits_payment = await _create_revolut_subscription_payment(
-        wallet_id=reference.wallet_id,
-        amount_minor=amount_minor,
-        currency=currency,
-        memo=reference.memo or "",
-        extra=extra,
-        order_id=order_id,
-        payment_request=order.get("checkout_url") or "",
-        subscription_id=subscription_id,
-    )
-
-    await check_fiat_status(lnbits_payment)
-
-
-async def _handle_revolut_subscription_order_paid(order_id: str):
-    fiat_provider = await _get_revolut_provider()
-    if not fiat_provider:
-        return
-
-    order = await fiat_provider.get_order(order_id)
-    order_type = (order.get("type") or "").lower()
-    order_state = (order.get("state") or "").upper()
-    if order_type != "payment" or order_state != "COMPLETED":
-        logger.warning(f"Revolut order is not a completed payment: '{order_id}'.")
-        return
-
-    channel_data = order.get("channel_data") or {}
-    subscription_id = channel_data.get("subscription_id")
-    if not subscription_id:
-        logger.warning(f"Revolut order missing subscription_id: '{order_id}'.")
-        return
-
-    subscription = await fiat_provider.get_subscription(subscription_id)
-    if subscription.get("state") != "active":
-        logger.warning(f"Revolut subscription is not active: '{subscription_id}'.")
-        return
-
-    await _handle_revolut_subscription(
-        subscription, fiat_provider, order_id=order_id, order=order
-    )
-
-
-async def _create_revolut_subscription_payment(
-    wallet_id: str,
-    amount_minor: int,
-    currency: str,
-    memo: str,
-    extra: dict,
-    order_id: str,
-    payment_request: str,
-    subscription_id: str,
-) -> Payment:
-    amount = RevolutWallet.minor_units_to_amount(amount_minor, currency)
-    payment = await create_wallet_invoice(
-        wallet_id,
-        CreateInvoice(
-            unit=currency,
-            amount=amount,
-            memo=memo,
-            extra=extra,
-            internal=True,
-            external_id=subscription_id,
-        ),
-    )
-    payment.fee = -abs(service_fee_fiat(payment.msat, "revolut"))
-    payment.fiat_provider = "revolut"
-    payment.extra["fiat_checking_id"] = f"order_{order_id}"
-    payment.extra["fiat_payment_request"] = payment_request
-    checking_id = f"fiat_revolut_order_{order_id}"
-    await update_payment(payment, checking_id)
-    payment.checking_id = checking_id
-    return payment
-
-
-async def _handle_square_payment_event(event: dict):
-    payment = _square_extract_payment(event)
-    payment_options = _deserialize_square_metadata(_square_payment_note(payment))
-    if payment_options.wallet_id:
-        if not _square_payment_is_completed(payment):
-            logger.debug("Square subscription payment is not completed yet.")
-            return
-        await _handle_square_subscription_payment(payment, payment_options)
-        return
-
-    order_id = payment.get("order_id")
-    if not order_id:
-        logger.warning("Square payment event missing order_id.")
-        return
-
-    lnbits_payment = await get_standalone_payment(f"fiat_square_order_{order_id}")
-    if not lnbits_payment:
-        logger.warning(f"No payment found for Square order: '{order_id}'.")
-        return
-
-    await check_fiat_status(lnbits_payment)
-
-
-async def _handle_square_invoice_payment_made(event: dict):
-    invoice = event.get("data", {}).get("object", {}).get("invoice") or {}
-    order_id = invoice.get("order_id")
-    if not order_id:
-        logger.warning("Square invoice.payment_made event missing order_id.")
-        return
-    subscription_id = invoice.get("subscription_id")
-
-    fiat_provider = await get_fiat_provider("square")
-    if not isinstance(fiat_provider, SquareWallet):
-        logger.warning("Square fiat provider is not configured.")
-        return
-
-    payment = await fiat_provider.get_payment_for_order(order_id)
-    if not payment:
-        logger.warning(f"No Square payment found for invoice order: '{order_id}'.")
-        return
-
-    payment_options = _deserialize_square_metadata(_square_payment_note(payment))
-    if not payment_options.wallet_id:
-        payment_id = payment.get("id")
-        stored_payment = (
-            await get_standalone_payment(f"fiat_square_payment_{payment_id}")
-            if payment_id
-            else None
-        )
-        if not stored_payment and subscription_id:
-            stored_payments = await get_payments(
-                filters=Filters(
-                    filters=[
-                        Filter.parse_query(
-                            "external_id", [subscription_id], PaymentFilters
-                        )
-                    ],
-                    model=PaymentFilters,
-                    sortby="created_at",
-                    direction="desc",
-                    limit=1,
-                )
-            )
-            stored_payment = stored_payments[0] if stored_payments else None
-        if stored_payment:
-            payment_options = _square_payment_options_from_payment(stored_payment)
-        else:
-            logger.warning("Square subscription payment missing LNbits metadata.")
-            return
-
-    await _handle_square_subscription_payment(
-        payment,
-        payment_options,
-        invoice.get("public_url") or "",
-        square_subscription_id=subscription_id,
-    )
-
-
-async def _handle_square_subscription_payment(
-    payment: dict,
-    payment_options: FiatSubscriptionPaymentOptions,
-    payment_request: str = "",
-    square_subscription_id: str | None = None,
-):
-    amount_money = payment.get("amount_money") or {}
-    amount = amount_money.get("amount")
-    currency = (amount_money.get("currency") or "").upper()
-    payment_id = payment.get("id")
-    if amount is None or not currency or not payment_id:
-        raise ValueError("Square subscription payment event missing payment amount.")
-    wallet_id = payment_options.wallet_id
-    if not wallet_id:
-        raise ValueError("Square subscription payment event missing wallet_id.")
-
-    checking_id = f"payment_{payment_id}"
-    existing_payment = await get_standalone_payment(f"fiat_square_{checking_id}")
-    if existing_payment:
-        if (
-            square_subscription_id
-            and existing_payment.external_id != square_subscription_id
-        ):
-            existing_payment.external_id = square_subscription_id
-            await update_payment(existing_payment)
-        await check_fiat_status(existing_payment)
-        return
-
-    square_subscription_id = square_subscription_id or (
-        payment_options.extra or {}
-    ).get("square_subscription_id")
-    extra = {
-        **(payment_options.extra or {}),
-        "subscription_request_id": payment_options.subscription_request_id,
-        "fiat_method": "subscription",
-        "tag": payment_options.tag,
-        "subscription": {
-            "checking_id": checking_id,
-            "payment_request": payment_request,
-        },
-    }
-
-    lnbits_payment = await create_fiat_invoice(
-        wallet_id=wallet_id,
-        invoice_data=CreateInvoice(
-            unit=currency,
-            amount=amount / 100,
-            memo=payment_options.memo or "",
-            extra=extra,
-            fiat_provider="square",
-            external_id=square_subscription_id,
-        ),
-    )
-
-    await check_fiat_status(lnbits_payment)
-
-
-def _square_payment_options_from_payment(
-    payment: Payment,
-) -> FiatSubscriptionPaymentOptions:
-    extra = payment.extra or {}
-    return FiatSubscriptionPaymentOptions(
-        wallet_id=payment.wallet_id,
-        tag=extra.get("tag") or payment.tag,
-        subscription_request_id=extra.get("subscription_request_id"),
-        extra=extra,
-        memo=payment.memo,
-    )
-
-
-def _square_extract_payment(event: dict) -> dict:
-    event_object = event.get("data", {}).get("object", {})
-    return event_object.get("payment") or event_object
-
-
-def _square_payment_is_completed(payment: dict) -> bool:
-    return (payment.get("status") or "").upper() == "COMPLETED"
-
-
-def _square_payment_note(payment: dict) -> str:
-    return payment.get("note") or payment.get("payment_note") or ""
-
-
-def _deserialize_square_metadata(custom_id: str) -> FiatSubscriptionPaymentOptions:
-    try:
-        meta = json.loads(custom_id)
-        if not isinstance(meta, list):
-            return FiatSubscriptionPaymentOptions()
-        wallet_id = meta[0] if len(meta) > 0 else None
-        tag = meta[1] if len(meta) > 1 else None
-        subscription_request_id = meta[2] if len(meta) > 2 else None
-        extra_link = meta[3] if len(meta) > 3 else None
-        memo = meta[4] if len(meta) > 4 else None
-
-        extra = {
-            "link": extra_link,
-            "subscription_request_id": subscription_request_id,
-        }
-
-        return FiatSubscriptionPaymentOptions(
-            wallet_id=wallet_id,
-            tag=tag,
-            subscription_request_id=subscription_request_id,
-            extra=extra,
-            memo=memo,
-        )
-    except (json.JSONDecodeError, IndexError, TypeError):
-        return FiatSubscriptionPaymentOptions()
@@ -98,16 +98,12 @@ async def api_install_extension(data: CreateExtension):
        ext_info.clean_extension_files()
        detail = (
            str(exc)
-            if isinstance(exc, (AssertionError, ValueError))
+            if isinstance(exc, AssertionError)
            else f"Failed to install extension '{ext_info.id}'."
            f"({ext_info.installed_version})."
        )
        raise HTTPException(
-            status_code=(
-                HTTPStatus.BAD_REQUEST
-                if isinstance(exc, (AssertionError, ValueError))
-                else HTTPStatus.INTERNAL_SERVER_ERROR
-            ),
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
            detail=detail,
        ) from exc

@@ -292,6 +288,7 @@ async def api_deactivate_extension(ext_id: str) -> SimpleStatus:

@extension_router.delete("/{ext_id}", dependencies=[Depends(check_admin)])
 async def api_uninstall_extension(ext_id: str) -> SimpleStatus:
+
    extension = await get_installed_extension(ext_id)
    if not extension:
        raise HTTPException(
@@ -566,7 +563,6 @@ async def extensions(account_id: AccountId = Depends(check_account_id_exists)):
            "shortDescription": ext.short_description,
            "stars": ext.stars,
            "isFeatured": ext.meta.featured if ext.meta else False,
-            "categories": ext.meta.categories if ext.meta else [],
            "dependencies": ext.meta.dependencies if ext.meta else "",
            "isInstalled": ext.id in installed_exts_ids,
            "hasDatabaseTables": next(
@@ -641,7 +637,8 @@ async def create_extension_review(
 ) -> ExtensionReviewPaymentRequest:
    async with httpx.AsyncClient() as client:
        resp = await client.post(
-            settings.lnbits_extensions_reviews_url + "/reviews", json=data.dict()
+            settings.lnbits_extensions_reviews_url + "/reviews",
+            json=data.model_dump(),
        )
        resp.raise_for_status()
        payment_request = resp.json()
@@ -2,35 +2,17 @@ from http import HTTPStatus

 from fastapi import APIRouter, Depends, HTTPException
 from loguru import logger
-from pydantic import BaseModel

-from lnbits.core.crud.settings import set_settings_field
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.core.models.wallets import WalletTypeInfo
-from lnbits.core.services import update_cached_settings
 from lnbits.core.services.fiat_providers import test_connection
 from lnbits.decorators import check_admin, require_admin_key
-from lnbits.fiat import RevolutWallet, StripeWallet, get_fiat_provider
+from lnbits.fiat import StripeWallet, get_fiat_provider
 from lnbits.fiat.base import CreateFiatSubscription, FiatSubscriptionResponse

 fiat_router = APIRouter(tags=["Fiat API"], prefix="/api/v1/fiat")


-class RevolutCreateWebhook(BaseModel):
-    url: str
-    endpoint: str | None = None
-    api_secret_key: str | None = None
-    api_version: str | None = None
-
-
-class RevolutCreateWebhookResponse(BaseModel):
-    id: str | None = None
-    url: str
-    events: list[str] = []
-    signing_secret: str
-    already_exists: bool = False
-
-
@fiat_router.put(
    "/check/{provider}",
    status_code=HTTPStatus.OK,
@@ -40,54 +22,6 @@ async def api_test_fiat_provider(provider: str) -> SimpleStatus:
    return await test_connection(provider)


-@fiat_router.post(
-    "/revolut/webhook",
-    status_code=HTTPStatus.OK,
-    dependencies=[Depends(check_admin)],
-)
-async def api_create_revolut_webhook(
-    data: RevolutCreateWebhook,
-) -> RevolutCreateWebhookResponse:
-    try:
-        webhook = await RevolutWallet.create_webhook(
-            url=data.url,
-            endpoint=data.endpoint,
-            api_secret_key=data.api_secret_key,
-            api_version=data.api_version,
-        )
-    except ValueError as exc:
-        logger.warning(exc)
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
-    except Exception as exc:
-        logger.warning(exc)
-        raise HTTPException(
-            status_code=500, detail="Failed to create Revolut webhook."
-        ) from exc
-
-    signing_secret = webhook.get("signing_secret")
-    webhook_url = webhook.get("url") or data.url
-    if not signing_secret:
-        raise HTTPException(
-            status_code=502, detail="Revolut returned no webhook signing secret."
-        )
-
-    updated_settings = {
-        "revolut_payment_webhook_url": webhook_url,
-        "revolut_webhook_signing_secret": signing_secret,
-    }
-    for key, value in updated_settings.items():
-        await set_settings_field(key, value)
-    update_cached_settings(updated_settings)
-
-    return RevolutCreateWebhookResponse(
-        id=webhook.get("id"),
-        url=webhook_url,
-        events=webhook.get("events") or [],
-        signing_secret=signing_secret,
-        already_exists=webhook.get("already_exists", False),
-    )
-
-
@fiat_router.post(
    "/{provider}/subscription",
    status_code=HTTPStatus.OK,
@@ -34,7 +34,6 @@ from lnbits.core.models import (
    PaymentWalletStats,
    SettleInvoice,
    SimpleStatus,
-    UpdatePaymentExtra,
 )
 from lnbits.core.models.payments import UpdatePaymentLabels
 from lnbits.core.models.users import AccountId
@@ -264,7 +263,6 @@ async def api_payments_create(
            payment_request=invoice_data.bolt11,
            extra=invoice_data.extra,
            labels=invoice_data.labels,
-            external_id=invoice_data.external_id,
        )
        return payment

@@ -298,38 +296,6 @@ async def api_update_payment_labels(
    return SimpleStatus(success=True, message="Payment labels updated.")


-@payment_router.patch(
-    "/extra",
-    name="Update payment extra",
-    description="Append new extra metadata to a payment.",
-    response_model=Payment,
-)
-async def api_update_payment_extra(
-    data: UpdatePaymentExtra,
-    key_type: WalletTypeInfo = Depends(require_admin_key),
-) -> Payment:
-    payment = await get_standalone_payment(
-        data.payment_hash, wallet_id=key_type.wallet.id
-    )
-    if payment is None:
-        raise HTTPException(HTTPStatus.NOT_FOUND, "Payment does not exist.")
-    if not payment.success:
-        raise HTTPException(
-            HTTPStatus.BAD_REQUEST, "Payment extra can only be updated after success."
-        )
-
-    duplicate_keys = sorted(set(payment.extra).intersection(data.extra))
-    if duplicate_keys:
-        raise HTTPException(
-            HTTPStatus.BAD_REQUEST,
-            f"Extra keys already exist: {', '.join(duplicate_keys)}.",
-        )
-
-    payment.extra.update(data.extra)
-    await update_payment(payment)
-    return payment
-
-
@payment_router.get("/fee-reserve")
 async def api_payments_fee_reserve(invoice: str = Query("invoice")) -> JSONResponse:
    invoice_obj = bolt11.decode(invoice)
@@ -8,10 +8,20 @@ import time
 from contextlib import asynccontextmanager
 from datetime import datetime, timezone
 from enum import Enum
-from typing import Any, Generic, Literal, TypeVar, get_origin
+from types import UnionType
+from typing import (
+    Any,
+    ClassVar,
+    Generic,
+    Literal,
+    TypeVar,
+    Union,
+    get_args,
+    get_origin,
+)

 from loguru import logger
-from pydantic import BaseModel, ValidationError, root_validator
+from pydantic import BaseModel, ConfigDict, Field, TypeAdapter, model_validator
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine, create_async_engine
 from sqlalchemy.sql import text

@@ -20,6 +30,7 @@ from lnbits.settings import settings
 POSTGRES = "POSTGRES"
 COCKROACH = "COCKROACH"
 SQLITE = "SQLITE"
+PYDANTIC_MODEL_TYPES = (BaseModel,)

 DateTrunc = Literal["hour", "day", "month"]
 sqlite_formats = {
@@ -28,6 +39,72 @@ sqlite_formats = {
    "month": "%Y-%m-01 00:00:00",
 }

+
+def _is_pydantic_model_class(model: Any) -> bool:
+    return isinstance(model, type) and any(
+        issubclass(model, model_type) for model_type in PYDANTIC_MODEL_TYPES
+    )
+
+
+def _issubclass(candidate: Any, parent: Any) -> bool:
+    return isinstance(candidate, type) and issubclass(candidate, parent)
+
+
+def _strip_optional(annotation: Any) -> Any:
+    origin = get_origin(annotation)
+    if origin not in {Union, UnionType}:
+        return annotation
+
+    args = [arg for arg in get_args(annotation) if arg is not type(None)]
+    if len(args) == 1:
+        return _strip_optional(args[0])
+    return annotation
+
+
+def _model_fields(model: type[Any]) -> dict[str, Any]:
+    fields = getattr(model, "model_fields", None)
+    if fields is not None:
+        return fields
+    return getattr(model, "__fields__", {})
+
+
+def _field_annotation(field: Any) -> Any:
+    annotation = getattr(field, "annotation", None)
+    if annotation is None:
+        annotation = getattr(field, "outer_type_", Any)
+    return _strip_optional(annotation)
+
+
+def _field_inner_type(field: Any) -> Any:
+    type_ = getattr(field, "type_", None)
+    if type_ is not None:
+        return _strip_optional(type_)
+
+    annotation = _field_annotation(field)
+    origin = get_origin(annotation)
+    if origin in {list, set, tuple, dict}:
+        args = get_args(annotation)
+        return _strip_optional(args[0]) if args else Any
+
+    return annotation
+
+
+def _field_extra(field: Any) -> dict[str, Any]:
+    field_info = getattr(field, "field_info", None)
+    if field_info is not None:
+        return getattr(field_info, "extra", {})
+
+    return getattr(field, "json_schema_extra", None) or {}
+
+
+def _model_dump(model: BaseModel) -> dict[str, Any]:
+    return model.model_dump()
+
+
+def _validate_model(model: type[Any], values: dict[str, Any]) -> Any:
+    return model.model_validate(values)
+
+
 if settings.lnbits_database_url:
    database_uri = settings.lnbits_database_url
    if database_uri.startswith("cockroachdb://"):
@@ -447,8 +524,8 @@ class Operator(Enum):


 class FilterModel(BaseModel):
-    __search_fields__: list[str] = []
-    __sort_fields__: list[str] | None = None
+    __search_fields__: ClassVar[list[str]] = []
+    __sort_fields__: ClassVar[list[str] | None] = None


 T = TypeVar("T")
@@ -462,10 +539,12 @@ class Page(BaseModel, Generic[T]):


 class Filter(BaseModel, Generic[TFilterModel]):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
    table_name: str | None = None
    field: str
    op: Operator = Operator.EQ
-    model: type[TFilterModel] | None
+    model: type[TFilterModel] | None = Field(default=None, exclude=True)
    values: dict | None = None

    @classmethod
@@ -487,16 +566,17 @@ class Filter(BaseModel, Generic[TFilterModel]):
            field = key
            op = Operator("eq")

-        if field in model.__fields__:
-            compare_field = model.__fields__[field]
+        model_fields = _model_fields(model)
+        if field in model_fields:
+            compare_field = model_fields[field]
            values: dict = {}
            if op in {Operator.EVERY, Operator.ANY, Operator.INCLUDE, Operator.EXCLUDE}:
                raw_values = [v for rv in raw_values for v in rv.split(",")]

            for index, raw_value in enumerate(raw_values):
-                validated, errors = compare_field.validate(raw_value, {}, loc="none")
-                if errors:
-                    raise ValidationError(errors=[errors], model=model)
+                validated = TypeAdapter(
+                    _field_annotation(compare_field)
+                ).validate_python(raw_value)
                values[f"{field}__{index}"] = validated
        else:
            raise ValueError("Unknown filter field")
@@ -508,7 +588,10 @@ class Filter(BaseModel, Generic[TFilterModel]):
        prefix = f"{self.table_name}." if self.table_name else ""
        stmt = []
        for key in self.values.keys() if self.values else []:
-            if self.model and self.model.__fields__[self.field].type_ == datetime:
+            if (
+                self.model
+                and _field_inner_type(_model_fields(self.model)[self.field]) == datetime
+            ):
                placeholder = compat_timestamp_placeholder(key)
                stmt.append(f"{prefix}{self.field} {self.op.as_sql} {placeholder}")
            if self.op in {Operator.INCLUDE, Operator.EXCLUDE}:
@@ -534,7 +617,9 @@ class Filters(BaseModel, Generic[TFilterModel]):
    the values can be validated. Otherwise, make sure to validate the inputs manually.
    """

-    filters: list[Filter[TFilterModel]] = []
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    filters: list[Filter[TFilterModel]] = Field(default_factory=list)
    search: str | None = None

    offset: int | None = None
@@ -542,27 +627,27 @@ class Filters(BaseModel, Generic[TFilterModel]):
    sortby: str | None = None
    direction: Literal["asc", "desc"] | None = None

-    model: type[TFilterModel] | None = None
+    model: type[TFilterModel] | None = Field(default=None, exclude=True)

-    table_name: str | None = None
+    table_name: str | None = Field(default=None, exclude=True)

-    @root_validator(pre=True)
-    def validate_sortby(cls, values):
+    @model_validator(mode="before")
+    @classmethod
+    def validate_sortby(cls, values: Any):
+        if not isinstance(values, dict):
+            return values
        sortby = values.get("sortby")
        model = values.get("model")
        if sortby and model:
-            model = values["model"]
            # if no sort fields are specified explicitly all fields are allowed
-            allowed = model.__sort_fields__ or model.__fields__
+            allowed = model.__sort_fields__ or _model_fields(model).keys()
            if sortby not in allowed:
                raise ValueError("Invalid sort field")
        return values

    def pagination(self) -> str:
        stmt = ""
-        if self.limit == 0:
-            self.limit = 1000
-        self.limit = 10 if self.limit is None else self.limit
+        self.limit = self.limit or 10
        stmt += f"LIMIT {min(1000, self.limit)} "
        if self.offset:
            stmt += f"OFFSET {self.offset}"
@@ -669,10 +754,12 @@ def model_to_dict(model: BaseModel) -> dict:
    :param model: Pydantic model
    """
    _dict: dict = {}
-    for key, value in model.dict().items():
-        type_ = model.__fields__[key].type_
-        outertype_ = model.__fields__[key].outer_type_
-        if model.__fields__[key].field_info.extra.get("no_database", False):
+    model_fields = _model_fields(type(model))
+    for key, value in _model_dump(model).items():
+        field = model_fields[key]
+        type_ = _field_inner_type(field)
+        outertype_ = _field_annotation(field)
+        if _field_extra(field).get("no_database", False):
            continue
        if isinstance(value, datetime):
            if DB_TYPE == SQLITE:
@@ -683,7 +770,7 @@ def model_to_dict(model: BaseModel) -> dict:
                _dict[key] = value.replace(tzinfo=None)
            continue
        if (
-            type(type_) is type(BaseModel)
+            _is_pydantic_model_class(type_)
            or type_ is dict
            or get_origin(outertype_) is list
        ):
@@ -707,51 +794,50 @@ def dict_to_submodel(model: type[TModel], value: dict | str) -> TModel | None:
    return dict_to_model(_subdict, model)


-def dict_to_model(_row: dict, model: type[TModel]) -> TModel:  # noqa: C901
+def dict_to_model(_row: dict, model: type[TModel]) -> TModel:
    """
    Convert a dictionary with JSON-encoded nested models to a Pydantic model
    :param _dict: Dictionary from database
    :param model: Pydantic model
    """
    _dict: dict = {}
+    model_fields = _model_fields(model)
    for key, value in _row.items():
        if value is None:
            continue
-        if key not in model.__fields__:
+        if key not in model_fields:
            # Somethimes an SQL JOIN will create additional column
            continue
-        type_ = model.__fields__[key].type_
-        outertype_ = model.__fields__[key].outer_type_
+        field = model_fields[key]
+        type_ = _field_inner_type(field)
+        outertype_ = _field_annotation(field)
        if get_origin(outertype_) is list:
            _items = _safe_load_json(value) if isinstance(value, str) else value
            _dict[key] = [
-                dict_to_submodel(type_, v) if issubclass(type_, BaseModel) else v
+                dict_to_submodel(type_, v) if _is_pydantic_model_class(type_) else v
                for v in _items
            ]
            continue
-        if issubclass(type_, bool):
+        if _issubclass(type_, bool):
            _dict[key] = bool(value)
            continue
-        if issubclass(type_, datetime):
+        if _issubclass(type_, datetime):
            if DB_TYPE == SQLITE:
                _dict[key] = datetime.fromtimestamp(value, timezone.utc)
            else:
                _dict[key] = value.replace(tzinfo=timezone.utc)
            continue
-        if issubclass(type_, BaseModel):
+        if _is_pydantic_model_class(type_):
            _dict[key] = dict_to_submodel(type_, value)
            continue
        # TODO: remove this when all sub models are migrated to Pydantic
        # NOTE: this is for type dict on BaseModel, (used in Payment class)
-        if type_ is dict and value:
+        if (type_ is dict or get_origin(outertype_) is dict) and value:
            _dict[key] = _safe_load_json(value)
            continue
        _dict[key] = value
        continue
-    _model = model.construct(**_dict)
-    if isinstance(_model, BaseModel):
-        _model.__init__(**_dict)  # type: ignore
-    return _model
+    return _validate_model(model, _dict)


 def _safe_load_json(value: str) -> dict:
@@ -9,8 +9,6 @@ from lnbits.fiat.base import FiatProvider
 from lnbits.settings import settings

 from .paypal import PayPalWallet
-from .revolut import RevolutWallet
-from .square import SquareWallet
 from .stripe import StripeWallet

 fiat_module = importlib.import_module("lnbits.fiat")
@@ -19,8 +17,6 @@ fiat_module = importlib.import_module("lnbits.fiat")
 class FiatProviderType(Enum):
    stripe = "StripeWallet"
    paypal = "PayPalWallet"
-    square = "SquareWallet"
-    revolut = "RevolutWallet"


 async def get_fiat_provider(name: str) -> FiatProvider | None:
@@ -56,7 +52,5 @@ fiat_providers: dict[str, FiatProvider] = {}

 __all__ = [
    "PayPalWallet",
-    "RevolutWallet",
-    "SquareWallet",
    "StripeWallet",
 ]
@@ -95,10 +95,6 @@ class FiatSubscriptionPaymentOptions(BaseModel):
        description="Unique ID that can be used to identify the subscription request."
        "If not provided, one will be generated.",
    )
-    customer_email: str | None = Field(
-        default=None,
-        description="The customer email to use for the subscription.",
-    )
    tag: str | None = Field(
        default=None,
        description="Payments created by the recurring subscription"
@@ -131,15 +127,15 @@ class FiatSubscriptionResponse(BaseModel):


 class FiatPaymentSuccessStatus(FiatPaymentStatus):
-    paid = True  # type: ignore[reportIncompatibleVariableOverride]
+    paid = True


 class FiatPaymentFailedStatus(FiatPaymentStatus):
-    paid = False  # type: ignore[reportIncompatibleVariableOverride]
+    paid = False


 class FiatPaymentPendingStatus(FiatPaymentStatus):
-    paid = None  # type: ignore[reportIncompatibleVariableOverride]
+    paid = None


 class FiatProvider(ABC):
@@ -6,7 +6,7 @@ from typing import Any, Literal

 import httpx
 from loguru import logger
-from pydantic import BaseModel, Field, ValidationError
+from pydantic import BaseModel, ConfigDict, Field, ValidationError

 from lnbits.helpers import normalize_endpoint, urlsafe_short_hash
 from lnbits.settings import settings
@@ -28,8 +28,7 @@ FiatMethod = Literal["checkout", "subscription"]


 class PayPalCheckoutOptions(BaseModel):
-    class Config:
-        extra = "ignore"
+    model_config = ConfigDict(extra="ignore")

    success_url: str | None = None
    cancel_url: str | None = None
@@ -37,16 +36,14 @@ class PayPalCheckoutOptions(BaseModel):


 class PayPalSubscriptionOptions(BaseModel):
-    class Config:
-        extra = "ignore"
+    model_config = ConfigDict(extra="ignore")

    checking_id: str | None = None
    payment_request: str | None = None


 class PayPalCreateInvoiceOptions(BaseModel):
-    class Config:
-        extra = "ignore"
+    model_config = ConfigDict(extra="ignore")

    fiat_method: FiatMethod = "checkout"
    checkout: PayPalCheckoutOptions | None = None
@@ -339,7 +336,7 @@ class PayPalWallet(FiatProvider):
        self, raw_opts: dict[str, Any]
    ) -> PayPalCreateInvoiceOptions | None:
        try:
-            return PayPalCreateInvoiceOptions.parse_obj(raw_opts)
+            return PayPalCreateInvoiceOptions.model_validate(raw_opts)
        except ValidationError as e:
            logger.warning(f"Invalid PayPal options: {e}")
            return None
@@ -1,646 +0,0 @@
-import asyncio
-import ipaddress
-import json
-from collections.abc import AsyncGenerator
-from decimal import ROUND_HALF_UP, Decimal
-from typing import Any
-from urllib.parse import urlparse
-
-import httpx
-from loguru import logger
-from pydantic import BaseModel, Field, ValidationError
-
-from lnbits.helpers import normalize_endpoint, urlsafe_short_hash
-from lnbits.settings import settings
-
-from .base import (
-    FiatInvoiceResponse,
-    FiatPaymentFailedStatus,
-    FiatPaymentPendingStatus,
-    FiatPaymentResponse,
-    FiatPaymentStatus,
-    FiatPaymentSuccessStatus,
-    FiatProvider,
-    FiatStatusResponse,
-    FiatSubscriptionPaymentOptions,
-    FiatSubscriptionResponse,
-)
-
-
-class RevolutCheckoutOptions(BaseModel):
-    class Config:
-        extra = "ignore"
-
-    success_url: str | None = None
-    metadata: dict[str, Any] = Field(default_factory=dict)
-    description: str | None = None
-
-
-class RevolutCreateInvoiceOptions(BaseModel):
-    class Config:
-        extra = "ignore"
-
-    checkout: RevolutCheckoutOptions | None = None
-
-
-class RevolutSubscriptionReference(BaseModel):
-    wallet_id: str
-    tag: str | None = None
-    subscription_request_id: str | None = None
-    extra: dict[str, Any] | None = None
-    memo: str | None = None
-
-
-REVOLUT_WEBHOOK_EVENTS = [
-    "ORDER_AUTHORISED",
-    "ORDER_COMPLETED",
-    "SUBSCRIPTION_INITIATED",
-]
-
-ZERO_DECIMAL_CURRENCIES = {
-    "BIF",
-    "CLP",
-    "DJF",
-    "GNF",
-    "ISK",
-    "JPY",
-    "KMF",
-    "KRW",
-    "PYG",
-    "RWF",
-    "UGX",
-    "VND",
-    "VUV",
-    "XAF",
-    "XOF",
-    "XPF",
-}
-THREE_DECIMAL_CURRENCIES = {
-    "BHD",
-    "IQD",
-    "JOD",
-    "KWD",
-    "LYD",
-    "OMR",
-    "TND",
-}
-REVOLUT_CUSTOMER_LIST_LIMIT = 500
-REVOLUT_CUSTOMER_LIST_MAX_PAGES = 20
-REVOLUT_REQUEST_TIMEOUT = 30
-
-
-class RevolutWallet(FiatProvider):
-    """https://developer.revolut.com/docs/merchant"""
-
-    def __init__(self):
-        logger.debug("Initializing RevolutWallet")
-        self._settings_fields = self._settings_connection_fields()
-        if not settings.revolut_api_endpoint:
-            raise ValueError("Cannot initialize RevolutWallet: missing endpoint.")
-        if not settings.revolut_api_secret_key:
-            raise ValueError("Cannot initialize RevolutWallet: missing API secret key.")
-
-        self.endpoint = normalize_endpoint(settings.revolut_api_endpoint)
-        self.headers = {
-            "Authorization": f"Bearer {settings.revolut_api_secret_key}",
-            "Revolut-Api-Version": settings.revolut_api_version,
-            "Content-Type": "application/json",
-            "User-Agent": settings.user_agent,
-        }
-        self.client = httpx.AsyncClient(base_url=self.endpoint, headers=self.headers)
-        logger.info("RevolutWallet initialized.")
-
-    async def cleanup(self):
-        try:
-            await self.client.aclose()
-        except RuntimeError as e:
-            logger.warning(f"Error closing Revolut wallet connection: {e}")
-
-    async def status(
-        self, only_check_settings: bool | None = False
-    ) -> FiatStatusResponse:
-        if only_check_settings:
-            if self._settings_fields != self._settings_connection_fields():
-                return FiatStatusResponse("Connection settings have changed.", 0)
-            return FiatStatusResponse(balance=0)
-
-        try:
-            r = await self.client.get(
-                "/api/orders",
-                params={"limit": 1},
-                timeout=REVOLUT_REQUEST_TIMEOUT,
-            )
-            r.raise_for_status()
-            _ = r.json()
-            return FiatStatusResponse(balance=0)
-        except json.JSONDecodeError:
-            return FiatStatusResponse("Server error: 'invalid json response'", 0)
-        except Exception as exc:
-            logger.warning(exc)
-            return FiatStatusResponse(f"Unable to connect to {self.endpoint}.", 0)
-
-    async def create_invoice(
-        self,
-        amount: float,
-        payment_hash: str,
-        currency: str,
-        memo: str | None = None,
-        extra: dict[str, Any] | None = None,
-        **kwargs,
-    ) -> FiatInvoiceResponse:
-        opts = self._parse_create_opts(extra or {})
-        if opts is None:
-            return FiatInvoiceResponse(
-                ok=False, error_message="Invalid Revolut options"
-            )
-
-        amount_minor = self.amount_to_minor_units(amount, currency)
-        checkout = opts.checkout or RevolutCheckoutOptions()
-        success_url = (
-            checkout.success_url
-            or settings.revolut_payment_success_url
-            or "https://lnbits.com"
-        )
-
-        payload = {
-            "amount": amount_minor,
-            "currency": currency.upper(),
-            "description": checkout.description or memo or "LNbits Invoice",
-            "redirect_url": success_url,
-            "metadata": {
-                **checkout.metadata,
-                "payment_hash": payment_hash,
-                "alan_action": "invoice",
-            },
-        }
-
-        try:
-            r = await self.client.post(
-                "/api/orders", json=payload, timeout=REVOLUT_REQUEST_TIMEOUT
-            )
-            r.raise_for_status()
-            data = r.json()
-            order_id = data.get("id")
-            checkout_url = data.get("checkout_url")
-            if not order_id or not checkout_url:
-                return FiatInvoiceResponse(
-                    ok=False, error_message="Server error: missing order id or url"
-                )
-            return FiatInvoiceResponse(
-                ok=True,
-                checking_id=f"order_{order_id}",
-                payment_request=checkout_url,
-            )
-        except json.JSONDecodeError:
-            return FiatInvoiceResponse(
-                ok=False, error_message="Server error: invalid json response"
-            )
-        except Exception as exc:
-            logger.warning(exc)
-            return FiatInvoiceResponse(
-                ok=False, error_message=f"Unable to connect to {self.endpoint}."
-            )
-
-    async def create_subscription(
-        self,
-        subscription_id: str,
-        quantity: int,
-        payment_options: FiatSubscriptionPaymentOptions,
-        **kwargs,
-    ) -> FiatSubscriptionResponse:
-        if quantity != 1:
-            return FiatSubscriptionResponse(
-                ok=False,
-                error_message="Revolut subscriptions do not support quantity.",
-            )
-
-        wallet_id = payment_options.wallet_id
-        if not wallet_id:
-            return FiatSubscriptionResponse(
-                ok=False, error_message="Wallet ID is required."
-            )
-
-        extra = payment_options.extra or {}
-        if not payment_options.subscription_request_id:
-            payment_options.subscription_request_id = urlsafe_short_hash()
-
-        reference = RevolutSubscriptionReference(
-            wallet_id=wallet_id,
-            tag=payment_options.tag,
-            subscription_request_id=payment_options.subscription_request_id,
-            extra=extra,
-            memo=payment_options.memo,
-        )
-        payload: dict[str, Any] = {
-            "plan_variation_id": subscription_id,
-            "external_reference": self._serialize_subscription_reference(reference),
-            "setup_order_redirect_url": (
-                payment_options.success_url
-                or settings.revolut_payment_success_url
-                or "https://lnbits.com"
-            ),
-        }
-        if extra.get("trial_duration"):
-            payload["trial_duration"] = extra["trial_duration"]
-
-        headers = {
-            **self.headers,
-            "Idempotency-Key": payment_options.subscription_request_id,
-        }
-
-        try:
-            customer_id, customer_error = await self._get_subscription_customer_id(
-                payment_options
-            )
-            if not customer_id:
-                return FiatSubscriptionResponse(ok=False, error_message=customer_error)
-            payload["customer_id"] = customer_id
-            r = await self.client.post(
-                "/api/subscriptions",
-                json=payload,
-                headers=headers,
-                timeout=REVOLUT_REQUEST_TIMEOUT,
-            )
-            r.raise_for_status()
-            data = r.json()
-            revolut_subscription_id = data.get("id")
-            setup_order_id = data.get("setup_order_id")
-            if not revolut_subscription_id or not setup_order_id:
-                return FiatSubscriptionResponse(
-                    ok=False,
-                    error_message=(
-                        "Server error: missing subscription id or setup order id"
-                    ),
-                )
-
-            setup_order = await self.get_order(setup_order_id)
-            checkout_url = setup_order.get("checkout_url")
-            if not checkout_url:
-                return FiatSubscriptionResponse(
-                    ok=False, error_message="Server error: missing setup checkout url"
-                )
-
-            return FiatSubscriptionResponse(
-                ok=True,
-                checkout_session_url=checkout_url,
-                subscription_request_id=revolut_subscription_id,
-            )
-        except json.JSONDecodeError:
-            return FiatSubscriptionResponse(
-                ok=False, error_message="Server error: invalid json response"
-            )
-        except Exception as exc:
-            logger.warning(exc)
-            return FiatSubscriptionResponse(
-                ok=False, error_message=f"Unable to connect to {self.endpoint}."
-            )
-
-    async def cancel_subscription(
-        self,
-        subscription_id: str,
-        correlation_id: str,
-        **kwargs,
-    ) -> FiatSubscriptionResponse:
-        try:
-            subscription = await self.get_subscription(subscription_id)
-            reference = self.deserialize_subscription_reference(
-                subscription.get("external_reference")
-            )
-            if not reference or reference.wallet_id != correlation_id:
-                return FiatSubscriptionResponse(
-                    ok=False, error_message="Subscription not found."
-                )
-
-            r = await self.client.post(
-                f"/api/subscriptions/{subscription_id}/cancel",
-                timeout=REVOLUT_REQUEST_TIMEOUT,
-            )
-            r.raise_for_status()
-            return FiatSubscriptionResponse(ok=True)
-        except Exception as exc:
-            logger.warning(exc)
-            return FiatSubscriptionResponse(
-                ok=False, error_message="Unable to cancel subscription."
-            )
-
-    async def pay_invoice(self, payment_request: str) -> FiatPaymentResponse:
-        raise NotImplementedError("Revolut does not support paying invoices directly.")
-
-    async def get_invoice_status(self, checking_id: str) -> FiatPaymentStatus:
-        try:
-            order_id = self._normalize_revolut_id(checking_id)
-            return self._status_from_order(await self.get_order(order_id))
-        except Exception as exc:
-            logger.debug(f"Error getting Revolut invoice status: {exc}")
-            return FiatPaymentPendingStatus()
-
-    async def get_payment_status(self, checking_id: str) -> FiatPaymentStatus:
-        raise NotImplementedError("Revolut does not support outgoing payments.")
-
-    async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
-        logger.warning(
-            "Revolut does not support paid invoices stream. Use webhooks instead."
-        )
-        mock_queue: asyncio.Queue[str] = asyncio.Queue(0)
-        while settings.lnbits_running:
-            value = await mock_queue.get()
-            yield value
-
-    def _normalize_revolut_id(self, checking_id: str) -> str:
-        value = (
-            checking_id.replace("fiat_revolut_", "", 1)
-            if checking_id.startswith("fiat_revolut_")
-            else checking_id
-        )
-        return value.replace("order_", "", 1) if value.startswith("order_") else value
-
-    async def get_order(self, order_id: str) -> dict[str, Any]:
-        r = await self.client.get(
-            f"/api/orders/{order_id}", timeout=REVOLUT_REQUEST_TIMEOUT
-        )
-        r.raise_for_status()
-        return r.json()
-
-    async def get_subscription(self, subscription_id: str) -> dict[str, Any]:
-        r = await self.client.get(
-            f"/api/subscriptions/{subscription_id}", timeout=REVOLUT_REQUEST_TIMEOUT
-        )
-        r.raise_for_status()
-        return r.json()
-
-    async def get_subscription_cycle(
-        self, subscription_id: str, cycle_id: str
-    ) -> dict[str, Any]:
-        r = await self.client.get(
-            f"/api/subscriptions/{subscription_id}/cycles/{cycle_id}",
-            timeout=REVOLUT_REQUEST_TIMEOUT,
-        )
-        r.raise_for_status()
-        return r.json()
-
-    async def _get_subscription_customer_id(
-        self, payment_options: FiatSubscriptionPaymentOptions
-    ) -> tuple[str | None, str | None]:
-        if not payment_options.customer_email:
-            return (
-                None,
-                "Revolut subscriptions require customer_email.",
-            )
-
-        customer = await self._get_customer_by_email(payment_options.customer_email)
-        customer_id = customer.get("id") if customer else None
-        if customer_id:
-            return customer_id, None
-
-        customer = await self._create_customer(payment_options.customer_email)
-        customer_id = customer.get("id")
-        if not customer_id:
-            return None, "Server error: missing customer id"
-        return customer_id, None
-
-    async def _get_customer_by_email(self, email: str) -> dict[str, Any] | None:
-        page_token = None
-        for _ in range(REVOLUT_CUSTOMER_LIST_MAX_PAGES):
-            customer_page = await self._list_customers(page_token=page_token)
-            customer = _find_customer_by_email(customer_page["customers"], email)
-            if customer:
-                return customer
-
-            page_token = customer_page.get("next_page_token")
-            if not page_token:
-                return None
-        return None
-
-    async def _list_customers(self, page_token: str | None = None) -> dict[str, Any]:
-        params: dict[str, Any] = {"limit": REVOLUT_CUSTOMER_LIST_LIMIT}
-        if page_token:
-            params["page_token"] = page_token
-        r = await self.client.get(
-            "/api/customers", params=params, timeout=REVOLUT_REQUEST_TIMEOUT
-        )
-        r.raise_for_status()
-        return _extract_customer_page(r.json())
-
-    async def _create_customer(self, email: str) -> dict[str, Any]:
-        r = await self.client.post(
-            "/api/customers",
-            json={"email": email},
-            timeout=REVOLUT_REQUEST_TIMEOUT,
-        )
-        r.raise_for_status()
-        return r.json()
-
-    @classmethod
-    async def create_webhook(
-        cls,
-        url: str,
-        endpoint: str | None = None,
-        api_secret_key: str | None = None,
-        api_version: str | None = None,
-    ) -> dict[str, Any]:
-        if not url:
-            raise ValueError("Missing Revolut webhook URL.")
-        cls._validate_webhook_url(url)
-        if not endpoint and not settings.revolut_api_endpoint:
-            raise ValueError("Missing Revolut API endpoint.")
-        if not api_secret_key and not settings.revolut_api_secret_key:
-            raise ValueError("Missing Revolut API secret key.")
-
-        base_url = normalize_endpoint(endpoint or settings.revolut_api_endpoint)
-        secret_key = api_secret_key or settings.revolut_api_secret_key
-        headers = {
-            "Authorization": f"Bearer {secret_key}",
-            "Revolut-Api-Version": api_version or settings.revolut_api_version,
-            "Content-Type": "application/json",
-            "User-Agent": settings.user_agent,
-        }
-        payload = {"url": url, "events": REVOLUT_WEBHOOK_EVENTS}
-        async with httpx.AsyncClient(base_url=base_url, headers=headers) as client:
-            webhooks = await cls._list_webhooks(client)
-            existing = await cls._get_existing_webhook(client, webhooks, url)
-            if existing:
-                existing["already_exists"] = True
-                return existing
-
-            response = await client.post(
-                "/api/webhooks", json=payload, timeout=REVOLUT_REQUEST_TIMEOUT
-            )
-            response.raise_for_status()
-            return response.json()
-
-    @classmethod
-    async def _list_webhooks(cls, client: httpx.AsyncClient) -> list[dict[str, Any]]:
-        response = await client.get("/api/webhooks", timeout=REVOLUT_REQUEST_TIMEOUT)
-        response.raise_for_status()
-        data = response.json()
-        if isinstance(data, list):
-            return data
-        if isinstance(data, dict):
-            for field in ["webhooks", "data", "items"]:
-                if isinstance(data.get(field), list):
-                    return data[field]
-        return []
-
-    @classmethod
-    async def _get_existing_webhook(
-        cls, client: httpx.AsyncClient, webhooks: list[dict[str, Any]], url: str
-    ) -> dict[str, Any] | None:
-        for webhook in webhooks:
-            if cls._normalize_webhook_url(webhook.get("url")) != (
-                cls._normalize_webhook_url(url)
-            ):
-                continue
-
-            webhook_id = webhook.get("id")
-            if webhook_id and (
-                not webhook.get("events") or not webhook.get("signing_secret")
-            ):
-                response = await client.get(
-                    f"/api/webhooks/{webhook_id}", timeout=REVOLUT_REQUEST_TIMEOUT
-                )
-                response.raise_for_status()
-                webhook = response.json()
-
-            events = set(webhook.get("events") or [])
-            missing_events = set(REVOLUT_WEBHOOK_EVENTS) - events
-            if missing_events:
-                raise ValueError(
-                    "A Revolut webhook already exists for this URL, but it is "
-                    f"missing required events: {', '.join(sorted(missing_events))}."
-                )
-
-            if not webhook.get("signing_secret"):
-                raise ValueError(
-                    "A Revolut webhook already exists for this URL, but Revolut "
-                    "did not return a signing secret."
-                )
-
-            return webhook
-        return None
-
-    @classmethod
-    def _normalize_webhook_url(cls, url: str | None) -> str:
-        return (url or "").strip().rstrip("/")
-
-    @classmethod
-    def _validate_webhook_url(cls, url: str) -> None:
-        parsed = urlparse(url)
-        hostname = parsed.hostname
-        if parsed.scheme not in ["http", "https"] or not hostname:
-            raise ValueError("Revolut webhook URL must be a clearnet URL.")
-
-        host = hostname.lower()
-        if host == "localhost" or host.endswith(".localhost"):
-            raise ValueError("Revolut webhook URL must be a clearnet URL.")
-        if host.endswith(".local") or host.endswith(".onion"):
-            raise ValueError("Revolut webhook URL must be a clearnet URL.")
-
-        try:
-            ip = ipaddress.ip_address(host)
-        except ValueError:
-            return
-
-        if (
-            ip.is_loopback
-            or ip.is_private
-            or ip.is_link_local
-            or ip.is_reserved
-            or ip.is_unspecified
-        ):
-            raise ValueError("Revolut webhook URL must be a clearnet URL.")
-
-    def _status_from_order(self, order: dict[str, Any]) -> FiatPaymentStatus:
-        status = (order.get("state") or "").upper()
-        if status == "COMPLETED":
-            return FiatPaymentSuccessStatus()
-        if status in ["CANCELLED", "FAILED"]:
-            return FiatPaymentFailedStatus()
-        return FiatPaymentPendingStatus()
-
-    @classmethod
-    def amount_to_minor_units(cls, amount: float | Decimal, currency: str) -> int:
-        scale = Decimal(10) ** cls.currency_exponent(currency)
-        return int((Decimal(str(amount)) * scale).quantize(Decimal("1"), ROUND_HALF_UP))
-
-    @classmethod
-    def minor_units_to_amount(cls, amount: int, currency: str) -> float:
-        scale = Decimal(10) ** cls.currency_exponent(currency)
-        return float(Decimal(amount) / scale)
-
-    @classmethod
-    def currency_exponent(cls, currency: str) -> int:
-        normalized = currency.upper()
-        if normalized in ZERO_DECIMAL_CURRENCIES:
-            return 0
-        if normalized in THREE_DECIMAL_CURRENCIES:
-            return 3
-        return 2
-
-    def _parse_create_opts(
-        self, raw_opts: dict[str, Any]
-    ) -> RevolutCreateInvoiceOptions | None:
-        try:
-            return RevolutCreateInvoiceOptions.parse_obj(raw_opts)
-        except ValidationError as e:
-            logger.warning(f"Invalid Revolut options: {e}")
-            return None
-
-    def _serialize_subscription_reference(
-        self, reference: RevolutSubscriptionReference
-    ) -> str:
-        payload = reference.dict(exclude_none=True)
-        serialized = json.dumps(payload, separators=(",", ":"))
-        if len(serialized) > 1024:
-            raise ValueError("Revolut subscription external_reference is too long.")
-        return serialized
-
-    def deserialize_subscription_reference(
-        self, external_reference: str | None
-    ) -> RevolutSubscriptionReference | None:
-        if not external_reference:
-            return None
-        try:
-            return RevolutSubscriptionReference.parse_obj(
-                json.loads(external_reference)
-            )
-        except (json.JSONDecodeError, ValidationError) as exc:
-            logger.warning(exc)
-            return None
-
-    def _settings_connection_fields(self) -> str:
-        return "-".join(
-            [
-                str(settings.revolut_api_endpoint),
-                str(settings.revolut_api_secret_key),
-                str(settings.revolut_api_version),
-                str(settings.revolut_webhook_signing_secret),
-            ]
-        )
-
-
-def _extract_customer_page(data: Any) -> dict[str, Any]:
-    if isinstance(data, list):
-        return {"customers": _filter_customer_list(data)}
-    if isinstance(data, dict):
-        for field in ["customers", "data", "items"]:
-            customers = data.get(field)
-            if isinstance(customers, list):
-                return {
-                    "customers": _filter_customer_list(customers),
-                    "next_page_token": data.get("next_page_token"),
-                }
-    return {"customers": []}
-
-
-def _filter_customer_list(customers: list[Any]) -> list[dict[str, Any]]:
-    return [customer for customer in customers if isinstance(customer, dict)]
-
-
-def _find_customer_by_email(
-    customers: list[dict[str, Any]], email: str
-) -> dict[str, Any] | None:
-    normalized_email = email.casefold()
-    for customer in customers:
-        if str(customer.get("email") or "").casefold() == normalized_email:
-            return customer
-    return None
@@ -1,620 +0,0 @@
-import asyncio
-import json
-from collections.abc import AsyncGenerator
-from typing import Any, Literal
-
-import httpx
-from loguru import logger
-from pydantic import BaseModel, Field, ValidationError
-
-from lnbits.helpers import normalize_endpoint, urlsafe_short_hash
-from lnbits.settings import settings
-
-from .base import (
-    FiatInvoiceResponse,
-    FiatPaymentFailedStatus,
-    FiatPaymentPendingStatus,
-    FiatPaymentResponse,
-    FiatPaymentStatus,
-    FiatPaymentSuccessStatus,
-    FiatProvider,
-    FiatStatusResponse,
-    FiatSubscriptionPaymentOptions,
-    FiatSubscriptionResponse,
-)
-
-FiatMethod = Literal["checkout", "subscription"]
-
-
-class SquareCheckoutOptions(BaseModel):
-    class Config:
-        extra = "ignore"
-
-    success_url: str | None = None
-    metadata: dict[str, str] = Field(default_factory=dict)
-    line_item_name: str | None = None
-
-
-class SquareSubscriptionOptions(BaseModel):
-    class Config:
-        extra = "ignore"
-
-    checking_id: str | None = None
-    payment_request: str | None = None
-
-
-class SquareCreateInvoiceOptions(BaseModel):
-    class Config:
-        extra = "ignore"
-
-    fiat_method: FiatMethod = "checkout"
-    checkout: SquareCheckoutOptions | None = None
-    subscription: SquareSubscriptionOptions | None = None
-
-
-class SquareSubscriptionCheckoutInfo(BaseModel):
-    plan_variation_id: str
-    price_money: dict[str, Any]
-
-
-class SquareWallet(FiatProvider):
-    """https://developer.squareup.com/reference/square"""
-
-    def __init__(self):
-        logger.debug("Initializing SquareWallet")
-        self._settings_fields = self._settings_connection_fields()
-        if not settings.square_api_endpoint:
-            raise ValueError("Cannot initialize SquareWallet: missing endpoint.")
-        if not settings.square_access_token:
-            raise ValueError("Cannot initialize SquareWallet: missing access token.")
-        if not settings.square_location_id:
-            raise ValueError("Cannot initialize SquareWallet: missing location ID.")
-
-        self.endpoint = normalize_endpoint(settings.square_api_endpoint)
-        self.location_id = settings.square_location_id
-        self.headers = {
-            "Authorization": f"Bearer {settings.square_access_token}",
-            "Square-Version": settings.square_api_version,
-            "Content-Type": "application/json",
-            "User-Agent": settings.user_agent,
-        }
-        self.client = httpx.AsyncClient(base_url=self.endpoint, headers=self.headers)
-        logger.info("SquareWallet initialized.")
-
-    async def cleanup(self):
-        try:
-            await self.client.aclose()
-        except RuntimeError as e:
-            logger.warning(f"Error closing Square wallet connection: {e}")
-
-    async def status(
-        self, only_check_settings: bool | None = False
-    ) -> FiatStatusResponse:
-        if only_check_settings:
-            if self._settings_fields != self._settings_connection_fields():
-                return FiatStatusResponse("Connection settings have changed.", 0)
-            return FiatStatusResponse(balance=0)
-
-        try:
-            r = await self.client.get(f"/v2/locations/{self.location_id}", timeout=15)
-            r.raise_for_status()
-            _ = r.json()
-            return FiatStatusResponse(balance=0)
-        except json.JSONDecodeError:
-            return FiatStatusResponse("Server error: 'invalid json response'", 0)
-        except Exception as exc:
-            logger.warning(exc)
-            return FiatStatusResponse(f"Unable to connect to {self.endpoint}.", 0)
-
-    async def create_invoice(
-        self,
-        amount: float,
-        payment_hash: str,
-        currency: str,
-        memo: str | None = None,
-        extra: dict[str, Any] | None = None,
-        **kwargs,
-    ) -> FiatInvoiceResponse:
-        opts = self._parse_create_opts(extra or {})
-        if not opts:
-            return FiatInvoiceResponse(ok=False, error_message="Invalid Square options")
-
-        if opts.fiat_method == "subscription":
-            return self._create_subscription_invoice(opts.subscription)
-
-        return await self._create_checkout_invoice(
-            amount=amount,
-            payment_hash=payment_hash,
-            currency=currency,
-            opts=opts,
-            memo=memo,
-        )
-
-    async def create_subscription(
-        self,
-        subscription_id: str,
-        quantity: int,
-        payment_options: FiatSubscriptionPaymentOptions,
-        **kwargs,
-    ) -> FiatSubscriptionResponse:
-        if settings.lnbits_running:
-            return FiatSubscriptionResponse(
-                ok=False, error_message="Subscription not supported for Square."
-            )
-        success_url = (
-            payment_options.success_url
-            or settings.square_payment_success_url
-            or "https://lnbits.com"
-        )
-
-        if not payment_options.subscription_request_id:
-            payment_options.subscription_request_id = urlsafe_short_hash()
-        payment_options.extra = payment_options.extra or {}
-        payment_options.extra["subscription_request_id"] = (
-            payment_options.subscription_request_id
-        )
-        try:
-            checkout_info = await self._get_subscription_checkout_info(subscription_id)
-            metadata = self._serialize_metadata(payment_options)
-            payload = {
-                "idempotency_key": payment_options.subscription_request_id,
-                "description": metadata,
-                "quick_pay": {
-                    "name": (payment_options.memo or "LNbits Subscription")[:255],
-                    "price_money": checkout_info.price_money,
-                    "location_id": self.location_id,
-                },
-                "checkout_options": {
-                    "redirect_url": success_url,
-                    "subscription_plan_id": checkout_info.plan_variation_id,
-                },
-                "payment_note": metadata,
-            }
-            r = await self.client.post(
-                "/v2/online-checkout/payment-links", json=payload
-            )
-            r.raise_for_status()
-            data = r.json()
-            payment_link = data.get("payment_link") or {}
-            url = payment_link.get("url")
-            if not url:
-                return FiatSubscriptionResponse(
-                    ok=False, error_message="Server error: missing url"
-                )
-            return FiatSubscriptionResponse(
-                ok=True,
-                checkout_session_url=url,
-                subscription_request_id=payment_options.subscription_request_id,
-            )
-        except json.JSONDecodeError as exc:
-            logger.warning(exc)
-            return FiatSubscriptionResponse(
-                ok=False, error_message="Server error: invalid json response"
-            )
-        except Exception as exc:
-            logger.warning(exc)
-            return FiatSubscriptionResponse(
-                ok=False, error_message=f"Unable to connect to {self.endpoint}."
-            )
-
-    async def cancel_subscription(
-        self,
-        subscription_id: str,
-        correlation_id: str,
-        **kwargs,
-    ) -> FiatSubscriptionResponse:
-        try:
-            square_subscription_id = await self._get_square_subscription_id(
-                subscription_id, correlation_id
-            )
-            r = await self.client.post(
-                f"/v2/subscriptions/{square_subscription_id}/cancel"
-            )
-            r.raise_for_status()
-            return FiatSubscriptionResponse(ok=True)
-        except Exception as exc:
-            logger.warning(exc)
-            return FiatSubscriptionResponse(
-                ok=False, error_message="Unable to cancel subscription."
-            )
-
-    async def pay_invoice(self, payment_request: str) -> FiatPaymentResponse:
-        raise NotImplementedError("Square does not support paying invoices directly.")
-
-    async def get_invoice_status(self, checking_id: str) -> FiatPaymentStatus:
-        try:
-            square_id = self._normalize_square_id(checking_id)
-            if square_id.startswith("payment_"):
-                payment_id = square_id.replace("payment_", "", 1)
-                return await self._get_payment_status(payment_id)
-
-            order_id = (
-                square_id.replace("order_", "", 1)
-                if square_id.startswith("order_")
-                else square_id
-            )
-            return await self._get_order_status(order_id)
-        except Exception as exc:
-            logger.debug(f"Error getting Square invoice status: {exc}")
-            return FiatPaymentPendingStatus()
-
-    async def get_payment_status(self, checking_id: str) -> FiatPaymentStatus:
-        raise NotImplementedError("Square does not support outgoing payments.")
-
-    async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
-        logger.warning(
-            "Square does not support paid invoices stream. Use webhooks instead."
-        )
-        mock_queue: asyncio.Queue[str] = asyncio.Queue(0)
-        while settings.lnbits_running:
-            value = await mock_queue.get()
-            yield value
-
-    async def _get_order_status(self, order_id: str) -> FiatPaymentStatus:
-        order = await self._get_order(order_id)
-        payment_id = self._payment_id_from_order(order)
-        if payment_id:
-            return await self._get_payment_status(payment_id)
-
-        if (order.get("state") or "").upper() == "CANCELED":
-            return FiatPaymentFailedStatus()
-        return FiatPaymentPendingStatus()
-
-    async def _get_order(self, order_id: str) -> dict[str, Any]:
-        r = await self.client.get(f"/v2/orders/{order_id}")
-        r.raise_for_status()
-        return r.json().get("order") or {}
-
-    async def get_payment_for_order(self, order_id: str) -> dict[str, Any] | None:
-        order = await self._get_order(order_id)
-        payment_id = self._payment_id_from_order(order)
-        if not payment_id:
-            return None
-        return await self._get_payment(payment_id)
-
-    def _payment_id_from_order(self, order: dict[str, Any]) -> str | None:
-        tenders = order.get("tenders") or []
-        for tender in tenders:
-            payment_id = tender.get("payment_id")
-            if payment_id:
-                return payment_id
-        return None
-
-    async def _get_payment_status(self, payment_id: str) -> FiatPaymentStatus:
-        return self._status_from_payment(await self._get_payment(payment_id))
-
-    async def _get_payment(self, payment_id: str) -> dict[str, Any]:
-        r = await self.client.get(f"/v2/payments/{payment_id}")
-        r.raise_for_status()
-        return r.json().get("payment") or {}
-
-    async def _get_subscription_checkout_info(
-        self, subscription_plan_id: str
-    ) -> SquareSubscriptionCheckoutInfo:
-        catalog_object = await self._get_catalog_object(subscription_plan_id)
-        if catalog_object.get("type") == "SUBSCRIPTION_PLAN":
-            return await self._get_plan_checkout_info(catalog_object)
-
-        if catalog_object.get("type") == "SUBSCRIPTION_PLAN_VARIATION":
-            price_money = await self._get_subscription_price_money(
-                catalog_object,
-            )
-            plan_variation_id = catalog_object.get("id")
-            if not plan_variation_id:
-                raise ValueError("Square subscription plan variation is missing an ID.")
-            return SquareSubscriptionCheckoutInfo(
-                plan_variation_id=plan_variation_id,
-                price_money=price_money,
-            )
-
-        raise ValueError(
-            "Square subscription ID must be a plan ID or plan variation ID."
-        )
-
-    async def _get_plan_checkout_info(
-        self, catalog_object: dict[str, Any]
-    ) -> SquareSubscriptionCheckoutInfo:
-        plan_data = catalog_object.get("subscription_plan_data") or {}
-        plan_variations = plan_data.get("subscription_plan_variations") or []
-        eligible_item_ids = plan_data.get("eligible_item_ids") or []
-        plan_variation = next(
-            (
-                variation
-                for variation in plan_variations
-                if not variation.get("is_deleted")
-            ),
-            None,
-        )
-        if not plan_variation:
-            raise ValueError("Square subscription plan is missing a variation.")
-
-        price_money = await self._get_subscription_price_money(
-            plan_variation,
-            eligible_item_ids=eligible_item_ids,
-        )
-        plan_variation_id = plan_variation.get("id")
-        if not plan_variation_id:
-            raise ValueError("Square subscription plan variation is missing an ID.")
-
-        return SquareSubscriptionCheckoutInfo(
-            plan_variation_id=plan_variation_id,
-            price_money=price_money,
-        )
-
-    async def _get_catalog_object(self, object_id: str) -> dict[str, Any]:
-        r = await self.client.get(f"/v2/catalog/object/{object_id}")
-        r.raise_for_status()
-        return r.json().get("object") or {}
-
-    async def _get_subscription_price_money(
-        self,
-        plan_variation: dict[str, Any],
-        eligible_item_ids: list[str] | None = None,
-    ) -> dict[str, Any]:
-        variation_data = plan_variation.get("subscription_plan_variation_data") or {}
-        phases = variation_data.get("phases") or []
-        for phase in phases:
-            pricing = phase.get("pricing") or {}
-            price_money = pricing.get("price_money") or phase.get(
-                "recurring_price_money"
-            )
-            parsed_price_money = self._parse_price_money(price_money)
-            if parsed_price_money:
-                return parsed_price_money
-
-            if pricing.get("type") == "RELATIVE":
-                return await self._get_relative_subscription_price_money(
-                    eligible_item_ids or []
-                )
-
-        raise ValueError("Square subscription plan variation is missing price_money.")
-
-    async def _get_relative_subscription_price_money(
-        self, eligible_item_ids: list[str]
-    ) -> dict[str, Any]:
-        if len(eligible_item_ids) != 1:
-            raise ValueError(
-                "Square relative subscription plan must have exactly one item."
-            )
-
-        item = await self._get_catalog_object(eligible_item_ids[0])
-        item_variations: list[dict[str, Any]] = []
-        if item.get("type") == "ITEM":
-            item_variations = (item.get("item_data") or {}).get("variations") or []
-        elif item.get("type") == "ITEM_VARIATION":
-            item_variations = [item]
-
-        item_variation = next(
-            (
-                variation
-                for variation in item_variations
-                if not variation.get("is_deleted")
-            ),
-            None,
-        )
-        if not item_variation:
-            raise ValueError("Square subscription item is missing a variation.")
-
-        price_money = self._parse_price_money(
-            (item_variation.get("item_variation_data") or {}).get("price_money")
-        )
-        if price_money:
-            return price_money
-
-        raise ValueError("Square subscription item variation is missing price_money.")
-
-    def _parse_price_money(
-        self, price_money: dict[str, Any] | None
-    ) -> dict[str, Any] | None:
-        if (
-            price_money
-            and price_money.get("amount") is not None
-            and price_money.get("currency")
-        ):
-            return {
-                "amount": int(price_money["amount"]),
-                "currency": price_money["currency"].upper(),
-            }
-        return None
-
-    def _status_from_payment(self, payment: dict[str, Any]) -> FiatPaymentStatus:
-        status = (payment.get("status") or "").upper()
-        if status == "COMPLETED":
-            return FiatPaymentSuccessStatus()
-        if status in ["CANCELED", "FAILED"]:
-            return FiatPaymentFailedStatus()
-        return FiatPaymentPendingStatus()
-
-    async def _create_checkout_invoice(
-        self,
-        amount: float,
-        payment_hash: str,
-        currency: str,
-        opts: SquareCreateInvoiceOptions,
-        memo: str | None = None,
-    ) -> FiatInvoiceResponse:
-        amount_cents = int(amount * 100)
-        co = opts.checkout or SquareCheckoutOptions()
-        success_url = (
-            co.success_url
-            or settings.square_payment_success_url
-            or "https://lnbits.com"
-        )
-        line_item_name = (co.line_item_name or memo or "LNbits Invoice")[:255]
-        metadata = {
-            **co.metadata,
-            "payment_hash": payment_hash,
-            "alan_action": "invoice",
-        }
-
-        payload = {
-            "idempotency_key": payment_hash,
-            "order": {
-                "location_id": self.location_id,
-                "metadata": metadata,
-                "line_items": [
-                    {
-                        "name": line_item_name,
-                        "quantity": "1",
-                        "base_price_money": {
-                            "amount": amount_cents,
-                            "currency": currency.upper(),
-                        },
-                    }
-                ],
-            },
-            "checkout_options": {"redirect_url": success_url},
-        }
-        if memo:
-            payload["payment_note"] = memo[:500]
-
-        try:
-            r = await self.client.post(
-                "/v2/online-checkout/payment-links", json=payload
-            )
-            r.raise_for_status()
-            data = r.json()
-            payment_link = data.get("payment_link") or {}
-            order_id = payment_link.get("order_id")
-            url = payment_link.get("url")
-            if not order_id or not url:
-                return FiatInvoiceResponse(
-                    ok=False, error_message="Server error: missing order id or url"
-                )
-            return FiatInvoiceResponse(
-                ok=True,
-                checking_id=f"order_{order_id}",
-                payment_request=url,
-            )
-        except json.JSONDecodeError:
-            return FiatInvoiceResponse(
-                ok=False, error_message="Server error: invalid json response"
-            )
-        except Exception as exc:
-            logger.warning(exc)
-            return FiatInvoiceResponse(
-                ok=False, error_message=f"Unable to connect to {self.endpoint}."
-            )
-
-    def _create_subscription_invoice(
-        self, opts: SquareSubscriptionOptions | None
-    ) -> FiatInvoiceResponse:
-        term = opts or SquareSubscriptionOptions()
-        checking_id = term.checking_id or f"payment_{urlsafe_short_hash()}"
-        return FiatInvoiceResponse(
-            ok=True,
-            checking_id=checking_id,
-            payment_request=term.payment_request or "",
-        )
-
-    def _normalize_square_id(self, checking_id: str) -> str:
-        return (
-            checking_id.replace("fiat_square_", "", 1)
-            if checking_id.startswith("fiat_square_")
-            else checking_id
-        )
-
-    def _parse_create_opts(
-        self, raw_opts: dict[str, Any]
-    ) -> SquareCreateInvoiceOptions | None:
-        try:
-            return SquareCreateInvoiceOptions.parse_obj(raw_opts)
-        except ValidationError as e:
-            logger.warning(f"Invalid Square options: {e}")
-            return None
-
-    def _serialize_metadata(
-        self, payment_options: FiatSubscriptionPaymentOptions
-    ) -> str:
-        extra_link = None
-        if payment_options.extra:
-            raw_link = payment_options.extra.get("link")
-            extra_link = str(raw_link)[:200] if raw_link else None
-
-        meta = [
-            payment_options.wallet_id,
-            payment_options.tag,
-            payment_options.subscription_request_id,
-            extra_link,
-        ]
-
-        memo_limit = 493 - len(json.dumps(meta, separators=(",", ":")))
-        if memo_limit > 0 and payment_options.memo:
-            meta.append(payment_options.memo[:memo_limit])
-        else:
-            meta.append(None)
-
-        metadata = json.dumps(meta, separators=(",", ":"))
-        if len(metadata) > 500:
-            raise ValueError("Square subscription metadata is too long.")
-        return metadata
-
-    async def _get_square_subscription_id(
-        self, subscription_id: str, wallet_id: str
-    ) -> str:
-        try:
-            from lnbits.core.crud.payments import get_payments
-            from lnbits.core.models import PaymentFilters
-            from lnbits.db import Filter, Filters
-
-            payments = await get_payments(
-                wallet_id=wallet_id,
-                filters=Filters(
-                    filters=[
-                        Filter.parse_query(
-                            "external_id", [subscription_id], PaymentFilters
-                        )
-                    ],
-                    model=PaymentFilters,
-                    sortby="created_at",
-                    direction="desc",
-                    limit=1,
-                ),
-            )
-            payment = next(
-                (
-                    payment
-                    for payment in payments
-                    if payment.external_id and payment.fiat_provider == "square"
-                ),
-                None,
-            )
-            if payment and payment.external_id:
-                return payment.external_id
-
-            payments = await get_payments(
-                wallet_id=wallet_id,
-                incoming=True,
-                filters=Filters(
-                    model=PaymentFilters,
-                    sortby="created_at",
-                    direction="desc",
-                ),
-            )
-            payment = next(
-                (
-                    payment
-                    for payment in payments
-                    if payment.external_id
-                    and payment.fiat_provider == "square"
-                    and (payment.extra or {}).get("subscription_request_id")
-                    == subscription_id
-                ),
-                None,
-            )
-            if payment and payment.external_id:
-                return payment.external_id
-        except Exception as exc:
-            logger.warning(exc)
-
-        return subscription_id
-
-    def _settings_connection_fields(self) -> str:
-        return "-".join(
-            [
-                str(settings.square_api_endpoint),
-                str(settings.square_access_token),
-                str(settings.square_location_id),
-                str(settings.square_api_version),
-            ]
-        )
@@ -8,7 +8,7 @@ from urllib.parse import urlencode

 import httpx
 from loguru import logger
-from pydantic import BaseModel, Field, ValidationError
+from pydantic import BaseModel, ConfigDict, Field, ValidationError

 from lnbits.helpers import normalize_endpoint, urlsafe_short_hash
 from lnbits.settings import settings
@@ -30,8 +30,7 @@ FiatMethod = Literal["checkout", "terminal", "subscription"]


 class StripeTerminalOptions(BaseModel):
-    class Config:
-        extra = "ignore"
+    model_config = ConfigDict(extra="ignore")

    capture_method: Literal["automatic", "manual"] = "automatic"
    metadata: dict[str, str] = Field(default_factory=dict)
@@ -39,8 +38,7 @@ class StripeTerminalOptions(BaseModel):


 class StripeCheckoutOptions(BaseModel):
-    class Config:
-        extra = "ignore"
+    model_config = ConfigDict(extra="ignore")

    success_url: str | None = None
    metadata: dict[str, str] = Field(default_factory=dict)
@@ -48,16 +46,14 @@ class StripeCheckoutOptions(BaseModel):


 class StripeSubscriptionOptions(BaseModel):
-    class Config:
-        extra = "ignore"
+    model_config = ConfigDict(extra="ignore")

    checking_id: str | None = None
    payment_request: str | None = None


 class StripeCreateInvoiceOptions(BaseModel):
-    class Config:
-        extra = "ignore"
+    model_config = ConfigDict(extra="ignore")

    fiat_method: FiatMethod = "checkout"
    terminal: StripeTerminalOptions | None = None
@@ -171,7 +167,10 @@ class StripeWallet(FiatProvider):
            ("line_items[0][price]", subscription_id),
            ("line_items[0][quantity]", f"{quantity}"),
        ]
-        subscription_data = {**payment_options.dict(), "alan_action": "subscription"}
+        subscription_data = {
+            **payment_options.model_dump(),
+            "alan_action": "subscription",
+        }
        subscription_data["extra"] = json.dumps(subscription_data.get("extra") or {})

        form_data += self._encode_metadata(
@@ -494,7 +493,7 @@ class StripeWallet(FiatProvider):
        self, raw_opts: dict[str, Any]
    ) -> StripeCreateInvoiceOptions | None:
        try:
-            return StripeCreateInvoiceOptions.parse_obj(raw_opts)
+            return StripeCreateInvoiceOptions.model_validate(raw_opts)
        except ValidationError as e:
            logger.warning(f"Invalid Stripe options: {e}")
            return None
@@ -12,7 +12,6 @@ import shortuuid
 from fastapi.routing import APIRoute
 from loguru import logger
 from packaging import version
-from pydantic.schema import field_schema
 from starlette.templating import Jinja2Templates

 from lnbits.settings import settings
@@ -71,7 +70,7 @@ def template_renderer(additional_folders: list | None = None) -> Jinja2Templates
    # used in base.html
    t.env.globals["SITE_TITLE"] = settings.lnbits_site_title
    t.env.globals["LNBITS_APPLE_TOUCH_ICON"] = settings.lnbits_apple_touch_icon
-    t.env.globals["SETTINGS"] = settings.to_public().dict(by_alias=True)
+    t.env.globals["SETTINGS"] = settings.to_public().model_dump(by_alias=True)
    t.env.globals["CURRENCIES"] = list(currencies.keys())

    if settings.bundle_assets:
@@ -127,23 +126,26 @@ def generate_filter_params_openapi(model: type[FilterModel], keep_optional=False
    :param keep_optional: If false, all parameters will be optional,
    otherwise inferred from model
    """
-    fields = list(model.__fields__.values())
+    schema = model.model_json_schema()
+    properties = schema.get("properties", {})
+    required = set(schema.get("required", []))
    params = []
-    for field in fields:
-        schema, _, _ = field_schema(field, model_name_map={})
+    for field_name, field in model.model_fields.items():
+        field_key = field.alias or field_name
+        field_schema = properties.get(field_key, {})

        description = "Supports Filtering"
        if (
            hasattr(model, "__search_fields__")
-            and field.name in model.__search_fields__
+            and field_name in model.__search_fields__
        ):
            description += ". Supports Search"

        parameter = {
-            "name": field.alias,
+            "name": field_key,
            "in": "query",
-            "required": field.required if keep_optional else False,
-            "schema": schema,
+            "required": field_key in required if keep_optional else False,
+            "schema": field_schema,
            "description": description,
        }
        params.append(parameter)
@@ -1,78 +0,0 @@
-"""Generate llms.txt markdown from FastAPI OpenAPI schema for AI agents."""
-
-from typing import Any
-
-from fastapi import FastAPI
-from fastapi.responses import PlainTextResponse
-
-
-def generate_llms_txt(app: FastAPI) -> str:
-    """Convert an OpenAPI schema to llms.txt markdown format."""
-    openapi_schema = app.openapi()
-    lines: list[str] = []
-
-    # H1: API Title
-    info = openapi_schema.get("info", {})
-    title = info.get("title", "API")
-    lines.append(f"# {title}")
-    lines.append("")
-
-    # Blockquote: Description
-    description = info.get("description")
-    if description:
-        for line in description.strip().split("\n"):
-            lines.append(f"> {line}")
-        lines.append("")
-
-    # Group endpoints by tag
-    paths = openapi_schema.get("paths", {})
-    endpoints_by_tag: dict[str, list[dict[str, Any]]] = {}
-
-    for path, path_item in paths.items():
-        for method in ["get", "post", "put", "patch", "delete", "head", "options"]:
-            if method not in path_item:
-                continue
-            operation = path_item[method]
-            tags = operation.get("tags", ["Endpoints"])
-            tag = tags[0] if tags else "Endpoints"
-            if tag not in endpoints_by_tag:
-                endpoints_by_tag[tag] = []
-            endpoints_by_tag[tag].append(
-                {
-                    "path": path,
-                    "method": method.upper(),
-                    "operation": operation,
-                }
-            )
-
-    # Generate sections by tag
-    for tag, endpoints in endpoints_by_tag.items():
-        lines.append(f"## {tag}")
-        lines.append("")
-        for endpoint in endpoints:
-            method = endpoint["method"]
-            path = endpoint["path"]
-            operation = endpoint["operation"]
-            summary = operation.get("summary", "")
-            if summary:
-                lines.append(f"### `{method} {path}` - {summary}")
-            else:
-                lines.append(f"### `{method} {path}`")
-            lines.append("")
-        lines.append("")
-
-    return "\n".join(lines).strip() + "\n"
-
-
-def create_llms_txt_route(app: FastAPI) -> None:
-    """Add a /llms.txt endpoint to the app."""
-
-    @app.get(
-        "/llms.txt",
-        response_class=PlainTextResponse,
-        include_in_schema=False,
-        summary="Get LLM-friendly API documentation",
-    )
-    async def get_llms_txt() -> str:
-        """Return the API documentation in llms.txt markdown format."""
-        return generate_llms_txt(app)
@@ -7,7 +7,6 @@ from typing import Any
 from fastapi import FastAPI, Request, Response
 from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
 from loguru import logger
-from pyinstrument import Profiler
 from slowapi import _rate_limit_exceeded_handler
 from slowapi.errors import RateLimitExceeded
 from slowapi.middleware import SlowAPIMiddleware
@@ -247,16 +246,3 @@ def add_first_install_middleware(app: FastAPI):
        ):
            return RedirectResponse("/first_install")
        return await call_next(request)
-
-
-def add_profiler_middleware(app: FastAPI):
-    @app.middleware("http")
-    async def profile_middleware(request: Request, call_next):
-        profiling = request.query_params.get("profiler", False)
-        if profiling:
-            profiler = Profiler(async_mode="enabled")
-            profiler.start()
-            _ = await call_next(request)
-            profiler.stop()
-            return HTMLResponse(profiler.output_html())
-        return await call_next(request)
@@ -364,7 +364,7 @@ class LndRestNode(Node):
        fee_report = await self.get("/v1/fees")
        balance = await self.get("/v1/balance/channels")
        return NodeInfoResponse(
-            **public.dict(),
+            **public.model_dump(),
            onchain_balance_sat=onchain["total_balance"],
            onchain_confirmed_sat=onchain["confirmed_balance"],
            balance_msat=balance["local_balance"]["msat"],
@@ -2,7 +2,6 @@ from __future__ import annotations

 import importlib
 import importlib.metadata
-import inspect
 import json
 import os
 import re
@@ -11,11 +10,12 @@ from enum import Enum
 from os import path
 from pathlib import Path
 from time import gmtime, strftime, time
-from typing import Any
+from typing import Any, get_args, get_origin
 from uuid import uuid4

+from dotenv import dotenv_values
 from loguru import logger
-from pydantic import BaseModel, BaseSettings, Extra, Field, validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator


 def list_parse_fallback(v: str):
@@ -29,6 +29,89 @@ def list_parse_fallback(v: str):
        return []


+def _remove_env_names(schema: dict[str, Any]) -> None:
+    for prop in schema.get("properties", {}).values():
+        prop.pop("env_names", None)
+
+
+def _iter_validation_aliases(validation_alias: Any) -> list[str]:
+    if isinstance(validation_alias, str):
+        return [validation_alias]
+
+    choices = getattr(validation_alias, "choices", None)
+    if not choices:
+        return []
+
+    return [choice for choice in choices if isinstance(choice, str)]
+
+
+def _annotation_has_origin(annotation: Any, origins: tuple[type, ...]) -> bool:
+    origin = get_origin(annotation)
+    if origin in origins:
+        return True
+
+    return any(_annotation_has_origin(arg, origins) for arg in get_args(annotation))
+
+
+def _parse_settings_value(value: Any, annotation: Any) -> Any:
+    if not isinstance(value, str):
+        return value
+
+    stripped_value = value.strip()
+
+    if stripped_value.startswith("[") or stripped_value.startswith("{"):
+        return json.loads(stripped_value)
+
+    if _annotation_has_origin(annotation, (list, set, tuple)):
+        return list_parse_fallback(value)
+
+    return value
+
+
+class LNbitsBaseSettings(BaseModel):
+    def __init__(self, **data):
+        super().__init__(**{**self._settings_data(), **data})
+
+    @classmethod
+    def _settings_data(cls) -> dict[str, Any]:
+        env_file = cls.model_config.get("env_file")
+        env_file_encoding = cls.model_config.get("env_file_encoding")
+        case_sensitive = bool(cls.model_config.get("case_sensitive", False))
+
+        raw_values: dict[str, Any] = {}
+        if env_file:
+            dotenv_items = dotenv_values(env_file, encoding=env_file_encoding)
+            raw_values.update(
+                {key: value for key, value in dotenv_items.items() if value is not None}
+            )
+        raw_values.update(os.environ)
+
+        lookup_values = (
+            raw_values
+            if case_sensitive
+            else {str(key).lower(): value for key, value in raw_values.items()}
+        )
+
+        settings_values: dict[str, Any] = {}
+        for field_name, field in cls.model_fields.items():
+            lookup_keys = _iter_validation_aliases(field.validation_alias)
+            if field.alias and field.alias != field_name:
+                lookup_keys.append(field.alias)
+            lookup_keys.append(field_name)
+
+            for key in lookup_keys:
+                lookup_key = key if case_sensitive else key.lower()
+                if lookup_key not in lookup_values:
+                    continue
+
+                settings_values[field_name] = _parse_settings_value(
+                    lookup_values[lookup_key], field.annotation
+                )
+                break
+
+        return settings_values
+
+
 class LNbitsSettings(BaseModel):
    @classmethod
    def validate_list(cls, val):
@@ -284,7 +367,7 @@ class ThemesSettings(LNbitsSettings):
    lnbits_custom_image: str | None = Field(default="/static/images/logos/lnbits.svg")
    lnbits_ad_space_title: str = Field(default="Supported by")
    lnbits_ad_space: str = Field(
-        default="https://shop.lnbits.com/;/static/images/bitcoin-shop-banner.png;/static/images/bitcoin-shop-banner.png,https://affil.trezor.io/aff_c?offer_id=169&aff_id=33845;/static/images/bitcoin-hardware-wallet.png;/static/images/bitcoin-hardware-wallet.png,https://firefish.io/?ref=lnbits;/static/images/firefish.png;/static/images/firefish.png"
+        default="https://shop.lnbits.com/;/static/images/bitcoin-shop-banner.png;/static/images/bitcoin-shop-banner.png,https://affil.trezor.io/aff_c?offer_id=169&aff_id=33845;/static/images/bitcoin-hardware-wallet.png;/static/images/bitcoin-hardware-wallet.png,https://firefish.io/?ref=lnbits;/static/images/firefish.png;/static/images/firefish.png,https://opensats.org/;/static/images/open-sats.png;/static/images/open-sats.png"
    )  # sneaky sneaky
    lnbits_ad_space_enabled: bool = Field(default=False)
    lnbits_allowed_currencies: list[str] = Field(default=[])
@@ -300,7 +383,6 @@ class ThemesSettings(LNbitsSettings):
    lnbits_default_card_rounded: bool = Field(default=True)
    lnbits_default_card_gradient: bool = Field(default=True)
    lnbits_default_card_shadow: bool = Field(default=False)
-    lnbits_default_burger_menu_background: bool = Field(default=True)


 class OpsSettings(LNbitsSettings):
@@ -324,6 +406,10 @@ class AssetSettings(LNbitsSettings):
            "heic",
            "heif",
            "heics",
+            "text/plain",
+            "text/jsontext/xml",
+            "application/json",
+            "application/pdf",
        ]
    )
    lnbits_asset_thumbnail_width: int = Field(default=128, ge=0)
@@ -359,11 +445,9 @@ class FeeSettings(LNbitsSettings):


 class ExchangeProvidersSettings(LNbitsSettings):
-    lnbits_exchange_rate_cache_seconds: int = Field(default=60, ge=0)
+    lnbits_exchange_rate_cache_seconds: int = Field(default=30, ge=0)
    lnbits_exchange_history_size: int = Field(default=60, ge=0)
    lnbits_exchange_history_refresh_interval_seconds: int = Field(default=300, ge=0)
-    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=[
@@ -446,7 +530,6 @@ class SecuritySettings(LNbitsSettings):

    lnbits_max_outgoing_payment_amount_sats: int = Field(default=10_000_000, ge=0)
    lnbits_max_incoming_payment_amount_sats: int = Field(default=10_000_000, ge=0)
-    first_install_token_confirmed: str | None = Field(default=None)

    def is_wallet_max_balance_exceeded(self, amount):
        return (
@@ -587,9 +670,6 @@ class ZBDFundingSource(LNbitsSettings):
 class PhoenixdFundingSource(LNbitsSettings):
    phoenixd_api_endpoint: str | None = Field(default="http://localhost:9740/")
    phoenixd_api_password: str | None = Field(default=None)
-    phoenixd_data_dir: str | None = Field(default=None)
-    phoenixd_mnemonic: str | None = Field(default=None)
-    phoenixd_mnemonic_backup_confirmed: bool = Field(default=False)


 class AlbyFundingSource(LNbitsSettings):
@@ -614,7 +694,6 @@ class SparkL2FundingSource(LNbitsSettings):
    spark_l2_external_endpoint: str | None = Field(default="http://localhost:8765")
    spark_l2_external_api_key: str | None = Field(default=None)
    spark_l2_mnemonic: str | None = Field(default=None)
-    spark_l2_mnemonic_backup_confirmed: bool = Field(default=False)
    spark_l2_pay_wait_ms: int = Field(default=4000, ge=0)
    spark_l2_pay_poll_ms: int = Field(default=500, ge=0)
    spark_l2_stream_keepalive_ms: int = Field(default=15000, ge=0)
@@ -652,14 +731,13 @@ class BoltzFundingSource(LNbitsSettings):
    boltz_client_password: str = Field(default="")
    boltz_client_cert: str | None = Field(default=None)
    boltz_mnemonic: str | None = Field(default=None)
-    boltz_mnemonic_backup_confirmed: bool = Field(default=False)


 class StrikeFundingSource(LNbitsSettings):
    strike_api_endpoint: str | None = Field(
-        default="https://api.strike.me/v1", env="STRIKE_API_ENDPOINT"
+        default="https://api.strike.me/v1", validation_alias="STRIKE_API_ENDPOINT"
    )
-    strike_api_key: str | None = Field(default=None, env="STRIKE_API_KEY")
+    strike_api_key: str | None = Field(default=None, validation_alias="STRIKE_API_KEY")


 class FiatProviderLimits(BaseModel):
@@ -704,35 +782,6 @@ class PayPalFiatProvider(LNbitsSettings):
    paypal_limits: FiatProviderLimits = Field(default_factory=FiatProviderLimits)


-class SquareFiatProvider(LNbitsSettings):
-    square_enabled: bool = Field(default=False)
-    square_api_endpoint: str = Field(default="https://connect.squareup.com")
-    square_access_token: str | None = Field(default=None)
-    square_location_id: str | None = Field(default=None)
-    square_api_version: str = Field(default="2026-01-22")
-    square_payment_success_url: str = Field(default="https://lnbits.com")
-    square_payment_webhook_url: str = Field(
-        default="https://your-lnbits-domain-here.com/api/v1/callback/square"
-    )
-    square_webhook_signature_key: str | None = Field(default=None)
-
-    square_limits: FiatProviderLimits = Field(default_factory=FiatProviderLimits)
-
-
-class RevolutFiatProvider(LNbitsSettings):
-    revolut_enabled: bool = Field(default=False)
-    revolut_api_endpoint: str = Field(default="https://merchant.revolut.com")
-    revolut_api_secret_key: str | None = Field(default=None)
-    revolut_api_version: str = Field(default="2026-04-20")
-    revolut_payment_success_url: str = Field(default="https://lnbits.com")
-    revolut_payment_webhook_url: str = Field(
-        default="https://your-lnbits-domain-here.com/api/v1/callback/revolut"
-    )
-    revolut_webhook_signing_secret: str | None = Field(default=None)
-
-    revolut_limits: FiatProviderLimits = Field(default_factory=FiatProviderLimits)
-
-
 class LightningSettings(LNbitsSettings):
    lightning_invoice_expiry: int = Field(default=3600, gt=0)

@@ -770,12 +819,7 @@ class FundingSourcesSettings(
    funding_source_max_retries: int = Field(default=4, ge=0)


-class FiatProvidersSettings(
-    StripeFiatProvider,
-    PayPalFiatProvider,
-    SquareFiatProvider,
-    RevolutFiatProvider,
-):
+class FiatProvidersSettings(StripeFiatProvider, PayPalFiatProvider):
    def is_fiat_provider_enabled(self, provider: str | None) -> bool:
        """
        Checks if a specific fiat provider is enabled.
@@ -786,10 +830,6 @@ class FiatProvidersSettings(
            return self.stripe_enabled
        if provider == "paypal":
            return self.paypal_enabled
-        if provider == "square":
-            return self.square_enabled
-        if provider == "revolut":
-            return self.revolut_enabled
        return False

    def get_fiat_providers_for_user(self, user_id: str) -> list[str]:
@@ -809,18 +849,6 @@ class FiatProvidersSettings(
        ):
            allowed_providers.append("paypal")

-        if self.square_enabled and (
-            not self.square_limits.allowed_users
-            or user_id in self.square_limits.allowed_users
-        ):
-            allowed_providers.append("square")
-
-        if self.revolut_enabled and (
-            not self.revolut_limits.allowed_users
-            or user_id in self.revolut_limits.allowed_users
-        ):
-            allowed_providers.append("revolut")
-
        return allowed_providers

    def get_fiat_provider_limits(self, provider_name: str) -> FiatProviderLimits | None:
@@ -1026,12 +1054,12 @@ class EditableSettings(
    KeycloakAuthSettings,
    OidcAuthSettings,
 ):
-    @validator(
+    @field_validator(
        "lnbits_admin_users",
        "lnbits_allowed_users",
        "lnbits_theme_options",
        "lnbits_admin_extensions",
-        pre=True,
+        mode="before",
    )
    @classmethod
    def validate_editable_settings(cls, val):
@@ -1039,29 +1067,29 @@ class EditableSettings(

    @classmethod
    def from_dict(cls, d: dict):
-        return cls(
-            **{k: v for k, v in d.items() if k in inspect.signature(cls).parameters}
-        )
+        return cls(**{k: v for k, v in d.items() if k in cls.model_fields})

-    # fixes openapi.json validation, remove field env_names
-    class Config:
-        @staticmethod
-        def schema_extra(schema: dict[str, Any]) -> None:
-            for prop in schema.get("properties", {}).values():
-                prop.pop("env_names", None)
+    # Fixes openapi.json validation by removing the v1-only env_names metadata.
+    model_config = ConfigDict(
+        populate_by_name=True,
+        json_schema_extra=_remove_env_names,
+    )


 class UpdateSettings(EditableSettings):
-    class Config(EditableSettings.Config):
-        extra = Extra.forbid
+    model_config = ConfigDict(
+        populate_by_name=True,
+        extra="forbid",
+        json_schema_extra=_remove_env_names,
+    )


 class EnvSettings(LNbitsSettings):
    debug: bool = Field(default=False)
    debug_database: bool = Field(default=False)
    bundle_assets: bool = Field(default=True)
-    profiler: bool = Field(default=False)
    # When enabled, auth cookies require HTTPS and SSO will reject insecure HTTP.
+    # Set to false for local/dev environments that run without TLS.
    auth_https_only: bool = Field(default=True)
    host: str = Field(default="127.0.0.1")
    port: int = Field(default=5000, gt=0)
@@ -1080,20 +1108,11 @@ class EnvSettings(LNbitsSettings):

    cleanup_wallets_days: int = Field(default=90, ge=0)
    funding_source_max_retries: int = Field(default=4, ge=0)
-    lnbits_max_users: int = Field(default=0, ge=0)
-    lnbits_max_extensions: int = Field(default=0, ge=0)

    @property
    def has_default_extension_path(self) -> bool:
        return self.lnbits_extensions_path == "lnbits"

-    def has_first_install_token_changed(self) -> bool:
-        if not self.first_install_token:
-            return False
-        if not settings.first_install_token_confirmed:
-            return False
-        return self.first_install_token != settings.first_install_token_confirmed
-
    def check_auth_secret_key(self):
        if self.auth_secret_key:
            return
@@ -1174,7 +1193,7 @@ class TransientSettings(InstalledExtensionsSettings, ExchangeHistorySettings):

    @classmethod
    def readonly_fields(cls):
-        return [f for f in inspect.signature(cls).parameters if not f.startswith("_")]
+        return [f for f in cls.model_fields if not f.startswith("_")]


 class ReadOnlySettings(
@@ -1189,9 +1208,9 @@ class ReadOnlySettings(
    def lnbits_extensions_upgrade_path(self) -> str:
        return str(Path(self.lnbits_data_folder, "upgrades"))

-    @validator(
+    @field_validator(
        "lnbits_allowed_funding_sources",
-        pre=True,
+        mode="before",
    )
    @classmethod
    def validate_readonly_settings(cls, val):
@@ -1199,15 +1218,18 @@ class ReadOnlySettings(

    @classmethod
    def readonly_fields(cls):
-        return [f for f in inspect.signature(cls).parameters if not f.startswith("_")]
+        return [f for f in cls.model_fields if not f.startswith("_")]


-class Settings(EditableSettings, ReadOnlySettings, TransientSettings, BaseSettings):
-    class Config(EditableSettings.Config, BaseSettings.Config):  # type: ignore[misc]
-        env_file = ".env"
-        env_file_encoding = "utf-8"
-        case_sensitive = False
-        json_loads = list_parse_fallback  # type: ignore[assignment]
+class Settings(
+    EditableSettings, ReadOnlySettings, TransientSettings, LNbitsBaseSettings
+):
+    model_config = ConfigDict(
+        populate_by_name=True,
+        env_file=".env",
+        env_file_encoding="utf-8",
+        case_sensitive=False,
+    )

    def is_user_allowed(self, user_id: str) -> bool:
        return (
@@ -1287,7 +1309,6 @@ class PublicSettings(BaseModel):
    default_card_rounded: bool = Field(alias="defaultCardRounded")
    default_card_gradient: bool = Field(alias="defaultCardGradient")
    default_card_shadow: bool = Field(alias="defaultCardShadow")
-    default_burger_menu_background: bool = Field(alias="defaultBurgerMenuBackground")
    denomination: str | None = Field()
    extensions: list[str] = Field()
    allowed_currencies: list[str] = Field(alias="allowedCurrencies")
@@ -1351,7 +1372,6 @@ class PublicSettings(BaseModel):
            defaultCardRounded=settings.lnbits_default_card_rounded,
            defaultCardGradient=settings.lnbits_default_card_gradient,
            defaultCardShadow=settings.lnbits_default_card_shadow,
-            defaultBurgerMenuBackground=settings.lnbits_default_burger_menu_background,
            denomination=settings.lnbits_denomination,
            extensions=list(settings.lnbits_installed_extensions_ids),
            allowedCurrencies=settings.lnbits_allowed_currencies,
@@ -1414,7 +1434,7 @@ if not settings.user_agent:
 # printing environment variable for debugging
 if not settings.lnbits_admin_ui:
    logger.debug("Environment Settings:")
-    for key, value in settings.dict(exclude_none=True).items():
+    for key, value in settings.model_dump(exclude_none=True).items():
        logger.debug(f"{key}: {value}")


@@ -212,15 +212,12 @@ body.bg-image .q-page-container {
  backdrop-filter: none; /* Ensure the page content is not affected */
 }

-body.body--dark .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-  --q-dark: rgba(29, 29, 29, 0.3);
-  background-color: var(--q-dark);
-}
+body.body--dark .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark),
 body.body--dark .q-header,
 body.body--dark .q-drawer {
  --q-dark: rgba(29, 29, 29, 0.3);
  background-color: var(--q-dark);
-  backdrop-filter: brightness(0.8);
+  backdrop-filter: blur(6px) brightness(0.8);
 }

 body.rounded-ui .q-card,
@@ -391,18 +388,11 @@ body[data-theme=salvador].card-gradient.body--dark .q-drawer {
 }

 body.card-shadow .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-  box-shadow: 0 10px 24px rgba(0, 0, 0, 0.18);
+  filter: drop-shadow(0 10px 24px rgba(0, 0, 0, 0.18));
 }

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

 :root {
@@ -184,7 +184,6 @@ window.localisation.en = {
  release_notes: 'Release Notes',
  activate_extension_details: 'Make extension available/unavailable for users',
  featured: 'Featured',
-  categories: 'Categories',
  all: 'All',
  only_admins_can_install: '(Only admin accounts can install extensions)',
  only_admins_can_create_extensions:
@@ -268,15 +267,6 @@ window.localisation.en = {
  webhook_events_list: 'The following events must be supported by the webhook:',
  webhook_stripe_description:
    'One the stripe side you must configure a webhook with a URL that points to your LNbits server.',
-  webhook_square_description:
-    'On the Square side configure a webhook pointing to this exact LNbits URL.',
-  square_webhook_url_hint:
-    'Must exactly match the Square notification URL. LNbits requires the /api/v1/callback/square path.',
-  access_token: 'Access Token',
-  location_id: 'Location ID',
-  square_location_id_hint:
-    'Square location ID to create payment links for. Use the endpoint to select sandbox or production.',
-  api_version: 'API Version',
  payment_proof: 'Payment Proof',
  update: 'Update',
  update_available: 'Update {version} available!',
@@ -285,8 +275,6 @@ window.localisation.en = {
  requires_server_restart:
    'Changing these settings requires a server restart to take effect.',
  funding_source_info: 'Select the active funding wallet',
-  phoenixd_warning:
-    "Phoenixd mnemonic is only available if phoenixd data-dir is specified and is readable by LNbits. It's not indicative of phoenixd not running. It just means LNbits cannot access the mnemonic to display it here.",
  latest_update: 'You are on the latest version {version}.',
  notifications: 'Notifications',
  notifications_configure: 'Configure Notifications',
@@ -491,8 +479,6 @@ window.localisation.en = {
  toggle_card_gradient: 'Toggle gradient on cards',
  card_shadow: 'Card Shadow',
  toggle_card_shadow: 'Toggle shadow on cards',
-  burger_menu_background: 'Burger Menu Background',
-  toggle_burger_menu_background: 'Toggle burger menu background',
  language: 'Language',
  assets: 'Assets',
  max_asset_size_mb: 'Max Asset Size (MB)',
@@ -817,8 +803,6 @@ window.localisation.en = {
  webhook_id_hint: 'PayPal webhook ID used to verify incoming events.',
  webhook_paypal_description:
    'On the PayPal side configure a webhook pointing to your LNbits server.',
-  square_webhook_signature_key_hint:
-    'Square webhook signature key used to verify incoming events.',
  callback_success_url: 'Callback Success URL',
  callback_success_url_hint:
    'The user will be redirected to this URL after the payment is successful',
@@ -59,7 +59,7 @@ window.LNbits = {
        newWallet.canSendPayments = perms.includes('send-payments')
      }
      newWallet.url = `/wallet?&wal=${data.id}`
-      newWallet.storedPaylinks = data.stored_paylinks.links
+      newWallet.storedPaylinks = data.stored_paylinks?.links
      return newWallet
    }
  }
@@ -452,9 +452,7 @@ window.app.component('username-password', {
      confirmationMethod: 'code',
      confirmationEmail: '',
      confirmationCode: this.invitationCode || '',
-      showConfirmationCode: false,
-      showPwd: false,
-      showPwdRepeat: false
+      showConfirmationCode: false
    }
  },
  methods: {
@@ -62,6 +62,12 @@ 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 => {
@@ -121,21 +127,18 @@ 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_price_aggregator_enabled
-        ? [{name: 'Aggregator'}]
-        : [...this.formData.lnbits_exchange_rate_providers, {name: 'LNbits'}]
+      const exchanges = [
+        ...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 : 2,
+        borderWidth: exchange.name === 'LNbits' ? 4 : 1,
        tension: 0.4
      }))
      this.exchangeRatesChart = new Chart(
@@ -145,11 +148,7 @@ window.app.component('lnbits-admin-exchange-providers', {
          options: {
            plugins: {
              legend: {
-                display: true
-              },
-              title: {
-                display: true,
-                text: 'Bitcoin Price History'
+                display: false
              }
            }
          },
@@ -5,9 +5,6 @@ window.app.component('lnbits-admin-fiat-providers', {
    return {
      formAddStripeUser: '',
      formAddPaypalUser: '',
-      formAddSquareUser: '',
-      formAddRevolutUser: '',
-      creatingRevolutWebhook: false,
      hideInputToggle: true
    }
  },
@@ -23,12 +20,6 @@ window.app.component('lnbits-admin-fiat-providers', {
        this.formData?.paypal_payment_webhook_url ||
        this.calculateWebhookUrl('paypal')
      )
-    },
-    revolutWebhookUrl() {
-      return (
-        this.formData?.revolut_payment_webhook_url ||
-        this.calculateWebhookUrl('revolut')
-      )
    }
  },
  watch: {
@@ -67,8 +58,6 @@ window.app.component('lnbits-admin-fiat-providers', {
    syncWebhookUrls() {
      this.maybeSetWebhookUrl('stripe_payment_webhook_url', 'stripe')
      this.maybeSetWebhookUrl('paypal_payment_webhook_url', 'paypal')
-      this.maybeSetWebhookUrl('square_payment_webhook_url', 'square')
-      this.maybeSetWebhookUrl('revolut_payment_webhook_url', 'revolut')
    },
    maybeSetWebhookUrl(fieldName, provider) {
      if (!this.formData) {
@@ -88,47 +77,6 @@ window.app.component('lnbits-admin-fiat-providers', {
      }
      this.copyText(url)
    },
-    isClearnetWebhookUrl(url) {
-      let parsedUrl
-      try {
-        parsedUrl = new URL(url)
-      } catch (e) {
-        return false
-      }
-
-      const host = parsedUrl.hostname.toLowerCase()
-      if (!['http:', 'https:'].includes(parsedUrl.protocol)) {
-        return false
-      }
-      if (
-        host === 'localhost' ||
-        host.endsWith('.localhost') ||
-        host.endsWith('.local') ||
-        host.endsWith('.onion')
-      ) {
-        return false
-      }
-      if (
-        /^127\./.test(host) ||
-        /^10\./.test(host) ||
-        /^192\.168\./.test(host) ||
-        /^169\.254\./.test(host) ||
-        /^172\.(1[6-9]|2\d|3[0-1])\./.test(host) ||
-        host === '0.0.0.0' ||
-        host === '::1'
-      ) {
-        return false
-      }
-      return true
-    },
-    notifyRevolutWebhookWarning(message) {
-      Quasar.Notify.create({
-        type: 'warning',
-        message,
-        icon: null,
-        closeBtn: true
-      })
-    },
    addStripeAllowedUser() {
      const addUser = this.formAddStripeUser || ''
      if (
@@ -163,40 +111,6 @@ window.app.component('lnbits-admin-fiat-providers', {
      this.formData.paypal_limits.allowed_users =
        this.formData.paypal_limits.allowed_users.filter(u => u !== user)
    },
-    addSquareAllowedUser() {
-      const addUser = this.formAddSquareUser || ''
-      if (
-        addUser.length &&
-        !this.formData.square_limits.allowed_users.includes(addUser)
-      ) {
-        this.formData.square_limits.allowed_users = [
-          ...this.formData.square_limits.allowed_users,
-          addUser
-        ]
-        this.formAddSquareUser = ''
-      }
-    },
-    removeSquareAllowedUser(user) {
-      this.formData.square_limits.allowed_users =
-        this.formData.square_limits.allowed_users.filter(u => u !== user)
-    },
-    addRevolutAllowedUser() {
-      const addUser = this.formAddRevolutUser || ''
-      if (
-        addUser.length &&
-        !this.formData.revolut_limits.allowed_users.includes(addUser)
-      ) {
-        this.formData.revolut_limits.allowed_users = [
-          ...this.formData.revolut_limits.allowed_users,
-          addUser
-        ]
-        this.formAddRevolutUser = ''
-      }
-    },
-    removeRevolutAllowedUser(user) {
-      this.formData.revolut_limits.allowed_users =
-        this.formData.revolut_limits.allowed_users.filter(u => u !== user)
-    },
    checkFiatProvider(providerName) {
      LNbits.api
        .request('PUT', `/api/v1/fiat/check/${providerName}`)
@@ -210,48 +124,6 @@ window.app.component('lnbits-admin-fiat-providers', {
          })
        })
        .catch(LNbits.utils.notifyApiError)
-    },
-    createRevolutWebhook() {
-      const webhookUrl = this.calculateWebhookUrl('revolut')
-      this.formData.revolut_payment_webhook_url = webhookUrl
-
-      if (!this.formData.revolut_api_secret_key) {
-        this.notifyRevolutWebhookWarning(
-          'Add your Revolut API secret key before creating a webhook.'
-        )
-        return
-      }
-      if (!this.isClearnetWebhookUrl(webhookUrl)) {
-        this.notifyRevolutWebhookWarning(
-          'Revolut webhook URL must be a clearnet URL.'
-        )
-        return
-      }
-
-      this.creatingRevolutWebhook = true
-      LNbits.api
-        .request('POST', '/api/v1/fiat/revolut/webhook', null, {
-          url: webhookUrl,
-          endpoint: this.formData.revolut_api_endpoint,
-          api_secret_key: this.formData.revolut_api_secret_key,
-          api_version: this.formData.revolut_api_version
-        })
-        .then(response => {
-          const data = response.data
-          this.formData.revolut_payment_webhook_url = data.url
-          this.formData.revolut_webhook_signing_secret = data.signing_secret
-          Quasar.Notify.create({
-            type: 'positive',
-            message: `Revolut webhook ${
-              data.already_exists ? 'already exists' : 'created'
-            }${data.id ? `: ${data.id}` : ''}.`,
-            icon: null
-          })
-        })
-        .catch(LNbits.utils.notifyApiError)
-        .finally(() => {
-          this.creatingRevolutWebhook = false
-        })
    }
  }
 })
@@ -1,151 +0,0 @@
-window.app.component('lnbits-admin-funding-seed-backup', {
-  props: ['active', 'is-super-user', 'form-data', 'settings'],
-  template: '#lnbits-admin-funding-seed-backup',
-  data() {
-    return {
-      dialog: {
-        show: false,
-        step: 1,
-        seed: '',
-        visible: false,
-        challenge: [],
-        answers: {},
-        error: '',
-        confirmField: ''
-      }
-    }
-  },
-  watch: {
-    active(isActive) {
-      if (isActive) {
-        this.openIfRequired()
-      }
-    },
-    'formData.lnbits_backend_wallet_class'(walletClass, previousWalletClass) {
-      const source = this.seedBackupSource(walletClass)
-      if (previousWalletClass && source && this.formData[source.seedField]) {
-        this.formData[source.confirmField] = false
-      }
-      this.openIfRequired()
-    },
-    'formData.boltz_mnemonic'() {
-      this.formData.boltz_mnemonic_backup_confirmed =
-        this.formData.boltz_mnemonic === this.settings.boltz_mnemonic
-          ? this.settings.boltz_mnemonic_backup_confirmed
-          : false
-      this.openIfRequired()
-    },
-    'formData.phoenixd_mnemonic'() {
-      this.formData.phoenixd_mnemonic_backup_confirmed =
-        this.formData.phoenixd_mnemonic === this.settings.phoenixd_mnemonic
-          ? this.settings.phoenixd_mnemonic_backup_confirmed
-          : false
-      this.openIfRequired()
-    },
-    'formData.spark_l2_mnemonic'() {
-      this.formData.spark_l2_mnemonic_backup_confirmed =
-        this.formData.spark_l2_mnemonic === this.settings.spark_l2_mnemonic
-          ? this.settings.spark_l2_mnemonic_backup_confirmed
-          : false
-      this.openIfRequired()
-    }
-  },
-  computed: {
-    seedWords() {
-      return this.dialog.seed
-        .split(/\s+/)
-        .filter(Boolean)
-        .map((word, index) => ({index, word}))
-    }
-  },
-  created() {
-    this.openIfRequired()
-  },
-  methods: {
-    seedBackupSource(walletClass = this.formData.lnbits_backend_wallet_class) {
-      if (walletClass === 'BoltzWallet') {
-        return {
-          seedField: 'boltz_mnemonic',
-          confirmField: 'boltz_mnemonic_backup_confirmed'
-        }
-      }
-      if (walletClass === 'PhoenixdWallet') {
-        return {
-          seedField: 'phoenixd_mnemonic',
-          confirmField: 'phoenixd_mnemonic_backup_confirmed'
-        }
-      }
-      if (walletClass === 'SparkL2Wallet') {
-        return {
-          seedField: 'spark_l2_mnemonic',
-          confirmField: 'spark_l2_mnemonic_backup_confirmed'
-        }
-      }
-    },
-    openIfRequired() {
-      if (!this.active || !this.isSuperUser) return
-
-      const source = this.seedBackupSource()
-      if (!source) return
-
-      const seed = (this.formData[source.seedField] || '').trim()
-      const confirmed = this.formData[source.confirmField]
-      if (!seed || confirmed || this.dialog.show) return
-
-      this.dialog = {
-        show: true,
-        step: 1,
-        seed,
-        visible: false,
-        challenge: [],
-        answers: {},
-        error: '',
-        confirmField: source.confirmField
-      }
-    },
-    prepareChallenge() {
-      const words = this.dialog.seed.split(/\s+/).filter(Boolean)
-      const count = Math.min(4, words.length)
-      const indexes = _.shuffle([...Array(words.length).keys()]).slice(0, count)
-      this.dialog.challenge = indexes
-        .sort((a, b) => a - b)
-        .map(index => ({index, word: words[index]}))
-      this.dialog.answers = {}
-      this.dialog.error = ''
-      this.dialog.step = 2
-    },
-    submitChallenge() {
-      const isValid = this.dialog.challenge.every(({index, word}) => {
-        const answer = this.dialog.answers[index] || ''
-        return answer.trim().toLowerCase() === word.toLowerCase()
-      })
-      if (!isValid) {
-        this.dialog.error =
-          'One or more words are incorrect. Check your backup and try again.'
-        return
-      }
-
-      const field = this.dialog.confirmField
-      LNbits.api
-        .request(
-          'PATCH',
-          '/admin/api/v1/settings',
-          this.g.user.wallets[0].adminkey,
-          {
-            [field]: true
-          }
-        )
-        .then(() => {
-          this.formData[field] = true
-          this.settings[field] = true
-          this.dialog.show = false
-          Quasar.Notify.create({
-            type: 'positive',
-            message: 'Seed backup confirmed',
-            icon: 'check'
-          })
-        })
-        .catch(LNbits.utils.notifyApiError)
-    }
-  }
-})
@@ -202,18 +202,7 @@ window.app.component('lnbits-admin-funding-sources', {
          'Phoenixd',
          {
            phoenixd_api_endpoint: 'Endpoint',
-            phoenixd_api_password: 'Key',
-            phoenixd_data_dir: {
-              label: 'Data Directory',
-              hint: 'Directory where phoenixd stores its data, including the seed phrase.'
-            },
-            phoenixd_mnemonic: {
-              label: 'Phoenixd Seed Phrase',
-              hint: 'Only available if phoenixd data-dir is specified',
-              readonly: true,
-              copy: true,
-              qrcode: true
-            }
+            phoenixd_api_password: 'Key'
          }
        ],
        [
@@ -1,5 +1,5 @@
 window.app.component('lnbits-admin-funding', {
-  props: ['active', 'is-super-user', 'form-data', 'settings'],
+  props: ['is-super-user', 'form-data', 'settings'],
  template: '#lnbits-admin-funding',
  data() {
    return {
@@ -41,37 +41,5 @@ window.app.component('lnbits-admin-site-customisation', {
      ]
    }
  },
-  methods: {
-    onBackgroundImageInput(e) {
-      const file = e.target.files[0]
-      if (file) {
-        this.uploadBackgroundImage(file)
-      }
-      e.target.value = null
-    },
-    async uploadBackgroundImage(file) {
-      const formData = new FormData()
-      formData.append('file', file)
-      try {
-        const {data} = await LNbits.api.request(
-          'POST',
-          '/api/v1/assets?public_asset=true',
-          null,
-          formData,
-          {
-            headers: {'Content-Type': 'multipart/form-data'}
-          }
-        )
-        const assetUrl = `${window.location.origin}/api/v1/assets/${data.id}/thumbnail`
-        this.formData.lnbits_default_bgimage = assetUrl
-        Quasar.Notify.create({
-          type: 'positive',
-          message: 'Background image uploaded.',
-          icon: null
-        })
-      } catch (e) {
-        LNbits.utils.notifyApiError(e)
-      }
-    }
-  }
+  methods: {}
 })
@@ -360,37 +360,18 @@ window.app.component('lnbits-payment-list', {
    paymentTableRowKey(row) {
      return row.payment_hash + row.amount
    },
-    async exportCSV(detailed = false) {
+    exportCSV(detailed = false) {
      // status is important for export but it is not in paymentsTable
      // because it is manually added with payment detail link and icons
      // and would cause duplication in the list
      const pagination = this.paymentsTable.pagination
-      const maxPages = 100
-      const limit = 1000
-      let payments = []
-
-      this.paymentsCSV.loading = true
-      try {
-        for (let page = 0; page < maxPages; page++) {
-          const query = {
-            sortby: pagination.sortBy ?? 'time',
-            direction: pagination.descending ? 'desc' : 'asc',
-            limit,
-            offset: page * limit
-          }
-          const params = new URLSearchParams(query)
-          const response = await LNbits.api.getPayments(this.wallet, params)
-          const pagePayments = response.data.data || []
-          payments = payments.concat(pagePayments.map(this.mapPayment))
-
-          if (
-            pagePayments.length < limit ||
-            payments.length >= response.data.total
-          ) {
-            break
-          }
-        }
-
+      const query = {
+        sortby: pagination.sortBy ?? 'time',
+        direction: pagination.descending ? 'desc' : 'asc'
+      }
+      const params = new URLSearchParams(query)
+      LNbits.api.getPayments(this.wallet, params).then(response => {
+        let payments = response.data.data.map(this.mapPayment)
        let columns = this.paymentsCSV.columns

        if (detailed) {
@@ -419,11 +400,7 @@ window.app.component('lnbits-payment-list', {
          payments,
          this.wallet.name + '-payments'
        )
-      } catch (err) {
-        LNbits.utils.notifyApiError(err)
-      } finally {
-        this.paymentsCSV.loading = false
-      }
+      })
    },
    addFilterTag() {
      if (!this.exportTagName) return
@@ -8,10 +8,6 @@ window.app.component('lnbits-qrcode-lnurl', {
    prefix: {
      type: String,
      default: 'lnurlp'
-    },
-    href: {
-      type: String,
-      default: ''
    }
  },
  data() {
@@ -25,10 +21,7 @@ window.app.component('lnbits-qrcode-lnurl', {
      if (this.tab == 'bech32') {
        const bytes = new TextEncoder().encode(this.url)
        const bech32 = NostrTools.nip19.encodeBytes('lnurl', bytes)
-        this.lnurl =
-          this.href && this.href.trim() !== ''
-            ? `${this.href}?lightning=${bech32.toUpperCase()}`
-            : `lightning:${bech32.toUpperCase()}`
+        this.lnurl = `lightning:${bech32.toUpperCase()}`
      } else if (this.tab == 'lud17') {
        if (this.url.startsWith('http://')) {
          this.lnurl = this.url.replace('http://', this.prefix + '://')
@@ -85,9 +85,6 @@ window.app.component('lnbits-qrcode', {
        event.preventDefault()
        event.stopPropagation()
        return false
-      } else if (this.href && this.href.startsWith('http')) {
-        window.open(this.href, '_blank')
-        event.preventDefault()
      }
    },
    async writeNfcTag() {
@@ -168,26 +165,5 @@ window.app.component('lnbits-qrcode', {
    this.$refs.qrCode.$el.style.maxWidth = this.maxWidth + 'px'
    this.$refs.qrCode.$el.setAttribute('width', '100%')
    this.$refs.qrCode.$el.removeAttribute('height')
-  },
-  computed: {
-    optimizedValue() {
-      const separatorIndex = this.value.indexOf(':')
-      const type =
-        separatorIndex === -1 ? '' : this.value.substring(0, separatorIndex)
-      const value =
-        separatorIndex === -1
-          ? this.value
-          : this.value.substring(separatorIndex + 1)
-
-      if (this.utils.isValidBech32(value)) {
-        const normalizedValue = value.toUpperCase()
-        if (type) {
-          return `${type.toUpperCase()}:${normalizedValue}`
-        }
-        return normalizedValue
-      }
-
-      return this.value
-    }
  }
 })
@@ -69,14 +69,6 @@ window.app.component('lnbits-theme', {
        document.body.classList.remove('card-shadow')
      }
    },
-    'g.burgerMenuChoice'(val) {
-      this.$q.localStorage.set('lnbits.burgerMenu', val)
-      if (val === true) {
-        document.body.classList.remove('no-burger-background')
-      } else {
-        document.body.classList.add('no-burger-background')
-      }
-    },
    'g.mobileSimple'(val) {
      this.$q.localStorage.set('lnbits.mobileSimple', val)
      if (val === true) {
@@ -158,9 +150,6 @@ window.app.component('lnbits-theme', {
    if (this.g.cardShadowChoice === true) {
      document.body.classList.add('card-shadow')
    }
-    if (this.g.burgerMenuChoice !== true) {
-      document.body.classList.add('no-burger-background')
-    }
    if (this.g.bgimageChoice !== '') {
      document.body.classList.add('bg-image')
      document.body.style.setProperty(
@@ -1,17 +1,16 @@
 function eventReaction(amount) {
  localUrl = ''
-  const reaction =
-    Quasar.LocalStorage.getItem('lnbits.reactions') || SETTINGS.defaultReaction
-  if (!reaction || reaction.toLowerCase() === 'none') {
+  reaction = localStorage.getItem('lnbits.reactions')
+  if (!reaction || reaction === 'None') {
    return
  }
-
  try {
    if (amount < 0) {
      return
    }
-    if (typeof window[reaction] === 'function') {
-      window[reaction]()
+    reaction = localStorage.getItem('lnbits.reactions')
+    if (reaction) {
+      window[reaction.split('|')[1]]()
    }
  } catch (e) {
    console.log(e)
@@ -29,10 +29,6 @@ window.g = Vue.reactive({
    SETTINGS.defaultCardGradient
  ),
  cardShadowChoice: localStore('lnbits.cardShadow', SETTINGS.defaultCardShadow),
-  burgerMenuChoice: localStore(
-    'lnbits.burgerMenu',
-    SETTINGS.defaultBurgerMenuBackground
-  ),
  reactionChoice: localStore('lnbits.reactions', SETTINGS.defaultReaction),
  bgimageChoice: localStore(
    'lnbits.backgroundImage',
@@ -27,14 +27,6 @@ const DynamicComponent = {
            name: r.name,
            component: async () => {
              await LNbits.utils.loadTemplate(r.template)
-              if (r.i18n) {
-                const locale =
-                  window.i18n?.global?.locale?.value ??
-                  window.i18n?.global?.locale ??
-                  window.g.locale ??
-                  'en'
-                await LNbits.utils.loadExtI18n(r.i18n, locale)
-              }
              await LNbits.utils.loadScript(r.component)
              return window[r.name]
            }
@@ -159,30 +151,6 @@ window.i18n = new VueI18n.createI18n({
  fallbackLocale: 'en',
  messages: window.localisation
 })
-;(function () {
-  let _applying = false
-  let _target = null
-  Vue.watch(
-    () => window.i18n.global.locale,
-    async (locale, prevLocale) => {
-      if (_applying || !LNbits.utils._extI18nDirs.size) return
-      _target = locale
-      _applying = true
-      window.i18n.global.locale = prevLocale
-      _applying = false
-      await Promise.all(
-        [...LNbits.utils._extI18nDirs].map(dir =>
-          LNbits.utils.loadExtI18n(dir, locale)
-        )
-      )
-      if (_target !== locale) return
-      _applying = true
-      window.i18n.global.locale = locale
-      _applying = false
-    },
-    {flush: 'sync'}
-  )
-})()

 window.app.mixin({
  data() {
@@ -545,56 +545,31 @@ window.PageAccount = {
      if (file) {
        this.uploadAsset(file)
      }
-      e.target.value = null
    },
-    onBackgroundImageInput(e) {
-      const file = e.target.files[0]
-      if (file) {
-        this.uploadBackgroundImage(file)
-      }
-      e.target.value = null
-    },
-    async uploadAsset(
-      file,
-      {isPublic = this.assetsUploadToPublic, notifySuccess = true} = {}
-    ) {
+    async uploadAsset(file) {
      const formData = new FormData()
      formData.append('file', file)
      try {
-        const {data} = await LNbits.api.request(
+        await LNbits.api.request(
          'POST',
-          `/api/v1/assets?public_asset=${isPublic}`,
+          `/api/v1/assets?public_asset=${this.assetsUploadToPublic}`,
          null,
          formData,
          {
            headers: {'Content-Type': 'multipart/form-data'}
          }
        )
-        if (notifySuccess) {
-          this.$q.notify({
-            type: 'positive',
-            message: 'Upload successful!',
-            icon: null
-          })
-        }
+        this.$q.notify({
+          type: 'positive',
+          message: 'Upload successful!',
+          icon: null
+        })
        await this.getUserAssets()
-        return data
      } catch (e) {
        console.warn(e)
        LNbits.utils.notifyApiError(e)
      }
    },
-    async uploadBackgroundImage(file) {
-      const asset = await this.uploadAsset(file, {
-        isPublic: false,
-        notifySuccess: false
-      })
-      if (!asset) {
-        return
-      }
-      const assetUrl = `${window.location.origin}/api/v1/assets/${asset.id}/thumbnail`
-      await this.siteCustomisationChanged({bgimageChoice: assetUrl})
-    },
    async deleteAsset(asset) {
      LNbits.utils
        .confirmDialog('Are you sure you want to delete this asset?')
@@ -732,8 +707,7 @@ window.PageAccount = {
        darkChoice: this.g.settings.defaultDark,
        cardRoundedChoice: this.g.settings.defaultCardRounded,
        cardGradientChoice: this.g.settings.defaultCardGradient,
-        cardShadowChoice: this.g.settings.defaultCardShadow,
-        burgerMenuChoice: this.g.settings.defaultBurgerMenuBackground
+        cardShadowChoice: this.g.settings.defaultCardShadow
      }
      this.siteCustomisationChanged(defaults)
    }
@@ -10,7 +10,6 @@ window.PageExtensions = {
      tab: 'installed',
      manageExtensionTab: 'releases',
      filteredExtensions: [],
-      categories: new Set(),
      updatableExtensions: [],
      showUninstallDialog: false,
      showManageExtensionDialog: false,
@@ -107,10 +106,6 @@ window.PageExtensions = {
        }
      }

-      const isCategoryTab = !['installed', 'all', 'featured'].includes(tab)
-      const isInSelectedCategory = extension =>
-        extension.categories?.includes(tab) ?? false
-
      this.filteredExtensions = this.extensions
        .filter(e => (tab === 'all' ? !e.isInstalled : true))
        .filter(e => (tab === 'installed' ? e.isInstalled : true))
@@ -118,7 +113,6 @@ window.PageExtensions = {
          tab === 'installed' ? (e.isActive ? true : !!this.g.user.admin) : true
        )
        .filter(e => (tab === 'featured' ? e.isFeatured : true))
-        .filter(e => (isCategoryTab ? isInSelectedCategory(e) : true))
        .filter(extensionNameContains(term))
        .map(e => ({
          ...e,
@@ -838,9 +832,6 @@ window.PageExtensions = {
    async fetchAllExtensions() {
      try {
        const {data} = await LNbits.api.request('GET', `/api/v1/extension/all`)
-        data.forEach(ext => {
-          ext.categories?.forEach(category => this.categories.add(category))
-        })
        return data
      } catch (error) {
        console.warn(error)
@@ -21,7 +21,7 @@ window.PageHome = {
      return (
        this.lnurl !== '' &&
        this.g.settings.allowRegister &&
-        this.g.settings.authMethods.includes('user-id-only')
+        'user-id-only' in this.g.settings.authMethods
      )
    },
    formatDescription() {
@@ -223,12 +223,6 @@ window.PageWallet = {
          if (data.tag === 'payRequest') {
            this.parse.lnurlpay = Object.freeze(data)
            this.parse.data.amount = data.minSendable / 1000
-            this.receive.units = [
-              'sats',
-              ...(this.g.allowedCurrencies.length > 0
-                ? this.g.allowedCurrencies
-                : this.g.currencies)
-            ]
          } else if (data.tag === 'login') {
            this.parse.lnurlauth = Object.freeze(data)
          } else if (data.tag === 'withdrawRequest') {
@@ -160,46 +160,6 @@ window._lnbitsUtils = {
      return null
    }
  },
-  isValidBech32(value) {
-    if (typeof value !== 'string') {
-      return false
-    }
-
-    const candidate = value.trim()
-    if (
-      !candidate ||
-      (candidate !== candidate.toLowerCase() &&
-        candidate !== candidate.toUpperCase())
-    ) {
-      return false
-    }
-
-    const normalized = candidate.toLowerCase()
-    const splitPosition = normalized.lastIndexOf('1')
-    if (splitPosition <= 0) {
-      return false
-    }
-
-    const humanReadablePart = normalized.substring(0, splitPosition)
-    const data = normalized.substring(splitPosition + 1)
-    if (data.length < 6) {
-      return false
-    }
-
-    if (
-      typeof bech32ToFiveBitArray !== 'function' ||
-      typeof verify_checksum !== 'function'
-    ) {
-      return false
-    }
-
-    const words = bech32ToFiveBitArray(data)
-    if (words.some(word => word < 0)) {
-      return false
-    }
-
-    return verify_checksum(humanReadablePart, words)
-  },
  async notifyApiError(error) {
    if (!error.response) {
      return console.error(error)
@@ -323,20 +283,6 @@ window._lnbitsUtils = {
    converter.setOption('simpleLineBreaks', true)
    return converter.makeHtml(text)
  },
-  _extI18nDirs: new Set(),
-  _extI18nLoaded: {},
-  loadExtI18n(dir, locale) {
-    this._extI18nDirs.add(dir)
-    const loaded = (this._extI18nLoaded[dir] ??= {})
-    if (loaded[locale]) return loaded[locale]
-    loaded[locale] = this.loadScript(`${dir}/${locale}.js`).catch(() => {
-      if (locale !== 'en') {
-        loaded['en'] ??= this.loadScript(`${dir}/en.js`).catch(() => {})
-        return loaded['en']
-      }
-    })
-    return loaded[locale]
-  },
  async decryptLnurlPayAES(success_action, preimage) {
    let keyb = new Uint8Array(
      preimage.match(/[\da-f]{2}/gi).map(h => parseInt(h, 16))
@@ -58,15 +58,11 @@ body.bg-image {
 }
 // transparent background for specific elements
 body.body--dark {
-  .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-    --q-dark: #{color.adjust(#1d1d1d, $alpha: -0.7)};
-    background-color: var(--q-dark);
-  }
-
+  .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark),
  .q-header,
  .q-drawer {
    --q-dark: #{color.adjust(#1d1d1d, $alpha: -0.7)};
    background-color: var(--q-dark);
-    backdrop-filter: brightness(0.8);
+    backdrop-filter: blur(6px) brightness(0.8);
  }
 }
@@ -61,21 +61,12 @@ body.rounded-ui {

 body.card-shadow {
  .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-    box-shadow: 0 10px 24px rgba(0, 0, 0, 0.18);
+    filter: drop-shadow(0 10px 24px rgba(0, 0, 0, 0.18));
  }
 }

 body.card-shadow.body--dark {
  .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-    box-shadow: 0 12px 28px rgba(0, 0, 0, 0.45);
-  }
-}
-
-body.no-burger-background {
-  .q-drawer {
-    background-color: transparent !important;
-    background-image: none !important;
-    backdrop-filter: none !important;
-    box-shadow: none !important;
+    filter: drop-shadow(0 12px 28px rgba(0, 0, 0, 0.45));
  }
 }
@@ -58,7 +58,6 @@
    "js/pages/users.js",
    "js/pages/account.js",
    "js/pages/admin.js",
-    "js/components/admin/lnbits-admin-funding-seed-backup.js",
    "js/components/admin/lnbits-admin-funding.js",
    "js/components/admin/lnbits-admin-funding-sources.js",
    "js/components/admin/lnbits-admin-fiat-providers.js",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dni ⚡	bc7e3d4dc8	fifi	2026-03-25 11:29:03 +01:00
dni ⚡	034ba44241	manual testing works	2026-03-25 11:14:53 +01:00
dni ⚡	b0b8ea95f2	2nd stage draft pydantic	2026-03-25 10:47:13 +01:00
dni ⚡	261350243f	stage2 update fastapi	2026-03-25 10:23:35 +01:00
dni ⚡	ed02802ad6	stage one moving to last fastapi version supporting `pydantic.v1`	2026-03-25 09:39:22 +01:00