rc5

revert fiat amounts :(
refactor: just refactor (#2740 )
2024-10-18 09:10:55 +02:00 · 2024-10-18 09:08:00 +02:00 · 2024-10-18 08:45:08 +02:00 · 2024-10-17 11:48:42 +02:00 · 2024-10-17 11:45:23 +02:00 · 2024-10-17 10:43:05 +02:00
239 changed files with 53602 additions and 19637 deletions
@@ -3,12 +3,14 @@ data
 docker
 docs
 tests
+node_modules

 lnbits/static/css/*
 lnbits/static/bundle.js
 lnbits/static/bundle.css

 *.md
+!README.md
 *.log

 .env
@@ -9,13 +9,13 @@
 # configurations defined in `ReadOnlySettings` will still be read from the environment variables.
 # The rest of the settings will be stored in your database and you will be able to change them
 # only  through the Admin UI.
-# Disable this to make LNbits use this config file again.
-LNBITS_ADMIN_UI=false
+# Disable this and clear `settings` table from database to make LNbits use this config file again.
+LNBITS_ADMIN_UI=true

 # Change theme
 LNBITS_SITE_TITLE="LNbits"
 LNBITS_SITE_TAGLINE="free and open-source lightning wallet"
-LNBITS_SITE_DESCRIPTION="Some description about your service, will display if title is not 'LNbits'"
+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"
 # LNBITS_CUSTOM_LOGO="https://lnbits.com/assets/images/logo/logo.svg"
@@ -28,12 +28,15 @@ PORT=5000
 ######################################

 # which fundingsources are allowed in the admin ui
-LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, AlbyWallet, ZBDWallet, OpenNodeWallet"
+# LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, BlinkWallet, AlbyWallet, ZBDWallet, PhoenixdWallet, OpenNodeWallet, NWCWallet, BreezSdkWallet, BoltzWallet"

 LNBITS_BACKEND_WALLET_CLASS=VoidWallet
 # VoidWallet is just a fallback that works without any actual Lightning capabilities,
 # just so you can see the UI before dealing with this file.

+# How many times to retry connectiong to the Funding Source before defaulting to the VoidWallet
+# FUNDING_SOURCE_MAX_RETRIES=4
+
 # Invoice expiry for LND, CLN, Eclair, LNbits funding sources
 LIGHTNING_INVOICE_EXPIRY=3600

@@ -55,7 +58,7 @@ CORELIGHTNING_REST_MACAROON="/path/to/clnrest/access.macaroon"  # or BASE64/HEXS
 CORELIGHTNING_REST_CERT="/path/to/clnrest/tls.cert"

 # LnbitsWallet
-LNBITS_ENDPOINT=https://legend.lnbits.com
+LNBITS_ENDPOINT=https://demo.lnbits.com
 LNBITS_KEY=LNBITS_ADMIN_KEY

 # LndWallet
@@ -84,10 +87,25 @@ LNPAY_WALLET_KEY=LNPAY_ADMIN_KEY
 ALBY_API_ENDPOINT=https://api.getalby.com/
 ALBY_ACCESS_TOKEN=ALBY_ACCESS_TOKEN

+# BoltzWallet
+BOLTZ_CLIENT_ENDPOINT=127.0.0.1:9002
+BOLTZ_CLIENT_MACAROON="/home/bob/.boltz/macaroon" # or HEXSTRING
+BOLTZ_CLIENT_CERT="/home/bob/.boltz/tls.cert" # or HEXSTRING
+BOLTZ_CLIENT_WALLET="lnbits"
+
 # ZBDWallet
 ZBD_API_ENDPOINT=https://api.zebedee.io/v0/
 ZBD_API_KEY=ZBD_ACCESS_TOKEN

+# BlinkWallet
+BLINK_API_ENDPOINT=https://api.blink.sv/graphql
+BLINK_WS_ENDPOINT=wss://ws.blink.sv/graphql
+BLINK_TOKEN=BLINK_TOKEN
+
+# PhoenixdWallet
+PHOENIXD_API_ENDPOINT=http://localhost:9740/
+PHOENIXD_API_PASSWORD=PHOENIXD_KEY
+
 # OpenNodeWallet
 OPENNODE_API_ENDPOINT=https://api.opennode.com/
 OPENNODE_KEY=OPENNODE_ADMIN_KEY
@@ -100,18 +118,29 @@ LNBITS_DENOMINATION=sats
 ECLAIR_URL=http://127.0.0.1:8283
 ECLAIR_PASS=eclairpw

+# NWCWalllet
+NWC_PAIRING_URL="nostr+walletconnect://000...000?relay=example.com&secret=123"
+
 # LnTipsWallet
 # Enter /api in LightningTipBot to get your key
 LNTIPS_API_KEY=LNTIPS_ADMIN_KEY
 LNTIPS_API_ENDPOINT=https://ln.tips

+# BreezSdkWallet
+BREEZ_API_KEY=KEY
+BREEZ_GREENLIGHT_SEED=SEED
+# A Greenlight invite code or Greenlight partner certificate/key can be used
+BREEZ_GREENLIGHT_INVITE_CODE=CODE
+BREEZ_GREENLIGHT_DEVICE_KEY="/path/to/breezsdk/device.pem"  # or BASE64/HEXSTRING
+BREEZ_GREENLIGHT_DEVICE_CERT="/path/to/breezsdk/device.crt"  # or BASE64/HEXSTRING
+
 ######################################
 ####### Auth Configurations ##########
 ######################################
 # Secret Key: will default to the hash of the super user. It is strongly recommended that you set your own value.
 AUTH_SECRET_KEY=""
 AUTH_TOKEN_EXPIRE_MINUTES=525600
-# Possible authorization methods: user-id-only, username-password, google-auth, github-auth, keycloak-auth
+# Possible authorization methods: user-id-only, username-password, nostr-auth-nip98, google-auth, github-auth, keycloak-auth
 AUTH_ALLOWED_METHODS="user-id-only, username-password"
 # Set this flag if HTTP is used for OAuth
 # OAUTHLIB_INSECURE_TRANSPORT="1"
@@ -155,6 +184,8 @@ LNBITS_ADMIN_USERS=""

 # Extensions only admin can access
 LNBITS_ADMIN_EXTENSIONS="ngrok, admin"
+# Extensions enabled by default when a user is created
+LNBITS_USER_DEFAULT_EXTENSIONS="lnurlp"

 # Start LNbits core only. The extensions are not loaded.
 # LNBITS_EXTENSIONS_DEACTIVATE_ALL=true
@@ -175,6 +206,9 @@ LNBITS_DEFAULT_WALLET_NAME="LNbits wallet"
 # LNBITS_AD_SPACE_TITLE="Supported by"
 # csv ad space, format "<url>;<img-light>;<img-dark>, <url>;<img-light>;<img-dark>", extensions can choose to honor
 # LNBITS_AD_SPACE="https://shop.lnbits.com/;https://raw.githubusercontent.com/lnbits/lnbits/main/lnbits/static/images/lnbits-shop-light.png;https://raw.githubusercontent.com/lnbits/lnbits/main/lnbits/static/images/lnbits-shop-dark.png"
+# LNBITS_SHOW_HOME_PAGE_ELEMENTS=true # if set to true, the ad space will be displayed on the home page
+# LNBITS_CUSTOM_BADGE="USE WITH CAUTION - LNbits wallet is still in BETA"
+# LNBITS_CUSTOM_BADGE_COLOR="warning"

 # Hides wallet api, extensions can choose to honor
 LNBITS_HIDE_API=false
@@ -1 +1 @@
-custom: https://legend.lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK
+custom: https://demo.lnbits.com/lnurlp/link/fH59GD
@@ -46,7 +46,10 @@ runs:

    - name: Install the project dependencies
      shell: bash
-      run: poetry install
+      run: |
+        poetry install
+        # needed for conv tests
+        poetry add psycopg2-binary

    - name: Use Node.js ${{ inputs.node-version }}
      if: ${{ (inputs.npm == 'true') }}
@@ -12,7 +12,7 @@ jobs:
  lint:
    uses: ./.github/workflows/lint.yml

-  tests:
+  test-api:
    needs: [ lint ]
    strategy:
      matrix:
@@ -20,6 +20,35 @@ jobs:
        db-url: ["", "postgres://lnbits:lnbits@0.0.0.0:5432/lnbits"]
    uses: ./.github/workflows/tests.yml
    with:
+      custom-pytest: "poetry run pytest tests/api"
+      python-version: ${{ matrix.python-version }}
+      db-url: ${{ matrix.db-url }}
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  test-wallets:
+    needs: [ lint ]
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10"]
+        db-url: ["", "postgres://lnbits:lnbits@0.0.0.0:5432/lnbits"]
+    uses: ./.github/workflows/tests.yml
+    with:
+      custom-pytest: "poetry run pytest tests/wallets"
+      python-version: ${{ matrix.python-version }}
+      db-url: ${{ matrix.db-url }}
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  test-unit:
+    needs: [ lint ]
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10"]
+        db-url: ["", "postgres://lnbits:lnbits@0.0.0.0:5432/lnbits"]
+    uses: ./.github/workflows/tests.yml
+    with:
+      custom-pytest: "poetry run pytest tests/unit"
      python-version: ${{ matrix.python-version }}
      db-url: ${{ matrix.db-url }}
    secrets:
@@ -48,6 +77,7 @@ jobs:
        python-version: ["3.9"]
        backend-wallet-class: ["LndRestWallet", "LndWallet", "CoreLightningWallet", "CoreLightningRestWallet", "LNbitsWallet", "EclairWallet"]
    with:
+      custom-pytest: "poetry run pytest tests/regtest"
      python-version: ${{ matrix.python-version }}
      backend-wallet-class: ${{ matrix.backend-wallet-class }}
    secrets:
@@ -26,7 +26,7 @@ jobs:
    runs-on: ${{ matrix.os-version }}
    steps:
      - uses: actions/checkout@v4
-      - uses: ./.github/actions/prepare
+      - uses: lnbits/lnbits/.github/actions/prepare@dev
        with:
          python-version: ${{ inputs.python-version }}
          node-version: ${{ matrix.node-version }}
@@ -28,11 +28,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v24
+      - uses: cachix/install-nix-action@v27
        with:
-          nix_path: nixpkgs=channel:nixos-23.11
-      - uses: cachix/cachix-action@v13
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/cachix'
+          nix_path: nixpkgs=channel:nixos-24.05
+      - uses: cachix/cachix-action@v15
        with:
          name: lnbits
          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -3,8 +3,9 @@ name: regtest
 on:
  workflow_call:
    inputs:
-      make:
-        default: test
+      custom-pytest:
+        description: "Custom pytest arguments"
+        required: true
        type: string
      python-version:
        default: "3.9"
@@ -26,19 +27,10 @@ jobs:
    steps:
      - uses: actions/checkout@v4

-      - name: Set up Docker Buildx
+      - name: docker build
        if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push
-        if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
-        uses: docker/build-push-action@v5
-        with:
-            context: .
-            push: false
-            tags: lnbits/lnbits:latest
-            cache-from: type=registry,ref=lnbits/lnbits:latest
-            cache-to: type=inline
+        run: |
+          docker build -t lnbits/lnbits .

      - name: Setup Regtest
        run: |
@@ -52,10 +44,6 @@ jobs:
        with:
          python-version: ${{ inputs.python-version }}

-      - name: Create fake admin
-        if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
-        run: docker exec lnbits-lnbits-1 poetry run python tools/create_fake_admin.py
-
      - name: Run pytest
        uses: pavelzw/pytest-action@v2
        env:
@@ -76,15 +64,14 @@ jobs:
          LNBITS_KEY: "d08a3313322a4514af75d488bcc27eee"
          ECLAIR_URL: http://127.0.0.1:8082
          ECLAIR_PASS: lnbits
-          LNBITS_DATA_FOLDER: "./tests/data"
          PYTHONUNBUFFERED: 1
          DEBUG: true
        with:
-          verbose: false
+          verbose: true
          job-summary: true
          emoji: false
-          click-to-expand: false
-          custom-pytest: poetry run pytest
+          click-to-expand: true
+          custom-pytest: ${{ inputs.custom-pytest }}
          report-title: "regtest (${{ inputs.python-version }}, ${{ inputs.backend-wallet-class }}"

      - name: Upload coverage to Codecov
@@ -93,3 +80,8 @@ jobs:
          file: ./coverage.xml
          token: ${{ secrets.CODECOV_TOKEN }}
          verbose: true
+
+      - name: docker lnbits logs
+        if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
+        run: |
+          docker logs lnbits-lnbits-1
@@ -0,0 +1,32 @@
+name: release-rc
+
+on:
+  push:
+    tags:
+      - "*-rc[0-9]"
+
+permissions:
+  contents: write
+
+jobs:
+
+  docker:
+    uses: ./.github/workflows/docker.yml
+    with:
+      tag: ${{ github.ref_name }}
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+
+  pypi:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install dependencies for building secp256k1
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential automake libtool libffi-dev libgmp-dev
+      - uses: actions/checkout@v4
+      - name: Build and publish to pypi
+        uses: JRubics/poetry-publish@v1.15
+        with:
+          pypi_token: ${{ secrets.PYPI_API_KEY }}
@@ -10,6 +10,7 @@ permissions:
  contents: write

 jobs:
+
  release:
    runs-on: ubuntu-latest
    steps:
@@ -29,3 +30,25 @@ jobs:
    secrets:
      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+
+  docker-latest:
+    needs: [ release ]
+    uses: ./.github/workflows/docker.yml
+    with:
+      tag: latest
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+
+  pypi:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install dependencies for building secp256k1
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential automake libtool libffi-dev libgmp-dev
+      - uses: actions/checkout@v4
+      - name: Build and publish to pypi
+        uses: JRubics/poetry-publish@v1.15
+        with:
+          pypi_token: ${{ secrets.PYPI_API_KEY }}
@@ -3,6 +3,10 @@ name: tests
 on:
  workflow_call:
    inputs:
+      custom-pytest:
+        description: "Custom pytest arguments"
+        required: true
+        type: string
      python-version:
        default: "3.9"
        type: string
@@ -50,16 +54,14 @@ jobs:
        env:
          LNBITS_DATABASE_URL: ${{ inputs.db-url }}
          LNBITS_BACKEND_WALLET_CLASS: FakeWallet
-          FAKE_WALLET_SECRET: "ToTheMoon1"
-          LNBITS_DATA_FOLDER: "./tests/data"
          PYTHONUNBUFFERED: 1
          DEBUG: true
        with:
-          verbose: false
+          verbose: true
          job-summary: true
          emoji: false
-          click-to-expand: false
-          custom-pytest: poetry run pytest
+          click-to-expand: true
+          custom-pytest: ${{ inputs.custom-pytest }}
          report-title: "test (${{ inputs.python-version }}, ${{ inputs.db-url }})"

      - name: Upload coverage to Codecov
@@ -35,6 +35,7 @@ __bundle__
 coverage.xml
 node_modules
 lnbits/static/bundle.js
+lnbits/static/bundle-components.js
 lnbits/static/bundle.css
 lnbits/static/bundle.min.js.old
 lnbits/static/bundle.min.css.old
@@ -49,5 +50,11 @@ fly.toml
 lnbits-backup.zip

 # Ignore extensions (post installable extension PR)
-extensions
-upgrades/
+/lnbits/extensions
+/upgrades/
+
+# builded python package
+dist
+
+# jetbrains
+.idea
@@ -23,7 +23,7 @@ repos:
      - id: ruff
        args: [ --fix, --exit-non-zero-on-fix ]
  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: '50c5478ed9e10bf360335449280cf2a67f4edb7a'
+    rev: "v4.0.0-alpha.8"
    hooks:
      - id: prettier
        types_or: [css, javascript, html, json]
@@ -10,4 +10,9 @@

 **/lnbits/static/vendor
 **/lnbits/static/bundle.*
+**/lnbits/static/bundle-components.*
 **/lnbits/static/css/*
+
+flake.lock
+
+.venv
@@ -1,4 +1,4 @@
-FROM python:3.10-slim-bullseye
+FROM python:3.10-slim-bookworm AS builder

 RUN apt-get clean
 RUN apt-get update
@@ -7,18 +7,44 @@ RUN apt-get install -y curl pkg-config build-essential libnss-myhostname
 RUN curl -sSL https://install.python-poetry.org | python3 -
 ENV PATH="/root/.local/bin:$PATH"

+WORKDIR /app
+
+# Only copy the files required to install the dependencies
+COPY pyproject.toml poetry.lock ./
+
+RUN mkdir data
+
+ENV POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_IN_PROJECT=1 \
+    POETRY_VIRTUALENVS_CREATE=1 \
+    POETRY_CACHE_DIR=/tmp/poetry_cache
+
+RUN poetry install --only main
+
+FROM python:3.10-slim-bookworm
+
 # needed for backups postgresql-client version 14 (pg_dump)
-RUN apt-get install -y apt-utils wget
-RUN echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list
-RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-RUN apt-get update
-RUN apt-get install -y postgresql-client-14
+RUN apt-get update && apt-get -y upgrade && \
+    apt-get -y install gnupg2 curl lsb-release && \
+    sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
+    curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
+    apt-get update && \
+    apt-get -y install postgresql-client-14 postgresql-client-common && \
+    apt-get clean all && rm -rf /var/lib/apt/lists/*
+
+RUN curl -sSL https://install.python-poetry.org | python3 -
+ENV PATH="/root/.local/bin:$PATH"
+
+ENV POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_IN_PROJECT=1 \
+    POETRY_VIRTUALENVS_CREATE=1 \
+    VIRTUAL_ENV=/app/.venv \
+    PATH="/app/.venv/bin:$PATH"

 WORKDIR /app

 COPY . .
-
-RUN mkdir data
+COPY --from=builder /app/.venv .venv

 RUN poetry install --only main

@@ -6,8 +6,10 @@ format: prettier black ruff

 check: mypy pyright checkblack checkruff checkprettier checkbundle

+test: test-unit test-wallets test-api test-regtest
+
 prettier:
-	poetry run ./node_modules/.bin/prettier --write lnbits
+	poetry run ./node_modules/.bin/prettier --write .

 pyright:
 	poetry run ./node_modules/.bin/pyright
@@ -25,7 +27,7 @@ checkruff:
 	poetry run ruff check .

 checkprettier:
-	poetry run ./node_modules/.bin/prettier --check lnbits
+	poetry run ./node_modules/.bin/prettier --check .

 checkblack:
 	poetry run black --check .
@@ -36,23 +38,39 @@ checkeditorconfig:
 dev:
 	poetry run lnbits --reload

-test:
-	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
-	FAKE_WALLET_SECRET="ToTheMoon1" \
-	LNBITS_DATA_FOLDER="./tests/data" \
-	PYTHONUNBUFFERED=1 \
-	DEBUG=true \
-	poetry run pytest
+docker:
+	docker build -t lnbits/lnbits .

-test-real-wallet:
+test-wallets:
+	LNBITS_DATA_FOLDER="./tests/data" \
+	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
+	PYTHONUNBUFFERED=1 \
+	DEBUG=true \
+	poetry run pytest tests/wallets
+
+test-unit:
+	LNBITS_DATA_FOLDER="./tests/data" \
+	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
+	PYTHONUNBUFFERED=1 \
+	DEBUG=true \
+	poetry run pytest tests/unit
+
+test-api:
+	LNBITS_DATA_FOLDER="./tests/data" \
+	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
+	PYTHONUNBUFFERED=1 \
+	DEBUG=true \
+	poetry run pytest tests/api
+
+test-regtest:
 	LNBITS_DATA_FOLDER="./tests/data" \
 	PYTHONUNBUFFERED=1 \
 	DEBUG=true \
-	poetry run pytest
+	poetry run pytest tests/regtest

 test-migration:
 	LNBITS_ADMIN_UI=True \
-	make test
+	make test-api
 	HOST=0.0.0.0 \
 	PORT=5002 \
 	LNBITS_DATA_FOLDER="./tests/data" \
@@ -69,6 +87,7 @@ migration:
 	poetry run python tools/conv.py

 openapi:
+	LNBITS_ADMIN_UI=False \
 	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
 	LNBITS_DATA_FOLDER="./tests/data" \
 	PYTHONUNBUFFERED=1 \
@@ -88,24 +107,21 @@ sass:

 bundle:
 	npm install
-	npm run sass
-	npm run vendor_copy
-	npm run vendor_json
+	npm run bundle
 	poetry run ./node_modules/.bin/prettier -w ./lnbits/static/vendor.json
-	npm run vendor_bundle_css
-	npm run vendor_minify_css
-	npm run vendor_bundle_js
-	npm run vendor_minify_js

 checkbundle:
 	cp lnbits/static/bundle.min.js lnbits/static/bundle.min.js.old
 	cp lnbits/static/bundle.min.css lnbits/static/bundle.min.css.old
+	cp lnbits/static/bundle-components.min.js lnbits/static/bundle-components.min.js.old
 	make bundle
 	diff -q lnbits/static/bundle.min.js lnbits/static/bundle.min.js.old || exit 1
 	diff -q lnbits/static/bundle.min.css lnbits/static/bundle.min.css.old || exit 1
+	diff -q lnbits/static/bundle-components.min.js lnbits/static/bundle-components.min.js.old || exit 1
 	@echo "Bundle is OK"
 	rm lnbits/static/bundle.min.js.old
 	rm lnbits/static/bundle.min.css.old
+	rm lnbits/static/bundle-components.min.js.old

 install-pre-commit-hook:
 	@echo "Installing pre-commit hook to git"
@@ -1,22 +1,16 @@
-
 <picture >
  <source media="(prefers-color-scheme: dark)" srcset="https://i.imgur.com/QE6SIrs.png"  style="width:300px">
  <img src="https://i.imgur.com/fyKPgVT.png" style="width:300px">
 </picture>

-<b>(BETA)</b> 
-
-[![license-badge]](LICENSE) [![docs-badge]][docs]
-
+![phase: beta](https://img.shields.io/badge/phase-beta-C41E3A) [![license-badge]](LICENSE) [![docs-badge]][docs] ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-08A04B) [<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)
 ![Lightning network wallet](https://i.imgur.com/DeIiO0y.png)

 # The world's most powerful suite of bitcoin tools.

-## Run for yourself, for others, or as part of a stack. 
+## Run for yourself, for others, or as part of a stack.

-(Join us on [https://t.me/lnbits](https://t.me/lnbits))
-
-LNbits is beta, for responsible disclosure of any concerns please contact an admin in [https://t.me/lnbits](https://t.me/lnbits)
+LNbits is beta, for responsible disclosure of any concerns please contact an admin in the community chat.

 LNbits is a Python server that sits on top of any funding source. It can be used as:

@@ -36,7 +30,7 @@ LNbits is inspired by all the great work of [opennode.com](https://www.opennode.

 ## Running LNbits

-Test on our demo server [legend.lnbits.com](https://legend.lnbits.com), or on [lnbits.com](https://lnbits.com) software as a service, where you can spin up an LNbits instance for 21sats per hr.
+Test on our demo server [demo.lnbits.com](https://demo.lnbits.com), or on [lnbits.com](https://lnbits.com) software as a service, where you can spin up an LNbits instance for 21sats per hr.

 See the [install guide](https://github.com/lnbits/lnbits/blob/main/docs/guide/installation.md) for details on installation and setup.

@@ -50,7 +44,7 @@ LNbits is packaged with tools to help manage funds, such as a table of transacti

 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. 
+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 src="https://i.imgur.com/aEBpwJF.png" style="width:800px">

@@ -74,7 +68,7 @@ As well as working great in a browser, LNbits has native IoS and Android apps as

 ## Tip us

-If you like this project [send some tip love](https://legend.lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK)!
+If you like this project [send some tip love](https://demo.lnbits.com/lnurlp/link/fH59GD)!

 [docs]: https://github.com/lnbits/lnbits/wiki
 [docs-badge]: https://img.shields.io/badge/docs-lnbits.org-673ab7.svg
@@ -5,8 +5,6 @@ title: API reference
 nav_order: 3
 ---

+# API reference

-API reference
-=============
-
-[Swagger Docs](https://legend.lnbits.com/docs)
+[Swagger Docs](https://demo.lnbits.com/docs)
@@ -5,30 +5,39 @@ nav_order: 4
 has_children: true
 ---

-
-For developers
-==============
+# For developers

 Thanks for contributing :)

+# Run

-Run
-=====
+Follow the [Basic installation: Option 1 (recommended): poetry](https://docs.lnbits.org/guide/installation.html#option-1-recommended-poetry)
+guide to install poetry and other dependencies.
+
+Then you can start LNbits uvicorn server with:

-This starts the lnbits uvicorn server
 ```bash
 poetry run lnbits
 ```

-This starts the lnbits uvicorn with hot reloading.
+Or you can use the following to start uvicorn with hot reloading enabled:
+
 ```bash
 make dev
 # or
 poetry run lnbits --reload
 ```

-Precommit hooks
-=====
+You might need the following extra dependencies on clean installation of Debian:
+
+```
+sudo apt install nodejs
+sudo apt install npm
+npm install
+sudo apt-get install autoconf libtool libpg-dev
+```
+
+# Precommit hooks

 This ensures that all commits adhere to the formatting and linting rules.

@@ -36,31 +45,35 @@ This ensures that all commits adhere to the formatting and linting rules.
 make install-pre-commit-hook
 ```

-Tests
-=====
+# Tests

 This project has unit tests that help prevent regressions. Before you can run the tests, you must install a few dependencies:
+
 ```bash
 poetry install
 npm i
 ```

 Then to run the tests:
+
 ```bash
 make test
 ```

 Run formatting:
+
 ```bash
 make format
 ```

 Run mypy checks:
+
 ```bash
 poetry run mypy
 ```

 Run everything:
+
 ```bash
 make all
 ```
@@ -5,11 +5,10 @@ title: Making extensions
 nav_order: 2
 ---

-
-Extension set up
-=================
+# Extension set up

 Start off by creating a fork of the [example extension](https://github.com/lnbits/example) into own GitHub repository and rename the repository to `mysuperplugin`:
+
 ```sh
 cd [my-working-folder]
 git clone https://github.com/[my-user-name]/mysuperplugin.git --depth=1 # Let's not use dashes or anything; it doesn't like those.
@@ -18,6 +17,7 @@ rm -rf .git/
 find . -type f -print0 | xargs -0 sed -i 's/example/mysuperplugin/g' # Change all occurrences of 'example' to your plugin name 'mysuperplugin'.
 mv templates/example templates/mysuperplugin # Rename templates folder.
 ```
+
 - if you are on macOS and having difficulty with 'sed', consider `brew install gnu-sed` and use 'gsed', without -0 option after xargs.

 1. Edit `manifest.json` and change the organisation name to your GitHub username.
@@ -30,17 +30,15 @@ mv templates/example templates/mysuperplugin # Rename templates folder.
 1. ...
 1. Profit!!!

-Extension structure explained
-----------------------------
-* views_api.py: This is where your public API would go. It will be exposed at "$DOMAIN/$PLUGIN/$ROUTE". For example: https://lnbits.com/mysuperplugin/api/v1/tools.
-* views.py: The `/` path will show up as your plugin's home page in lnbits' UI. Other pages you can define yourself. The `templates` folder should explain itself in relation to this.
-* migrations.py: Create database tables for your plugin. They'll be created automatically when you start lnbits.
+## Extension structure explained
+
+- views_api.py: This is where your public API would go. It will be exposed at "$DOMAIN/$PLUGIN/$ROUTE". For example: https://lnbits.com/mysuperplugin/api/v1/tools.
+- views.py: The `/` path will show up as your plugin's home page in lnbits' UI. Other pages you can define yourself. The `templates` folder should explain itself in relation to this.
+- migrations.py: Create database tables for your plugin. They'll be created automatically when you start lnbits.

 ... This document is a work-in-progress. Send pull requests if you get stuck, so others don't.

-
-Adding new dependencies
-----------------------
+## Adding new dependencies

 DO NOT ADD NEW DEPENDENCIES. Try to use the dependencies that are available in `pyproject.toml`. Getting the LNbits project to accept a new dependency is time consuming and uncertain, and may result in your extension NOT being made available to others.

@@ -53,9 +51,7 @@ $ poetry add <package>
 **But we need an extra step to make sure LNbits doesn't break in production.**
 Dependencies need to be added to `pyproject.toml`, then tested by running on `poetry` compatibility can be tested with `nix build .#checks.x86_64-linux.vmTest`.

-
-SQLite to PostgreSQL migration
-----------------------
+## SQLite to PostgreSQL migration

 LNbits currently supports SQLite and PostgreSQL databases. There is a migration script `tools/conv.py` that helps users migrate from SQLite to PostgreSQL. This script also copies all extension databases to the new backend.

@@ -64,22 +60,31 @@ LNbits currently supports SQLite and PostgreSQL databases. There is a migration
 `mock_data.zip` contains a few lines of sample SQLite data and is used in automated GitHub test to see whether your migration in `conv.py` works. Run your extension and save a few lines of data into a SQLite `your_extension.sqlite3` file. Unzip `tests/data/mock_data.zip`, add `your_extension.sqlite3`, updated `database.sqlite3` and zip it again. Add the updated `mock_data.zip` to your PR.

 ### running migration locally
+
 you will need a running postgres database

 #### create lnbits user for migration database
+
 ```console
 sudo su - postgres -c "psql -c 'CREATE ROLE lnbits LOGIN PASSWORD 'lnbits';'"
 ```
+
 #### create migration database
+
 ```console
 sudo su - postgres -c "psql -c 'CREATE DATABASE migration;'"
 ```
+
 #### run the migration
+
 ```console
 make test-migration
 ```
+
 sudo su - postgres -c "psql -c 'CREATE ROLE lnbits LOGIN PASSWORD 'lnbits';'"
+
 #### clean migration database afterwards, fails if you try again
+
 ```console
 sudo su - postgres -c "psql -c 'DROP DATABASE IF EXISTS migration;'"
 ```
@@ -1,29 +1,32 @@
 <html>
-    <head>
-        <!-- Load the latest Swagger UI code and style from npm using unpkg.com -->
-        <script src="https://unpkg.com/swagger-ui-dist@3/swagger-ui-bundle.js"></script>
-        <link rel="stylesheet" type="text/css" href="https://unpkg.com/swagger-ui-dist@3/swagger-ui.css"/>
-        <title>My New API</title>
-    </head>
-    <body>
-        <div id="swagger-ui"></div> <!-- Div to hold the UI component -->
-        <script>
-            window.onload = function () {
-                // Begin Swagger UI call region
-                const ui = SwaggerUIBundle({
-                    url: "https://legend.lnbits.com/openapi.json", //Location of Open API spec in the repo
-                    dom_id: '#swagger-ui',
-                    deepLinking: true,
-                    presets: [
-                        SwaggerUIBundle.presets.apis,
-                        SwaggerUIBundle.SwaggerUIStandalonePreset
-                    ],
-                    plugins: [
-                        SwaggerUIBundle.plugins.DownloadUrl
-                    ],
-                })
-                window.ui = ui
-            }
-        </script>
-    </body>
+  <head>
+    <!-- Load the latest Swagger UI code and style from npm using unpkg.com -->
+    <script src="https://unpkg.com/swagger-ui-dist@3/swagger-ui-bundle.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://unpkg.com/swagger-ui-dist@3/swagger-ui.css"
+    />
+    <title>My New API</title>
+  </head>
+  <body>
+    <div id="swagger-ui"></div>
+    <!-- Div to hold the UI component -->
+    <script>
+      window.onload = function () {
+        // Begin Swagger UI call region
+        const ui = SwaggerUIBundle({
+          url: 'https://demo.lnbits.com/openapi.json', //Location of Open API spec in the repo
+          dom_id: '#swagger-ui',
+          deepLinking: true,
+          presets: [
+            SwaggerUIBundle.presets.apis,
+            SwaggerUIBundle.SwaggerUIStandalonePreset
+          ],
+          plugins: [SwaggerUIBundle.plugins.DownloadUrl]
+        })
+        window.ui = ui
+      }
+    </script>
+  </body>
 </html>
@@ -5,14 +5,11 @@ title: Websockets
 nav_order: 2
 ---

-
-Websockets
-=================
+# Websockets

 `websockets` are a great way to add a two way instant data channel between server and client.

-LNbits has a useful in built websocket tool. With a websocket client connect to (obv change `somespecificid`) `wss://legend.lnbits.com/api/v1/ws/somespecificid` (you can use an online websocket tester). Now make a get to `https://legend.lnbits.com/api/v1/ws/somespecificid/somedata`. You can send data to that websocket by using `from lnbits.core.services import websocketUpdater` and the function `websocketUpdater("somespecificid", "somdata")`.
-
+LNbits has a useful in built websocket tool. With a websocket client connect to (obv change `somespecificid`) `wss://demo.lnbits.com/api/v1/ws/somespecificid` (you can use an online websocket tester). Now make a get to `https://demo.lnbits.com/api/v1/ws/somespecificid/somedata`. You can send data to that websocket by using `from lnbits.core.services import websocketUpdater` and the function `websocketUpdater("somespecificid", "somdata")`.

 Example vue-js function for listening to the websocket:

@@ -4,17 +4,15 @@ title: Admin UI
 nav_order: 4
 ---

+# Admin UI

-Admin UI
-========
 The LNbits Admin UI lets you change LNbits settings via the LNbits frontend.
 It is disabled by default and the first time you set the environment variable `LNBITS_ADMIN_UI=true`
 the settings are initialized and saved to the database and will be used from there as long the UI is enabled.
 From there on the settings from the database are used.

+# Super User

-Super User
-==========
 With the Admin UI we introduced the super user, it is created with the initialisation of the Admin UI and will be shown with a success message in the server logs.
 The super user has access to the server and can change settings that may crash the server and make it unresponsive via the frontend and api, like changing funding sources.

@@ -29,48 +27,52 @@ We also added a decorator for the API routes to check for super user.

 There is also the possibility of posting the super user via webhook to another service when it is created. you can look it up here https://github.com/lnbits/lnbits/blob/main/lnbits/settings.py `class SaaSSettings`

+# Admin Users

-Admin Users
-===========
 environment variable: `LNBITS_ADMIN_USERS`, comma-separated list of user ids
 Admin Users can change settings in the admin ui as well, with the exception of funding source settings, because they require e server restart and could potentially make the server inaccessible. Also they have access to all the extension defined in `LNBITS_ADMIN_EXTENSIONS`.

+# Allowed Users

-Allowed Users
-=============
 environment variable: `LNBITS_ALLOWED_USERS`, comma-separated list of user ids
 By defining this users, LNbits will no longer be usable by the public, only defined users and admins can then access the LNbits frontend.

 Setting this environment variable also disables account creation.
 Account creation can be also disabled by setting `LNBITS_ALLOW_NEW_ACCOUNTS=false`

+# How to activate

-How to activate
-=============
 ```
 $ sudo systemctl stop lnbits.service
-$ cd ~/lnbits-legend
+$ cd ~/lnbits
 $ sudo nano .env
 ```
+
 -> set: `LNBITS_ADMIN_UI=true`

 Now start LNbits once in the terminal window
+
 ```
 $ poetry run lnbits
 ```
+
 You can now `cat` the Super User ID:
+
 ```
 $ cat data/.super_user
 123de4bfdddddbbeb48c8bc8382fe123
 ```
+
 You can access your super user account at `/wallet?usr=super_user_id`. You just have to append it to your normal LNbits web domain.

-After that you will find the __`Admin` / `Manage Server`__ between `Wallets` and `Extensions`
+After that you will find the **`Admin` / `Manage Server`** between `Wallets` and `Extensions`

 Here you can design the interface, it has TOPUP to fill wallets and you can restrict access rights to extensions only for admins or generally deactivated for everyone. You can make users admins or set up Allowed Users if you want to restrict access. And of course the classic settings of the .env file, e.g. to change the funding source wallet or set a charge fee.

 Do not forget
+
 ```
 sudo systemctl start lnbits.service
 ```
+
 A little hint, if you set `RESET TO DEFAULTS`, then a new Super User Account will also be created. The old one is then no longer valid.
@@ -10,16 +10,16 @@ Go to `Manage Server` > `Server` > `Extensions Manifests`

 ![image](https://user-images.githubusercontent.com/2951406/213494038-e8152d8e-61f2-4cb7-8b5f-361fc3f9a31f.png)

-
 An `Extension Manifest` is a link to a `JSON` file which contains information about various extensions that can be installed (repository of extensions).
 Multiple repositories can be configured. For more information check the [Manifest File](https://github.com/lnbits/lnbits/blob/main/docs/guide/extension-install.md#manifest-file) section.

-
 **LNbits** administrators should configure their instances to use repositories that they trust (like the [lnbits-extensions](https://github.com/lnbits/lnbits-extensions/) one).
+
 > **Warning**
 > Extensions can have bugs or malicious code, be careful what you install!!

 ## Install New Extension
+
 Only administrator users can install or upgrade extensions.

 Go to `Manage Extensions` > `Add Remove Extensions`
@@ -45,13 +45,12 @@ Select the version to be installed (usually the last one) and click `Install`. O
 >
 > For Explicit Release: the order of the releases is the one in the "extensions" object

-
 The extension has been installed but it cannot be accessed yet. In order to activate the extension toggle it in the `Activated` state.

 Go to `Manage Extensions` (as admin user or regular user). Search for the extension and enable it.

-
 ## Uninstall Extension
+
 On the `Install` page click `Manage` for the extension you want to uninstall:
 ![image](https://user-images.githubusercontent.com/2951406/213653194-32cbb1da-dcc8-43cf-8a82-1ec5d2d3dc16.png)

@@ -65,6 +64,7 @@ Users will no longer be able to access the extension.
 > The database for the extension is not removed. If the extension is re-installed later, the data will be accessible.

 ## Manifest File
+
 The manifest file is just a `JSON` file that lists a collection of extensions that can be installed. This file is of the form:

 ```json
@@ -77,30 +77,32 @@ The manifest file is just a `JSON` file that lists a collection of extensions th
 There are two ways to specify installable extensions:

 ### Explicit Release
+
 It goes under the `extensions` object and it is of the form:
+
 ```json
-        {
-            "id": "lnurlp",
-            "name": "LNURL Pay Links",
-            "version": 1,
-            "shortDescription": "Upgrade to version 111111111",
-            "icon": "receipt",
-            "details": "All charge names should be <code>111111111</code>. API panel must show: <br>",
-            "archive": "https://github.com/lnbits/lnbits-extensions/raw/main/new/lnurlp/1/lnurlp.zip",
-            "hash": "a22d02de6bf306a7a504cd344e032cc6d48837a1d4aeb569a55a57507bf9a43a",
-            "htmlUrl": "https://github.com/lnbits/lnbits-extensions/tree/main/new/lnurlp/1",
-            "infoNotification": "This is a very old version",
-            "dependencies": ["other-ext-id"]
-        }
+{
+  "id": "lnurlp",
+  "name": "LNURL Pay Links",
+  "version": 1,
+  "shortDescription": "Upgrade to version 111111111",
+  "icon": "receipt",
+  "details": "All charge names should be <code>111111111</code>. API panel must show: <br>",
+  "archive": "https://github.com/lnbits/lnbits-extensions/raw/main/new/lnurlp/1/lnurlp.zip",
+  "hash": "a22d02de6bf306a7a504cd344e032cc6d48837a1d4aeb569a55a57507bf9a43a",
+  "htmlUrl": "https://github.com/lnbits/lnbits-extensions/tree/main/new/lnurlp/1",
+  "infoNotification": "This is a very old version",
+  "dependencies": ["other-ext-id"]
+}
 ```

 <details><summary>Fields Detailed Description</summary>

 | Field                | Type          |           | Description                                                                                                                                                          |
-|----------------------|---------------|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| id                   | string        | mandatory | The ID of the extension. Must be unique for each extension. It is also used as the path in the URL.                                                                          |
+| -------------------- | ------------- | --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| id                   | string        | mandatory | The ID of the extension. Must be unique for each extension. It is also used as the path in the URL.                                                                  |
 | name                 | string        | mandatory | User friendly name for the extension. It will be displayed on the installation page.                                                                                 |
-| version              | string        | mandatory | Version of this release. [Semantic versioning](https://semver.org/) is recommended.                                                                                   |
+| version              | string        | mandatory | Version of this release. [Semantic versioning](https://semver.org/) is recommended.                                                                                  |
 | shortDescription     | string        | optional  | A few words about the extension. It will be displayed on the installation page.                                                                                      |
 | icon                 | string        | optional  | quasar valid icon name                                                                                                                                               |
 | details              | string (html) | optional  | Details about this particular release                                                                                                                                |
@@ -109,31 +111,30 @@ It goes under the `extensions` object and it is of the form:
 | htmlUrl              | string        | optional  | Link to the extension home page.                                                                                                                                     |
 | infoNotification     | string        | optional  | Users that have this release installed will see a info message for their extension. For example if the extension support will be terminated soon.                    |
 | criticalNotification | string        | optional  | Reserved for urgent notifications. The admin user will receive a message each time it visits the `Install` page. One example is if the extension has a critical bug. |
-| dependencies         | list          | optional  | A list of extension IDs. It signals that those extensions must be installed BEFORE the this one can be installed.
+| dependencies         | list          | optional  | A list of extension IDs. It signals that those extensions must be installed BEFORE the this one can be installed.                                                    |

 </details>

 This mode has the advantage of strictly specifying what releases of an extension can be installed.

 ### GitHub Repository
+
 It goes under the `repos` object and it is of the form:

 ```json
 {
-    "id": "withdraw",
-    "organisation": "lnbits",
-    "repository": "withdraw-extension"
+  "id": "withdraw",
+  "organisation": "lnbits",
+  "repository": "withdraw-extension"
 }
 ```

-| Field        | Type   | Description                                           |
-|--------------|--------|-------------------------------------------------------|
-| id           | string | The ID of the extension. Must be unique for each extension. It is also used as the path in the URL.                               |
-| organisation | string | The GitHub organisation (eg: `lnbits`)                |
-| repository   | string | The GitHub repository name (eg: `withdraw-extension`) |
+| Field        | Type   | Description                                                                                         |
+| ------------ | ------ | --------------------------------------------------------------------------------------------------- |
+| id           | string | The ID of the extension. Must be unique for each extension. It is also used as the path in the URL. |
+| organisation | string | The GitHub organisation (eg: `lnbits`)                                                              |
+| repository   | string | The GitHub repository name (eg: `withdraw-extension`)                                               |

 The admin user will see all releases from the Github repository:

 ![image](https://user-images.githubusercontent.com/2951406/213508934-11de5ae5-2045-471c-854b-94b6acbf4434.png)
-
-
@@ -4,10 +4,10 @@ title: FAQ
 nav_order: 5
 ---

-
 # FAQ - Frequently Asked Questions

 ## Install options
+
 <ul><p>LNbits is not a node management software but a ⚡️LN only accounting system on top of a funding source.</p>

 <details><summary>Funding my LNbits wallet from my node it doesn't work.</summary>
@@ -54,6 +54,7 @@ allow-self-payment=1
  </ul>

 ## Troubleshooting
+
 <ul><details><summary>Message "https error" or network error" when scanning a LNbits QR</summary>
 <p>Bad news, this is a routing error that might have quite a lot of reasons. Let´s try a few of the most possible problems and their solutions. First choose your setup</p>
  <ul>
@@ -83,7 +84,7 @@ allow-self-payment=1
 <details><summary>Wallet-URL deleted, are my funds safu ?</summary>
    <ul>
      <li>
-        <details><summary>Wallet on demo server legend.lnbits</summary>
+        <details><summary>Wallet on demo server demo.lnbits.com</summary>
        <p>Always save a copy of your wallet-URL, Export2phone-QR or LNDhub for your own wallets in a safe place. LNbits CANNOT help you to recover them when lost.</p>
        </details>
      </li>
@@ -155,7 +156,6 @@ allow-self-payment=1
  </p>
  </details>

-
 <details><summary>How can I use a LNbits lndhub account in other wallet apps?</summary>
  <p>Open your LNbits with the account / wallet you want to use, go to "manage extensions" and activate the <a href="https://github.com/lnbits/lndhub">LNDHUB extension</a>.</p>
  <p>Then open the LNDHUB extension, choose the wallet you want to use and scan the QR code you want to use: "admin" or "invoice only", depending on the security level you want for that wallet.</p>
@@ -166,6 +166,7 @@ allow-self-payment=1
  </ul>

 ## Building hardware tools
+
 <ul>  <p>LNbits has all sorts of open APIs and tools to program and connect to a lot of different devices for a gazillion of use-cases. Let us know what you did with it ! Come to the <a href="https://t.me/makerbits">Makerbits Telegram Group</a> if you are interested in building or if you need help with a project - we got you!</p>

 <details><summary>ATM - deposit and withdraw in your shop or at your meetup</summary>
@@ -216,6 +217,7 @@ allow-self-payment=1
  </ul>

 ## Use cases of LNbits
+
 <ul><details><summary>Merchant</summary>
  <p>LNbits is a powerful solution for merchants, due to the easy setup with various extensions, that can be used for many scenarios.</p>
  <p><a href="https://darthcoin.substack.com/p/lnbits-for-small-merchants">Here is an overview of the LNbits tools available for a small restaurant as well as a hotel</a></p>
@@ -262,6 +264,7 @@ allow-self-payment=1
 </ul>

 ## Developing for LNbits
+
 <ul>
    <li><a href="https://docs.lnbits.org/devs/development.html">Making extensions / How to use Websockets / API reference</a></li>
    <li><a href="https://t.me/lnbits">Telegram LNbits Support Group</a></li></ul>
@@ -1,19 +1,23 @@
-
 ## Defining a route with path parameters
+
 **old:**
+
 ```python
 # with <>
@offlineshop_ext.route("/lnurl/<item_id>", methods=["GET"])
 ```

 **new:**
+
 ```python
 # with curly braces: {}
@offlineshop_ext.get("/lnurl/{item_id}")
 ```

 ## Check if a user exists and access user object
+
 **old:**
+
 ```python
 # decorators
@check_user_exists()
@@ -24,14 +28,18 @@ async def do_routing_stuff():
 **new:**
 If user doesn't exist, `Depends(check_user_exists)` will raise an exception.
 If user exists, `user` will be the user object
+
 ```python
 # depends calls
@core_html_routes.get("/my_route")
 async def extensions(user: User = Depends(check_user_exists)):
    pass
 ```
+
 ## Returning data from API calls
+
 **old:**
+
 ```python
 return (
    {
@@ -42,9 +50,11 @@ return (
    HTTPStatus.OK,
 )
 ```
+
 FastAPI returns `HTTPStatus.OK` by default id no Exception is raised

 **new:**
+
 ```python
 return {
    "id": wallet.wallet.id,
@@ -54,6 +64,7 @@ return {
 ```

 To change the default HTTPStatus, add it to the path decorator
+
 ```python
@core_app.post("/api/v1/payments", status_code=HTTPStatus.CREATED)
 async def payments():
@@ -61,7 +72,9 @@ async def payments():
 ```

 ## Raise exceptions
+
 **old:**
+
 ```python
 return (
    {"message": f"Failed to connect to {domain}."},
@@ -74,6 +87,7 @@ abort(HTTPStatus.INTERNAL_SERVER_ERROR, "Could not process withdraw LNURL.")
 **new:**

 Raise an exception to return a status code other than the default status code.
+
 ```python
 raise HTTPException(
    status_code=HTTPStatus.BAD_REQUEST,
@@ -82,7 +96,9 @@ raise HTTPException(
 ```

 ## Extensions
+
 **old:**
+
 ```python
 from quart import Blueprint

@@ -92,6 +108,7 @@ amilk_ext: Blueprint = Blueprint(
 ```

 **new:**
+
 ```python
 from fastapi import APIRouter
 from lnbits.jinja2_templating import Jinja2Templates
@@ -114,9 +131,12 @@ offlineshop_rndr = template_renderer([
 ```

 ## Possible optimizations
+
 ### Use Redis as a cache server
+
 Instead of hitting the database over and over again, we can store a short lived object in [Redis](https://redis.io) for an arbitrary key.
 Example:
-* Get transactions for a wallet ID
-* User data for a user id
-* Wallet data for a Admin / Invoice key
+
+- Get transactions for a wallet ID
+- User data for a user id
+- Wallet data for a Admin / Invoice key
@@ -6,25 +6,22 @@ nav_order: 2

 # Basic installation

-You can choose between four package managers, `poetry` and `nix`
+The following sections explain how to install LNbits using varions package managers: `poetry`, `nix`, `Docker` and `Fly.io`.

-By default, LNbits will use SQLite as its database. You can also use PostgreSQL which is recommended for applications with a high load (see guide below).
+Note that by default LNbits uses SQLite as its database, which is simple and effective but you can configure it to use PostgreSQL instead which is also described in a section below.

-## Option 1 (recommended): poetry
+## Option 1 (recommended): Poetry

-Mininum poetry version has is ^1.2, but it is recommended to use latest poetry. (including OSX)
-Make sure you have Python 3.9 or 3.10 installed.
+It is recommended to use the latest version of Poetry. Make sure you have Python version 3.9 or higher installed.
+
+### Verify Python version

-### install python on ubuntu
 ```sh
-# for making sure python 3.9 is installed, skip if installed. To check your installed version: python3 --version
-sudo apt update
-sudo apt install software-properties-common
-sudo add-apt-repository ppa:deadsnakes/ppa
-sudo apt install python3.9 python3.9-distutils
+python3 --version
 ```

-### install poetry
+### Install Poetry
+
 ```sh
 curl -sSL https://install.python-poetry.org | python3 -
 # Once the above poetry install is completed, use the installation path printed to terminal and replace in the following command
@@ -36,13 +33,8 @@ git clone https://github.com/lnbits/lnbits.git
 cd lnbits
 git checkout main

-# Next command, you can exchange with python3.10 or newer versions.
-# Identify your version with python3 --version and specify in the next line
-# command is only needed when your default python is not ^3.9 or ^3.10
-poetry env use python3.9
 poetry install --only main

-mkdir data
 cp .env.example .env
 # set funding source amongst other options
 nano .env
@@ -56,6 +48,7 @@ poetry run lnbits
 # adding --debug in the start-up command above to help your troubleshooting and generate a more verbose output
 # Note that you have to add the line DEBUG=true in your .env file, too.
 ```
+
 #### Updating the server

 ```
@@ -67,7 +60,19 @@ poetry install --only main
 # Start LNbits with `poetry run lnbits`
 ```

-## Option 2: Nix
+## Option 2: Install script (on Debian/Ubuntu)
+
+```sh
+wget https://raw.githubusercontent.com/lnbits/lnbits/main/lnbits.sh &&
+chmod +x lnbits.sh &&
+./lnbits.sh
+```
+
+Now visit `0.0.0.0:5000` to make a super-user account.
+
+`export PATH="/home/$USER/.local/bin:$PATH"` then `./lnbits.sh` can be used to run, but for more control `cd lnbits` and use `poetry run lnbits` (see previous option).
+
+## Option 3: Nix

 ```sh
 # Install nix. If you have installed via another manager, remove and use this install (from https://nixos.org/download)
@@ -97,7 +102,7 @@ nix run
 Ideally you would set the environment via the `.env` file,
 but you can also set the env variables or pass command line arguments:

-``` sh
+```sh
 # .env variables are currently passed when running, but LNbits can be managed with the admin UI.
 LNBITS_ADMIN_UI=true ./result/bin/lnbits --port 9000

@@ -105,16 +110,19 @@ LNBITS_ADMIN_UI=true ./result/bin/lnbits --port 9000
 SUPER_USER=be54db7f245346c8833eaa430e1e0405 LNBITS_ADMIN_UI=true ./result/bin/lnbits --port 9000
 ```

-## Option 3: Docker
+## Option 4: Docker

 use latest version from docker hub
+
 ```sh
 docker pull lnbits/lnbits
 wget https://raw.githubusercontent.com/lnbits/lnbits/main/.env.example -O .env
 mkdir data
 docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits/lnbits
 ```
+
 build the image yourself
+
 ```sh
 git clone https://github.com/lnbits/lnbits.git
 cd lnbits
@@ -124,7 +132,7 @@ mkdir data
 docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits/lnbits
 ```

-## Option 4: Fly.io
+## Option 5: Fly.io

 Fly.io is a docker container hosting platform that has a generous free tier. You can host LNbits for free on Fly.io for personal use.

@@ -157,7 +165,7 @@ You'll be prompted to enter an app name, region, postgres (choose no), deploy no

 You'll now find a file in the directory called `fly.toml`. Open that file and modify/add the following settings.

-Note: Be sure to replace `${PUT_YOUR_LNBITS_ENV_VARS_HERE}` with all relevant environment variables in `.env` or `.env.example`. Environment variable strings should be quoted here, so if in `.env` you have `LNBITS_ENDPOINT=https://legend.lnbits.com` in `fly.toml` you should have `LNBITS_ENDPOINT="https://legend.lnbits.com"`.
+Note: Be sure to replace `${PUT_YOUR_LNBITS_ENV_VARS_HERE}` with all relevant environment variables in `.env` or `.env.example`. Environment variable strings should be quoted here, so if in `.env` you have `LNBITS_ENDPOINT=https://demo.lnbits.com` in `fly.toml` you should have `LNBITS_ENDPOINT="https://demo.lnbits.com"`.

 Note: Don't enter secret environment variables here. Fly.io offers secrets (via the `fly secrets` command) that are exposed as environment variables in your runtime. So, for example, if using the LND_REST funding source, you can run `fly secrets set LND_REST_MACAROON=<hex_macaroon_data>`.

@@ -254,11 +262,10 @@ You might also need to install additional packages or perform additional setup s

 Take a look at [Polar](https://lightningpolar.com/) for an excellent way of spinning up a Lightning Network dev environment.

-
-
 # Additional guides

 ## SQLite to PostgreSQL migration
+
 If you already have LNbits installed and running, on an SQLite database, we **highly** recommend you migrate to postgres if you are planning to run LNbits on scale.

 There's a script included that can do the migration easy. You should have Postgres already installed and there should be a password for the user (see Postgres install guide above). Additionally, your LNbits instance should run once on postgres to implement the database schema before the migration works:
@@ -280,7 +287,6 @@ make migration

 Hopefully, everything works and get migrated... Launch LNbits again and check if everything is working properly.

-
 ## LNbits as a systemd service

 Systemd is great for taking care of your LNbits instance. It will start it on boot and restart it in case it crashes. If you want to run LNbits as a systemd service on your Debian/Ubuntu/Raspbian server, create a file at `/etc/systemd/system/lnbits.service` with the following content:
@@ -369,7 +375,7 @@ Install Apache2 and enable Apache2 mods:

 ```sh
 apt-get install apache2 certbot
-a2enmod headers ssl proxy proxy-http
+a2enmod headers ssl proxy proxy_http
 ```

 Create a SSL certificate with LetsEncrypt:
@@ -408,7 +414,7 @@ EOF
 Restart Apache2:

 ```sh
-service restart apache2
+service apache2 restart
 ```

 ## Running behind an Nginx reverse proxy over HTTPS
@@ -440,6 +446,15 @@ server {
    proxy_set_header X-Forwarded-Host $host;
    proxy_set_header X-Forwarded-Proto $scheme;

+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass_request_headers on;
+
+    # WebSocket support
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "Upgrade";
+
    listen [::]:443 ssl;
    listen 443 ssl;
    ssl_certificate /etc/letsencrypt/live/lnbits.org/fullchain.pem;
@@ -453,32 +468,40 @@ EOF
 Restart nginx:

 ```sh
-service restart nginx
+service nginx restart
 ```

 ## Using https without reverse proxy
+
 The most common way of using LNbits via https is to use a reverse proxy such as Caddy, nginx, or ngriok. However, you can also run LNbits via https without additional software. This is useful for development purposes or if you want to use LNbits in your local network.

 We have to create a self-signed certificate using `mkcert`. Note that this certificate is not "trusted" by most browsers but that's fine (since you know that you have created it) and encryption is always better than clear text.

 #### Install mkcert
+
 You can find the install instructions for `mkcert` [here](https://github.com/FiloSottile/mkcert).

 Install mkcert on Ubuntu:
+
 ```sh
 sudo apt install libnss3-tools
 curl -JLO "https://dl.filippo.io/mkcert/latest?for=linux/amd64"
 chmod +x mkcert-v*-linux-amd64
 sudo cp mkcert-v*-linux-amd64 /usr/local/bin/mkcert
 ```
+
 #### Create certificate
+
 To create a certificate, first `cd` into your LNbits folder and execute the following command on Linux:
+
 ```sh
 openssl req -new -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes -out cert.pem -keyout key.pem
 ```
+
 This will create two new files (`key.pem` and `cert.pem `).

 Alternatively, you can use mkcert ([more info](https://kifarunix.com/how-to-create-self-signed-ssl-certificate-with-mkcert-on-ubuntu-18-04/)):
+
 ```sh
 # add your local IP (192.x.x.x) as well if you want to use it in your local network
 mkcert localhost 127.0.0.1 ::1
@@ -490,7 +513,6 @@ You can then pass the certificate files to uvicorn when you start LNbits:
 poetry run uvicorn lnbits.__main__:app --host 0.0.0.0 --port 5000 --ssl-keyfile ./key.pem --ssl-certfile ./cert.pem
 ```

-
 ## LNbits running on Umbrel behind Tor

 If you want to run LNbits on your Umbrel but want it to be reached through clearnet, _Uxellodunum_ made an extensive [guide](https://community.getumbrel.com/t/guide-lnbits-without-tor/604) on how to do it.
@@ -502,7 +524,7 @@ To install using docker you first need to build the docker image as:
 ```
 git clone https://github.com/lnbits/lnbits.git
 cd lnbits
-docker build -t lnbits-legend .
+docker build -t lnbits/lnbits .
 ```

 You can launch the docker in a different directory, but make sure to copy `.env.example` from lnbits there
@@ -514,6 +536,7 @@ cp <lnbits_repo>/.env.example .env
 and change the configuration in `.env` as required.

 Then create the data directory
+
 ```
 mkdir data
 ```
@@ -521,7 +544,7 @@ mkdir data
 Then the image can be run as:

 ```
-docker run --detach --publish 5000:5000 --name lnbits-legend -e "LNBITS_BACKEND_WALLET_CLASS='FakeWallet'" --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits-legend
+docker run --detach --publish 5000:5000 --name lnbits -e "LNBITS_BACKEND_WALLET_CLASS='FakeWallet'" --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits
 ```

 Finally you can access your lnbits on your machine at port 5000.
@@ -4,15 +4,12 @@ title: Backend wallets
 nav_order: 3
 ---

-
-Backend wallets
-===============
+# Backend wallets

 LNbits can run on top of many Lightning Network funding sources with more being added regularly.

 A backend wallet can be configured using the following LNbits environment variables:

-
 ### CoreLightning

 - `LNBITS_BACKEND_WALLET_CLASS`: **CoreLightningWallet**
@@ -79,6 +76,15 @@ For the invoice to work you must have a publicly accessible URL in your LNbits.
 - `OPENNODE_API_ENDPOINT`: https://api.opennode.com/
 - `OPENNODE_KEY`: opennodeAdminApiKey

+### Blink
+
+For the invoice to work you must have a publicly accessible URL in your LNbits. No manual webhook setting is necessary. You can generate a Blink API key after logging in or creating a new Blink account at: https://dashboard.blink.sv. For more info visit: https://dev.blink.sv/api/auth#create-an-api-key```
+
+- `LNBITS_BACKEND_WALLET_CLASS`: **BlinkWallet**
+- `BLINK_API_ENDPOINT`: https://api.blink.sv/graphql
+- `BLINK_WS_ENDPOINT`: wss://ws.blink.sv/graphql
+- `BLINK_TOKEN`: BlinkToken
+
 ### Alby

 For the invoice to work you must have a publicly accessible URL in your LNbits. No manual webhook setting is necessary. You can generate an alby access token here: https://getalby.com/developer/access_tokens/new
@@ -87,6 +93,18 @@ For the invoice to work you must have a publicly accessible URL in your LNbits.
 - `ALBY_API_ENDPOINT`: https://api.getalby.com/
 - `ALBY_ACCESS_TOKEN`: AlbyAccessToken

+### Boltz
+
+This funding source connects to a running [boltz-client](https://docs.boltz.exchange/v/boltz-client) and handles all lightning payments through submarine swaps on the liquid network.
+You can configure the daemon to run in standalone mode by `standalone = True` in the config file or using the cli flag (`boltzd --standalone`).
+Once running, you can create a liquid wallet using `boltzcli wallet create lnbits lbtc`.
+
+- `LNBITS_BACKEND_WALLET_CLASS`: **BoltzWallet**
+- `BOLTZ_CLIENT_ENDPOINT`: 127.0.0.1:9002
+- `BOLTZ_CLIENT_MACAROON`: /home/bob/.boltz/macaroons/admin.macaroon or Base64/Hex
+- `BOLTZ_CLIENT_CERT`: /home/bob/.boltz/tls.cert or Base64/Hex
+- `BOLTZ_CLIENT_WALLET`: lnbits
+
 ### ZBD

 For the invoice to work you must have a publicly accessible URL in your LNbits. No manual webhook setting is necessary. You can generate an ZBD API Key here: https://zbd.dev/docs/dashboard/projects/api
@@ -95,6 +113,35 @@ For the invoice to work you must have a publicly accessible URL in your LNbits.
 - `ZBD_API_ENDPOINT`: https://api.zebedee.io/v0/
 - `ZBD_API_KEY`: ZBDApiKey

+### Phoenixd
+
+For the invoice to work you must have a publicly accessible URL in your LNbits. You can get a phoenixd API key from the install
+~/.phoenix/phoenix.conf, also see the documentation for phoenixd.
+
+- `LNBITS_BACKEND_WALLET_CLASS`: **PhoenixdWallet**
+- `PHOENIXD_API_ENDPOINT`: http://localhost:9740/
+- `PHOENIXD_API_PASSWORD`: PhoenixdApiPassword
+
+### Breez SDK
+
+A Greenlight invite code or Greenlight partner certificate/key can be used to register a new node with Greenlight. If the Greenlight node already exists, neither are required.
+
+- `LNBITS_BACKEND_WALLET_CLASS`: **BreezSdkWallet**
+- `BREEZ_API_KEY`: ...
+- `BREEZ_GREENLIGHT_SEED`: ...
+- `BREEZ_GREENLIGHT_INVITE_CODE`: ...
+- `BREEZ_GREENLIGHT_DEVICE_KEY`: /path/to/breezsdk/device.pem or Base64/Hex
+- `BREEZ_GREENLIGHT_DEVICE_CERT`: /path/to/breezsdk/device.crt or Base64/Hex
+
 ### Cliche Wallet

 - `CLICHE_ENDPOINT`: ws://127.0.0.1:12000
+
+### Nostr Wallet Connect (NWC)
+
+To use NWC as funding source in LNbits you'll need a pairing URL (also known as pairing secret) from a NWC service provider. You can find a list of providers [here](https://github.com/getAlby/awesome-nwc?tab=readme-ov-file#nwc-wallets).
+
+You can configure Nostr Wallet Connect in the admin ui or using the following environment variables:
+
+- `LNBITS_BACKEND_WALLET_CLASS`: **NWCWallet**
+- `NWC_PAIRING_URL`: **nostr+walletconnect://...your...pairing...secret...**
@@ -4,21 +4,17 @@ title: User’s Guide
 nav_order: 1
 ---

-
-LNbits, free and open-source Lightning Network wallet/accounts system
-=====================================================================
+# LNbits, free and open-source Lightning Network wallet/accounts system

 LNbits is a very simple Python application that sits on top of any funding source, and can be used as:

-* Accounts system to mitigate the risk of exposing applications to your full balance, via unique API keys for each wallet
-* Extendable platform for exploring Lightning Network functionality via LNbits extension framework
-* Part of a development stack via LNbits API
-* Fallback wallet for the LNURL scheme
-* Instant wallet for LN demonstrations
+- Accounts system to mitigate the risk of exposing applications to your full balance, via unique API keys for each wallet
+- Extendable platform for exploring Lightning Network functionality via LNbits extension framework
+- Part of a development stack via LNbits API
+- Fallback wallet for the LNURL scheme
+- Instant wallet for LN demonstrations

-
-LNbits as an account system
---------------------------
+## LNbits as an account system

 LNbits is packaged with tools to help manage funds, such as a table of transactions, line chart of spending,
 export to csv + more to come...
@@ -5,11 +5,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@@ -26,11 +26,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1698974481,
-        "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=",
+        "lastModified": 1703863825,
+        "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
        "owner": "nix-community",
        "repo": "nix-github-actions",
-        "rev": "4bb5e752616262457bc7ca5882192a564c0472d2",
+        "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
        "type": "github"
      },
      "original": {
@@ -41,16 +41,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1702233072,
-        "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
+        "lastModified": 1723938990,
+        "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
+        "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -66,11 +66,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1702334837,
-        "narHash": "sha256-QZG6+zFshyY+L8m2tlOTm75U5m9y7z01g0josVK+8Os=",
+        "lastModified": 1724134185,
+        "narHash": "sha256-nDqpGjz7cq3ThdC98BPe1ANCNlsJds/LLZ3/MdIXjA0=",
        "owner": "nix-community",
        "repo": "poetry2nix",
-        "rev": "1f4bcbf1be73abc232a972a77102a3e820485a99",
+        "rev": "5ee730a8752264e463c0eaf06cc060fd07f6dae9",
        "type": "github"
      },
      "original": {
@@ -122,11 +122,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1699786194,
-        "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
+        "lastModified": 1719749022,
+        "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
+        "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
        "type": "github"
      },
      "original": {
@@ -2,7 +2,7 @@
  description = "LNbits, free and open-source Lightning wallet and accounts system";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
    poetry2nix = {
      url = "github:nix-community/poetry2nix";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -30,16 +30,10 @@
          meta.rev = self.dirtyRev or self.rev;
          meta.mainProgram = projectName;
          overrides = pkgs.poetry2nix.overrides.withDefaults (final: prev: {
+            coincurve = prev.coincurve.override { preferWheel = true; };
            protobuf = prev.protobuf.override { preferWheel = true; };
            ruff = prev.ruff.override { preferWheel = true; };
            wallycore = prev.wallycore.override { preferWheel = true; };
-            # remove the following override when https://github.com/nix-community/poetry2nix/pull/1563 is merged
-            asgi-lifespan = prev.asgi-lifespan.overridePythonAttrs (
-              old: { buildInputs = (old.buildInputs or []) ++ [ prev.setuptools ]; }
-            );
-            pytest-md = prev.pytest-md.overridePythonAttrs (
-              old: { buildInputs = (old.buildInputs or []) ++ [ prev.setuptools ]; }
-            );
          });
        };
      });
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# Check install has not already run
+if [ ! -d lnbits/data ]; then
+
+  # Update package list and install prerequisites non-interactively
+  sudo apt update -y
+  sudo apt install -y software-properties-common
+  
+  # Add the deadsnakes PPA repository non-interactively
+  sudo add-apt-repository -y ppa:deadsnakes/ppa
+  
+  # Install Python 3.9 and distutils non-interactively
+  sudo apt install -y python3.9 python3.9-distutils
+
+  # Install Poetry
+  curl -sSL https://install.python-poetry.org | python3.9 -
+
+  # Add Poetry to PATH for the current session
+  export PATH="/home/$USER/.local/bin:$PATH"
+
+  if [ ! -d lnbits/wallets ]; then
+    # Clone the LNbits repository
+    git clone https://github.com/lnbits/lnbits.git
+    if [ $? -ne 0 ]; then
+      echo "Failed to clone the repository ... FAIL"
+      exit 1
+    fi
+    # Ensure we are in the lnbits directory
+    cd lnbits || { echo "Failed to cd into lnbits ... FAIL"; exit 1; }
+  fi
+
+  git checkout main
+  # Make data folder
+  mkdir data
+
+  # Copy the .env.example to .env
+  cp .env.example .env
+
+elif [ ! -d lnbits/wallets ]; then
+  # cd into lnbits
+  cd lnbits || { echo "Failed to cd into lnbits ... FAIL"; exit 1; }
+fi
+
+# Set path for running after install
+export PATH="/home/$USER/.local/bin:$PATH"
+
+# Install the dependencies using Poetry
+poetry env use python3.9
+poetry install --only main
+
+# Set environment variables for LNbits
+export LNBITS_ADMIN_UI=true
+export HOST=0.0.0.0
+
+# Run LNbits
+poetry run lnbits
@@ -0,0 +1,24 @@
+from .core.services import create_invoice, pay_invoice
+from .decorators import (
+    check_admin,
+    check_super_user,
+    check_user_exists,
+    require_admin_key,
+    require_invoice_key,
+)
+from .exceptions import InvoiceError, PaymentError
+
+__all__ = [
+    # decorators
+    "require_admin_key",
+    "require_invoice_key",
+    "check_admin",
+    "check_super_user",
+    "check_user_exists",
+    # services
+    "pay_invoice",
+    "create_invoice",
+    # exceptions
+    "PaymentError",
+    "InvoiceError",
+]
@@ -1,35 +1,33 @@
 import asyncio
 import glob
 import importlib
-import logging
 import os
 import shutil
 import sys
-import traceback
 from contextlib import asynccontextmanager
-from hashlib import sha256
-from http import HTTPStatus
 from pathlib import Path
-from typing import Callable, List, Optional
+from typing import Callable, Optional

-from fastapi import FastAPI, HTTPException, Request
-from fastapi.exceptions import RequestValidationError
+from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import RedirectResponse
 from fastapi.staticfiles import StaticFiles
 from loguru import logger
 from slowapi import Limiter
 from slowapi.util import get_remote_address
 from starlette.middleware.sessions import SessionMiddleware
-from starlette.responses import JSONResponse

-from lnbits.core.crud import get_dbversions, get_installed_extensions
+from lnbits.core.crud import (
+    get_db_version,
+    get_installed_extensions,
+    update_installed_extension_state,
+)
+from lnbits.core.extensions.helpers import version_parse
 from lnbits.core.helpers import migrate_extension_database
-from lnbits.core.services import websocketUpdater
 from lnbits.core.tasks import (  # watchdog_task
    killswitch_task,
    wait_for_paid_invoices,
 )
+from lnbits.exceptions import register_exception_handlers
 from lnbits.settings import settings
 from lnbits.tasks import (
    cancel_all_tasks,
@@ -37,21 +35,18 @@ from lnbits.tasks import (
    register_invoice_listener,
 )
 from lnbits.utils.cache import cache
-from lnbits.wallets import get_wallet_class, set_wallet_class
+from lnbits.utils.logger import (
+    configure_logger,
+    initialize_server_websocket_logger,
+    log_server_info,
+)
+from lnbits.wallets import get_funding_source, set_funding_source

 from .commands import migrate_databases
 from .core import init_core_routers
 from .core.db import core_app_extra
+from .core.extensions.models import Extension, ExtensionMeta, InstallableExtension
 from .core.services import check_admin_settings, check_webpush_settings
-from .core.views.extension_api import add_installed_extension
-from .core.views.generic import update_installed_extension_state
-from .extension_manager import (
-    Extension,
-    InstallableExtension,
-    get_valid_extensions,
-    version_parse,
-)
-from .helpers import template_renderer
 from .middleware import (
    CustomGZipMiddleware,
    ExtensionsRedirectMiddleware,
@@ -63,12 +58,14 @@ from .middleware import (
 from .requestvars import g
 from .tasks import (
    check_pending_payments,
+    create_task,
    internal_invoice_listener,
    invoice_listener,
 )


 async def startup(app: FastAPI):
+    settings.lnbits_running = True

    # wait till migration is done
    await migrate_databases()
@@ -81,7 +78,7 @@ async def startup(app: FastAPI):

    # initialize WALLET
    try:
-        set_wallet_class()
+        set_funding_source()
    except Exception as e:
        logger.error(f"Error initializing {settings.lnbits_backend_wallet_class}: {e}")
        set_void_wallet_class()
@@ -92,26 +89,21 @@ async def startup(app: FastAPI):
    # register core routes
    init_core_routers(app)

-    # check extensions after restart
-    if not settings.lnbits_extensions_deactivate_all:
-        await check_installed_extensions(app)
-        register_all_ext_routes(app)
-
-    if settings.lnbits_admin_ui:
-        initialize_server_logger()
-
    # initialize tasks
-    register_async_tasks()
+    register_async_tasks(app)


 async def shutdown():
+    logger.warning("LNbits shutting down...")
+    settings.lnbits_running = False
+
    # shutdown event
    cancel_all_tasks()

    # wait a bit to allow them to finish, so that cleanup can run without problems
    await asyncio.sleep(0.1)
-    WALLET = get_wallet_class()
-    await WALLET.cleanup()
+    funding_source = get_funding_source()
+    await funding_source.cleanup()


@asynccontextmanager
@@ -138,8 +130,8 @@ def create_app() -> FastAPI:
    )

    # Allow registering new extensions routes without direct access to the `app` object
-    setattr(core_app_extra, "register_new_ext_routes", register_new_ext_routes(app))
-    setattr(core_app_extra, "register_new_ratelimiter", register_new_ratelimiter(app))
+    core_app_extra.register_new_ext_routes = register_new_ext_routes(app)
+    core_app_extra.register_new_ratelimiter = register_new_ratelimiter(app)

    # register static files
    static_path = Path("lnbits", "static")
@@ -177,38 +169,39 @@ def create_app() -> FastAPI:


 async def check_funding_source() -> None:
+    funding_source = get_funding_source()

-    WALLET = get_wallet_class()
-
-    sleep_time = 5
-    max_retries = 5
+    max_retries = settings.funding_source_max_retries
    retry_counter = 0

-    while True:
+    while settings.lnbits_running:
        try:
-            logger.info(f"Connecting to backend {WALLET.__class__.__name__}...")
-            error_message, balance = await WALLET.status()
+            logger.info(f"Connecting to backend {funding_source.__class__.__name__}...")
+            error_message, balance = await funding_source.status()
            if not error_message:
                retry_counter = 0
                logger.success(
-                    f"✔️ Backend {WALLET.__class__.__name__} connected "
+                    f"✔️ Backend {funding_source.__class__.__name__} connected "
                    f"and with a balance of {balance} msat."
                )
                break
            logger.error(
-                f"The backend for {WALLET.__class__.__name__} isn't "
+                f"The backend for {funding_source.__class__.__name__} isn't "
                f"working properly: '{error_message}'",
                RuntimeWarning,
            )
        except Exception as e:
-            logger.error(f"Error connecting to {WALLET.__class__.__name__}: {e}")
+            logger.error(
+                f"Error connecting to {funding_source.__class__.__name__}: {e}"
+            )

-        if retry_counter == max_retries:
+        if retry_counter >= max_retries:
            set_void_wallet_class()
-            WALLET = get_wallet_class()
+            funding_source = get_funding_source()
            break

        retry_counter += 1
+        sleep_time = min(0.25 * (2**retry_counter), 60)
        logger.warning(
            f"Retrying connection to backend in {sleep_time} seconds... "
            f"({retry_counter}/{max_retries})"
@@ -221,7 +214,7 @@ def set_void_wallet_class():
        "Fallback to VoidWallet, because the backend for "
        f"{settings.lnbits_backend_wallet_class} isn't working properly"
    )
-    set_wallet_class("VoidWallet")
+    set_funding_source("VoidWallet")


 async def check_installed_extensions(app: FastAPI):
@@ -245,6 +238,8 @@ async def check_installed_extensions(app: FastAPI):
                )
        except Exception as e:
            logger.warning(e)
+            settings.deactivate_extension_paths(ext.id)
+            await update_installed_extension_state(ext_id=ext.id, active=False)
            logger.warning(
                f"Failed to re-install extension: {ext.id} ({ext.installed_version})"
            )
@@ -256,16 +251,16 @@ async def check_installed_extensions(app: FastAPI):

 async def build_all_installed_extensions_list(
    include_deactivated: Optional[bool] = True,
-) -> List[InstallableExtension]:
+) -> list[InstallableExtension]:
    """
    Returns a list of all the installed extensions plus the extensions that
    MUST be installed by default (see LNBITS_EXTENSIONS_DEFAULT_INSTALL).
    """
    installed_extensions = await get_installed_extensions()
+    settings.lnbits_all_extensions_ids = {e.id for e in installed_extensions}

-    installed_extensions_ids = [e.id for e in installed_extensions]
    for ext_id in settings.lnbits_extensions_default_install:
-        if ext_id in installed_extensions_ids:
+        if ext_id in settings.lnbits_all_extensions_ids:
            continue

        ext_releases = await InstallableExtension.get_extension_releases(ext_id)
@@ -276,8 +271,13 @@ async def build_all_installed_extensions_list(
        release = next((e for e in ext_releases if e.is_version_compatible), None)

        if release:
+            ext_meta = ExtensionMeta(installed_release=release)
            ext_info = InstallableExtension(
-                id=ext_id, name=ext_id, installed_release=release, icon=release.icon
+                id=ext_id,
+                name=ext_id,
+                version=release.version,
+                icon=release.icon,
+                meta=ext_meta,
            )
            installed_extensions.append(ext_info)

@@ -300,7 +300,7 @@ async def check_installed_extension_files(ext: InstallableExtension) -> bool:

    zip_files = glob.glob(os.path.join(settings.lnbits_data_folder, "zips", "*.zip"))

-    if f"./{str(ext.zip_path)}" not in zip_files:
+    if f"./{ext.zip_path!s}" not in zip_files:
        await ext.download_archive()
    ext.extract_archive()

@@ -308,19 +308,16 @@ async def check_installed_extension_files(ext: InstallableExtension) -> bool:


 async def restore_installed_extension(app: FastAPI, ext: InstallableExtension):
-    await add_installed_extension(ext)
    await update_installed_extension_state(ext_id=ext.id, active=True)

    extension = Extension.from_installable_ext(ext)
    register_ext_routes(app, extension)

-    current_version = (await get_dbversions()).get(ext.id, 0)
-    await migrate_extension_database(extension, current_version)
+    current_version = await get_db_version(ext.id)
+    await migrate_extension_database(ext, current_version)

    # mount routes for the new version
    core_app_extra.register_new_ext_routes(extension)
-    if extension.upgrade_hash:
-        ext.notify_upgrade()


 def register_custom_extensions_path():
@@ -383,84 +380,41 @@ def register_ext_routes(app: FastAPI, ext: Extension) -> None:
            )
            app.mount(s["path"], StaticFiles(directory=static_dir), s["name"])

-    if hasattr(ext_module, f"{ext.code}_redirect_paths"):
-        ext_redirects = getattr(ext_module, f"{ext.code}_redirect_paths")
-        settings.lnbits_extensions_redirects = [
-            r for r in settings.lnbits_extensions_redirects if r["ext_id"] != ext.code
-        ]
-        for r in ext_redirects:
-            r["ext_id"] = ext.code
-            settings.lnbits_extensions_redirects.append(r)
+    ext_redirects = (
+        getattr(ext_module, f"{ext.code}_redirect_paths")
+        if hasattr(ext_module, f"{ext.code}_redirect_paths")
+        else []
+    )

-    logger.trace(f"adding route for extension {ext_module}")
+    settings.activate_extension_paths(ext.code, ext.upgrade_hash, ext_redirects)

+    logger.trace(f"Adding route for extension {ext_module}.")
    prefix = f"/upgrades/{ext.upgrade_hash}" if ext.upgrade_hash != "" else ""
    app.include_router(router=ext_route, prefix=prefix)


-def register_all_ext_routes(app: FastAPI):
-    for ext in get_valid_extensions(False):
+async def check_and_register_extensions(app: FastAPI):
+    await check_installed_extensions(app)
+    for ext in Extension.get_valid_extensions(False):
        try:
            register_ext_routes(app, ext)
-        except Exception as e:
-            logger.error(f"Could not load extension `{ext.code}`: {str(e)}")
+        except Exception as exc:
+            logger.error(f"Could not load extension `{ext.code}`: {exc!s}")


-def initialize_server_logger():
-    super_user_hash = sha256(settings.super_user.encode("utf-8")).hexdigest()
+def register_async_tasks(app: FastAPI):

-    serverlog_queue = asyncio.Queue()
+    # check extensions after restart
+    if not settings.lnbits_extensions_deactivate_all:
+        create_task(check_and_register_extensions(app))

-    async def update_websocket_serverlog():
-        while True:
-            msg = await serverlog_queue.get()
-            await websocketUpdater(super_user_hash, msg)
-
-    create_permanent_task(update_websocket_serverlog)
-
-    logger.add(
-        lambda msg: serverlog_queue.put_nowait(msg),
-        format=Formatter().format,
-    )
-
-
-def log_server_info():
-    logger.info("Starting LNbits")
-    logger.info(f"Version: {settings.version}")
-    logger.info(f"Baseurl: {settings.lnbits_baseurl}")
-    logger.info(f"Host: {settings.host}")
-    logger.info(f"Port: {settings.port}")
-    logger.info(f"Debug: {settings.debug}")
-    logger.info(f"Site title: {settings.lnbits_site_title}")
-    logger.info(f"Funding source: {settings.lnbits_backend_wallet_class}")
-    logger.info(f"Data folder: {settings.lnbits_data_folder}")
-    logger.info(f"Database: {get_db_vendor_name()}")
-    logger.info(f"Service fee: {settings.lnbits_service_fee}")
-    logger.info(f"Service fee max: {settings.lnbits_service_fee_max}")
-    logger.info(f"Service fee wallet: {settings.lnbits_service_fee_wallet}")
-
-
-def get_db_vendor_name():
-    db_url = settings.lnbits_database_url
-    return (
-        "PostgreSQL"
-        if db_url and db_url.startswith("postgres://")
-        else (
-            "CockroachDB"
-            if db_url and db_url.startswith("cockroachdb://")
-            else "SQLite"
-        )
-    )
-
-
-def register_async_tasks():
    create_permanent_task(check_pending_payments)
    create_permanent_task(invoice_listener)
    create_permanent_task(internal_invoice_listener)
    create_permanent_task(cache.invalidate_forever)

    # core invoice listener
-    invoice_queue = asyncio.Queue(5)
+    invoice_queue: asyncio.Queue = asyncio.Queue(5)
    register_invoice_listener(invoice_queue, "core")
    create_permanent_task(lambda: wait_for_paid_invoices(invoice_queue))

@@ -468,148 +422,7 @@ def register_async_tasks():
    # create_permanent_task(watchdog_task)
    create_permanent_task(killswitch_task)

-
-def register_exception_handlers(app: FastAPI):
-    @app.exception_handler(Exception)
-    async def exception_handler(request: Request, exc: Exception):
-        etype, _, tb = sys.exc_info()
-        traceback.print_exception(etype, exc, tb)
-        logger.error(f"Exception: {str(exc)}")
-        # Only the browser sends "text/html" request
-        # not fail proof, but everything else get's a JSON response
-        if (
-            request.headers
-            and "accept" in request.headers
-            and "text/html" in request.headers["accept"]
-        ):
-            return template_renderer().TemplateResponse(
-                request, "error.html", {"err": f"Error: {str(exc)}"}
-            )
-
-        return JSONResponse(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            content={"detail": str(exc)},
-        )
-
-    @app.exception_handler(RequestValidationError)
-    async def validation_exception_handler(
-        request: Request, exc: RequestValidationError
-    ):
-        logger.error(f"RequestValidationError: {str(exc)}")
-        # Only the browser sends "text/html" request
-        # not fail proof, but everything else get's a JSON response
-
-        if (
-            request.headers
-            and "accept" in request.headers
-            and "text/html" in request.headers["accept"]
-        ):
-            return template_renderer().TemplateResponse(
-                request,
-                "error.html",
-                {"err": f"Error: {str(exc)}"},
-            )
-
-        return JSONResponse(
-            status_code=HTTPStatus.BAD_REQUEST,
-            content={"detail": str(exc)},
-        )
-
-    @app.exception_handler(HTTPException)
-    async def http_exception_handler(request: Request, exc: HTTPException):
-        logger.error(f"HTTPException {exc.status_code}: {exc.detail}")
-        # Only the browser sends "text/html" request
-        # not fail proof, but everything else get's a JSON response
-
-        if (
-            request.headers
-            and "accept" in request.headers
-            and "text/html" in request.headers["accept"]
-        ):
-            if exc.headers and "token-expired" in exc.headers:
-                response = RedirectResponse("/")
-                response.delete_cookie("cookie_access_token")
-                response.delete_cookie("is_lnbits_user_authorized")
-                response.set_cookie("is_access_token_expired", "true")
-                return response
-
-            return template_renderer().TemplateResponse(
-                request,
-                "error.html",
-                {
-                    "request": request,
-                    "err": f"HTTP Error {exc.status_code}: {exc.detail}",
-                },
-            )
-
-        return JSONResponse(
-            status_code=exc.status_code,
-            content={"detail": exc.detail},
-        )
-
-
-def configure_logger() -> None:
-    logger.remove()
-    log_level: str = "DEBUG" if settings.debug else "INFO"
-    formatter = Formatter()
-    logger.add(sys.stdout, level=log_level, format=formatter.format)
-
-    if settings.enable_log_to_file:
-        logger.add(
-            Path(settings.lnbits_data_folder, "logs", "lnbits.log"),
-            rotation=settings.log_rotation,
-            retention=settings.log_retention,
-            level="INFO",
-            format=formatter.format,
-        )
-        logger.add(
-            Path(settings.lnbits_data_folder, "logs", "debug.log"),
-            rotation=settings.log_rotation,
-            retention=settings.log_retention,
-            level="DEBUG",
-            format=formatter.format,
-        )
-
-    logging.getLogger("uvicorn").handlers = [InterceptHandler()]
-    logging.getLogger("uvicorn.access").handlers = [InterceptHandler()]
-    logging.getLogger("uvicorn.error").handlers = [InterceptHandler()]
-    logging.getLogger("uvicorn.error").propagate = False
-
-    logging.getLogger("sqlalchemy").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base").propagate = False
-    logging.getLogger("sqlalchemy.engine.base.Engine").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base.Engine").propagate = False
-
-
-class Formatter:
-    def __init__(self):
-        self.padding = 0
-        self.minimal_fmt = (
-            "<green>{time:YYYY-MM-DD HH:mm:ss.SS}</green> | <level>{level}</level> | "
-            "<level>{message}</level>\n"
-        )
-        if settings.debug:
-            self.fmt = (
-                "<green>{time:YYYY-MM-DD HH:mm:ss.SS}</green> | "
-                "<level>{level: <4}</level> | "
-                "<cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> | "
-                "<level>{message}</level>\n"
-            )
-        else:
-            self.fmt = self.minimal_fmt
-
-    def format(self, record):
-        function = "{function}".format(**record)
-        if function == "emit":  # uvicorn logs
-            return self.minimal_fmt
-        return self.fmt
-
-
-class InterceptHandler(logging.Handler):
-    def emit(self, record):
-        try:
-            level = logger.level(record.levelname).name
-        except ValueError:
-            level = record.levelno
-        logger.log(level, record.getMessage())
+    # server logs for websocket
+    if settings.lnbits_admin_ui:
+        server_log_task = initialize_server_websocket_logger()
+        create_permanent_task(server_log_task)
@@ -3,8 +3,7 @@ import importlib
 import time
 from functools import wraps
 from pathlib import Path
-from typing import List, Optional, Tuple
-from urllib.parse import urlparse
+from typing import Optional

 import click
 import httpx
@@ -12,7 +11,27 @@ from fastapi.exceptions import HTTPException
 from loguru import logger
 from packaging import version

-from lnbits.core.models import Payment, User
+from lnbits.core import db as core_db
+from lnbits.core.crud import (
+    delete_accounts_no_wallets,
+    delete_unused_wallets,
+    delete_wallet_by_id,
+    delete_wallet_payment,
+    get_db_versions,
+    get_installed_extension,
+    get_installed_extensions,
+    get_payment,
+    get_payments,
+    remove_deleted_wallets,
+    update_payment,
+)
+from lnbits.core.extensions.models import (
+    CreateExtension,
+    ExtensionRelease,
+    InstallableExtension,
+)
+from lnbits.core.helpers import is_valid_url, migrate_databases
+from lnbits.core.models import Payment, PaymentState
 from lnbits.core.services import check_admin_settings
 from lnbits.core.views.extension_api import (
    api_install_extension,
@@ -21,30 +40,6 @@ from lnbits.core.views.extension_api import (
 from lnbits.settings import settings
 from lnbits.wallets.base import Wallet

-from .core import db as core_db
-from .core import migrations as core_migrations
-from .core.crud import (
-    delete_accounts_no_wallets,
-    delete_unused_wallets,
-    delete_wallet_by_id,
-    delete_wallet_payment,
-    get_dbversions,
-    get_inactive_extensions,
-    get_installed_extension,
-    get_installed_extensions,
-    get_payments,
-    remove_deleted_wallets,
-    update_payment_status,
-)
-from .core.helpers import migrate_extension_database, run_migration
-from .db import COCKROACH, POSTGRES, SQLITE
-from .extension_manager import (
-    CreateExtension,
-    ExtensionRelease,
-    InstallableExtension,
-    get_valid_extensions,
-)
-

 def coro(f):
    @wraps(f)
@@ -83,7 +78,7 @@ def get_super_user() -> Optional[str]:
            "Superuser id not found. Please check that the file "
            + f"'{superuser_file.absolute()}' exists and has read permissions."
        )
-    with open(superuser_file, "r") as file:
+    with open(superuser_file) as file:
        return file.readline()


@@ -123,52 +118,12 @@ def database_migrate():
    loop.run_until_complete(migrate_databases())


-async def db_migrate():
-    asyncio.create_task(migrate_databases())
-
-
-async def migrate_databases():
-    """Creates the necessary databases if they don't exist already; or migrates them."""
-
-    async with core_db.connect() as conn:
-        exists = False
-        if conn.type == SQLITE:
-            exists = await conn.fetchone(
-                "SELECT * FROM sqlite_master WHERE type='table' AND name='dbversions'"
-            )
-        elif conn.type in {POSTGRES, COCKROACH}:
-            exists = await conn.fetchone(
-                "SELECT * FROM information_schema.tables WHERE table_schema = 'public'"
-                " AND table_name = 'dbversions'"
-            )
-
-        if not exists:
-            await core_migrations.m000_create_migrations_table(conn)
-
-        current_versions = await get_dbversions(conn)
-        core_version = current_versions.get("core", 0)
-        await run_migration(conn, core_migrations, "core", core_version)
-
-    # here is the first place we can be sure that the
-    # `installed_extensions` table has been created
-    await load_disabled_extension_list()
-
-    for ext in get_valid_extensions(False):
-        current_version = current_versions.get(ext.code, 0)
-        try:
-            await migrate_extension_database(ext, current_version)
-        except Exception as e:
-            logger.exception(f"Error migrating extension {ext.code}: {e}")
-
-    logger.info("✔️ All migrations done.")
-
-
@db.command("versions")
@coro
 async def db_versions():
    """Show current database versions"""
    async with core_db.connect() as conn:
-        click.echo(await get_dbversions(conn))
+        click.echo(await get_db_versions(conn))


@db.command("cleanup-wallets")
@@ -205,7 +160,7 @@ async def database_delete_wallet(wallet: str):
@click.option("-c", "--checking-id", required=True, help="Payment checking Id.")
@coro
 async def database_delete_wallet_payment(wallet: str, checking_id: str):
-    """Mark wallet as deleted"""
+    """Delete wallet payment"""
    async with core_db.connect() as conn:
        await delete_wallet_payment(
            wallet_id=wallet, checking_id=checking_id, conn=conn
@@ -215,10 +170,13 @@ async def database_delete_wallet_payment(wallet: str, checking_id: str):
@db.command("mark-payment-pending")
@click.option("-c", "--checking-id", required=True, help="Payment checking Id.")
@coro
-async def database_revert_payment(checking_id: str, pending: bool = True):
-    """Mark wallet as deleted"""
+async def database_revert_payment(checking_id: str):
+    """Mark payment as pending"""
    async with core_db.connect() as conn:
-        await update_payment_status(pending=pending, checking_id=checking_id, conn=conn)
+        payment = await get_payment(checking_id=checking_id, conn=conn)
+        payment.status = PaymentState.PENDING
+        await update_payment(payment, conn=conn)
+        click.echo(f"Payment '{checking_id}' marked as pending.")


@db.command("cleanup-accounts")
@@ -275,7 +233,7 @@ async def check_invalid_payments(
    click.echo("Funding source: " + str(funding_source))

    # payments that are settled in the DB, but not at the Funding source level
-    invalid_payments: List[Payment] = []
+    invalid_payments: list[Payment] = []
    invalid_wallets = {}
    for db_payment in settled_db_payments:
        if verbose:
@@ -312,12 +270,6 @@ async def check_invalid_payments(
        click.echo(" ".join([w, str(data[0]), str(data[1] / 1000).ljust(10)]))


-async def load_disabled_extension_list() -> None:
-    """Update list of extensions that have been explicitly disabled"""
-    inactive_extensions = await get_inactive_extensions()
-    settings.lnbits_deactivated_extensions += inactive_extensions
-
-
@extensions.command("list")
@coro
 async def extensions_list():
@@ -327,8 +279,10 @@ async def extensions_list():
    from lnbits.app import build_all_installed_extensions_list

    for ext in await build_all_installed_extensions_list():
-        assert ext.installed_release, f"Extension {ext.id} has no installed_release"
-        click.echo(f"  - {ext.id} ({ext.installed_release.version})")
+        assert (
+            ext.meta and ext.meta.installed_release
+        ), f"Extension {ext.id} has no installed_release"
+        click.echo(f"  - {ext.id} ({ext.meta.installed_release.version})")


@extensions.command("update")
@@ -377,7 +331,7 @@ async def extensions_update(
    if extension and all_extensions:
        click.echo("Only one of extension ID or the '--all' flag must be specified")
        return
-    if url and not _is_url(url):
+    if url and not is_valid_url(url):
        click.echo(f"Invalid '--url' option value: {url}")
        return

@@ -451,7 +405,7 @@ async def extensions_install(
 ):
    """Install a extension"""
    click.echo(f"Installing {extension}... {repo_index}")
-    if url and not _is_url(url):
+    if url and not is_valid_url(url):
        click.echo(f"Invalid '--url' option value: {url}")
        return

@@ -479,7 +433,7 @@ async def extensions_uninstall(
    """Uninstall a extension"""
    click.echo(f"Uninstalling '{extension}'...")

-    if url and not _is_url(url):
+    if url and not is_valid_url(url):
        click.echo(f"Invalid '--url' option value: {url}")
        return

@@ -492,7 +446,7 @@ async def extensions_uninstall(
        click.echo(f"Failed to uninstall '{extension}' Error: '{ex.detail}'.")
        return False, ex.detail
    except Exception as ex:
-        click.echo(f"Failed to uninstall '{extension}': {str(ex)}.")
+        click.echo(f"Failed to uninstall '{extension}': {ex!s}.")
        return False, str(ex)


@@ -511,7 +465,7 @@ async def install_extension(
    source_repo: Optional[str] = None,
    url: Optional[str] = None,
    admin_user: Optional[str] = None,
-) -> Tuple[bool, str]:
+) -> tuple[bool, str]:
    try:
        release = await _select_release(extension, repo_index, source_repo)
        if not release:
@@ -530,7 +484,7 @@ async def install_extension(
        click.echo(f"Failed to install '{extension}' Error: '{ex.detail}'.")
        return False, ex.detail
    except Exception as ex:
-        click.echo(f"Failed to install '{extension}': {str(ex)}.")
+        click.echo(f"Failed to install '{extension}': {ex!s}.")
        return False, str(ex)


@@ -540,7 +494,7 @@ async def update_extension(
    source_repo: Optional[str] = None,
    url: Optional[str] = None,
    admin_user: Optional[str] = None,
-) -> Tuple[bool, str]:
+) -> tuple[bool, str]:
    try:
        click.echo(f"Updating '{extension}' extension.")
        installed_ext = await get_installed_extension(extension)
@@ -553,7 +507,7 @@ async def update_extension(
        click.echo(f"Current '{extension}' version: {installed_ext.installed_version}.")

        assert (
-            installed_ext.installed_release
+            installed_ext.meta and installed_ext.meta.installed_release
        ), "Cannot find previously installed release. Please uninstall first."

        release = await _select_release(extension, repo_index, source_repo)
@@ -561,7 +515,7 @@ async def update_extension(
            return False, "No release selected."
        if (
            release.version == installed_ext.installed_version
-            and release.source_repo == installed_ext.installed_release.source_repo
+            and release.source_repo == installed_ext.meta.installed_release.source_repo
        ):
            click.echo(f"Extension '{extension}' already up to date.")
            return False, "Already up to date"
@@ -582,7 +536,7 @@ async def update_extension(
        click.echo(f"Failed to update '{extension}' Error: '{ex.detail}.")
        return False, ex.detail
    except Exception as ex:
-        click.echo(f"Failed to update '{extension}': {str(ex)}.")
+        click.echo(f"Failed to update '{extension}': {ex!s}.")
        return False, str(ex)


@@ -605,7 +559,7 @@ async def _select_release(
        return latest_repo_releases[source_repo]

    if len(latest_repo_releases) == 1:
-        return latest_repo_releases[list(latest_repo_releases.keys())[0]]
+        return latest_repo_releases[next(iter(latest_repo_releases.keys()))]

    repos = list(latest_repo_releases.keys())
    repos.sort()
@@ -660,7 +614,7 @@ async def _call_install_extension(
            )
            resp.raise_for_status()
    else:
-        await api_install_extension(data, User(id="mock_id"))
+        await api_install_extension(data)


 async def _call_uninstall_extension(
@@ -674,7 +628,7 @@ async def _call_uninstall_extension(
            )
            resp.raise_for_status()
    else:
-        await api_uninstall_extension(extension, User(id="mock_id"))
+        await api_uninstall_extension(extension)


 async def _can_run_operation(url) -> bool:
@@ -693,7 +647,7 @@ async def _can_run_operation(url) -> bool:
    elif url:
        click.echo(
            "The option '--url' has been provided,"
-            + f" but no server found runnint at '{url}'"
+            f" but no server found running at '{url}'"
        )
        return False

@@ -708,11 +662,3 @@ async def _is_lnbits_started(url: Optional[str]):
            return True
    except Exception:
        return False
-
-
-def _is_url(url):
-    try:
-        result = urlparse(url)
-        return all([result.scheme, result.netloc])
-    except ValueError:
-        return False
@@ -7,11 +7,12 @@ from .views.auth_api import auth_router
 from .views.extension_api import extension_router

 # this compat is needed for usermanager extension
-from .views.generic import generic_router, update_user_extension
+from .views.generic import generic_router
 from .views.node_api import node_router, public_node_router, super_node_router
 from .views.payment_api import payment_router
 from .views.public_api import public_router
 from .views.tinyurl_api import tinyurl_router
+from .views.user_api import users_router
 from .views.wallet_api import wallet_router
 from .views.webpush_api import webpush_router
 from .views.websocket_api import websocket_router
@@ -36,3 +37,7 @@ def init_core_routers(app: FastAPI):
    app.include_router(websocket_router)
    app.include_router(tinyurl_router)
    app.include_router(webpush_router)
+    app.include_router(users_router)
+
+
+__all__ = ["core_app", "core_app_extra", "db"]
@@ -0,0 +1,95 @@
+import asyncio
+import importlib
+
+from loguru import logger
+
+from lnbits.core import core_app_extra
+from lnbits.core.crud import (
+    create_installed_extension,
+    delete_installed_extension,
+    get_db_version,
+    get_installed_extension,
+    update_installed_extension_state,
+)
+from lnbits.core.helpers import migrate_extension_database
+from lnbits.settings import settings
+
+from .models import Extension, InstallableExtension
+
+
+async def install_extension(ext_info: InstallableExtension) -> Extension:
+    ext_id = ext_info.id
+    extension = Extension.from_installable_ext(ext_info)
+    installed_ext = await get_installed_extension(ext_id)
+    if installed_ext:
+        ext_info.meta = installed_ext.meta
+
+    await ext_info.download_archive()
+
+    ext_info.extract_archive()
+
+    db_version = await get_db_version(ext_id)
+    await migrate_extension_database(ext_info, db_version)
+
+    await create_installed_extension(ext_info)
+
+    if extension.is_upgrade_extension:
+        # call stop while the old routes are still active
+        await stop_extension_background_work(ext_id)
+
+    return extension
+
+
+async def uninstall_extension(ext_id: str):
+    await stop_extension_background_work(ext_id)
+
+    settings.deactivate_extension_paths(ext_id)
+
+    extension = await get_installed_extension(ext_id)
+    if extension:
+        extension.clean_extension_files()
+    await delete_installed_extension(ext_id=ext_id)
+
+
+async def activate_extension(ext: Extension):
+    core_app_extra.register_new_ext_routes(ext)
+    await update_installed_extension_state(ext_id=ext.code, active=True)
+
+
+async def deactivate_extension(ext_id: str):
+    settings.deactivate_extension_paths(ext_id)
+    await update_installed_extension_state(ext_id=ext_id, active=False)
+
+
+async def stop_extension_background_work(ext_id: str) -> bool:
+    """
+    Stop background work for extension (like asyncio.Tasks, WebSockets, etc).
+    Extensions SHOULD expose a `api_stop()` function.
+    """
+    upgrade_hash = settings.lnbits_upgraded_extensions.get(ext_id, "")
+    ext = Extension(ext_id, True, False, upgrade_hash=upgrade_hash)
+
+    try:
+        logger.info(f"Stopping background work for extension '{ext.module_name}'.")
+        old_module = importlib.import_module(ext.module_name)
+
+        # Extensions must expose an `{ext_id}_stop()` function at the module level
+        # The `api_stop()` function is for backwards compatibility (will be deprecated)
+        stop_fns = [f"{ext_id}_stop", "api_stop"]
+        stop_fn_name = next((fn for fn in stop_fns if hasattr(old_module, fn)), None)
+        assert stop_fn_name, f"No stop function found for '{ext.module_name}'."
+
+        stop_fn = getattr(old_module, stop_fn_name)
+        if stop_fn:
+            if asyncio.iscoroutinefunction(stop_fn):
+                await stop_fn()
+            else:
+                stop_fn()
+
+        logger.info(f"Stopped background work for extension '{ext.module_name}'.")
+    except Exception as ex:
+        logger.warning(f"Failed to stop background work for '{ext.module_name}'.")
+        logger.warning(ex)
+        return False
+
+    return True
@@ -0,0 +1,56 @@
+import hashlib
+from typing import Any, Optional
+from urllib import request
+
+import httpx
+from loguru import logger
+from packaging import version
+
+from lnbits.settings import settings
+
+
+def version_parse(v: str):
+    """
+    Wrapper for version.parse() that does not throw if the version is invalid.
+    Instead it return the lowest possible version ("0.0.0")
+    """
+    try:
+        return version.parse(v)
+    except Exception:
+        return version.parse("0.0.0")
+
+
+async def github_api_get(url: str, error_msg: Optional[str]) -> Any:
+    headers = {"User-Agent": settings.user_agent}
+    if settings.lnbits_ext_github_token:
+        headers["Authorization"] = f"Bearer {settings.lnbits_ext_github_token}"
+    async with httpx.AsyncClient(headers=headers) as client:
+        resp = await client.get(url)
+        if resp.status_code != 200:
+            logger.warning(f"{error_msg} ({url}): {resp.text}")
+        resp.raise_for_status()
+        return resp.json()
+
+
+def download_url(url, save_path):
+    with request.urlopen(url, timeout=60) as dl_file:
+        with open(save_path, "wb") as out_file:
+            out_file.write(dl_file.read())
+
+
+def file_hash(filename):
+    h = hashlib.sha256()
+    b = bytearray(128 * 1024)
+    mv = memoryview(b)
+    with open(filename, "rb", buffering=0) as f:
+        while n := f.readinto(mv):
+            h.update(mv[:n])
+    return h.hexdigest()
+
+
+def icon_to_github_url(source_repo: str, path: Optional[str]) -> str:
+    if not path:
+        return ""
+    _, _, *rest = path.split("/")
+    tail = "/".join(rest)
+    return f"https://github.com/{source_repo}/raw/main/{tail}"
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import asyncio
 import hashlib
 import json
@@ -6,16 +8,22 @@ import shutil
 import sys
 import zipfile
 from pathlib import Path
-from typing import Any, List, NamedTuple, Optional, Tuple
-from urllib import request
+from typing import Any, NamedTuple, Optional

 import httpx
 from loguru import logger
-from packaging import version
 from pydantic import BaseModel

 from lnbits.settings import settings

+from .helpers import (
+    download_url,
+    file_hash,
+    github_api_get,
+    icon_to_github_url,
+    version_parse,
+)
+

 class ExplicitRelease(BaseModel):
    id: str
@@ -23,7 +31,7 @@ class ExplicitRelease(BaseModel):
    version: str
    archive: str
    hash: str
-    dependencies: List[str] = []
+    dependencies: list[str] = []
    repo: Optional[str]
    icon: Optional[str]
    short_description: Optional[str]
@@ -32,6 +40,7 @@ class ExplicitRelease(BaseModel):
    warning: Optional[str]
    info_notification: Optional[str]
    critical_notification: Optional[str]
+    details_link: Optional[str]
    pay_link: Optional[str]

    def is_version_compatible(self):
@@ -47,9 +56,9 @@ class GitHubRelease(BaseModel):


 class Manifest(BaseModel):
-    featured: List[str] = []
-    extensions: List["ExplicitRelease"] = []
-    repos: List["GitHubRelease"] = []
+    featured: list[str] = []
+    extensions: list[ExplicitRelease] = []
+    repos: list[GitHubRelease] = []


 class GitHubRepoRelease(BaseModel):
@@ -58,6 +67,9 @@ class GitHubRepoRelease(BaseModel):
    zipball_url: str
    html_url: str

+    def details_link(self, source_repo: str) -> str:
+        return f"https://raw.githubusercontent.com/{source_repo}/{self.tag_name}/config.json"
+

 class GitHubRepo(BaseModel):
    stargazers_count: str
@@ -77,6 +89,17 @@ class ExtensionConfig(BaseModel):
            return True
        return version_parse(self.min_lnbits_version) <= version_parse(settings.version)

+    @classmethod
+    async def fetch_github_release_config(
+        cls, org: str, repo: str, tag_name: str
+    ) -> Optional[ExtensionConfig]:
+        config_url = (
+            f"https://raw.githubusercontent.com/{org}/{repo}/{tag_name}/config.json"
+        )
+        error_msg = "Cannot fetch GitHub extension config"
+        config = await github_api_get(config_url, error_msg)
+        return ExtensionConfig.parse_obj(config)
+

 class ReleasePaymentInfo(BaseModel):
    amount: Optional[int] = None
@@ -85,104 +108,38 @@ class ReleasePaymentInfo(BaseModel):
    payment_request: Optional[str] = None


-def download_url(url, save_path):
-    with request.urlopen(url, timeout=60) as dl_file:
-        with open(save_path, "wb") as out_file:
-            out_file.write(dl_file.read())
+class PayToEnableInfo(BaseModel):
+    amount: int
+    required: bool = False
+    wallet: Optional[str] = None


-def file_hash(filename):
-    h = hashlib.sha256()
-    b = bytearray(128 * 1024)
-    mv = memoryview(b)
-    with open(filename, "rb", buffering=0) as f:
-        while n := f.readinto(mv):
-            h.update(mv[:n])
-    return h.hexdigest()
+class UserExtensionInfo(BaseModel):
+    paid_to_enable: Optional[bool] = False
+    payment_hash_to_enable: Optional[str] = None


-async def fetch_github_repo_info(
-    org: str, repository: str
-) -> Tuple[GitHubRepo, GitHubRepoRelease, ExtensionConfig]:
-    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)
+class UserExtension(BaseModel):
+    user: str
+    extension: str
+    active: bool
+    extra: Optional[UserExtensionInfo] = None

-    lates_release_url = (
-        f"https://api.github.com/repos/{org}/{repository}/releases/latest"
-    )
-    error_msg = "Cannot fetch extension releases"
-    latest_release: Any = await github_api_get(lates_release_url, error_msg)
+    @property
+    def is_paid(self) -> bool:
+        if not self.extra:
+            return False
+        return self.extra.paid_to_enable is True

-    config_url = f"https://raw.githubusercontent.com/{org}/{repository}/{github_repo.default_branch}/config.json"
-    error_msg = "Cannot fetch config for extension"
-    config = await github_api_get(config_url, error_msg)
-
-    return (
-        github_repo,
-        GitHubRepoRelease.parse_obj(latest_release),
-        ExtensionConfig.parse_obj(config),
-    )
-
-
-async def fetch_manifest(url) -> Manifest:
-    error_msg = "Cannot fetch extensions manifest"
-    manifest = await github_api_get(url, error_msg)
-    return Manifest.parse_obj(manifest)
-
-
-async def fetch_github_releases(org: str, repo: str) -> List[GitHubRepoRelease]:
-    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]
-
-
-async def fetch_github_release_config(
-    org: str, repo: str, tag_name: str
-) -> Optional[ExtensionConfig]:
-    config_url = (
-        f"https://raw.githubusercontent.com/{org}/{repo}/{tag_name}/config.json"
-    )
-    error_msg = "Cannot fetch GitHub extension config"
-    config = await github_api_get(config_url, error_msg)
-    return ExtensionConfig.parse_obj(config)
-
-
-async def github_api_get(url: str, error_msg: Optional[str]) -> Any:
-    headers = {"User-Agent": settings.user_agent}
-    if settings.lnbits_ext_github_token:
-        headers["Authorization"] = f"Bearer {settings.lnbits_ext_github_token}"
-    async with httpx.AsyncClient(headers=headers) as client:
-        resp = await client.get(url)
-        if resp.status_code != 200:
-            logger.warning(f"{error_msg} ({url}): {resp.text}")
-        resp.raise_for_status()
-        return resp.json()
-
-
-async def fetch_release_payment_info(
-    url: str, amount: Optional[int] = None
-) -> Optional[ReleasePaymentInfo]:
-    if amount:
-        url = f"{url}?amount={amount}"
-    try:
-        async with httpx.AsyncClient() as client:
-            resp = await client.get(url)
-            resp.raise_for_status()
-            return ReleasePaymentInfo(**resp.json())
-    except Exception as e:
-        logger.warning(e)
-        return None
-
-
-def icon_to_github_url(source_repo: str, path: Optional[str]) -> str:
-    if not path:
-        return ""
-    _, _, *rest = path.split("/")
-    tail = "/".join(rest)
-    return f"https://github.com/{source_repo}/raw/main/{tail}"
+    @classmethod
+    def from_row(cls, data: dict) -> UserExtension:
+        ext = UserExtension(**data)
+        ext.extra = (
+            UserExtensionInfo(**json.loads(data["_extra"] or "{}"))
+            if "_extra" in data
+            else None
+        )
+        return ext


 class Extension(NamedTuple):
@@ -192,7 +149,7 @@ class Extension(NamedTuple):
    name: Optional[str] = None
    short_description: Optional[str] = None
    tile: Optional[str] = None
-    contributors: Optional[List[str]] = None
+    contributors: Optional[list[str]] = None
    hidden: bool = False
    migration_module: Optional[str] = None
    db_name: Optional[str] = None
@@ -214,7 +171,7 @@ class Extension(NamedTuple):
        return self.upgrade_hash != ""

    @classmethod
-    def from_installable_ext(cls, ext_info: "InstallableExtension") -> "Extension":
+    def from_installable_ext(cls, ext_info: InstallableExtension) -> Extension:
        return Extension(
            code=ext_info.id,
            is_valid=True,
@@ -223,21 +180,43 @@ class Extension(NamedTuple):
            upgrade_hash=ext_info.hash if ext_info.module_installed else "",
        )

+    @classmethod
+    def get_valid_extensions(
+        cls, include_deactivated: Optional[bool] = True
+    ) -> list[Extension]:
+        valid_extensions = [
+            extension for extension in cls._extensions() if extension.is_valid
+        ]

-# All subdirectories in the current directory, not recursive.
+        if include_deactivated:
+            return valid_extensions

+        if settings.lnbits_extensions_deactivate_all:
+            return []

-class ExtensionManager:
-    def __init__(self) -> None:
+        return [
+            e
+            for e in valid_extensions
+            if e.code not in settings.lnbits_deactivated_extensions
+        ]
+
+    @classmethod
+    def get_valid_extension(
+        cls, ext_id: str, include_deactivated: Optional[bool] = True
+    ) -> Optional[Extension]:
+        all_extensions = cls.get_valid_extensions(include_deactivated)
+        return next((e for e in all_extensions if e.code == ext_id), None)
+
+    @classmethod
+    def _extensions(cls) -> list[Extension]:
        p = Path(settings.lnbits_extensions_path, "extensions")
        Path(p).mkdir(parents=True, exist_ok=True)
-        self._extension_folders: List[Path] = [f for f in p.iterdir() if f.is_dir()]
+        extension_folders: list[Path] = [f for f in p.iterdir() if f.is_dir()]

-    @property
-    def extensions(self) -> List[Extension]:
-        output: List[Extension] = []
+        # todo: remove this property somehow, it is too expensive
+        output: list[Extension] = []

-        for extension_folder in self._extension_folders:
+        for extension_folder in extension_folders:
            extension_code = extension_folder.parts[-1]
            try:
                with open(extension_folder / "config.json") as json_file:
@@ -281,6 +260,7 @@ class ExtensionRelease(BaseModel):
    warning: Optional[str] = None
    repo: Optional[str] = None
    icon: Optional[str] = None
+    details_link: Optional[str] = None

    pay_link: Optional[str] = None
    cost_sats: Optional[int] = None
@@ -299,13 +279,27 @@ class ExtensionRelease(BaseModel):
        if not self.pay_link:
            return

-        payment_info = await fetch_release_payment_info(self.pay_link)
+        payment_info = await self.fetch_release_payment_info()
        self.cost_sats = payment_info.amount if payment_info else None

+    async def fetch_release_payment_info(
+        self, amount: Optional[int] = None
+    ) -> Optional[ReleasePaymentInfo]:
+        url = f"{self.pay_link}?amount={amount}" if amount else self.pay_link
+        assert url, "Missing URL for payment info."
+        try:
+            async with httpx.AsyncClient() as client:
+                resp = await client.get(url)
+                resp.raise_for_status()
+                return ReleasePaymentInfo(**resp.json())
+        except Exception as e:
+            logger.warning(e)
+            return None
+
    @classmethod
    def from_github_release(
-        cls, source_repo: str, r: "GitHubRepoRelease"
-    ) -> "ExtensionRelease":
+        cls, source_repo: str, r: GitHubRepoRelease
+    ) -> ExtensionRelease:
        return ExtensionRelease(
            name=r.name,
            description=r.name,
@@ -313,14 +307,15 @@ class ExtensionRelease(BaseModel):
            archive=r.zipball_url,
            source_repo=source_repo,
            is_github_release=True,
+            details_link=r.details_link(source_repo),
            repo=f"https://github.com/{source_repo}",
            html_url=r.html_url,
        )

    @classmethod
    def from_explicit_release(
-        cls, source_repo: str, e: "ExplicitRelease"
-    ) -> "ExtensionRelease":
+        cls, source_repo: str, e: ExplicitRelease
+    ) -> ExtensionRelease:
        return ExtensionRelease(
            name=e.name,
            version=e.version,
@@ -332,15 +327,16 @@ class ExtensionRelease(BaseModel):
            is_version_compatible=e.is_version_compatible(),
            warning=e.warning,
            html_url=e.html_url,
+            details_link=e.details_link,
            pay_link=e.pay_link,
            repo=e.repo,
            icon=e.icon,
        )

    @classmethod
-    async def get_github_releases(cls, org: str, repo: str) -> List["ExtensionRelease"]:
+    async def get_github_releases(cls, org: str, repo: str) -> list[ExtensionRelease]:
        try:
-            github_releases = await fetch_github_releases(org, repo)
+            github_releases = await cls.fetch_github_releases(org, repo)
            return [
                ExtensionRelease.from_github_release(f"{org}/{repo}", r)
                for r in github_releases
@@ -349,28 +345,65 @@ class ExtensionRelease(BaseModel):
            logger.warning(e)
            return []

+    @classmethod
+    async def fetch_github_releases(
+        cls, org: str, repo: str
+    ) -> list[GitHubRepoRelease]:
+        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]
+
+    @classmethod
+    async def fetch_release_details(cls, details_link: str) -> Optional[dict]:
+
+        try:
+            async with httpx.AsyncClient() as client:
+                resp = await client.get(details_link)
+                resp.raise_for_status()
+                data = resp.json()
+                if "description_md" in data:
+                    resp = await client.get(data["description_md"])
+                    if not resp.is_error:
+                        data["description_md"] = resp.text
+
+                return data
+        except Exception as e:
+            logger.warning(e)
+            return None
+
+
+class ExtensionMeta(BaseModel):
+    installed_release: Optional[ExtensionRelease] = None
+    latest_release: Optional[ExtensionRelease] = None
+    pay_to_enable: Optional[PayToEnableInfo] = None
+    payments: list[ReleasePaymentInfo] = []
+    dependencies: list[str] = []
+    archive: Optional[str] = None
+    featured: bool = False
+

 class InstallableExtension(BaseModel):
    id: str
    name: str
+    version: str
+    active: Optional[bool] = False
    short_description: Optional[str] = None
    icon: Optional[str] = None
-    dependencies: List[str] = []
-    is_admin_only: bool = False
    stars: int = 0
-    featured = False
-    latest_release: Optional[ExtensionRelease] = None
-    installed_release: Optional[ExtensionRelease] = None
-    payments: List[ReleasePaymentInfo] = []
-    archive: Optional[str] = None
+    meta: Optional[ExtensionMeta] = None
+
+    @property
+    def is_admin_only(self) -> bool:
+        return self.id in settings.lnbits_admin_extensions

    @property
    def hash(self) -> str:
-        if self.installed_release:
-            if self.installed_release.hash:
-                return self.installed_release.hash
+        if self.meta and self.meta.installed_release:
+            if self.meta.installed_release.hash:
+                return self.meta.installed_release.hash
            m = hashlib.sha256()
-            m.update(f"{self.installed_release.archive}".encode())
+            m.update(f"{self.meta.installed_release.archive}".encode())
            return m.hexdigest()
        return "not-installed"

@@ -408,32 +441,44 @@ class InstallableExtension(BaseModel):

    @property
    def installed_version(self) -> str:
-        if self.installed_release:
-            return self.installed_release.version
+        if self.meta and self.meta.installed_release:
+            return self.meta.installed_release.version
        return ""

+    @property
+    def requires_payment(self) -> bool:
+        if not self.meta or not self.meta.pay_to_enable:
+            return False
+        return self.meta.pay_to_enable.required is True
+
    async def download_archive(self):
        logger.info(f"Downloading extension {self.name} ({self.installed_version}).")
        ext_zip_file = self.zip_path
        if ext_zip_file.is_file():
            os.remove(ext_zip_file)
        try:
-            assert self.installed_release, "installed_release is none."
+            assert (
+                self.meta and self.meta.installed_release
+            ), "installed_release is none."

            self._restore_payment_info()

            await asyncio.to_thread(
-                download_url, self.installed_release.archive_url, ext_zip_file
+                download_url, self.meta.installed_release.archive_url, ext_zip_file
            )

            self._remember_payment_info()

-        except Exception as ex:
-            logger.warning(ex)
-            raise AssertionError("Cannot fetch extension archive file")
+        except Exception as exc:
+            logger.warning(exc)
+            raise AssertionError("Cannot fetch extension archive file") from exc

        archive_hash = file_hash(ext_zip_file)
-        if self.installed_release.hash and self.installed_release.hash != archive_hash:
+        if (
+            self.meta
+            and self.meta.installed_release.hash
+            and self.meta.installed_release.hash != archive_hash
+        ):
            # remove downloaded archive
            if ext_zip_file.is_file():
                os.remove(ext_zip_file)
@@ -467,33 +512,18 @@ class InstallableExtension(BaseModel):
            self.short_description = config_json.get("short_description")

            if (
-                self.installed_release
-                and self.installed_release.is_github_release
+                self.meta
+                and self.meta.installed_release
+                and self.meta.installed_release.is_github_release
                and config_json.get("tile")
            ):
                self.icon = icon_to_github_url(
-                    self.installed_release.source_repo, config_json.get("tile")
+                    self.meta.installed_release.source_repo, config_json.get("tile")
                )

        shutil.rmtree(self.ext_dir, True)
        shutil.copytree(Path(self.ext_upgrade_dir), Path(self.ext_dir))
-        logger.success(f"Extension {self.name} ({self.installed_version}) installed.")
-
-    def notify_upgrade(self) -> None:
-        """
-        Update the list of upgraded extensions. The middleware will perform
-        redirects based on this
-        """
-
-        clean_upgraded_exts = list(
-            filter(
-                lambda old_ext: not old_ext.endswith(f"/{self.id}"),
-                settings.lnbits_upgraded_extensions,
-            )
-        )
-        settings.lnbits_upgraded_extensions = clean_upgraded_exts + [
-            f"{self.hash}/{self.id}"
-        ]
+        logger.info(f"Extension {self.name} ({self.installed_version}) extracted.")

    def clean_extension_files(self):
        # remove downloaded archive
@@ -508,80 +538,78 @@ class InstallableExtension(BaseModel):
    def check_latest_version(self, release: Optional[ExtensionRelease]):
        if not release:
            return
-        if not self.latest_release:
-            self.latest_release = release
+        if not self.meta or not self.meta.latest_release:
+            meta = self.meta or ExtensionMeta()
+            meta.latest_release = release
+            self.meta = meta
            return
-        if version_parse(self.latest_release.version) < version_parse(release.version):
-            self.latest_release = release
+        if version_parse(self.meta.latest_release.version) < version_parse(
+            release.version
+        ):
+            self.meta.latest_release = release

    def find_existing_payment(
        self, pay_link: Optional[str]
    ) -> Optional[ReleasePaymentInfo]:
-        if not pay_link:
+        if not pay_link or not self.meta or not self.meta.payments:
            return None
        return next(
-            (p for p in self.payments if p.pay_link == pay_link),
+            (p for p in self.meta.payments if p.pay_link == pay_link),
            None,
        )

    def _restore_payment_info(self):
-        if not self.installed_release:
+        if (
+            not self.meta
+            or not self.meta.installed_release
+            or not self.meta.installed_release.pay_link
+            or not self.meta.installed_release.payment_hash
+        ):
            return
-        if not self.installed_release.pay_link:
-            return
-        if self.installed_release.payment_hash:
-            return
-        payment_info = self.find_existing_payment(self.installed_release.pay_link)
+        payment_info = self.find_existing_payment(self.meta.installed_release.pay_link)
        if payment_info:
-            self.installed_release.payment_hash = payment_info.payment_hash
+            self.meta.installed_release.payment_hash = payment_info.payment_hash

    def _remember_payment_info(self):
-        if not self.installed_release or not self.installed_release.pay_link:
+        if (
+            not self.meta
+            or not self.meta.installed_release
+            or not self.meta.installed_release.pay_link
+        ):
            return
        payment_info = ReleasePaymentInfo(
-            amount=self.installed_release.cost_sats,
-            pay_link=self.installed_release.pay_link,
-            payment_hash=self.installed_release.payment_hash,
+            amount=self.meta.installed_release.cost_sats,
+            pay_link=self.meta.installed_release.pay_link,
+            payment_hash=self.meta.installed_release.payment_hash,
        )
-        self.payments = [
-            p for p in self.payments if p.pay_link != payment_info.pay_link
+        self.meta.payments = [
+            p for p in self.meta.payments if p.pay_link != payment_info.pay_link
        ]
-        self.payments.append(payment_info)
-
-    @classmethod
-    def from_row(cls, data: dict) -> "InstallableExtension":
-        meta = json.loads(data["meta"])
-        ext = InstallableExtension(**data)
-        if "installed_release" in meta:
-            ext.installed_release = ExtensionRelease(**meta["installed_release"])
-        if meta.get("payments"):
-            ext.payments = [ReleasePaymentInfo(**p) for p in meta["payments"]]
-        return ext
-
-    @classmethod
-    def from_rows(cls, rows: List[Any] = []) -> List["InstallableExtension"]:
-        return [InstallableExtension.from_row(row) for row in rows]
+        self.meta.payments.append(payment_info)

    @classmethod
    async def from_github_release(
        cls, github_release: GitHubRelease
-    ) -> Optional["InstallableExtension"]:
+    ) -> Optional[InstallableExtension]:
        try:
-            repo, latest_release, config = await fetch_github_repo_info(
+            repo, latest_release, config = await cls.fetch_github_repo_info(
                github_release.organisation, github_release.repository
            )
-
+            source_repo = f"{github_release.organisation}/{github_release.repository}"
            return InstallableExtension(
                id=github_release.id,
                name=config.name,
+                version=latest_release.tag_name,
                short_description=config.short_description,
                stars=int(repo.stargazers_count),
                icon=icon_to_github_url(
-                    f"{github_release.organisation}/{github_release.repository}",
+                    source_repo,
                    config.tile,
                ),
-                latest_release=ExtensionRelease.from_github_release(
-                    repo.html_url, latest_release
+                meta=ExtensionMeta(
+                    latest_release=ExtensionRelease.from_github_release(
+                        source_repo, latest_release
+                    ),
                ),
            )
        except Exception as e:
@@ -589,26 +617,27 @@ class InstallableExtension(BaseModel):
        return None

    @classmethod
-    def from_explicit_release(cls, e: ExplicitRelease) -> "InstallableExtension":
+    def from_explicit_release(cls, e: ExplicitRelease) -> InstallableExtension:
+        meta = ExtensionMeta(archive=e.archive, dependencies=e.dependencies)
        return InstallableExtension(
            id=e.id,
            name=e.name,
-            archive=e.archive,
+            version=e.version,
            short_description=e.short_description,
            icon=e.icon,
-            dependencies=e.dependencies,
+            meta=meta,
        )

    @classmethod
    async def get_installable_extensions(
        cls,
-    ) -> List["InstallableExtension"]:
-        extension_list: List[InstallableExtension] = []
-        extension_id_list: List[str] = []
+    ) -> list[InstallableExtension]:
+        extension_list: list[InstallableExtension] = []
+        extension_id_list: list[str] = []

        for url in settings.lnbits_extensions_manifests:
            try:
-                manifest = await fetch_manifest(url)
+                manifest = await cls.fetch_manifest(url)

                for r in manifest.repos:
                    ext = await InstallableExtension.from_github_release(r)
@@ -617,11 +646,13 @@ class InstallableExtension(BaseModel):
                    existing_ext = next(
                        (ee for ee in extension_list if ee.id == r.id), None
                    )
-                    if existing_ext:
-                        existing_ext.check_latest_version(ext.latest_release)
+                    if existing_ext and ext.meta:
+                        existing_ext.check_latest_version(ext.meta.latest_release)
                        continue

-                    ext.featured = ext.id in manifest.featured
+                    meta = ext.meta or ExtensionMeta()
+                    meta.featured = ext.id in manifest.featured
+                    ext.meta = meta
                    extension_list += [ext]
                    extension_id_list += [ext.id]

@@ -635,21 +666,23 @@ class InstallableExtension(BaseModel):
                        continue
                    ext = InstallableExtension.from_explicit_release(e)
                    ext.check_latest_version(release)
-                    ext.featured = ext.id in manifest.featured
+                    meta = ext.meta or ExtensionMeta()
+                    meta.featured = ext.id in manifest.featured
+                    ext.meta = meta
                    extension_list += [ext]
                    extension_id_list += [e.id]
            except Exception as e:
-                logger.warning(f"Manifest {url} failed with '{str(e)}'")
+                logger.warning(f"Manifest {url} failed with '{e!s}'")

        return extension_list

    @classmethod
-    async def get_extension_releases(cls, ext_id: str) -> List["ExtensionRelease"]:
-        extension_releases: List[ExtensionRelease] = []
+    async def get_extension_releases(cls, ext_id: str) -> list[ExtensionRelease]:
+        extension_releases: list[ExtensionRelease] = []

        for url in settings.lnbits_extensions_manifests:
            try:
-                manifest = await fetch_manifest(url)
+                manifest = await cls.fetch_manifest(url)
                for r in manifest.repos:
                    if r.id != ext_id:
                        continue
@@ -666,15 +699,15 @@ class InstallableExtension(BaseModel):
                    extension_releases.append(explicit_release)

            except Exception as e:
-                logger.warning(f"Manifest {url} failed with '{str(e)}'")
+                logger.warning(f"Manifest {url} failed with '{e!s}'")

        return extension_releases

    @classmethod
    async def get_extension_release(
        cls, ext_id: str, source_repo: str, archive: str, version: str
-    ) -> Optional["ExtensionRelease"]:
-        all_releases: List[ExtensionRelease] = (
+    ) -> Optional[ExtensionRelease]:
+        all_releases: list[ExtensionRelease] = (
            await InstallableExtension.get_extension_releases(ext_id)
        )
        selected_release = [
@@ -687,6 +720,37 @@ class InstallableExtension(BaseModel):

        return selected_release[0] if len(selected_release) != 0 else None

+    @classmethod
+    async def fetch_github_repo_info(
+        cls, org: str, repository: str
+    ) -> tuple[GitHubRepo, GitHubRepoRelease, ExtensionConfig]:
+        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)
+
+        lates_release_url = (
+            f"https://api.github.com/repos/{org}/{repository}/releases/latest"
+        )
+        error_msg = "Cannot fetch extension releases"
+        latest_release: Any = await github_api_get(lates_release_url, error_msg)
+
+        config_url = f"https://raw.githubusercontent.com/{org}/{repository}/{github_repo.default_branch}/config.json"
+        error_msg = "Cannot fetch config for extension"
+        config = await github_api_get(config_url, error_msg)
+
+        return (
+            github_repo,
+            GitHubRepoRelease.parse_obj(latest_release),
+            ExtensionConfig.parse_obj(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)
+

 class CreateExtension(BaseModel):
    ext_id: str
@@ -697,30 +761,7 @@ class CreateExtension(BaseModel):
    payment_hash: Optional[str] = None


-def get_valid_extensions(include_deactivated: Optional[bool] = True) -> List[Extension]:
-    valid_extensions = [
-        extension for extension in ExtensionManager().extensions if extension.is_valid
-    ]
-
-    if include_deactivated:
-        return valid_extensions
-
-    if settings.lnbits_extensions_deactivate_all:
-        return []
-
-    return [
-        e
-        for e in valid_extensions
-        if e.code not in settings.lnbits_deactivated_extensions
-    ]
-
-
-def version_parse(v: str):
-    """
-    Wrapper for version.parse() that does not throw if the version is invalid.
-    Instead it return the lowest possible version ("0.0.0")
-    """
-    try:
-        return version.parse(v)
-    except Exception:
-        return version.parse("0.0.0")
+class ExtensionDetailsRequest(BaseModel):
+    ext_id: str
+    source_repo: str
+    version: str
@@ -1,42 +1,51 @@
 import importlib
 import re
 from typing import Any, Optional
+from urllib.parse import urlparse
 from uuid import UUID

-import httpx
 from loguru import logger

+from lnbits.core import migrations as core_migrations
+from lnbits.core.crud import (
+    get_db_versions,
+    get_installed_extensions,
+    update_migration_version,
+)
 from lnbits.core.db import db as core_db
-from lnbits.db import Connection
-from lnbits.extension_manager import Extension
+from lnbits.core.extensions.models import InstallableExtension
+from lnbits.core.models import DbVersion
+from lnbits.db import COCKROACH, POSTGRES, SQLITE, Connection
 from lnbits.settings import settings

-from .crud import update_migration_version

+async def migrate_extension_database(
+    ext: InstallableExtension, current_version: Optional[DbVersion] = None
+):

-async def migrate_extension_database(ext: Extension, current_version):
    try:
        ext_migrations = importlib.import_module(f"{ext.module_name}.migrations")
        ext_db = importlib.import_module(ext.module_name).db
-    except ImportError as e:
-        logger.error(e)
-        raise ImportError(
-            f"Please make sure that the extension `{ext.code}` has a migrations file."
-        )
+    except ImportError as exc:
+        logger.error(exc)
+        raise ImportError(f"Cannot import module for extension '{ext.id}'.") from exc

    async with ext_db.connect() as ext_conn:
-        await run_migration(ext_conn, ext_migrations, ext.code, current_version)
+        await run_migration(ext_conn, ext_migrations, ext.id, current_version)


 async def run_migration(
-    db: Connection, migrations_module: Any, db_name: str, current_version: int
+    db: Connection,
+    migrations_module: Any,
+    db_name: str,
+    current_version: Optional[DbVersion] = None,
 ):
    matcher = re.compile(r"^m(\d\d\d)_")
    for key, migrate in migrations_module.__dict__.items():
        match = matcher.match(key)
        if match:
            version = int(match.group(1))
-            if version > current_version:
+            if not current_version or version > current_version.version:
                logger.debug(f"running migration {db_name}.{version}")
                print(f"running migration {db_name}.{version}")
                await migrate(db)
@@ -48,72 +57,73 @@ async def run_migration(
                        await update_migration_version(conn, db_name, version)


-async def stop_extension_background_work(
-    ext_id: str, user: str, access_token: Optional[str] = None
-):
-    """
-    Stop background work for extension (like asyncio.Tasks, WebSockets, etc).
-    Extensions SHOULD expose a `api_stop()` function and/or a DELETE enpoint
-    at the root level of their API.
-    """
-    stopped = await _stop_extension_background_work(ext_id)
-
-    if not stopped:
-        # fallback to REST API call
-        await _stop_extension_background_work_via_api(ext_id, user, access_token)
-
-
-async def _stop_extension_background_work(ext_id) -> bool:
-    upgrade_hash = settings.extension_upgrade_hash(ext_id) or ""
-    ext = Extension(ext_id, True, False, upgrade_hash=upgrade_hash)
-
-    try:
-        logger.info(f"Stopping background work for extension '{ext.module_name}'.")
-        old_module = importlib.import_module(ext.module_name)
-
-        # Extensions must expose an `{ext_id}_stop()` function at the module level
-        # The `api_stop()` function is for backwards compatibility (will be deprecated)
-        stop_fns = [f"{ext_id}_stop", "api_stop"]
-        stop_fn_name = next((fn for fn in stop_fns if hasattr(old_module, fn)), None)
-        assert stop_fn_name, "No stop function found for '{ext.module_name}'"
-
-        await getattr(old_module, stop_fn_name)()
-
-        logger.info(f"Stopped background work for extension '{ext.module_name}'.")
-    except Exception as ex:
-        logger.warning(f"Failed to stop background work for '{ext.module_name}'.")
-        logger.warning(ex)
-        return False
-
-    return True
-
-
-async def _stop_extension_background_work_via_api(ext_id, user, access_token):
-    logger.info(
-        f"Stopping background work for extension '{ext_id}' using the REST API."
-    )
-    async with httpx.AsyncClient() as client:
-        try:
-            url = f"http://{settings.host}:{settings.port}/{ext_id}/api/v1?usr={user}"
-            headers = (
-                {"Authorization": "Bearer " + access_token} if access_token else None
-            )
-            resp = await client.delete(url=url, headers=headers)
-            resp.raise_for_status()
-            logger.info(f"Stopped background work for extension '{ext_id}'.")
-        except Exception as ex:
-            logger.warning(
-                f"Failed to stop background work for '{ext_id}' using the REST API."
-            )
-            logger.warning(ex)
-
-
 def to_valid_user_id(user_id: str) -> UUID:
    if len(user_id) < 32:
        raise ValueError("User ID must have at least 128 bits")
    try:
        int(user_id, 16)
-    except Exception:
-        raise ValueError("Invalid hex string for User ID.")
+    except Exception as exc:
+        raise ValueError("Invalid hex string for User ID.") from exc

    return UUID(hex=user_id[:32], version=4)
+
+
+async def load_disabled_extension_list() -> None:
+    """Update list of extensions that have been explicitly disabled"""
+    inactive_extensions = await get_installed_extensions(active=False)
+    settings.lnbits_deactivated_extensions.update([e.id for e in inactive_extensions])
+
+
+async def migrate_databases():
+    """Creates the necessary databases if they don't exist already; or migrates them."""
+
+    async with core_db.connect() as conn:
+        exists = False
+        if conn.type == SQLITE:
+            exists = await conn.fetchone(
+                "SELECT * FROM sqlite_master WHERE type='table' AND name='dbversions'"
+            )
+        elif conn.type in {POSTGRES, COCKROACH}:
+            exists = await conn.fetchone(
+                "SELECT * FROM information_schema.tables WHERE table_schema = 'public'"
+                " AND table_name = 'dbversions'"
+            )
+
+        if not exists:
+            await core_migrations.m000_create_migrations_table(conn)
+
+        current_versions = await get_db_versions(conn)
+        core_version = next(
+            (v for v in current_versions if v.db == "core"),
+            DbVersion(db="core", version=0),
+        )
+        await run_migration(conn, core_migrations, "core", core_version)
+
+    # here is the first place we can be sure that the
+    # `installed_extensions` table has been created
+    await load_disabled_extension_list()
+
+    for ext in await get_installed_extensions():
+        current_version = next(
+            (v for v in current_versions if v.db == ext.id),
+            DbVersion(db=ext.id, version=0),
+        )
+        if current_version is None:
+            logger.warning(
+                f"Extension {ext.id} has no migration version. This should not happen."
+            )
+            continue
+        try:
+            await migrate_extension_database(ext, current_version)
+        except Exception as e:
+            logger.exception(f"Error migrating extension {ext.id}: {e}")
+
+    logger.info("✔️ All migrations done.")
+
+
+def is_valid_url(url):
+    try:
+        result = urlparse(url)
+        return all([result.scheme, result.netloc])
+    except ValueError:
+        return False
@@ -1,4 +1,4 @@
-import datetime
+import json
 from time import time

 from loguru import logger
@@ -100,9 +100,8 @@ async def m002_add_fields_to_apipayments(db):
        await db.execute("ALTER TABLE apipayments ADD COLUMN bolt11 TEXT")
        await db.execute("ALTER TABLE apipayments ADD COLUMN extra TEXT")

-        import json
-
-        rows = await (await db.execute("SELECT * FROM apipayments")).fetchall()
+        result = await db.execute("SELECT * FROM apipayments")
+        rows = result.mappings().all()
        for row in rows:
            if not row["memo"] or not row["memo"].startswith("#"):
                continue
@@ -113,15 +112,15 @@ async def m002_add_fields_to_apipayments(db):
                    new = row["memo"][len(prefix) :]
                    await db.execute(
                        """
-                        UPDATE apipayments SET extra = ?, memo = ?
-                        WHERE checking_id = ? AND memo = ?
+                        UPDATE apipayments SET extra = :extra, memo = :memo1
+                        WHERE checking_id = :checking_id AND memo = :memo2
                        """,
-                        (
-                            json.dumps({"tag": ext}),
-                            new,
-                            row["checking_id"],
-                            row["memo"],
-                        ),
+                        {
+                            "extra": json.dumps({"tag": ext}),
+                            "memo1": new,
+                            "checking_id": row["checking_id"],
+                            "memo2": row["memo"],
+                        },
                    )
                    break
    except OperationalError:
@@ -212,19 +211,18 @@ async def m007_set_invoice_expiries(db):
    Precomputes invoice expiry for existing pending incoming payments.
    """
    try:
-        rows = await (
-            await db.execute(
-                f"""
-                SELECT bolt11, checking_id
-                FROM apipayments
-                WHERE pending = true
-                AND amount > 0
-                AND bolt11 IS NOT NULL
-                AND expiry IS NULL
-                AND time < {db.timestamp_now}
-                """
-            )
-        ).fetchall()
+        result = await db.execute(
+            f"""
+            SELECT bolt11, checking_id
+            FROM apipayments
+            WHERE pending = true
+            AND amount > 0
+            AND bolt11 IS NOT NULL
+            AND expiry IS NULL
+            AND time < {db.timestamp_now}
+            """
+        )
+        rows = result.mappings().all()
        if len(rows):
            logger.info(f"Migration: Checking expiry of {len(rows)} invoices")
        for i, (
@@ -236,22 +234,17 @@ async def m007_set_invoice_expiries(db):
                if invoice.expiry is None:
                    continue

-                expiration_date = datetime.datetime.fromtimestamp(
-                    invoice.date + invoice.expiry
-                )
+                expiration_date = invoice.date + invoice.expiry
                logger.info(
                    f"Migration: {i+1}/{len(rows)} setting expiry of invoice"
                    f" {invoice.payment_hash} to {expiration_date}"
                )
                await db.execute(
-                    """
-                    UPDATE apipayments SET expiry = ?
-                    WHERE checking_id = ? AND amount > 0
+                    f"""
+                    UPDATE apipayments SET expiry = {db.timestamp_placeholder('expiry')}
+                    WHERE checking_id = :checking_id AND amount > 0
                    """,
-                    (
-                        db.datetime_to_timestamp(expiration_date),
-                        checking_id,
-                    ),
+                    {"expiry": expiration_date, "checking_id": checking_id},
                )
            except Exception:
                continue
@@ -347,29 +340,34 @@ async def m014_set_deleted_wallets(db):
    Sets deleted column to wallets.
    """
    try:
-        rows = await (
-            await db.execute(
-                """
-                SELECT *
-                FROM wallets
-                WHERE user LIKE 'del:%'
-                AND adminkey LIKE 'del:%'
-                AND inkey LIKE 'del:%'
-                """
-            )
-        ).fetchall()
+        result = await db.execute(
+            """
+            SELECT *
+            FROM wallets
+            WHERE user LIKE 'del:%'
+            AND adminkey LIKE 'del:%'
+            AND inkey LIKE 'del:%'
+            """
+        )
+        rows = result.mappings().all()

        for row in rows:
            try:
-                user = row[2].split(":")[1]
-                adminkey = row[3].split(":")[1]
-                inkey = row[4].split(":")[1]
+                user = row["user"].split(":")[1]
+                adminkey = row["adminkey"].split(":")[1]
+                inkey = row["inkey"].split(":")[1]
                await db.execute(
                    """
-                    UPDATE wallets SET user = ?, adminkey = ?, inkey = ?, deleted = true
-                    WHERE id = ?
+                    UPDATE wallets SET
+                    "user" = :user, adminkey = :adminkey, inkey = :inkey, deleted = true
+                    WHERE id = :wallet
                    """,
-                    (user, adminkey, inkey, row[0]),
+                    {
+                        "user": user,
+                        "adminkey": adminkey,
+                        "inkey": inkey,
+                        "wallet": row.get("id"),
+                    },
                )
            except Exception:
                continue
@@ -455,19 +453,169 @@ async def m017_add_timestamp_columns_to_accounts_and_wallets(db):
        now = int(time())
        await db.execute(
            f"""
-            UPDATE wallets SET created_at = {db.timestamp_placeholder}
+            UPDATE wallets SET created_at = {db.timestamp_placeholder('now')}
            WHERE created_at IS NULL
            """,
-            (now,),
+            {"now": now},
        )
        await db.execute(
            f"""
-            UPDATE accounts SET created_at = {db.timestamp_placeholder}
+            UPDATE accounts SET created_at = {db.timestamp_placeholder('now')}
            WHERE created_at IS NULL
            """,
-            (now,),
+            {"now": now},
        )

    except OperationalError as exc:
        logger.error(f"Migration 17 failed: {exc}")
        pass
+
+
+async def m018_balances_view_exclude_deleted(db):
+    """
+    Make deleted wallets not show up in the balances view.
+    """
+    await db.execute("DROP VIEW balances")
+    await db.execute(
+        """
+        CREATE VIEW balances AS
+        SELECT apipayments.wallet,
+               SUM(apipayments.amount - ABS(apipayments.fee)) AS balance
+        FROM apipayments
+        LEFT JOIN wallets ON apipayments.wallet = wallets.id
+        WHERE (wallets.deleted = false OR wallets.deleted is NULL)
+              AND ((apipayments.pending = false AND apipayments.amount > 0)
+              OR apipayments.amount < 0)
+        GROUP BY wallet
+    """
+    )
+
+
+async def m019_balances_view_based_on_wallets(db):
+    """
+    Make deleted wallets not show up in the balances view.
+    Important for querying whole lnbits balances.
+    """
+    await db.execute("DROP VIEW balances")
+    await db.execute(
+        """
+        CREATE VIEW balances AS
+        SELECT apipayments.wallet,
+               SUM(apipayments.amount - ABS(apipayments.fee)) AS balance
+        FROM wallets
+        LEFT JOIN apipayments ON apipayments.wallet = wallets.id
+        WHERE (wallets.deleted = false OR wallets.deleted is NULL)
+              AND ((apipayments.pending = false AND apipayments.amount > 0)
+              OR apipayments.amount < 0)
+        GROUP BY apipayments.wallet
+    """
+    )
+
+
+async def m020_add_column_column_to_user_extensions(db):
+    """
+    Adds extra column to user extensions.
+    """
+    await db.execute("ALTER TABLE extensions ADD COLUMN extra TEXT")
+
+
+async def m021_add_success_failed_to_apipayments(db):
+    """
+    Adds success and failed columns to apipayments.
+    """
+    await db.execute("ALTER TABLE apipayments ADD COLUMN status TEXT DEFAULT 'pending'")
+    #  set all not pending to success true, failed payments were deleted until now
+    await db.execute("UPDATE apipayments SET status = 'success' WHERE NOT pending")
+
+    await db.execute("DROP VIEW balances")
+    await db.execute(
+        """
+        CREATE VIEW balances AS
+        SELECT apipayments.wallet,
+               SUM(apipayments.amount - ABS(apipayments.fee)) AS balance
+        FROM wallets
+        LEFT JOIN apipayments ON apipayments.wallet = wallets.id
+        WHERE (wallets.deleted = false OR wallets.deleted is NULL)
+        AND (
+            (apipayments.status = 'success' AND apipayments.amount > 0)
+            OR (apipayments.status IN ('success', 'pending') AND apipayments.amount < 0)
+        )
+        GROUP BY apipayments.wallet
+    """
+    )
+
+
+async def m022_add_pubkey_to_accounts(db):
+    """
+    Adds pubkey column to accounts.
+    """
+    try:
+        await db.execute("ALTER TABLE accounts ADD COLUMN pubkey TEXT")
+    except OperationalError:
+        pass
+
+
+async def m023_add_column_column_to_apipayments(db):
+    """
+    renames hash to payment_hash and drops unused index
+    """
+    await db.execute("DROP INDEX by_hash")
+    await db.execute("ALTER TABLE apipayments RENAME COLUMN hash TO payment_hash")
+    await db.execute("ALTER TABLE apipayments RENAME COLUMN wallet TO wallet_id")
+    await db.execute("ALTER TABLE accounts RENAME COLUMN pass TO password_hash")
+
+    await db.execute("CREATE INDEX by_hash ON apipayments (payment_hash)")
+
+
+async def m024_drop_pending(db):
+    await db.execute("ALTER TABLE apipayments DROP COLUMN pending")
+
+
+async def m025_refresh_view(db):
+    await db.execute("DROP VIEW balances")
+    await db.execute(
+        """
+        CREATE VIEW balances AS
+        SELECT apipayments.wallet_id,
+               SUM(apipayments.amount - ABS(apipayments.fee)) AS balance
+        FROM wallets
+        LEFT JOIN apipayments ON apipayments.wallet_id = wallets.id
+        WHERE (wallets.deleted = false OR wallets.deleted is NULL)
+        AND (
+            (apipayments.status = 'success' AND apipayments.amount > 0)
+            OR (apipayments.status IN ('success', 'pending') AND apipayments.amount < 0)
+        )
+        GROUP BY apipayments.wallet_id
+    """
+    )
+
+
+async def m026_update_payment_table(db):
+    await db.execute("ALTER TABLE apipayments ADD COLUMN tag TEXT")
+    await db.execute("ALTER TABLE apipayments ADD COLUMN extension TEXT")
+    await db.execute("ALTER TABLE apipayments ADD COLUMN created_at TIMESTAMP")
+    await db.execute("ALTER TABLE apipayments ADD COLUMN updated_at TIMESTAMP")
+
+
+async def m027_update_apipayments_data(db):
+    result = await db.execute("SELECT * FROM apipayments")
+    payments = result.mappings().all()
+    for payment in payments:
+        tag = None
+        created_at = payment.get("time")
+        if payment.get("extra"):
+            extra = json.loads(payment.get("extra"))
+            tag = extra.get("tag")
+        tsph = db.timestamp_placeholder("created_at")
+        await db.execute(
+            f"""
+            UPDATE apipayments
+            SET tag = :tag, created_at = {tsph}, updated_at = {tsph}
+            WHERE checking_id = :checking_id
+            """,
+            {
+                "tag": tag,
+                "created_at": created_at,
+                "checking_id": payment.get("checking_id"),
+            },
+        )
@@ -1,24 +1,29 @@
-import datetime
+from __future__ import annotations
+
 import hashlib
 import hmac
-import json
-import time
 from dataclasses import dataclass
+from datetime import datetime, timezone
 from enum import Enum
-from sqlite3 import Row
-from typing import Callable, Dict, List, Optional
+from typing import Callable, Optional

 from ecdsa import SECP256k1, SigningKey
 from fastapi import Query
-from loguru import logger
-from pydantic import BaseModel
+from passlib.context import CryptContext
+from pydantic import BaseModel, Field, validator

-from lnbits.db import Connection, FilterModel, FromRowModel
+from lnbits.db import FilterModel
 from lnbits.helpers import url_for
 from lnbits.lnurl import encode as lnurl_encode
 from lnbits.settings import settings
-from lnbits.wallets import get_wallet_class
-from lnbits.wallets.base import PaymentPendingStatus, PaymentStatus
+from lnbits.utils.exchange_rates import allowed_currencies
+from lnbits.wallets import get_funding_source
+from lnbits.wallets.base import (
+    PaymentFailedStatus,
+    PaymentPendingStatus,
+    PaymentStatus,
+    PaymentSuccessStatus,
+)


 class BaseWallet(BaseModel):
@@ -29,16 +34,21 @@ class BaseWallet(BaseModel):
    balance_msat: int


-class Wallet(BaseWallet):
+class Wallet(BaseModel):
+    id: str
    user: str
-    currency: Optional[str]
-    deleted: bool
-    created_at: Optional[int] = None
-    updated_at: Optional[int] = None
+    name: str
+    adminkey: str
+    inkey: str
+    deleted: bool = False
+    created_at: datetime = datetime.now(timezone.utc)
+    updated_at: datetime = datetime.now(timezone.utc)
+    currency: Optional[str] = None
+    balance_msat: int = Field(default=0, no_database=True)

    @property
    def balance(self) -> int:
-        return self.balance_msat // 1000
+        return int(self.balance_msat // 1000)

    @property
    def withdrawable_balance(self) -> int:
@@ -62,13 +72,8 @@ class Wallet(BaseWallet):
            linking_key, curve=SECP256k1, hashfunc=hashlib.sha256
        )

-    async def get_payment(self, payment_hash: str) -> Optional["Payment"]:
-        from .crud import get_standalone_payment

-        return await get_standalone_payment(payment_hash)
-
-
-class WalletType(Enum):
+class KeyType(Enum):
    admin = 0
    invoice = 1
    invalid = 2
@@ -80,11 +85,11 @@ class WalletType(Enum):

@dataclass
 class WalletTypeInfo:
-    wallet_type: WalletType
+    key_type: KeyType
    wallet: Wallet


-class UserConfig(BaseModel):
+class UserExtra(BaseModel):
    email_verified: Optional[bool] = False
    first_name: Optional[str] = None
    last_name: Optional[str] = None
@@ -97,24 +102,83 @@ class UserConfig(BaseModel):
    provider: Optional[str] = "lnbits"  # auth provider


+class Account(BaseModel):
+    id: str
+    username: Optional[str] = None
+    password_hash: Optional[str] = None
+    pubkey: Optional[str] = None
+    email: Optional[str] = None
+    extra: UserExtra = UserExtra()
+    created_at: datetime = datetime.now(timezone.utc)
+    updated_at: datetime = datetime.now(timezone.utc)
+
+    @property
+    def is_super_user(self) -> bool:
+        return self.id == settings.super_user
+
+    @property
+    def is_admin(self) -> bool:
+        return self.id in settings.lnbits_admin_users or self.is_super_user
+
+    def hash_password(self, password: str) -> str:
+        """sets and returns the hashed password"""
+        pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+        self.password_hash = pwd_context.hash(password)
+        return self.password_hash
+
+    def verify_password(self, password: str) -> bool:
+        """returns True if the password matches the hash"""
+        if not self.password_hash:
+            return False
+        pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+        return pwd_context.verify(password, self.password_hash)
+
+
+class AccountOverview(Account):
+    transaction_count: Optional[int] = 0
+    wallet_count: Optional[int] = 0
+    balance_msat: Optional[int] = 0
+    last_payment: Optional[datetime] = None
+
+
+class AccountFilters(FilterModel):
+    __search_fields__ = ["id", "email", "username"]
+    __sort_fields__ = [
+        "balance_msat",
+        "email",
+        "username",
+        "transaction_count",
+        "wallet_count",
+        "last_payment",
+    ]
+
+    id: str
+    last_payment: Optional[datetime] = None
+    transaction_count: Optional[int] = None
+    wallet_count: Optional[int] = None
+    username: Optional[str] = None
+    email: Optional[str] = None
+
+
 class User(BaseModel):
    id: str
+    created_at: datetime
+    updated_at: datetime
    email: Optional[str] = None
    username: Optional[str] = None
-    extensions: List[str] = []
-    wallets: List[Wallet] = []
+    pubkey: Optional[str] = None
+    extensions: list[str] = []
+    wallets: list[Wallet] = []
    admin: bool = False
    super_user: bool = False
    has_password: bool = False
-    config: Optional[UserConfig] = None
-    created_at: Optional[int] = None
-    updated_at: Optional[int] = None
+    extra: UserExtra = UserExtra()

    @property
-    def wallet_ids(self) -> List[str]:
+    def wallet_ids(self) -> list[str]:
        return [wallet.id for wallet in self.wallets]

-    def get_wallet(self, wallet_id: str) -> Optional["Wallet"]:
+    def get_wallet(self, wallet_id: str) -> Optional[Wallet]:
        w = [wallet for wallet in self.wallets if wallet.id == wallet_id]
        return w[0] if w else None

@@ -140,15 +204,26 @@ class UpdateUser(BaseModel):
    user_id: str
    email: Optional[str] = Query(default=None)
    username: Optional[str] = Query(default=..., min_length=2, max_length=20)
-    config: Optional[UserConfig] = None
+    extra: Optional[UserExtra] = None


 class UpdateUserPassword(BaseModel):
    user_id: str
+    password_old: Optional[str] = None
+    password: str = Query(default=..., min_length=8, max_length=50)
+    password_repeat: str = Query(default=..., min_length=8, max_length=50)
+    username: str = Query(default=..., min_length=2, max_length=20)
+
+
+class UpdateUserPubkey(BaseModel):
+    user_id: str
+    pubkey: str = Query(default=..., max_length=64)
+
+
+class ResetUserPassword(BaseModel):
+    reset_key: str
    password: str = Query(default=..., min_length=8, max_length=50)
    password_repeat: str = Query(default=..., min_length=8, max_length=50)
-    password_old: Optional[str] = Query(default=None, min_length=8, max_length=50)
-    username: Optional[str] = Query(default=..., min_length=2, max_length=20)


 class UpdateSuperuserPassword(BaseModel):
@@ -166,46 +241,79 @@ class LoginUsernamePassword(BaseModel):
    password: str


-class Payment(FromRowModel):
+class AccessTokenPayload(BaseModel):
+    sub: str
+    usr: Optional[str] = None
+    email: Optional[str] = None
+    auth_time: Optional[int] = 0
+
+
+class PaymentState(str, Enum):
+    PENDING = "pending"
+    SUCCESS = "success"
+    FAILED = "failed"
+
+    def __str__(self) -> str:
+        return self.value
+
+
+class PaymentExtra(BaseModel):
+    comment: Optional[str] = None
+    success_action: Optional[str] = None
+    lnurl_response: Optional[str] = None
+
+
+class PayInvoice(BaseModel):
+    payment_request: str
+    description: Optional[str] = None
+    max_sat: Optional[int] = None
+    extra: Optional[dict] = {}
+
+
+class CreatePayment(BaseModel):
+    wallet_id: str
+    payment_hash: str
+    bolt11: str
+    amount_msat: int
+    memo: str
+    extra: Optional[dict] = {}
+    preimage: Optional[str] = None
+    expiry: Optional[datetime] = None
+    webhook: Optional[str] = None
+    fee: int = 0
+
+
+class Payment(BaseModel):
    checking_id: str
-    pending: bool
+    payment_hash: str
+    wallet_id: str
    amount: int
    fee: int
-    memo: Optional[str]
-    time: int
    bolt11: str
-    preimage: str
-    payment_hash: str
-    expiry: Optional[float]
-    extra: Dict = {}
-    wallet_id: str
-    webhook: Optional[str]
-    webhook_status: Optional[int]
-
-    @classmethod
-    def from_row(cls, row: Row):
-        return cls(
-            checking_id=row["checking_id"],
-            payment_hash=row["hash"] or "0" * 64,
-            bolt11=row["bolt11"] or "",
-            preimage=row["preimage"] or "0" * 64,
-            extra=json.loads(row["extra"] or "{}"),
-            pending=row["pending"],
-            amount=row["amount"],
-            fee=row["fee"],
-            memo=row["memo"],
-            time=row["time"],
-            expiry=row["expiry"],
-            wallet_id=row["wallet"],
-            webhook=row["webhook"],
-            webhook_status=row["webhook_status"],
-        )
+    status: str = PaymentState.PENDING
+    memo: Optional[str] = None
+    expiry: Optional[datetime] = None
+    webhook: Optional[str] = None
+    webhook_status: Optional[int] = None
+    preimage: Optional[str] = "0" * 64
+    tag: Optional[str] = None
+    extension: Optional[str] = None
+    time: datetime = datetime.now(timezone.utc)
+    created_at: datetime = datetime.now(timezone.utc)
+    updated_at: datetime = datetime.now(timezone.utc)
+    extra: dict = {}

    @property
-    def tag(self) -> Optional[str]:
-        if self.extra is None:
-            return ""
-        return self.extra.get("tag")
+    def pending(self) -> bool:
+        return self.status == PaymentState.PENDING.value
+
+    @property
+    def success(self) -> bool:
+        return self.status == PaymentState.SUCCESS.value
+
+    @property
+    def failed(self) -> bool:
+        return self.status == PaymentState.FAILED.value

    @property
    def msat(self) -> int:
@@ -225,86 +333,26 @@ class Payment(FromRowModel):

    @property
    def is_expired(self) -> bool:
-        return self.expiry < time.time() if self.expiry else False
+        return self.expiry < datetime.now(timezone.utc) if self.expiry else False

    @property
-    def is_uncheckable(self) -> bool:
+    def is_internal(self) -> bool:
        return self.checking_id.startswith("internal_")

-    async def update_status(
-        self,
-        status: PaymentStatus,
-        conn: Optional[Connection] = None,
-    ) -> None:
-        from .crud import update_payment_details
-
-        await update_payment_details(
-            checking_id=self.checking_id,
-            pending=status.pending,
-            fee=status.fee_msat,
-            preimage=status.preimage,
-            conn=conn,
-        )
-
-    async def set_pending(self, pending: bool) -> None:
-        from .crud import update_payment_status
-
-        self.pending = pending
-
-        await update_payment_status(self.checking_id, pending)
-
-    async def check_status(
-        self,
-        conn: Optional[Connection] = None,
-    ) -> PaymentStatus:
-        if self.is_uncheckable:
+    async def check_status(self) -> PaymentStatus:
+        if self.is_internal:
+            if self.success:
+                return PaymentSuccessStatus()
+            if self.failed:
+                return PaymentFailedStatus()
            return PaymentPendingStatus()
-
-        logger.debug(
-            f"Checking {'outgoing' if self.is_out else 'incoming'} "
-            f"pending payment {self.checking_id}"
-        )
-
-        WALLET = get_wallet_class()
+        funding_source = get_funding_source()
        if self.is_out:
-            status = await WALLET.get_payment_status(self.checking_id)
+            status = await funding_source.get_payment_status(self.checking_id)
        else:
-            status = await WALLET.get_invoice_status(self.checking_id)
-
-        logger.debug(f"Status: {status}")
-
-        if self.is_in and status.pending and self.is_expired and self.expiry:
-            expiration_date = datetime.datetime.fromtimestamp(self.expiry)
-            logger.debug(
-                f"Deleting expired incoming pending payment {self.checking_id}: "
-                f"expired {expiration_date}"
-            )
-            await self.delete(conn)
-        # wait at least 15 minutes before deleting failed outgoing payments
-        elif self.is_out and status.failed:
-            if self.time + 900 < int(time.time()):
-                logger.warning(
-                    f"Deleting outgoing failed payment {self.checking_id}: {status}"
-                )
-                await self.delete(conn)
-            else:
-                logger.warning(
-                    f"Tried to delete outgoing payment {self.checking_id}: "
-                    "skipping because it's not old enough"
-                )
-        elif not status.pending:
-            logger.info(
-                f"Marking '{'in' if self.is_in else 'out'}' "
-                f"{self.checking_id} as not pending anymore: {status}"
-            )
-            await self.update_status(status, conn=conn)
+            status = await funding_source.get_invoice_status(self.checking_id)
        return status

-    async def delete(self, conn: Optional[Connection] = None) -> None:
-        from .crud import delete_wallet_payment
-
-        await delete_wallet_payment(self.checking_id, self.wallet_id, conn=conn)
-

 class PaymentFilters(FilterModel):
    __search_fields__ = ["memo", "amount"]
@@ -313,34 +361,24 @@ class PaymentFilters(FilterModel):
    amount: int
    fee: int
    memo: Optional[str]
-    time: datetime.datetime
+    time: datetime
    bolt11: str
    preimage: str
    payment_hash: str
-    expiry: Optional[datetime.datetime]
-    extra: Dict = {}
+    expiry: Optional[datetime]
+    extra: dict = {}
    wallet_id: str
    webhook: Optional[str]
    webhook_status: Optional[int]


 class PaymentHistoryPoint(BaseModel):
-    date: datetime.datetime
+    date: datetime
    income: int
    spending: int
    balance: int


-class BalanceCheck(BaseModel):
-    wallet: str
-    service: str
-    url: str
-
-    @classmethod
-    def from_row(cls, row: Row):
-        return cls(wallet=row["wallet"], service=row["service"], url=row["url"])
-
-
 def _do_nothing(*_):
    pass

@@ -357,10 +395,6 @@ class TinyURL(BaseModel):
    wallet: str
    time: float

-    @classmethod
-    def from_row(cls, row: Row):
-        return cls(**dict(row))
-

 class ConversionData(BaseModel):
    from_: str = "sat"
@@ -374,6 +408,7 @@ class Callback(BaseModel):

 class DecodePayment(BaseModel):
    data: str
+    filter_fields: Optional[list[str]] = []


 class CreateLnurl(BaseModel):
@@ -394,11 +429,17 @@ class CreateInvoice(BaseModel):
    description_hash: Optional[str] = None
    unhashed_description: Optional[str] = None
    expiry: Optional[int] = None
-    lnurl_callback: Optional[str] = None
-    lnurl_balance_check: Optional[str] = None
    extra: Optional[dict] = None
    webhook: Optional[str] = None
    bolt11: Optional[str] = None
+    lnurl_callback: Optional[str] = None
+
+    @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


 class CreateTopup(BaseModel):
@@ -423,4 +464,23 @@ class WebPushSubscription(BaseModel):
    user: str
    data: str
    host: str
-    timestamp: str
+    timestamp: datetime
+
+
+class BalanceDelta(BaseModel):
+    lnbits_balance_msats: int
+    node_balance_msats: int
+
+    @property
+    def delta_msats(self):
+        return self.node_balance_msats - self.lnbits_balance_msats
+
+
+class SimpleStatus(BaseModel):
+    success: bool
+    message: str
+
+
+class DbVersion(BaseModel):
+    db: str
+    version: int
@@ -1,15 +1,15 @@
 import asyncio
-import datetime
 import json
 import time
 from io import BytesIO
 from pathlib import Path
-from typing import Dict, List, Optional, Tuple, TypedDict
+from typing import Optional
 from urllib.parse import parse_qs, urlparse
+from uuid import UUID, uuid4

 import httpx
-from bolt11 import Bolt11
 from bolt11 import decode as bolt11_decode
+from bolt11.types import Bolt11
 from cryptography.hazmat.primitives import serialization
 from fastapi import Depends, WebSocket
 from loguru import logger
@@ -17,8 +17,14 @@ from py_vapid import Vapid
 from py_vapid.utils import b64urlencode

 from lnbits.core.db import db
+from lnbits.core.extensions.models import UserExtension
 from lnbits.db import Connection
-from lnbits.decorators import WalletTypeInfo, require_admin_key
+from lnbits.decorators import (
+    WalletTypeInfo,
+    check_user_extension_access,
+    require_admin_key,
+)
+from lnbits.exceptions import InvoiceError, PaymentError
 from lnbits.helpers import url_for
 from lnbits.lnurl import LnurlErrorResponse
 from lnbits.lnurl import decode as decode_lnurl
@@ -30,7 +36,7 @@ from lnbits.settings import (
    settings,
 )
 from lnbits.utils.exchange_rates import fiat_amount_as_satoshis, satoshis_amount_as_fiat
-from lnbits.wallets import FAKE_WALLET, get_wallet_class, set_wallet_class
+from lnbits.wallets import fake_wallet, get_funding_source, set_funding_source
 from lnbits.wallets.base import (
    PaymentPendingStatus,
    PaymentResponse,
@@ -40,54 +46,54 @@ from lnbits.wallets.base import (

 from .crud import (
    check_internal,
-    check_internal_pending,
    create_account,
    create_admin_settings,
    create_payment,
    create_wallet,
-    delete_wallet_payment,
    get_account,
+    get_account_by_email,
+    get_account_by_pubkey,
+    get_account_by_username,
    get_payments,
    get_standalone_payment,
    get_super_settings,
    get_total_balance,
+    get_user_from_account,
    get_wallet,
    get_wallet_payment,
+    is_internal_status_success,
    update_admin_settings,
-    update_payment_details,
-    update_payment_status,
+    update_payment,
    update_super_user,
+    update_user_extension,
 )
 from .helpers import to_valid_user_id
-from .models import Payment, UserConfig, Wallet
-
-
-class PaymentFailure(Exception):
-    pass
-
-
-class InvoiceFailure(Exception):
-    pass
+from .models import (
+    Account,
+    BalanceDelta,
+    CreatePayment,
+    Payment,
+    PaymentState,
+    User,
+    UserExtra,
+    Wallet,
+)


 async def calculate_fiat_amounts(
    amount: float,
-    wallet_id: str,
+    wallet: Wallet,
    currency: Optional[str] = None,
-    extra: Optional[Dict] = None,
-    conn: Optional[Connection] = None,
-) -> Tuple[int, Optional[Dict]]:
-    wallet = await get_wallet(wallet_id, conn=conn)
-    assert wallet, "invalid wallet_id"
+    extra: Optional[dict] = None,
+) -> tuple[int, dict]:
    wallet_currency = wallet.currency or settings.lnbits_default_accounting_currency
-
+    fiat_amounts: dict = extra or {}
    if currency and currency != "sat":
        amount_sat = await fiat_amount_as_satoshis(amount, currency)
-        extra = extra or {}
        if currency != wallet_currency:
-            extra["fiat_currency"] = currency
-            extra["fiat_amount"] = round(amount, ndigits=3)
-            extra["fiat_rate"] = amount_sat / amount
+            fiat_amounts["fiat_currency"] = currency
+            fiat_amounts["fiat_amount"] = round(amount, ndigits=3)
+            fiat_amounts["fiat_rate"] = amount_sat / amount
    else:
        amount_sat = int(amount)

@@ -96,16 +102,15 @@ async def calculate_fiat_amounts(
            fiat_amount = amount
        else:
            fiat_amount = await satoshis_amount_as_fiat(amount_sat, wallet_currency)
-        extra = extra or {}
-        extra["wallet_fiat_currency"] = wallet_currency
-        extra["wallet_fiat_amount"] = round(fiat_amount, ndigits=3)
-        extra["wallet_fiat_rate"] = amount_sat / fiat_amount
+        fiat_amounts["wallet_fiat_currency"] = wallet_currency
+        fiat_amounts["wallet_fiat_amount"] = round(fiat_amount, ndigits=3)
+        fiat_amounts["wallet_fiat_rate"] = amount_sat / fiat_amount

    logger.debug(
-        f"Calculated fiat amounts {wallet.id=} {amount=} {currency=}: {extra=}"
+        f"Calculated fiat amounts {wallet.id=} {amount=} {currency=}: {fiat_amounts=}"
    )

-    return amount_sat, extra
+    return amount_sat, fiat_amounts


 async def create_invoice(
@@ -117,36 +122,42 @@ async def create_invoice(
    description_hash: Optional[bytes] = None,
    unhashed_description: Optional[bytes] = None,
    expiry: Optional[int] = None,
-    extra: Optional[Dict] = None,
+    extra: Optional[dict] = None,
    webhook: Optional[str] = None,
    internal: Optional[bool] = False,
    conn: Optional[Connection] = None,
-) -> Tuple[str, str]:
+) -> Payment:
    if not amount > 0:
-        raise InvoiceFailure("Amountless invoices not supported.")
+        raise InvoiceError("Amountless invoices not supported.", status="failed")

    user_wallet = await get_wallet(wallet_id, conn=conn)
    if not user_wallet:
-        raise InvoiceFailure(f"Could not fetch wallet '{wallet_id}'.")
+        raise InvoiceError(f"Could not fetch wallet '{wallet_id}'.", status="failed")

    invoice_memo = None if description_hash else memo

    # use the fake wallet if the invoice is for internal use only
-    wallet = FAKE_WALLET if internal else get_wallet_class()
+    funding_source = fake_wallet if internal else get_funding_source()

    amount_sat, extra = await calculate_fiat_amounts(
-        amount, wallet_id, currency=currency, extra=extra, conn=conn
+        amount, user_wallet, currency, extra
    )

    if settings.is_wallet_max_balance_exceeded(
        user_wallet.balance_msat / 1000 + amount_sat
    ):
-        raise InvoiceFailure(
-            f"Wallet balance  cannot exceed "
-            f"{settings.lnbits_wallet_limit_max_balance} sats."
+        raise InvoiceError(
+            f"Wallet balance cannot exceed "
+            f"{settings.lnbits_wallet_limit_max_balance} sats.",
+            status="failed",
        )

-    ok, checking_id, payment_request, error_message = await wallet.create_invoice(
+    (
+        ok,
+        checking_id,
+        payment_request,
+        error_message,
+    ) = await funding_source.create_invoice(
        amount=amount_sat,
        memo=invoice_memo,
        description_hash=description_hash,
@@ -154,25 +165,199 @@ async def create_invoice(
        expiry=expiry or settings.lightning_invoice_expiry,
    )
    if not ok or not payment_request or not checking_id:
-        raise InvoiceFailure(error_message or "unexpected backend error.")
+        raise InvoiceError(
+            error_message or "unexpected backend error.", status="pending"
+        )

    invoice = bolt11_decode(payment_request)

-    amount_msat = 1000 * amount_sat
-    await create_payment(
+    create_payment_model = CreatePayment(
        wallet_id=wallet_id,
-        checking_id=checking_id,
-        payment_request=payment_request,
+        bolt11=payment_request,
        payment_hash=invoice.payment_hash,
-        amount=amount_msat,
-        expiry=get_bolt11_expiry(invoice),
+        amount_msat=amount_sat * 1000,
+        expiry=invoice.expiry_date,
        memo=memo,
        extra=extra,
        webhook=webhook,
+    )
+
+    payment = await create_payment(
+        checking_id=checking_id,
+        data=create_payment_model,
        conn=conn,
    )

-    return invoice.payment_hash, payment_request
+    return payment
+
+
+async def _pay_internal_invoice(
+    wallet: Wallet,
+    create_payment_model: CreatePayment,
+    conn: Optional[Connection] = None,
+) -> Optional[Payment]:
+    """
+    Pay an internal payment.
+    returns None if the payment is not internal.
+    """
+    # check_internal() returns the payment of the invoice we're waiting for
+    # (pending only)
+    internal_payment = await check_internal(
+        create_payment_model.payment_hash, conn=conn
+    )
+    if not internal_payment:
+        return None
+
+    # perform additional checks on the internal payment
+    # the payment hash is not enough to make sure that this is the same invoice
+    internal_invoice = await get_standalone_payment(
+        internal_payment.checking_id, incoming=True, conn=conn
+    )
+    if not internal_invoice:
+        raise PaymentError("Internal payment not found.", status="failed")
+
+    amount_msat = create_payment_model.amount_msat
+    if (
+        internal_invoice.amount != abs(amount_msat)
+        or internal_invoice.bolt11 != create_payment_model.bolt11.lower()
+    ):
+        raise PaymentError("Invalid invoice. Bolt11 changed.", status="failed")
+
+    fee_reserve_total_msat = fee_reserve_total(abs(amount_msat), internal=True)
+    create_payment_model.fee = abs(fee_reserve_total_msat)
+
+    if wallet.balance_msat < abs(amount_msat) + fee_reserve_total_msat:
+        raise PaymentError("Insufficient balance.", status="failed")
+
+    internal_id = f"internal_{create_payment_model.payment_hash}"
+    logger.debug(f"creating temporary internal payment with id {internal_id}")
+    payment = await create_payment(
+        checking_id=internal_id,
+        data=create_payment_model,
+        status=PaymentState.SUCCESS,
+        conn=conn,
+    )
+
+    # mark the invoice from the other side as not pending anymore
+    # so the other side only has access to his new money when we are sure
+    # the payer has enough to deduct from
+    internal_payment.status = PaymentState.SUCCESS
+    await update_payment(internal_payment, conn=conn)
+
+    await send_payment_notification(wallet, payment)
+
+    # notify receiver asynchronously
+    from lnbits.tasks import internal_invoice_queue
+
+    logger.debug(f"enqueuing internal invoice {internal_payment.checking_id}")
+    await internal_invoice_queue.put(internal_payment.checking_id)
+
+    return payment
+
+
+async def _verify_external_payment(
+    payment: Payment, conn: Optional[Connection] = None
+) -> Payment:
+    # fail on pending payments
+    if payment.pending:
+        raise PaymentError("Payment is still pending.", status="pending")
+    if payment.success:
+        raise PaymentError("Payment already paid.", status="success")
+
+    # payment failed
+    status = await payment.check_status()
+    if status.failed:
+        raise PaymentError(
+            "Payment is failed node, retrying is not possible.", status="failed"
+        )
+
+    if status.success:
+        # payment was successful on the fundingsource
+        payment.status = PaymentState.SUCCESS
+        await update_payment(payment, conn=conn)
+        raise PaymentError(
+            "Failed payment was already paid on the fundingsource.",
+            status="success",
+        )
+
+    # status.pending fall through and try again
+    return payment
+
+
+async def _pay_external_invoice(
+    wallet: Wallet,
+    create_payment_model: CreatePayment,
+    conn: Optional[Connection] = None,
+) -> Payment:
+    checking_id = create_payment_model.payment_hash
+    amount_msat = create_payment_model.amount_msat
+
+    fee_reserve_total_msat = fee_reserve_total(amount_msat, internal=False)
+
+    if wallet.balance_msat < abs(amount_msat) + fee_reserve_total_msat:
+        raise PaymentError(
+            f"You must reserve at least ({round(fee_reserve_total_msat/1000)}"
+            "  sat) to cover potential routing fees.",
+            status="failed",
+        )
+    # check if there is already a payment with the same checking_id
+    old_payment = await get_standalone_payment(checking_id, conn=conn)
+    if old_payment:
+        return await _verify_external_payment(old_payment, conn)
+
+    create_payment_model.fee = -abs(fee_reserve_total_msat)
+    payment = await create_payment(
+        checking_id=checking_id,
+        data=create_payment_model,
+        conn=conn,
+    )
+
+    fee_reserve_msat = fee_reserve(amount_msat, internal=False)
+    service_fee_msat = service_fee(amount_msat, internal=False)
+
+    funding_source = get_funding_source()
+
+    logger.debug(f"fundingsource: sending payment {checking_id}")
+    payment_response: PaymentResponse = await funding_source.pay_invoice(
+        create_payment_model.bolt11, fee_reserve_msat
+    )
+    logger.debug(f"backend: pay_invoice finished {checking_id}, {payment_response}")
+    if payment_response.checking_id and payment_response.checking_id != checking_id:
+        logger.warning(
+            f"backend sent unexpected checking_id (expected: {checking_id} got:"
+            f" {payment_response.checking_id})"
+        )
+    if payment_response.checking_id and payment_response.ok is not False:
+        # payment.ok can be True (paid) or None (pending)!
+        logger.debug(f"updating payment {checking_id}")
+        payment.status = (
+            PaymentState.SUCCESS
+            if payment_response.ok is True
+            else PaymentState.PENDING
+        )
+        payment.fee = -(abs(payment_response.fee_msat or 0) + abs(service_fee_msat))
+        payment.preimage = payment_response.preimage
+        await update_payment(payment, payment_response.checking_id, conn=conn)
+        payment.checking_id = payment_response.checking_id
+        if payment.success:
+            await send_payment_notification(wallet, payment)
+        logger.success(f"payment successful {payment_response.checking_id}")
+    elif payment_response.checking_id is None and payment_response.ok is False:
+        # payment failed
+        logger.debug(f"payment failed {checking_id}, {payment_response.error_message}")
+        payment.status = PaymentState.FAILED
+        await update_payment(payment, conn=conn)
+        raise PaymentError(
+            f"Payment failed: {payment_response.error_message}"
+            or "Payment failed, but backend didn't give us an error message.",
+            status="failed",
+        )
+    else:
+        logger.warning(
+            "didn't receive checking_id from backend, payment may be stuck in"
+            f" database: {checking_id}"
+        )
+    return payment


 async def pay_invoice(
@@ -180,243 +365,139 @@ async def pay_invoice(
    wallet_id: str,
    payment_request: str,
    max_sat: Optional[int] = None,
-    extra: Optional[Dict] = None,
+    extra: Optional[dict] = None,
    description: str = "",
+    tag: str = "",
    conn: Optional[Connection] = None,
-) -> str:
-    """
-    Pay a Lightning invoice.
-    First, we create a temporary payment in the database with fees set to the reserve
-    fee. We then check whether the balance of the payer would go negative.
-    We then attempt to pay the invoice through the backend. If the payment is
-    successful, we update the payment in the database with the payment details.
-    If the payment is unsuccessful, we delete the temporary payment.
-    If the payment is still in flight, we hope that some other process
-    will regularly check for the payment.
-    """
-    try:
-        invoice = bolt11_decode(payment_request)
-    except Exception:
-        raise InvoiceFailure("Bolt11 decoding failed.")
-
-    if not invoice.amount_msat or not invoice.amount_msat > 0:
-        raise InvoiceFailure("Amountless invoices not supported.")
-    if max_sat and invoice.amount_msat > max_sat * 1000:
-        raise InvoiceFailure("Amount in invoice is too high.")
-
-    await check_wallet_limits(wallet_id, conn, invoice.amount_msat)
+) -> Payment:
+    invoice = _validate_payment_request(payment_request, max_sat)
+    assert invoice.amount_msat

    async with db.reuse_conn(conn) if conn else db.connect() as conn:
-        temp_id = invoice.payment_hash
-        internal_id = f"internal_{invoice.payment_hash}"
+        amount_msat = invoice.amount_msat
+        wallet = await _check_wallet_for_payment(wallet_id, tag, amount_msat, conn)

-        _, extra = await calculate_fiat_amounts(
-            invoice.amount_msat / 1000, wallet_id, extra=extra, conn=conn
-        )
+        if await is_internal_status_success(invoice.payment_hash, conn):
+            raise PaymentError("Internal invoice already paid.", status="failed")

-        # put all parameters that don't change here
-        class PaymentKwargs(TypedDict):
-            wallet_id: str
-            payment_request: str
-            payment_hash: str
-            amount: int
-            memo: str
-            expiry: Optional[datetime.datetime]
-            extra: Optional[Dict]
+        _, extra = await calculate_fiat_amounts(amount_msat / 1000, wallet, extra=extra)

-        payment_kwargs: PaymentKwargs = PaymentKwargs(
+        create_payment_model = CreatePayment(
            wallet_id=wallet_id,
-            payment_request=payment_request,
+            bolt11=payment_request,
            payment_hash=invoice.payment_hash,
-            amount=-invoice.amount_msat,
-            expiry=get_bolt11_expiry(invoice),
+            amount_msat=-amount_msat,
+            expiry=invoice.expiry_date,
            memo=description or invoice.description or "",
            extra=extra,
        )

-        # we check if an internal invoice exists that has already been paid
-        # (not pending anymore)
-        if not await check_internal_pending(invoice.payment_hash, conn=conn):
-            raise PaymentFailure("Internal invoice already paid.")
+        payment = await _pay_invoice(wallet, create_payment_model, conn)
+        await _credit_service_fee_wallet(payment, conn)

-        # check_internal() returns the checking_id of the invoice we're waiting for
-        # (pending only)
-        internal_checking_id = await check_internal(invoice.payment_hash, conn=conn)
-        if internal_checking_id:
-            fee_reserve_total_msat = fee_reserve_total(
-                invoice.amount_msat, internal=True
-            )
-            # perform additional checks on the internal payment
-            # the payment hash is not enough to make sure that this is the same invoice
-            internal_invoice = await get_standalone_payment(
-                internal_checking_id, incoming=True, conn=conn
-            )
-            assert internal_invoice is not None
-            if (
-                internal_invoice.amount != invoice.amount_msat
-                or internal_invoice.bolt11 != payment_request.lower()
-            ):
-                raise PaymentFailure("Invalid invoice.")
-
-            logger.debug(f"creating temporary internal payment with id {internal_id}")
-            # create a new payment from this wallet
-            new_payment = await create_payment(
-                checking_id=internal_id,
-                fee=0 + abs(fee_reserve_total_msat),
-                pending=False,
-                conn=conn,
-                **payment_kwargs,
-            )
-        else:
-            fee_reserve_total_msat = fee_reserve_total(
-                invoice.amount_msat, internal=False
-            )
-            logger.debug(f"creating temporary payment with id {temp_id}")
-            # create a temporary payment here so we can check if
-            # the balance is enough in the next step
-            try:
-                new_payment = await create_payment(
-                    checking_id=temp_id,
-                    fee=-abs(fee_reserve_total_msat),
-                    conn=conn,
-                    **payment_kwargs,
-                )
-            except Exception as e:
-                logger.error(f"could not create temporary payment: {e}")
-                # happens if the same wallet tries to pay an invoice twice
-                raise PaymentFailure("Could not make payment.")
-
-        # do the balance check
-        wallet = await get_wallet(wallet_id, conn=conn)
-        assert wallet, "Wallet for balancecheck could not be fetched"
-        if wallet.balance_msat < 0:
-            logger.debug("balance is too low, deleting temporary payment")
-            if (
-                not internal_checking_id
-                and wallet.balance_msat > -fee_reserve_total_msat
-            ):
-                raise PaymentFailure(
-                    f"You must reserve at least ({round(fee_reserve_total_msat/1000)}"
-                    "  sat) to cover potential routing fees."
-                )
-            raise PermissionError("Insufficient balance.")
-
-    if internal_checking_id:
-        service_fee_msat = service_fee(invoice.amount_msat, internal=True)
-        logger.debug(f"marking temporary payment as not pending {internal_checking_id}")
-        # mark the invoice from the other side as not pending anymore
-        # so the other side only has access to his new money when we are sure
-        # the payer has enough to deduct from
-        async with db.connect() as conn:
-            await update_payment_status(
-                checking_id=internal_checking_id, pending=False, conn=conn
-            )
-        await send_payment_notification(wallet, new_payment)
-
-        # notify receiver asynchronously
-        from lnbits.tasks import internal_invoice_queue
-
-        logger.debug(f"enqueuing internal invoice {internal_checking_id}")
-        await internal_invoice_queue.put(internal_checking_id)
-    else:
-        fee_reserve_msat = fee_reserve(invoice.amount_msat, internal=False)
-        service_fee_msat = service_fee(invoice.amount_msat, internal=False)
-        logger.debug(f"backend: sending payment {temp_id}")
-        # actually pay the external invoice
-        WALLET = get_wallet_class()
-        payment: PaymentResponse = await WALLET.pay_invoice(
-            payment_request, fee_reserve_msat
-        )
-
-        if payment.checking_id and payment.checking_id != temp_id:
-            logger.warning(
-                f"backend sent unexpected checking_id (expected: {temp_id} got:"
-                f" {payment.checking_id})"
-            )
-
-        logger.debug(f"backend: pay_invoice finished {temp_id}")
-        if payment.checking_id and payment.ok is not False:
-            # payment.ok can be True (paid) or None (pending)!
-            logger.debug(f"updating payment {temp_id}")
-            async with db.connect() as conn:
-                await update_payment_details(
-                    checking_id=temp_id,
-                    pending=payment.ok is not True,
-                    fee=-(
-                        abs(payment.fee_msat if payment.fee_msat else 0)
-                        + abs(service_fee_msat)
-                    ),
-                    preimage=payment.preimage,
-                    new_checking_id=payment.checking_id,
-                    conn=conn,
-                )
-                wallet = await get_wallet(wallet_id, conn=conn)
-                updated = await get_wallet_payment(
-                    wallet_id, payment.checking_id, conn=conn
-                )
-                if wallet and updated:
-                    await send_payment_notification(wallet, updated)
-                logger.debug(f"payment successful {payment.checking_id}")
-        elif payment.checking_id is None and payment.ok is False:
-            # payment failed
-            logger.warning("backend sent payment failure")
-            async with db.connect() as conn:
-                logger.debug(f"deleting temporary payment {temp_id}")
-                await delete_wallet_payment(temp_id, wallet_id, conn=conn)
-            raise PaymentFailure(
-                f"Payment failed: {payment.error_message}"
-                or "Payment failed, but backend didn't give us an error message."
-            )
-        else:
-            logger.warning(
-                "didn't receive checking_id from backend, payment may be stuck in"
-                f" database: {temp_id}"
-            )
-
-    # credit service fee wallet
-    if settings.lnbits_service_fee_wallet and service_fee_msat:
-        new_payment = await create_payment(
-            wallet_id=settings.lnbits_service_fee_wallet,
-            fee=0,
-            amount=abs(service_fee_msat),
-            memo="Service fee",
-            checking_id="service_fee" + temp_id,
-            payment_request=payment_request,
-            payment_hash=invoice.payment_hash,
-            pending=False,
-        )
-    return invoice.payment_hash
+        return payment


-async def check_wallet_limits(wallet_id, conn, amount_msat):
-    await check_time_limit_between_transactions(conn, wallet_id)
-    await check_wallet_daily_withdraw_limit(conn, wallet_id, amount_msat)
+async def _pay_invoice(wallet, create_payment_model, conn):
+    payment = await _pay_internal_invoice(wallet, create_payment_model, conn)
+    if not payment:
+        payment = await _pay_external_invoice(wallet, create_payment_model, conn)
+    return payment


-async def check_time_limit_between_transactions(conn, wallet_id):
+async def _check_wallet_for_payment(
+    wallet_id: str,
+    tag: str,
+    amount_msat: int,
+    conn: Optional[Connection],
+):
+    wallet = await get_wallet(wallet_id, conn=conn)
+    if not wallet:
+        raise PaymentError(f"Could not fetch wallet '{wallet_id}'.", status="failed")
+
+    # check if the payment is made for an extension that the user disabled
+    status = await check_user_extension_access(wallet.user, tag)
+    if not status.success:
+        raise PaymentError(status.message)
+
+    await check_wallet_limits(wallet_id, amount_msat, conn)
+    return wallet
+
+
+def _validate_payment_request(
+    payment_request: str, max_sat: Optional[int] = None
+) -> Bolt11:
+    try:
+        invoice = bolt11_decode(payment_request)
+    except Exception as exc:
+        raise PaymentError("Bolt11 decoding failed.", status="failed") from exc
+
+    if not invoice.amount_msat or not invoice.amount_msat > 0:
+        raise PaymentError("Amountless invoices not supported.", status="failed")
+
+    if max_sat and invoice.amount_msat > max_sat * 1000:
+        raise PaymentError("Amount in invoice is too high.", status="failed")
+
+    return invoice
+
+
+async def _credit_service_fee_wallet(
+    payment: Payment, conn: Optional[Connection] = None
+):
+    service_fee_msat = service_fee(payment.amount, internal=payment.is_internal)
+    if not settings.lnbits_service_fee_wallet or not service_fee_msat:
+        return
+
+    create_payment_model = CreatePayment(
+        wallet_id=settings.lnbits_service_fee_wallet,
+        bolt11=payment.bolt11,
+        payment_hash=payment.payment_hash,
+        amount_msat=abs(service_fee_msat),
+        memo="Service fee",
+    )
+    await create_payment(
+        checking_id=f"service_fee_{payment.payment_hash}",
+        data=create_payment_model,
+        status=PaymentState.SUCCESS,
+        conn=conn,
+    )
+
+
+async def check_wallet_limits(
+    wallet_id: str, amount_msat: int, conn: Optional[Connection] = None
+):
+    await check_time_limit_between_transactions(wallet_id, conn)
+    await check_wallet_daily_withdraw_limit(wallet_id, amount_msat, conn)
+
+
+async def check_time_limit_between_transactions(
+    wallet_id: str, conn: Optional[Connection] = None
+):
    limit = settings.lnbits_wallet_limit_secs_between_trans
    if not limit or limit <= 0:
        return
-
    payments = await get_payments(
        since=int(time.time()) - limit,
        wallet_id=wallet_id,
        limit=1,
        conn=conn,
    )
-
    if len(payments) == 0:
        return
-
-    raise ValueError(
-        f"The time limit of {limit} seconds between payments has been reached."
+    raise PaymentError(
+        status="failed",
+        message=f"The time limit of {limit} seconds between payments has been reached.",
    )


-async def check_wallet_daily_withdraw_limit(conn, wallet_id, amount_msat):
+async def check_wallet_daily_withdraw_limit(
+    wallet_id: str, amount_msat: int, conn: Optional[Connection] = None
+):
    limit = settings.lnbits_wallet_limit_daily_max_withdraw
-    if not limit or limit <= 0:
+    if not limit:
        return
+    if limit < 0:
+        raise ValueError("It is not allowed to spend funds from this server.")

    payments = await get_payments(
        since=int(time.time()) - 60 * 60 * 24,
@@ -444,7 +525,7 @@ async def redeem_lnurl_withdraw(
    wallet_id: str,
    lnurl_request: str,
    memo: Optional[str] = None,
-    extra: Optional[Dict] = None,
+    extra: Optional[dict] = None,
    wait_seconds: int = 0,
    conn: Optional[Connection] = None,
 ) -> None:
@@ -499,7 +580,6 @@ async def redeem_lnurl_withdraw(
 async def perform_lnurlauth(
    callback: str,
    wallet: WalletTypeInfo = Depends(require_admin_key),
-    conn: Optional[Connection] = None,
 ) -> Optional[LnurlErrorResponse]:
    cb = urlparse(callback)

@@ -583,16 +663,15 @@ async def check_transaction_status(
    )
    if not payment:
        return PaymentPendingStatus()
-    if not payment.pending:
-        # note: before, we still checked the status of the payment again
+
+    if payment.status == PaymentState.SUCCESS.value:
        return PaymentSuccessStatus(fee_msat=payment.fee)

-    status: PaymentStatus = await payment.check_status()
-    return status
+    return await payment.check_status()


 # WARN: this same value must be used for balance check and passed to
-# WALLET.pay_invoice(), it may cause a vulnerability if the values differ
+# funding_source.pay_invoice(), it may cause a vulnerability if the values differ
 def fee_reserve(amount_msat: int, internal: bool = False) -> int:
    if internal:
        return 0
@@ -602,6 +681,7 @@ def fee_reserve(amount_msat: int, internal: bool = False) -> int:


 def service_fee(amount_msat: int, internal: bool = False) -> int:
+    amount_msat = abs(amount_msat)
    service_fee_percent = settings.lnbits_service_fee
    fee_max = settings.lnbits_service_fee_max * 1000
    if settings.lnbits_service_fee_wallet:
@@ -621,32 +701,33 @@ def fee_reserve_total(amount_msat: int, internal: bool = False) -> int:


 async def send_payment_notification(wallet: Wallet, payment: Payment):
-    await websocketUpdater(
-        wallet.id,
-        json.dumps(
-            {
-                "wallet_balance": wallet.balance,
-                "payment": payment.dict(),
-            }
-        ),
+    await websocket_manager.send_data(payment.json(), wallet.inkey)
+    # json.dumps(
+    #     {
+    #         "wallet_balance": wallet.balance,
+    #         "payment": payment,
+    #     }
+    # ),
+    await websocket_manager.send_data(
+        json.dumps({"pending": payment.pending}), payment.payment_hash
    )


 async def update_wallet_balance(wallet_id: str, amount: int):
-    payment_hash, _ = await create_invoice(
-        wallet_id=wallet_id,
-        amount=amount,
-        memo="Admin top up",
-        internal=True,
-    )
    async with db.connect() as conn:
-        checking_id = await check_internal(payment_hash, conn=conn)
-        assert checking_id, "newly created checking_id cannot be retrieved"
-        await update_payment_status(checking_id=checking_id, pending=False, conn=conn)
+        payment = await create_invoice(
+            wallet_id=wallet_id,
+            amount=amount,
+            memo="Admin top up",
+            internal=True,
+            conn=conn,
+        )
+        payment.status = PaymentState.SUCCESS
+        await update_payment(payment, conn=conn)
        # notify receiver asynchronously
        from lnbits.tasks import internal_invoice_queue

-        await internal_invoice_queue.put(checking_id)
+        await internal_invoice_queue.put(payment.checking_id)


 async def check_admin_settings():
@@ -680,7 +761,7 @@ async def check_admin_settings():
            send_admin_user_to_saas()

        account = await get_account(settings.super_user)
-        if account and account.config and account.config.provider == "env":
+        if account and account.extra and account.extra.provider == "env":
            settings.first_install = True

        logger.success(
@@ -723,7 +804,7 @@ def update_cached_settings(sets_dict: dict):
        except Exception:
            logger.warning(f"Failed overriding setting: {key}, value: {value}")
    if "super_user" in sets_dict:
-        setattr(settings, "super_user", sets_dict["super_user"])
+        settings.super_user = sets_dict["super_user"]


 async def init_admin_settings(super_user: Optional[str] = None) -> SuperSettings:
@@ -731,20 +812,58 @@ async def init_admin_settings(super_user: Optional[str] = None) -> SuperSettings
    if super_user:
        account = await get_account(super_user)
    if not account:
-        account = await create_account(
-            user_id=super_user, user_config=UserConfig(provider="env")
+        account_id = super_user or uuid4().hex
+        account = Account(
+            id=account_id,
+            extra=UserExtra(provider="env"),
        )
-    if not account.wallets or len(account.wallets) == 0:
+        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())


+async def create_user_account(
+    account: Optional[Account] = None, wallet_name: Optional[str] = None
+) -> User:
+    if not settings.new_accounts_allowed:
+        raise ValueError("Account creation is disabled.")
+    if account:
+        if account.username and await get_account_by_username(account.username):
+            raise ValueError("Username already exists.")
+
+        if account.email and await get_account_by_email(account.email):
+            raise ValueError("Email already exists.")
+
+        if account.pubkey and await get_account_by_pubkey(account.pubkey):
+            raise ValueError("Pubkey already exists.")
+
+        if account.id:
+            user_uuid4 = UUID(hex=account.id, version=4)
+            assert user_uuid4.hex == account.id, "User ID is not valid UUID4 hex string"
+        else:
+            account.id = uuid4().hex
+
+    account = await create_account(account)
+    await create_wallet(
+        user_id=account.id,
+        wallet_name=wallet_name or settings.lnbits_default_wallet_name,
+    )
+
+    for ext_id in settings.lnbits_user_default_extensions:
+        user_ext = UserExtension(user=account.id, extension=ext_id, active=True)
+        await update_user_extension(user_ext)
+
+    user = await get_user_from_account(account)
+    assert user, "Cannot find user for account."
+
+    return user
+
+
 class WebsocketConnectionManager:
    def __init__(self) -> None:
-        self.active_connections: List[WebSocket] = []
+        self.active_connections: list[WebSocket] = []

    async def connect(self, websocket: WebSocket, item_id: str):
        logger.debug(f"Websocket connected to {item_id}")
@@ -760,33 +879,42 @@ class WebsocketConnectionManager:
                await connection.send_text(message)


-websocketManager = WebsocketConnectionManager()
+websocket_manager = WebsocketConnectionManager()


-async def websocketUpdater(item_id, data):
-    return await websocketManager.send_data(f"{data}", item_id)
+async def websocket_updater(item_id: str, data: str):
+    return await websocket_manager.send_data(data, item_id)


 async def switch_to_voidwallet() -> None:
-    WALLET = get_wallet_class()
-    if WALLET.__class__.__name__ == "VoidWallet":
+    funding_source = get_funding_source()
+    if funding_source.__class__.__name__ == "VoidWallet":
        return
-    set_wallet_class("VoidWallet")
+    set_funding_source("VoidWallet")
    settings.lnbits_backend_wallet_class = "VoidWallet"


-async def get_balance_delta() -> Tuple[int, int, int]:
-    WALLET = get_wallet_class()
-    total_balance = await get_total_balance()
-    error_message, node_balance = await WALLET.status()
-    if error_message:
-        raise Exception(error_message)
-    return node_balance - total_balance, node_balance, total_balance
+async def get_balance_delta() -> BalanceDelta:
+    funding_source = get_funding_source()
+    status = await funding_source.status()
+    lnbits_balance = await get_total_balance()
+    return BalanceDelta(
+        lnbits_balance_msats=lnbits_balance,
+        node_balance_msats=status.balance_msat,
+    )


-def get_bolt11_expiry(invoice: Bolt11) -> datetime.datetime:
-    if invoice.expiry:
-        return datetime.datetime.fromtimestamp(invoice.date + invoice.expiry)
-    else:
-        # assume maximum bolt11 expiry of 31 days to be on the safe side
-        return datetime.datetime.now() + datetime.timedelta(days=31)
+async def update_pending_payments(wallet_id: str):
+    pending_payments = await get_payments(
+        wallet_id=wallet_id,
+        pending=True,
+        exclude_uncheckable=True,
+    )
+    for payment in pending_payments:
+        status = await payment.check_status()
+        if status.failed:
+            payment.status = PaymentState.FAILED
+            await update_payment(payment)
+        elif status.success:
+            payment.status = PaymentState.SUCCESS
+            await update_payment(payment)
@@ -5,7 +5,6 @@ import httpx
 from loguru import logger

 from lnbits.core.crud import (
-    get_balance_notify,
    get_wallet,
    get_webpush_subscriptions_for_user,
    mark_webhook_sent,
@@ -16,7 +15,7 @@ from lnbits.core.services import (
    send_payment_notification,
    switch_to_voidwallet,
 )
-from lnbits.settings import get_wallet_class, settings
+from lnbits.settings import get_funding_source, settings
 from lnbits.tasks import send_push_notification

 api_invoice_listeners: Dict[str, asyncio.Queue] = {}
@@ -27,9 +26,12 @@ async def killswitch_task():
    killswitch will check lnbits-status repository for a signal from
    LNbits and will switch to VoidWallet if the killswitch is triggered.
    """
-    while True:
-        WALLET = get_wallet_class()
-        if settings.lnbits_killswitch and WALLET.__class__.__name__ != "VoidWallet":
+    while settings.lnbits_running:
+        funding_source = get_funding_source()
+        if (
+            settings.lnbits_killswitch
+            and funding_source.__class__.__name__ != "VoidWallet"
+        ):
            with httpx.Client() as client:
                try:
                    r = client.get(settings.lnbits_status_manifest, timeout=4)
@@ -54,11 +56,15 @@ async def watchdog_task():
    Registers a watchdog which will check lnbits balance and nodebalance
    and will switch to VoidWallet if the watchdog delta is reached.
    """
-    while True:
-        WALLET = get_wallet_class()
-        if settings.lnbits_watchdog and WALLET.__class__.__name__ != "VoidWallet":
+    while settings.lnbits_running:
+        funding_source = get_funding_source()
+        if (
+            settings.lnbits_watchdog
+            and funding_source.__class__.__name__ != "VoidWallet"
+        ):
            try:
-                delta, *_ = await get_balance_delta()
+                balance = await get_balance_delta()
+                delta = balance.delta_msats
                logger.debug(f"Running watchdog task. current delta: {delta}")
                if delta + settings.lnbits_watchdog_delta <= 0:
                    logger.error(f"Switching to VoidWallet. current delta: {delta}")
@@ -70,10 +76,9 @@ async def watchdog_task():

 async def wait_for_paid_invoices(invoice_paid_queue: asyncio.Queue):
    """
-    This task dispatches events to all api_invoice_listeners,
-    webhooks, push notifications and balance notifications.
+    This worker dispatches events to all extensions and dispatches webhooks.
    """
-    while True:
+    while settings.lnbits_running:
        payment = await invoice_paid_queue.get()
        logger.trace("received invoice paid event")
        # dispatch api_invoice_listeners
@@ -85,28 +90,6 @@ async def wait_for_paid_invoices(invoice_paid_queue: asyncio.Queue):
        # dispatch webhook
        if payment.webhook and not payment.webhook_status:
            await dispatch_webhook(payment)
-        # dispatch balance_notify
-        url = await get_balance_notify(payment.wallet_id)
-        if url:
-            headers = {"User-Agent": settings.user_agent}
-            async with httpx.AsyncClient(headers=headers) as client:
-                try:
-                    r = await client.post(url, timeout=4)
-                    r.raise_for_status()
-                    await mark_webhook_sent(payment.payment_hash, r.status_code)
-                except httpx.HTTPStatusError as exc:
-                    status_code = exc.response.status_code
-                    await mark_webhook_sent(payment.payment_hash, status_code)
-                    logger.warning(
-                        f"balance_notify returned a bad status_code: {status_code} "
-                        f"while requesting {exc.request.url!r}."
-                    )
-                    logger.warning(exc)
-                except httpx.RequestError as exc:
-                    await mark_webhook_sent(payment.payment_hash, -1)
-                    logger.warning(f"Could not send balance_notify to {url}")
-                    logger.warning(exc)
-
        # dispatch push notification
        await send_payment_push_notification(payment)

@@ -24,6 +24,40 @@
      </div>
    </div>
  </q-card-section>
+  <q-card-section
+    v-if="formData.auth_allowed_methods?.includes('nostr-auth-nip98')"
+    class="q-pl-xl"
+  >
+    <strong class="q-my-none q-mb-sm">Nostr Auth</strong>
+
+    <div class="row">
+      <div class="col-md-12 col-sm-12 q-pr-sm">
+        <q-input
+          filled
+          v-model="nostrAcceptedUrl"
+          @keydown.enter="addNostrUrl"
+          type="text"
+          label="Nostr Request URL"
+          hint="Absolute URL that the clients will use to login."
+        >
+          <q-btn @click="addNostrUrl" dense flat icon="add"></q-btn>
+        </q-input>
+      </div>
+      <div>
+        <div>
+          <q-chip
+            v-for="url in formData.nostr_absolute_request_urls"
+            :key="url"
+            removable
+            @remove="removeNostrUrl(url)"
+            color="primary"
+            text-color="white"
+            :label="url"
+          ></q-chip>
+        </div>
+      </div>
+    </div>
+  </q-card-section>
  <q-card-section
    v-if="formData.auth_allowed_methods?.includes('google-auth')"
    class="q-pl-xl"
@@ -173,7 +207,7 @@
                  @remove="removeBlockedIPs(blocked_ip)"
                  color="primary"
                  text-color="white"
-                  v-text="blocked_ip"
+                  :label="blocked_ip"
                ></q-chip>
              </div>
              <br />
@@ -202,7 +236,7 @@
                  @remove="removeAllowedIPs(allowed_ip)"
                  color="primary"
                  text-color="white"
-                  v-text="allowed_ip"
+                  :label="allowed_ip"
                ></q-chip>
              </div>
              <br />
@@ -1,24 +1,19 @@
 <q-tab-panel name="server">
  <q-card-section class="q-pa-none">
    <h6 class="q-my-none">Server Management</h6>
-    <br />
    <div>
      <div class="row">
-        <div class="col">
-          <p>Server Info</p>
-          <ul>
-            <li
-              v-if="settings.lnbits_data_folder"
-              v-text="'SQlite: ' + settings.lnbits_data_folder"
-            ></li>
-            <li
-              v-if="settings.lnbits_database_url"
-              v-text="'Postgres: ' + settings.lnbits_database_url"
-            ></li>
-          </ul>
+        <div class="col-md-6">
+          <p>Base URL</p>
+          <q-input
+            filled
+            v-model.number="formData.lnbits_baseurl"
+            label="Static/Base url for the server"
+          ></q-input>
          <br />
        </div>
      </div>
+      <h6 class="q-my-none">Currency Settings</h6>
      <div class="row q-col-gutter-md">
        <div class="col-12 col-md-6">
          <p>Allowed currencies</p>
@@ -45,56 +40,7 @@
          <br />
        </div>
      </div>
-      <div class="row q-col-gutter-md">
-        <div class="col-12 col-md-6">
-          <p>Admin Extensions</p>
-          <q-select
-            filled
-            v-model="formData.lnbits_admin_extensions"
-            multiple
-            hint="Extensions only user with admin privileges can use"
-            label="Admin extensions"
-            :options="g.extensions.map(e => e.code)"
-          ></q-select>
-          <br />
-        </div>
-        <div class="col-12 col-md-6">
-          <p>Miscellaneous</p>
-          <q-item tag="label" v-ripple>
-            <q-item-section>
-              <q-item-label>Disable Extensions</q-item-label>
-              <q-item-label caption>Disables all extensions</q-item-label>
-            </q-item-section>
-            <q-item-section avatar>
-              <q-toggle
-                size="md"
-                v-model="formData.lnbits_extensions_deactivate_all"
-                checked-icon="check"
-                color="green"
-                unchecked-icon="clear"
-              />
-            </q-item-section>
-          </q-item>
-          <q-item tag="label" v-ripple>
-            <q-item-section>
-              <q-item-label>Hide API</q-item-label>
-              <q-item-label caption
-                >Hides wallet api, extensions can choose to honor</q-item-label
-              >
-            </q-item-section>
-            <q-item-section avatar>
-              <q-toggle
-                size="md"
-                v-model="formData.lnbits_hide_api"
-                checked-icon="check"
-                color="green"
-                unchecked-icon="clear"
-              />
-            </q-item-section>
-          </q-item>
-          <br />
-        </div>
-      </div>
+
      <br />
      <h6 class="q-my-none">Service Fee</h6>
      <div class="row q-col-gutter-md">
@@ -154,32 +100,94 @@
          <br />
        </div>
      </div>
-
+      <q-separator></q-separator>
      <h6 class="q-my-none">Extensions</h6>
-      <div>
-        <p>Extension Sources</p>
-        <q-input
-          filled
-          v-model="formAddExtensionsManifest"
-          @keydown.enter="addExtensionsManifest"
-          type="text"
-          label="Source URL (only use the official LNbits extension source, and sources you can trust)"
-          hint="Repositories from where the extensions can be downloaded"
-        >
-          <q-btn @click="addExtensionsManifest" dense flat icon="add"></q-btn>
-        </q-input>
-        <div>
-          <q-chip
-            v-for="manifestUrl in formData.lnbits_extensions_manifests"
-            :key="manifestUrl"
-            removable
-            @remove="removeExtensionsManifest(manifestUrl)"
-            color="primary"
-            text-color="white"
-            ><span v-text="manifestUrl"></span
-          ></q-chip>
+      <div class="row q-col-gutter-md">
+        <div class="col-12">
+          <p>Extension Sources</p>
+          <q-input
+            filled
+            v-model="formAddExtensionsManifest"
+            @keydown.enter="addExtensionsManifest"
+            type="text"
+            label="Source URL (only use the official LNbits extension source, and sources you can trust)"
+            hint="Repositories from where the extensions can be downloaded"
+          >
+            <q-btn @click="addExtensionsManifest" dense flat icon="add"></q-btn>
+          </q-input>
+          <div>
+            <q-chip
+              v-for="manifestUrl in formData.lnbits_extensions_manifests"
+              :key="manifestUrl"
+              removable
+              @remove="removeExtensionsManifest(manifestUrl)"
+              color="primary"
+              text-color="white"
+              ><span v-text="manifestUrl"></span
+            ></q-chip>
+          </div>
+        </div>
+      </div>
+      <div class="row q-col-gutter-md">
+        <div class="col-12 col-md-6">
+          <p>Admin Extensions</p>
+          <q-select
+            filled
+            v-model="formData.lnbits_admin_extensions"
+            multiple
+            hint="Extensions only user with admin privileges can use"
+            label="Admin extensions"
+            :options="g.extensions.map(e => e.code)"
+          ></q-select>
+        </div>
+
+        <div class="col-12 col-md-6">
+          <p>User Default Extensions</p>
+          <q-select
+            filled
+            v-model="formData.lnbits_user_default_extensions"
+            multiple
+            hint="Extensions that will be enabled by default for the users."
+            label="User extensions"
+            :options="g.extensions.map(e => e.code)"
+          ></q-select>
+        </div>
+        <div class="col-12 col-md-6">
+          <p>Miscellaneous</p>
+          <q-item tag="label" v-ripple>
+            <q-item-section>
+              <q-item-label>Disable Extensions</q-item-label>
+              <q-item-label caption>Disables all extensions</q-item-label>
+            </q-item-section>
+            <q-item-section avatar>
+              <q-toggle
+                size="md"
+                v-model="formData.lnbits_extensions_deactivate_all"
+                checked-icon="check"
+                color="green"
+                unchecked-icon="clear"
+              />
+            </q-item-section>
+          </q-item>
+          <q-item tag="label" v-ripple>
+            <q-item-section>
+              <q-item-label>Hide API</q-item-label>
+              <q-item-label caption
+                >Hides wallet api, extensions can choose to honor</q-item-label
+              >
+            </q-item-section>
+            <q-item-section avatar>
+              <q-toggle
+                size="md"
+                v-model="formData.lnbits_hide_api"
+                checked-icon="check"
+                color="green"
+                unchecked-icon="clear"
+              />
+            </q-item-section>
+          </q-item>
+          <br />
        </div>
-        <br />
      </div>
    </div>
  </q-card-section>
@@ -4,7 +4,7 @@
    <br />
    <div>
      <div class="row q-col-gutter-md">
-        <div class="col-12 col-md-6">
+        <div class="col-12 col-md-5">
          <p>Site Title</p>
          <q-input
            filled
@@ -14,7 +14,7 @@
          ></q-input>
          <br />
        </div>
-        <div class="col-12 col-md-6">
+        <div class="col-12 col-md-5">
          <p>Site Tagline</p>
          <q-input
            filled
@@ -24,7 +24,15 @@
          ></q-input>
          <br />
        </div>
+        <div class="col-12 col-md-2 q-mt-xl">
+          <q-toggle
+            tip="Remove homepage elements like 'runs on' etc"
+            v-model="formData.lnbits_show_home_page_elements"
+            :label="formData.lnbits_show_home_page_elements ? 'Enable elements on homepage' : 'Disable elements on homepage'"
+          ></q-toggle>
+        </div>
      </div>
+
      <div>
        <p>Site Description</p>
        <q-input
@@ -44,7 +52,6 @@
            v-model="formData.lnbits_default_wallet_name"
            label="LNbits wallet"
          ></q-input>
-          <br />
        </div>
        <div class="col-12 col-md-4">
          <p>Denomination</p>
@@ -55,7 +62,6 @@
            label="sats"
            hint="The name for the FakeWallet token"
          ></q-input>
-          <br />
        </div>
        <div class="col-12 col-md-4">
          <p>QR code logo</p>
@@ -66,9 +72,33 @@
            label="https://example.com/image.svg"
            hint="URL to logo image in QR code"
          ></q-input>
-          <br />
        </div>
      </div>
+      <div class="row q-col-gutter-md">
+        <div class="col-12 col-md-4">
+          <p>Custom Badge</p>
+          <div class="row q-col-gutter-md">
+            <div class="col-12 col-md-8">
+              <q-input
+                filled
+                type="text"
+                tip="Custom Badge"
+                v-model="formData.lnbits_custom_badge"
+                label="Custom Badge 'USE WITH CAUTION - LNbits wallet is still in BETA'"
+              ></q-input>
+            </div>
+            <div class="col-12 col-md-4">
+              <q-select
+                filled
+                v-model="formData.lnbits_custom_badge_color"
+                :options="colors"
+                label="Custom badge color"
+              ></q-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <br />
      <div class="row q-col-gutter-md">
        <div class="col-12 col-md-6">
          <p>Themes</p>
@@ -23,8 +23,8 @@
            @remove="removeAdminUser(user)"
            color="primary"
            text-color="white"
+            :label="user"
          >
-            <span v-text="user"></span>
          </q-chip>
        </div>
        <br />
@@ -49,8 +49,8 @@
            @remove="removeAllowedUser(user)"
            color="primary"
            text-color="white"
+            :label="user"
          >
-            <span v-text="user" />
          </q-chip>
        </div>
        <br />
@@ -26,6 +26,7 @@
      :label="$t('restart')"
      color="primary"
      @click="restartServer"
+      class="q-ml-md"
    >
      <q-tooltip v-if="needsRestart">
        <span v-text="$t('restart_tooltip')"></span>
@@ -40,17 +41,6 @@
      />
    </q-btn>

-    <q-btn
-      v-if="isSuperUser"
-      :label="$t('topup')"
-      color="primary"
-      @click="topUpDialog.show = true"
-    >
-      <q-tooltip>
-        <span v-text="$t('add_funds_tooltip')"></span>
-      </q-tooltip>
-    </q-btn>
-
    <q-btn :label="$t('download_backup')" flat @click="downloadBackup"></q-btn>

    <q-btn
@@ -119,54 +109,6 @@
  </div>
 </div>

-<q-dialog v-if="isSuperUser" v-model="topUpDialog.show" position="top">
-  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-    <q-form class="q-gutter-md">
-      <p v-text="$t('topup_wallet')"></p>
-
-      <div class="row">
-        <div class="col-12">
-          <q-input
-            dense
-            type="text"
-            filled
-            v-model="wallet.id"
-            label="Wallet ID"
-            :hint="$t('topup_hint')"
-          ></q-input>
-
-          <br />
-        </div>
-
-        <div class="col-12">
-          <q-input
-            dense
-            type="number"
-            filled
-            v-model="wallet.amount"
-            :label="$t('amount')"
-          ></q-input>
-        </div>
-      </div>
-
-      <div class="row q-mt-lg">
-        <q-btn
-          :label="$t('topup')"
-          color="primary"
-          @click="topupWallet"
-        ></q-btn>
-
-        <q-btn
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          :label="$t('cancel')"
-        ></q-btn>
-      </div>
-    </q-form>
-  </q-card>
-</q-dialog>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script src="{{ static_url_for('static', 'js/admin.js') }}"></script>
 {% endblock %}
@@ -5,10 +5,75 @@
  :content-inset-level="0.5"
 >
  <q-card-section>
-    <strong>Node URL: </strong><em v-text="origin"></em><br />
-    <strong>Wallet ID: </strong><em>{{ wallet.id }}</em><br />
-    <strong>Admin key: </strong><em>{{ wallet.adminkey }}</em><br />
-    <strong>Invoice/read key: </strong><em>{{ wallet.inkey }}</em>
+    <q-list>
+      <q-item dense class="q-pa-none">
+        <q-item-section>
+          <q-item-label>
+            <strong>Node URL: </strong><em v-text="origin"></em>
+          </q-item-label>
+        </q-item-section>
+      </q-item>
+      <q-item dense class="q-pa-none">
+        <q-item-section>
+          <q-item-label>
+            <strong>Wallet ID: </strong><em v-text="wallet.id"></em>
+          </q-item-label>
+        </q-item-section>
+        <q-item-section side>
+          <q-icon
+            name="content_copy"
+            class="cursor-pointer"
+            @click="copyText(wallet.id)"
+          ></q-icon>
+        </q-item-section>
+      </q-item>
+      <q-item dense class="q-pa-none">
+        <q-item-section>
+          <q-item-label>
+            <strong>Admin key: </strong
+            ><em
+              v-text="adminkeyHidden ? '****************' : wallet.adminkey"
+            ></em>
+          </q-item-label>
+        </q-item-section>
+        <q-item-section side>
+          <div>
+            <q-icon
+              :name="adminkeyHidden ? 'visibility_off' : 'visibility'"
+              class="cursor-pointer"
+              @click="adminkeyHidden = !adminkeyHidden"
+            ></q-icon>
+            <q-icon
+              name="content_copy"
+              class="cursor-pointer q-ml-sm"
+              @click="copyText('{{ wallet.adminkey }}')"
+            ></q-icon>
+          </div>
+        </q-item-section>
+      </q-item>
+      <q-item dense class="q-pa-none">
+        <q-item-section>
+          <q-item-label>
+            <strong>Invoice/read key: </strong
+            ><em v-text="inkeyHidden ? '****************' : wallet.inkey"></em>
+          </q-item-label>
+        </q-item-section>
+        <q-item-section side>
+          <div>
+            <q-icon
+              :name="inkeyHidden ? 'visibility_off' : 'visibility'"
+              class="cursor-pointer"
+              @click="inkeyHidden = !inkeyHidden"
+            ></q-icon>
+            <q-icon
+              name="content_copy"
+              class="cursor-pointer q-ml-sm"
+              @click="copyText(wallet.inkey)"
+            ></q-icon>
+          </div>
+        </q-item-section>
+      </q-item>
+    </q-list>
  </q-card-section>
  <q-expansion-item
    group="api"
@@ -109,18 +174,16 @@
          ><span class="text-light-green">POST</span>
          /api/v1/payments/decode</code
        >
-        <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code>{"X-Api-Key": "<i>{{ wallet.inkey }}</i>"}</code><br />
        <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
-        <code>{"invoice": &lt;string&gt;}</code>
+        <code>{"data": &lt;string&gt;}</code>
        <h5 class="text-caption q-mt-sm q-mb-none">
          Returns 200 (application/json)
        </h5>
        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
        <code
          >curl -X POST {{ request.base_url }}api/v1/payments/decode -d
-          '{"data": &lt;bolt11/lnurl, string&gt;}' -H "X-Api-Key:
-          <i>{{ wallet.inkey }}</i>" -H "Content-type: application/json"</code
+          '{"data": &lt;bolt11/lnurl, string&gt;}' -H "Content-type:
+          application/json"</code
        >
      </q-card-section>
    </q-card>
@@ -26,7 +26,9 @@
            </q-tabs>
            <q-tab-panels v-model="tab">
              <q-tab-panel name="user">
-                <div v-if="passwordData.show">
+                <div v-if="credentialsData.show">
+                  <q-separator></q-separator>
+
                  <q-card-section>
                    <div class="row">
                      <div class="col">
@@ -36,19 +38,26 @@
                      </div>
                      <div class="col">
                        <q-img
-                          v-if="user.config.picture"
+                          v-if="user.extra.picture"
                          style="max-width: 100px"
-                          :src="user.config.picture"
+                          :src="user.extra.picture"
                          class="float-right"
                        ></q-img>
                      </div>
                    </div>
                  </q-card-section>
-                  <q-separator></q-separator>
                  <q-card-section>
+                    <q-input
+                      v-model="credentialsData.username"
+                      :label="$t('username')"
+                      filled
+                      dense
+                      :readonly="hasUsername"
+                      class="q-mb-md"
+                    ></q-input>
                    <q-input
                      v-if="user.has_password"
-                      v-model="passwordData.oldPassword"
+                      v-model="credentialsData.oldPassword"
                      type="password"
                      autocomplete="off"
                      label="Old Password"
@@ -57,7 +66,7 @@
                      :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
                    ></q-input>
                    <q-input
-                      v-model="passwordData.newPassword"
+                      v-model="credentialsData.newPassword"
                      type="password"
                      autocomplete="off"
                      :label="$t('password')"
@@ -66,7 +75,7 @@
                      :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
                    ></q-input>
                    <q-input
-                      v-model="passwordData.newPasswordRepeat"
+                      v-model="credentialsData.newPasswordRepeat"
                      type="password"
                      autocomplete="off"
                      :label="$t('password_repeat')"
@@ -75,24 +84,47 @@
                      class="q-mb-md"
                      :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
                    ></q-input>
-                  </q-card-section>
-                  <q-separator></q-separator>
-                  <q-card-section class="q-pb-lg">
                    <q-btn
                      @click="updatePassword"
-                      :disable="(!passwordData.newPassword || !passwordData.newPasswordRepeat) || passwordData.newPassword !== passwordData.newPasswordRepeat"
+                      :disable="disableUpdatePassword()"
                      unelevated
                      color="primary"
+                      class="float-right"
                      :label="$t('change_password')"
                    >
                    </q-btn>
+                  </q-card-section>
+                  <q-separator class="q-mt-xl"></q-separator>
+                  <q-card-section>
+                    <div class="col q-mb-sm">
+                      <h4 class="q-my-none">
+                        <span v-text="$t('pubkey')"></span>
+                      </h4>
+                    </div>
+                    <q-input
+                      v-model="credentialsData.pubkey"
+                      type="text"
+                      label="Pubkey"
+                      filled
+                      dense
+                    ></q-input>
                    <q-btn
-                      @click="passwordData.show = false"
+                      @click="updatePubkey"
+                      unelevated
+                      color="primary"
+                      class="q-mt-md float-right"
+                      :label="$t('update_pubkey')"
+                    >
+                    </q-btn>
+                  </q-card-section>
+                  <q-separator class="q-mt-xl"></q-separator>
+                  <q-card-section class="q-pb-lg">
+                    <q-btn
+                      @click="credentialsData.show = false"
                      :label="$t('back')"
                      outline
                      unelevated
                      color="grey"
-                      class="float-right"
                    ></q-btn>
                  </q-card-section>
                </div>
@@ -101,9 +133,9 @@
                    <div class="row">
                      <div class="col">
                        <q-img
-                          v-if="user.config.picture"
+                          v-if="user.extra.picture"
                          style="max-width: 100px"
-                          :src="user.config.picture"
+                          :src="user.extra.picture"
                          class="float-right"
                        ></q-img>
                      </div>
@@ -137,6 +169,15 @@
                      class="q-mb-md"
                    >
                    </q-input>
+                    <q-input
+                      v-model="user.pubkey"
+                      :label="$t('pubkey')"
+                      filled
+                      dense
+                      readonly
+                      class="q-mb-md"
+                    >
+                    </q-input>
                    <q-input
                      v-model="user.email"
                      :label="$t('email')"
@@ -195,9 +236,9 @@
                    </div>
                  </q-card-section>

-                  <q-card-section v-if="user.config">
+                  <q-card-section v-if="user.extra">
                    <q-input
-                      v-model="user.config.first_name"
+                      v-model="user.extra.first_name"
                      :label="$t('first_name')"
                      filled
                      dense
@@ -205,7 +246,7 @@
                    >
                    </q-input>
                    <q-input
-                      v-model="user.config.last_name"
+                      v-model="user.extra.last_name"
                      :label="$t('last_name')"
                      filled
                      dense
@@ -213,7 +254,7 @@
                    >
                    </q-input>
                    <q-input
-                      v-model="user.config.provider"
+                      v-model="user.extra.provider"
                      :label="$t('auth_provider')"
                      filled
                      dense
@@ -222,10 +263,9 @@
                    >
                    </q-input>
                    <q-input
-                      v-model="user.config.picture"
+                      v-model="user.extra.picture"
                      :label="$t('picture')"
                      filled
-                      dense
                      class="q-mb-md"
                    >
                    </q-input>
@@ -236,11 +276,10 @@
                      <span v-text="$t('update_account')"></span>
                    </q-btn>
                    <q-btn
-                      @click="showChangePassword()"
-                      :label="user.has_password ? $t('change_password'): $t('set_password')"
-                      outline
-                      unelevated
-                      color="grey"
+                      @click="showUpdateCredentials()"
+                      :label="$t('update_credentials')"
+                      filled
+                      color="primary"
                      class="float-right"
                    ></q-btn>
                  </q-card-section>
@@ -373,6 +412,27 @@
                    </q-btn>
                  </div>
                </div>
+                <div class="row q-mb-md">
+                  <div class="col-4">
+                    <span v-text="$t('gradient_background')"></span>
+                  </div>
+                  <div class="col-8">
+                    <q-btn
+                      dense
+                      flat
+                      round
+                      @click="toggleGradient"
+                      icon="gradient"
+                      size="sm"
+                      v-model="gradientChoice"
+                    >
+                      <q-tooltip
+                        ><span v-text="$t('toggle_gradient')"></span
+                      ></q-tooltip>
+                    </q-btn>
+                  </div>
+                </div>
+
                <div class="row q-mb-md">
                  <div class="col-4">
                    <span v-text="$t('toggle_darkmode')"></span>
@@ -410,7 +470,7 @@
                      v-model="reactionChoice"
                      :options="reactionOptions"
                      label="Reactions"
-                      @input="reactionChoiceFunc"
+                      @update:model-value="reactionChoiceFunc"
                    >
                      <q-tooltip
                        ><span v-text="$t('payment_reactions')"></span
@@ -97,9 +97,9 @@
  }
 </style>
 <script>
-  new Vue({
+  window.app = Vue.createApp({
    el: '#vue',
-    mixins: [windowMixin],
+    mixins: [window.windowMixin],
    data: function () {
      return {
        loginData: {
@@ -8,12 +8,19 @@
  ></div>
  <div v-else class="col-12 col-md-4 col-lg-4 q-gutter-y-md">
    <div class="gt-sm">
-      <h3 class="q-my-none" v-if="'{{SITE_TITLE}}' == 'LNbits'">
+      <h3
+        class="q-my-none"
+        v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'"
+      >
        {{SITE_TITLE}}
      </h3>
-      <h5 class="q-my-md" v-if="'{{SITE_TITLE}}' == 'LNbits'">
+      <h5 class="q-my-md" v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'">
        {{SITE_TAGLINE}}
      </h5>
+      <div
+        v-html="formatDescription"
+        v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'"
+      ></div>
    </div>
    {% if lnurl and LNBITS_NEW_ACCOUNTS_ALLOWED and ("user-id-only" in
    LNBITS_AUTH_METHODS)%}
@@ -26,7 +33,7 @@
              color="primary"
              @click="processing"
              type="a"
-              href="{{ url_for('core.lnurlwallet') }}?lightning={{ lnurl }}"
+              href="/lnurlwallet?lightning={{ lnurl }}"
              v-text="$t('press_to_claim')"
              class="full-width"
            ></q-btn>
@@ -177,6 +184,47 @@
              </div>
            </q-form>
          </q-card-section>
+          <q-card-section
+            v-if="authAction === 'reset' && authMethod === 'username-password'"
+          >
+            <b> <span v-text="$t('reset_password')"></span> </b><br /><br />
+            <q-form @submit="reset" class="q-gutter-md">
+              <q-input
+                filled
+                dense
+                required
+                :disable="true"
+                v-model="reset_key"
+                :label="$t('reset_key') + ' *'"
+              ></q-input>
+              <q-input
+                filled
+                dense
+                v-model="password"
+                :label="$t('password') + ' *'"
+                type="password"
+                :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
+              ></q-input>
+              <q-input
+                filled
+                dense
+                v-model="passwordRepeat"
+                :label="$t('password_repeat') + ' *'"
+                type="password"
+                :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
+              ></q-input>
+              <div>
+                <q-btn
+                  unelevated
+                  color="primary"
+                  :disable="!password || !passwordRepeat|| !reset_key || (password !== passwordRepeat)"
+                  type="submit"
+                  class="full-width"
+                  :label="$t('reset_password')"
+                ></q-btn>
+              </div>
+            </q-form>
+          </q-card-section>
          {%endif%} {% if LNBITS_NEW_ACCOUNTS_ALLOWED %}
          <q-card-section
            v-if="authAction === 'register' && authMethod === 'user-id-only'"
@@ -223,7 +271,28 @@
            v-if="authAction === 'login' && authMethod === 'username-password'"
          >
            <div class="row">
-              {% if "google-auth" in LNBITS_AUTH_METHODS %}
+              {% if "nostr-auth-nip98" in LNBITS_AUTH_METHODS %}
+              <div class="col-12 full-width q-pa-sm">
+                <q-btn
+                  @click="signInWithNostr"
+                  outline
+                  no-caps
+                  rounded
+                  color="grey"
+                  class="full-width"
+                >
+                  <q-avatar size="32px" class="q-mr-md">
+                    <q-img
+                      class="bg-primary"
+                      :src="'{{ static_url_for('static', 'images/logos/nostr.svg') }}'"
+                    ></q-img>
+                  </q-avatar>
+                  <div>
+                    <span v-text="$t('signin_with_nostr')"></span>
+                  </div>
+                </q-btn>
+              </div>
+              {%endif%} {% if "google-auth" in LNBITS_AUTH_METHODS %}
              <div class="col-12 full-width q-pa-sm">
                <q-btn
                  href="/api/v1/auth/google"
@@ -306,7 +375,7 @@
  </div>

  <div
-    v-if="'{{SITE_TITLE}}' != 'LNbits'"
+    v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'False'"
    class="col-12 col-md-5 col-lg-5 q-pt-xl"
  >
    <h3 class="q-my-none">{{SITE_TITLE}}</h3>
@@ -331,7 +400,7 @@
          outline
          color="grey"
          type="a"
-          href="https://legend.lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK"
+          href="https://demo.lnbits.com/lnurlp/link/fH59GD"
          target="_blank"
          rel="noopener noreferrer"
          :label="$t('donate')"
@@ -477,6 +546,32 @@
            </a>
          </div>
        </div>
+        <div class="row">
+          <div class="col">
+            <a
+              href="https://breez.technology/sdk/"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              <q-img
+                contain
+                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/breez.png') }}' : '{{ static_url_for('static', 'images/breezl.png') }}'"
+              ></q-img>
+            </a>
+          </div>
+          <div class="col q-pl-md">
+            <a
+              href="https://blockstream.com/lightning/greenlight/"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              <q-img
+                contain
+                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/greenlight.png') }}' : '{{ static_url_for('static', 'images/greenlightl.png') }}'"
+              ></q-img>
+            </a>
+          </div>
+        </div>
        <div class="row">
          <div class="col">
            <a
@@ -499,23 +594,62 @@
            </a>
          </div>
        </div>
+        <div class="row">
+          <div class="col">
+            <a
+              href="https://phoenix.acinq.co/server"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              <q-img
+                contain
+                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/phoenixd.png') }}' : '{{ static_url_for('static', 'images/phoenixdl.png') }}'"
+              ></q-img>
+            </a>
+          </div>
+          <div class="col">
+            <a
+              href="https://boltz.exchange/"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              <q-img
+                contain
+                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/boltz.svg') }}' : '{{ static_url_for('static', 'images/boltz.svg') }}'"
+              ></q-img>
+            </a>
+          </div>
+        </div>
      </div>
    </div>
  </div>
-  {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %}
-  <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
-    <q-btn flat color="secondary" class="full-width q-mb-md"
-      >{{ AD_SPACE_TITLE }}</q-btn
-    >
+</div>
+{% if AD_SPACE %}
+<div class="row justify-center">
+  <q-btn flat color="secondary" class="full-width q-mb-md"
+    >{{ AD_SPACE_TITLE }}</q-btn
+  >

-    <a href="{{ AD[0] }}" class="q-ma-md">
-      <img v-if="($q.dark.isActive)" src="{{ AD[1] }}" style="max-width: 90%" />
-      <img v-else src="{{ AD[2] }}" style="max-width: 90%" />
+  {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %}
+  <div class="flex flex-center column">
+    <a href="{{ AD[0] }}">
+      <img
+        v-if="($q.dark.isActive)"
+        src="{{ AD[1] }}"
+        style="max-width: 420px"
+      />
+      <img v-else src="{{ AD[2] }}" style="max-width: 420px" />
    </a>
  </div>
-  {% endfor %} {% endif %}
+
+  {% endfor %}
 </div>
-<div v-if="'{{SITE_TITLE}}' == 'LNbits'" class="row gt-sm q-mt-xl">
+{% endif %}
+
+<div
+  v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'"
+  class="row gt-sm q-mt-xl"
+>
  <div class="col-1"></div>
  <div class="col-10 q-pl-xl">
    <span v-text="$t('lnbits_description')"></span>
@@ -6,7 +6,7 @@
 <script src="{{ static_url_for('static', 'js/wallet.js') }}"></script>
 {% endblock %}
 <!---->
-{% block title %} {{ wallet.name }} - {{ SITE_TITLE }} {% endblock %}
+{% block title %}{{ wallet_name }} - {{ SITE_TITLE }} {% endblock %}
 <!---->
 {% block page %}
 <div class="row q-col-gutter-md">
@@ -38,7 +38,6 @@
              <strong v-text="formattedBalance"></strong>
              <small>{{LNBITS_DENOMINATION}}</small>
              <lnbits-update-balance
-                v-if="'{{user.super_user}}' == 'True'"
                :wallet_id="this.g.wallet.id"
                flat
                :callback="updateBalanceCallback"
@@ -102,226 +101,11 @@
            </div>
          </div>
        </q-card>
-
-        <q-card
-          :style="$q.screen.lt.md ? {
-            background: $q.screen.lt.md ? 'none !important': ''
-            , boxShadow: $q.screen.lt.md ? 'none !important': ''
-            , marginTop: $q.screen.lt.md ? '0px !important': ''
-          } : ''"
-        >
-          <q-card-section>
-            <div class="row items-center no-wrap q-mb-sm">
-              <div class="col">
-                <h5
-                  class="text-subtitle1 q-my-none"
-                  :v-text="$t('transactions')"
-                ></h5>
-              </div>
-              <div class="gt-sm col-auto">
-                <q-btn
-                  flat
-                  color="grey"
-                  @click="exportCSV"
-                  :label="$t('export_csv')"
-                ></q-btn>
-                <q-btn
-                  dense
-                  flat
-                  round
-                  icon="show_chart"
-                  color="grey"
-                  @click="showChart"
-                >
-                  <q-tooltip>
-                    <span v-text="$t('chart_tooltip')"></span
-                  ></q-tooltip>
-                </q-btn>
-              </div>
-            </div>
-            <q-input
-              :style="$q.screen.lt.md ? {
-              display: mobileSimple ? 'none !important': ''
-            } : ''"
-              filled
-              dense
-              clearable
-              v-model="paymentsTable.search"
-              debounce="300"
-              :placeholder="$t('search_by_tag_memo_amount')"
-              class="q-mb-md"
-            >
-            </q-input>
-            <q-table
-              dense
-              flat
-              :data="paymentsOmitter"
-              :row-key="paymentTableRowKey"
-              :columns="paymentsTable.columns"
-              :pagination.sync="paymentsTable.pagination"
-              :no-data-label="$t('no_transactions')"
-              :filter="paymentsTable.search"
-              :loading="paymentsTable.loading"
-              :hide-header="mobileSimple"
-              :hide-bottom="mobileSimple"
-              @request="fetchPayments"
-            >
-              <template v-slot:header="props">
-                <q-tr :props="props">
-                  <q-th auto-width></q-th>
-                  <q-th
-                    v-for="col in props.cols"
-                    :key="col.name"
-                    :props="props"
-                    v-text="col.label"
-                  ></q-th>
-                </q-tr>
-              </template>
-              <template v-slot:body="props">
-                <q-tr :props="props">
-                  <q-td auto-width class="text-center">
-                    <q-icon
-                      v-if="props.row.isPaid"
-                      size="14px"
-                      :name="props.row.isOut ? 'call_made' : 'call_received'"
-                      :color="props.row.isOut ? 'pink' : 'green'"
-                      @click="props.expand = !props.expand"
-                    ></q-icon>
-                    <q-icon
-                      v-else
-                      name="settings_ethernet"
-                      color="grey"
-                      @click="props.expand = !props.expand"
-                    >
-                      <q-tooltip
-                        ><span v-text="$t('pending')"></span
-                      ></q-tooltip>
-                    </q-icon>
-                  </q-td>
-                  <q-td
-                    key="time"
-                    :props="props"
-                    style="white-space: normal; word-break: break-all"
-                  >
-                    <q-badge
-                      v-if="props.row.tag"
-                      color="yellow"
-                      text-color="black"
-                    >
-                      <a
-                        v-text="'#'+props.row.tag"
-                        class="inherit"
-                        :href="['/', props.row.tag].join('')"
-                      ></a>
-                    </q-badge>
-                    <span v-text="props.row.memo"></span>
-                    <br />
-
-                    <i>
-                      <span v-text="props.row.dateFrom"></span>
-                      <q-tooltip
-                        ><span v-text="props.row.date"></span
-                      ></q-tooltip>
-                    </i>
-                  </q-td>
-                  <q-td
-                    auto-width
-                    key="amount"
-                    v-if="'{{LNBITS_DENOMINATION}}' != 'sats'"
-                    :props="props"
-                    v-text="parseFloat(String(props.row.fsat).replaceAll(',', '')) / 100"
-                  >
-                  </q-td>
-                  <q-td auto-width key="amount" v-else :props="props">
-                    <span v-text="props.row.fsat"></span>
-                    <br />
-                    <i v-if="props.row.extra.wallet_fiat_currency">
-                      <span
-                        v-text="formatFiat(props.row.extra.wallet_fiat_currency, props.row.extra.wallet_fiat_amount)"
-                      ></span>
-                      <br />
-                    </i>
-                    <i v-if="props.row.extra.fiat_currency">
-                      <span
-                        v-text="formatFiat(props.row.extra.fiat_currency, props.row.extra.fiat_amount)"
-                      ></span>
-                    </i>
-                  </q-td>
-                </q-tr>
-
-                <q-dialog v-model="props.expand" :props="props" position="top">
-                  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-                    <div class="text-center q-mb-lg">
-                      <div v-if="props.row.isIn && props.row.pending">
-                        <q-icon name="settings_ethernet" color="grey"></q-icon>
-                        <span v-text="$t('invoice_waiting')"></span>
-                        <lnbits-payment-details
-                          :payment="props.row"
-                        ></lnbits-payment-details>
-                        <div
-                          v-if="props.row.bolt11"
-                          class="text-center q-mb-lg"
-                        >
-                          <a :href="'lightning:' + props.row.bolt11">
-                            <q-responsive :ratio="1" class="q-mx-xl">
-                              <lnbits-qrcode
-                                :value="'lightning:' + props.row.bolt11.toUpperCase()"
-                              ></lnbits-qrcode>
-                            </q-responsive>
-                          </a>
-                        </div>
-                        <div class="row q-mt-lg">
-                          <q-btn
-                            outline
-                            color="grey"
-                            @click="copyText(props.row.bolt11)"
-                            :label="$t('copy_invoice')"
-                          ></q-btn>
-                          <q-btn
-                            v-close-popup
-                            flat
-                            color="grey"
-                            class="q-ml-auto"
-                            :label="$t('close')"
-                          ></q-btn>
-                        </div>
-                      </div>
-                      <div v-else-if="props.row.isPaid && props.row.isIn">
-                        <q-icon
-                          size="18px"
-                          :name="'call_received'"
-                          :color="'green'"
-                        ></q-icon>
-                        <span v-text="$t('payment_received')"></span>
-                        <lnbits-payment-details
-                          :payment="props.row"
-                        ></lnbits-payment-details>
-                      </div>
-                      <div v-else-if="props.row.isPaid && props.row.isOut">
-                        <q-icon
-                          size="18px"
-                          :name="'call_made'"
-                          :color="'pink'"
-                        ></q-icon>
-                        <span v-text="$t('payment_sent')"></span>
-                        <lnbits-payment-details
-                          :payment="props.row"
-                        ></lnbits-payment-details>
-                      </div>
-                      <div v-else-if="props.row.isOut && props.row.pending">
-                        <q-icon name="settings_ethernet" color="grey"></q-icon>
-                        <span v-text="$t('outgoing_payment_pending')"></span>
-                        <lnbits-payment-details
-                          :payment="props.row"
-                        ></lnbits-payment-details>
-                      </div>
-                    </div>
-                  </q-card>
-                </q-dialog>
-              </template>
-            </q-table>
-          </q-card-section>
-        </q-card>
+        <payment-list
+          :update="updatePayments"
+          :wallet="this.g.wallet"
+          :mobile-simple="mobileSimple"
+        />
      </div>
      {% if HIDE_API %}
      <div class="col-12 col-md-4 q-gutter-y-md">
@@ -369,11 +153,16 @@
                  <q-card>
                    <q-card-section class="text-center">
                      <p v-text="$t('export_to_phone_desc')"></p>
-                      <qrcode
-                        :value="'{{request.base_url}}wallet?usr={{user.id}}&wal={{wallet.id}}'"
-                        :options="{width:240}"
-                      ></qrcode>
+                      <lnbits-qrcode :value="exportUrl"></lnbits-qrcode>
                    </q-card-section>
+                    <q-card-actions class="flex-center q-pb-md">
+                      <q-btn
+                        outline
+                        color="grey"
+                        :label="$t('copy_wallet_url')"
+                        @click="copyText('{{request.base_url}}wallet?usr={{user.id}}&wal={{wallet.id}}')"
+                      ></q-btn>
+                    </q-card-actions>
                  </q-card>
                </q-expansion-item>
                <q-separator></q-separator>
@@ -459,19 +248,21 @@
              </q-list>
            </q-card-section>
          </q-card>
-          {% endif %} {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD =
-          ADS.split(";") %}
+          {% endif %} {% if AD_SPACE %}
          <q-card>
            <q-card-section>
              <h6 class="text-subtitle1 q-mt-none q-mb-sm">
                {{ AD_SPACE_TITLE }}
              </h6>
            </q-card-section>
+            {% for ADS in AD_SPACE %} {% set AD = ADS.split(";") %}
+
            <q-card-section class="q-pa-none">
              <a
                style="display: inline-block"
                href="{{ AD[0] }}"
-                class="q-ma-md"
+                class="q-ml-md q-mb-xs q-mr-md"
+                style="max-width: 80%"
              >
                <img
                  style="max-width: 100%; height: auto"
@@ -483,8 +274,10 @@
                  v-else
                  src="{{ AD[2] }}"
                />
-              </a> </q-card-section></q-card
-          >{% endfor %} {% endif %}
+              </a> </q-card-section
+            >{% endfor %}
+          </q-card>
+          {% endif %}
        </div>
      </div>

@@ -522,13 +315,11 @@
            <q-input
              ref="setAmount"
              filled
+              :pattern="receive.unit === 'sat' ? '\\d*' : '\\d*\\.?\\d*'"
+              inputmode="numeric"
              dense
              v-model.number="receive.data.amount"
              :label="$t('amount') + ' (' + receive.unit + ') *'"
-              :mask="receive.unit != 'sat' ? '#.##' : '#'"
-              fill-mask="0"
-              reverse-fill-mask
-              :step="receive.unit != 'sat' ? '0.01' : '1'"
              :min="receive.minMax[0]"
              :max="receive.minMax[1]"
              :readonly="receive.lnurl && receive.lnurl.fixed"
@@ -575,11 +366,9 @@
        >
          <div class="text-center q-mb-lg">
            <a :href="'lightning:' + receive.paymentReq">
-              <q-responsive :ratio="1" class="q-mx-xl">
-                <lnbits-qrcode
-                  :value="'lightning:' + receive.paymentReq.toUpperCase()"
-                ></lnbits-qrcode>
-              </q-responsive>
+              <lnbits-qrcode
+                :value="'lightning:' + receive.paymentReq.toUpperCase()"
+              ></lnbits-qrcode>
            </a>
          </div>
          <div class="row q-mt-lg">
@@ -832,8 +621,8 @@
            <div v-else>
              <q-responsive :ratio="1">
                <qrcode-stream
-                  @decode="decodeQR"
-                  @init="onInitQR"
+                  @detect="decodeQR"
+                  @camera-on="onInitQR"
                  class="rounded-borders"
                ></qrcode-stream>
              </q-responsive>
@@ -856,8 +645,8 @@
        <q-card class="q-pa-lg q-pt-xl">
          <div class="text-center q-mb-lg">
            <qrcode-stream
-              @decode="decodeQR"
-              @init="onInitQR"
+              @detect="decodeQR"
+              @camera-on="onInitQR"
              class="rounded-borders"
            ></qrcode-stream>
          </div>
@@ -873,27 +662,6 @@
        </q-card>
      </q-dialog>

-      <q-dialog v-model="paymentsChart.show" position="top">
-        <q-card class="q-pa-sm" style="width: 800px; max-width: unset">
-          <q-card-section>
-            <div class="row q-gutter-sm justify-between">
-              <div class="text-h6">Payments Chart</div>
-              <q-select
-                label="Group"
-                filled
-                dense
-                v-model="paymentsChart.group"
-                style="min-width: 120px"
-                :options="paymentsChart.groupOptions"
-              >
-              </q-select>
-            </div>
-
-            <canvas ref="canvas" width="600" height="400"></canvas>
-          </q-card-section>
-        </q-card>
-      </q-dialog>
-
      <q-tabs
        class="lt-md fixed-bottom left-0 right-0 bg-primary text-white shadow-2 z-top"
        active-class="px-0"
@@ -51,11 +51,11 @@
            >
              <a :href="'lightning:' + transactionDetailsDialog.data.bolt11">
                <q-responsive :ratio="1" class="q-mx-xl">
-                  <qrcode
+                  <qrcode-vue
                    :value="'lightning:' + transactionDetailsDialog.data.bolt11.toUpperCase()"
                    :options="{width: 340}"
                    class="rounded-borders"
-                  ></qrcode>
+                  ></qrcode-vue>
                </q-responsive>
              </a>
              <q-btn
@@ -94,9 +94,9 @@
            <q-table
              dense
              flat
-              :data="paymentsTable.data"
+              :rows="paymentsTable.data"
              :columns="paymentsTable.columns"
-              :pagination.sync="paymentsTable.pagination"
+              v-model:pagination="paymentsTable.pagination"
              row-key="payment_hash"
              no-data-label="No transactions made yet"
              :filter="paymentsTable.filter"
@@ -138,11 +138,11 @@
                          >
                            <a :href="'lightning:' + props.row.bolt11">
                              <q-responsive :ratio="1" class="q-mx-xl">
-                                <qrcode
+                                <qrcode-vue
                                  :value="'lightning:' + props.row.bolt11.toUpperCase()"
                                  :options="{width: 340}"
                                  class="rounded-borders"
-                                ></qrcode>
+                                ></qrcode-vue>
                              </q-responsive>
                            </a>
                          </div>
@@ -256,9 +256,9 @@
            <q-table
              dense
              flat
-              :data="invoiceTable.data"
+              :rows="invoiceTable.data"
              :columns="invoiceTable.columns"
-              :pagination.sync="invoiceTable.pagination"
+              v-model:pagination="invoiceTable.pagination"
              no-data-label="No transactions made yet"
              :filter="invoiceTable.filter"
              @request="getInvoices"
@@ -47,7 +47,7 @@
  Vue.component(VueQrcode.name, VueQrcode)
  Vue.use(VueQrcodeReader)

-  new Vue({
+  window.app = Vue.createApp({
    el: '#vue',
    config: {
      globalProperties: {
@@ -55,7 +55,7 @@
        msg: 'hello'
      }
    },
-    mixins: [windowMixin],
+    mixins: [window.windowMixin],
    data: function () {
      return {
        isSuperUser: false,
@@ -319,7 +319,7 @@
          .confirmDialog('Do you really wanna disconnect this peer?')
          .onOk(() => {
            this.api('DELETE', `/peers/${id}`).then(response => {
-              this.$q.notify({
+              Quasar.Notify.create({
                message: 'Disconnected',
                icon: null
              })
@@ -53,10 +53,7 @@ context %} {% block page %}
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script src="{{ static_url_for('static', 'js/node.js') }}"></script>
 <script>
-  Vue.component(VueQrcode.name, VueQrcode)
-  Vue.use(VueQrcodeReader)
-
-  new Vue({
+  window.app = Vue.createApp({
    el: '#vue',
    config: {
      globalProperties: {
@@ -64,7 +61,7 @@ context %} {% block page %}
        msg: 'hello'
      }
    },
-    mixins: [windowMixin],
+    mixins: [window.windowMixin],
    data: function () {
      return {
        isSuperUser: false,
@@ -0,0 +1,23 @@
+<q-dialog v-model="createUserDialog.show">
+  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+    <p>Create User</p>
+    <div class="row">
+      <div class="col-12">
+        <q-form @submit="createUser">
+          <lnbits-dynamic-fields
+            :options="createUserDialog.fields"
+            v-model="createUserDialog.data"
+          ></lnbits-dynamic-fields>
+          <div class="row q-mt-lg">
+            <q-btn v-close-popup unelevated color="primary" type="submit"
+              >Create</q-btn
+            >
+            <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+              >Cancel</q-btn
+            >
+          </div>
+        </q-form>
+      </div>
+    </div>
+  </q-card>
+</q-dialog>
@@ -0,0 +1,23 @@
+<q-dialog v-model="createWalletDialog.show">
+  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+    <p>Create Wallet</p>
+    <div class="row">
+      <div class="col-12">
+        <q-form @submit="createWallet">
+          <lnbits-dynamic-fields
+            :options="createWalletDialog.fields"
+            v-model="createUserDialog.data"
+          ></lnbits-dynamic-fields>
+          <div class="row q-mt-lg">
+            <q-btn v-close-popup unelevated color="primary" type="submit"
+              >Create</q-btn
+            >
+            <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+              >Cancel</q-btn
+            >
+          </div>
+        </q-form>
+      </div>
+    </div>
+  </q-card>
+</q-dialog>
@@ -0,0 +1,49 @@
+<q-dialog v-model="topupDialog.show" position="top">
+  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+    <q-form class="q-gutter-md">
+      <p v-text="$t('topup_wallet')"></p>
+
+      <div class="row">
+        <div class="col-12">
+          <q-input
+            dense
+            type="text"
+            filled
+            v-model="wallet.id"
+            label="Wallet ID"
+            :hint="$t('topup_hint')"
+          ></q-input>
+
+          <br />
+        </div>
+
+        <div class="col-12">
+          <q-input
+            dense
+            type="number"
+            filled
+            v-model="wallet.amount"
+            :label="$t('amount')"
+          ></q-input>
+        </div>
+      </div>
+
+      <div class="row q-mt-lg">
+        <q-btn
+          :label="$t('topup')"
+          color="primary"
+          @click="topupWallet"
+          v-close-popup
+        ></q-btn>
+
+        <q-btn
+          v-close-popup
+          flat
+          color="grey"
+          class="q-ml-auto"
+          :label="$t('cancel')"
+        ></q-btn>
+      </div>
+    </q-form>
+  </q-card>
+</q-dialog>
@@ -0,0 +1,112 @@
+<q-dialog v-model="walletDialog.show">
+  <q-card class="q-pa-lg" style="width: 700px; max-width: 80vw">
+    <h2 class="text-h6 q-mb-md">Wallets</h2>
+    <q-dialog v-model="paymentDialog.show">
+      <q-card class="q-pa-lg" style="width: 700px; max-width: 80vw">
+        <payment-list :wallet="activeWallet" />
+      </q-card>
+    </q-dialog>
+    <q-table :rows="wallets" :columns="walletTable.columns">
+      <template v-slot:header="props">
+        <q-tr :props="props">
+          <q-th auto-width></q-th>
+          <q-th
+            auto-width
+            v-for="col in props.cols"
+            v-text="col.label"
+            :key="col.name"
+            :props="props"
+          ></q-th>
+        </q-tr>
+      </template>
+      <template v-slot:body="props">
+        <q-tr :props="props">
+          <q-td auto-width>
+            <q-btn
+              round
+              icon="menu"
+              size="sm"
+              color="secondary"
+              @click="showPayments(props.row.id)"
+            >
+              <q-tooltip>Show Payments</q-tooltip>
+            </q-btn>
+            <q-btn
+              v-if="!props.row.deleted"
+              round
+              icon="content_copy"
+              size="sm"
+              color="primary"
+              class="q-ml-xs"
+              @click="copyText(props.row.id)"
+            >
+              <q-tooltip>Copy Wallet ID</q-tooltip>
+            </q-btn>
+            <lnbits-update-balance
+              v-if="!props.row.deleted"
+              :wallet_id="props.row.id"
+              :callback="topupCallback"
+              class="q-ml-xs"
+            ></lnbits-update-balance>
+            <q-btn
+              round
+              v-if="!props.row.deleted"
+              icon="vpn_key"
+              size="sm"
+              color="primary"
+              class="q-ml-xs"
+              @click="copyText(props.row.adminkey)"
+            >
+              <q-tooltip>Copy Admin Key</q-tooltip>
+            </q-btn>
+            <q-btn
+              round
+              v-if="!props.row.deleted"
+              icon="vpn_key"
+              size="sm"
+              color="secondary"
+              class="q-ml-xs"
+              @click="copyText(props.row.inkey)"
+            >
+              <q-tooltip>Copy Invoice Key</q-tooltip>
+            </q-btn>
+            <q-btn
+              round
+              v-if="props.row.deleted"
+              icon="toggle_off"
+              size="sm"
+              color="secondary"
+              class="q-ml-xs"
+              @click="undeleteUserWallet(props.row.user, props.row.id)"
+            >
+              <q-tooltip>Undelete Wallet</q-tooltip>
+            </q-btn>
+            <q-btn
+              round
+              icon="delete"
+              size="sm"
+              color="negative"
+              class="q-ml-xs"
+              @click="deleteUserWallet(props.row.user, props.row.id, props.row.deleted)"
+            >
+              <q-tooltip>Delete Wallet</q-tooltip>
+            </q-btn>
+          </q-td>
+          <q-td auto-width v-text="props.row.name"></q-td>
+          <q-td auto-width v-text="props.row.currency"></q-td>
+          <q-td auto-width v-text="formatSat(props.row.balance_msat)"></q-td>
+          <q-td auto-width v-text="props.row.deleted"></q-td>
+        </q-tr>
+      </template>
+    </q-table>
+    <div class="row q-mt-lg">
+      <q-btn
+        v-close-popup
+        flat
+        color="grey"
+        class="q-ml-auto"
+        :label="$t('close')"
+      ></q-btn>
+    </div>
+  </q-card>
+</q-dialog>
@@ -0,0 +1,132 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %} {% include "users/_walletDialog.html" %} {% include
+"users/_topupDialog.html" %} {% include "users/_createUserDialog.html" %} {%
+include "users/_createWalletDialog.html" %}
+
+<h3 class="text-subtitle q-my-none" v-text="$t('users')"></h3>
+
+<div class="row q-col-gutter-md justify-center">
+  <div class="col q-gutter-y-md" style="width: 300px">
+    <div style="width: 100%; max-width: 2000px">
+      <canvas ref="chart1"></canvas>
+    </div>
+  </div>
+</div>
+<div class="row q-col-gutter-md justify-center">
+  <div class="col q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        <div class="row items-center no-wrap q-mb-sm">
+          <q-btn :label="$t('topup')" @click="topupDialog.show = true">
+            <q-tooltip
+              >{%raw%}{{ $t('add_funds_tooltip') }}{%endraw%}</q-tooltip
+            >
+          </q-btn>
+        </div>
+        <q-table
+          row-key="id"
+          :rows="users"
+          :columns="usersTable.columns"
+          v-model:pagination="usersTable.pagination"
+          :no-data-label="$t('no_users')"
+          :filter="usersTable.search"
+          :loading="usersTable.loading"
+          @request="fetchUsers"
+        >
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th auto-width></q-th>
+              <q-th
+                v-for="col in props.cols"
+                v-text="col.label"
+                :key="col.name"
+                :props="props"
+              ></q-th>
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr auto-width :props="props">
+              <q-td>
+                <q-btn
+                  round
+                  icon="list"
+                  size="sm"
+                  color="secondary"
+                  @click="fetchWallets(props.row.id)"
+                >
+                  <q-tooltip>Show Wallets</q-tooltip>
+                </q-btn>
+                <q-btn
+                  round
+                  icon="content_copy"
+                  size="sm"
+                  color="primary"
+                  class="q-ml-xs"
+                  @click="copyText(props.row.id)"
+                >
+                  <q-tooltip>Copy User ID</q-tooltip>
+                </q-btn>
+                <q-btn
+                  round
+                  v-if="!props.row.is_super_user"
+                  icon="build"
+                  size="sm"
+                  :color="props.row.is_admin ? 'primary' : 'grey'"
+                  class="q-ml-xs"
+                  @click="toggleAdmin(props.row.id)"
+                >
+                  <q-tooltip>Toggle Admin</q-tooltip>
+                </q-btn>
+                <q-btn
+                  round
+                  v-if="props.row.is_super_user"
+                  icon="build"
+                  size="sm"
+                  color="positive"
+                  class="q-ml-xs"
+                >
+                  <q-tooltip>Super User</q-tooltip>
+                </q-btn>
+                <q-btn
+                  round
+                  icon="refresh"
+                  size="sm"
+                  color="secondary"
+                  @click="resetPassword(props.row.id)"
+                >
+                  <q-tooltip>Generate and copy password reset url</q-tooltip>
+                </q-btn>
+                <q-btn
+                  round
+                  icon="delete"
+                  size="sm"
+                  color="negative"
+                  class="q-ml-xs"
+                  @click="deleteUser(props.row.id, props)"
+                >
+                  <q-tooltip>Delete User</q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td
+                auto-width
+                v-text="formatSat(props.row.balance_msat)"
+              ></q-td>
+              <q-td auto-width v-text="props.row.wallet_count"></q-td>
+              <q-td auto-width v-text="props.row.transaction_count"></q-td>
+              <q-td auto-width v-text="props.row.username"></q-td>
+              <q-td auto-width v-text="props.row.email"></q-td>
+              <q-td
+                auto-width
+                v-text="formatDate(props.row.last_payment)"
+              ></q-td>
+            </q-tr>
+          </template>
+        </q-table>
+      </q-card-section>
+    </q-card>
+  </div>
+</div>
+
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+<script src="{{ static_url_for('static', 'js/users.js') }}"></script>
+{% endblock %}
@@ -8,14 +8,11 @@ from urllib.parse import urlparse

 from fastapi import APIRouter, Depends
 from fastapi.responses import FileResponse
-from starlette.exceptions import HTTPException

-from lnbits.core.crud import get_wallet
-from lnbits.core.models import CreateTopup, User
+from lnbits.core.models import User
 from lnbits.core.services import (
    get_balance_delta,
    update_cached_settings,
-    update_wallet_balance,
 )
 from lnbits.core.tasks import api_invoice_listeners
 from lnbits.decorators import check_admin, check_super_user
@@ -36,18 +33,7 @@ admin_router = APIRouter(tags=["Admin UI"], prefix="/admin")
    dependencies=[Depends(check_admin)],
 )
 async def api_auditor():
-    try:
-        delta, node_balance, total_balance = await get_balance_delta()
-        return {
-            "delta_msats": int(delta),
-            "node_balance_msats": int(node_balance),
-            "lnbits_balance_msats": int(total_balance),
-        }
-    except Exception:
-        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail="Could not audit balance.",
-        )
+    return await get_balance_delta()


@admin_router.get(
@@ -104,30 +90,6 @@ async def api_restart_server() -> dict[str, str]:
    return {"status": "Success"}


-@admin_router.put(
-    "/api/v1/topup",
-    name="Topup",
-    status_code=HTTPStatus.OK,
-    dependencies=[Depends(check_super_user)],
-)
-async def api_topup_balance(data: CreateTopup) -> dict[str, str]:
-    try:
-        await get_wallet(data.id)
-    except Exception:
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN, detail="wallet does not exist."
-        )
-
-    if settings.lnbits_backend_wallet_class == "VoidWallet":
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN, detail="VoidWallet active"
-        )
-
-    await update_wallet_balance(wallet_id=data.id, amount=int(data.amount))
-
-    return {"status": "Success"}
-
-
@admin_router.get(
    "/api/v1/backup",
    status_code=HTTPStatus.OK,
@@ -2,7 +2,8 @@ import hashlib
 import json
 from http import HTTPStatus
 from io import BytesIO
-from typing import Dict, List
+from time import time
+from typing import Any
 from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse

 import httpx
@@ -12,8 +13,9 @@ from fastapi import (
    Depends,
 )
 from fastapi.exceptions import HTTPException
-from starlette.responses import StreamingResponse
+from fastapi.responses import StreamingResponse

+from lnbits.core.crud import get_user
 from lnbits.core.models import (
    BaseWallet,
    ConversionData,
@@ -25,61 +27,82 @@ from lnbits.core.models import (
 from lnbits.decorators import (
    WalletTypeInfo,
    check_user_exists,
-    get_key_type,
    require_admin_key,
+    require_invoice_key,
 )
 from lnbits.lnurl import decode as lnurl_decode
 from lnbits.settings import settings
 from lnbits.utils.exchange_rates import (
    allowed_currencies,
    fiat_amount_as_satoshis,
+    get_fiat_rate_satoshis,
    satoshis_amount_as_fiat,
 )
+from lnbits.wallets import get_funding_source
+from lnbits.wallets.base import StatusResponse

-from ..crud import (
-    create_account,
-    create_wallet,
-)
-from ..services import perform_lnurlauth
-
-# backwards compatibility for extension
-# TODO: remove api_payment and pay_invoice imports from extensions
-from .payment_api import api_payment, pay_invoice  # noqa: F401
+from ..services import create_user_account, perform_lnurlauth

 api_router = APIRouter(tags=["Core"])


@api_router.get("/api/v1/health", status_code=HTTPStatus.OK)
-async def health():
-    return
+async def health() -> dict:
+    return {
+        "server_time": int(time()),
+        "up_time": int(time() - settings.server_startup_time),
+    }
+
+
+@api_router.get("/api/v1/status", status_code=HTTPStatus.OK)
+async def health_check(wallet: WalletTypeInfo = Depends(require_invoice_key)) -> dict:
+    stat: dict[str, Any] = {
+        "server_time": int(time()),
+        "up_time": int(time() - settings.server_startup_time),
+    }
+
+    user = await get_user(wallet.wallet.user)
+    if not user:
+        return stat
+
+    stat["version"] = settings.version
+    if not user.admin:
+        return stat
+
+    funding_source = get_funding_source()
+    stat["funding_source"] = funding_source.__class__.__name__
+
+    status: StatusResponse = await funding_source.status()
+    stat["funding_source_error"] = status.error_message
+    stat["funding_source_balance_msat"] = status.balance_msat
+
+    return stat


@api_router.get(
    "/api/v1/wallets",
    name="Wallets",
    description="Get basic info for all of user's wallets.",
+    response_model=list[BaseWallet],
 )
-async def api_wallets(user: User = Depends(check_user_exists)) -> List[BaseWallet]:
-    return [BaseWallet(**w.dict()) for w in user.wallets]
+async def api_wallets(user: User = Depends(check_user_exists)) -> list[Wallet]:
+    return user.wallets


-@api_router.post("/api/v1/account", response_model=Wallet)
+@api_router.post("/api/v1/account")
 async def api_create_account(data: CreateWallet) -> Wallet:
-    if not settings.new_accounts_allowed:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail="Account creation is disabled.",
-        )
-    account = await create_account()
-    return await create_wallet(user_id=account.id, wallet_name=data.name)
+    user = await create_user_account(wallet_name=data.name)
+    return user.wallets[0]


@api_router.get("/api/v1/lnurlscan/{code}")
-async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_lnurlscan(
+    code: str, wallet: WalletTypeInfo = Depends(require_invoice_key)
+):
    try:
        url = str(lnurl_decode(code))
        domain = urlparse(url).netloc
-    except Exception:
+    except Exception as exc:
        # parse internet identifier (user@domain.com)
        name_domain = code.split("@")
        if len(name_domain) == 2 and len(name_domain[1].split(".")) >= 2:
@@ -94,10 +117,10 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type
        else:
            raise HTTPException(
                status_code=HTTPStatus.BAD_REQUEST, detail="invalid lnurl"
-            )
+            ) from exc

    # params is what will be returned to the client
-    params: Dict = {"domain": domain}
+    params: dict = {"domain": domain}

    if "tag=login" in url:
        params.update(kind="auth")
@@ -119,14 +142,14 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type

        try:
            data = json.loads(r.text)
-        except json.decoder.JSONDecodeError:
+        except json.decoder.JSONDecodeError as exc:
            raise HTTPException(
                status_code=HTTPStatus.SERVICE_UNAVAILABLE,
                detail={
                    "domain": domain,
                    "message": f"got invalid response '{r.text[:200]}'",
                },
-            )
+            ) from exc

        try:
            tag: str = data.get("tag")
@@ -146,7 +169,7 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type

                # callback with k1 already in it
                parsed_callback: ParseResult = urlparse(data["callback"])
-                qs: Dict = parse_qs(parsed_callback.query)
+                qs: dict = parse_qs(parsed_callback.query)
                qs["k1"] = data["k1"]

                # balanceCheck/balanceNotify
@@ -185,7 +208,7 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type
                    "domain": domain,
                    "message": f"lnurl JSON response invalid: {exc}",
                },
-            )
+            ) from exc

    return params

@@ -202,8 +225,14 @@ async def api_perform_lnurlauth(
    return ""


+@api_router.get("/api/v1/rate/{currency}")
+async def api_check_fiat_rate(currency: str) -> dict[str, float]:
+    rate = await get_fiat_rate_satoshis(currency)
+    return {"rate": rate}
+
+
@api_router.get("/api/v1/currencies")
-async def api_list_currencies_available() -> List[str]:
+async def api_list_currencies_available() -> list[str]:
    return allowed_currencies()


@@ -1,18 +1,18 @@
+import base64
 import importlib
+import json
+from http import HTTPStatus
+from time import time
 from typing import Callable, Optional
+from uuid import uuid4

-from fastapi import APIRouter, Depends, HTTPException, Request, status
+from fastapi import APIRouter, Depends, HTTPException, Request
 from fastapi.responses import JSONResponse, RedirectResponse
 from fastapi_sso.sso.base import OpenID, SSOBase
 from loguru import logger
-from starlette.status import (
-    HTTP_400_BAD_REQUEST,
-    HTTP_401_UNAUTHORIZED,
-    HTTP_403_FORBIDDEN,
-    HTTP_500_INTERNAL_SERVER_ERROR,
-)

-from lnbits.decorators import check_user_exists
+from lnbits.core.services import create_user_account
+from lnbits.decorators import access_token_payload, check_user_exists
 from lnbits.helpers import (
    create_access_token,
    decrypt_internal_message,
@@ -21,27 +21,30 @@ from lnbits.helpers import (
    is_valid_username,
 )
 from lnbits.settings import AuthMethods, settings
+from lnbits.utils.nostr import normalize_public_key, verify_event

 from ..crud import (
-    create_account,
-    create_user,
    get_account,
    get_account_by_email,
+    get_account_by_pubkey,
+    get_account_by_username,
    get_account_by_username_or_email,
-    get_user,
+    get_user_from_account,
    update_account,
-    update_user_password,
-    verify_user_password,
 )
 from ..models import (
+    AccessTokenPayload,
+    Account,
    CreateUser,
    LoginUsernamePassword,
    LoginUsr,
+    ResetUserPassword,
    UpdateSuperuserPassword,
    UpdateUser,
    UpdateUserPassword,
+    UpdateUserPubkey,
    User,
-    UserConfig,
+    UserExtra,
 )

 auth_router = APIRouter(prefix="/api/v1/auth", tags=["Auth"])
@@ -56,41 +59,43 @@ async def get_auth_user(user: User = Depends(check_user_exists)) -> User:
 async def login(data: LoginUsernamePassword) -> JSONResponse:
    if not settings.is_auth_method_allowed(AuthMethods.username_and_password):
        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, "Login by 'Username and Password' not allowed."
+            HTTPStatus.UNAUTHORIZED, "Login by 'Username and Password' not allowed."
        )
+    account = await get_account_by_username_or_email(data.username)
+    if not account or not account.verify_password(data.password):
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid credentials.")
+    return _auth_success_response(account.username, account.id, account.email)

-    try:
-        user = await get_account_by_username_or_email(data.username)

-        if not user:
-            raise HTTPException(HTTP_401_UNAUTHORIZED, "Invalid credentials.")
-        if not await verify_user_password(user.id, data.password):
-            raise HTTPException(HTTP_401_UNAUTHORIZED, "Invalid credentials.")
-
-        return _auth_success_response(user.username, user.id)
-    except HTTPException as e:
-        raise e
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(HTTP_500_INTERNAL_SERVER_ERROR, "Cannot login.")
+@auth_router.post("/nostr", description="Login via Nostr")
+async def nostr_login(request: Request) -> JSONResponse:
+    if not settings.is_auth_method_allowed(AuthMethods.nostr_auth_nip98):
+        raise HTTPException(
+            HTTPStatus.UNAUTHORIZED, "Login with Nostr Auth not allowed."
+        )
+    event = _nostr_nip98_event(request)
+    account = await get_account_by_pubkey(event["pubkey"])
+    if not account:
+        account = Account(
+            id=uuid4().hex,
+            pubkey=event["pubkey"],
+            extra=UserExtra(provider="nostr"),
+        )
+        await create_user_account(account)
+    return _auth_success_response(account.username or "", account.id, account.email)


@auth_router.post("/usr", description="Login via the User ID")
 async def login_usr(data: LoginUsr) -> JSONResponse:
    if not settings.is_auth_method_allowed(AuthMethods.user_id_only):
-        raise HTTPException(HTTP_401_UNAUTHORIZED, "Login by 'User ID' not allowed.")
-
-    try:
-        user = await get_user(data.usr)
-        if not user:
-            raise HTTPException(HTTP_401_UNAUTHORIZED, "User ID does not exist.")
-
-        return _auth_success_response(user.username or "", user.id)
-    except HTTPException as e:
-        raise e
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(HTTP_500_INTERNAL_SERVER_ERROR, "Cannot login.")
+        raise HTTPException(
+            HTTPStatus.UNAUTHORIZED,
+            "Login by 'User ID' not allowed.",
+        )
+    account = await get_account(data.usr)
+    if not account:
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User ID does not exist.")
+    return _auth_success_response(account.username, account.id, account.email)


@auth_router.get("/{provider}", description="SSO Provider")
@@ -100,7 +105,8 @@ async def login_with_sso_provider(
    provider_sso = _new_sso(provider)
    if not provider_sso:
        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, f"Login by '{provider}' not allowed."
+            HTTPStatus.UNAUTHORIZED,
+            f"Login by '{provider}' not allowed.",
        )

    provider_sso.redirect_uri = str(request.base_url) + f"api/v1/auth/{provider}/token"
@@ -114,31 +120,22 @@ async def handle_oauth_token(request: Request, provider: str) -> RedirectRespons
    provider_sso = _new_sso(provider)
    if not provider_sso:
        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, f"Login by '{provider}' not allowed."
+            HTTPStatus.UNAUTHORIZED,
+            f"Login by '{provider}' not allowed.",
        )

-    try:
-        with provider_sso:
-            userinfo = await provider_sso.verify_and_process(request)
-            assert userinfo is not None
-            user_id = decrypt_internal_message(provider_sso.state)
-        request.session.pop("user", None)
-        return await _handle_sso_login(userinfo, user_id)
-    except HTTPException as e:
-        raise e
-    except ValueError as e:
-        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(
-            HTTP_500_INTERNAL_SERVER_ERROR,
-            f"Cannot authenticate user with {provider} Auth.",
-        )
+    with provider_sso:
+        userinfo = await provider_sso.verify_and_process(request)
+        if not userinfo:
+            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid user info.")
+        user_id = decrypt_internal_message(provider_sso.state)
+    request.session.pop("user", None)
+    return await _handle_sso_login(userinfo, user_id)


@auth_router.post("/logout")
 async def logout() -> JSONResponse:
-    response = JSONResponse({"status": "success"}, status_code=status.HTTP_200_OK)
+    response = JSONResponse({"status": "success"}, HTTPStatus.OK)
    response.delete_cookie("cookie_access_token")
    response.delete_cookie("is_lnbits_user_authorized")
    response.delete_cookie("is_access_token_expired")
@@ -151,51 +148,124 @@ async def logout() -> JSONResponse:
 async def register(data: CreateUser) -> JSONResponse:
    if not settings.is_auth_method_allowed(AuthMethods.username_and_password):
        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, "Register by 'Username and Password' not allowed."
+            HTTPStatus.UNAUTHORIZED,
+            "Register by 'Username and Password' not allowed.",
        )

    if data.password != data.password_repeat:
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Passwords do not match.")
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Passwords do not match.")

    if not data.username:
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Missing username.")
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Missing username.")
    if not is_valid_username(data.username):
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid username.")
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid username.")
+
+    if await get_account_by_username(data.username):
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Username already exists.")

    if data.email and not is_valid_email_address(data.email):
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid email.")
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid email.")

-    try:
-        user = await create_user(data)
-        return _auth_success_response(user.username)
+    account = Account(
+        id=uuid4().hex,
+        email=data.email,
+        username=data.username,
+    )
+    account.hash_password(data.password)
+    await create_user_account(account)
+    return _auth_success_response(account.username, account.id, account.email)

-    except ValueError as e:
-        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(HTTP_500_INTERNAL_SERVER_ERROR, "Cannot create user.")
+
+@auth_router.put("/pubkey")
+async def update_pubkey(
+    data: UpdateUserPubkey,
+    user: User = Depends(check_user_exists),
+    payload: AccessTokenPayload = Depends(access_token_payload),
+) -> Optional[User]:
+    if data.user_id != user.id:
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid user ID.")
+
+    _validate_auth_timeout(payload.auth_time)
+    if (
+        data.pubkey
+        and data.pubkey != user.pubkey
+        and await get_account_by_pubkey(data.pubkey)
+    ):
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Public key already in use.")
+
+    account = await get_account(user.id)
+    if not account:
+        raise HTTPException(HTTPStatus.NOT_FOUND, "Account not found.")
+
+    account.pubkey = normalize_public_key(data.pubkey)
+    await update_account(account)
+    return await get_user_from_account(account)


@auth_router.put("/password")
 async def update_password(
-    data: UpdateUserPassword, user: User = Depends(check_user_exists)
+    data: UpdateUserPassword,
+    user: User = Depends(check_user_exists),
+    payload: AccessTokenPayload = Depends(access_token_payload),
 ) -> Optional[User]:
+    _validate_auth_timeout(payload.auth_time)
+    assert data.user_id == user.id, "Invalid user ID."
+    if (
+        data.username
+        and user.username != data.username
+        and await get_account_by_username(data.username)
+    ):
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Username already exists.")
+
+    account = await get_account(user.id)
+    assert account, "Account not found."
+
+    # old accounts do not have a password
+    if account.password_hash:
+        assert data.password_old, "Missing old password."
+        assert account.verify_password(data.password_old), "Invalid old password."
+
+    account.username = data.username
+    account.hash_password(data.password)
+    await update_account(account)
+    _user = await get_user_from_account(account)
+    if not _user:
+        raise HTTPException(HTTPStatus.NOT_FOUND, "User not found.")
+    return _user
+
+
+@auth_router.put("/reset")
+async def reset_password(data: ResetUserPassword) -> JSONResponse:
    if not settings.is_auth_method_allowed(AuthMethods.username_and_password):
        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, "Auth by 'Username and Password' not allowed."
+            HTTPStatus.UNAUTHORIZED, "Auth by 'Username and Password' not allowed."
        )
-    if data.user_id != user.id:
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid user ID.")
+
+    assert data.password == data.password_repeat, "Passwords do not match."
+    assert data.reset_key[:10].startswith("reset_key_"), "This is not a reset key."

    try:
-        return await update_user_password(data)
-    except AssertionError as e:
-        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(
-            HTTP_500_INTERNAL_SERVER_ERROR, "Cannot update user password."
-        )
+        reset_key = base64.b64decode(data.reset_key[10:]).decode()
+        reset_data_json = decrypt_internal_message(reset_key)
+    except Exception as exc:
+        raise ValueError("Invalid reset key.") from exc
+
+    assert reset_data_json, "Cannot process reset key."
+
+    action, user_id, request_time = json.loads(reset_data_json)
+    assert action, "Missing action."
+    assert user_id, "Missing user ID."
+    assert request_time, "Missing reset time."
+
+    _validate_auth_timeout(request_time)
+
+    account = await get_account(user_id)
+    if not account:
+        raise HTTPException(HTTPStatus.NOT_FOUND, "User not found.")
+
+    account.hash_password(data.password)
+    await update_account(account)
+    return _auth_success_response(account.username, user_id, account.email)


@auth_router.put("/update")
@@ -203,78 +273,83 @@ async def update(
    data: UpdateUser, user: User = Depends(check_user_exists)
 ) -> Optional[User]:
    if data.user_id != user.id:
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid user ID.")
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid user ID.")
    if data.username and not is_valid_username(data.username):
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid username.")
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid username.")
    if data.email != user.email:
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Email mismatch.")
+        raise HTTPException(
+            HTTPStatus.BAD_REQUEST,
+            "Email mismatch.",
+        )
+    if (
+        data.username
+        and user.username != data.username
+        and await get_account_by_username(data.username)
+    ):
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Username already exists.")
+    if (
+        data.email
+        and data.email != user.email
+        and await get_account_by_email(data.email)
+    ):
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Email already exists.")

-    try:
-        return await update_account(user.id, data.username, None, data.config)
-    except AssertionError as e:
-        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(HTTP_500_INTERNAL_SERVER_ERROR, "Cannot update user.")
+    account = await get_account(user.id)
+    if not account:
+        raise HTTPException(HTTPStatus.NOT_FOUND, "Account not found.")
+
+    if data.username:
+        account.username = data.username
+    if data.email:
+        account.email = data.email
+    if data.extra:
+        account.extra = data.extra
+
+    await update_account(account)
+    return await get_user_from_account(account)


@auth_router.put("/first_install")
 async def first_install(data: UpdateSuperuserPassword) -> JSONResponse:
    if not settings.first_install:
-        raise HTTPException(HTTP_401_UNAUTHORIZED, "This is not your first install")
-    try:
-        await update_account(
-            user_id=settings.super_user,
-            username=data.username,
-            user_config=UserConfig(provider="lnbits"),
-        )
-        super_user = UpdateUserPassword(
-            user_id=settings.super_user,
-            password=data.password,
-            password_repeat=data.password_repeat,
-            username=data.username,
-        )
-        await update_user_password(super_user)
-        settings.first_install = False
-        return _auth_success_response(username=super_user.username)
-    except AssertionError as e:
-        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(
-            HTTP_500_INTERNAL_SERVER_ERROR, "Cannot update user password."
-        )
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "This is not your first install")
+    account = await get_account(settings.super_user)
+    if not account:
+        raise HTTPException(HTTPStatus.INTERNAL_SERVER_ERROR, "Superuser not found.")
+    account.username = data.username
+    account.extra = account.extra or UserExtra()
+    account.extra.provider = "lnbits"
+    account.hash_password(data.password)
+    await update_account(account)
+    settings.first_install = False
+    return _auth_success_response(account.username, account.id, account.email)


 async def _handle_sso_login(userinfo: OpenID, verified_user_id: Optional[str] = None):
    email = userinfo.email
    if not email or not is_valid_email_address(email):
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid email.")
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid email.")

    redirect_path = "/wallet"
-    user_config = UserConfig(**dict(userinfo))
-    user_config.email_verified = True
-
    account = await get_account_by_email(email)

    if verified_user_id:
        if account:
-            raise HTTPException(HTTP_401_UNAUTHORIZED, "Email already used.")
+            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Email already used.")
        account = await get_account(verified_user_id)
        if not account:
-            raise HTTPException(HTTP_401_UNAUTHORIZED, "Cannot verify user email.")
+            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Cannot verify user email.")
        redirect_path = "/account"

    if account:
-        user = await update_account(account.id, email=email, user_config=user_config)
+        account.extra = account.extra or UserExtra()
+        account.extra.email_verified = True
+        await update_account(account)
    else:
-        if not settings.new_accounts_allowed:
-            raise HTTPException(HTTP_400_BAD_REQUEST, "Account creation is disabled.")
-        user = await create_account(email=email, user_config=user_config)
-
-    if not user:
-        raise HTTPException(HTTP_401_UNAUTHORIZED, "User not found.")
-
+        account = Account(
+            id=uuid4().hex, email=email, extra=UserExtra(email_verified=True)
+        )
+        await create_user_account(account)
    return _auth_redirect_response(redirect_path, email)


@@ -283,9 +358,10 @@ def _auth_success_response(
    user_id: Optional[str] = None,
    email: Optional[str] = None,
 ) -> JSONResponse:
-    access_token = create_access_token(
-        data={"sub": username or "", "usr": user_id, "email": email}
+    payload = AccessTokenPayload(
+        sub=username or "", usr=user_id, email=email, auth_time=int(time())
    )
+    access_token = create_access_token(data=payload.dict())
    response = JSONResponse({"access_token": access_token, "token_type": "bearer"})
    response.set_cookie("cookie_access_token", access_token, httponly=True)
    response.set_cookie("is_lnbits_user_authorized", "true")
@@ -295,7 +371,8 @@ def _auth_success_response(


 def _auth_redirect_response(path: str, email: str) -> RedirectResponse:
-    access_token = create_access_token(data={"sub": "" or "", "email": email})
+    payload = AccessTokenPayload(sub="" or "", email=email, auth_time=int(time()))
+    access_token = create_access_token(data=payload.dict())
    response = RedirectResponse(path)
    response.set_cookie("cookie_access_token", access_token, httponly=True)
    response.set_cookie("is_lnbits_user_authorized", "true")
@@ -316,16 +393,16 @@ def _new_sso(provider: str) -> Optional[SSOBase]:
            logger.warning(f"{provider} auth allowed but not configured.")
            return None

-        SSOProviderClass = _find_auth_provider_class(provider)
-        ssoProvider = SSOProviderClass(
+        sso_provider_class = _find_auth_provider_class(provider)
+        sso_provider = sso_provider_class(
            client_id, client_secret, None, allow_insecure_http=True
        )
        if (
            discovery_url
-            and getattr(ssoProvider, "discovery_url", discovery_url) != discovery_url
+            and getattr(sso_provider, "discovery_url", discovery_url) != discovery_url
        ):
-            ssoProvider.discovery_url = discovery_url
-        return ssoProvider
+            sso_provider.discovery_url = discovery_url
+        return sso_provider
    except Exception as e:
        logger.warning(e)

@@ -337,10 +414,57 @@ def _find_auth_provider_class(provider: str) -> Callable:
    for module in sso_modules:
        try:
            provider_module = importlib.import_module(f"{module}.{provider}")
-            ProviderClass = getattr(provider_module, f"{provider.title()}SSO")
-            if ProviderClass:
-                return ProviderClass
+            provider_class = getattr(provider_module, f"{provider.title()}SSO")
+            if provider_class:
+                return provider_class
        except Exception:
            pass

    raise ValueError(f"No SSO provider found for '{provider}'.")
+
+
+def _nostr_nip98_event(request: Request) -> dict:
+    auth_header = request.headers.get("Authorization")
+    if not auth_header:
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Nostr Auth header missing.")
+    scheme, token = auth_header.split()
+    if scheme.lower() != "nostr":
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid Authorization scheme.")
+    event = None
+    try:
+        event_json = base64.b64decode(token.encode("ascii"))
+        event = json.loads(event_json)
+    except Exception as exc:
+        logger.warning(exc)
+    assert event, "Nostr login event cannot be parsed."
+
+    if not verify_event(event):
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Nostr login event is not valid.")
+    assert event["kind"] == 27_235, "Invalid event kind."
+
+    auth_threshold = settings.auth_credetials_update_threshold
+    assert (
+        abs(time() - event["created_at"]) < auth_threshold
+    ), f"More than {auth_threshold} seconds have passed since the event was signed."
+
+    method: Optional[str] = next((v for k, v in event["tags"] if k == "method"), None)
+    assert method, "Tag 'method' is missing."
+    assert method.upper() == "POST", "Invalid value for tag 'method'."
+
+    url = next((v for k, v in event["tags"] if k == "u"), None)
+
+    assert url, "Tag 'u' for URL is missing."
+    accepted_urls = [f"{u}/nostr" for u in settings.nostr_absolute_request_urls]
+    assert url in accepted_urls, f"Invalid value for tag 'u': '{url}'."
+
+    return event
+
+
+def _validate_auth_timeout(auth_time: Optional[int] = 0):
+    if abs(time() - (auth_time or 0)) > settings.auth_credetials_update_threshold:
+        raise HTTPException(
+            HTTPStatus.BAD_REQUEST,
+            "You can only update your credentials in the first"
+            f" {settings.auth_credetials_update_threshold} seconds."
+            " Please login again or ask a new reset key!",
+        )
@@ -1,7 +1,6 @@
-from typing import (
-    List,
-    Optional,
-)
+import sys
+import traceback
+from http import HTTPStatus

 from bolt11 import decode as bolt11_decode
 from fastapi import (
@@ -9,41 +8,46 @@ from fastapi import (
    Depends,
    HTTPException,
 )
-from fastapi import (
-    status as HTTPStatus,
-)
 from loguru import logger

-from lnbits.core.db import core_app_extra
-from lnbits.core.helpers import (
-    migrate_extension_database,
-    stop_extension_background_work,
+from lnbits.core.extensions.extension_manager import (
+    activate_extension,
+    deactivate_extension,
+    install_extension,
+    uninstall_extension,
 )
-from lnbits.core.models import (
-    User,
-)
-from lnbits.decorators import (
-    check_access_token,
-    check_admin,
-)
-from lnbits.extension_manager import (
+from lnbits.core.extensions.models import (
    CreateExtension,
    Extension,
+    ExtensionConfig,
+    ExtensionMeta,
    ExtensionRelease,
    InstallableExtension,
-    fetch_github_release_config,
-    fetch_release_payment_info,
-    get_valid_extensions,
+    PayToEnableInfo,
+    ReleasePaymentInfo,
+    UserExtension,
+    UserExtensionInfo,
+)
+from lnbits.core.models import (
+    SimpleStatus,
+    User,
+)
+from lnbits.core.services import check_transaction_status, create_invoice
+from lnbits.decorators import (
+    check_admin,
+    check_user_exists,
 )
-from lnbits.settings import settings

 from ..crud import (
-    add_installed_extension,
+    create_user_extension,
    delete_dbversion,
-    delete_installed_extension,
    drop_extension_db,
-    get_dbversions,
+    get_db_version,
    get_installed_extension,
+    get_installed_extensions,
+    get_user_extension,
+    update_installed_extension,
+    update_user_extension,
 )

 extension_router = APIRouter(
@@ -52,12 +56,8 @@ extension_router = APIRouter(
 )


-@extension_router.post("")
-async def api_install_extension(
-    data: CreateExtension,
-    user: User = Depends(check_admin),
-    access_token: Optional[str] = Depends(check_access_token),
-):
+@extension_router.post("", dependencies=[Depends(check_admin)])
+async def api_install_extension(data: CreateExtension):
    release = await InstallableExtension.get_extension_release(
        data.ext_id, data.source_repo, data.archive, data.version
    )
@@ -72,74 +72,243 @@ async def api_install_extension(
        )

    release.payment_hash = data.payment_hash
+    ext_meta = ExtensionMeta(installed_release=release)
    ext_info = InstallableExtension(
-        id=data.ext_id, name=data.ext_id, installed_release=release, icon=release.icon
+        id=data.ext_id,
+        name=data.ext_id,
+        version=data.version,
+        meta=ext_meta,
+        icon=release.icon,
    )

    try:
-        installed_ext = await get_installed_extension(data.ext_id)
-        ext_info.payments = installed_ext.payments if installed_ext else []
+        extension = await install_extension(ext_info)

-        await ext_info.download_archive()
-
-        ext_info.extract_archive()
-
-        extension = Extension.from_installable_ext(ext_info)
-
-        db_version = (await get_dbversions()).get(data.ext_id, 0)
-        await migrate_extension_database(extension, db_version)
-
-        await add_installed_extension(ext_info)
-
-        if extension.is_upgrade_extension:
-            # call stop while the old routes are still active
-            await stop_extension_background_work(data.ext_id, user.id, access_token)
-
-        if data.ext_id not in settings.lnbits_deactivated_extensions:
-            settings.lnbits_deactivated_extensions += [data.ext_id]
-
-        # mount routes for the new version
-        core_app_extra.register_new_ext_routes(extension)
-
-        if extension.upgrade_hash:
-            ext_info.notify_upgrade()
-
-        return extension
-    except AssertionError as e:
-        raise HTTPException(HTTPStatus.BAD_REQUEST, str(e))
-    except Exception as ex:
-        logger.warning(ex)
+    except Exception as exc:
+        logger.warning(exc)
+        etype, _, tb = sys.exc_info()
+        traceback.print_exception(etype, exc, tb)
        ext_info.clean_extension_files()
+        detail = (
+            str(exc)
+            if isinstance(exc, AssertionError)
+            else f"Failed to install extension '{ext_info.id}'."
+            f"({ext_info.installed_version})."
+        )
        raise HTTPException(
            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail=(
-                f"Failed to install extension {ext_info.id} "
-                f"({ext_info.installed_version})."
-            ),
+            detail=detail,
+        ) from exc
+
+    try:
+        await activate_extension(extension)
+        return extension
+    except Exception as exc:
+        logger.warning(exc)
+        await deactivate_extension(extension.code)
+        detail = (
+            str(exc)
+            if isinstance(exc, AssertionError)
+            else f"Extension `{extension.code}` installed, but activation failed."
+        )
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=detail,
+        ) from exc
+
+
+@extension_router.get("/{ext_id}/details")
+async def api_extension_details(
+    ext_id: str,
+    details_link: str,
+):
+    all_releases = await InstallableExtension.get_extension_releases(ext_id)
+
+    release = next((r for r in all_releases if r.details_link == details_link), None)
+    if not release:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Release not found"
        )

-
-@extension_router.delete("/{ext_id}")
-async def api_uninstall_extension(
-    ext_id: str,
-    user: User = Depends(check_admin),
-    access_token: Optional[str] = Depends(check_access_token),
-):
-    installable_extensions = await InstallableExtension.get_installable_extensions()
-
-    extensions = [e for e in installable_extensions if e.id == ext_id]
-    if len(extensions) == 0:
+    release_details = await ExtensionRelease.fetch_release_details(details_link)
+    if not release_details:
        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail="Cannot fetch details for release",
+        )
+    release_details["icon"] = release.icon
+    release_details["repo"] = release.repo
+    return release_details
+
+
+@extension_router.put("/{ext_id}/sell")
+async def api_update_pay_to_enable(
+    ext_id: str,
+    data: PayToEnableInfo,
+    user: User = Depends(check_admin),
+) -> SimpleStatus:
+    if data.wallet not in user.wallet_ids:
+        raise HTTPException(
+            HTTPStatus.BAD_REQUEST, "Wallet does not belong to this admin user."
+        )
+    extension = await get_installed_extension(ext_id)
+    if not extension:
+        raise HTTPException(HTTPStatus.NOT_FOUND, f"Extension '{ext_id}' not found.")
+    if extension.meta:
+        extension.meta.pay_to_enable = data
+    else:
+        extension.meta = ExtensionMeta(pay_to_enable=data)
+    await update_installed_extension(extension)
+    return SimpleStatus(
+        success=True, message=f"Payment info updated for '{ext_id}' extension."
+    )
+
+
+@extension_router.put("/{ext_id}/enable")
+async def api_enable_extension(
+    ext_id: str, user: User = Depends(check_user_exists)
+) -> SimpleStatus:
+    if ext_id not in [e.code for e in Extension.get_valid_extensions()]:
+        raise HTTPException(
+            HTTPStatus.NOT_FOUND, f"Extension '{ext_id}' doesn't exist."
+        )
+    try:
+        logger.info(f"Enabling extension: {ext_id}.")
+        ext = await get_installed_extension(ext_id)
+        assert ext, f"Extension '{ext_id}' is not installed."
+        assert ext.active, f"Extension '{ext_id}' is not activated."
+
+        user_ext = await get_user_extension(user.id, ext_id)
+        if not user_ext:
+            user_ext = UserExtension(user=user.id, extension=ext_id, active=False)
+            await create_user_extension(user_ext)
+
+        if user.admin or not ext.requires_payment:
+            user_ext.active = True
+            await update_user_extension(user_ext)
+            return SimpleStatus(success=True, message=f"Extension '{ext_id}' enabled.")
+
+        if not (user_ext.extra and user_ext.extra.payment_hash_to_enable):
+            raise HTTPException(
+                HTTPStatus.PAYMENT_REQUIRED, f"Extension '{ext_id}' requires payment."
+            )
+
+        if user_ext.is_paid:
+            user_ext.active = True
+            await update_user_extension(user_ext)
+            return SimpleStatus(
+                success=True, message=f"Paid extension '{ext_id}' enabled."
+            )
+
+        assert (
+            ext.meta and ext.meta.pay_to_enable and ext.meta.pay_to_enable.wallet
+        ), f"Extension '{ext_id}' is missing payment wallet."
+
+        payment_status = await check_transaction_status(
+            wallet_id=ext.meta.pay_to_enable.wallet,
+            payment_hash=user_ext.extra.payment_hash_to_enable,
+        )
+
+        if not payment_status.paid:
+            raise HTTPException(
+                HTTPStatus.PAYMENT_REQUIRED,
+                f"Invoice generated but not paid for enabeling extension '{ext_id}'.",
+            )
+
+        user_ext.active = True
+        user_ext.extra.paid_to_enable = True
+        await update_user_extension(user_ext)
+        return SimpleStatus(success=True, message=f"Paid extension '{ext_id}' enabled.")
+
+    except AssertionError as exc:
+        raise HTTPException(HTTPStatus.BAD_REQUEST, str(exc)) from exc
+    except HTTPException as exc:
+        raise exc from exc
+    except Exception as exc:
+        logger.warning(exc)
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=(f"Failed to enable '{ext_id}' "),
+        ) from exc
+
+
+@extension_router.put("/{ext_id}/disable")
+async def api_disable_extension(
+    ext_id: str, user: User = Depends(check_user_exists)
+) -> SimpleStatus:
+    if ext_id not in [e.code for e in Extension.get_valid_extensions()]:
+        raise HTTPException(
+            HTTPStatus.BAD_REQUEST, f"Extension '{ext_id}' doesn't exist."
+        )
+    user_ext = await get_user_extension(user.id, ext_id)
+    if not user_ext or not user_ext.active:
+        return SimpleStatus(
+            success=True, message=f"Extension '{ext_id}' already disabled."
+        )
+    logger.info(f"Disabeling extension: {ext_id}.")
+    user_ext.active = False
+    await update_user_extension(user_ext)
+    return SimpleStatus(success=True, message=f"Extension '{ext_id}' disabled.")
+
+
+@extension_router.put("/{ext_id}/activate", dependencies=[Depends(check_admin)])
+async def api_activate_extension(ext_id: str) -> SimpleStatus:
+    try:
+        logger.info(f"Activating extension: '{ext_id}'.")
+
+        ext = Extension.get_valid_extension(ext_id)
+        assert ext, f"Extension '{ext_id}' doesn't exist."
+
+        await activate_extension(ext)
+        return SimpleStatus(success=True, message=f"Extension '{ext_id}' activated.")
+    except Exception as exc:
+        logger.warning(exc)
+        await deactivate_extension(ext_id)
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=(f"Failed to activate '{ext_id}'."),
+        ) from exc
+
+
+@extension_router.put("/{ext_id}/deactivate", dependencies=[Depends(check_admin)])
+async def api_deactivate_extension(ext_id: str) -> SimpleStatus:
+    try:
+        logger.info(f"Deactivating extension: '{ext_id}'.")
+
+        ext = Extension.get_valid_extension(ext_id)
+        assert ext, f"Extension '{ext_id}' doesn't exist."
+
+        await deactivate_extension(ext_id)
+        return SimpleStatus(success=True, message=f"Extension '{ext_id}' deactivated.")
+    except Exception as exc:
+        logger.warning(exc)
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=(f"Failed to deactivate '{ext_id}'."),
+        ) from exc
+
+
+@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(
+            status_code=HTTPStatus.NOT_FOUND,
            detail=f"Unknown extension id: {ext_id}",
        )

+    installed_extensions = await get_installed_extensions()
    # check that other extensions do not depend on this one
-    for valid_ext_id in [ext.code for ext in get_valid_extensions()]:
+    for valid_ext_id in [ext.code for ext in Extension.get_valid_extensions()]:
        installed_ext = next(
-            (ext for ext in installable_extensions if ext.id == valid_ext_id), None
+            (ext for ext in installed_extensions if ext.id == valid_ext_id), None
        )
-        if installed_ext and ext_id in installed_ext.dependencies:
+        if (
+            installed_ext
+            and installed_ext.meta
+            and ext_id in installed_ext.meta.dependencies
+        ):
            raise HTTPException(
                status_code=HTTPStatus.BAD_REQUEST,
                detail=(
@@ -149,27 +318,20 @@ async def api_uninstall_extension(
            )

    try:
-        # call stop while the old routes are still active
-        await stop_extension_background_work(ext_id, user.id, access_token)
-
-        if ext_id not in settings.lnbits_deactivated_extensions:
-            settings.lnbits_deactivated_extensions += [ext_id]
-
-        for ext_info in extensions:
-            ext_info.clean_extension_files()
-            await delete_installed_extension(ext_id=ext_info.id)
+        await uninstall_extension(ext_id)

        logger.success(f"Extension '{ext_id}' uninstalled.")
-    except Exception as ex:
+        return SimpleStatus(success=True, message=f"Extension '{ext_id}' uninstalled.")
+    except Exception as exc:
        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
-        )
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(exc)
+        ) from exc


@extension_router.get("/{ext_id}/releases", dependencies=[Depends(check_admin)])
-async def get_extension_releases(ext_id: str):
+async def get_extension_releases(ext_id: str) -> list[ExtensionRelease]:
    try:
-        extension_releases: List[ExtensionRelease] = (
+        extension_releases: list[ExtensionRelease] = (
            await InstallableExtension.get_extension_releases(ext_id)
        )

@@ -184,44 +346,109 @@ async def get_extension_releases(ext_id: str):

        return extension_releases

-    except Exception as ex:
+    except Exception as exc:
        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
-        )
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(exc)
+        ) from exc


-@extension_router.put("/invoice", dependencies=[Depends(check_admin)])
-async def get_extension_invoice(data: CreateExtension):
+@extension_router.put("/{ext_id}/invoice/install", dependencies=[Depends(check_admin)])
+async def get_pay_to_install_invoice(
+    ext_id: str, data: CreateExtension
+) -> ReleasePaymentInfo:
    try:
-        assert data.cost_sats, "A non-zero amount must be specified"
+        assert (
+            ext_id == data.ext_id
+        ), f"Wrong extension id. Expected {ext_id}, but got {data.ext_id}"
+        assert data.cost_sats, "A non-zero amount must be specified."
        release = await InstallableExtension.get_extension_release(
            data.ext_id, data.source_repo, data.archive, data.version
        )
-        assert release, "Release not found"
-        assert release.pay_link, "Pay link not found for release"
+        assert release, "Release not found."
+        assert release.pay_link, "Pay link not found for release."

-        payment_info = await fetch_release_payment_info(
-            release.pay_link, data.cost_sats
-        )
-        assert payment_info and payment_info.payment_request, "Cannot request invoice"
+        payment_info = await release.fetch_release_payment_info(data.cost_sats)
+
+        assert payment_info and payment_info.payment_request, "Cannot request invoice."
        invoice = bolt11_decode(payment_info.payment_request)

-        assert invoice.amount_msat is not None, "Invoic amount is missing"
+        assert invoice.amount_msat is not None, "Invoic amount is missing."
        invoice_amount = int(invoice.amount_msat / 1000)
        assert (
            invoice_amount == data.cost_sats
        ), f"Wrong invoice amount: {invoice_amount}."
        assert (
            payment_info.payment_hash == invoice.payment_hash
-        ), "Wroong invoice payment hash"
+        ), "Wrong invoice payment hash."

        return payment_info

-    except AssertionError as e:
-        raise HTTPException(HTTPStatus.BAD_REQUEST, str(e))
-    except Exception as ex:
-        logger.warning(ex)
-        raise HTTPException(HTTPStatus.INTERNAL_SERVER_ERROR, "Cannot request invoice")
+    except AssertionError as exc:
+        raise HTTPException(HTTPStatus.BAD_REQUEST, str(exc)) from exc
+    except Exception as exc:
+        logger.warning(exc)
+        raise HTTPException(
+            HTTPStatus.INTERNAL_SERVER_ERROR, "Cannot request invoice"
+        ) from exc
+
+
+@extension_router.put("/{ext_id}/invoice/enable")
+async def get_pay_to_enable_invoice(
+    ext_id: str, data: PayToEnableInfo, user: User = Depends(check_user_exists)
+):
+    if not data.amount or data.amount <= 0:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST, detail="Amount must be greater than 0."
+        )
+
+    ext = await get_installed_extension(ext_id)
+    if not ext:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail=f"Extension '{ext_id}' not found."
+        )
+
+    if not ext.meta or not ext.meta.pay_to_enable:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=f"Payment info not found for extension '{ext_id}'.",
+        )
+
+    if not ext.meta.pay_to_enable.required:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=f"Payment not required for extension '{ext_id}'.",
+        )
+
+    if not ext.meta.pay_to_enable.wallet or not ext.meta.pay_to_enable.amount:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=f"Payment wallet or amount missing for extension '{ext_id}'.",
+        )
+
+    if data.amount < ext.meta.pay_to_enable.amount:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=(
+                f"Amount {data.amount} sats is less than required "
+                f"{ext.meta.pay_to_enable.amount} sats."
+            ),
+        )
+
+    payment = await create_invoice(
+        wallet_id=ext.meta.pay_to_enable.wallet,
+        amount=data.amount,
+        memo=f"Enable '{ext.name}' extension.",
+    )
+
+    user_ext = await get_user_extension(user.id, ext_id)
+    if not user_ext:
+        user_ext = UserExtension(user=user.id, extension=ext_id, active=False)
+        await create_user_extension(user_ext)
+    user_ext_info = user_ext.extra if user_ext.extra else UserExtensionInfo()
+    user_ext_info.payment_hash_to_enable = payment.payment_hash
+    user_ext.extra = user_ext_info
+    await update_user_extension(user_ext)
+    return {"payment_hash": payment.payment_hash, "payment_request": payment.bolt11}


@extension_router.get(
@@ -230,7 +457,7 @@ async def get_extension_invoice(data: CreateExtension):
 )
 async def get_extension_release(org: str, repo: str, tag_name: str):
    try:
-        config = await fetch_github_release_config(org, repo, tag_name)
+        config = await ExtensionConfig.fetch_github_release_config(org, repo, tag_name)
        if not config:
            return {}

@@ -239,10 +466,10 @@ async def get_extension_release(org: str, repo: str, tag_name: str):
            "is_version_compatible": config.is_version_compatible(),
            "warning": config.warning,
        }
-    except Exception as ex:
+    except Exception as exc:
        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
-        )
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(exc)
+        ) from exc


@extension_router.delete(
@@ -251,7 +478,7 @@ async def get_extension_release(org: str, repo: str, tag_name: str):
 )
 async def delete_extension_db(ext_id: str):
    try:
-        db_version = (await get_dbversions()).get(ext_id, None)
+        db_version = await get_db_version(ext_id)
        if not db_version:
            raise HTTPException(
                status_code=HTTPStatus.BAD_REQUEST,
@@ -260,12 +487,15 @@ async def delete_extension_db(ext_id: str):
        await drop_extension_db(ext_id=ext_id)
        await delete_dbversion(ext_id=ext_id)
        logger.success(f"Database removed for extension '{ext_id}'")
+        return SimpleStatus(
+            success=True, message=f"DB deleted for '{ext_id}' extension."
+        )
    except HTTPException as ex:
        logger.error(ex)
        raise ex
-    except Exception as ex:
-        logger.error(ex)
+    except Exception as exc:
+        logger.error(exc)
        raise HTTPException(
            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
            detail=f"Cannot delete data for extension '{ext_id}'",
-        )
+        ) from exc
@@ -1,40 +1,33 @@
-import asyncio
-import sys
 from http import HTTPStatus
 from pathlib import Path
 from typing import Annotated, List, Optional, Union
-from urllib.parse import urlparse
+from urllib.parse import urlencode, urlparse

-from fastapi import Cookie, Depends, Query, Request, status
+import httpx
+from fastapi import Cookie, Depends, Query, Request
 from fastapi.exceptions import HTTPException
-from fastapi.responses import FileResponse, HTMLResponse, JSONResponse, RedirectResponse
+from fastapi.responses import FileResponse, HTMLResponse, RedirectResponse
 from fastapi.routing import APIRouter
-from loguru import logger
+from lnurl import decode as lnurl_decode
 from pydantic.types import UUID4

-from lnbits.core.db import core_app_extra, db
+from lnbits.core.extensions.models import Extension, ExtensionMeta, InstallableExtension
 from lnbits.core.helpers import to_valid_user_id
 from lnbits.core.models import User
+from lnbits.core.services import create_invoice, create_user_account
 from lnbits.decorators import check_admin, check_user_exists
-from lnbits.helpers import template_renderer, url_for
+from lnbits.helpers import template_renderer
 from lnbits.settings import settings
-from lnbits.wallets import get_wallet_class
+from lnbits.wallets import get_funding_source

-from ...extension_manager import InstallableExtension, get_valid_extensions
 from ...utils.exchange_rates import allowed_currencies, currencies
 from ..crud import (
-    create_account,
    create_wallet,
-    get_balance_check,
-    get_dbversions,
-    get_inactive_extensions,
+    get_db_versions,
    get_installed_extensions,
    get_user,
-    save_balance_notify,
-    update_installed_extension_state,
-    update_user_extension,
+    get_wallet,
 )
-from ..services import pay_invoice, redeem_lnurl_withdraw

 generic_router = APIRouter(
    tags=["Core NON-API Website Routes"], include_in_schema=False
@@ -78,107 +71,89 @@ async def robots():
    return HTMLResponse(content=data, media_type="text/plain")


-@generic_router.get(
-    "/extensions", name="install.extensions", response_class=HTMLResponse
-)
-async def extensions_install(
-    request: Request,
-    user: User = Depends(check_user_exists),
-    activate: str = Query(None),
-    deactivate: str = Query(None),
-    enable: str = Query(None),
-    disable: str = Query(None),
-):
-    await toggle_extension(enable, disable, user.id)
+@generic_router.get("/extensions", name="extensions", response_class=HTMLResponse)
+async def extensions(request: Request, user: User = Depends(check_user_exists)):
+    installed_exts: List[InstallableExtension] = await get_installed_extensions()
+    installed_exts_ids = [e.id for e in installed_exts]

-    try:
-        installed_exts: List["InstallableExtension"] = await get_installed_extensions()
-        installed_exts_ids = [e.id for e in installed_exts]
+    installable_exts = await InstallableExtension.get_installable_extensions()
+    installable_exts_ids = [e.id for e in installable_exts]
+    installable_exts += [e for e in installed_exts if e.id not in installable_exts_ids]

-        installable_exts = await InstallableExtension.get_installable_extensions()
-        installable_exts_ids = [e.id for e in installable_exts]
-        installable_exts += [
-            e for e in installed_exts if e.id not in installable_exts_ids
-        ]
+    for e in installable_exts:
+        installed_ext = next((ie for ie in installed_exts if e.id == ie.id), None)
+        if installed_ext and installed_ext.meta:
+            installed_release = installed_ext.meta.installed_release
+            if installed_ext.meta.pay_to_enable and not user.admin:
+                # not a security leak, but better not to share the wallet id
+                installed_ext.meta.pay_to_enable.wallet = None
+            pay_to_enable = installed_ext.meta.pay_to_enable

-        for e in installable_exts:
-            installed_ext = next((ie for ie in installed_exts if e.id == ie.id), None)
-            if installed_ext:
-                e.installed_release = installed_ext.installed_release
-                # use the installed extension values
-                e.name = installed_ext.name
-                e.short_description = installed_ext.short_description
-                e.icon = installed_ext.icon
-
-    except Exception as ex:
-        logger.warning(ex)
-        installable_exts = []
-        installed_exts_ids = []
-
-    try:
-        ext_id = activate or deactivate
-        all_extensions = get_valid_extensions()
-        ext = next((e for e in all_extensions if e.code == ext_id), None)
-        if ext_id and user.admin:
-            if deactivate and deactivate not in settings.lnbits_deactivated_extensions:
-                settings.lnbits_deactivated_extensions += [deactivate]
-            elif activate:
-                # if extension never loaded (was deactivated on server startup)
-                if ext_id not in sys.modules.keys():
-                    # run extension start-up routine
-                    core_app_extra.register_new_ext_routes(ext)
-
-                settings.lnbits_deactivated_extensions = list(
-                    filter(
-                        lambda e: e != activate, settings.lnbits_deactivated_extensions
-                    )
+            if e.meta:
+                e.meta.installed_release = installed_release
+                e.meta.pay_to_enable = pay_to_enable
+            else:
+                e.meta = ExtensionMeta(
+                    installed_release=installed_release,
+                    pay_to_enable=pay_to_enable,
                )
+            # use the installed extension values
+            e.name = installed_ext.name
+            e.short_description = installed_ext.short_description
+            e.icon = installed_ext.icon

-            await update_installed_extension_state(
-                ext_id=ext_id, active=activate is not None
-            )
+    all_ext_ids = [ext.code for ext in Extension.get_valid_extensions()]
+    inactive_extensions = [e.id for e in await get_installed_extensions(active=False)]
+    db_versions = await get_db_versions()

-        all_ext_ids = [ext.code for ext in all_extensions]
-        inactive_extensions = await get_inactive_extensions()
-        db_version = await get_dbversions()
-        extensions = [
-            {
-                "id": ext.id,
-                "name": ext.name,
-                "icon": ext.icon,
-                "shortDescription": ext.short_description,
-                "stars": ext.stars,
-                "isFeatured": ext.featured,
-                "dependencies": ext.dependencies,
-                "isInstalled": ext.id in installed_exts_ids,
-                "hasDatabaseTables": ext.id in db_version,
-                "isAvailable": ext.id in all_ext_ids,
-                "isAdminOnly": ext.id in settings.lnbits_admin_extensions,
-                "isActive": ext.id not in inactive_extensions,
-                "latestRelease": (
-                    dict(ext.latest_release) if ext.latest_release else None
-                ),
-                "installedRelease": (
-                    dict(ext.installed_release) if ext.installed_release else None
-                ),
-            }
-            for ext in installable_exts
-        ]
+    extensions = [
+        {
+            "id": ext.id,
+            "name": ext.name,
+            "icon": ext.icon,
+            "shortDescription": ext.short_description,
+            "stars": ext.stars,
+            "isFeatured": ext.meta.featured if ext.meta else False,
+            "dependencies": ext.meta.dependencies if ext.meta else "",
+            "isInstalled": ext.id in installed_exts_ids,
+            "hasDatabaseTables": next(
+                (True for version in db_versions if version.db == ext.id), False
+            ),
+            "isAvailable": ext.id in all_ext_ids,
+            "isAdminOnly": ext.id in settings.lnbits_admin_extensions,
+            "isActive": ext.id not in inactive_extensions,
+            "latestRelease": (
+                dict(ext.meta.latest_release)
+                if ext.meta and ext.meta.latest_release
+                else None
+            ),
+            "installedRelease": (
+                dict(ext.meta.installed_release)
+                if ext.meta and ext.meta.installed_release
+                else None
+            ),
+            "payToEnable": (
+                dict(ext.meta.pay_to_enable)
+                if ext.meta and ext.meta.pay_to_enable
+                else {}
+            ),
+            "isPaymentRequired": ext.requires_payment,
+        }
+        for ext in installable_exts
+    ]

-        # refresh user state. Eg: enabled extensions.
-        user = await get_user(user.id) or user
+    # refresh user state. Eg: enabled extensions.
+    # TODO: refactor
+    # user = await get_user(user.id) or user

-        return template_renderer().TemplateResponse(
-            request,
-            "core/extensions.html",
-            {
-                "user": user.dict(),
-                "extensions": extensions,
-            },
-        )
-    except Exception as e:
-        logger.warning(e)
-        raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))
+    return template_renderer().TemplateResponse(
+        request,
+        "core/extensions.html",
+        {
+            "user": user.json(),
+            "extensions": extensions,
+        },
+    )


@generic_router.get(
@@ -193,35 +168,34 @@ async def wallet(
    wal: Optional[UUID4] = Query(None),
 ):
    if wal:
-        wallet_id = wal.hex
+        wallet = await get_wallet(wal.hex)
    elif len(user.wallets) == 0:
        wallet = await create_wallet(user_id=user.id)
-        user = await get_user(user_id=user.id) or user
-        wallet_id = wallet.id
+        user.wallets.append(wallet)
    elif lnbits_last_active_wallet and user.get_wallet(lnbits_last_active_wallet):
-        wallet_id = lnbits_last_active_wallet
+        wallet = await get_wallet(lnbits_last_active_wallet)
    else:
-        wallet_id = user.wallets[0].id
+        wallet = user.wallets[0]

-    user_wallet = user.get_wallet(wallet_id)
-    if not user_wallet or user_wallet.deleted:
+    if not wallet or wallet.deleted:
        return template_renderer().TemplateResponse(
-            request, "error.html", {"err": "Wallet not found"}
+            request, "error.html", {"err": "Wallet not found"}, HTTPStatus.NOT_FOUND
        )

    resp = template_renderer().TemplateResponse(
        request,
        "core/wallet.html",
        {
-            "user": user.dict(),
-            "wallet": user_wallet.dict(),
+            "user": user.json(),
+            "wallet": wallet.json(),
+            "wallet_name": wallet.name,
            "currencies": allowed_currencies(),
            "service_fee": settings.lnbits_service_fee,
            "service_fee_max": settings.lnbits_service_fee_max,
            "web_manifest": f"/manifest/{user.id}.webmanifest",
        },
    )
-    resp.set_cookie("lnbits_last_active_wallet", wallet_id)
+    resp.set_cookie("lnbits_last_active_wallet", wallet.id)
    return resp


@@ -238,120 +212,11 @@ async def account(
        request,
        "core/account.html",
        {
-            "user": user.dict(),
+            "user": user.json(),
        },
    )


-@generic_router.get("/withdraw", response_class=JSONResponse)
-async def lnurl_full_withdraw(request: Request):
-    usr_param = request.query_params.get("usr")
-    if not usr_param:
-        return {"status": "ERROR", "reason": "usr parameter not provided."}
-
-    user = await get_user(usr_param)
-    if not user:
-        return {"status": "ERROR", "reason": "User does not exist."}
-
-    wal_param = request.query_params.get("wal")
-    if not wal_param:
-        return {"status": "ERROR", "reason": "wal parameter not provided."}
-
-    wallet = user.get_wallet(wal_param)
-    if not wallet:
-        return {"status": "ERROR", "reason": "Wallet does not exist."}
-
-    return {
-        "tag": "withdrawRequest",
-        "callback": url_for("/withdraw/cb", external=True, usr=user.id, wal=wallet.id),
-        "k1": "0",
-        "minWithdrawable": 1000 if wallet.withdrawable_balance else 0,
-        "maxWithdrawable": wallet.withdrawable_balance,
-        "defaultDescription": (
-            f"{settings.lnbits_site_title} balance withdraw from {wallet.id[0:5]}"
-        ),
-        "balanceCheck": url_for("/withdraw", external=True, usr=user.id, wal=wallet.id),
-    }
-
-
-@generic_router.get("/withdraw/cb", response_class=JSONResponse)
-async def lnurl_full_withdraw_callback(request: Request):
-    usr_param = request.query_params.get("usr")
-    if not usr_param:
-        return {"status": "ERROR", "reason": "usr parameter not provided."}
-
-    user = await get_user(usr_param)
-    if not user:
-        return {"status": "ERROR", "reason": "User does not exist."}
-
-    wal_param = request.query_params.get("wal")
-    if not wal_param:
-        return {"status": "ERROR", "reason": "wal parameter not provided."}
-
-    wallet = user.get_wallet(wal_param)
-    if not wallet:
-        return {"status": "ERROR", "reason": "Wallet does not exist."}
-
-    pr = request.query_params.get("pr")
-    if not pr:
-        return {"status": "ERROR", "reason": "payment_request not provided."}
-
-    async def pay():
-        try:
-            await pay_invoice(wallet_id=wallet.id, payment_request=pr)
-        except Exception:
-            pass
-
-    asyncio.create_task(pay())
-
-    balance_notify = request.query_params.get("balanceNotify")
-    if balance_notify:
-        await save_balance_notify(wallet.id, balance_notify)
-
-    return {"status": "OK"}
-
-
-@generic_router.get("/withdraw/notify/{service}")
-async def lnurl_balance_notify(request: Request, service: str):
-    wal_param = request.query_params.get("wal")
-    if not wal_param:
-        return {"status": "ERROR", "reason": "wal parameter not provided."}
-
-    bc = await get_balance_check(wal_param, service)
-    if bc:
-        await redeem_lnurl_withdraw(bc.wallet, bc.url)
-
-
-@generic_router.get(
-    "/lnurlwallet", response_class=RedirectResponse, name="core.lnurlwallet"
-)
-async def lnurlwallet(request: Request):
-    async with db.connect() as conn:
-        account = await create_account(conn=conn)
-        user = await get_user(account.id, conn=conn)
-        assert user, "Newly created user not found."
-        wallet = await create_wallet(user_id=user.id, conn=conn)
-
-    lightning_param = request.query_params.get("lightning")
-    if not lightning_param:
-        return {"status": "ERROR", "reason": "lightning parameter not provided."}
-
-    asyncio.create_task(
-        redeem_lnurl_withdraw(
-            wallet.id,
-            lightning_param,
-            "LNbits initial funding: voucher redeem.",
-            {"tag": "lnurlwallet"},
-            5,  # wait 5 seconds before sending the invoice to the service
-        )
-    )
-
-    return RedirectResponse(
-        f"/wallet?usr={user.id}&wal={wallet.id}",
-        status_code=status.HTTP_307_TEMPORARY_REDIRECT,
-    )
-
-
@generic_router.get("/service-worker.js")
 async def service_worker(request: Request):
    return template_renderer().TemplateResponse(
@@ -367,11 +232,9 @@ async def service_worker(request: Request):
@generic_router.get("/manifest/{usr}.webmanifest")
 async def manifest(request: Request, usr: str):
    host = urlparse(str(request.url)).netloc
-
    user = await get_user(usr)
    if not user:
        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
-
    return {
        "short_name": settings.lnbits_site_title,
        "name": settings.lnbits_site_title + " Wallet",
@@ -452,17 +315,17 @@ async def node(request: Request, user: User = Depends(check_admin)):
    if not settings.lnbits_node_ui:
        raise HTTPException(status_code=HTTPStatus.SERVICE_UNAVAILABLE)

-    WALLET = get_wallet_class()
-    _, balance = await WALLET.status()
+    funding_source = get_funding_source()
+    _, balance = await funding_source.status()

    return template_renderer().TemplateResponse(
        request,
        "node/index.html",
        {
-            "user": user.dict(),
+            "user": user.json(),
            "settings": settings.dict(),
            "balance": balance,
-            "wallets": user.wallets[0].dict(),
+            "wallets": user.wallets[0].json(),
        },
    )

@@ -472,8 +335,8 @@ async def node_public(request: Request):
    if not settings.lnbits_public_node_ui:
        raise HTTPException(status_code=HTTPStatus.SERVICE_UNAVAILABLE)

-    WALLET = get_wallet_class()
-    _, balance = await WALLET.status()
+    funding_source = get_funding_source()
+    _, balance = await funding_source.status()

    return template_renderer().TemplateResponse(
        request,
@@ -486,18 +349,18 @@ async def node_public(request: Request):


@generic_router.get("/admin", response_class=HTMLResponse)
-async def index(request: Request, user: User = Depends(check_admin)):
+async def admin_index(request: Request, user: User = Depends(check_admin)):
    if not settings.lnbits_admin_ui:
        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)

-    WALLET = get_wallet_class()
-    _, balance = await WALLET.status()
+    funding_source = get_funding_source()
+    _, balance = await funding_source.status()

    return template_renderer().TemplateResponse(
        request,
        "admin/index.html",
        {
-            "user": user.dict(),
+            "user": user.json(),
            "settings": settings.dict(),
            "balance": balance,
            "currencies": list(currencies.keys()),
@@ -505,36 +368,78 @@ async def index(request: Request, user: User = Depends(check_admin)):
    )


+@generic_router.get("/users", response_class=HTMLResponse)
+async def users_index(request: Request, user: User = Depends(check_admin)):
+    if not settings.lnbits_admin_ui:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
+
+    return template_renderer().TemplateResponse(
+        "users/index.html",
+        {
+            "request": request,
+            "user": user.json(),
+            "settings": settings.dict(),
+            "currencies": list(currencies.keys()),
+        },
+    )
+
+
@generic_router.get("/uuidv4/{hex_value}")
 async def hex_to_uuid4(hex_value: str):
    try:
        user_id = to_valid_user_id(hex_value).hex
        return RedirectResponse(url=f"/wallet?usr={user_id}")
-    except Exception as e:
-        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST, detail=str(e))
-
-
-async def toggle_extension(extension_to_enable, extension_to_disable, user_id):
-    if extension_to_enable and extension_to_disable:
+    except Exception as exc:
        raise HTTPException(
-            HTTPStatus.BAD_REQUEST, "You can either `enable` or `disable` an extension."
-        )
+            status_code=HTTPStatus.BAD_REQUEST, detail=str(exc)
+        ) from exc

-    # check if extension exists
-    if extension_to_enable or extension_to_disable:
-        ext = extension_to_enable or extension_to_disable
-        if ext not in [e.code for e in get_valid_extensions()]:
+
+@generic_router.get("/lnurlwallet", response_class=RedirectResponse)
+async def lnurlwallet(request: Request):
+    """
+    If a user doesn't have a Lightning Network wallet and scans the LNURLw QR code with
+    their smartphone camera, or a QR scanner app, they can follow the link provided to
+    claim their satoshis and get an instant LNbits wallet! lnbits/withdraw docs
+    """
+
+    lightning_param = request.query_params.get("lightning")
+    if not lightning_param:
+        return {"status": "ERROR", "reason": "lightning parameter not provided."}
+    if not settings.lnbits_allow_new_accounts:
+        return {"status": "ERROR", "reason": "New accounts are not allowed."}
+
+    lnurl = lnurl_decode(lightning_param)
+
+    async with httpx.AsyncClient() as client:
+
+        res1 = await client.get(lnurl, timeout=2)
+        res1.raise_for_status()
+        data1 = res1.json()
+        if data1.get("tag") != "withdrawRequest":
            raise HTTPException(
-                HTTPStatus.BAD_REQUEST, f"Extension '{ext}' doesn't exist."
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail="Invalid lnurl. Expected tag=withdrawRequest",
            )
+        if not data1.get("maxWithdrawable"):
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail="Invalid lnurl. Expected maxWithdrawable",
+            )
+        account = await create_user_account()
+        wallet = await create_wallet(user_id=account.id)
+        _, payment_request = await create_invoice(
+            wallet_id=wallet.id,
+            amount=data1.get("maxWithdrawable") / 1000,
+            memo=data1.get("defaultDescription", "lnurl wallet withdraw"),
+        )
+        url = data1.get("callback")
+        params = {"k1": data1.get("k1"), "pr": payment_request}
+        callback = url + ("&" if urlparse(url).query else "?") + urlencode(params)

-    if extension_to_enable:
-        logger.info(f"Enabling extension: {extension_to_enable} for user {user_id}")
-        await update_user_extension(
-            user_id=user_id, extension=extension_to_enable, active=True
-        )
-    elif extension_to_disable:
-        logger.info(f"Disabling extension: {extension_to_disable} for user {user_id}")
-        await update_user_extension(
-            user_id=user_id, extension=extension_to_disable, active=False
-        )
+        res2 = await client.get(callback, timeout=2)
+        res2.raise_for_status()
+
+    return RedirectResponse(
+        f"/wallet?usr={account.id}&wal={wallet.id}",
+    )
@@ -27,8 +27,8 @@ from ...utils.cache import cache


 def require_node():
-    NODE = get_node_class()
-    if not NODE:
+    node_class = get_node_class()
+    if not node_class:
        raise HTTPException(
            status_code=HTTPStatus.NOT_IMPLEMENTED,
            detail="Active backend does not implement Node API",
@@ -38,7 +38,7 @@ def require_node():
            status_code=HTTPStatus.SERVICE_UNAVAILABLE,
            detail="Not enabled",
        )
-    return NODE
+    return node_class


 def check_public():
@@ -195,5 +195,7 @@ async def api_get_1ml_stats(node: Node = Depends(require_node)) -> Optional[Node
        try:
            r.raise_for_status()
            return r.json()["noderank"]
-        except httpx.HTTPStatusError:
-            raise HTTPException(status_code=404, detail="Node not found on 1ml.com")
+        except httpx.HTTPStatusError as exc:
+            raise HTTPException(
+                status_code=404, detail="Node not found on 1ml.com"
+            ) from exc
@@ -3,16 +3,16 @@ import json
 import uuid
 from http import HTTPStatus
 from math import ceil
-from typing import List, Optional, Union
+from typing import List, Optional
 from urllib.parse import urlparse

 import httpx
 from fastapi import (
    APIRouter,
-    Body,
    Depends,
    Header,
    HTTPException,
+    Query,
    Request,
 )
 from fastapi.responses import JSONResponse
@@ -20,27 +20,24 @@ from loguru import logger
 from sse_starlette.sse import EventSourceResponse

 from lnbits import bolt11
-from lnbits.core.db import db
 from lnbits.core.models import (
    CreateInvoice,
    CreateLnurl,
    DecodePayment,
+    KeyType,
    Payment,
    PaymentFilters,
    PaymentHistoryPoint,
-    Query,
    Wallet,
-    WalletType,
 )
 from lnbits.db import Filters, Page
 from lnbits.decorators import (
    WalletTypeInfo,
-    get_key_type,
    parse_filters,
    require_admin_key,
    require_invoice_key,
 )
-from lnbits.helpers import generate_filter_params_openapi, url_for
+from lnbits.helpers import filter_dict_keys, generate_filter_params_openapi
 from lnbits.lnurl import decode as lnurl_decode
 from lnbits.settings import settings
 from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
@@ -52,16 +49,12 @@ from ..crud import (
    get_payments_paginated,
    get_standalone_payment,
    get_wallet_for_key,
-    save_balance_check,
-    update_pending_payments,
 )
 from ..services import (
-    InvoiceFailure,
-    PaymentFailure,
-    check_transaction_status,
    create_invoice,
    fee_reserve_total,
    pay_invoice,
+    update_pending_payments,
 )
 from ..tasks import api_invoice_listeners

@@ -77,12 +70,12 @@ payment_router = APIRouter(prefix="/api/v1/payments", tags=["Payments"])
    openapi_extra=generate_filter_params_openapi(PaymentFilters),
 )
 async def api_payments(
-    wallet: WalletTypeInfo = Depends(get_key_type),
+    key_info: WalletTypeInfo = Depends(require_invoice_key),
    filters: Filters = Depends(parse_filters(PaymentFilters)),
 ):
-    await update_pending_payments(wallet.wallet.id)
+    await update_pending_payments(key_info.wallet.id)
    return await get_payments(
-        wallet_id=wallet.wallet.id,
+        wallet_id=key_info.wallet.id,
        pending=True,
        complete=True,
        filters=filters,
@@ -96,12 +89,12 @@ async def api_payments(
    openapi_extra=generate_filter_params_openapi(PaymentFilters),
 )
 async def api_payments_history(
-    wallet: WalletTypeInfo = Depends(get_key_type),
+    key_info: WalletTypeInfo = Depends(require_invoice_key),
    group: DateTrunc = Query("day"),
    filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
 ):
-    await update_pending_payments(wallet.wallet.id)
-    return await get_payments_history(wallet.wallet.id, group, filters)
+    await update_pending_payments(key_info.wallet.id)
+    return await get_payments_history(key_info.wallet.id, group, filters)


@payment_router.get(
@@ -113,12 +106,12 @@ async def api_payments_history(
    openapi_extra=generate_filter_params_openapi(PaymentFilters),
 )
 async def api_payments_paginated(
-    wallet: WalletTypeInfo = Depends(get_key_type),
+    key_info: WalletTypeInfo = Depends(require_invoice_key),
    filters: Filters = Depends(parse_filters(PaymentFilters)),
 ):
-    await update_pending_payments(wallet.wallet.id)
+    await update_pending_payments(key_info.wallet.id)
    page = await get_payments_paginated(
-        wallet_id=wallet.wallet.id,
+        wallet_id=key_info.wallet.id,
        pending=True,
        complete=True,
        filters=filters,
@@ -126,7 +119,7 @@ async def api_payments_paginated(
    return page


-async def api_payments_create_invoice(data: CreateInvoice, wallet: Wallet):
+async def _api_payments_create_invoice(data: CreateInvoice, wallet: Wallet):
    description_hash = b""
    unhashed_description = b""
    memo = data.memo or settings.lnbits_site_title
@@ -134,112 +127,58 @@ async def api_payments_create_invoice(data: CreateInvoice, wallet: Wallet):
        if data.description_hash:
            try:
                description_hash = bytes.fromhex(data.description_hash)
-            except ValueError:
+            except ValueError as exc:
                raise HTTPException(
                    status_code=HTTPStatus.BAD_REQUEST,
                    detail="'description_hash' must be a valid hex string",
-                )
+                ) from exc
        if data.unhashed_description:
            try:
                unhashed_description = bytes.fromhex(data.unhashed_description)
-            except ValueError:
+            except ValueError as exc:
                raise HTTPException(
                    status_code=HTTPStatus.BAD_REQUEST,
                    detail="'unhashed_description' must be a valid hex string",
-                )
+                ) from exc
        # do not save memo if description_hash or unhashed_description is set
        memo = ""

-    async with db.connect() as conn:
-        try:
-            payment_hash, payment_request = await create_invoice(
-                wallet_id=wallet.id,
-                amount=data.amount,
-                memo=memo,
-                currency=data.unit,
-                description_hash=description_hash,
-                unhashed_description=unhashed_description,
-                expiry=data.expiry,
-                extra=data.extra,
-                webhook=data.webhook,
-                internal=data.internal,
-                conn=conn,
-            )
-            # NOTE: we get the checking_id with a seperate query because create_invoice
-            # does not return it and it would be a big hustle to change its return type
-            # (used across extensions)
-            payment_db = await get_standalone_payment(payment_hash, conn=conn)
-            assert payment_db is not None, "payment not found"
-            checking_id = payment_db.checking_id
-        except InvoiceFailure as e:
-            raise HTTPException(status_code=520, detail=str(e))
-        except Exception as exc:
-            raise exc
+    payment = await create_invoice(
+        wallet_id=wallet.id,
+        amount=data.amount,
+        memo=memo,
+        currency=data.unit,
+        description_hash=description_hash,
+        unhashed_description=unhashed_description,
+        expiry=data.expiry,
+        extra=data.extra,
+        webhook=data.webhook,
+        internal=data.internal,
+    )

-    invoice = bolt11.decode(payment_request)
-
-    lnurl_response: Union[None, bool, str] = None
+    # lnurl_response is not saved in the database
    if data.lnurl_callback:
-        if data.lnurl_balance_check is not None:
-            await save_balance_check(wallet.id, data.lnurl_balance_check)
-
        headers = {"User-Agent": settings.user_agent}
        async with httpx.AsyncClient(headers=headers) as client:
            try:
                r = await client.get(
                    data.lnurl_callback,
-                    params={
-                        "pr": payment_request,
-                        "balanceNotify": url_for(
-                            f"/withdraw/notify/{urlparse(data.lnurl_callback).netloc}",
-                            external=True,
-                            wal=wallet.id,
-                        ),
-                    },
+                    params={"pr": payment.bolt11},
                    timeout=10,
                )
                if r.is_error:
-                    lnurl_response = r.text
+                    payment.extra["lnurl_response"] = r.text
                else:
                    resp = json.loads(r.text)
                    if resp["status"] != "OK":
-                        lnurl_response = resp["reason"]
+                        payment.extra["lnurl_response"] = resp["reason"]
                    else:
-                        lnurl_response = True
+                        payment.extra["lnurl_response"] = True
            except (httpx.ConnectError, httpx.RequestError) as ex:
                logger.error(ex)
-                lnurl_response = False
+                payment.extra["lnurl_response"] = False

-    return {
-        "payment_hash": invoice.payment_hash,
-        "payment_request": payment_request,
-        # maintain backwards compatibility with API clients:
-        "checking_id": checking_id,
-        "lnurl_response": lnurl_response,
-    }
-
-
-async def api_payments_pay_invoice(
-    bolt11: str, wallet: Wallet, extra: Optional[dict] = None
-):
-    try:
-        payment_hash = await pay_invoice(
-            wallet_id=wallet.id, payment_request=bolt11, extra=extra
-        )
-    except ValueError as e:
-        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST, detail=str(e))
-    except PermissionError as e:
-        raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail=str(e))
-    except PaymentFailure as e:
-        raise HTTPException(status_code=520, detail=str(e))
-    except Exception as exc:
-        raise exc
-
-    return {
-        "payment_hash": payment_hash,
-        # maintain backwards compatibility with API clients:
-        "checking_id": payment_hash,
-    }
+    return payment


@payment_router.post(
@@ -254,23 +193,32 @@ async def api_payments_pay_invoice(
        field to supply the BOLT11 invoice to be paid.
    """,
    status_code=HTTPStatus.CREATED,
+    responses={
+        400: {"description": "Invalid BOLT11 string or missing fields."},
+        401: {"description": "Invoice (or Admin) key required."},
+        520: {"description": "Payment or Invoice error."},
+    },
 )
 async def api_payments_create(
+    invoice_data: CreateInvoice,
    wallet: WalletTypeInfo = Depends(require_invoice_key),
-    invoiceData: CreateInvoice = Body(...),
-):
-    if invoiceData.out is True and wallet.wallet_type == WalletType.admin:
-        if not invoiceData.bolt11:
+) -> Payment:
+    if invoice_data.out is True and wallet.key_type == KeyType.admin:
+        if not invoice_data.bolt11:
            raise HTTPException(
                status_code=HTTPStatus.BAD_REQUEST,
-                detail="BOLT11 string is invalid or not given",
+                detail="Missing BOLT11 invoice",
            )
-        return await api_payments_pay_invoice(
-            invoiceData.bolt11, wallet.wallet, invoiceData.extra
-        )  # admin key
-    elif not invoiceData.out:
+        payment = await pay_invoice(
+            wallet_id=wallet.wallet.id,
+            payment_request=invoice_data.bolt11,
+            extra=invoice_data.extra,
+        )
+        return payment
+
+    elif not invoice_data.out:
        # invoice key
-        return await api_payments_create_invoice(invoiceData, wallet.wallet)
+        return await _api_payments_create_invoice(invoice_data, wallet.wallet)
    else:
        raise HTTPException(
            status_code=HTTPStatus.UNAUTHORIZED,
@@ -296,7 +244,7 @@ async def api_payments_fee_reserve(invoice: str = Query("invoice")) -> JSONRespo
@payment_router.post("/lnurl")
 async def api_payments_pay_lnurl(
    data: CreateLnurl, wallet: WalletTypeInfo = Depends(require_admin_key)
-):
+) -> Payment:
    domain = urlparse(data.callback).netloc

    headers = {"User-Agent": settings.user_agent}
@@ -316,11 +264,11 @@ async def api_payments_pay_lnurl(
            if r.is_error:
                raise httpx.ConnectError("LNURL callback connection error")
            r.raise_for_status()
-        except (httpx.ConnectError, httpx.RequestError):
+        except (httpx.ConnectError, httpx.RequestError) as exc:
            raise HTTPException(
                status_code=HTTPStatus.BAD_REQUEST,
                detail=f"Failed to connect to {domain}.",
-            )
+            ) from exc

    params = json.loads(r.text)
    if params.get("status") == "ERROR":
@@ -340,15 +288,12 @@ async def api_payments_pay_lnurl(
        raise HTTPException(
            status_code=HTTPStatus.BAD_REQUEST,
            detail=(
-                (
-                    f"{domain} returned an invalid invoice. Expected"
-                    f" {amount_msat} msat, got {invoice.amount_msat}."
-                ),
+                f"{domain} returned an invalid invoice. Expected"
+                f" {amount_msat} msat, got {invoice.amount_msat}."
            ),
        )

    extra = {}
-
    if params.get("successAction"):
        extra["success_action"] = params["successAction"]
    if data.comment:
@@ -357,19 +302,14 @@ async def api_payments_pay_lnurl(
        extra["fiat_currency"] = data.unit
        extra["fiat_amount"] = data.amount / 1000
    assert data.description is not None, "description is required"
-    payment_hash = await pay_invoice(
+
+    payment = await pay_invoice(
        wallet_id=wallet.wallet.id,
        payment_request=params["pr"],
        description=data.description,
        extra=extra,
    )
-
-    return {
-        "success_action": params.get("successAction"),
-        "payment_hash": payment_hash,
-        # maintain backwards compatibility with API clients:
-        "checking_id": payment_hash,
-    }
+    return payment


 async def subscribe_wallet_invoices(request: Request, wallet: Wallet):
@@ -386,7 +326,7 @@ async def subscribe_wallet_invoices(request: Request, wallet: Wallet):
    api_invoice_listeners[uid] = payment_queue

    try:
-        while True:
+        while settings.lnbits_running:
            if await request.is_disconnected():
                await request.close()
                break
@@ -404,10 +344,10 @@ async def subscribe_wallet_invoices(request: Request, wallet: Wallet):

@payment_router.get("/sse")
 async def api_payments_sse(
-    request: Request, wallet: WalletTypeInfo = Depends(get_key_type)
+    request: Request, key_info: WalletTypeInfo = Depends(require_invoice_key)
 ):
    return EventSourceResponse(
-        subscribe_wallet_invoices(request, wallet.wallet),
+        subscribe_wallet_invoices(request, key_info.wallet),
        ping=20,
        media_type="text/event-stream",
    )
@@ -415,10 +355,10 @@ async def api_payments_sse(

 # TODO: refactor this route into a public and admin one
@payment_router.get("/{payment_hash}")
-async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):
+async def api_payment(payment_hash, x_api_key: Optional[str] = Header(None)):
    # We use X_Api_Key here because we want this call to work with and without keys
    # If a valid key is given, we also return the field "details", otherwise not
-    wallet = await get_wallet_for_key(X_Api_Key) if isinstance(X_Api_Key, str) else None
+    wallet = await get_wallet_for_key(x_api_key) if isinstance(x_api_key, str) else None

    payment = await get_standalone_payment(
        payment_hash, wallet_id=wallet.id if wallet else None
@@ -427,21 +367,14 @@ async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):
        raise HTTPException(
            status_code=HTTPStatus.NOT_FOUND, detail="Payment does not exist."
        )
-    await check_transaction_status(payment.wallet_id, payment_hash)
-    payment = await get_standalone_payment(
-        payment_hash, wallet_id=wallet.id if wallet else None
-    )
-    if not payment:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Payment does not exist."
-        )
-    elif not payment.pending:
+
+    if payment.success:
        if wallet and wallet.id == payment.wallet_id:
            return {"paid": True, "preimage": payment.preimage, "details": payment}
        return {"paid": True, "preimage": payment.preimage}

    try:
-        await payment.check_status()
+        status = await payment.check_status()
    except Exception:
        if wallet and wallet.id == payment.wallet_id:
            return {"paid": False, "details": payment}
@@ -449,11 +382,12 @@ async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):

    if wallet and wallet.id == payment.wallet_id:
        return {
-            "paid": not payment.pending,
+            "paid": payment.success,
+            "status": f"{status!s}",
            "preimage": payment.preimage,
            "details": payment,
        }
-    return {"paid": not payment.pending, "preimage": payment.preimage}
+    return {"paid": payment.success, "preimage": payment.preimage}


@payment_router.post("/decode", status_code=HTTPStatus.OK)
@@ -465,9 +399,10 @@ async def api_payments_decode(data: DecodePayment) -> JSONResponse:
            return JSONResponse({"domain": url})
        else:
            invoice = bolt11.decode(payment_str)
-            return JSONResponse(invoice.data)
+            filtered_data = filter_dict_keys(invoice.data, data.filter_fields)
+            return JSONResponse(filtered_data)
    except Exception as exc:
        return JSONResponse(
-            {"message": f"Failed to decode: {str(exc)}"},
+            {"message": f"Failed to decode: {exc!s}"},
            status_code=HTTPStatus.BAD_REQUEST,
        )
@@ -20,17 +20,18 @@ async def api_public_payment_longpolling(payment_hash):
        raise HTTPException(
            status_code=HTTPStatus.NOT_FOUND, detail="Payment does not exist."
        )
-    elif not payment.pending:
+    # TODO: refactor to use PaymentState
+    if payment.success:
        return {"status": "paid"}

    try:
        invoice = bolt11.decode(payment.bolt11)
        if invoice.has_expired():
            return {"status": "expired"}
-    except Exception:
+    except Exception as exc:
        raise HTTPException(
            status_code=HTTPStatus.BAD_REQUEST, detail="Invalid bolt11 invoice."
-        )
+        ) from exc

    payment_queue = asyncio.Queue(0)

@@ -50,7 +51,7 @@ async def api_public_payment_longpolling(payment_hash):
        cancel_scope.cancel()

    cancel_scope = asyncio.create_task(payment_info_receiver())
-    asyncio.create_task(timeouter(cancel_scope))
+    asyncio.create_task(timeouter(cancel_scope))  # noqa: RUF006

    if response:
        return response
@@ -38,10 +38,10 @@ async def api_create_tinyurl(
                if tinyurl.wallet == wallet.wallet.id:
                    return tinyurl
        return await create_tinyurl(url, endless, wallet.wallet.id)
-    except Exception:
+    except Exception as exc:
        raise HTTPException(
            status_code=HTTPStatus.BAD_REQUEST, detail="Unable to create tinyurl"
-        )
+        ) from exc


@tinyurl_router.get(
@@ -60,10 +60,10 @@ async def api_get_tinyurl(
        raise HTTPException(
            status_code=HTTPStatus.FORBIDDEN, detail="Wrong key provided."
        )
-    except Exception:
+    except Exception as exc:
        raise HTTPException(
            status_code=HTTPStatus.NOT_FOUND, detail="Unable to fetch tinyurl"
-        )
+        ) from exc


@tinyurl_router.delete(
@@ -83,10 +83,10 @@ async def api_delete_tinyurl(
        raise HTTPException(
            status_code=HTTPStatus.FORBIDDEN, detail="Wrong key provided."
        )
-    except Exception:
+    except Exception as exc:
        raise HTTPException(
            status_code=HTTPStatus.BAD_REQUEST, detail="Unable to delete"
-        )
+        ) from exc


@tinyurl_router.get(
@@ -0,0 +1,153 @@
+import base64
+import json
+import time
+from http import HTTPStatus
+from typing import List
+
+from fastapi import APIRouter, Depends
+from fastapi.exceptions import HTTPException
+
+from lnbits.core.crud import (
+    delete_account,
+    delete_wallet,
+    force_delete_wallet,
+    get_accounts,
+    get_wallet,
+    get_wallets,
+    update_admin_settings,
+)
+from lnbits.core.models import (
+    AccountFilters,
+    AccountOverview,
+    CreateTopup,
+    User,
+    Wallet,
+)
+from lnbits.core.services import update_wallet_balance
+from lnbits.db import Filters, Page
+from lnbits.decorators import check_admin, check_super_user, parse_filters
+from lnbits.helpers import encrypt_internal_message, generate_filter_params_openapi
+from lnbits.settings import EditableSettings, settings
+
+users_router = APIRouter(prefix="/users/api/v1", dependencies=[Depends(check_admin)])
+
+
+@users_router.get(
+    "/user",
+    name="get accounts",
+    summary="Get paginated list of accounts",
+    openapi_extra=generate_filter_params_openapi(AccountFilters),
+)
+async def api_get_users(
+    filters: Filters = Depends(parse_filters(AccountFilters)),
+) -> Page[AccountOverview]:
+    return await get_accounts(filters=filters)
+
+
+@users_router.delete("/user/{user_id}", status_code=HTTPStatus.OK)
+async def api_users_delete_user(
+    user_id: str, user: User = Depends(check_admin)
+) -> None:
+    wallets = await get_wallets(user_id)
+    if len(wallets) > 0:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Cannot delete user with wallets.",
+        )
+
+    if user_id == settings.super_user:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Cannot delete super user.",
+        )
+
+    if user_id in settings.lnbits_admin_users and not user.super_user:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Only super_user can delete admin user.",
+        )
+    await delete_account(user_id)
+
+
+@users_router.put(
+    "/user/{user_id}/reset_password", dependencies=[Depends(check_super_user)]
+)
+async def api_users_reset_password(user_id: str) -> str:
+    if user_id == settings.super_user:
+        raise HTTPException(
+            status_code=HTTPStatus.FORBIDDEN,
+            detail="Cannot change superuser password.",
+        )
+
+    reset_data = ["reset", user_id, int(time.time())]
+    reset_data_json = json.dumps(reset_data, separators=(",", ":"), ensure_ascii=False)
+    reset_key = encrypt_internal_message(reset_data_json)
+    assert reset_key, "Cannot generate reset key."
+    reset_key_b64 = base64.b64encode(reset_key.encode()).decode()
+    return f"reset_key_{reset_key_b64}"
+
+
+@users_router.get("/user/{user_id}/admin", dependencies=[Depends(check_super_user)])
+async def api_users_toggle_admin(user_id: str) -> None:
+    if user_id == settings.super_user:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Cannot change super user.",
+        )
+    if user_id in settings.lnbits_admin_users:
+        settings.lnbits_admin_users.remove(user_id)
+    else:
+        settings.lnbits_admin_users.append(user_id)
+    update_settings = EditableSettings(lnbits_admin_users=settings.lnbits_admin_users)
+    await update_admin_settings(update_settings)
+
+
+@users_router.get("/user/{user_id}/wallet")
+async def api_users_get_user_wallet(user_id: str) -> List[Wallet]:
+    return await get_wallets(user_id)
+
+
+@users_router.get("/user/{user_id}/wallet/{wallet}/undelete")
+async def api_users_undelete_user_wallet(user_id: str, wallet: str) -> None:
+    wal = await get_wallet(wallet)
+    if not wal:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND,
+            detail="Wallet does not exist.",
+        )
+
+    if user_id != wal.user:
+        raise HTTPException(
+            status_code=HTTPStatus.FORBIDDEN,
+            detail="Wallet does not belong to user.",
+        )
+    if wal.deleted:
+        await delete_wallet(user_id=user_id, wallet_id=wallet, deleted=False)
+
+
+@users_router.delete("/user/{user_id}/wallet/{wallet}")
+async def api_users_delete_user_wallet(user_id: str, wallet: str) -> None:
+    wal = await get_wallet(wallet)
+    if not wal:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND,
+            detail="Wallet does not exist.",
+        )
+    if wal.deleted:
+        await force_delete_wallet(wallet)
+    await delete_wallet(user_id=user_id, wallet_id=wallet)
+
+
+@users_router.put(
+    "/topup",
+    name="Topup",
+    status_code=HTTPStatus.OK,
+    dependencies=[Depends(check_super_user)],
+)
+async def api_topup_balance(data: CreateTopup) -> dict[str, str]:
+    await get_wallet(data.id)
+    if settings.lnbits_backend_wallet_class == "VoidWallet":
+        raise Exception("VoidWallet active")
+
+    await update_wallet_balance(wallet_id=data.id, amount=int(data.amount))
+    return {"status": "Success"}
@@ -1,25 +1,28 @@
+from http import HTTPStatus
 from typing import Optional

 from fastapi import (
    APIRouter,
    Body,
    Depends,
+    HTTPException,
 )

 from lnbits.core.models import (
    CreateWallet,
+    KeyType,
    Wallet,
-    WalletType,
 )
 from lnbits.decorators import (
    WalletTypeInfo,
-    get_key_type,
    require_admin_key,
+    require_invoice_key,
 )

 from ..crud import (
    create_wallet,
    delete_wallet,
+    get_wallet,
    update_wallet,
 )

@@ -27,36 +30,45 @@ wallet_router = APIRouter(prefix="/api/v1/wallet", tags=["Wallet"])


@wallet_router.get("")
-async def api_wallet(wallet: WalletTypeInfo = Depends(get_key_type)):
-    if wallet.wallet_type == WalletType.admin:
-        return {
-            "id": wallet.wallet.id,
-            "name": wallet.wallet.name,
-            "balance": wallet.wallet.balance_msat,
-        }
-    else:
-        return {"name": wallet.wallet.name, "balance": wallet.wallet.balance_msat}
+async def api_wallet(key_info: WalletTypeInfo = Depends(require_invoice_key)):
+    res = {
+        "name": key_info.wallet.name,
+        "balance": key_info.wallet.balance_msat,
+    }
+    if key_info.key_type == KeyType.admin:
+        res["id"] = key_info.wallet.id
+    return res


@wallet_router.put("/{new_name}")
 async def api_update_wallet_name(
-    new_name: str, wallet: WalletTypeInfo = Depends(require_admin_key)
+    new_name: str, key_info: WalletTypeInfo = Depends(require_admin_key)
 ):
-    await update_wallet(wallet.wallet.id, new_name)
+    wallet = await get_wallet(key_info.wallet.id)
+    if not wallet:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="Wallet not found")
+    wallet.name = new_name
+    await update_wallet(wallet)
    return {
-        "id": wallet.wallet.id,
-        "name": wallet.wallet.name,
-        "balance": wallet.wallet.balance_msat,
+        "id": wallet.id,
+        "name": wallet.name,
+        "balance": wallet.balance_msat,
    }


-@wallet_router.patch("", response_model=Wallet)
+@wallet_router.patch("")
 async def api_update_wallet(
    name: Optional[str] = Body(None),
    currency: Optional[str] = Body(None),
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-):
-    return await update_wallet(wallet.wallet.id, name, currency)
+    key_info: WalletTypeInfo = Depends(require_admin_key),
+) -> Wallet:
+    wallet = await get_wallet(key_info.wallet.id)
+    if not wallet:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="Wallet not found")
+    wallet.name = name or wallet.name
+    wallet.currency = currency if currency is not None else wallet.currency
+    await update_wallet(wallet)
+    return wallet


@wallet_router.delete("")
@@ -69,9 +81,9 @@ async def api_delete_wallet(
    )


-@wallet_router.post("", response_model=Wallet)
+@wallet_router.post("")
 async def api_create_wallet(
    data: CreateWallet,
-    wallet: WalletTypeInfo = Depends(require_admin_key),
+    key_info: WalletTypeInfo = Depends(require_admin_key),
 ) -> Wallet:
-    return await create_wallet(user_id=wallet.wallet.user, wallet_name=data.name)
+    return await create_wallet(user_id=key_info.wallet.user, wallet_name=data.name)
@@ -6,8 +6,10 @@ from urllib.parse import unquote, urlparse
 from fastapi import (
    APIRouter,
    Depends,
+    HTTPException,
    Request,
 )
+from loguru import logger

 from lnbits.core.models import (
    CreateWebPushSubscription,
@@ -33,20 +35,27 @@ async def api_create_webpush_subscription(
    data: CreateWebPushSubscription,
    wallet: WalletTypeInfo = Depends(require_admin_key),
 ) -> WebPushSubscription:
-    subscription = json.loads(data.subscription)
-    endpoint = subscription["endpoint"]
-    host = urlparse(str(request.url)).netloc
+    try:
+        subscription = json.loads(data.subscription)
+        endpoint = subscription["endpoint"]
+        host = urlparse(str(request.url)).netloc

-    subscription = await get_webpush_subscription(endpoint, wallet.wallet.user)
-    if subscription:
-        return subscription
-    else:
-        return await create_webpush_subscription(
-            endpoint,
-            wallet.wallet.user,
-            data.subscription,
-            host,
-        )
+        subscription = await get_webpush_subscription(endpoint, wallet.wallet.user)
+        if subscription:
+            return subscription
+        else:
+            return await create_webpush_subscription(
+                endpoint,
+                wallet.wallet.user,
+                data.subscription,
+                host,
+            )
+    except Exception as exc:
+        logger.debug(exc)
+        raise HTTPException(
+            HTTPStatus.INTERNAL_SERVER_ERROR,
+            "Cannot create webpush notification",
+        ) from exc


@webpush_router.delete("", status_code=HTTPStatus.OK)
@@ -54,7 +63,15 @@ async def api_delete_webpush_subscription(
    request: Request,
    wallet: WalletTypeInfo = Depends(require_admin_key),
 ):
-    endpoint = unquote(
-        base64.b64decode(str(request.query_params.get("endpoint"))).decode("utf-8")
-    )
-    await delete_webpush_subscription(endpoint, wallet.wallet.user)
+    try:
+        endpoint = unquote(
+            base64.b64decode(str(request.query_params.get("endpoint"))).decode("utf-8")
+        )
+        count = await delete_webpush_subscription(endpoint, wallet.wallet.user)
+        return {"count": count}
+    except Exception as exc:
+        logger.debug(exc)
+        raise HTTPException(
+            HTTPStatus.INTERNAL_SERVER_ERROR,
+            "Cannot delete webpush notification",
+        ) from exc
@@ -4,9 +4,11 @@ from fastapi import (
    WebSocketDisconnect,
 )

+from lnbits.settings import settings
+
 from ..services import (
-    websocketManager,
-    websocketUpdater,
+    websocket_manager,
+    websocket_updater,
 )

 websocket_router = APIRouter(prefix="/api/v1/ws", tags=["Websocket"])
@@ -14,18 +16,18 @@ websocket_router = APIRouter(prefix="/api/v1/ws", tags=["Websocket"])

@websocket_router.websocket("/{item_id}")
 async def websocket_connect(websocket: WebSocket, item_id: str):
-    await websocketManager.connect(websocket, item_id)
+    await websocket_manager.connect(websocket, item_id)
    try:
-        while True:
+        while settings.lnbits_running:
            await websocket.receive_text()
    except WebSocketDisconnect:
-        websocketManager.disconnect(websocket)
+        websocket_manager.disconnect(websocket)


@websocket_router.post("/{item_id}")
 async def websocket_update_post(item_id: str, data: str):
    try:
-        await websocketUpdater(item_id, data)
+        await websocket_updater(item_id, data)
        return {"sent": True, "data": data}
    except Exception:
        return {"sent": False, "data": data}
@@ -34,7 +36,7 @@ async def websocket_update_post(item_id: str, data: str):
@websocket_router.get("/{item_id}/{data}")
 async def websocket_update_get(item_id: str, data: str):
    try:
-        await websocketUpdater(item_id, data)
+        await websocket_updater(item_id, data)
        return {"sent": True, "data": data}
    except Exception:
        return {"sent": False, "data": data}
@@ -2,19 +2,19 @@ from __future__ import annotations

 import asyncio
 import datetime
+import json
 import os
 import re
 import time
 from contextlib import asynccontextmanager
 from enum import Enum
-from sqlite3 import Row
-from typing import Any, Generic, List, Literal, Optional, Type, TypeVar
+from typing import Any, Generic, Literal, Optional, TypeVar, Union

 from loguru import logger
 from pydantic import BaseModel, ValidationError, root_validator
-from sqlalchemy import create_engine
-from sqlalchemy_aio.base import AsyncConnection
-from sqlalchemy_aio.strategy import ASYNCIO_STRATEGY
+from sqlalchemy import event
+from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine, create_async_engine
+from sqlalchemy.sql import text

 from lnbits.settings import settings

@@ -24,31 +24,15 @@ SQLITE = "SQLITE"

 if settings.lnbits_database_url:
    database_uri = settings.lnbits_database_url
-
    if database_uri.startswith("cockroachdb://"):
        DB_TYPE = COCKROACH
    else:
+        if not database_uri.startswith("postgres://"):
+            raise ValueError(
+                "Please use the 'postgres://...' " "format for the database URL."
+            )
        DB_TYPE = POSTGRES

-    from psycopg2.extensions import DECIMAL, new_type, register_type
-
-    def _parse_timestamp(value, _):
-        if value is None:
-            return None
-        f = "%Y-%m-%d %H:%M:%S.%f"
-        if "." not in value:
-            f = "%Y-%m-%d %H:%M:%S"
-        return time.mktime(datetime.datetime.strptime(value, f).timetuple())
-
-    register_type(
-        new_type(
-            DECIMAL.values,
-            "DEC2FLOAT",
-            lambda value, curs: float(value) if value is not None else None,
-        )
-    )
-
-    register_type(new_type((1184, 1114), "TIMESTAMP2INT", _parse_timestamp))
 else:
    if not os.path.isdir(settings.lnbits_data_folder):
        os.mkdir(settings.lnbits_data_folder)
@@ -56,13 +40,21 @@ else:
    DB_TYPE = SQLITE


-def compat_timestamp_placeholder():
+def compat_timestamp_placeholder(key: str):
    if DB_TYPE == POSTGRES:
-        return "to_timestamp(?)"
+        return f"to_timestamp(:{key})"
    elif DB_TYPE == COCKROACH:
-        return "cast(? AS timestamp)"
+        return f"cast(:{key} AS timestamp)"
    else:
-        return "?"
+        return f":{key}"
+
+
+def get_placeholder(model: Any, field: str) -> str:
+    type_ = model.__fields__[field].type_
+    if type_ == datetime.datetime:
+        return compat_timestamp_placeholder(field)
+    else:
+        return f":{field}"


 class Compat:
@@ -119,15 +111,13 @@ class Compat:
            return "BIGINT"
        return "INT"

-    @property
-    def timestamp_placeholder(self) -> str:
-        return compat_timestamp_placeholder()
+    def timestamp_placeholder(self, key: str) -> str:
+        return compat_timestamp_placeholder(key)


 class Connection(Compat):
-    def __init__(self, conn: AsyncConnection, txn, typ, name, schema):
+    def __init__(self, conn: AsyncConnection, typ, name, schema):
        self.conn = conn
-        self.txn = txn
        self.type = typ
        self.name = name
        self.schema = schema
@@ -138,49 +128,76 @@ class Connection(Compat):
            query = query.replace("?", "%s")
        return query

-    def rewrite_values(self, values):
+    def rewrite_values(self, values: dict) -> dict:
        # strip html
-        CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
-
-        # tuple to list and back to tuple
-        raw_values = [values] if isinstance(values, str) else list(values)
-        values = []
-        for raw_value in raw_values:
+        clean_regex = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
+        clean_values: dict = {}
+        for key, raw_value in values.items():
            if isinstance(raw_value, str):
-                values.append(re.sub(CLEANR, "", raw_value))
+                clean_values[key] = re.sub(clean_regex, "", raw_value)
            elif isinstance(raw_value, datetime.datetime):
                ts = raw_value.timestamp()
                if self.type == SQLITE:
-                    values.append(int(ts))
+                    clean_values[key] = int(ts)
                else:
-                    values.append(ts)
+                    clean_values[key] = ts
            else:
-                values.append(raw_value)
-        return tuple(values)
+                clean_values[key] = raw_value
+        return clean_values

-    async def fetchall(self, query: str, values: tuple = ()) -> list:
-        result = await self.conn.execute(
-            self.rewrite_query(query), self.rewrite_values(values)
-        )
-        return await result.fetchall()
-
-    async def fetchone(self, query: str, values: tuple = ()):
-        result = await self.conn.execute(
-            self.rewrite_query(query), self.rewrite_values(values)
-        )
-        row = await result.fetchone()
-        await result.close()
+    async def fetchall(
+        self,
+        query: str,
+        values: Optional[dict] = None,
+        model: Optional[type[TModel]] = None,
+    ) -> list[TModel]:
+        params = self.rewrite_values(values) if values else {}
+        result = await self.conn.execute(text(self.rewrite_query(query)), params)
+        row = result.mappings().all()
+        result.close()
+        if not row:
+            return []
+        if model:
+            return [dict_to_model(r, model) for r in row]
        return row

+    async def fetchone(
+        self,
+        query: str,
+        values: Optional[dict] = None,
+        model: Optional[type[TModel]] = None,
+    ) -> TModel:
+        params = self.rewrite_values(values) if values else {}
+        result = await self.conn.execute(text(self.rewrite_query(query)), params)
+        row = result.mappings().first()
+        result.close()
+        if model and row:
+            return dict_to_model(row, model)
+        return row
+
+    async def update(
+        self, table_name: str, model: BaseModel, where: str = "WHERE id = :id"
+    ):
+        await self.conn.execute(
+            text(update_query(table_name, model, where)), model_to_dict(model)
+        )
+        await self.conn.commit()
+
+    async def insert(self, table_name: str, model: BaseModel):
+        await self.conn.execute(
+            text(insert_query(table_name, model)), model_to_dict(model)
+        )
+        await self.conn.commit()
+
    async def fetch_page(
        self,
        query: str,
-        where: Optional[List[str]] = None,
-        values: Optional[List[str]] = None,
+        where: Optional[list[str]] = None,
+        values: Optional[dict] = None,
        filters: Optional[Filters] = None,
-        model: Optional[Type[TRowModel]] = None,
-        group_by: Optional[List[str]] = None,
-    ) -> Page[TRowModel]:
+        model: Optional[type[TModel]] = None,
+        group_by: Optional[list[str]] = None,
+    ) -> Page[TModel]:
        if not filters:
            filters = Filters()
        clause = filters.where(where)
@@ -203,14 +220,15 @@ class Connection(Compat):
            {filters.order_by()}
            {filters.pagination()}
            """,
-            parsed_values,
+            self.rewrite_values(parsed_values),
+            model,
        )
        if rows:
            # no need for extra query if no pagination is specified
            if filters.offset or filters.limit:
-                count = await self.fetchone(
+                result = await self.execute(
                    f"""
-                    SELECT COUNT(*) FROM (
+                    SELECT COUNT(*) as count FROM (
                        {query}
                        {clause}
                        {group_by_string}
@@ -218,21 +236,24 @@ class Connection(Compat):
                    """,
                    parsed_values,
                )
-                count = int(count[0])
+                row = result.mappings().first()
+                result.close()
+                count = int(row.get("count", 0))
            else:
                count = len(rows)
        else:
            count = 0

        return Page(
-            data=[model.from_row(row) for row in rows] if model else rows,
+            data=rows,
            total=count,
        )

-    async def execute(self, query: str, values: tuple = ()):
-        return await self.conn.execute(
-            self.rewrite_query(query), self.rewrite_values(values)
-        )
+    async def execute(self, query: str, values: Optional[dict] = None):
+        params = self.rewrite_values(values) if values else {}
+        result = await self.conn.execute(text(self.rewrite_query(query)), params)
+        await self.conn.commit()
+        return result


 class Database(Compat):
@@ -245,18 +266,42 @@ class Database(Compat):
            self.path = os.path.join(
                settings.lnbits_data_folder, f"{self.name}.sqlite3"
            )
-            database_uri = f"sqlite:///{self.path}"
+            database_uri = f"sqlite+aiosqlite:///{self.path}"
        else:
-            database_uri = settings.lnbits_database_url
+            database_uri = settings.lnbits_database_url.replace(
+                "postgres://", "postgresql+asyncpg://"
+            )

        if self.name.startswith("ext_"):
            self.schema = self.name[4:]
        else:
            self.schema = None

-        self.engine = create_engine(
-            database_uri, strategy=ASYNCIO_STRATEGY, echo=settings.debug_database
+        self.engine: AsyncEngine = create_async_engine(
+            database_uri, echo=settings.debug_database
        )
+
+        if self.type in {POSTGRES, COCKROACH}:
+
+            @event.listens_for(self.engine.sync_engine, "connect")
+            def register_custom_types(dbapi_connection, *_):
+                def _parse_date(value) -> datetime.datetime:
+                    if value is None:
+                        value = "1970-01-01 00:00:00"
+                    f = "%Y-%m-%d %H:%M:%S.%f"
+                    if "." not in value:
+                        f = "%Y-%m-%d %H:%M:%S"
+                    return datetime.datetime.strptime(value, f)
+
+                dbapi_connection.run_async(
+                    lambda connection: connection.set_type_codec(
+                        "TIMESTAMP",
+                        encoder=datetime.datetime,
+                        decoder=_parse_date,
+                        schema="pg_catalog",
+                    )
+                )
+
        self.lock = asyncio.Lock()

        logger.trace(f"database {self.type} added for {self.name}")
@@ -265,49 +310,65 @@ class Database(Compat):
    async def connect(self):
        await self.lock.acquire()
        try:
-            async with self.engine.connect() as conn:  # type: ignore
-                async with conn.begin() as txn:
-                    wconn = Connection(conn, txn, self.type, self.name, self.schema)
+            async with self.engine.connect() as conn:
+                if not conn:
+                    raise Exception("Could not connect to the database")

-                    if self.schema:
-                        if self.type in {POSTGRES, COCKROACH}:
-                            await wconn.execute(
-                                f"CREATE SCHEMA IF NOT EXISTS {self.schema}"
-                            )
-                        elif self.type == SQLITE:
-                            await wconn.execute(
-                                f"ATTACH '{self.path}' AS {self.schema}"
-                            )
+                wconn = Connection(conn, self.type, self.name, self.schema)

-                    yield wconn
+                if self.schema:
+                    if self.type in {POSTGRES, COCKROACH}:
+                        await wconn.execute(
+                            f"CREATE SCHEMA IF NOT EXISTS {self.schema}"
+                        )
+                    elif self.type == SQLITE:
+                        await wconn.execute(f"ATTACH '{self.path}' AS {self.schema}")
+
+                yield wconn
        finally:
            self.lock.release()

-    async def fetchall(self, query: str, values: tuple = ()) -> list:
+    async def fetchall(
+        self,
+        query: str,
+        values: Optional[dict] = None,
+        model: Optional[type[TModel]] = None,
+    ) -> list[TModel]:
        async with self.connect() as conn:
-            result = await conn.execute(query, values)
-            return await result.fetchall()
+            return await conn.fetchall(query, values, model)

-    async def fetchone(self, query: str, values: tuple = ()):
+    async def fetchone(
+        self,
+        query: str,
+        values: Optional[dict] = None,
+        model: Optional[type[TModel]] = None,
+    ) -> TModel:
        async with self.connect() as conn:
-            result = await conn.execute(query, values)
-            row = await result.fetchone()
-            await result.close()
-            return row
+            return await conn.fetchone(query, values, model)
+
+    async def insert(self, table_name: str, model: BaseModel) -> None:
+        async with self.connect() as conn:
+            await conn.insert(table_name, model)
+
+    async def update(
+        self, table_name: str, model: BaseModel, where: str = "WHERE id = :id"
+    ) -> None:
+        async with self.connect() as conn:
+            await conn.update(table_name, model, where)

    async def fetch_page(
        self,
        query: str,
-        where: Optional[List[str]] = None,
-        values: Optional[List[str]] = None,
+        where: Optional[list[str]] = None,
+        values: Optional[dict] = None,
        filters: Optional[Filters] = None,
-        model: Optional[Type[TRowModel]] = None,
-        group_by: Optional[List[str]] = None,
-    ) -> Page[TRowModel]:
+        model: Optional[type[TModel]] = None,
+        group_by: Optional[list[str]] = None,
+    ) -> Page[TModel]:
        async with self.connect() as conn:
            return await conn.fetch_page(query, where, values, filters, model, group_by)

-    async def execute(self, query: str, values: tuple = ()):
+    async def execute(self, query: str, values: Optional[dict] = None):
        async with self.connect() as conn:
            return await conn.execute(query, values)

@@ -363,20 +424,13 @@ class Operator(Enum):
            raise ValueError("Unknown SQL Operator")


-class FromRowModel(BaseModel):
-    @classmethod
-    def from_row(cls, row: Row):
-        return cls(**dict(row))
-
-
 class FilterModel(BaseModel):
-    __search_fields__: List[str] = []
-    __sort_fields__: Optional[List[str]] = None
+    __search_fields__: list[str] = []
+    __sort_fields__: Optional[list[str]] = None


 T = TypeVar("T")
 TModel = TypeVar("TModel", bound=BaseModel)
-TRowModel = TypeVar("TRowModel", bound=FromRowModel)
 TFilterModel = TypeVar("TFilterModel", bound=FilterModel)


@@ -388,12 +442,13 @@ class Page(BaseModel, Generic[T]):
 class Filter(BaseModel, Generic[TFilterModel]):
    field: str
    op: Operator = Operator.EQ
-    values: list[Any]
-
-    model: Optional[Type[TFilterModel]]
+    model: Optional[type[TFilterModel]]
+    values: Optional[dict] = None

    @classmethod
-    def parse_query(cls, key: str, raw_values: list[Any], model: Type[TFilterModel]):
+    def parse_query(
+        cls, key: str, raw_values: list[Any], model: type[TFilterModel], i: int = 0
+    ):
        # Key format:
        # key[operator]
        # e.g. name[eq]
@@ -409,12 +464,12 @@ class Filter(BaseModel, Generic[TFilterModel]):

        if field in model.__fields__:
            compare_field = model.__fields__[field]
-            values = []
+            values: dict = {}
            for raw_value in raw_values:
                validated, errors = compare_field.validate(raw_value, {}, loc="none")
                if errors:
                    raise ValidationError(errors=[errors], model=model)
-                values.append(validated)
+                values[f"{field}__{i}"] = validated
        else:
            raise ValueError("Unknown filter field")

@@ -422,15 +477,17 @@ class Filter(BaseModel, Generic[TFilterModel]):

    @property
    def statement(self):
-        if self.model and self.model.__fields__[self.field].type_ == datetime.datetime:
-            placeholder = compat_timestamp_placeholder()
-        else:
-            placeholder = "?"
-        if self.op in (Operator.INCLUDE, Operator.EXCLUDE):
-            placeholders = ", ".join([placeholder] * len(self.values))
-            stmt = [f"{self.field} {self.op.as_sql} ({placeholders})"]
-        else:
-            stmt = [f"{self.field} {self.op.as_sql} {placeholder}"] * len(self.values)
+        stmt = []
+        for key in self.values.keys() if self.values else []:
+            clean_key = key.split("__")[0]
+            if (
+                self.model
+                and self.model.__fields__[clean_key].type_ == datetime.datetime
+            ):
+                placeholder = compat_timestamp_placeholder(key)
+            else:
+                placeholder = f":{key}"
+            stmt.append(f"{clean_key} {self.op.as_sql} {placeholder}")
        return " OR ".join(stmt)


@@ -443,7 +500,7 @@ class Filters(BaseModel, Generic[TFilterModel]):
    the values can be validated. Otherwise, make sure to validate the inputs manually.
    """

-    filters: List[Filter[TFilterModel]] = []
+    filters: list[Filter[TFilterModel]] = []
    search: Optional[str] = None

    offset: Optional[int] = None
@@ -452,7 +509,7 @@ class Filters(BaseModel, Generic[TFilterModel]):
    sortby: Optional[str] = None
    direction: Optional[Literal["asc", "desc"]] = None

-    model: Optional[Type[TFilterModel]] = None
+    model: Optional[type[TFilterModel]] = None

    @root_validator(pre=True)
    def validate_sortby(cls, values):
@@ -474,21 +531,18 @@ class Filters(BaseModel, Generic[TFilterModel]):
            stmt += f"OFFSET {self.offset}"
        return stmt

-    def where(self, where_stmts: Optional[List[str]] = None) -> str:
+    def where(self, where_stmts: Optional[list[str]] = None) -> str:
        if not where_stmts:
            where_stmts = []
        if self.filters:
            for page_filter in self.filters:
                where_stmts.append(page_filter.statement)
        if self.search and self.model:
+            fields = self.model.__search_fields__
            if DB_TYPE == POSTGRES:
-                where_stmts.append(
-                    f"lower(concat({', '.join(self.model.__search_fields__)})) LIKE ?"
-                )
+                where_stmts.append(f"lower(concat({', '.join(fields)})) LIKE :search")
            elif DB_TYPE == SQLITE:
-                where_stmts.append(
-                    f"lower({'||'.join(self.model.__search_fields__)}) LIKE ?"
-                )
+                where_stmts.append(f"lower({'||'.join(fields)}) LIKE :search")
        if where_stmts:
            return "WHERE " + " AND ".join(where_stmts)
        return ""
@@ -498,12 +552,113 @@ class Filters(BaseModel, Generic[TFilterModel]):
            return f"ORDER BY {self.sortby} {self.direction or 'asc'}"
        return ""

-    def values(self, values: Optional[List[str]] = None) -> tuple:
+    def values(self, values: Optional[dict] = None) -> dict:
        if not values:
-            values = []
+            values = {}
        if self.filters:
            for page_filter in self.filters:
-                values.extend(page_filter.values)
+                if page_filter.values:
+                    for key, value in page_filter.values.items():
+                        values[key] = value
        if self.search and self.model:
-            values.append(f"%{self.search}%")
-        return tuple(values)
+            values["search"] = f"%{self.search}%"
+        return values
+
+
+def insert_query(table_name: str, model: BaseModel) -> str:
+    """
+    Generate an insert query with placeholders for a given table and model
+    :param table_name: Name of the table
+    :param model: Pydantic model
+    """
+    placeholders = []
+    keys = model_to_dict(model).keys()
+    for field in keys:
+        placeholders.append(get_placeholder(model, field))
+    # add quotes to keys to avoid SQL conflicts (e.g. `user` is a reserved keyword)
+    fields = ", ".join([f'"{key}"' for key in keys])
+    values = ", ".join(placeholders)
+    return f"INSERT INTO {table_name} ({fields}) VALUES ({values})"
+
+
+def update_query(
+    table_name: str, model: BaseModel, where: str = "WHERE id = :id"
+) -> str:
+    """
+    Generate an update query with placeholders for a given table and model
+    :param table_name: Name of the table
+    :param model: Pydantic model
+    :param where: Where string, default to `WHERE id = :id`
+    """
+    fields = []
+    for field in model_to_dict(model).keys():
+        placeholder = get_placeholder(model, field)
+        # add quotes to keys to avoid SQL conflicts (e.g. `user` is a reserved keyword)
+        fields.append(f'"{field}" = {placeholder}')
+    query = ", ".join(fields)
+    return f"UPDATE {table_name} SET {query} {where}"
+
+
+def model_to_dict(model: BaseModel) -> dict:
+    """
+    Convert a Pydantic model to a dictionary with JSON-encoded nested models
+    private fields starting with _ are ignored
+    :param model: Pydantic model
+    """
+    _dict: dict = {}
+    for key, value in model.dict().items():
+        type_ = model.__fields__[key].type_
+        if model.__fields__[key].field_info.extra.get("no_database", False):
+            continue
+        if isinstance(value, datetime.datetime):
+            _dict[key] = value.timestamp()
+            continue
+        if type(type_) is type(BaseModel) or type_ is dict:
+            _dict[key] = json.dumps(value)
+            continue
+        _dict[key] = value
+
+    return _dict
+
+
+def dict_to_submodel(model: type[TModel], value: Union[dict, str]) -> Optional[TModel]:
+    """convert a dictionary or JSON string to a Pydantic model"""
+    if isinstance(value, str):
+        if value == "null":
+            return None
+        _subdict = json.loads(value)
+    elif isinstance(value, dict):
+        _subdict = value
+    else:
+        logger.warning(f"Expected str or dict, got {type(value)}")
+        return None
+    # recursively convert nested models
+    return dict_to_model(_subdict, model)
+
+
+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 = {}
+    for key, value in _row.items():
+        if key not in model.__fields__:
+            logger.warning(f"Converting {key} to model `{model}`.")
+            continue
+        type_ = model.__fields__[key].type_
+        if issubclass(type_, bool):
+            _dict[key] = bool(value)
+            continue
+        if issubclass(type_, BaseModel) and value:
+            _dict[key] = dict_to_submodel(type_, value)
+            continue
+        # TODO: remove this when all sub models are migrated to Pydantic
+        if type_ is dict and value:
+            _dict[key] = json.loads(value)
+            continue
+        _dict[key] = value
+        continue
+    _model = model.construct(**_dict)
+    return _model
@@ -1,12 +1,12 @@
 from http import HTTPStatus
 from typing import Annotated, Literal, Optional, Type, Union

+import jwt
 from fastapi import Cookie, Depends, Query, Request, Security
 from fastapi.exceptions import HTTPException
 from fastapi.openapi.models import APIKey, APIKeyIn, SecuritySchemeType
 from fastapi.security import APIKeyHeader, APIKeyQuery, OAuth2PasswordBearer
 from fastapi.security.base import SecurityBase
-from jose import ExpiredSignatureError, JWTError, jwt
 from loguru import logger
 from pydantic.types import UUID4

@@ -14,26 +14,43 @@ from lnbits.core.crud import (
    get_account,
    get_account_by_email,
    get_account_by_username,
-    get_user,
+    get_user_active_extensions_ids,
+    get_user_from_account,
    get_wallet_for_key,
 )
-from lnbits.core.models import User, Wallet, WalletType, WalletTypeInfo
+from lnbits.core.models import (
+    AccessTokenPayload,
+    Account,
+    KeyType,
+    SimpleStatus,
+    User,
+    WalletTypeInfo,
+)
 from lnbits.db import Filter, Filters, TFilterModel
 from lnbits.settings import AuthMethods, settings

 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="api/v1/auth", auto_error=False)

+api_key_header = APIKeyHeader(
+    name="X-API-KEY",
+    auto_error=False,
+    description="Admin or Invoice key for wallet API's",
+)
+api_key_query = APIKeyQuery(
+    name="api-key",
+    auto_error=False,
+    description="Admin or Invoice key for wallet API's",
+)
+

 class KeyChecker(SecurityBase):
    def __init__(
        self,
-        scheme_name: Optional[str] = None,
-        auto_error: bool = True,
        api_key: Optional[str] = None,
+        expected_key_type: Optional[KeyType] = None,
    ):
-        self.scheme_name = scheme_name or self.__class__.__name__
-        self.auto_error: bool = auto_error
-        self._key_type: WalletType = WalletType.invoice
+        self.auto_error: bool = True
+        self.expected_key_type = expected_key_type
        self._api_key = api_key
        if api_key:
            openapi_model = APIKey(
@@ -49,185 +66,64 @@ class KeyChecker(SecurityBase):
                name="X-API-KEY",
                description="Wallet API Key - HEADER",
            )
-        self.wallet: Optional[Wallet] = None
-        self.model: APIKey = openapi_model
+        self.model: APIKey = openapi_model  # type: ignore

-    async def __call__(self, request: Request):
-        try:
-            key_value = (
-                self._api_key
-                if self._api_key
-                else request.headers.get("X-API-KEY") or request.query_params["api-key"]
-            )
-            # FIXME: Find another way to validate the key. A fetch from DB should be
-            #        avoided here. Also, we should not return the wallet here - thats
-            #        silly. Possibly store it in a Redis DB
-            wallet = await get_wallet_for_key(key_value, self._key_type)
-            if not wallet:
-                raise HTTPException(
-                    status_code=HTTPStatus.UNAUTHORIZED,
-                    detail="Invalid key or wallet.",
-                )
-            self.wallet = wallet
-        except KeyError:
-            raise HTTPException(
-                status_code=HTTPStatus.BAD_REQUEST, detail="`X-API-KEY` header missing."
-            )
+    async def __call__(self, request: Request) -> WalletTypeInfo:

-
-class WalletInvoiceKeyChecker(KeyChecker):
-    """
-    WalletInvoiceKeyChecker will ensure that the provided invoice
-    wallet key is correct and populate g().wallet with the wallet
-    for the key in `X-API-key`.
-
-    The checker will raise an HTTPException when the key is wrong in some ways.
-    """
-
-    def __init__(
-        self,
-        scheme_name: Optional[str] = None,
-        auto_error: bool = True,
-        api_key: Optional[str] = None,
-    ):
-        super().__init__(scheme_name, auto_error, api_key)
-        self._key_type = WalletType.invoice
-
-
-class WalletAdminKeyChecker(KeyChecker):
-    """
-    WalletAdminKeyChecker will ensure that the provided admin
-    wallet key is correct and populate g().wallet with the wallet
-    for the key in `X-API-key`.
-
-    The checker will raise an HTTPException when the key is wrong in some ways.
-    """
-
-    def __init__(
-        self,
-        scheme_name: Optional[str] = None,
-        auto_error: bool = True,
-        api_key: Optional[str] = None,
-    ):
-        super().__init__(scheme_name, auto_error, api_key)
-        self._key_type = WalletType.admin
-
-
-api_key_header = APIKeyHeader(
-    name="X-API-KEY",
-    auto_error=False,
-    description="Admin or Invoice key for wallet API's",
-)
-api_key_query = APIKeyQuery(
-    name="api-key",
-    auto_error=False,
-    description="Admin or Invoice key for wallet API's",
-)
-
-
-async def get_key_type(
-    r: Request,
-    api_key_header: str = Security(api_key_header),
-    api_key_query: str = Security(api_key_query),
-) -> WalletTypeInfo:
-    token = api_key_header or api_key_query
-
-    if not token:
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail="Invoice (or Admin) key required.",
+        key_value = (
+            self._api_key
+            if self._api_key
+            else request.headers.get("X-API-KEY") or request.query_params.get("api-key")
        )

-    for wallet_type, WalletChecker in zip(
-        [WalletType.admin, WalletType.invoice],
-        [WalletAdminKeyChecker, WalletInvoiceKeyChecker],
-    ):
-        try:
-            checker = WalletChecker(api_key=token)
-            await checker.__call__(r)
-            if checker.wallet is None:
-                raise HTTPException(
-                    status_code=HTTPStatus.NOT_FOUND, detail="Wallet does not exist."
-                )
-            wallet = WalletTypeInfo(wallet_type, checker.wallet)
-            if (
-                wallet.wallet.user != settings.super_user
-                and wallet.wallet.user not in settings.lnbits_admin_users
-            ) and (
-                settings.lnbits_admin_extensions
-                and r["path"].split("/")[1] in settings.lnbits_admin_extensions
-            ):
-                raise HTTPException(
-                    status_code=HTTPStatus.FORBIDDEN,
-                    detail="User not authorized for this extension.",
-                )
-            return wallet
-        except HTTPException as exc:
-            if exc.status_code == HTTPStatus.BAD_REQUEST:
-                raise
-            elif exc.status_code == HTTPStatus.UNAUTHORIZED:
-                # we pass this in case it is not an invoice key, nor an admin key,
-                # and then return NOT_FOUND at the end of this block
-                pass
-            else:
-                raise
-        except Exception:
-            raise
-    raise HTTPException(
-        status_code=HTTPStatus.NOT_FOUND, detail="Wallet does not exist."
-    )
+        if not key_value:
+            raise HTTPException(
+                status_code=HTTPStatus.UNAUTHORIZED,
+                detail="No Api Key provided.",
+            )
+
+        wallet = await get_wallet_for_key(key_value)
+
+        if not wallet:
+            raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="Wallet not found.",
+            )
+
+        if self.expected_key_type is KeyType.admin and wallet.adminkey != key_value:
+            raise HTTPException(
+                status_code=HTTPStatus.UNAUTHORIZED,
+                detail="Invalid adminkey.",
+            )
+
+        await _check_user_extension_access(wallet.user, request["path"])
+
+        key_type = KeyType.admin if wallet.adminkey == key_value else KeyType.invoice
+        return WalletTypeInfo(key_type, wallet)


 async def require_admin_key(
-    r: Request,
+    request: Request,
    api_key_header: str = Security(api_key_header),
    api_key_query: str = Security(api_key_query),
-):
-    token = api_key_header or api_key_query
-
-    if not token:
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail="Admin key required.",
-        )
-
-    wallet = await get_key_type(r, token)
-
-    if wallet.wallet_type != 0:
-        # If wallet type is not admin then return the unauthorized status
-        # This also covers when the user passes an invalid key type
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED, detail="Admin key required."
-        )
-    else:
-        return wallet
+) -> WalletTypeInfo:
+    check: KeyChecker = KeyChecker(
+        api_key=api_key_header or api_key_query,
+        expected_key_type=KeyType.admin,
+    )
+    return await check(request)


 async def require_invoice_key(
-    r: Request,
+    request: Request,
    api_key_header: str = Security(api_key_header),
    api_key_query: str = Security(api_key_query),
-):
-    token = api_key_header or api_key_query
-
-    if not token:
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail="Invoice (or Admin) key required.",
-        )
-
-    wallet = await get_key_type(r, token)
-
-    if (
-        wallet.wallet_type != WalletType.admin
-        and wallet.wallet_type != WalletType.invoice
-    ):
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail="Invoice (or Admin) key required.",
-        )
-    else:
-        return wallet
+) -> WalletTypeInfo:
+    check: KeyChecker = KeyChecker(
+        api_key=api_key_header or api_key_query,
+        expected_key_type=KeyType.invoice,
+    )
+    return await check(request)


 async def check_access_token(
@@ -249,18 +145,42 @@ async def check_user_exists(
    else:
        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Missing user ID or access token.")

-    if not account or not settings.is_user_allowed(account.id):
+    if not account:
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User not found.")
+
+    if not settings.is_user_allowed(account.id):
        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User not allowed.")

-    user = await get_user(account.id)
-    assert user, "User not found for account."
-
-    if not user.admin and r["path"].split("/")[1] in settings.lnbits_admin_extensions:
-        raise HTTPException(HTTPStatus.FORBIDDEN, "User not authorized for extension.")
-
+    user = await get_user_from_account(account)
+    if not user:
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User not found.")
+    await _check_user_extension_access(user.id, r["path"])
    return user


+async def optional_user_id(
+    access_token: Annotated[Optional[str], Depends(check_access_token)],
+    usr: Optional[UUID4] = None,
+) -> Optional[str]:
+    if usr and settings.is_auth_method_allowed(AuthMethods.user_id_only):
+        return usr.hex
+    if access_token:
+        account = await _get_account_from_token(access_token)
+        return account.id if account else None
+
+    return None
+
+
+async def access_token_payload(
+    access_token: Annotated[Optional[str], Depends(check_access_token)],
+) -> AccessTokenPayload:
+    if not access_token:
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Missing access token.")
+
+    payload: dict = jwt.decode(access_token, settings.auth_secret_key, ["HS256"])
+    return AccessTokenPayload(**payload)
+
+
 async def check_admin(user: Annotated[User, Depends(check_user_exists)]) -> User:
    if user.id != settings.super_user and user.id not in settings.lnbits_admin_users:
        raise HTTPException(
@@ -294,9 +214,9 @@ def parse_filters(model: Type[TFilterModel]):
    ):
        params = request.query_params
        filters = []
-        for key in params.keys():
+        for i, key in enumerate(params.keys()):
            try:
-                filters.append(Filter.parse_query(key, params.getlist(key), model))
+                filters.append(Filter.parse_query(key, params.getlist(key), model, i))
            except ValueError:
                continue

@@ -313,21 +233,62 @@ def parse_filters(model: Type[TFilterModel]):
    return dependency


-async def _get_account_from_token(access_token):
-    try:
-        payload = jwt.decode(access_token, settings.auth_secret_key, "HS256")
-        if "sub" in payload and payload.get("sub"):
-            return await get_account_by_username(str(payload.get("sub")))
-        if "usr" in payload and payload.get("usr"):
-            return await get_account(str(payload.get("usr")))
-        if "email" in payload and payload.get("email"):
-            return await get_account_by_email(str(payload.get("email")))
+async def check_user_extension_access(user_id: str, ext_id: str) -> SimpleStatus:
+    """
+    Check if the user has access to a particular extension.
+    Raises HTTP Forbidden if the user is not allowed.
+    """
+    if settings.is_admin_extension(ext_id) and not settings.is_admin_user(user_id):
+        return SimpleStatus(
+            success=False, message=f"User not authorized for extension '{ext_id}'."
+        )

-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Data missing for access token.")
-    except ExpiredSignatureError:
+    if settings.is_extension_id(ext_id):
+        ext_ids = await get_user_active_extensions_ids(user_id)
+        if ext_id not in ext_ids:
+            return SimpleStatus(
+                success=False, message=f"User extension '{ext_id}' not enabled."
+            )
+
+    return SimpleStatus(success=True, message="OK")
+
+
+async def _check_user_extension_access(user_id: str, current_path: str):
+    path = current_path.split("/")
+    ext_id = path[3] if path[1] == "upgrades" else path[1]
+    status = await check_user_extension_access(user_id, ext_id)
+    if not status.success:
+        raise HTTPException(
+            HTTPStatus.FORBIDDEN,
+            status.message,
+        )
+
+
+async def _get_account_from_token(access_token) -> Optional[Account]:
+    try:
+        payload: dict = jwt.decode(access_token, settings.auth_secret_key, ["HS256"])
+        user = await _get_user_from_jwt_payload(payload)
+        if not user:
+            raise HTTPException(
+                HTTPStatus.UNAUTHORIZED, "Data missing for access token."
+            )
+
+        return user
+
+    except jwt.ExpiredSignatureError as exc:
        raise HTTPException(
            HTTPStatus.UNAUTHORIZED, "Session expired.", {"token-expired": "true"}
-        )
-    except JWTError as e:
-        logger.debug(e)
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid access token.")
+        ) from exc
+    except jwt.PyJWTError as exc:
+        logger.debug(exc)
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid access token.") from exc
+
+
+async def _get_user_from_jwt_payload(payload) -> Optional[Account]:
+    if "sub" in payload and payload.get("sub"):
+        return await get_account_by_username(str(payload.get("sub")))
+    if "usr" in payload and payload.get("usr"):
+        return await get_account(str(payload.get("usr")))
+    if "email" in payload and payload.get("email"):
+        return await get_account_by_email(str(payload.get("email")))
+    return None
@@ -0,0 +1,123 @@
+import sys
+import traceback
+from http import HTTPStatus
+from typing import Optional
+
+from fastapi import FastAPI, HTTPException, Request
+from fastapi.exceptions import RequestValidationError
+from fastapi.responses import JSONResponse, RedirectResponse, Response
+from loguru import logger
+
+from .helpers import template_renderer
+
+
+class PaymentError(Exception):
+    def __init__(self, message: str, status: str = "pending"):
+        self.message = message
+        self.status = status
+
+
+class InvoiceError(Exception):
+    def __init__(self, message: str, status: str = "pending"):
+        self.message = message
+        self.status = status
+
+
+def render_html_error(request: Request, exc: Exception) -> Optional[Response]:
+    # Only the browser sends "text/html" request
+    # not fail proof, but everything else get's a JSON response
+    if (
+        request.headers
+        and "accept" in request.headers
+        and "text/html" in request.headers["accept"]
+    ):
+        if (
+            isinstance(exc, HTTPException)
+            and exc.headers
+            and "token-expired" in exc.headers
+        ):
+            response = RedirectResponse("/")
+            response.delete_cookie("cookie_access_token")
+            response.delete_cookie("is_lnbits_user_authorized")
+            response.set_cookie("is_access_token_expired", "true")
+            return response
+
+        status_code: int = (
+            exc.status_code
+            if isinstance(exc, HTTPException)
+            else HTTPStatus.INTERNAL_SERVER_ERROR
+        )
+
+        return template_renderer().TemplateResponse(
+            request, "error.html", {"err": f"Error: {exc!s}"}, status_code
+        )
+
+    return None
+
+
+def register_exception_handlers(app: FastAPI):
+    """Register exception handlers for the FastAPI app"""
+
+    @app.exception_handler(Exception)
+    async def exception_handler(request: Request, exc: Exception):
+        etype, _, tb = sys.exc_info()
+        traceback.print_exception(etype, exc, tb)
+        logger.error(f"Exception: {exc!s}")
+        return render_html_error(request, exc) or JSONResponse(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            content={"detail": str(exc)},
+        )
+
+    @app.exception_handler(AssertionError)
+    async def assert_error_handler(request: Request, exc: AssertionError):
+        etype, _, tb = sys.exc_info()
+        traceback.print_exception(etype, exc, tb)
+        logger.warning(f"AssertionError: {exc!s}")
+        return render_html_error(request, exc) or JSONResponse(
+            status_code=HTTPStatus.BAD_REQUEST,
+            content={"detail": str(exc)},
+        )
+
+    @app.exception_handler(ValueError)
+    async def value_error_handler(request: Request, exc: ValueError):
+        etype, _, tb = sys.exc_info()
+        traceback.print_exception(etype, exc, tb)
+        logger.warning(f"ValueError: {exc!s}")
+        return render_html_error(request, exc) or JSONResponse(
+            status_code=HTTPStatus.BAD_REQUEST,
+            content={"detail": str(exc)},
+        )
+
+    @app.exception_handler(RequestValidationError)
+    async def validation_exception_handler(
+        request: Request, exc: RequestValidationError
+    ):
+        logger.error(f"RequestValidationError: {exc!s}")
+        return render_html_error(request, exc) or JSONResponse(
+            status_code=HTTPStatus.BAD_REQUEST,
+            content={"detail": str(exc)},
+        )
+
+    @app.exception_handler(HTTPException)
+    async def http_exception_handler(request: Request, exc: HTTPException):
+        logger.error(f"HTTPException {exc.status_code}: {exc.detail}")
+        return render_html_error(request, exc) or JSONResponse(
+            status_code=exc.status_code,
+            content={"detail": exc.detail},
+        )
+
+    @app.exception_handler(PaymentError)
+    async def payment_error_handler(request: Request, exc: PaymentError):
+        logger.error(f"{exc.message}, {exc.status}")
+        return JSONResponse(
+            status_code=520,
+            content={"detail": exc.message, "status": exc.status},
+        )
+
+    @app.exception_handler(InvoiceError)
+    async def invoice_error_handler(request: Request, exc: InvoiceError):
+        logger.error(f"{exc.message}, Status: {exc.status}")
+        return JSONResponse(
+            status_code=520,
+            content={"detail": exc.message, "status": exc.status},
+        )
@@ -1,15 +1,15 @@
 import json
 import re
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from pathlib import Path
-from typing import Any, List, Optional, Type
+from typing import Any, Optional, Type

 import jinja2
+import jwt
 import shortuuid
-from jose import jwt
-from pydantic import BaseModel
 from pydantic.schema import field_schema

+from lnbits.core.extensions.models import Extension
 from lnbits.jinja2_templating import Jinja2Templates
 from lnbits.nodes import get_node_class
 from lnbits.requestvars import g
@@ -17,7 +17,19 @@ from lnbits.settings import settings
 from lnbits.utils.crypto import AESCipher

 from .db import FilterModel
-from .extension_manager import get_valid_extensions
+
+
+def get_db_vendor_name():
+    db_url = settings.lnbits_database_url
+    return (
+        "PostgreSQL"
+        if db_url and db_url.startswith("postgres://")
+        else (
+            "CockroachDB"
+            if db_url and db_url.startswith("cockroachdb://")
+            else "SQLite"
+        )
+    )


 def urlsafe_short_hash() -> str:
@@ -37,7 +49,7 @@ def static_url_for(static: str, path: str) -> str:
    return f"/{static}/{path}?v={settings.server_startup_time}"


-def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templates:
+def template_renderer(additional_folders: Optional[list] = None) -> Jinja2Templates:
    folders = ["lnbits/templates", "lnbits/core/templates"]
    if additional_folders:
        additional_folders += [
@@ -58,6 +70,11 @@ def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templa
    t.env.globals["LNBITS_DENOMINATION"] = settings.lnbits_denomination
    t.env.globals["SITE_TAGLINE"] = settings.lnbits_site_tagline
    t.env.globals["SITE_DESCRIPTION"] = settings.lnbits_site_description
+    t.env.globals["LNBITS_SHOW_HOME_PAGE_ELEMENTS"] = (
+        settings.lnbits_show_home_page_elements
+    )
+    t.env.globals["LNBITS_CUSTOM_BADGE"] = settings.lnbits_custom_badge
+    t.env.globals["LNBITS_CUSTOM_BADGE_COLOR"] = settings.lnbits_custom_badge_color
    t.env.globals["LNBITS_THEME_OPTIONS"] = settings.lnbits_theme_options
    t.env.globals["LNBITS_QR_LOGO"] = settings.lnbits_qr_logo
    t.env.globals["LNBITS_VERSION"] = settings.version
@@ -74,19 +91,21 @@ def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templa
        settings.lnbits_node_ui and get_node_class() is not None
    )
    t.env.globals["LNBITS_NODE_UI_AVAILABLE"] = get_node_class() is not None
-    t.env.globals["EXTENSIONS"] = get_valid_extensions(False)
+    t.env.globals["EXTENSIONS"] = Extension.get_valid_extensions(False)
    if settings.lnbits_custom_logo:
        t.env.globals["USE_CUSTOM_LOGO"] = settings.lnbits_custom_logo

    if settings.bundle_assets:
        t.env.globals["INCLUDED_JS"] = ["bundle.min.js"]
        t.env.globals["INCLUDED_CSS"] = ["bundle.min.css"]
+        t.env.globals["INCLUDED_COMPONENTS"] = ["bundle-components.min.js"]
    else:
        vendor_filepath = Path(settings.lnbits_path, "static", "vendor.json")
        with open(vendor_filepath) as vendor_file:
            vendor_files = json.loads(vendor_file.read())
            t.env.globals["INCLUDED_JS"] = vendor_files["js"]
            t.env.globals["INCLUDED_CSS"] = vendor_files["css"]
+            t.env.globals["INCLUDED_COMPONENTS"] = vendor_files["components"]

    t.env.globals["WEBPUSH_PUBKEY"] = settings.lnbits_webpush_pubkey

@@ -154,28 +173,6 @@ def generate_filter_params_openapi(model: Type[FilterModel], keep_optional=False
    }


-def insert_query(table_name: str, model: BaseModel) -> str:
-    """
-    Generate an insert query with placeholders for a given table and model
-    :param table_name: Name of the table
-    :param model: Pydantic model
-    """
-    placeholders = ", ".join(["?"] * len(model.dict().keys()))
-    fields = ", ".join(model.dict().keys())
-    return f"INSERT INTO {table_name} ({fields}) VALUES ({placeholders})"
-
-
-def update_query(table_name: str, model: BaseModel, where: str = "WHERE id = ?") -> str:
-    """
-    Generate an update query with placeholders for a given table and model
-    :param table_name: Name of the table
-    :param model: Pydantic model
-    :param where: Where string, default to `WHERE id = ?`
-    """
-    query = ", ".join([f"{field} = ?" for field in model.dict().keys()])
-    return f"UPDATE {table_name} SET {query} {where}"
-
-
 def is_valid_email_address(email: str) -> bool:
    email_regex = r"[A-Za-z0-9\._%+-]+@[A-Za-z0-9\.-]+\.[A-Za-z]{2,63}"
    return re.fullmatch(email_regex, email) is not None
@@ -187,7 +184,9 @@ def is_valid_username(username: str) -> bool:


 def create_access_token(data: dict):
-    expire = datetime.utcnow() + timedelta(minutes=settings.auth_token_expire_minutes)
+    expire = datetime.now(timezone.utc) + timedelta(
+        minutes=settings.auth_token_expire_minutes
+    )
    to_encode = data.copy()
    to_encode.update({"exp": expire})
    return jwt.encode(to_encode, settings.auth_secret_key, "HS256")
@@ -205,3 +204,10 @@ def decrypt_internal_message(m: Optional[str] = None) -> Optional[str]:
    if not m:
        return None
    return AESCipher(key=settings.auth_secret_key).decrypt(m)
+
+
+def filter_dict_keys(data: dict, filter_keys: Optional[list[str]]) -> dict:
+    if not filter_keys:
+        # return shallow clone of the dict even if there are no filters
+        return {**data}
+    return {key: data[key] for key in filter_keys if key in data}
@@ -1 +1,65 @@
-from lnurl import LnurlErrorResponse, decode, encode, handle  # noqa: F401
+from typing import Callable
+
+from fastapi import HTTPException, Request, Response
+from fastapi.responses import JSONResponse
+from fastapi.routing import APIRoute
+from lnurl import LnurlErrorResponse, decode, encode, handle
+from loguru import logger
+
+from lnbits.exceptions import InvoiceError, PaymentError
+
+
+class LnurlErrorResponseHandler(APIRoute):
+    """
+    Custom APIRoute class to handle LNURL errors.
+    LNURL errors always return with status 200 and
+    a JSON response with `status="ERROR"` and a `reason` key.
+    Helps to catch HTTPException and return a valid lnurl error response
+
+    Example:
+    withdraw_lnurl_router = APIRouter(prefix="/api/v1/lnurl")
+    withdraw_lnurl_router.route_class = LnurlErrorResponseHandler
+    """
+
+    def get_route_handler(self) -> Callable:
+        original_route_handler = super().get_route_handler()
+
+        async def lnurl_route_handler(request: Request) -> Response:
+            try:
+                response = await original_route_handler(request)
+                return response
+            except (InvoiceError, PaymentError) as exc:
+                logger.debug(f"Wallet Error: {exc}")
+                response = JSONResponse(
+                    status_code=200,
+                    content={"status": "ERROR", "reason": f"{exc.message}"},
+                )
+                return response
+            except HTTPException as exc:
+                logger.debug(f"HTTPException: {exc}")
+                response = JSONResponse(
+                    status_code=200,
+                    content={"status": "ERROR", "reason": f"{exc.detail}"},
+                )
+                return response
+            except Exception as exc:
+                logger.error("Unknown Error:", exc)
+                response = JSONResponse(
+                    status_code=200,
+                    content={
+                        "status": "ERROR",
+                        "reason": f"UNKNOWN ERROR: {exc!s}",
+                    },
+                )
+                return response
+
+        return lnurl_route_handler
+
+
+__all__ = [
+    "decode",
+    "encode",
+    "handle",
+    "LnurlErrorResponse",
+    "LnurlErrorResponseHandler",
+]
@@ -1,5 +1,5 @@
 from http import HTTPStatus
-from typing import Any, List, Tuple, Union
+from typing import Any, List, Union

 from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
@@ -29,7 +29,7 @@ class InstalledExtensionMiddleware:
            await self.app(scope, receive, send)
            return

-        top_path, *rest = [p for p in full_path.split("/") if p]
+        top_path, *rest = (p for p in full_path.split("/") if p)
        headers = scope.get("headers", [])

        # block path for all users if the extension is disabled
@@ -45,16 +45,11 @@ class InstalledExtensionMiddleware:
            await self.app(scope, receive, send)
            return

-        upgrade_path = next(
-            (
-                e
-                for e in settings.lnbits_upgraded_extensions
-                if e.endswith(f"/{top_path}")
-            ),
-            None,
-        )
        # re-route all trafic if the extension has been upgraded
-        if upgrade_path:
+        if top_path in settings.lnbits_upgraded_extensions:
+            upgrade_path = (
+                f"""{settings.lnbits_upgraded_extensions[top_path]}/{top_path}"""
+            )
            tail = "/".join(rest)
            scope["path"] = f"/upgrades/{upgrade_path}/{tail}"

@@ -118,72 +113,12 @@ class ExtensionsRedirectMiddleware:
            return

        req_headers = scope["headers"] if "headers" in scope else []
-        redirect = self._find_redirect(scope["path"], req_headers)
+        redirect = settings.find_extension_redirect(scope["path"], req_headers)
        if redirect:
-            scope["path"] = self._new_path(redirect, scope["path"])
+            scope["path"] = redirect.new_path_from(scope["path"])

        await self.app(scope, receive, send)

-    def _find_redirect(self, path: str, req_headers: List[Tuple[bytes, bytes]]):
-        return next(
-            (
-                r
-                for r in settings.lnbits_extensions_redirects
-                if self._redirect_matches(r, path, req_headers)
-            ),
-            None,
-        )
-
-    def _redirect_matches(
-        self, redirect: dict, path: str, req_headers: List[Tuple[bytes, bytes]]
-    ) -> bool:
-        if "from_path" not in redirect:
-            return False
-        header_filters = (
-            redirect["header_filters"] if "header_filters" in redirect else {}
-        )
-        return self._has_common_path(redirect["from_path"], path) and self._has_headers(
-            header_filters, req_headers
-        )
-
-    def _has_headers(
-        self, filter_headers: dict, req_headers: List[Tuple[bytes, bytes]]
-    ) -> bool:
-        for h in filter_headers:
-            if not self._has_header(req_headers, (str(h), str(filter_headers[h]))):
-                return False
-        return True
-
-    def _has_header(
-        self, req_headers: List[Tuple[bytes, bytes]], header: Tuple[str, str]
-    ) -> bool:
-        for h in req_headers:
-            if (
-                h[0].decode().lower() == header[0].lower()
-                and h[1].decode() == header[1]
-            ):
-                return True
-        return False
-
-    def _has_common_path(self, redirect_path: str, req_path: str) -> bool:
-        redirect_path_elements = redirect_path.split("/")
-        req_path_elements = req_path.split("/")
-        if len(redirect_path) > len(req_path):
-            return False
-        sub_path = req_path_elements[: len(redirect_path_elements)]
-        return redirect_path == "/".join(sub_path)
-
-    def _new_path(self, redirect: dict, req_path: str) -> str:
-        from_path = redirect["from_path"].split("/")
-        redirect_to = redirect["redirect_to_path"].split("/")
-        req_tail_path = req_path.split("/")[len(from_path) :]
-
-        elements = [
-            e for e in ([redirect["ext_id"]] + redirect_to + req_tail_path) if e != ""
-        ]
-
-        return "/" + "/".join(elements)
-

 def add_ratelimit_middleware(app: FastAPI):
    core_app_extra.register_new_ratelimiter()
@@ -214,8 +149,6 @@ def add_ip_block_middleware(app: FastAPI):
            )
        return await call_next(request)

-    app.middleware("http")(block_allow_ip_middleware)
-

 def add_first_install_middleware(app: FastAPI):
    @app.middleware("http")
@@ -228,5 +161,3 @@ def add_first_install_middleware(app: FastAPI):
        ):
            return RedirectResponse("/first_install")
        return await call_next(request)
-
-    app.middleware("http")(first_install_middleware)
@@ -2,7 +2,7 @@ from __future__ import annotations

 from abc import ABC, abstractmethod
 from enum import Enum
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, Optional

 from pydantic import BaseModel

@@ -212,7 +212,7 @@ class Node(ABC):
        pass

    @abstractmethod
-    async def get_channels(self) -> List[NodeChannel]:
+    async def get_channels(self) -> list[NodeChannel]:
        pass

    @abstractmethod
@@ -2,7 +2,7 @@ from __future__ import annotations

 import asyncio
 from http import HTTPStatus
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, Optional

 from fastapi import HTTPException

@@ -44,11 +44,12 @@ def catch_rpc_errors(f):
    async def wrapper(*args, **kwargs):
        try:
            return await f(*args, **kwargs)
-        except RpcError as e:
-            if e.error["code"] == -32602:
-                raise HTTPException(status_code=400, detail=e.error["message"])
+        except RpcError as exc:
+            msg = exc.error["message"]
+            if exc.error["code"] == -32602:
+                raise HTTPException(status_code=400, detail=msg) from exc
            else:
-                raise HTTPException(status_code=500, detail=e.error["message"])
+                raise HTTPException(status_code=500, detail=msg) from exc

    return wrapper

@@ -66,9 +67,11 @@ class CoreLightningNode(Node):
        # https://docs.corelightning.org/reference/lightning-connect
        try:
            await self.ln_rpc("connect", uri)
-        except RpcError as e:
-            if e.error["code"] == 400:
-                raise HTTPException(HTTPStatus.BAD_REQUEST, detail=e.error["message"])
+        except RpcError as exc:
+            if exc.error["code"] == 400:
+                raise HTTPException(
+                    HTTPStatus.BAD_REQUEST, detail=exc.error["message"]
+                ) from exc
            else:
                raise

@@ -76,12 +79,12 @@ class CoreLightningNode(Node):
    async def disconnect_peer(self, peer_id: str):
        try:
            await self.ln_rpc("disconnect", peer_id)
-        except RpcError as e:
-            if e.error["code"] == -1:
+        except RpcError as exc:
+            if exc.error["code"] == -1:
                raise HTTPException(
                    HTTPStatus.BAD_REQUEST,
-                    detail=e.error["message"],
-                )
+                    detail=exc.error["message"],
+                ) from exc
            else:
                raise

@@ -105,14 +108,14 @@ class CoreLightningNode(Node):
                funding_txid=result["txid"],
                output_index=result["outnum"],
            )
-        except RpcError as e:
-            message = e.error["message"]
+        except RpcError as exc:
+            message = exc.error["message"]

            if "amount: should be a satoshi amount" in message:
                raise HTTPException(
                    HTTPStatus.BAD_REQUEST,
                    detail="The amount is not a valid satoshi amount.",
-                )
+                ) from exc

            if "Unknown peer" in message:
                raise HTTPException(
@@ -121,7 +124,7 @@ class CoreLightningNode(Node):
                        "We where able to connect to the peer but CLN "
                        "can't find it when opening a channel."
                    ),
-                )
+                ) from exc

            if "Owning subdaemon openingd died" in message:
                # https://github.com/ElementsProject/lightning/issues/2798#issuecomment-511205719
@@ -131,14 +134,14 @@ class CoreLightningNode(Node):
                        "Likely the peer didn't like our channel opening "
                        "proposal and disconnected from us."
                    ),
-                )
+                ) from exc

            if (
                "Number of pending channels exceed maximum" in message
                or "exceeds maximum chan size of 10 BTC" in message
                or "Could not afford" in message
            ):
-                raise HTTPException(HTTPStatus.BAD_REQUEST, detail=message)
+                raise HTTPException(HTTPStatus.BAD_REQUEST, detail=message) from exc
            raise

    @catch_rpc_errors
@@ -152,13 +155,13 @@ class CoreLightningNode(Node):
            raise HTTPException(status_code=400, detail="Short id required")
        try:
            await self.ln_rpc("close", short_id)
-        except RpcError as e:
-            message = e.error["message"]
+        except RpcError as exc:
+            message = exc.error["message"]
            if (
                "Short channel ID not active:" in message
                or "Short channel ID not found" in message
            ):
-                raise HTTPException(HTTPStatus.BAD_REQUEST, detail=message)
+                raise HTTPException(HTTPStatus.BAD_REQUEST, detail=message) from exc
            else:
                raise

@@ -168,7 +171,7 @@ class CoreLightningNode(Node):
        return info["id"]

    @catch_rpc_errors
-    async def get_peer_ids(self) -> List[str]:
+    async def get_peer_ids(self) -> list[str]:
        peers = await self.ln_rpc("listpeers")
        return [p["id"] for p in peers["peers"] if p["connected"]]

@@ -194,7 +197,7 @@ class CoreLightningNode(Node):
            return NodePeerInfo(id=node["nodeid"])

    @catch_rpc_errors
-    async def get_channels(self) -> List[NodeChannel]:
+    async def get_channels(self) -> list[NodeChannel]:
        funds = await self.ln_rpc("listfunds")
        nodes = await self.ln_rpc("listnodes")
        nodes_by_id = {n["nodeid"]: n for n in nodes["nodes"]}
@@ -4,7 +4,7 @@ import asyncio
 import base64
 import json
 from http import HTTPStatus
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, Optional

 from fastapi import HTTPException
 from httpx import HTTPStatusError
@@ -60,11 +60,13 @@ class LndRestNode(Node):
        )
        try:
            response.raise_for_status()
-        except HTTPStatusError as e:
-            json = e.response.json()
+        except HTTPStatusError as exc:
+            json = exc.response.json()
            if json:
                error = json.get("error") or json
-                raise HTTPException(e.response.status_code, detail=error.get("message"))
+                raise HTTPException(
+                    exc.response.status_code, detail=error.get("message")
+                ) from exc
        return response.json()

    def get(self, path: str, **kwargs):
@@ -81,8 +83,8 @@ class LndRestNode(Node):
    async def connect_peer(self, uri: str):
        try:
            pubkey, host = uri.split("@")
-        except ValueError:
-            raise HTTPException(400, detail="Invalid peer URI")
+        except ValueError as exc:
+            raise HTTPException(400, detail="Invalid peer URI") from exc
        await self.request(
            "POST",
            "/v1/peers",
@@ -96,11 +98,11 @@ class LndRestNode(Node):
    async def disconnect_peer(self, peer_id: str):
        try:
            await self.request("DELETE", "/v1/peers/" + peer_id)
-        except HTTPException as e:
-            if "unable to disconnect" in e.detail:
+        except HTTPException as exc:
+            if "unable to disconnect" in exc.detail:
                raise HTTPException(
                    HTTPStatus.BAD_REQUEST, detail="Peer is not connected"
-                )
+                ) from exc
            raise

    async def _get_peer_info(self, peer_id: str) -> NodePeerInfo:
@@ -174,9 +176,9 @@ class LndRestNode(Node):
                status_code=HTTPStatus.BAD_REQUEST, detail="Channel point required"
            )

-        asyncio.create_task(self._close_channel(point, force))
+        asyncio.create_task(self._close_channel(point, force))  # noqa: RUF006

-    async def get_channels(self) -> List[NodeChannel]:
+    async def get_channels(self) -> list[NodeChannel]:
        normal, pending, closed = await asyncio.gather(
            self.get("/v1/channels"),
            self.get("/v1/channels/pending"),
@@ -0,0 +1 @@
+# Marker file for PEP 561
@@ -16,7 +16,7 @@ from lnbits.settings import set_cli_settings, settings
    }
 )
@click.option("--port", default=settings.port, help="Port to listen on")
-@click.option("--host", default=settings.host, help="Host to run LNBits on")
+@click.option("--host", default=settings.host, help="Host to run LNbits on")
@click.option(
    "--forwarded-allow-ips",
    default=settings.forwarded_allow_ips,
@@ -24,14 +24,16 @@ from lnbits.settings import set_cli_settings, settings
 )
@click.option("--ssl-keyfile", default=None, help="Path to SSL keyfile")
@click.option("--ssl-certfile", default=None, help="Path to SSL certificate")
-@click.pass_context
+@click.option(
+    "--reload", is_flag=True, default=False, help="Enable auto-reload for development"
+)
 def main(
-    ctx,
    port: int,
    host: str,
    forwarded_allow_ips: str,
    ssl_keyfile: str,
    ssl_certfile: str,
+    reload: bool,
 ):
    """Launched with `poetry run lnbits` at root level"""

@@ -46,21 +48,6 @@ def main(

    set_cli_settings(host=host, port=port, forwarded_allow_ips=forwarded_allow_ips)

-    # this beautiful beast parses all command line arguments and
-    # passes them to the uvicorn server
-    d = {}
-    for a in ctx.args:
-        item = a.split("=")
-        if len(item) > 1:  # argument like --key=value
-            print(a, item)
-            d[item[0].strip("--").replace("-", "_")] = (
-                int(item[1])  # need to convert to int if it's a number
-                if item[1].isdigit()
-                else item[1]
-            )
-        else:
-            d[a.strip("--")] = True  # argument like --key
-
    while True:
        config = uvicorn.Config(
            "lnbits.__main__:app",
@@ -70,7 +57,7 @@ def main(
            forwarded_allow_ips=forwarded_allow_ips,
            ssl_keyfile=ssl_keyfile,
            ssl_certfile=ssl_certfile,
-            **d
+            reload=reload or False,
        )

        server = uvicorn.Server(config=config)
@@ -7,9 +7,8 @@ import json
 from enum import Enum
 from hashlib import sha256
 from os import path
-from sqlite3 import Row
 from time import time
-from typing import Any, List, Optional
+from typing import Any, Optional

 import httpx
 from loguru import logger
@@ -36,8 +35,8 @@ class LNbitsSettings(BaseModel):


 class UsersSettings(LNbitsSettings):
-    lnbits_admin_users: List[str] = Field(default=[])
-    lnbits_allowed_users: List[str] = Field(default=[])
+    lnbits_admin_users: list[str] = Field(default=[])
+    lnbits_allowed_users: list[str] = Field(default=[])
    lnbits_allow_new_accounts: bool = Field(default=True)

    @property
@@ -46,9 +45,10 @@ class UsersSettings(LNbitsSettings):


 class ExtensionsSettings(LNbitsSettings):
-    lnbits_admin_extensions: List[str] = Field(default=[])
+    lnbits_admin_extensions: list[str] = Field(default=[])
+    lnbits_user_default_extensions: list[str] = Field(default=[])
    lnbits_extensions_deactivate_all: bool = Field(default=False)
-    lnbits_extensions_manifests: List[str] = Field(
+    lnbits_extensions_manifests: list[str] = Field(
        default=[
            "https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions.json"
        ]
@@ -56,36 +56,150 @@ class ExtensionsSettings(LNbitsSettings):


 class ExtensionsInstallSettings(LNbitsSettings):
-    lnbits_extensions_default_install: List[str] = Field(default=[])
+    lnbits_extensions_default_install: list[str] = Field(default=[])
    # required due to GitHUb rate-limit
    lnbits_ext_github_token: str = Field(default="")


+class RedirectPath(BaseModel):
+    ext_id: str
+    from_path: str
+    redirect_to_path: str
+    header_filters: dict = {}
+
+    def in_conflict(self, other: RedirectPath) -> bool:
+        if self.ext_id == other.ext_id:
+            return False
+        return self.redirect_matches(
+            other.from_path, list(other.header_filters.items())
+        ) or other.redirect_matches(self.from_path, list(self.header_filters.items()))
+
+    def find_in_conflict(self, others: list[RedirectPath]) -> Optional[RedirectPath]:
+        for other in others:
+            if self.in_conflict(other):
+                return other
+        return None
+
+    def new_path_from(self, req_path: str) -> str:
+        from_path = self.from_path.split("/")
+        redirect_to = self.redirect_to_path.split("/")
+        req_tail_path = req_path.split("/")[len(from_path) :]
+
+        elements = [e for e in ([self.ext_id, *redirect_to, *req_tail_path]) if e != ""]
+
+        return "/" + "/".join(elements)
+
+    def redirect_matches(self, path: str, req_headers: list[tuple[str, str]]) -> bool:
+        return self._has_common_path(path) and self._has_headers(req_headers)
+
+    def _has_common_path(self, req_path: str) -> bool:
+        if len(self.from_path) > len(req_path):
+            return False
+
+        redirect_path_elements = self.from_path.split("/")
+        req_path_elements = req_path.split("/")
+
+        sub_path = req_path_elements[: len(redirect_path_elements)]
+        return self.from_path == "/".join(sub_path)
+
+    def _has_headers(self, req_headers: list[tuple[str, str]]) -> bool:
+        for h in self.header_filters:
+            if not self._has_header(req_headers, (str(h), str(self.header_filters[h]))):
+                return False
+        return True
+
+    def _has_header(
+        self, req_headers: list[tuple[str, str]], header: tuple[str, str]
+    ) -> bool:
+        for h in req_headers:
+            if h[0].lower() == header[0].lower() and h[1].lower() == header[1].lower():
+                return True
+        return False
+
+
 class InstalledExtensionsSettings(LNbitsSettings):
    # installed extensions that have been deactivated
-    lnbits_deactivated_extensions: List[str] = Field(default=[])
+    lnbits_deactivated_extensions: set[str] = Field(default=[])
    # upgraded extensions that require API redirects
-    lnbits_upgraded_extensions: List[str] = Field(default=[])
+    lnbits_upgraded_extensions: dict[str, str] = Field(default={})
    # list of redirects that extensions want to perform
-    lnbits_extensions_redirects: List[Any] = Field(default=[])
+    lnbits_extensions_redirects: list[RedirectPath] = Field(default=[])

-    def extension_upgrade_path(self, ext_id: str) -> Optional[str]:
+    # list of all extension ids
+    lnbits_all_extensions_ids: set[Any] = Field(default=[])
+
+    def find_extension_redirect(
+        self, path: str, req_headers: list[tuple[bytes, bytes]]
+    ) -> Optional[RedirectPath]:
+        headers = [(k.decode(), v.decode()) for k, v in req_headers]
        return next(
-            (e for e in self.lnbits_upgraded_extensions if e.endswith(f"/{ext_id}")),
+            (
+                r
+                for r in self.lnbits_extensions_redirects
+                if r.redirect_matches(path, headers)
+            ),
            None,
        )

-    def extension_upgrade_hash(self, ext_id: str) -> Optional[str]:
-        path = settings.extension_upgrade_path(ext_id)
-        return path.split("/")[0] if path else None
+    def activate_extension_paths(
+        self,
+        ext_id: str,
+        upgrade_hash: Optional[str] = None,
+        ext_redirects: Optional[list[dict]] = None,
+    ):
+        self.lnbits_deactivated_extensions.discard(ext_id)
+
+        """
+        Update the list of upgraded extensions. The middleware will perform
+        redirects based on this
+        """
+        if upgrade_hash:
+            self.lnbits_upgraded_extensions[ext_id] = upgrade_hash
+
+        if ext_redirects:
+            self._activate_extension_redirects(ext_id, ext_redirects)
+
+        self.lnbits_all_extensions_ids.add(ext_id)
+
+    def deactivate_extension_paths(self, ext_id: str):
+        self.lnbits_deactivated_extensions.add(ext_id)
+        self._remove_extension_redirects(ext_id)
+
+    def _activate_extension_redirects(self, ext_id: str, ext_redirects: list[dict]):
+        ext_redirect_paths = [
+            RedirectPath(**{"ext_id": ext_id, **er}) for er in ext_redirects
+        ]
+        existing_redirects = {
+            r.ext_id
+            for r in self.lnbits_extensions_redirects
+            if r.find_in_conflict(ext_redirect_paths)
+        }
+
+        assert len(existing_redirects) == 0, (
+            f"Cannot redirect for extension '{ext_id}'."
+            f" Already mapped by {existing_redirects}."
+        )
+
+        self._remove_extension_redirects(ext_id)
+        self.lnbits_extensions_redirects += ext_redirect_paths
+
+    def _remove_extension_redirects(self, ext_id: str):
+        self.lnbits_extensions_redirects = [
+            er for er in self.lnbits_extensions_redirects if er.ext_id != ext_id
+        ]


 class ThemesSettings(LNbitsSettings):
    lnbits_site_title: str = Field(default="LNbits")
    lnbits_site_tagline: str = Field(default="free and open-source lightning wallet")
-    lnbits_site_description: str = Field(default=None)
+    lnbits_site_description: Optional[str] = Field(
+        default="The world's most powerful suite of bitcoin tools."
+    )
+    lnbits_show_home_page_elements: bool = Field(default=True)
    lnbits_default_wallet_name: str = Field(default="LNbits wallet")
-    lnbits_theme_options: List[str] = Field(
+    lnbits_custom_badge: Optional[str] = Field(default=None)
+    lnbits_custom_badge_color: str = Field(default="warning")
+    lnbits_theme_options: list[str] = Field(
        default=[
            "classic",
            "freedom",
@@ -96,13 +210,13 @@ class ThemesSettings(LNbitsSettings):
            "cyber",
        ]
    )
-    lnbits_custom_logo: str = Field(default=None)
+    lnbits_custom_logo: Optional[str] = Field(default=None)
    lnbits_ad_space_title: str = Field(default="Supported by")
    lnbits_ad_space: str = Field(
-        default="https://shop.lnbits.com/;/static/images/lnbits-shop-light.png;/static/images/lnbits-shop-dark.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://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=[])
+    lnbits_allowed_currencies: list[str] = Field(default=[])
    lnbits_default_accounting_currency: Optional[str] = Field(default=None)
    lnbits_qr_logo: str = Field(default="/static/images/logos/lnbits.png")

@@ -114,7 +228,7 @@ class OpsSettings(LNbitsSettings):
    lnbits_service_fee: float = Field(default=0)
    lnbits_service_fee_ignore_internal: bool = Field(default=True)
    lnbits_service_fee_max: int = Field(default=0)
-    lnbits_service_fee_wallet: str = Field(default=None)
+    lnbits_service_fee_wallet: Optional[str] = Field(default=None)
    lnbits_hide_api: bool = Field(default=False)
    lnbits_denomination: str = Field(default="sats")

@@ -122,8 +236,8 @@ class OpsSettings(LNbitsSettings):
 class SecuritySettings(LNbitsSettings):
    lnbits_rate_limit_no: str = Field(default="200")
    lnbits_rate_limit_unit: str = Field(default="minute")
-    lnbits_allowed_ips: List[str] = Field(default=[])
-    lnbits_blocked_ips: List[str] = Field(default=[])
+    lnbits_allowed_ips: list[str] = Field(default=[])
+    lnbits_blocked_ips: list[str] = Field(default=[])
    lnbits_notifications: bool = Field(default=False)
    lnbits_killswitch: bool = Field(default=False)
    lnbits_killswitch_interval: int = Field(default=60)
@@ -152,7 +266,7 @@ class FakeWalletFundingSource(LNbitsSettings):


 class LNbitsFundingSource(LNbitsSettings):
-    lnbits_endpoint: str = Field(default="https://legend.lnbits.com")
+    lnbits_endpoint: str = Field(default="https://demo.lnbits.com")
    lnbits_key: Optional[str] = Field(default=None)
    lnbits_admin_key: Optional[str] = Field(default=None)
    lnbits_invoice_key: Optional[str] = Field(default=None)
@@ -164,6 +278,7 @@ class ClicheFundingSource(LNbitsSettings):

 class CoreLightningFundingSource(LNbitsSettings):
    corelightning_rpc: Optional[str] = Field(default=None)
+    corelightning_pay_command: str = Field(default="pay")
    clightning_rpc: Optional[str] = Field(default=None)


@@ -208,11 +323,22 @@ class LnPayFundingSource(LNbitsSettings):
    lnpay_admin_key: Optional[str] = Field(default=None)


+class BlinkFundingSource(LNbitsSettings):
+    blink_api_endpoint: Optional[str] = Field(default="https://api.blink.sv/graphql")
+    blink_ws_endpoint: Optional[str] = Field(default="wss://ws.blink.sv/graphql")
+    blink_token: Optional[str] = Field(default=None)
+
+
 class ZBDFundingSource(LNbitsSettings):
    zbd_api_endpoint: Optional[str] = Field(default="https://api.zebedee.io/v0/")
    zbd_api_key: Optional[str] = Field(default=None)


+class PhoenixdFundingSource(LNbitsSettings):
+    phoenixd_api_endpoint: Optional[str] = Field(default="http://localhost:9740/")
+    phoenixd_api_password: Optional[str] = Field(default=None)
+
+
 class AlbyFundingSource(LNbitsSettings):
    alby_api_endpoint: Optional[str] = Field(default="https://api.getalby.com/")
    alby_access_token: Optional[str] = Field(default=None)
@@ -237,6 +363,25 @@ class LnTipsFundingSource(LNbitsSettings):
    lntips_invoice_key: Optional[str] = Field(default=None)


+class NWCFundingSource(LNbitsSettings):
+    nwc_pairing_url: Optional[str] = Field(default=None)
+
+
+class BreezSdkFundingSource(LNbitsSettings):
+    breez_api_key: Optional[str] = Field(default=None)
+    breez_greenlight_seed: Optional[str] = Field(default=None)
+    breez_greenlight_invite_code: Optional[str] = Field(default=None)
+    breez_greenlight_device_key: Optional[str] = Field(default=None)
+    breez_greenlight_device_cert: Optional[str] = Field(default=None)
+
+
+class BoltzFundingSource(LNbitsSettings):
+    boltz_client_endpoint: Optional[str] = Field(default="127.0.0.1:9002")
+    boltz_client_macaroon: Optional[str] = Field(default=None)
+    boltz_client_wallet: Optional[str] = Field(default="lnbits")
+    boltz_client_cert: Optional[str] = Field(default=None)
+
+
 class LightningSettings(LNbitsSettings):
    lightning_invoice_expiry: int = Field(default=3600)

@@ -251,18 +396,23 @@ class FundingSourcesSettings(
    LndRestFundingSource,
    LndGrpcFundingSource,
    LnPayFundingSource,
+    BlinkFundingSource,
    AlbyFundingSource,
+    BoltzFundingSource,
    ZBDFundingSource,
+    PhoenixdFundingSource,
    OpenNodeFundingSource,
    SparkFundingSource,
    LnTipsFundingSource,
+    NWCFundingSource,
+    BreezSdkFundingSource,
 ):
    lnbits_backend_wallet_class: str = Field(default="VoidWallet")


 class WebPushSettings(LNbitsSettings):
-    lnbits_webpush_pubkey: str = Field(default=None)
-    lnbits_webpush_privkey: str = Field(default=None)
+    lnbits_webpush_pubkey: Optional[str] = Field(default=None)
+    lnbits_webpush_privkey: Optional[str] = Field(default=None)


 class NodeUISettings(LNbitsSettings):
@@ -278,25 +428,46 @@ class NodeUISettings(LNbitsSettings):
 class AuthMethods(Enum):
    user_id_only = "user-id-only"
    username_and_password = "username-password"
+    nostr_auth_nip98 = "nostr-auth-nip98"
    google_auth = "google-auth"
    github_auth = "github-auth"
    keycloak_auth = "keycloak-auth"

+    @classmethod
+    def all(cls):
+        return [
+            AuthMethods.user_id_only.value,
+            AuthMethods.username_and_password.value,
+            AuthMethods.nostr_auth_nip98.value,
+            AuthMethods.google_auth.value,
+            AuthMethods.github_auth.value,
+            AuthMethods.keycloak_auth.value,
+        ]
+

 class AuthSettings(LNbitsSettings):
    auth_token_expire_minutes: int = Field(default=525600)
    auth_all_methods = [a.value for a in AuthMethods]
-    auth_allowed_methods: List[str] = Field(
+    auth_allowed_methods: list[str] = Field(
        default=[
            AuthMethods.user_id_only.value,
            AuthMethods.username_and_password.value,
        ]
    )
+    # How many seconds after login the user is allowed to update its credentials.
+    # A fresh login is required afterwards.
+    auth_credetials_update_threshold: int = Field(default=120)

    def is_auth_method_allowed(self, method: AuthMethods):
        return method.value in self.auth_allowed_methods


+class NostrAuthSettings(LNbitsSettings):
+    nostr_absolute_request_urls: list[str] = Field(
+        default=["http://127.0.0.1:5000", "http://localhost:5000"]
+    )
+
+
 class GoogleAuthSettings(LNbitsSettings):
    google_client_id: str = Field(default="")
    google_client_secret: str = Field(default="")
@@ -324,6 +495,7 @@ class EditableSettings(
    WebPushSettings,
    NodeUISettings,
    AuthSettings,
+    NostrAuthSettings,
    GoogleAuthSettings,
    GitHubAuthSettings,
    KeycloakAuthSettings,
@@ -377,6 +549,7 @@ class EnvSettings(LNbitsSettings):
    log_retention: str = Field(default="3 months")
    server_startup_time: int = Field(default=time())
    cleanup_wallets_days: int = Field(default=90)
+    funding_source_max_retries: int = Field(default=4)

    @property
    def has_default_extension_path(self) -> bool:
@@ -395,21 +568,26 @@ class PersistenceSettings(LNbitsSettings):


 class SuperUserSettings(LNbitsSettings):
-    lnbits_allowed_funding_sources: List[str] = Field(
+    lnbits_allowed_funding_sources: list[str] = Field(
        default=[
-            "VoidWallet",
-            "FakeWallet",
-            "CoreLightningWallet",
-            "CoreLightningRestWallet",
-            "LndRestWallet",
-            "EclairWallet",
-            "LndWallet",
-            "LnTipsWallet",
-            "LNPayWallet",
            "AlbyWallet",
-            "ZBDWallet",
+            "BoltzWallet",
+            "BlinkWallet",
+            "BreezSdkWallet",
+            "CoreLightningRestWallet",
+            "CoreLightningWallet",
+            "EclairWallet",
+            "FakeWallet",
+            "LNPayWallet",
            "LNbitsWallet",
+            "LnTipsWallet",
+            "LndRestWallet",
+            "LndWallet",
            "OpenNodeWallet",
+            "PhoenixdWallet",
+            "VoidWallet",
+            "ZBDWallet",
+            "NWCWallet",
        ]
    )

@@ -422,6 +600,12 @@ class TransientSettings(InstalledExtensionsSettings):
    #  - are cleared on server restart
    first_install: bool = Field(default=False)

+    # Indicates that the server should continue to run.
+    # When set to false it indicates that the shutdown procedure is ongoing.
+    # If false no new tasks, threads, etc should be started.
+    # Long running while loops should use this flag instead of `while True:`
+    lnbits_running: bool = Field(default=True)
+
    @classmethod
    def readonly_fields(cls):
        return [f for f in inspect.signature(cls).parameters if not f.startswith("_")]
@@ -434,7 +618,7 @@ class ReadOnlySettings(
    PersistenceSettings,
    SuperUserSettings,
 ):
-    lnbits_admin_ui: bool = Field(default=False)
+    lnbits_admin_ui: bool = Field(default=True)

    @validator(
        "lnbits_allowed_funding_sources",
@@ -450,18 +634,13 @@ class ReadOnlySettings(


 class Settings(EditableSettings, ReadOnlySettings, TransientSettings, BaseSettings):
-    @classmethod
-    def from_row(cls, row: Row) -> "Settings":
-        data = dict(row)
-        return cls(**data)
-
    class Config:
        env_file = ".env"
        env_file_encoding = "utf-8"
        case_sensitive = False
        json_loads = list_parse_fallback

-    def is_user_allowed(self, user_id: str):
+    def is_user_allowed(self, user_id: str) -> bool:
        return (
            len(self.lnbits_allowed_users) == 0
            or user_id in self.lnbits_allowed_users
@@ -469,6 +648,15 @@ class Settings(EditableSettings, ReadOnlySettings, TransientSettings, BaseSettin
            or user_id == self.super_user
        )

+    def is_admin_user(self, user_id: str) -> bool:
+        return user_id in self.lnbits_admin_users or user_id == self.super_user
+
+    def is_admin_extension(self, ext_id: str) -> bool:
+        return ext_id in self.lnbits_admin_extensions
+
+    def is_extension_id(self, ext_id: str) -> bool:
+        return ext_id in self.lnbits_all_extensions_ids
+

 class SuperSettings(EditableSettings):
    super_user: str
@@ -476,7 +664,7 @@ class SuperSettings(EditableSettings):

 class AdminSettings(EditableSettings):
    is_super_user: bool
-    lnbits_allowed_funding_sources: Optional[List[str]]
+    lnbits_allowed_funding_sources: Optional[list[str]]


 def set_cli_settings(**kwargs):
@@ -505,7 +693,7 @@ def send_admin_user_to_saas():
            except Exception as e:
                logger.error(
                    "error sending super_user to saas:"
-                    f" {settings.lnbits_saas_callback}. Error: {str(e)}"
+                    f" {settings.lnbits_saas_callback}. Error: {e!s}"
                )


@@ -531,10 +719,10 @@ if not settings.lnbits_admin_ui:
        logger.debug(f"{key}: {value}")


-def get_wallet_class():
+def get_funding_source():
    """
    Backwards compatibility
    """
-    from lnbits.wallets import get_wallet_class
+    from lnbits.wallets import get_funding_source

-    return get_wallet_class()
+    return get_funding_source()
@@ -530,23 +530,26 @@ video {
  overflow-wrap: break-word;
 }

-.qrcode__wrapper canvas {
+.qrcode__wrapper {
  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.qrcode__wrapper canvas {
  width: 100% !important;
-  max-width: 100%;
-  max-height: 100%;
+  height: 100% !important;
+  max-width: 350px;
 }

 .qrcode__image {
+  position: absolute;
+  max-width: 52px;
  width: 15%;
-  height: 15%;
  overflow: hidden;
  background: #fff;
-  left: 50%;
  overflow: hidden;
-  position: absolute;
-  top: 50%;
-  transform: translate(-50%, -50%);
  padding: 0.2rem;
  border-radius: 0.2rem;
 }
@@ -554,3 +557,12 @@ video {
 .whitespace-pre-line {
  white-space: pre-line;
 }
+
+.q-carousel__slide {
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+
+.q-dialog__inner--minimized {
+  padding: 12px;
+}
@@ -9,6 +9,8 @@ window.localisation.br = {
  transactions: 'Transações',
  dashboard: 'Painel de Controle',
  node: 'Nó',
+  export_users: 'Exportar Usuários',
+  no_users: 'Nenhum usuário encontrado',
  total_capacity: 'Capacidade Total',
  avg_channel_size: 'Tamanho médio do canal',
  biggest_channel_size: 'Maior Tamanho de Canal',
@@ -33,7 +35,9 @@ window.localisation.br = {
  reset_defaults_tooltip:
    'Apagar todas as configurações e redefinir para os padrões.',
  download_backup: 'Fazer backup do banco de dados',
-  name_your_wallet: 'Nomeie sua carteira %{name}',
+  name_your_wallet: 'Nomeie sua carteira {name}',
+  wallet_topup_ok:
+    'Sucesso ao criar fundos virtuais ({amount} sats). Pagamentos dependem dos fundos reais na fonte de financiamento.',
  paste_invoice_label: 'Cole uma fatura, pedido de pagamento ou código lnurl *',
  lnbits_description:
    'Fácil de configurar e leve, o LNbits pode ser executado em qualquer fonte de financiamento da Lightning Network e até mesmo o LNbits em si! Você pode executar o LNbits para si mesmo ou oferecer facilmente uma solução de custódia para outros. Cada carteira tem suas próprias chaves de API e não há limite para o número de carteiras que você pode criar. Ser capaz de particionar fundos torna o LNbits uma ferramenta útil para gerenciamento de dinheiro e como uma ferramenta de desenvolvimento. As extensões adicionam funcionalidades extras ao LNbits para que você possa experimentar uma série de tecnologias de ponta na rede lightning. Nós tornamos o desenvolvimento de extensões o mais fácil possível e, como um projeto gratuito e de código aberto, incentivamos as pessoas a desenvolver e enviar as suas próprias.',
@@ -54,10 +58,9 @@ window.localisation.br = {
  donate: 'Doar',
  view_github: 'Ver no GitHub',
  voidwallet_active: 'VoidWallet está ativo! Pagamentos desabilitados',
-  use_with_caution: 'USE COM CAUTELA - a carteira %{name} ainda está em BETA',
-  service_fee: 'Taxa de serviço: %{amount} % por transação',
-  service_fee_max:
-    'Taxa de serviço: %{amount} % por transação (máx %{max} sats)',
+  use_with_caution: 'USE COM CAUTELA - a carteira {name} ainda está em BETA',
+  service_fee: 'Taxa de serviço: {amount} % por transação',
+  service_fee_max: 'Taxa de serviço: {amount} % por transação (máx {max} sats)',
  service_fee_tooltip:
    'Taxa de serviço cobrada pelo administrador do servidor LNbits por transação de saída',
  toggle_darkmode: 'Alternar modo escuro',
@@ -68,7 +71,7 @@ window.localisation.br = {
  lnbits_version: 'Versão do LNbits',
  runs_on: 'Executa em',
  credit_hint: 'Pressione Enter para creditar a conta',
-  credit_label: '%{denomination} para creditar',
+  credit_label: '{denomination} para creditar',
  paste: 'Colar',
  paste_from_clipboard: 'Cole do clipboard',
  paste_request: 'Colar Pedido',
@@ -99,6 +102,7 @@ window.localisation.br = {
    'Este é um código QR de retirada do LNURL para sugar tudo desta carteira. Não compartilhe com ninguém. É compatível com balanceCheck e balanceNotify para que sua carteira possa continuar retirando os fundos continuamente daqui após a primeira retirada.',
  i_understand: 'Eu entendo',
  copy_wallet_url: 'Copiar URL da carteira',
+  disclaimer_dialog_title: 'Importante!',
  disclaimer_dialog:
    'Funcionalidade de login a ser lançada em uma atualização futura, por enquanto, certifique-se de marcar esta página para acesso futuro à sua carteira! Este serviço está em BETA, e não nos responsabilizamos por pessoas que perderem o acesso aos fundos.',
  no_transactions: 'Ainda não foram feitas transações',
@@ -150,8 +154,8 @@ window.localisation.br = {
  expiry: 'Validade',
  webhook: 'Webhook',
  payment_proof: 'Comprovante de pagamento',
-  update_available: 'Atualização %{version} disponível!',
-  latest_update: 'Você está na versão mais recente %{version}.',
+  update_available: 'Atualização {version} disponível!',
+  latest_update: 'Você está na versão mais recente {version}.',
  notifications: 'Notificações',
  no_notifications: 'Sem notificações',
  notifications_disabled:
@@ -164,7 +168,7 @@ window.localisation.br = {
    'Se ativado, mudará sua fonte de fundos para VoidWallet automaticamente se o LNbits enviar um sinal de desativação. Você precisará ativar manualmente após uma atualização.',
  killswitch_interval: 'Intervalo do Killswitch',
  killswitch_interval_desc:
-    'Com que frequência a tarefa de fundo deve verificar o sinal de desativação do LNBits proveniente da fonte de status (em minutos).',
+    'Com que frequência a tarefa de fundo deve verificar o sinal de desativação do LNbits proveniente da fonte de status (em minutos).',
  enable_watchdog: 'Ativar Watchdog',
  enable_watchdog_desc:
    'Se ativado, ele mudará automaticamente sua fonte de financiamento para VoidWallet se o seu saldo for inferior ao saldo do LNbits. Você precisará ativar manualmente após uma atualização.',
@@ -241,5 +245,13 @@ window.localisation.br = {
  logout: 'Sair',
  look_and_feel: 'Aparência',
  language: 'Idioma',
-  color_scheme: 'Esquema de Cores'
+  color_scheme: 'Esquema de Cores',
+  extension_cost: 'Este lançamento requer um pagamento mínimo de {cost} sats.',
+  extension_paid_sats: 'Você já pagou {paid_sats} sats.',
+  release_details_error: 'Não é possível obter os detalhes da versão.',
+  pay_from_wallet: 'Pagar com a Carteira',
+  show_qr: 'Exibir QR',
+  retry_install: 'Repetir Instalação',
+  new_payment: 'Efetuar Novo Pagamento',
+  hide_empty_wallets: 'Ocultar carteiras vazias'
 }
@@ -9,6 +9,8 @@ window.localisation.cn = {
  transactions: '交易记录',
  dashboard: '控制面板',
  node: '节点',
+  export_users: '导出用户',
+  no_users: '未找到用户',
  total_capacity: '总容量',
  avg_channel_size: '平均频道大小',
  biggest_channel_size: '最大通道大小',
@@ -32,7 +34,9 @@ window.localisation.cn = {
  reset_defaults: '重置为默认设置',
  reset_defaults_tooltip: '删除所有设置并重置为默认设置',
  download_backup: '下载数据库备份',
-  name_your_wallet: '给你的 %{name}钱包起个名字',
+  name_your_wallet: '给你的 {name}钱包起个名字',
+  wallet_topup_ok:
+    '成功创建虚拟资金（{amount} sats）。付款取决于资金来源的实际资金。',
  paste_invoice_label: '粘贴发票，付款请求或lnurl*',
  lnbits_description:
    'LNbits 设置简单、轻量级，可以在任何闪电网络的资金来源上运行，甚至可以在LNbits自身上运行！您可以为自己运行LNbits，或者轻松为他人提供托管解决方案。每个钱包都有自己的 API 密钥，你可以创建的钱包数量没有限制。能够把资金分开管理使 LNbits 成为一款有用的资金管理和开发工具。扩展程序增加了 LNbits 的额外功能，所以你可以在闪电网络上尝试各种尖端技术。我们已经尽可能简化了开发扩展程序的过程，作为一个免费和开源的项目，我们鼓励人们开发并提交自己的扩展程序。',
@@ -52,9 +56,9 @@ window.localisation.cn = {
  donate: '捐献',
  view_github: '在GitHub上查看',
  voidwallet_active: 'VoidWallet 已激活！付款功能已禁用。',
-  use_with_caution: '请谨慎使用 - %{name}钱包还处于测试版阶段',
-  service_fee: '服务费：%{amount}% 每笔交易',
-  service_fee_max: '服务费：%{amount}% 每笔交易（最高 %{max} sats）',
+  use_with_caution: '请谨慎使用 - {name}钱包还处于测试版阶段',
+  service_fee: '服务费：{amount}% 每笔交易',
+  service_fee_max: '服务费：{amount}% 每笔交易（最高 {max} sats）',
  service_fee_tooltip: 'LNbits服务器管理员每笔外发交易收取的服务费',
  toggle_darkmode: '切换暗黑模式',
  payment_reactions: '支付反应',
@@ -64,7 +68,7 @@ window.localisation.cn = {
  lnbits_version: 'LNbits版本',
  runs_on: '可运行在',
  credit_hint: '按 Enter 键充值账户',
-  credit_label: '%{denomination} 充值',
+  credit_label: '{denomination} 充值',
  paste: '粘贴',
  paste_from_clipboard: '从剪贴板粘贴',
  paste_request: '粘贴请求',
@@ -95,6 +99,7 @@ window.localisation.cn = {
    '这是一个 LNURL-取款的二维码，用于从该钱包中提取全部资金。请不要与他人分享。它与 balanceCheck 和 balanceNotify 兼容，因此在第一次取款后，您的钱包还可能会持续从这里提取资金',
  i_understand: '我明白',
  copy_wallet_url: '复制钱包URL',
+  disclaimer_dialog_title: '重要！',
  disclaimer_dialog:
    '登录功能将在以后的更新中发布，请将此页面加为书签，以便将来访问您的钱包！此服务处于测试阶段，我们不对资金的丢失承担任何责任。',
  no_transactions: '尚未进行任何交易',
@@ -141,8 +146,8 @@ window.localisation.cn = {
  expiry: '过期时间',
  webhook: 'Webhook',
  payment_proof: '付款证明',
-  update_available: '更新%{version}可用！',
-  latest_update: '您当前使用的是最新版本%{version}。',
+  update_available: '更新{version}可用！',
+  latest_update: '您当前使用的是最新版本{version}。',
  notifications: '通知',
  no_notifications: '没有通知',
  notifications_disabled: 'LNbits状态通知已禁用。',
@@ -154,7 +159,7 @@ window.localisation.cn = {
    '如果启用，当LNbits发送终止信号时，系统将自动将您的资金来源更改为VoidWallet。更新后，您将需要手动启用。',
  killswitch_interval: 'Killswitch 间隔',
  killswitch_interval_desc:
-    '后台任务应该多久检查一次来自状态源的LNBits断路信号（以分钟为单位）。',
+    '后台任务应该多久检查一次来自状态源的LNbits断路信号（以分钟为单位）。',
  enable_watchdog: '启用看门狗',
  enable_watchdog_desc:
    '如果启用，当您的余额低于LNbits余额时，系统将自动将您的资金来源更改为VoidWallet。更新后您将需要手动启用。',
@@ -229,5 +234,13 @@ window.localisation.cn = {
  logout: '注销',
  look_and_feel: '外观和感觉',
  language: '语言',
-  color_scheme: '配色方案'
+  color_scheme: '配色方案',
+  extension_cost: '此版本需要支付最低 {cost} sats。',
+  extension_paid_sats: '您已经支付了{paid_sats} sats。',
+  release_details_error: '无法获取发布详情。',
+  pay_from_wallet: '从钱包支付',
+  show_qr: '显示QR码',
+  retry_install: '重试安装',
+  new_payment: '创建新支付',
+  hide_empty_wallets: '隐藏空钱包'
 }
@@ -9,6 +9,8 @@ window.localisation.cs = {
  transactions: 'Transakce',
  dashboard: 'Přehled',
  node: 'Uzel',
+  export_users: 'Exportovat uživatele',
+  no_users: 'Nebyli nalezeni žádní uživatelé',
  total_capacity: 'Celková kapacita',
  avg_channel_size: 'Průmerná velikost kanálu',
  biggest_channel_size: 'Největší velikost kanálu',
@@ -32,7 +34,9 @@ window.localisation.cs = {
  reset_defaults: 'Obnovit výchozí',
  reset_defaults_tooltip: 'Smazat všechna nastavení a obnovit výchozí.',
  download_backup: 'Stáhnout zálohu databáze',
-  name_your_wallet: 'Pojmenujte svou %{name} peněženku',
+  name_your_wallet: 'Pojmenujte svou {name} peněženku',
+  wallet_topup_ok:
+    'Úspěšně vytvořeny virtuální prostředky ({amount} sats). Platby závisí na skutečných prostředcích na zdrojovém účtu.',
  paste_invoice_label: 'Vložte fakturu, platební požadavek nebo lnurl kód *',
  lnbits_description:
    'Snadno nastavitelný a lehkotonážní, LNbits může běžet na jakémkoliv zdroji financování Lightning Network a dokonce LNbits samotné! LNbits můžete provozovat pro sebe, nebo snadno nabízet správu peněženek pro ostatní. Každá peněženka má své vlastní API klíče a není omezen počet peněženek, které můžete vytvořit. Možnost rozdělení prostředků dělá z LNbits užitečný nástroj pro správu peněz a jako vývojový nástroj. Rozšíření přidávají extra funkčnost k LNbits, takže můžete experimentovat s řadou špičkových technologií na lightning network. Vývoj rozšíření jsme učinili co nejjednodušší a jako svobodný a open-source projekt podporujeme lidi ve vývoji a zasílání vlastních rozšíření.',
@@ -54,10 +58,10 @@ window.localisation.cs = {
  view_github: 'Zobrazit na GitHubu',
  voidwallet_active: 'VoidWallet je aktivní! Platby zakázány',
  use_with_caution:
-    'POUŽÍVEJTE S OBEZŘETNOSTÍ - %{name} peněženka je stále v BETĚ',
-  service_fee: 'Servisný poplatek: %{amount} % za transakci',
+    'POUŽÍVEJTE S OBEZŘETNOSTÍ - {name} peněženka je stále v BETĚ',
+  service_fee: 'Servisný poplatek: {amount} % za transakci',
  service_fee_max:
-    'Servisný poplatek: %{amount} % za transakci (max %{max} satoshi)',
+    'Servisný poplatek: {amount} % za transakci (max {max} satoshi)',
  service_fee_tooltip:
    'Servisní poplatek účtovaný správcem LNbits serveru za odchozí transakci',
  toggle_darkmode: 'Přepnout tmavý režim',
@@ -68,7 +72,7 @@ window.localisation.cs = {
  lnbits_version: 'Verze LNbits',
  runs_on: 'Běží na',
  credit_hint: 'Stiskněte Enter pro připsání na účet',
-  credit_label: '%{denomination} k připsání',
+  credit_label: '{denomination} k připsání',
  paste: 'Vložit',
  paste_from_clipboard: 'Vložit ze schránky',
  paste_request: 'Vložit požadavek',
@@ -99,6 +103,7 @@ window.localisation.cs = {
    'Toto je LNURL-withdraw QR kód pro vyčerpání všeho z této peněženky. Nesdílejte s nikým. Je kompatibilní s balanceCheck a balanceNotify, takže vaše peněženka může kontinuálně čerpat prostředky odsud po prvním výběru.',
  i_understand: 'Rozumím',
  copy_wallet_url: 'Kopírovat URL peněženky',
+  disclaimer_dialog_title: 'Důležité!',
  disclaimer_dialog:
    'Funkcionalita přihlášení bude vydána v budoucí aktualizaci, zatím si ujistěte, že jste si tuto stránku uložili do záložek pro budoucí přístup k vaší peněžence! Tato služba je v BETA verzi a nepřebíráme žádnou zodpovědnost za ztrátu přístupu k prostředkům.',
  no_transactions: 'Zatím žádné transakce',
@@ -148,8 +153,8 @@ window.localisation.cs = {
  expiry: 'Expirace',
  webhook: 'Webhook',
  payment_proof: 'Důkaz platby',
-  update_available: 'Dostupná aktualizace %{version}!',
-  latest_update: 'Máte nejnovější verzi %{version}.',
+  update_available: 'Dostupná aktualizace {version}!',
+  latest_update: 'Máte nejnovější verzi {version}.',
  notifications: 'Notifikace',
  no_notifications: 'Žádné notifikace',
  notifications_disabled: 'Notifikace stavu LNbits jsou zakázány.',
@@ -161,7 +166,7 @@ window.localisation.cs = {
    'Pokud je povoleno, automaticky změní zdroj financování na VoidWallet pokud LNbits odešle signál killswitch. Po aktualizaci budete muset povolit ručně.',
  killswitch_interval: 'Interval Killswitch',
  killswitch_interval_desc:
-    'Jak často by měl úkol na pozadí kontrolovat signál killswitch od LNBits ze zdroje stavu (v minutách).',
+    'Jak často by měl úkol na pozadí kontrolovat signál killswitch od LNbits ze zdroje stavu (v minutách).',
  enable_watchdog: 'Povolit Watchdog',
  enable_watchdog_desc:
    'Pokud je povoleno, automaticky změní zdroj financování na VoidWallet pokud je váš zůstatek nižší než zůstatek LNbits. Po aktualizaci budete muset povolit ručně.',
@@ -238,5 +243,13 @@ window.localisation.cs = {
  logout: 'Odhlásit se',
  look_and_feel: 'Vzhled a chování',
  language: 'Jazyk',
-  color_scheme: 'Barevné schéma'
+  color_scheme: 'Barevné schéma',
+  extension_cost: 'Toto vydání vyžaduje minimální platbu {cost} satoshi.',
+  extension_paid_sats: 'Již jste zaplatili {paid_sats} sats.',
+  release_details_error: 'Nelze získat podrobnosti o vydání.',
+  pay_from_wallet: 'Platit z peněženky',
+  show_qr: 'Zobrazit QR',
+  retry_install: 'Zkusit znovu nainstalovat',
+  new_payment: 'Vytvořit novou platbu',
+  hide_empty_wallets: 'Skrýt prázdné peněženky'
 }
@@ -9,6 +9,8 @@ window.localisation.de = {
  transactions: 'Transaktionen',
  dashboard: 'Armaturenbrett',
  node: 'Knoten',
+  export_users: 'Benutzer exportieren',
+  no_users: 'Keine Benutzer gefunden',
  total_capacity: 'Gesamtkapazität',
  avg_channel_size: 'Durchschn. Kanalgröße',
  biggest_channel_size: 'Größte Kanalgröße',
@@ -33,7 +35,9 @@ window.localisation.de = {
  reset_defaults_tooltip:
    'Alle Einstellungen auf die Standardeinstellungen zurücksetzen.',
  download_backup: 'Datenbank-Backup herunterladen',
-  name_your_wallet: 'Vergib deiner %{name} Wallet einen Namen',
+  name_your_wallet: 'Vergib deiner {name} Wallet einen Namen',
+  wallet_topup_ok:
+    'Erfolg beim Erstellen von virtuellen Mitteln ({amount} Satoshis). Zahlungen hängen von den tatsächlichen Mitteln der Finanzierungsquelle ab.',
  paste_invoice_label:
    'Füge eine Rechnung, Zahlungsanforderung oder LNURL ein *',
  lnbits_description:
@@ -55,11 +59,9 @@ window.localisation.de = {
  donate: 'Spenden',
  view_github: 'Auf GitHub anzeigen',
  voidwallet_active: 'VoidWallet ist aktiv! Zahlungen deaktiviert',
-  use_with_caution:
-    'BITTE MIT VORSICHT BENUTZEN - %{name} Wallet ist noch BETA',
-  service_fee: 'Dienstleistungsgebühr: %{amount} % pro Transaktion',
-  service_fee_max:
-    'Servicegebühr: %{amount} % pro Transaktion (max %{max} Sats)',
+  use_with_caution: 'BITTE MIT VORSICHT BENUTZEN - {name} Wallet ist noch BETA',
+  service_fee: 'Dienstleistungsgebühr: {amount} % pro Transaktion',
+  service_fee_max: 'Servicegebühr: {amount} % pro Transaktion (max {max} Sats)',
  service_fee_tooltip:
    'Bearbeitungsgebühr, die vom LNbits Server-Administrator pro ausgehender Transaktion berechnet wird',
  toggle_darkmode: 'Auf Dark Mode umschalten',
@@ -70,7 +72,7 @@ window.localisation.de = {
  lnbits_version: 'LNbits-Version',
  runs_on: 'Läuft auf',
  credit_hint: 'Klicke Enter, um das Konto zu belasten',
-  credit_label: '%{denomination} zu belasten',
+  credit_label: '{denomination} zu belasten',
  paste: 'Einfügen',
  paste_from_clipboard: 'Einfügen aus der Zwischenablage',
  paste_request: 'Anfrage einfügen',
@@ -102,6 +104,7 @@ window.localisation.de = {
    'LNURL-withdraw QR-Code, der das Abziehen aller Geldmittel aus dieser Wallet erlaubt. Teile ihn mit niemandem! Kompatibel mit balanceCheck und balanceNotify, so dass dein Wallet die Sats nach dem ersten Abzug kontinuierlich von hier abziehen kann.',
  i_understand: 'Ich verstehe',
  copy_wallet_url: 'Wallet-URL kopieren',
+  disclaimer_dialog_title: 'Wichtig!',
  disclaimer_dialog:
    'Login-Funktionalität wird in einem zukünftigen Update veröffentlicht. Bis dahin ist die Speicherung der Wallet-URL als Lesezeichen absolut notwendig, um Zugriff auf die Wallet zu erhalten! Dieser Service ist in BETA und wir übernehmen keine Verantwortung für Verluste durch verlorene Zugriffe.',
  no_transactions: 'Keine Transaktionen',
@@ -153,8 +156,8 @@ window.localisation.de = {
  expiry: 'Ablauf',
  webhook: 'Webhook',
  payment_proof: 'Beleg',
-  update_available: 'Aktualisierung %{version} verfügbar!',
-  latest_update: 'Sie sind auf der neuesten Version %{version}.',
+  update_available: 'Aktualisierung {version} verfügbar!',
+  latest_update: 'Sie sind auf der neuesten Version {version}.',
  notifications: 'Benachrichtigungen',
  no_notifications: 'Keine Benachrichtigungen',
  notifications_disabled: 'LNbits Statusbenachrichtigungen sind deaktiviert.',
@@ -166,7 +169,7 @@ window.localisation.de = {
    'Falls aktiviert, wird Ihre Zahlungsquelle automatisch auf VoidWallet umgestellt, wenn LNbits ein Killswitch-Signal sendet. Nach einem Update müssen Sie dies manuell wieder aktivieren.',
  killswitch_interval: 'Intervall für den Notausschalter',
  killswitch_interval_desc:
-    'Wie oft die Hintergrundaufgabe nach dem LNBits-Killswitch-Signal aus der Statusquelle suchen soll (in Minuten).',
+    'Wie oft die Hintergrundaufgabe nach dem LNbits-Killswitch-Signal aus der Statusquelle suchen soll (in Minuten).',
  enable_watchdog: 'Aktiviere Watchdog',
  enable_watchdog_desc:
    'Wenn aktiviert, wird Ihre Zahlungsquelle automatisch auf VoidWallet umgestellt, wenn Ihr Guthaben niedriger als das LNbits-Guthaben ist. Nach einem Update müssen Sie dies manuell aktivieren.',
@@ -245,5 +248,14 @@ window.localisation.de = {
  logout: 'Abmelden',
  look_and_feel: 'Aussehen und Verhalten',
  language: 'Sprache',
-  color_scheme: 'Farbschema'
+  color_scheme: 'Farbschema',
+  extension_cost:
+    'Diese Version erfordert eine Zahlung von mindestens {cost} Sats.',
+  extension_paid_sats: 'Sie haben bereits {paid_sats} Sats bezahlt.',
+  release_details_error: 'Kann die Details zur Veröffentlichung nicht abrufen.',
+  pay_from_wallet: 'Zahlen aus dem Geldbeutel',
+  show_qr: 'QR anzeigen',
+  retry_install: 'Installieren erneut versuchen',
+  new_payment: 'Neue Zahlung vornehmen',
+  hide_empty_wallets: 'Leere Geldbörsen verbergen'
 }
@@ -9,6 +9,8 @@ window.localisation.en = {
  transactions: 'Transactions',
  dashboard: 'Dashboard',
  node: 'Node',
+  export_users: 'Export Users',
+  no_users: 'No users found',
  total_capacity: 'Total Capacity',
  avg_channel_size: 'Avg. Channel Size',
  biggest_channel_size: 'Biggest Channel Size',
@@ -32,7 +34,9 @@ window.localisation.en = {
  reset_defaults: 'Reset to defaults',
  reset_defaults_tooltip: 'Delete all settings and reset to defaults.',
  download_backup: 'Download database backup',
-  name_your_wallet: 'Name your %{name} wallet',
+  name_your_wallet: 'Name your {name} wallet',
+  wallet_topup_ok:
+    'Success creating virtual funds ({amount} sats). Payments depend on actual funds on funding source.',
  paste_invoice_label: 'Paste an invoice, payment request or lnurl code *',
  lnbits_description:
    'Easy to set up and lightweight, LNbits can run on any Lightning Network funding source and even LNbits itself! You can run LNbits for yourself, or easily offer a custodian solution for others. Each wallet has its own API keys and there is no limit to the number of wallets you can make. Being able to partition funds makes LNbits a useful tool for money management and as a development tool. Extensions add extra functionality to LNbits so you can experiment with a range of cutting-edge technologies on the lightning network. We have made developing extensions as easy as possible, and as a free and open-source project, we encourage people to develop and submit their own.',
@@ -53,9 +57,9 @@ window.localisation.en = {
  donate: 'Donate',
  view_github: 'View on GitHub',
  voidwallet_active: 'VoidWallet is active! Payments disabled',
-  use_with_caution: 'USE WITH CAUTION - %{name} wallet is still in BETA',
-  service_fee: 'Service fee: %{amount} % per transaction',
-  service_fee_max: 'Service fee: %{amount} % per transaction (max %{max} sats)',
+  use_with_caution: 'USE WITH CAUTION - {name} wallet is still in BETA',
+  service_fee: 'Service fee: {amount} % per transaction',
+  service_fee_max: 'Service fee: {amount} % per transaction (max {max} sats)',
  service_fee_tooltip:
    'Service fee charged by the LNbits server admin per outgoing transaction',
  toggle_darkmode: 'Toggle Dark Mode',
@@ -66,7 +70,7 @@ window.localisation.en = {
  lnbits_version: 'LNbits version',
  runs_on: 'Runs on',
  credit_hint: 'Press Enter to credit account',
-  credit_label: '%{denomination} to credit',
+  credit_label: '{denomination} to credit',
  paste: 'Paste',
  paste_from_clipboard: 'Paste from clipboard',
  paste_request: 'Paste Request',
@@ -98,11 +102,8 @@ window.localisation.en = {
  i_understand: 'I understand',
  copy_wallet_url: 'Copy wallet URL',
  disclaimer_dialog_title: 'Important!',
-  disclaimer_dialog: `You *must* save your  login credentials to be able to access your wallet again.If you lose them, you will lose access to your wallet and funds.
-
-Find your  login credentials on your account settings page.
-
-This service is in BETA. LNbits holds no responsibility for loss of access to funds.`,
+  disclaimer_dialog:
+    'You *must* save your  login credentials to be able to access your wallet again. If you lose them, you will lose access to your wallet and funds.\n\nFind your  login credentials on your account settings page.\n\nThis service is in BETA. LNbits holds no responsibility for loss of access to funds.',
  no_transactions: 'No transactions made yet',
  manage: 'Manage',
  extensions: 'Extensions',
@@ -117,6 +118,7 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
  uninstall: 'Uninstall',
  drop_db: 'Remove Data',
  enable: 'Enable',
+  pay_to_enable: 'Pay To Enable',
  enable_extension_details: 'Enable extension for current user',
  disable: 'Disable',
  installed: 'Installed',
@@ -143,14 +145,15 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
  payment_hash: 'Payment Hash',
  fee: 'Fee',
  amount: 'Amount',
+  amount_sats: 'Amount (sats)',
  tag: 'Tag',
  unit: 'Unit',
  description: 'Description',
  expiry: 'Expiry',
  webhook: 'Webhook',
  payment_proof: 'Payment Proof',
-  update_available: 'Update %{version} available!',
-  latest_update: 'You are on the latest version %{version}.',
+  update_available: 'Update {version} available!',
+  latest_update: 'You are on the latest version {version}.',
  notifications: 'Notifications',
  no_notifications: 'No notifications',
  notifications_disabled: 'LNbits status notifications are disabled.',
@@ -162,7 +165,7 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
    'If enabled it will change your funding source to VoidWallet automatically if LNbits sends out a killswitch signal. You will need to enable manually after an update.',
  killswitch_interval: 'Killswitch Interval',
  killswitch_interval_desc:
-    'How often the background task should check for the LNBits killswitch signal from the status source (in minutes).',
+    'How often the background task should check for the LNbits killswitch signal from the status source (in minutes).',
  enable_watchdog: 'Enable Watchdog',
  enable_watchdog_desc:
    'If enabled it will change your funding source to VoidWallet automatically if your balance is lower than the LNbits balance. You will need to enable manually after an update.',
@@ -191,7 +194,7 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
  rate_limiter: 'Rate Limiter',
  wallet_limiter: 'Wallet Limiter',
  wallet_limit_max_withdraw_per_day:
-    'Max daily wallet withdrawal in sats (0 to disable)',
+    'Max daily wallet withdrawal in sats (0 for no limit, -1 to block withdrawal)',
  wallet_max_ballance: 'Wallet max balance in sats (0 to disable)',
  wallet_limit_secs_between_trans:
    'Min secs between transactions per wallet (0 to disable)',
@@ -211,6 +214,7 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
  login_to_account: 'Login to your account',
  create_account: 'Create account',
  account_settings: 'Account Settings',
+  signin_with_nostr: 'Continue with Nostr',
  signin_with_google: 'Sign in with Google',
  signin_with_github: 'Sign in with GitHub',
  signin_with_keycloak: 'Sign in with Keycloak',
@@ -219,11 +223,14 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
  password_config: 'Password Config',
  password_repeat: 'Password repeat',
  change_password: 'Change Password',
+  update_credentials: 'Update Credentials',
+  update_pubkey: 'Update Public Key',
  set_password: 'Set Password',
  invalid_password: 'Password must have at least 8 characters',
  login: 'Login',
  register: 'Register',
  username: 'Username',
+  pubkey: 'Public Key',
  user_id: 'User ID',
  email: 'Email',
  first_name: 'First Name',
@@ -238,13 +245,28 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
  back: 'Back',
  logout: 'Logout',
  look_and_feel: 'Look and Feel',
+  toggle_gradient: 'Toggle Gradient',
+  gradient_background: 'Gradient Background',
  language: 'Language',
  color_scheme: 'Color Scheme',
-  extension_cost: 'This release requires a payment of minimum %{cost} sats.',
-  extension_paid_sats: 'You have already paid %{paid_sats} sats.',
+  extension_cost: 'This release requires a payment of minimum {cost} sats.',
+  extension_paid_sats: 'You have already paid {paid_sats} sats.',
  release_details_error: 'Cannot get the release details.',
  pay_from_wallet: 'Pay from Wallet',
+  wallet_required: 'Wallet *',
  show_qr: 'Show QR',
  retry_install: 'Retry Install',
-  new_payment: 'Make New Payment'
+  new_payment: 'Make New Payment',
+  update_payment: 'Update Payment',
+  already_paid_question: 'Have you already paid?',
+  sell: 'Sell',
+  sell_require: 'Ask payment to enable extension',
+  sell_info:
+    'The {name} extension requires a payment of minimum {amount} sats to enable.',
+  hide_empty_wallets: 'Hide empty wallets',
+  recheck: 'Recheck',
+  contributors: 'Contributors',
+  license: 'License',
+  reset_key: 'Reset Key',
+  reset_password: 'Reset Password'
 }
@@ -9,6 +9,8 @@ window.localisation.es = {
  transactions: 'Transacciones',
  dashboard: 'Tablero de instrumentos',
  node: 'Nodo',
+  export_users: 'Exportar Usuarios',
+  no_users: 'No se encontraron usuarios',
  total_capacity: 'Capacidad Total',
  avg_channel_size: 'Tamaño Medio del Canal',
  biggest_channel_size: 'Tamaño del Canal Más Grande',
@@ -33,7 +35,9 @@ window.localisation.es = {
  reset_defaults_tooltip:
    'Borrar todas las configuraciones y restablecer a los valores predeterminados.',
  download_backup: 'Descargar copia de seguridad de la base de datos',
-  name_your_wallet: 'Nombre de su billetera %{name}',
+  name_your_wallet: 'Nombre de su billetera {name}',
+  wallet_topup_ok:
+    'Éxito creando fondos virtuales ({amount} sats). Los pagos dependen de los fondos reales en la fuente de financiación.',
  paste_invoice_label: 'Pegue la factura aquí',
  lnbits_description:
    'Fácil de instalar y liviano, LNbits puede ejecutarse en cualquier fuente de financiación de la red Lightning y hasta LNbits mismo! Puede ejecutar LNbits para usted mismo o ofrecer una solución competente a otros. Cada billetera tiene su propia clave API y no hay límite para la cantidad de billeteras que puede crear. La capacidad de particionar fondos hace de LNbits una herramienta útil para la administración de fondos y como herramienta de desarrollo. Las extensiones agregan funcionalidad adicional a LNbits, por lo que puede experimentar con una variedad de tecnologías de vanguardia en la red Lightning. Lo hemos hecho lo más simple posible para desarrollar extensiones y, como un proyecto gratuito y de código abierto, animamos a las personas a que se desarrollen a sí mismas y envíen sus propios contribuciones.',
@@ -54,10 +58,10 @@ window.localisation.es = {
  donate: 'Donar',
  view_github: 'Ver en GitHub',
  voidwallet_active: '¡VoidWallet está activo! Pagos desactivados',
-  use_with_caution: 'USAR CON CUIDADO - %{name} Wallet aún está en BETA',
-  service_fee: 'Tarifa de servicio: %{amount} % por transacción',
+  use_with_caution: 'USAR CON CUIDADO - {name} Wallet aún está en BETA',
+  service_fee: 'Tarifa de servicio: {amount} % por transacción',
  service_fee_max:
-    'Tarifa de servicio: %{amount} % por transacción (máx %{max} sats)',
+    'Tarifa de servicio: {amount} % por transacción (máx {max} sats)',
  service_fee_tooltip:
    'Comisión de servicio cobrada por el administrador del servidor LNbits por cada transacción saliente',
  toggle_darkmode: 'Cambiar modo oscuro',
@@ -68,7 +72,7 @@ window.localisation.es = {
  lnbits_version: 'Versión de LNbits',
  runs_on: 'Corre en',
  credit_hint: 'Presione Enter para cargar la cuenta',
-  credit_label: 'Cargar %{denomination}',
+  credit_label: 'Cargar {denomination}',
  paste: 'Pegar',
  paste_from_clipboard: 'Pegar desde el portapapeles',
  paste_request: 'Pegar solicitud',
@@ -99,6 +103,7 @@ window.localisation.es = {
    'Este es un código QR LNURL-withdraw para drenar todos los fondos de esta billetera. No lo comparta con nadie. Es compatible con balanceCheck y balanceNotify, por lo que su billetera puede continuar drenando los fondos de aquí después del primer drenaje.',
  i_understand: 'Lo entiendo',
  copy_wallet_url: 'Copiar URL de billetera',
+  disclaimer_dialog_title: '¡Importante!',
  disclaimer_dialog:
    'La funcionalidad de inicio de sesión se lanzará en una actualización futura, por ahora, asegúrese de guardar esta página como marcador para acceder a su billetera en el futuro. Este servicio está en BETA y no asumimos ninguna responsabilidad por personas que pierdan el acceso a sus fondos.',
  no_transactions: 'No hay transacciones todavía',
@@ -150,8 +155,8 @@ window.localisation.es = {
  expiry: 'Expiración',
  webhook: 'Webhook',
  payment_proof: 'Prueba de pago',
-  update_available: '¡Actualización %{version} disponible!',
-  latest_update: 'Usted está en la última versión %{version}.',
+  update_available: '¡Actualización {version} disponible!',
+  latest_update: 'Usted está en la última versión {version}.',
  notifications: 'Notificaciones',
  no_notifications: 'No hay notificaciones',
  notifications_disabled:
@@ -164,7 +169,7 @@ window.localisation.es = {
    'Si está activado, cambiará automáticamente su fuente de financiamiento a VoidWallet si LNbits envía una señal de parada de emergencia. Necesitará activarlo manualmente después de una actualización.',
  killswitch_interval: 'Intervalo de Killswitch',
  killswitch_interval_desc:
-    'Con qué frecuencia la tarea en segundo plano debe verificar la señal de interruptor de emergencia de LNBits desde la fuente de estado (en minutos).',
+    'Con qué frecuencia la tarea en segundo plano debe verificar la señal de interruptor de emergencia de LNbits desde la fuente de estado (en minutos).',
  enable_watchdog: 'Activar Watchdog',
  enable_watchdog_desc:
    'Si está activado, cambiará automáticamente su fuente de financiamiento a VoidWallet si su saldo es inferior al saldo de LNbits. Tendrá que activarlo manualmente después de una actualización.',
@@ -243,5 +248,13 @@ window.localisation.es = {
  logout: 'Cerrar sesión',
  look_and_feel: 'Apariencia',
  language: 'Idioma',
-  color_scheme: 'Esquema de colores'
+  color_scheme: 'Esquema de colores',
+  extension_cost: 'Esta versión requiere un pago mínimo de {cost} sats.',
+  extension_paid_sats: 'Ya has pagado {paid_sats} sats.',
+  release_details_error: 'No se pueden obtener los detalles de la versión.',
+  pay_from_wallet: 'Pagar desde la billetera',
+  show_qr: 'Mostrar QR',
+  retry_install: 'Reintentar Instalación',
+  new_payment: 'Realizar nuevo pago',
+  hide_empty_wallets: 'Ocultar billeteras vacías'
 }
@@ -9,6 +9,8 @@ window.localisation.fi = {
  transactions: 'Tapahtumat',
  dashboard: 'Ohjauspaneeli',
  node: 'Solmu',
+  export_users: 'Vie käyttäjät',
+  no_users: 'Käyttäjiä ei löytynyt',
  total_capacity: 'Kokonaiskapasiteetti',
  avg_channel_size: 'Keskimääräisen kanavan kapasiteetti',
  biggest_channel_size: 'Suurimman kanavan kapasiteetti',
@@ -33,7 +35,9 @@ window.localisation.fi = {
  reset_defaults_tooltip:
    'Poista kaikki asetusten muutokset ja palauta järjestelmän oletusasetukset.',
  download_backup: 'Lataa tietokannan varmuuskopio',
-  name_your_wallet: 'Anna %{name}-lompakollesi nimi',
+  name_your_wallet: 'Anna {name}-lompakollesi nimi',
+  wallet_topup_ok:
+    'Virtuaalisten varojen luominen onnistui ({amount} sats). Maksut riippuvat rahoituslähteen todellisista varoista.',
  paste_invoice_label:
    'Liitä lasku, maksupyyntö, lnurl-koodi tai Lightning Address *',
  lnbits_description:
@@ -57,21 +61,20 @@ window.localisation.fi = {
  voidwallet_active:
    'Maksutapahtumat ovat poissa käytöstä, koska VoidWallet on aktiivinen!',
  use_with_caution:
-    'KÄYTÄ VAROEN - BETA-ohjelmisto on käytössä palvelussa: %{name}',
-  service_fee: 'Palvelumaksu: %{amount} % tapahtumasta',
-  service_fee_max:
-    'Palvelumaksu: %{amount} % tapahtumasta (enintään %{max} sat)',
+    'KÄYTÄ VAROEN - BETA-ohjelmisto on käytössä palvelussa: {name}',
+  service_fee: 'Palvelumaksu: {amount} % tapahtumasta',
+  service_fee_max: 'Palvelumaksu: {amount} % tapahtumasta (enintään {max} sat)',
  service_fee_tooltip:
-    'LNBits palvelimen ylläpitäjä veloittaa lähtevästä maksusta palvelumaksun.',
+    'LNbits palvelimen ylläpitäjä veloittaa lähtevästä maksusta palvelumaksun.',
  toggle_darkmode: 'Tumma näkymä',
-  toggle_reactions: 'Käytä tapahtuma efektejä',
+  payment_reactions: 'Maksureaktiot',
  view_swagger_docs: 'Näytä LNbits Swagger API-dokumentit',
  api_docs: 'API-dokumentaatio',
  api_keys_api_docs: 'Solmun URL, API-avaimet ja -dokumentaatio',
  lnbits_version: 'LNbits versio',
  runs_on: 'Mukana menossa',
  credit_hint: 'Hyväksy painamalla Enter',
-  credit_label: 'Lisää tilille varoja %{denomination}',
+  credit_label: 'Lisää tilille varoja {denomination}',
  paste: 'Liitä',
  paste_from_clipboard: 'Liitä leikepöydältä',
  paste_request: 'Liitä pyyntö',
@@ -102,6 +105,7 @@ window.localisation.fi = {
    'Tämä LNURL-withdraw -tyyppinen QR-koodi on tarkoitettu kaikkien varojen imurointiin lompakosta. ÄLÄ JAA SITÄ KENELLEKÄÄN! Se on balanceCheck- ja balanceNotify-toimintojen kanssa yhteensopiva, joten sitä voi käyttää lompakon tyhjentämiseen ensimmäisen käytön jälleen jatkuvasti.',
  i_understand: 'Vakuutan ymmärtäväni',
  copy_wallet_url: 'Kopioi lompakon URL',
+  disclaimer_dialog_title: 'Tärkeää!',
  disclaimer_dialog:
    'Muistathan tallettaa kirjautumistietosi turvallisesta ja helposti saataville, jotta pääset jatkossakin kirjautumaan lompakkoosi! Tutustu myös Tilin asetukset -sivuun. Tämä palvelu on kokeiluvaiheessa (eli BETA), ja niinpä kukaan ei ota mitään vastuuta varojen säilymisestä tai niiden käytettävyyden takaamisesta.',
  no_transactions: 'Lompakossa ei ole yhtään tapahtumaa',
@@ -150,9 +154,9 @@ window.localisation.fi = {
  expiry: 'Vanheneminen',
  webhook: 'Webhook',
  payment_proof: 'Maksun varmenne',
-  update_available: 'Saatavilla on päivitys versioon %{version}!',
+  update_available: 'Saatavilla on päivitys versioon {version}!',
  latest_update:
-    'Käytössä oleva versio %{version}, on viimeisin saatavilla oleva.',
+    'Käytössä oleva versio {version}, on viimeisin saatavilla oleva.',
  notifications: 'Tiedotteet',
  no_notifications: 'Ei tiedotteita',
  notifications_disabled: 'LNbits-tilatiedotteet on poistettu käytöstä.',
@@ -241,5 +245,13 @@ window.localisation.fi = {
  logout: 'Poistu',
  look_and_feel: 'Kieli ja värit',
  language: 'Kieli',
-  color_scheme: 'Väriteema'
+  color_scheme: 'Väriteema',
+  extension_cost: 'Tämä julkaisu edellyttää vähintään {cost} satsin maksua.',
+  extension_paid_sats: 'Olet jo maksanut {paid_sats} satsia.',
+  release_details_error: 'Ei voi hakea julkaisun tietoja.',
+  pay_from_wallet: 'Maksa lompakosta',
+  show_qr: 'Näytä QR',
+  retry_install: 'Yritä asennusta uudelleen',
+  new_payment: 'Tee uusi maksu',
+  hide_empty_wallets: 'Piilota tyhjät lompakot'
 }
--- a/Show More
+++ b/Show More