chore: update to v1.0.0-rc2 (#2705)

---------

Co-authored-by: dni ⚡ <office@dnilabs.com>

.dockerignore

@@ -3,6 +3,7 @@ data
 docker
 docs
 tests
+node_modules
 
 lnbits/static/css/*
 lnbits/static/bundle.js

.env.example

@@ -28,7 +28,7 @@ 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, PhoenixdWallet, 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,
@@ -87,10 +87,21 @@ 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
@@ -107,11 +118,22 @@ 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 ##########
 ######################################
@@ -162,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

.github/actions/prepare/action.yml

@@ -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') }}

.github/workflows/nix.yml

@@ -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 }}"

.github/workflows/release-rc.yml

@@ -0,0 +1,44 @@
+name: release-rc
+
+on:
+  push:
+    tags:
+      - "*-rc[0-9]"
+
+permissions:
+  contents: write
+
+jobs:
+
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Create github release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.ref_name }}
+        run: |
+          gh release create "$tag" --generate-notes --prerelease
+
+  docker:
+    needs: [ release ]
+    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 }}

.github/workflows/release.yml

@@ -31,9 +31,22 @@ jobs:
       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

.gitignore

@@ -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,8 +50,8 @@ fly.toml
 lnbits-backup.zip
 
 # Ignore extensions (post installable extension PR)
-extensions
-upgrades/
+/lnbits/extensions
+/upgrades/
 
 # builded python package
 dist

.prettierignore

@@ -10,6 +10,7 @@
 
 **/lnbits/static/vendor
 **/lnbits/static/bundle.*
+**/lnbits/static/bundle-components.*
 **/lnbits/static/css/*
 
 flake.lock

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim-bookworm
+FROM python:3.10-slim-bookworm AS builder
 
 RUN apt-get clean
 RUN apt-get update
@@ -7,19 +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 install -y postgresql-common ca-certificates
-RUN install -d /usr/share/postgresql-common/pgdg
-RUN curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
-RUN sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-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
 

Makefile

@@ -39,24 +39,28 @@ dev:
 	poetry run lnbits --reload
 
 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 tests/regtest
@@ -99,24 +103,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"

docs/devs/development.md

@@ -11,13 +11,16 @@ Thanks for contributing :)
 
 # Run
 
-This starts the lnbits uvicorn server
+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:
 
 ```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
@@ -25,6 +28,15 @@ make dev
 poetry run lnbits --reload
 ```
 
+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.

docs/guide/installation.md

@@ -6,26 +6,21 @@ 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.
 
-### install python on ubuntu
+### Verify Python version
 
 ```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 -
@@ -38,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
@@ -70,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)
@@ -108,7 +110,7 @@ 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
 
@@ -130,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.
 
@@ -444,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;

docs/guide/wallets.md

@@ -76,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
@@ -84,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
@@ -101,6 +122,26 @@ For the invoice to work you must have a publicly accessible URL in your LNbits.
 - `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...**

flake.lock

@@ -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": {

flake.nix

@@ -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,19 +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 ]; }
-            );
-            types-mock = prev.pytest-md.overridePythonAttrs (
-              old: { buildInputs = (old.buildInputs or []) ++ [ prev.setuptools ]; }
-            );
           });
         };
       });

lnbits.sh

@@ -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

lnbits/app.py

@@ -16,7 +16,14 @@ from slowapi import Limiter
 from slowapi.util import get_remote_address
 from starlette.middleware.sessions import SessionMiddleware
 
-from lnbits.core.crud import get_dbversions, get_installed_extensions
+from lnbits.core.crud import (
+    add_installed_extension,
+    get_dbversions,
+    get_installed_extensions,
+    update_installed_extension_state,
+)
+from lnbits.core.extensions.extension_manager import deactivate_extension
+from lnbits.core.extensions.helpers import version_parse
 from lnbits.core.helpers import migrate_extension_database
 from lnbits.core.tasks import (  # watchdog_task
     killswitch_task,
@@ -40,15 +47,8 @@ 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, 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 .middleware import (
     CustomGZipMiddleware,
     ExtensionsRedirectMiddleware,
@@ -60,6 +60,7 @@ from .middleware import (
 from .requestvars import g
 from .tasks import (
     check_pending_payments,
+    create_task,
     internal_invoice_listener,
     invoice_listener,
 )
@@ -90,13 +91,8 @@ 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)
-
     # initialize tasks
-    register_async_tasks()
+    register_async_tasks(app)
 
 
 async def shutdown():
@@ -207,7 +203,7 @@ async def check_funding_source() -> None:
             break
 
         retry_counter += 1
-        sleep_time = 0.25 * (2**retry_counter)
+        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})"
@@ -244,6 +240,7 @@ async def check_installed_extensions(app: FastAPI):
                 )
         except Exception as e:
             logger.warning(e)
+            await deactivate_extension(ext.id)
             logger.warning(
                 f"Failed to re-install extension: {ext.id} ({ext.installed_version})"
             )
@@ -261,10 +258,10 @@ async def build_all_installed_extensions_list(
     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)
@@ -318,8 +315,6 @@ async def restore_installed_extension(app: FastAPI, ext: InstallableExtension):
 
     # 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():
@@ -382,37 +377,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}`: {e!s}")
+        except Exception as exc:
+            logger.error(f"Could not load extension `{ext.code}`: {exc!s}")
 
 
-def register_async_tasks():
+def register_async_tasks(app: FastAPI):
+
+    # check extensions after restart
+    if not settings.lnbits_extensions_deactivate_all:
+        create_task(check_and_register_extensions(app))
+
     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))
 

lnbits/commands.py

@@ -12,7 +12,26 @@ 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_dbversions,
+    get_installed_extension,
+    get_installed_extensions,
+    get_payments,
+    remove_deleted_wallets,
+    update_payment_status,
+)
+from lnbits.core.extensions.models import (
+    CreateExtension,
+    ExtensionRelease,
+    InstallableExtension,
+)
+from lnbits.core.helpers import 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)
@@ -123,47 +118,6 @@ def database_migrate():
     loop.run_until_complete(migrate_databases())
 
 
-async def db_migrate():
-    task = asyncio.create_task(migrate_databases())
-    await task
-
-
-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():
@@ -216,10 +170,12 @@ 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)
+        await update_payment_status(
+            status=PaymentState.PENDING, checking_id=checking_id, conn=conn
+        )
 
 
 @db.command("cleanup-accounts")
@@ -313,12 +269,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():
@@ -661,7 +611,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(
@@ -675,7 +625,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:
@@ -694,7 +644,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
 

lnbits/core/__init__.py

@@ -7,7 +7,7 @@ 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
@@ -38,3 +38,6 @@ def init_core_routers(app: FastAPI):
     app.include_router(tinyurl_router)
     app.include_router(webpush_router)
     app.include_router(users_router)
+
+
+__all__ = ["core_app", "core_app_extra", "db"]

lnbits/core/extensions/extension_manager.py

@@ -0,0 +1,93 @@
+import asyncio
+import importlib
+
+from loguru import logger
+
+from lnbits.core.crud import (
+    add_installed_extension,
+    delete_installed_extension,
+    get_dbversions,
+    get_installed_extension,
+    update_installed_extension_state,
+)
+from lnbits.core.db import core_app_extra
+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:
+    extension = Extension.from_installable_ext(ext_info)
+    installed_ext = await get_installed_extension(ext_info.id)
+    ext_info.payments = installed_ext.payments if installed_ext else []
+
+    await ext_info.download_archive()
+
+    ext_info.extract_archive()
+
+    db_version = (await get_dbversions()).get(ext_info.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(ext_info.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, "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

lnbits/core/extensions/helpers.py

@@ -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}"

lnbits/core/extensions/models.py

@@ -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,37 @@ 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):
+    required: Optional[bool] = False
+    amount: Optional[int] = None
+    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):
+    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 +148,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 +170,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 +179,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 +259,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 +278,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 +306,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 +326,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,19 +344,48 @@ 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 InstallableExtension(BaseModel):
     id: str
     name: str
+    active: Optional[bool] = False
     short_description: Optional[str] = None
     icon: Optional[str] = None
-    dependencies: List[str] = []
+    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] = []
+    payments: list[ReleasePaymentInfo] = []
+    pay_to_enable: Optional[PayToEnableInfo] = None
     archive: Optional[str] = None
 
     @property
@@ -412,6 +436,12 @@ class InstallableExtension(BaseModel):
             return self.installed_release.version
         return ""
 
+    @property
+    def requires_payment(self) -> bool:
+        if not self.pay_to_enable:
+            return False
+        return self.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
@@ -479,23 +509,6 @@ class InstallableExtension(BaseModel):
         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}",
-        ]
-
     def clean_extension_files(self):
         # remove downloaded archive
         if self.zip_path.is_file():
@@ -550,19 +563,20 @@ class InstallableExtension(BaseModel):
         self.payments.append(payment_info)
 
     @classmethod
-    def from_row(cls, data: dict) -> "InstallableExtension":
+    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("pay_to_enable"):
+            ext.pay_to_enable = PayToEnableInfo(**meta["pay_to_enable"])
         if meta.get("payments"):
             ext.payments = [ReleasePaymentInfo(**p) for p in meta["payments"]]
+
         return ext
 
     @classmethod
-    def from_rows(
-        cls, rows: Optional[List[Any]] = None
-    ) -> List["InstallableExtension"]:
+    def from_rows(cls, rows: Optional[list[Any]] = None) -> list[InstallableExtension]:
         if rows is None:
             rows = []
         return [InstallableExtension.from_row(row) for row in rows]
@@ -570,23 +584,23 @@ class InstallableExtension(BaseModel):
     @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,
                 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
+                    source_repo, latest_release
                 ),
             )
         except Exception as e:
@@ -594,7 +608,7 @@ class InstallableExtension(BaseModel):
         return None
 
     @classmethod
-    def from_explicit_release(cls, e: ExplicitRelease) -> "InstallableExtension":
+    def from_explicit_release(cls, e: ExplicitRelease) -> InstallableExtension:
         return InstallableExtension(
             id=e.id,
             name=e.name,
@@ -607,13 +621,13 @@ class InstallableExtension(BaseModel):
     @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)
@@ -649,12 +663,12 @@ class InstallableExtension(BaseModel):
         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
@@ -678,8 +692,8 @@ class InstallableExtension(BaseModel):
     @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 = [
@@ -692,6 +706,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
@@ -702,30 +747,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

lnbits/core/helpers.py

@@ -1,18 +1,23 @@
 import importlib
 import re
-from typing import Any, Optional
+from typing import Any
 from uuid import UUID
 
-import httpx
 from loguru import logger
 
+from lnbits.core import migrations as core_migrations
+from lnbits.core.crud import (
+    get_dbversions,
+    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 (
+    Extension,
+)
+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: Extension, current_version):
     try:
@@ -48,66 +53,6 @@ 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")
@@ -117,3 +62,46 @@ def to_valid_user_id(user_id: str) -> UUID:
         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_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()
+
+    # todo: revisit, use installed extensions
+    for ext in Extension.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.")

lnbits/core/migrations.py

@@ -1,4 +1,3 @@
-import datetime
 from time import time
 
 from loguru import logger
@@ -102,7 +101,7 @@ async def m002_add_fields_to_apipayments(db):
 
         import json
 
-        rows = await (await db.execute("SELECT * FROM apipayments")).fetchall()
+        rows = await db.fetchall("SELECT * FROM apipayments")
         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,17 @@ 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()
+        rows = await db.fetchall(
+            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}
+            """
+        )
         if len(rows):
             logger.info(f"Migration: Checking expiry of {len(rows)} invoices")
         for i, (
@@ -236,22 +233,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,17 +339,15 @@ 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()
+        rows = await db.fetchall(
+            """
+            SELECT *
+            FROM wallets
+            WHERE user LIKE 'del:%'
+            AND adminkey LIKE 'del:%'
+            AND inkey LIKE 'del:%'
+            """
+        )
 
         for row in rows:
             try:
@@ -366,10 +356,16 @@ async def m014_set_deleted_wallets(db):
                 inkey = row[4].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,17 +451,17 @@ 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:
@@ -512,3 +508,38 @@ async def m019_balances_view_based_on_wallets(db):
         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
+    """
+    )
+    # TODO: drop column in next release
+    # await db.execute("ALTER TABLE apipayments DROP COLUMN pending")

lnbits/core/models.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 import hashlib
 import hmac
@@ -5,20 +7,24 @@ import json
 import time
 from dataclasses import dataclass
 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 pydantic import BaseModel, validator
 
-from lnbits.db import Connection, FilterModel, FromRowModel
+from lnbits.db import FilterModel, FromRowModel
 from lnbits.helpers import url_for
 from lnbits.lnurl import encode as lnurl_encode
 from lnbits.settings import settings
+from lnbits.utils.exchange_rates import allowed_currencies
 from lnbits.wallets import get_funding_source
-from lnbits.wallets.base import PaymentPendingStatus, PaymentStatus
+from lnbits.wallets.base import (
+    PaymentFailedStatus,
+    PaymentPendingStatus,
+    PaymentStatus,
+    PaymentSuccessStatus,
+)
 
 
 class BaseWallet(BaseModel):
@@ -62,7 +68,7 @@ class Wallet(BaseWallet):
             linking_key, curve=SECP256k1, hashfunc=hashlib.sha256
         )
 
-    async def get_payment(self, payment_hash: str) -> Optional["Payment"]:
+    async def get_payment(self, payment_hash: str) -> Optional[Payment]:
         from .crud import get_standalone_payment
 
         return await get_standalone_payment(payment_hash)
@@ -132,8 +138,8 @@ class User(BaseModel):
     id: str
     email: Optional[str] = None
     username: Optional[str] = None
-    extensions: List[str] = []
-    wallets: List[Wallet] = []
+    extensions: list[str] = []
+    wallets: list[Wallet] = []
     admin: bool = False
     super_user: bool = False
     has_password: bool = False
@@ -142,10 +148,10 @@ class User(BaseModel):
     updated_at: Optional[int] = None
 
     @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
 
@@ -197,9 +203,33 @@ class LoginUsernamePassword(BaseModel):
     password: str
 
 
+class PaymentState(str, Enum):
+    PENDING = "pending"
+    SUCCESS = "success"
+    FAILED = "failed"
+
+    def __str__(self) -> str:
+        return self.value
+
+
+class CreatePayment(BaseModel):
+    wallet_id: str
+    payment_request: str
+    payment_hash: str
+    amount: int
+    memo: str
+    preimage: Optional[str] = None
+    expiry: Optional[datetime.datetime] = None
+    extra: Optional[dict] = None
+    webhook: Optional[str] = None
+    fee: int = 0
+
+
 class Payment(FromRowModel):
-    checking_id: str
+    status: str
+    # TODO should be removed in the future, backward compatibility
     pending: bool
+    checking_id: str
     amount: int
     fee: int
     memo: Optional[str]
@@ -208,20 +238,30 @@ class Payment(FromRowModel):
     preimage: str
     payment_hash: str
     expiry: Optional[float]
-    extra: Dict = {}
+    extra: Optional[dict]
     wallet_id: str
     webhook: Optional[str]
     webhook_status: Optional[int]
 
+    @property
+    def success(self) -> bool:
+        return self.status == PaymentState.SUCCESS.value
+
+    @property
+    def failed(self) -> bool:
+        return self.status == PaymentState.FAILED.value
+
     @classmethod
-    def from_row(cls, row: Row):
+    def from_row(cls, row: dict):
         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"],
+            status=row["status"],
+            # TODO should be removed in the future, backward compatibility
+            pending=row["status"] == PaymentState.PENDING.value,
             amount=row["amount"],
             fee=row["fee"],
             memo=row["memo"],
@@ -259,83 +299,23 @@ class Payment(FromRowModel):
         return self.expiry < time.time() 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}"
-        )
-
         funding_source = get_funding_source()
         if self.is_out:
             status = await funding_source.get_payment_status(self.checking_id)
         else:
             status = await funding_source.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)
         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"]
@@ -349,7 +329,7 @@ class PaymentFilters(FilterModel):
     preimage: str
     payment_hash: str
     expiry: Optional[datetime.datetime]
-    extra: Dict = {}
+    extra: dict = {}
     wallet_id: str
     webhook: Optional[str]
     webhook_status: Optional[int]
@@ -379,7 +359,7 @@ class TinyURL(BaseModel):
     time: float
 
     @classmethod
-    def from_row(cls, row: Row):
+    def from_row(cls, row: dict):
         return cls(**dict(row))
 
 
@@ -395,6 +375,7 @@ class Callback(BaseModel):
 
 class DecodePayment(BaseModel):
     data: str
+    filter_fields: Optional[list[str]] = []
 
 
 class CreateLnurl(BaseModel):
@@ -420,6 +401,14 @@ class CreateInvoice(BaseModel):
     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):
     id: str
@@ -453,3 +442,8 @@ class BalanceDelta(BaseModel):
     @property
     def delta_msats(self):
         return self.node_balance_msats - self.lnbits_balance_msats
+
+
+class SimpleStatus(BaseModel):
+    success: bool
+    message: str

lnbits/core/services.py

@@ -1,23 +1,30 @@
 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 MilliSatoshi
 from bolt11 import decode as bolt11_decode
 from cryptography.hazmat.primitives import serialization
 from fastapi import Depends, WebSocket
 from loguru import logger
+from passlib.context import CryptContext
 from py_vapid import Vapid
 from py_vapid.utils import b64urlencode
 
 from lnbits.core.db import db
 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
@@ -44,8 +51,9 @@ from .crud import (
     create_admin_settings,
     create_payment,
     create_wallet,
-    delete_wallet_payment,
     get_account,
+    get_account_by_email,
+    get_account_by_username,
     get_payments,
     get_standalone_payment,
     get_super_settings,
@@ -56,30 +64,27 @@ from .crud import (
     update_payment_details,
     update_payment_status,
     update_super_user,
+    update_user_extension,
 )
 from .helpers import to_valid_user_id
-from .models import BalanceDelta, Payment, UserConfig, Wallet
-
-
-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
+from .models import (
+    BalanceDelta,
+    CreatePayment,
+    Payment,
+    PaymentState,
+    User,
+    UserConfig,
+    Wallet,
+)
 
 
 async def calculate_fiat_amounts(
     amount: float,
     wallet_id: str,
     currency: Optional[str] = None,
-    extra: Optional[Dict] = None,
+    extra: Optional[dict] = None,
     conn: Optional[Connection] = None,
-) -> Tuple[int, Optional[Dict]]:
+) -> tuple[int, Optional[dict]]:
     wallet = await get_wallet(wallet_id, conn=conn)
     assert wallet, "invalid wallet_id"
     wallet_currency = wallet.currency or settings.lnbits_default_accounting_currency
@@ -120,11 +125,11 @@ 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]:
+) -> tuple[str, str]:
     if not amount > 0:
         raise InvoiceError("Amountless invoices not supported.", status="failed")
 
@@ -169,17 +174,20 @@ async def create_invoice(
 
     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,
         payment_hash=invoice.payment_hash,
-        amount=amount_msat,
+        amount=amount_sat * 1000,
         expiry=invoice.expiry_date,
         memo=memo,
         extra=extra,
         webhook=webhook,
+    )
+
+    await create_payment(
+        checking_id=checking_id,
+        data=create_payment_model,
         conn=conn,
     )
 
@@ -191,7 +199,7 @@ 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 = "",
     conn: Optional[Connection] = None,
 ) -> str:
@@ -225,17 +233,7 @@ async def pay_invoice(
             invoice.amount_msat / 1000, wallet_id, extra=extra, conn=conn
         )
 
-        # 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]
-
-        payment_kwargs: PaymentKwargs = PaymentKwargs(
+        create_payment_model = CreatePayment(
             wallet_id=wallet_id,
             payment_request=payment_request,
             payment_hash=invoice.payment_hash,
@@ -254,9 +252,6 @@ async def pay_invoice(
         # (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(
@@ -271,47 +266,36 @@ async def pay_invoice(
 
             logger.debug(f"creating temporary internal payment with id {internal_id}")
             # create a new payment from this wallet
+
+            fee_reserve_total_msat = fee_reserve_total(
+                invoice.amount_msat, internal=True
+            )
+            create_payment_model.fee = abs(fee_reserve_total_msat)
             new_payment = await create_payment(
                 checking_id=internal_id,
-                fee=0 + abs(fee_reserve_total_msat),
-                pending=False,
+                data=create_payment_model,
+                status=PaymentState.SUCCESS,
                 conn=conn,
-                **payment_kwargs,
             )
         else:
-            fee_reserve_total_msat = fee_reserve_total(
-                invoice.amount_msat, internal=False
+            new_payment = await _create_external_payment(
+                temp_id=temp_id,
+                amount_msat=invoice.amount_msat,
+                data=create_payment_model,
+                conn=conn,
             )
-            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 exc:
-                logger.error(f"could not create temporary payment: {exc}")
-                # happens if the same wallet tries to pay an invoice twice
-                raise PaymentError("Could not make payment.", status="failed") from exc
 
         # 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 PaymentError(
-                    f"You must reserve at least ({round(fee_reserve_total_msat/1000)}"
-                    "  sat) to cover potential routing fees.",
-                    status="failed",
-                )
-            raise PaymentError("Insufficient balance.", status="failed")
+        fee_reserve_total_msat = fee_reserve_total(invoice.amount_msat, internal=False)
+        _check_wallet_balance(wallet, fee_reserve_total_msat, internal_checking_id)
+
+    if extra and "tag" in extra:
+        # check if the payment is made for an extension that the user disabled
+        status = await check_user_extension_access(wallet.user, extra["tag"])
+        if not status.success:
+            raise PaymentError(status.message)
 
     if internal_checking_id:
         service_fee_msat = service_fee(invoice.amount_msat, internal=True)
@@ -321,7 +305,9 @@ async def pay_invoice(
         # 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
+                checking_id=internal_checking_id,
+                status=PaymentState.SUCCESS,
+                conn=conn,
             )
         await send_payment_notification(wallet, new_payment)
 
@@ -346,15 +332,18 @@ async def pay_invoice(
                 f" {payment.checking_id})"
             )
 
-        logger.debug(f"backend: pay_invoice finished {temp_id}")
-        logger.debug(f"backend: pay_invoice response {payment}")
+        logger.debug(f"backend: pay_invoice finished {temp_id}, {payment}")
         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,
+                    status=(
+                        PaymentState.SUCCESS
+                        if payment.ok is True
+                        else PaymentState.PENDING
+                    ),
                     fee=-(
                         abs(payment.fee_msat if payment.fee_msat else 0)
                         + abs(service_fee_msat)
@@ -369,13 +358,16 @@ async def pay_invoice(
                 )
                 if wallet and updated:
                     await send_payment_notification(wallet, updated)
-                logger.debug(f"payment successful {payment.checking_id}")
+                logger.success(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")
+            logger.debug(f"payment failed {temp_id}, {payment.error_message}")
             async with db.connect() as conn:
-                logger.debug(f"deleting temporary payment {temp_id}")
-                await delete_wallet_payment(temp_id, wallet_id, conn=conn)
+                await update_payment_status(
+                    checking_id=temp_id,
+                    status=PaymentState.FAILED,
+                    conn=conn,
+                )
             raise PaymentError(
                 f"Payment failed: {payment.error_message}"
                 or "Payment failed, but backend didn't give us an error message.",
@@ -389,19 +381,88 @@ async def pay_invoice(
 
     # credit service fee wallet
     if settings.lnbits_service_fee_wallet and service_fee_msat:
-        new_payment = await create_payment(
+        create_payment_model = CreatePayment(
             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,
+            amount=abs(service_fee_msat),
+            memo="Service fee",
+        )
+        new_payment = await create_payment(
+            checking_id=f"service_fee_{temp_id}",
+            data=create_payment_model,
+            status=PaymentState.SUCCESS,
         )
     return invoice.payment_hash
 
 
+async def _create_external_payment(
+    temp_id: str,
+    amount_msat: MilliSatoshi,
+    data: CreatePayment,
+    conn: Optional[Connection],
+) -> Payment:
+    fee_reserve_total_msat = fee_reserve_total(amount_msat, internal=False)
+
+    # check if there is already a payment with the same checking_id
+    old_payment = await get_standalone_payment(temp_id, conn=conn)
+    if old_payment:
+        # fail on pending payments
+        if old_payment.pending:
+            raise PaymentError("Payment is still pending.", status="pending")
+        if old_payment.success:
+            raise PaymentError("Payment already paid.", status="success")
+        if old_payment.failed:
+            status = await old_payment.check_status()
+            if status.success:
+                # payment was successful on the fundingsource
+                await update_payment_status(
+                    checking_id=temp_id, status=PaymentState.SUCCESS, conn=conn
+                )
+                raise PaymentError(
+                    "Failed payment was already paid on the fundingsource.",
+                    status="success",
+                )
+            if status.failed:
+                raise PaymentError(
+                    "Payment is failed node, retrying is not possible.", status="failed"
+                )
+            # status.pending fall through and try again
+        return old_payment
+
+    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:
+        data.fee = -abs(fee_reserve_total_msat)
+        new_payment = await create_payment(
+            checking_id=temp_id,
+            data=data,
+            conn=conn,
+        )
+        return new_payment
+    except Exception as exc:
+        logger.error(f"could not create temporary payment: {exc}")
+        # happens if the same wallet tries to pay an invoice twice
+        raise PaymentError("Could not make payment", status="failed") from exc
+
+
+def _check_wallet_balance(
+    wallet: Wallet,
+    fee_reserve_total_msat: int,
+    internal_checking_id: Optional[str] = None,
+):
+    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 PaymentError(
+                f"You must reserve at least ({round(fee_reserve_total_msat/1000)}"
+                "  sat) to cover potential routing fees.",
+                status="failed",
+            )
+        raise PaymentError("Insufficient balance.", status="failed")
+
+
 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)
@@ -459,7 +520,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:
@@ -597,12 +658,11 @@ 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
@@ -636,7 +696,7 @@ def fee_reserve_total(amount_msat: int, internal: bool = False) -> int:
 
 async def send_payment_notification(wallet: Wallet, payment: Payment):
     await websocket_updater(
-        wallet.id,
+        wallet.inkey,
         json.dumps(
             {
                 "wallet_balance": wallet.balance,
@@ -645,6 +705,10 @@ async def send_payment_notification(wallet: Wallet, payment: Payment):
         ),
     )
 
+    await websocket_updater(
+        payment.payment_hash, json.dumps({"pending": payment.pending})
+    )
+
 
 async def update_wallet_balance(wallet_id: str, amount: int):
     payment_hash, _ = await create_invoice(
@@ -656,7 +720,9 @@ async def update_wallet_balance(wallet_id: str, amount: int):
     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)
+        await update_payment_status(
+            checking_id=checking_id, status=PaymentState.SUCCESS, conn=conn
+        )
         # notify receiver asynchronously
         from lnbits.tasks import internal_invoice_queue
 
@@ -756,9 +822,44 @@ async def init_admin_settings(super_user: Optional[str] = None) -> SuperSettings
     return await create_admin_settings(account.id, editable_settings.dict())
 
 
+async def create_user_account(
+    user_id: Optional[str] = None,
+    email: Optional[str] = None,
+    username: Optional[str] = None,
+    password: Optional[str] = None,
+    wallet_name: Optional[str] = None,
+    user_config: Optional[UserConfig] = None,
+) -> User:
+    if not settings.new_accounts_allowed:
+        raise ValueError("Account creation is disabled.")
+    if username and await get_account_by_username(username):
+        raise ValueError("Username already exists.")
+
+    if email and await get_account_by_email(email):
+        raise ValueError("Email already exists.")
+
+    if user_id:
+        user_uuid4 = UUID(hex=user_id, version=4)
+        assert user_uuid4.hex == user_id, "User ID is not valid UUID4 hex string"
+    else:
+        user_id = uuid4().hex
+
+    pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+    password = pwd_context.hash(password) if password else None
+
+    account = await create_account(user_id, username, email, password, user_config)
+    wallet = await create_wallet(user_id=account.id, wallet_name=wallet_name)
+    account.wallets = [wallet]
+
+    for ext_id in settings.lnbits_user_default_extensions:
+        await update_user_extension(user_id=account.id, extension=ext_id, active=True)
+
+    return account
+
+
 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}")
@@ -797,3 +898,23 @@ async def get_balance_delta() -> BalanceDelta:
         lnbits_balance_msats=lnbits_balance,
         node_balance_msats=status.balance_msat,
     )
+
+
+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:
+            await update_payment_status(
+                checking_id=payment.checking_id,
+                status=PaymentState.FAILED,
+            )
+        elif status.success:
+            await update_payment_status(
+                checking_id=payment.checking_id,
+                status=PaymentState.SUCCESS,
+            )

lnbits/core/templates/admin/_tab_security.html

@@ -173,7 +173,7 @@
                   @remove="removeBlockedIPs(blocked_ip)"
                   color="primary"
                   text-color="white"
-                  v-text="blocked_ip"
+                  :label="blocked_ip"
                 ></q-chip>
               </div>
               <br />
@@ -202,7 +202,7 @@
                   @remove="removeAllowedIPs(allowed_ip)"
                   color="primary"
                   text-color="white"
-                  v-text="allowed_ip"
+                  :label="allowed_ip"
                 ></q-chip>
               </div>
               <br />

lnbits/core/templates/admin/_tab_server.html

@@ -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>

lnbits/core/templates/admin/_tab_theme.html

@@ -27,8 +27,8 @@
         <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'"
+            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>

lnbits/core/templates/admin/_tab_users.html

@@ -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 />

lnbits/core/templates/core/_api_docs.html

@@ -5,10 +5,77 @@
   :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>{{ 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 +176,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>

lnbits/core/templates/core/account.html

@@ -373,6 +373,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>

lnbits/core/templates/core/index.html

@@ -33,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>
@@ -484,6 +484,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
@@ -519,7 +545,18 @@
               ></q-img>
             </a>
           </div>
-          <div class="col q-pl-md"></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>

lnbits/core/templates/core/wallet.html

@@ -154,11 +154,19 @@
                   <q-card>
                     <q-card-section class="text-center">
                       <p v-text="$t('export_to_phone_desc')"></p>
-                      <qrcode
+                      <qrcode-vue
                         :value="'{{request.base_url}}wallet?usr={{user.id}}&wal={{wallet.id}}'"
-                        :options="{width:240}"
-                      ></qrcode>
+                        :options="{ width: 256 }"
+                      ></qrcode-vue>
                     </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>
@@ -311,13 +319,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"

lnbits/core/templates/node/_tab_transactions.html

@@ -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
@@ -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>

lnbits/core/templates/users/index.html

@@ -7,7 +7,7 @@ include "users/_createWalletDialog.html" %}
 
 <div class="row q-col-gutter-md justify-center">
   <div class="col q-gutter-y-md" style="width: 300px">
-    <div style="width: 600px">
+    <div style="width: 100%; max-width: 2000px">
       <canvas ref="chart1"></canvas>
     </div>
   </div>
@@ -24,8 +24,8 @@ include "users/_createWalletDialog.html" %}
           </q-btn>
         </div>
         <q-table
-          :data="users"
-          :row-key="usersTableRowKey"
+          row-key="id"
+          :rows="users"
           :columns="usersTable.columns"
           :pagination.sync="usersTable.pagination"
           :no-data-label="$t('no_users')"
@@ -70,7 +70,7 @@ include "users/_createWalletDialog.html" %}
                   v-if="!props.row.is_super_user"
                   icon="build"
                   size="sm"
-                  :color="props.row.is_admin ? 'primary' : ''"
+                  :color="props.row.is_admin ? 'primary' : 'grey'"
                   @click="toggleAdmin(props.row.id)"
                 >
                   <q-tooltip>Toggle Admin</q-tooltip>

lnbits/core/views/api.py

@@ -33,14 +33,11 @@ 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 ..crud import (
-    create_account,
-    create_wallet,
-)
-from ..services import perform_lnurlauth
+from ..services import create_user_account, perform_lnurlauth
 
 # backwards compatibility for extension
 # TODO: remove api_payment and pay_invoice imports from extensions
@@ -70,8 +67,8 @@ async def api_create_account(data: CreateWallet) -> Wallet:
             status_code=HTTPStatus.FORBIDDEN,
             detail="Account creation is disabled.",
         )
-    account = await create_account()
-    return await create_wallet(user_id=account.id, wallet_name=data.name)
+    account = await create_user_account(wallet_name=data.name)
+    return account.wallets[0]
 
 
 @api_router.get("/api/v1/lnurlscan/{code}")
@@ -204,6 +201,12 @@ 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]:
     return allowed_currencies()

lnbits/core/views/auth_api.py

@@ -12,6 +12,7 @@ from starlette.status import (
     HTTP_500_INTERNAL_SERVER_ERROR,
 )
 
+from lnbits.core.services import create_user_account
 from lnbits.decorators import check_user_exists
 from lnbits.helpers import (
     create_access_token,
@@ -23,8 +24,6 @@ from lnbits.helpers import (
 from lnbits.settings import AuthMethods, settings
 
 from ..crud import (
-    create_account,
-    create_user,
     get_account,
     get_account_by_email,
     get_account_by_username_or_email,
@@ -166,7 +165,9 @@ async def register(data: CreateUser) -> JSONResponse:
         raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid email.")
 
     try:
-        user = await create_user(data)
+        user = await create_user_account(
+            email=data.email, username=data.username, password=data.password
+        )
         return _auth_success_response(user.username)
 
     except ValueError as exc:
@@ -274,7 +275,7 @@ async def _handle_sso_login(userinfo: OpenID, verified_user_id: Optional[str] =
     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)
+        user = await create_user_account(email=email, user_config=user_config)
 
     if not user:
         raise HTTPException(HTTP_401_UNAUTHORIZED, "User not found.")

lnbits/core/views/extension_api.py

@@ -1,7 +1,6 @@
 from http import HTTPStatus
 from typing import (
     List,
-    Optional,
 )
 
 from bolt11 import decode as bolt11_decode
@@ -12,37 +11,42 @@ from fastapi import (
 )
 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,
     ExtensionRelease,
     InstallableExtension,
-    fetch_github_release_config,
-    fetch_release_payment_info,
-    get_valid_extensions,
+    PayToEnableInfo,
+    ReleasePaymentInfo,
+    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,
     delete_dbversion,
-    delete_installed_extension,
     drop_extension_db,
     get_dbversions,
     get_installed_extension,
     get_installed_extensions,
+    get_user_extension,
+    update_extension_pay_to_enable,
+    update_user_extension,
+    update_user_extension_extra,
 )
 
 extension_router = APIRouter(
@@ -51,12 +55,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
     )
@@ -76,65 +76,225 @@ async def api_install_extension(
     )
 
     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()
+    except Exception as exc:
+        logger.warning(exc)
+        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=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", dependencies=[Depends(check_user_exists)])
+async def api_extension_details(
+    ext_id: str,
+    details_link: str,
+):
+
+    try:
+        all_releases = await InstallableExtension.get_extension_releases(ext_id)
+
+        release = next(
+            (r for r in all_releases if r.details_link == details_link), None
+        )
+        assert release, "Details not found for release"
+
+        release_details = await ExtensionRelease.fetch_release_details(details_link)
+        assert release_details, "Cannot fetch details for release"
+        release_details["icon"] = release.icon
+        release_details["repo"] = release.repo
+        return release_details
     except AssertionError as exc:
         raise HTTPException(HTTPStatus.BAD_REQUEST, str(exc)) from exc
     except Exception as exc:
         logger.warning(exc)
-        ext_info.clean_extension_files()
         raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail=(
-                f"Failed to install extension {ext_info.id} "
-                f"({ext_info.installed_version})."
-            ),
+            HTTPStatus.INTERNAL_SERVER_ERROR,
+            f"Failed to get details for extension {ext_id}.",
         ) from exc
 
 
-@extension_router.delete("/{ext_id}")
-async def api_uninstall_extension(
+@extension_router.put("/{ext_id}/sell")
+async def api_update_pay_to_enable(
     ext_id: str,
+    data: PayToEnableInfo,
     user: User = Depends(check_admin),
-    access_token: Optional[str] = Depends(check_access_token),
-):
-    installed_extensions = await get_installed_extensions()
-
-    extensions = [e for e in installed_extensions if e.id == ext_id]
-    if len(extensions) == 0:
+) -> SimpleStatus:
+    try:
+        assert (
+            data.wallet in user.wallet_ids
+        ), "Wallet does not belong to this admin user."
+        await update_extension_pay_to_enable(ext_id, data)
+        return SimpleStatus(
+            success=True, message=f"Payment info updated for '{ext_id}' extension."
+        )
+    except AssertionError as exc:
+        raise HTTPException(HTTPStatus.BAD_REQUEST, str(exc)) from exc
+    except Exception as exc:
+        logger.warning(exc)
         raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=(f"Failed to update pay to install data for extension '{ext_id}' "),
+        ) from exc
+
+
+@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."
+
+        if user.admin or not ext.requires_payment:
+            await update_user_extension(user_id=user.id, extension=ext_id, active=True)
+            return SimpleStatus(success=True, message=f"Extension '{ext_id}' enabled.")
+
+        user_ext = await get_user_extension(user.id, ext_id)
+        if not (user_ext and 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:
+            await update_user_extension(user_id=user.id, extension=ext_id, active=True)
+            return SimpleStatus(
+                success=True, message=f"Paid extension '{ext_id}' enabled."
+            )
+
+        assert (
+            ext.pay_to_enable and ext.pay_to_enable.wallet
+        ), f"Extension '{ext_id}' is missing payment wallet."
+
+        payment_status = await check_transaction_status(
+            wallet_id=ext.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.extra.paid_to_enable = True
+        await update_user_extension_extra(user.id, ext_id, user_ext.extra)
+
+        await update_user_extension(user_id=user.id, extension=ext_id, active=True)
+        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."
+        )
+    try:
+        logger.info(f"Disabeling extension: {ext_id}.")
+        await update_user_extension(user_id=user.id, extension=ext_id, active=False)
+        return SimpleStatus(success=True, message=f"Extension '{ext_id}' disabled.")
+    except Exception as exc:
+        logger.warning(exc)
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=(f"Failed to disable '{ext_id}'."),
+        ) from exc
+
+
+@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 installed_extensions if ext.id == valid_ext_id), None
         )
@@ -148,17 +308,10 @@ 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.")
+        return SimpleStatus(success=True, message=f"Extension '{ext_id}' uninstalled.")
     except Exception as exc:
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(exc)
@@ -166,7 +319,7 @@ async def api_uninstall_extension(
 
 
 @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] = (
             await InstallableExtension.get_extension_releases(ext_id)
@@ -189,30 +342,34 @@ async def get_extension_releases(ext_id: str):
         ) 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
 
@@ -225,13 +382,58 @@ async def get_extension_invoice(data: CreateExtension):
         ) 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)
+):
+    try:
+        assert data.amount and data.amount > 0, "A non-zero amount must be specified."
+
+        ext = await get_installed_extension(ext_id)
+        assert ext, f"Extension '{ext_id}' not found."
+        assert ext.pay_to_enable, f"Payment Info not found for extension '{ext_id}'."
+        assert (
+            ext.pay_to_enable.required
+        ), f"Payment not required for extension '{ext_id}'."
+        assert ext.pay_to_enable.wallet and ext.pay_to_enable.amount, (
+            f"Payment wallet or amount missing for extension '{ext_id}'."
+            "Please contact the administrator."
+        )
+        assert (
+            data.amount >= ext.pay_to_enable.amount
+        ), f"Minimum amount is {ext.pay_to_enable.amount} sats."
+
+        payment_hash, payment_request = await create_invoice(
+            wallet_id=ext.pay_to_enable.wallet,
+            amount=data.amount,
+            memo=f"Enable '{ext.name}' extension.",
+        )
+
+        user_ext = await get_user_extension(user.id, ext_id)
+        user_ext_info = (
+            user_ext.extra if user_ext and user_ext.extra else UserExtensionInfo()
+        )
+        user_ext_info.payment_hash_to_enable = payment_hash
+        await update_user_extension_extra(user.id, ext_id, user_ext_info)
+
+        return {"payment_hash": payment_hash, "payment_request": payment_request}
+
+    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.get(
     "/release/{org}/{repo}/{tag_name}",
     dependencies=[Depends(check_admin)],
 )
 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 {}
 
@@ -261,6 +463,9 @@ 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

lnbits/core/views/generic.py

@@ -1,34 +1,33 @@
-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
 
+import httpx
 from fastapi import Cookie, Depends, Query, Request
 from fastapi.exceptions import HTTPException
 from fastapi.responses import FileResponse, HTMLResponse, RedirectResponse
 from fastapi.routing import APIRouter
+from lnurl import decode as lnurl_decode
 from loguru import logger
 from pydantic.types import UUID4
 
-from lnbits.core.db import core_app_extra
+from lnbits.core.extensions.models import Extension, InstallableExtension
 from lnbits.core.helpers import to_valid_user_id
 from lnbits.core.models import User
+from lnbits.core.services import create_invoice
 from lnbits.decorators import check_admin, check_user_exists
 from lnbits.helpers import template_renderer
 from lnbits.settings import settings
 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_dbversions,
-    get_inactive_extensions,
     get_installed_extensions,
     get_user,
-    update_installed_extension_state,
-    update_user_extension,
 )
 
 generic_router = APIRouter(
@@ -73,21 +72,10 @@ 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)):
     try:
-        installed_exts: List["InstallableExtension"] = await get_installed_extensions()
+        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()
@@ -100,6 +88,11 @@ async def extensions_install(
             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
+                if installed_ext.pay_to_enable and not user.admin:
+                    # not a security leak, but better not to share the wallet id
+                    installed_ext.pay_to_enable.wallet = None
+                e.pay_to_enable = installed_ext.pay_to_enable
+
                 # use the installed extension values
                 e.name = installed_ext.name
                 e.short_description = installed_ext.short_description
@@ -111,30 +104,10 @@ async def extensions_install(
         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
-                    )
-                )
-
-            await update_installed_extension_state(
-                ext_id=ext_id, active=activate is not None
-            )
-
-        all_ext_ids = [ext.code for ext in all_extensions]
-        inactive_extensions = await get_inactive_extensions()
+        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_version = await get_dbversions()
         extensions = [
             {
@@ -156,6 +129,8 @@ async def extensions_install(
                 "installedRelease": (
                     dict(ext.installed_release) if ext.installed_release else None
                 ),
+                "payToEnable": (dict(ext.pay_to_enable) if ext.pay_to_enable else {}),
+                "isPaymentRequired": ext.requires_payment,
             }
             for ext in installable_exts
         ]
@@ -203,7 +178,7 @@ async def wallet(
     user_wallet = user.get_wallet(wallet_id)
     if not user_wallet or user_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(
@@ -420,27 +395,51 @@ async def hex_to_uuid4(hex_value: str):
         ) from exc
 
 
-async def toggle_extension(extension_to_enable, extension_to_disable, user_id):
-    if extension_to_enable and extension_to_disable:
-        raise HTTPException(
-            HTTPStatus.BAD_REQUEST, "You can either `enable` or `disable` an extension."
-        )
+@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
+    """
 
-    # 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()]:
+    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_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}",
+    )

lnbits/core/views/payment_api.py

@@ -35,12 +35,11 @@ from lnbits.core.models import (
 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
+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,13 +51,12 @@ from ..crud import (
     get_payments_paginated,
     get_standalone_payment,
     get_wallet_for_key,
-    update_pending_payments,
 )
 from ..services import (
-    check_transaction_status,
     create_invoice,
     fee_reserve_total,
     pay_invoice,
+    update_pending_payments,
 )
 from ..tasks import api_invoice_listeners
 
@@ -74,12 +72,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,
@@ -93,12 +91,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(
@@ -110,12 +108,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,
@@ -379,10 +377,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",
     )
@@ -402,15 +400,8 @@ 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}
@@ -424,12 +415,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)
@@ -441,7 +432,8 @@ 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: {exc!s}"},

lnbits/core/views/public_api.py

@@ -20,7 +20,8 @@ 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:

lnbits/core/views/user_api.py

@@ -84,10 +84,10 @@ async def api_users_toggle_admin(user_id: str) -> None:
             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)
+        update_settings = EditableSettings(
+            lnbits_admin_users=settings.lnbits_admin_users
+        )
+        await update_admin_settings(update_settings)
     except Exception as exc:
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,

lnbits/core/views/wallet_api.py

@@ -13,8 +13,8 @@ from lnbits.core.models import (
 )
 from lnbits.decorators import (
     WalletTypeInfo,
-    get_key_type,
     require_admin_key,
+    require_invoice_key,
 )
 
 from ..crud import (
@@ -27,15 +27,14 @@ wallet_router = APIRouter(prefix="/api/v1/wallet", tags=["Wallet"])
 
 
 @wallet_router.get("")
-async def api_wallet(wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_wallet(wallet: WalletTypeInfo = Depends(require_invoice_key)):
+    res = {
+        "name": wallet.wallet.name,
+        "balance": wallet.wallet.balance_msat,
+    }
     if wallet.key_type == KeyType.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}
+        res["id"] = wallet.wallet.id
+    return res
 
 
 @wallet_router.put("/{new_name}")

lnbits/core/views/webpush_api.py

@@ -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

lnbits/db.py

@@ -7,14 +7,13 @@ import re
 import time
 from contextlib import asynccontextmanager
 from enum import Enum
-from sqlite3 import Row
 from typing import Any, Generic, Literal, Optional, TypeVar
 
 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 +23,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 +39,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 +110,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,45 +127,42 @@ class Connection(Compat):
             query = query.replace("?", "%s")
         return query
 
-    def rewrite_values(self, values):
+    def rewrite_values(self, values: dict) -> dict:
         # strip html
         clean_regex = 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_values: dict = {}
+        for key, raw_value in values.items():
             if isinstance(raw_value, str):
-                values.append(re.sub(clean_regex, "", 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 fetchall(self, query: str, values: Optional[dict] = None) -> list[dict]:
+        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()
+        return row
 
-    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 fetchone(self, query: str, values: Optional[dict] = None) -> dict:
+        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()
         return row
 
     async def fetch_page(
         self,
         query: str,
         where: Optional[list[str]] = None,
-        values: Optional[list[str]] = None,
+        values: Optional[dict] = None,
         filters: Optional[Filters] = None,
         model: Optional[type[TRowModel]] = None,
         group_by: Optional[list[str]] = None,
@@ -203,14 +189,14 @@ class Connection(Compat):
             {filters.order_by()}
             {filters.pagination()}
             """,
-            parsed_values,
+            self.rewrite_values(parsed_values),
         )
         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.fetchone(
                     f"""
-                    SELECT COUNT(*) FROM (
+                    SELECT COUNT(*) as count FROM (
                         {query}
                         {clause}
                         {group_by_string}
@@ -218,21 +204,22 @@ class Connection(Compat):
                     """,
                     parsed_values,
                 )
-                count = int(count[0])
+                count = int(result.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=[model.from_row(row) for row in rows] if model else [],
             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 +232,44 @@ 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_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 int(
+                        time.mktime(datetime.datetime.strptime(value, f).timetuple())
+                    )
+
+                dbapi_connection.run_async(
+                    lambda connection: connection.set_type_codec(
+                        "TIMESTAMP",
+                        encoder=datetime.datetime,
+                        decoder=_parse_timestamp,
+                        schema="pg_catalog",
+                    )
+                )
+
         self.lock = asyncio.Lock()
 
         logger.trace(f"database {self.type} added for {self.name}")
@@ -265,41 +278,37 @@ 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) -> list[dict]:
         async with self.connect() as conn:
-            result = await conn.execute(query, values)
-            return await result.fetchall()
+            return await conn.fetchall(query, values)
 
-    async def fetchone(self, query: str, values: tuple = ()):
+    async def fetchone(self, query: str, values: Optional[dict] = None) -> dict:
         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)
 
     async def fetch_page(
         self,
         query: str,
         where: Optional[list[str]] = None,
-        values: Optional[list[str]] = None,
+        values: Optional[dict] = None,
         filters: Optional[Filters] = None,
         model: Optional[type[TRowModel]] = None,
         group_by: Optional[list[str]] = None,
@@ -307,7 +316,7 @@ class Database(Compat):
         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)
 
@@ -365,8 +374,8 @@ class Operator(Enum):
 
 class FromRowModel(BaseModel):
     @classmethod
-    def from_row(cls, row: Row):
-        return cls(**dict(row))
+    def from_row(cls, row: dict):
+        return cls(**row)
 
 
 class FilterModel(BaseModel):
@@ -388,12 +397,13 @@ class Page(BaseModel, Generic[T]):
 class Filter(BaseModel, Generic[TFilterModel]):
     field: str
     op: Operator = Operator.EQ
-    values: list[Any]
-
     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 +419,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 +432,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)
 
 
@@ -481,14 +493,11 @@ class Filters(BaseModel, Generic[TFilterModel]):
             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 +507,14 @@ 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

lnbits/decorators.py

@@ -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
 
@@ -15,9 +15,10 @@ from lnbits.core.crud import (
     get_account_by_email,
     get_account_by_username,
     get_user,
+    get_user_active_extensions_ids,
     get_wallet_for_key,
 )
-from lnbits.core.models import KeyType, User, WalletTypeInfo
+from lnbits.core.models import KeyType, SimpleStatus, User, WalletTypeInfo
 from lnbits.db import Filter, Filters, TFilterModel
 from lnbits.settings import AuthMethods, settings
 
@@ -88,30 +89,12 @@ class KeyChecker(SecurityBase):
                 detail="Invalid adminkey.",
             )
 
-        if (
-            wallet.user != settings.super_user
-            and wallet.user not in settings.lnbits_admin_users
-            and settings.lnbits_admin_extensions
-            and request["path"].split("/")[1] in settings.lnbits_admin_extensions
-        ):
-            raise HTTPException(
-                status_code=HTTPStatus.FORBIDDEN,
-                detail="User not authorized for this extension.",
-            )
+        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 get_key_type(
-    request: Request,
-    api_key_header: str = Security(api_key_header),
-    api_key_query: str = Security(api_key_query),
-) -> WalletTypeInfo:
-    check: KeyChecker = KeyChecker(api_key=api_key_header or api_key_query)
-    return await check(request)
-
-
 async def require_admin_key(
     request: Request,
     api_key_header: str = Security(api_key_header),
@@ -161,19 +144,24 @@ async def check_user_exists(
     user = await get_user(account.id)
     assert user, "User not found for account."
 
-    if (
-        user.id != settings.super_user
-        and user.id not in settings.lnbits_admin_users
-        and settings.lnbits_admin_extensions
-        and r["path"].split("/")[1] in settings.lnbits_admin_extensions
-    ):
-        raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "User not authorized for extension."
-        )
+    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 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(
@@ -207,9 +195,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
 
@@ -226,9 +214,40 @@ def parse_filters(model: Type[TFilterModel]):
     return dependency
 
 
+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}'."
+        )
+
+    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):
     try:
-        payload = jwt.decode(access_token, settings.auth_secret_key, "HS256")
+        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"):
@@ -237,10 +256,10 @@ async def _get_account_from_token(access_token):
             return await get_account_by_email(str(payload.get("email")))
 
         raise HTTPException(HTTPStatus.UNAUTHORIZED, "Data missing for access token.")
-    except ExpiredSignatureError as exc:
+    except jwt.ExpiredSignatureError as exc:
         raise HTTPException(
             HTTPStatus.UNAUTHORIZED, "Session expired.", {"token-expired": "true"}
         ) from exc
-    except JWTError as exc:
+    except jwt.PyJWTError as exc:
         logger.debug(exc)
         raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid access token.") from exc

lnbits/exceptions.py

@@ -8,11 +8,21 @@ from fastapi.exceptions import RequestValidationError
 from fastapi.responses import JSONResponse, RedirectResponse, Response
 from loguru import logger
 
-from lnbits.core.services import InvoiceError, PaymentError
-
 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 register_exception_handlers(app: FastAPI):
     register_exception_handler(app)
     register_request_validation_exception_handler(app)
@@ -40,8 +50,14 @@ def render_html_error(request: Request, exc: Exception) -> Optional[Response]:
             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}"}
+            request, "error.html", {"err": f"Error: {exc!s}"}, status_code
         )
 
     return None
@@ -84,7 +100,7 @@ def register_http_exception_handler(app: FastAPI):
 def register_payment_error_handler(app: FastAPI):
     @app.exception_handler(PaymentError)
     async def payment_error_handler(request: Request, exc: PaymentError):
-        logger.error(f"PaymentError: {exc.message}, {exc.status}")
+        logger.error(f"{exc.message}, {exc.status}")
         return JSONResponse(
             status_code=520,
             content={"detail": exc.message, "status": exc.status},
@@ -94,7 +110,7 @@ def register_payment_error_handler(app: FastAPI):
 def register_invoice_error_handler(app: FastAPI):
     @app.exception_handler(InvoiceError)
     async def invoice_error_handler(request: Request, exc: InvoiceError):
-        logger.error(f"InvoiceError: {exc.message}, Status: {exc.status}")
+        logger.error(f"{exc.message}, Status: {exc.status}")
         return JSONResponse(
             status_code=520,
             content={"detail": exc.message, "status": exc.status},

lnbits/helpers.py

@@ -5,11 +5,13 @@ from pathlib import Path
 from typing import Any, List, 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.db import get_placeholder
 from lnbits.jinja2_templating import Jinja2Templates
 from lnbits.nodes import get_node_class
 from lnbits.requestvars import g
@@ -17,7 +19,6 @@ 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():
@@ -72,7 +73,7 @@ def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templa
     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
+        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
@@ -92,19 +93,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
 
@@ -178,19 +181,28 @@ def insert_query(table_name: str, model: BaseModel) -> str:
     :param table_name: Name of the table
     :param model: Pydantic model
     """
-    placeholders = ", ".join(["?"] * len(model.dict().keys()))
+    placeholders = []
+    for field in model.dict().keys():
+        placeholders.append(get_placeholder(model, field))
     fields = ", ".join(model.dict().keys())
-    return f"INSERT INTO {table_name} ({fields}) VALUES ({placeholders})"
+    values = ", ".join(placeholders)
+    return f"INSERT INTO {table_name} ({fields}) VALUES ({values})"
 
 
-def update_query(table_name: str, model: BaseModel, where: str = "WHERE id = ?") -> str:
+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 = ?`
+    :param where: Where string, default to `WHERE id = :id`
     """
-    query = ", ".join([f"{field} = ?" for field in model.dict().keys()])
+    fields = []
+    for field in model.dict().keys():
+        placeholder = get_placeholder(model, field)
+        fields.append(f"{field} = {placeholder}")
+    query = ", ".join(fields)
     return f"UPDATE {table_name} SET {query} {where}"
 
 
@@ -223,3 +235,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}

lnbits/lnurl.py

@@ -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",
+]

lnbits/middleware.py

@@ -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
@@ -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)

lnbits/server.py

@@ -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,

lnbits/settings.py

@@ -47,6 +47,7 @@ class UsersSettings(LNbitsSettings):
 
 class ExtensionsSettings(LNbitsSettings):
     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(
         default=[
@@ -61,23 +62,132 @@ class ExtensionsInstallSettings(LNbitsSettings):
     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):
@@ -86,9 +196,9 @@ class ThemesSettings(LNbitsSettings):
     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_show_home_page_elements: bool = Field(default=True)
     lnbits_default_wallet_name: str = Field(default="LNbits wallet")
-    lnbits_custom_badge: str = Field(default=None)
+    lnbits_custom_badge: Optional[str] = Field(default=None)
     lnbits_custom_badge_color: str = Field(default="warning")
     lnbits_theme_options: list[str] = Field(
         default=[
@@ -101,7 +211,7 @@ 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/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"
@@ -119,7 +229,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")
 
@@ -214,6 +324,12 @@ 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)
@@ -248,6 +364,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)
 
@@ -262,19 +397,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):
@@ -411,19 +550,23 @@ class SuperUserSettings(LNbitsSettings):
     lnbits_allowed_funding_sources: list[str] = Field(
         default=[
             "AlbyWallet",
-            "FakeWallet",
+            "BoltzWallet",
+            "BlinkWallet",
+            "BreezSdkWallet",
             "CoreLightningRestWallet",
             "CoreLightningWallet",
             "EclairWallet",
-            "LNbitsWallet",
-            "LndRestWallet",
+            "FakeWallet",
             "LNPayWallet",
+            "LNbitsWallet",
             "LnTipsWallet",
+            "LndRestWallet",
             "LndWallet",
             "OpenNodeWallet",
             "PhoenixdWallet",
             "VoidWallet",
             "ZBDWallet",
+            "NWCWallet",
         ]
     )
 
@@ -481,7 +624,7 @@ class Settings(EditableSettings, ReadOnlySettings, TransientSettings, BaseSettin
         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
@@ -489,6 +632,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

lnbits/static/css/base.css

@@ -554,3 +554,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;
+}

lnbits/static/i18n/br.js

@@ -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',
@@ -34,6 +36,8 @@ window.localisation.br = {
     '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}',
+  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.',
@@ -165,7 +169,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.',
@@ -249,5 +253,6 @@ window.localisation.br = {
   pay_from_wallet: 'Pagar com a Carteira',
   show_qr: 'Exibir QR',
   retry_install: 'Repetir Instalação',
-  new_payment: 'Efetuar Novo Pagamento'
+  new_payment: 'Efetuar Novo Pagamento',
+  hide_empty_wallets: 'Ocultar carteiras vazias'
 }

lnbits/static/i18n/cn.js

@@ -9,6 +9,8 @@ window.localisation.cn = {
   transactions: '交易记录',
   dashboard: '控制面板',
   node: '节点',
+  export_users: '导出用户',
+  no_users: '未找到用户',
   total_capacity: '总容量',
   avg_channel_size: '平均频道大小',
   biggest_channel_size: '最大通道大小',
@@ -33,6 +35,8 @@ window.localisation.cn = {
   reset_defaults_tooltip: '删除所有设置并重置为默认设置',
   download_backup: '下载数据库备份',
   name_your_wallet: '给你的 %{name}钱包起个名字',
+  wallet_topup_ok:
+    '成功创建虚拟资金（%{amount} sats）。付款取决于资金来源的实际资金。',
   paste_invoice_label: '粘贴发票，付款请求或lnurl*',
   lnbits_description:
     'LNbits 设置简单、轻量级，可以在任何闪电网络的资金来源上运行，甚至可以在LNbits自身上运行！您可以为自己运行LNbits，或者轻松为他人提供托管解决方案。每个钱包都有自己的 API 密钥，你可以创建的钱包数量没有限制。能够把资金分开管理使 LNbits 成为一款有用的资金管理和开发工具。扩展程序增加了 LNbits 的额外功能，所以你可以在闪电网络上尝试各种尖端技术。我们已经尽可能简化了开发扩展程序的过程，作为一个免费和开源的项目，我们鼓励人们开发并提交自己的扩展程序。',
@@ -155,7 +159,7 @@ window.localisation.cn = {
     '如果启用，当LNbits发送终止信号时，系统将自动将您的资金来源更改为VoidWallet。更新后，您将需要手动启用。',
   killswitch_interval: 'Killswitch 间隔',
   killswitch_interval_desc:
-    '后台任务应该多久检查一次来自状态源的LNBits断路信号（以分钟为单位）。',
+    '后台任务应该多久检查一次来自状态源的LNbits断路信号（以分钟为单位）。',
   enable_watchdog: '启用看门狗',
   enable_watchdog_desc:
     '如果启用，当您的余额低于LNbits余额时，系统将自动将您的资金来源更改为VoidWallet。更新后您将需要手动启用。',
@@ -237,5 +241,6 @@ window.localisation.cn = {
   pay_from_wallet: '从钱包支付',
   show_qr: '显示QR码',
   retry_install: '重试安装',
-  new_payment: '创建新支付'
+  new_payment: '创建新支付',
+  hide_empty_wallets: '隐藏空钱包'
 }

lnbits/static/i18n/cs.js

@@ -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',
@@ -33,6 +35,8 @@ window.localisation.cs = {
   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',
+  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í.',
@@ -162,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ě.',
@@ -246,5 +250,6 @@ window.localisation.cs = {
   pay_from_wallet: 'Platit z peněženky',
   show_qr: 'Zobrazit QR',
   retry_install: 'Zkusit znovu nainstalovat',
-  new_payment: 'Vytvořit novou platbu'
+  new_payment: 'Vytvořit novou platbu',
+  hide_empty_wallets: 'Skrýt prázdné peněženky'
 }

lnbits/static/i18n/de.js

@@ -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',
@@ -34,6 +36,8 @@ window.localisation.de = {
     'Alle Einstellungen auf die Standardeinstellungen zurücksetzen.',
   download_backup: 'Datenbank-Backup herunterladen',
   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:
@@ -167,7 +171,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.',
@@ -254,5 +258,6 @@ window.localisation.de = {
   pay_from_wallet: 'Zahlen aus dem Geldbeutel',
   show_qr: 'QR anzeigen',
   retry_install: 'Installieren erneut versuchen',
-  new_payment: 'Neue Zahlung vornehmen'
+  new_payment: 'Neue Zahlung vornehmen',
+  hide_empty_wallets: 'Leere Geldbörsen verbergen'
 }

lnbits/static/i18n/en.js

@@ -118,6 +118,7 @@ window.localisation.en = {
   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',
@@ -144,6 +145,7 @@ window.localisation.en = {
   payment_hash: 'Payment Hash',
   fee: 'Fee',
   amount: 'Amount',
+  amount_sats: 'Amount (sats)',
   tag: 'Tag',
   unit: 'Unit',
   description: 'Description',
@@ -163,7 +165,7 @@ window.localisation.en = {
     '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.',
@@ -239,14 +241,26 @@ window.localisation.en = {
   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.',
   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',
-  hide_empty_wallets: 'Hide empty wallets'
+  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'
 }

lnbits/static/i18n/es.js

@@ -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',
@@ -34,6 +36,8 @@ window.localisation.es = {
     '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}',
+  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.',
@@ -165,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.',
@@ -251,5 +255,6 @@ window.localisation.es = {
   pay_from_wallet: 'Pagar desde la billetera',
   show_qr: 'Mostrar QR',
   retry_install: 'Reintentar Instalación',
-  new_payment: 'Realizar nuevo pago'
+  new_payment: 'Realizar nuevo pago',
+  hide_empty_wallets: 'Ocultar billeteras vacías'
 }

lnbits/static/i18n/fi.js

@@ -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',
@@ -34,6 +36,8 @@ window.localisation.fi = {
     'Poista kaikki asetusten muutokset ja palauta järjestelmän oletusasetukset.',
   download_backup: 'Lataa tietokannan varmuuskopio',
   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:
@@ -62,7 +66,7 @@ window.localisation.fi = {
   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ä',
   payment_reactions: 'Maksureaktiot',
   view_swagger_docs: 'Näytä LNbits Swagger API-dokumentit',
@@ -249,5 +253,6 @@ window.localisation.fi = {
   pay_from_wallet: 'Maksa lompakosta',
   show_qr: 'Näytä QR',
   retry_install: 'Yritä asennusta uudelleen',
-  new_payment: 'Tee uusi maksu'
+  new_payment: 'Tee uusi maksu',
+  hide_empty_wallets: 'Piilota tyhjät lompakot'
 }

lnbits/static/i18n/fr.js

@@ -9,6 +9,8 @@ window.localisation.fr = {
   transactions: 'Transactions',
   dashboard: 'Tableau de bord',
   node: 'Noeud',
+  export_users: 'Exporter les utilisateurs',
+  no_users: 'Aucun utilisateur trouvé',
   total_capacity: 'Capacité totale',
   avg_channel_size: 'Taille moyenne du canal',
   biggest_channel_size: 'Taille de canal maximale',
@@ -36,6 +38,8 @@ window.localisation.fr = {
     'Supprimer tous les paramètres et les réinitialiser aux valeurs par défaut.',
   download_backup: 'Télécharger la sauvegarde de la base de données',
   name_your_wallet: 'Nommez votre portefeuille %{name}',
+  wallet_topup_ok:
+    'Succès de la création de fonds virtuels (%{amount} sats). Les paiements dépendent des fonds réels sur la source de financement.',
   paste_invoice_label:
     'Coller une facture, une demande de paiement ou un code lnurl *',
   lnbits_description:
@@ -169,7 +173,7 @@ window.localisation.fr = {
     'Si activé, il changera automatiquement votre source de financement en VoidWallet si LNbits envoie un signal de coupure. Vous devrez activer manuellement après une mise à jour.',
   killswitch_interval: 'Intervalle du Killswitch',
   killswitch_interval_desc:
-    "À quelle fréquence la tâche de fond doit-elle vérifier le signal d'arrêt d'urgence LNBits provenant de la source de statut (en minutes).",
+    "À quelle fréquence la tâche de fond doit-elle vérifier le signal d'arrêt d'urgence LNbits provenant de la source de statut (en minutes).",
   enable_watchdog: 'Activer le Watchdog',
   enable_watchdog_desc:
     'Si elle est activée, elle changera automatiquement votre source de financement en VoidWallet si votre solde est inférieur au solde LNbits. Vous devrez activer manuellement après une mise à jour.',
@@ -256,5 +260,6 @@ window.localisation.fr = {
   pay_from_wallet: 'Payer depuis le portefeuille',
   show_qr: 'Afficher le QR',
   retry_install: "Réessayer l'installation",
-  new_payment: 'Effectuer un nouveau paiement'
+  new_payment: 'Effectuer un nouveau paiement',
+  hide_empty_wallets: 'Masquer les portefeuilles vides'
 }

lnbits/static/i18n/it.js

@@ -9,6 +9,8 @@ window.localisation.it = {
   transactions: 'Transazioni',
   dashboard: 'Pannello di controllo',
   node: 'Interruttore',
+  export_users: 'Esporta utenti',
+  no_users: 'Nessun utente trovato',
   total_capacity: 'Capacità Totale',
   avg_channel_size: 'Dimensione media del canale',
   biggest_channel_size: 'Dimensione del canale più grande',
@@ -34,6 +36,8 @@ window.localisation.it = {
     'Cancella tutte le impostazioni e ripristina i valori predefiniti',
   download_backup: 'Scarica il backup del database',
   name_your_wallet: 'Dai un nome al tuo portafoglio %{name}',
+  wallet_topup_ok:
+    'Operazione riuscita nella creazione di fondi virtuali (%{amount} sats). I pagamenti dipendono dai fondi effettivi sulla fonte di finanziamento.',
   paste_invoice_label:
     'Incolla una fattura, una richiesta di pagamento o un codice lnurl *',
   lnbits_description:
@@ -165,7 +169,7 @@ window.localisation.it = {
     'Se attivato, cambierà automaticamente la tua fonte di finanziamento in VoidWallet se LNbits invia un segnale di killswitch. Dovrai attivare manualmente dopo un aggiornamento.',
   killswitch_interval: 'Intervallo Killswitch',
   killswitch_interval_desc:
-    'Quanto spesso il compito in background dovrebbe controllare il segnale di killswitch LNBits dalla fonte di stato (in minuti).',
+    'Quanto spesso il compito in background dovrebbe controllare il segnale di killswitch LNbits dalla fonte di stato (in minuti).',
   enable_watchdog: 'Attiva Watchdog',
   enable_watchdog_desc:
     'Se abilitato, cambierà automaticamente la tua fonte di finanziamento in VoidWallet se il tuo saldo è inferiore al saldo LNbits. Dovrai abilitarlo manualmente dopo un aggiornamento.',
@@ -253,5 +257,6 @@ window.localisation.it = {
   pay_from_wallet: 'Paga dal Portafoglio',
   show_qr: 'Mostra QR',
   retry_install: 'Riprova Installazione',
-  new_payment: 'Effettua Nuovo Pagamento'
+  new_payment: 'Effettua Nuovo Pagamento',
+  hide_empty_wallets: 'Nascondi portafogli vuoti'
 }

lnbits/static/i18n/jp.js

@@ -9,6 +9,8 @@ window.localisation.jp = {
   transactions: 'トランザクション',
   dashboard: 'ダッシュボード',
   node: 'ノード',
+  export_users: 'ユーザーのエクスポート',
+  no_users: 'ユーザーが見つかりません',
   total_capacity: '合計容量',
   avg_channel_size: '平均チャンネルサイズ',
   biggest_channel_size: '最大チャネルサイズ',
@@ -33,6 +35,8 @@ window.localisation.jp = {
   reset_defaults_tooltip: 'すべての設定を削除してデフォルトに戻します。',
   download_backup: 'データベースのバックアップをダウンロードする',
   name_your_wallet: 'あなたのウォレットの名前 %{name}',
+  wallet_topup_ok:
+    '仮想資金の作成に成功しました（%{amount} sats）。支払いは資金ソースの実際の資金に依存します。',
   paste_invoice_label: '請求書を貼り付けてください',
   lnbits_description:
     '簡単にインストールでき、軽量なLNbitsは、あらゆるライトニングネットワークの資金源と、LNbits自身でさえも実行できます！LNbitsを個人で実行することも、他人に対してカストディアンソリューションをで実行できます！ LNbitsを自分で実行することも、他の人に優れたソリューションを提供することもできます。各ウォレットには独自のAPIキーがあり、作成できるウォレットの数に制限はありません。資金を分割する機能は、LNbitsを資金管理ツールとして使用したり、開発ツールとして使用したりするための便利なツールです。拡張機能は、LNbitsに追加の機能を追加します。そのため、LNbitsは最先端の技術をネットワークLightningで試すことができます。拡張機能を開発するのは簡単で、無料でオープンソースのプロジェクトであるため、人々が自分で開発し、自分の貢献を送信することを奨励しています。',
@@ -162,7 +166,7 @@ window.localisation.jp = {
     '有効にすると、LNbitsからキルスイッチ信号が送信された場合に自動的に資金源をVoidWalletに切り替えます。更新後には手動で有効にする必要があります。',
   killswitch_interval: 'キルスイッチ間隔',
   killswitch_interval_desc:
-    'バックグラウンドタスクがステータスソースからLNBitsキルスイッチ信号を確認する頻度（分単位）。',
+    'バックグラウンドタスクがステータスソースからLNbitsキルスイッチ信号を確認する頻度（分単位）。',
   enable_watchdog: 'ウォッチドッグを有効にする',
   enable_watchdog_desc:
     '有効にすると、残高がLNbitsの残高より少ない場合に、資金源を自動的にVoidWalletに変更します。アップデート後は手動で有効にする必要があります。',
@@ -248,5 +252,6 @@ window.localisation.jp = {
   pay_from_wallet: 'ウォレットから支払う',
   show_qr: 'QRを表示',
   retry_install: '再試行インストール',
-  new_payment: '新しい支払いを作成する'
+  new_payment: '新しい支払いを作成する',
+  hide_empty_wallets: '空のウォレットを非表示にする'
 }

lnbits/static/i18n/kr.js

@@ -9,6 +9,8 @@ window.localisation.kr = {
   transactions: '거래 내역',
   dashboard: '현황판',
   node: '노드',
+  export_users: '사용자 내보내기',
+  no_users: '사용자가 없습니다',
   total_capacity: '총 용량',
   avg_channel_size: '평균 채널 용량',
   biggest_channel_size: '가장 큰 채널 용량',
@@ -34,9 +36,11 @@ window.localisation.kr = {
     '설정했던 내용들을 모두 지우고, 기본 설정으로 돌아갑니다.',
   download_backup: '데이터베이스 백업 다운로드',
   name_your_wallet: '사용할 %{name}지갑의 이름을 정하세요',
+  wallet_topup_ok:
+    '성공적으로 가상 자금을 생성했습니다 (%{amount} sats). 지급은 자금 원천의 실제 자금에 따라 달라집니다.',
   paste_invoice_label: '인보이스, 결제 요청, 혹은 lnurl 코드를 붙여넣으세요 *',
   lnbits_description:
-    '설정이 쉽고 가벼운 LNBits는 어떤 라이트닝 네트워크의 예산 자원 위에서든 돌아갈 수 있습니다, 그리고 다른 LNBits 지갑들입니다. 스스로 사용하기 위해, 또는 다른 사람들에게 수탁형 솔루션을 제공하기 위해 LNBits를 운영할 수 있습니다. 각 지갑들은 자신만의 API key를 가지며, 생성 가능한 지갑의 수에는 제한이 없습니다. 자금을 분할할 수 있는 기능으로 인해, LNBits는 자금 운영 도구로써뿐만 아니라 개발 도구로써도 유용합니다. 확장 기능들은 LNBits에 여러분들이 라이트닝 네트워크의 다양한 최신 기술들을 수행해볼 수 있게 하는 추가 기능을 제공합니다. LNBits 개발진들은 확장 기능들의 개발 또한 가능한 쉽게 만들었으며, 무료 오픈 소스 프로젝트답게 사람들이 자신만의 확장 기능들을 개발하고 제출하기를 응원합니다.',
+    '설정이 쉽고 가벼운 LNbits는 어떤 라이트닝 네트워크의 예산 자원 위에서든 돌아갈 수 있습니다, 그리고 다른 LNbits 지갑들입니다. 스스로 사용하기 위해, 또는 다른 사람들에게 수탁형 솔루션을 제공하기 위해 LNbits를 운영할 수 있습니다. 각 지갑들은 자신만의 API key를 가지며, 생성 가능한 지갑의 수에는 제한이 없습니다. 자금을 분할할 수 있는 기능으로 인해, LNbits는 자금 운영 도구로써뿐만 아니라 개발 도구로써도 유용합니다. 확장 기능들은 LNbits에 여러분들이 라이트닝 네트워크의 다양한 최신 기술들을 수행해볼 수 있게 하는 추가 기능을 제공합니다. LNbits 개발진들은 확장 기능들의 개발 또한 가능한 쉽게 만들었으며, 무료 오픈 소스 프로젝트답게 사람들이 자신만의 확장 기능들을 개발하고 제출하기를 응원합니다.',
   export_to_phone: 'QR 코드를 이용해 모바일 기기로 내보내기',
   export_to_phone_desc:
     '이 QR 코드는 선택된 지갑의 최대 접근 권한을 가진 전체 URL을 담고 있습니다. 스캔 후, 모바일 기기에서 지갑을 열 수 있습니다.',
@@ -58,7 +62,7 @@ window.localisation.kr = {
   service_fee: '서비스 수수료: 거래액의 %{amount} %',
   service_fee_max: '서비스 수수료: 거래액의 %{amount} % (최대 %{max} sats)',
   service_fee_tooltip:
-    '지불 결제 시마다 LNBits 서버 관리자에게 납부되는 서비스 수수료',
+    '지불 결제 시마다 LNbits 서버 관리자에게 납부되는 서비스 수수료',
   toggle_darkmode: '다크 모드 전환',
   payment_reactions: '결제 반응',
   view_swagger_docs: 'LNbits Swagger API 문서를 봅니다',
@@ -245,5 +249,6 @@ window.localisation.kr = {
   pay_from_wallet: '지갑에서 결제하다',
   show_qr: 'QR 보기',
   retry_install: '다시 설치하세요',
-  new_payment: '새로운 결제하기'
+  new_payment: '새로운 결제하기',
+  hide_empty_wallets: '빈 지갑 숨기기'
 }

lnbits/static/i18n/nl.js

@@ -9,6 +9,8 @@ window.localisation.nl = {
   transactions: 'Transacties',
   dashboard: 'Dashboard',
   node: 'Knooppunt',
+  export_users: 'Gebruikers exporteren',
+  no_users: 'Geen gebruikers gevonden',
   total_capacity: 'Totale capaciteit',
   avg_channel_size: 'Gem. Kanaalgrootte',
   biggest_channel_size: 'Grootste Kanaalgrootte',
@@ -35,6 +37,8 @@ window.localisation.nl = {
     'Wis alle instellingen en herstel de standaardinstellingen.',
   download_backup: 'Databaseback-up downloaden',
   name_your_wallet: 'Geef je %{name} portemonnee een naam',
+  wallet_topup_ok:
+    'Succes met het aanmaken van virtuele fondsen (%{amount} sats). Betalingen zijn afhankelijk van de werkelijke fondsen op de financieringsbron.',
   paste_invoice_label: 'Plak een factuur, betalingsverzoek of lnurl-code*',
   lnbits_description:
     'Gemakkelijk in te stellen en lichtgewicht, LNbits kan op elke lightning-netwerkfinancieringsbron draaien en zelfs LNbits zelf! U kunt LNbits voor uzelf laten draaien of gemakkelijk een bewaardersoplossing voor anderen bieden. Elke portemonnee heeft zijn eigen API-sleutels en er is geen limiet aan het aantal portemonnees dat u kunt maken. Het kunnen partitioneren van fondsen maakt LNbits een nuttige tool voor geldbeheer en als ontwikkelingstool. Extensies voegen extra functionaliteit toe aan LNbits, zodat u kunt experimenteren met een reeks toonaangevende technologieën op het bliksemschichtnetwerk. We hebben het ontwikkelen van extensies zo eenvoudig mogelijk gemaakt en als een gratis en opensource-project moedigen we mensen aan om hun eigen ontwikkelingen in te dienen.',
@@ -165,7 +169,7 @@ window.localisation.nl = {
     'Indien ingeschakeld, zal het uw financieringsbron automatisch wijzigen naar VoidWallet als LNbits een killswitch-signaal verzendt. U zult het na een update handmatig moeten inschakelen.',
   killswitch_interval: 'Uitschakelschakelaar-interval',
   killswitch_interval_desc:
-    'Hoe vaak de achtergrondtaak moet controleren op het LNBits killswitch signaal van de statusbron (in minuten).',
+    'Hoe vaak de achtergrondtaak moet controleren op het LNbits killswitch signaal van de statusbron (in minuten).',
   enable_watchdog: 'Inschakelen Watchdog',
   enable_watchdog_desc:
     'Indien ingeschakeld, wordt uw betaalbron automatisch gewijzigd naar VoidWallet als uw saldo lager is dan het saldo van LNbits. U zult dit na een update handmatig moeten inschakelen.',
@@ -252,5 +256,6 @@ window.localisation.nl = {
   pay_from_wallet: 'Betalen vanuit Portemonnee',
   show_qr: 'Toon QR',
   retry_install: 'Opnieuw installeren',
-  new_payment: 'Nieuwe betaling maken'
+  new_payment: 'Nieuwe betaling maken',
+  hide_empty_wallets: 'Verberg lege portemonnees'
 }

lnbits/static/i18n/pi.js

@@ -9,6 +9,8 @@ window.localisation.pi = {
   transactions: 'Pirate Transactions and loot',
   dashboard: 'Arrr-board',
   node: 'Node',
+  export_users: 'Export Mateys',
+  no_users: 'No swabbies found',
   total_capacity: 'Total Capacity',
   avg_channel_size: 'Avg. Channel Size',
   biggest_channel_size: 'Largest Bilge Size',
@@ -34,6 +36,8 @@ window.localisation.pi = {
     'Scuttle all settings and reset to Davy Jones Locker. Aye, start anew!',
   download_backup: 'Download database booty',
   name_your_wallet: 'Name yer %{name} treasure chest',
+  wallet_topup_ok:
+    "Success creatin' virtual funds (%{amount} sats). Payments depend on actual funds on funding source.",
   paste_invoice_label: 'Paste a booty, payment request or lnurl code, matey!',
   lnbits_description:
     'Arr, easy to set up and lightweight, LNbits can run on any Lightning Network funding source and even LNbits itself! Ye can run LNbits for yourself, or easily offer a custodian solution for others. Each chest has its own API keys and there be no limit to the number of chests ye can make. Being able to partition booty makes LNbits a useful tool for money management and as a development tool. Arr, extensions add extra functionality to LNbits so ye 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 scallywags to develop and submit their own.',
@@ -164,7 +168,7 @@ window.localisation.pi = {
     "If enabled it'll be changin' yer fundin' source to VoidWallet automatically if LNbits sends out a killswitch signal, ye will. Ye'll be needin' t' enable manually after an update, arr.",
   killswitch_interval: 'Killswitch Interval',
   killswitch_interval_desc:
-    "How oft th' background task should be checkin' fer th' LNBits killswitch signal from th' status source (in minutes).",
+    "How oft th' background task should be checkin' fer th' LNbits killswitch signal from th' status source (in minutes).",
   enable_watchdog: 'Enable Seadog',
   enable_watchdog_desc:
     "If enabled, it will swap yer treasure source t' VoidWallet on its own if yer balance be lower than th' LNbits balance. Ye'll need t' enable by hand after an update.",
@@ -249,5 +253,6 @@ window.localisation.pi = {
   pay_from_wallet: 'Pay from ye Wallet',
   show_qr: 'Show QR',
   retry_install: "Try 'nstallin' Again",
-  new_payment: 'Make New Payment'
+  new_payment: 'Make New Payment',
+  hide_empty_wallets: 'Stow empty wallets'
 }

lnbits/static/i18n/pl.js

@@ -9,6 +9,8 @@ window.localisation.pl = {
   transactions: 'Transakcje',
   dashboard: 'Panel kontrolny',
   node: 'Węzeł',
+  export_users: 'Eksportuj użytkowników',
+  no_users: 'Nie znaleziono użytkowników',
   total_capacity: 'Całkowita Pojemność',
   avg_channel_size: 'Średni rozmiar kanału',
   biggest_channel_size: 'Największy Rozmiar Kanału',
@@ -33,6 +35,8 @@ window.localisation.pl = {
   reset_defaults_tooltip: 'Wymaż wszystkie ustawienia i ustaw domyślne.',
   download_backup: 'Pobierz kopię zapasową bazy danych',
   name_your_wallet: 'Nazwij swój portfel %{name}',
+  wallet_topup_ok:
+    'Sukces w tworzeniu wirtualnych środków (%{amount} sats). Płatności zależą od rzeczywistych środków na źródle finansowania.',
   paste_invoice_label: 'Wklej fakturę, żądanie zapłaty lub kod lnurl *',
   lnbits_description:
     'Łatwy i lekki w konfiguracji, LNbits może działać w oparciu o dowolne źródło finansowania w sieci lightning czy nawet inną instancję LNbits! Możesz uruchomić instancję LNbits dla siebie lub dla innych. Każdy portfel ma swoje klucze API i nie ma ograniczeń jeśli chodzi o ilość portfeli. LNbits umożliwia dzielenie środków w celu zarządzania nimi, jest również dobrym narzędziem deweloperskim. Rozszerzenia zwiększają funkcjonalność LNbits co umożliwia eksperymentowanie z nowym technologiami w sieci lightning. Tworzenie rozszerzeń jest proste dlatego zachęcamy innych deweloperów do tworzenia dodatkowych funkcjonalności i wysyłanie do nas PR',
@@ -162,7 +166,7 @@ window.localisation.pl = {
     'Jeśli zostanie włączone, automatycznie zmieni źródło finansowania na VoidWallet, jeśli LNbits wyśle sygnał wyłączający. Po aktualizacji będziesz musiał włączyć to ręcznie.',
   killswitch_interval: 'Interwał wyłącznika awaryjnego',
   killswitch_interval_desc:
-    'Jak często zadanie w tle powinno sprawdzać sygnał wyłącznika awaryjnego LNBits ze źródła statusu (w minutach).',
+    'Jak często zadanie w tle powinno sprawdzać sygnał wyłącznika awaryjnego LNbits ze źródła statusu (w minutach).',
   enable_watchdog: 'Włącz Watchdog',
   enable_watchdog_desc:
     'Jeśli zostanie włączone, automatycznie zmieni źródło finansowania na VoidWallet, jeśli saldo jest niższe niż saldo LNbits. Po aktualizacji trzeba będzie włączyć ręcznie.',
@@ -248,5 +252,6 @@ window.localisation.pl = {
   pay_from_wallet: 'Zapłać z portfela',
   show_qr: 'Pokaż kod QR',
   retry_install: 'Ponów instalację',
-  new_payment: 'Dokonaj nowej płatności'
+  new_payment: 'Dokonaj nowej płatności',
+  hide_empty_wallets: 'Ukryj puste portfele'
 }

lnbits/static/i18n/pt.js

@@ -9,6 +9,8 @@ window.localisation.pt = {
   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 do Canal',
@@ -34,6 +36,8 @@ window.localisation.pt = {
     'Apagar todas as configurações e redefinir para os padrões.',
   download_backup: 'Fazer backup da base de dados',
   name_your_wallet: 'Nomeie sua carteira %{name}',
+  wallet_topup_ok:
+    'Sucesso ao criar fundos virtuais (%{amount} sats). Os 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.',
@@ -164,7 +168,7 @@ window.localisation.pt = {
     'Se ativado, ele mudará sua fonte de financiamento 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, mudará automaticamente a sua fonte de financiamento para VoidWallet caso o seu saldo seja inferior ao saldo LNbits. Você precisará ativar manualmente após uma atualização.',
@@ -248,5 +252,6 @@ window.localisation.pt = {
   pay_from_wallet: 'Pague da Carteira',
   show_qr: 'Exibir QR',
   retry_install: 'Reinstalar Tente Novamente',
-  new_payment: 'Realizar Novo Pagamento'
+  new_payment: 'Realizar Novo Pagamento',
+  hide_empty_wallets: 'Ocultar carteiras vazias'
 }

lnbits/static/i18n/sk.js

@@ -9,6 +9,8 @@ window.localisation.sk = {
   transactions: 'Transakcie',
   dashboard: 'Prehľad',
   node: 'Uzol',
+  export_users: 'Exportovať používateľov',
+  no_users: 'Nenašli sa žiadni používatelia',
   total_capacity: 'Celková kapacita',
   avg_channel_size: 'Priemerná veľkosť kanálu',
   biggest_channel_size: 'Najväčší kanál',
@@ -33,6 +35,8 @@ window.localisation.sk = {
   reset_defaults_tooltip: 'Odstrániť všetky nastavenia a obnoviť predvolené.',
   download_backup: 'Stiahnuť zálohu databázy',
   name_your_wallet: 'Pomenujte vašu %{name} peňaženku',
+  wallet_topup_ok:
+    'Úspešne vytvorené virtuálne prostriedky (%{amount} sats). Platby závisia od skutočných prostriedkov v zdroji financovania.',
   paste_invoice_label: 'Vložte faktúru, platobnú požiadavku alebo lnurl kód *',
   lnbits_description:
     'Ľahko nastaviteľný a ľahkotonážny, LNbits môže bežať na akomkoľvek zdroji financovania Lightning Network a dokonca LNbits samotný! LNbits môžete používať pre seba, alebo ľahko ponúknuť správcovské riešenie pre iných. Každá peňaženka má svoje vlastné API kľúče a nie je limit na počet peňaženiek, ktoré môžete vytvoriť. Schopnosť rozdeľovať finančné prostriedky robí z LNbits užitočný nástroj pre správu peňazí a ako vývojový nástroj. Rozšírenia pridávajú extra funkčnosť do LNbits, takže môžete experimentovať s radou najnovších technológií na lightning sieti. Vývoj rozšírení sme urobili čo najjednoduchší a ako voľný a open-source projekt, podporujeme ľudí vývoj a odovzdávanie vlastných rozšírení.',
@@ -247,5 +251,6 @@ window.localisation.sk = {
   pay_from_wallet: 'Zaplatiť z peňaženky',
   show_qr: 'Zobraziť QR',
   retry_install: 'Skúste inštaláciu znova',
-  new_payment: 'Vytvoriť novú platbu'
+  new_payment: 'Vytvoriť novú platbu',
+  hide_empty_wallets: 'Skryť prázdne peňaženky'
 }

lnbits/static/i18n/we.js

@@ -9,6 +9,8 @@ window.localisation.we = {
   transactions: 'Trafodion',
   dashboard: 'Panel Gweinyddol',
   node: 'Nod',
+  export_users: 'Allfor Defnyddwyr',
+  no_users: 'Heb ganfod defnyddwyr',
   total_capacity: 'Capasiti Cyfanswm',
   avg_channel_size: 'Maint Sianel Cyf.',
   biggest_channel_size: 'Maint Sianel Fwyaf',
@@ -33,6 +35,8 @@ window.localisation.we = {
   reset_defaults_tooltip: 'Dileu pob gosodiad ac ailosod i`r rhagosodiadau.',
   download_backup: 'Lawrlwytho copi wrth gefn cronfa ddata',
   name_your_wallet: 'Enwch eich waled %{name}',
+  wallet_topup_ok:
+    "Llwyddiant wrth greu cronfeydd rhithwir (%{amount} sats). Mae taliadau'n dibynnu ar gronfeydd gwirioneddol ar y ffynhonnell cyllido.",
   paste_invoice_label: 'Gludwch anfoneb, cais am daliad neu god lnurl *',
   lnbits_description:
     'Yn hawdd iw sefydlu ac yn ysgafn, gall LNbits redeg ar unrhyw ffynhonnell ariannu rhwydwaith mellt a hyd yn oed LNbits ei hun! Gallwch redeg LNbits i chi`ch hun, neu gynnig datrysiad ceidwad i eraill yn hawdd. Mae gan bob waled ei allweddi API ei hun ac nid oes cyfyngiad ar nifer y waledi y gallwch eu gwneud. Mae gallu rhannu cronfeydd yn gwneud LNbits yn arf defnyddiol ar gyfer rheoli arian ac fel offeryn datblygu. Mae estyniadau yn ychwanegu ymarferoldeb ychwanegol at LNbits fel y gallwch arbrofi gydag ystod o dechnolegau blaengar ar y rhwydwaith mellt. Rydym wedi gwneud datblygu estyniadau mor hawdd â phosibl, ac fel prosiect ffynhonnell agored am ddim, rydym yn annog pobl i ddatblygu a chyflwyno eu rhai eu hunain.',
@@ -162,7 +166,7 @@ window.localisation.we = {
     'Os bydd yn galluogi, bydd yn newid eich ffynhonnell arian i VoidWallet yn awtomatig os bydd LNbits yn anfon arwydd killswitch. Bydd angen i chi alluogi â llaw ar ôl diweddariad.',
   killswitch_interval: 'Amlder Cyllell Dorri',
   killswitch_interval_desc:
-    "Pa mor aml y dylai'r dasg gefndir wirio am signal killswitch LNBits o'r ffynhonnell statws (mewn munudau).",
+    "Pa mor aml y dylai'r dasg gefndir wirio am signal killswitch LNbits o'r ffynhonnell statws (mewn munudau).",
   enable_watchdog: 'Galluogi Watchdog',
   enable_watchdog_desc:
     'Os bydd yn cael ei alluogi bydd yn newid eich ffynhonnell ariannu i VoidWallet yn awtomatig os bydd eich balans yn is na balans LNbits. Bydd angen i chi alluogi â llaw ar ôl diweddariad.',
@@ -247,5 +251,6 @@ window.localisation.we = {
   pay_from_wallet: "Talu o'r Waled",
   show_qr: 'Dangos QR',
   retry_install: 'Ailgeisio Gosod',
-  new_payment: 'Gwneud Taliad Newydd'
+  new_payment: 'Gwneud Taliad Newydd',
+  hide_empty_wallets: 'Cuddio waledau gwag'
 }

lnbits/static/images/boltz.svg

@@ -0,0 +1,10 @@
+<svg width="46.626mm" height="12.965mm" version="1.1" viewBox="0 0 46.626 12.965" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<g transform="matrix(.85851 0 0 .85851 -56.357 -42.14)">
+<g transform="matrix(.26458 0 0 .26458 69.488 50.153)" style="fill:none">
+<path d="m14.462 28.768-.0035.0072h-12.787c-.4776 0-.8756-.1467-1.194-.4401s-.4776-.6619-.4776-1.1055c0-.4723.20262-.9589.60786-1.4598l20.342-24.837c.3763-.48659.7924-.77997 1.2482-.88015.4559-.10018.8648-.057246 1.2266.1288.3618.18605.6151.49016.7598.91235.1448.42218.1086.92666-.1085 1.5134l-6.643 17.625h1.1057l.0035-.0072h12.787c.4776 0 .8756.1467 1.194.4401s.4776.6619.4776 1.1055c0 .4723-.2026.9589-.6079 1.4598l-20.342 24.837c-.3763.4865-.7924.7799-1.2482.8801-.4559.1002-.86479.0573-1.2266-.1288-.36182-.186-.61509-.4902-.75982-.9123-.14473-.4222-.10855-.9267.10854-1.5135l6.643-17.624z" clip-rule="evenodd" fill="#fff" fill-rule="evenodd" style="fill:#fff"/>
+</g>
+<g transform="matrix(.26458 0 0 .26458 81.643 50.938)" style="fill:none">
+<path d="m.92 42h19.488c7.672 0 12.488-4.144 12.488-11.312 0-5.152-2.072-7.952-5.264-9.464v-.224c1.96-1.4 3.808-3.752 3.808-8.008 0-6.44-4.76-10.192-11.76-10.192h-18.76zm8.736-24.08v-7.392h8.736c2.968 0 4.144 1.568 4.144 3.696s-1.176 3.696-4.144 3.696zm0 16.296v-8.68h9.296c3.808 0 4.984 2.352 4.984 4.312 0 2.352-1.232 4.368-4.984 4.368zm40.657 8.288c9.52 0 14.616-6.384 14.616-15.12 0-8.792-5.208-15.176-14.616-15.176s-14.616 6.384-14.616 15.176 5.096 15.12 14.616 15.12zm0-7.56c-3.528 0-5.824-2.24-5.824-7.56 0-5.264 2.24-7.616 5.824-7.616s5.824 2.296 5.824 7.616-2.24 7.56-5.824 7.56zm18.831 7.056h8.624v-41.44h-8.624zm26.552.504c2.744 0 5.0404-.504 5.9364-.84v-7.168h-.56c-.896.336-1.8484.504-2.8004.504-2.576 0-3.752-1.176-3.752-3.92v-11.032h7.0004v-7.336h-7.0004v-7.672h-.56l-7.672 1.568v6.104h-5.152v7.336h4.76v13.104c0 5.32 3.024 9.352 9.8 9.352zm10.397-.504h24.192v-7.336h-13.552v-.224l13.44-14.448v-7.28h-24.024v7.336h13.44v.224l-13.496 14.504z" fill="#fff" style="fill:#fff"/>
+</g>
+</g>
+</svg>

lnbits/static/images/boltzl.svg

@@ -0,0 +1,10 @@
+<svg width="46.626mm" height="12.965mm" version="1.1" viewBox="0 0 46.626 12.965" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<g transform="matrix(.85851 0 0 .85851 -56.357 -42.14)">
+<g transform="matrix(.26458 0 0 .26458 69.488 50.153)">
+<path d="m14.462 28.768-.0035.0072h-12.787c-.4776 0-.8756-.1467-1.194-.4401s-.4776-.6619-.4776-1.1055c0-.4723.20262-.9589.60786-1.4598l20.342-24.837c.3763-.48659.7924-.77997 1.2482-.88015.4559-.10018.8648-.057246 1.2266.1288.3618.18605.6151.49016.7598.91235.1448.42218.1086.92666-.1085 1.5134l-6.643 17.625h1.1057l.0035-.0072h12.787c.4776 0 .8756.1467 1.194.4401s.4776.6619.4776 1.1055c0 .4723-.2026.9589-.6079 1.4598l-20.342 24.837c-.3763.4865-.7924.7799-1.2482.8801-.4559.1002-.86479.0573-1.2266-.1288-.36182-.186-.61509-.4902-.75982-.9123-.14473-.4222-.10855-.9267.10854-1.5135l6.643-17.624z" clip-rule="evenodd" fill="#fff" fill-rule="evenodd" style="fill:#000"/>
+</g>
+<g transform="matrix(.26458 0 0 .26458 81.643 50.938)">
+<path d="m.92 42h19.488c7.672 0 12.488-4.144 12.488-11.312 0-5.152-2.072-7.952-5.264-9.464v-.224c1.96-1.4 3.808-3.752 3.808-8.008 0-6.44-4.76-10.192-11.76-10.192h-18.76zm8.736-24.08v-7.392h8.736c2.968 0 4.144 1.568 4.144 3.696s-1.176 3.696-4.144 3.696zm0 16.296v-8.68h9.296c3.808 0 4.984 2.352 4.984 4.312 0 2.352-1.232 4.368-4.984 4.368zm40.657 8.288c9.52 0 14.616-6.384 14.616-15.12 0-8.792-5.208-15.176-14.616-15.176s-14.616 6.384-14.616 15.176 5.096 15.12 14.616 15.12zm0-7.56c-3.528 0-5.824-2.24-5.824-7.56 0-5.264 2.24-7.616 5.824-7.616s5.824 2.296 5.824 7.616-2.24 7.56-5.824 7.56zm18.831 7.056h8.624v-41.44h-8.624zm26.552.504c2.744 0 5.0404-.504 5.9364-.84v-7.168h-.56c-.896.336-1.8484.504-2.8004.504-2.576 0-3.752-1.176-3.752-3.92v-11.032h7.0004v-7.336h-7.0004v-7.672h-.56l-7.672 1.568v6.104h-5.152v7.336h4.76v13.104c0 5.32 3.024 9.352 9.8 9.352zm10.397-.504h24.192v-7.336h-13.552v-.224l13.44-14.448v-7.28h-24.024v7.336h13.44v.224l-13.496 14.504z" fill="#fff" style="fill:#000"/>
+</g>
+</g>
+</svg>

lnbits/static/js/account.js

@@ -1,6 +1,6 @@
-new Vue({
+window.app = Vue.createApp({
   el: '#vue',
-  mixins: [windowMixin],
+  mixins: [window.windowMixin],
   data: function () {
     return {
       user: null,
@@ -32,6 +32,42 @@ new Vue({
     toggleDarkMode: function () {
       this.$q.dark.toggle()
       this.$q.localStorage.set('lnbits.darkMode', this.$q.dark.isActive)
+      if (!this.$q.dark.isActive && this.gradientChoice) {
+        this.toggleGradient()
+      }
+    },
+    applyGradient: function () {
+      darkBgColor = this.$q.localStorage.getItem('lnbits.darkBgColor')
+      primaryColor = this.$q.localStorage.getItem('lnbits.primaryColor')
+      if (this.gradientChoice) {
+        if (!this.$q.dark.isActive) {
+          this.toggleDarkMode()
+        }
+        const gradientStyle = `linear-gradient(to bottom right, ${LNbits.utils.hexDarken(String(primaryColor), -70)}, #0a0a0a)`
+        document.body.style.setProperty(
+          'background-image',
+          gradientStyle,
+          'important'
+        )
+        const gradientStyleCards = `background-color: ${LNbits.utils.hexAlpha(String(darkBgColor), 0.4)} !important`
+        const style = document.createElement('style')
+        style.innerHTML =
+          `body[data-theme="${this.$q.localStorage.getItem('lnbits.theme')}"] .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark), body.body${this.$q.dark.isActive ? '--dark' : ''} .q-header, body.body${this.$q.dark.isActive ? '--dark' : ''} .q-drawer { ${gradientStyleCards} }` +
+          `body[data-theme="${this.$q.localStorage.getItem('lnbits.theme')}"].body--dark{background: ${LNbits.utils.hexDarken(String(primaryColor), -88)} !important; }` +
+          `[data-theme="${this.$q.localStorage.getItem('lnbits.theme')}"] .q-card--dark{background: ${String(darkBgColor)} !important;} }`
+        document.head.appendChild(style)
+        this.$q.localStorage.set('lnbits.gradientBg', true)
+      } else {
+        this.$q.localStorage.set('lnbits.gradientBg', false)
+      }
+    },
+    toggleGradient: function () {
+      this.gradientChoice = !this.gradientChoice
+      this.applyGradient()
+      if (!this.gradientChoice) {
+        window.location.reload()
+      }
+      this.gradientChoice = this.$q.localStorage.getItem('lnbits.gradientBg')
     },
     reactionChoiceFunc: function () {
       this.$q.localStorage.set('lnbits.reactions', this.reactionChoice)
@@ -39,6 +75,10 @@ new Vue({
     changeColor: function (newValue) {
       document.body.setAttribute('data-theme', newValue)
       this.$q.localStorage.set('lnbits.theme', newValue)
+      this.setColors()
+      if (this.$q.localStorage.getItem('lnbits.gradientBg')) {
+        this.applyGradient()
+      }
     },
     updateAccount: async function () {
       try {
@@ -118,5 +158,8 @@ new Vue({
     } catch (e) {
       LNbits.utils.notifyApiError(e)
     }
+    if (this.$q.localStorage.getItem('lnbits.gradientBg')) {
+      this.applyGradient()
+    }
   }
 })

lnbits/static/js/admin.js

@@ -1,4 +1,4 @@
-new Vue({
+window.app = Vue.createApp({
   el: '#vue',
   mixins: [windowMixin],
   data: function () {

lnbits/static/js/base.js

@@ -1,15 +1,10 @@
-/* globals crypto, moment, Vue, axios, Quasar, _ */
-
-Vue.use(VueI18n)
-
 window.LOCALE = 'en'
-window.i18n = new VueI18n({
+window.i18n = new VueI18n.createI18n({
   locale: window.LOCALE,
   fallbackLocale: window.LOCALE,
   messages: window.localisation
 })
 
-window.EventHub = new Vue()
 window.LNbits = {
   api: {
     request: function (method, url, apiKey, data) {
@@ -247,7 +242,7 @@ window.LNbits = {
     payment: function (data) {
       obj = {
         checking_id: data.checking_id,
-        pending: data.pending,
+        status: data.status,
         amount: data.amount,
         fee: data.fee,
         memo: data.memo,
@@ -264,12 +259,12 @@ window.LNbits = {
         fiat_currency: data.fiat_currency
       }
 
-      obj.date = Quasar.utils.date.formatDate(
+      obj.date = Quasar.date.formatDate(
         new Date(obj.time * 1000),
         'YYYY-MM-DD HH:mm'
       )
       obj.dateFrom = moment(obj.date).fromNow()
-      obj.expirydate = Quasar.utils.date.formatDate(
+      obj.expirydate = Quasar.date.formatDate(
         new Date(obj.expiry * 1000),
         'YYYY-MM-DD HH:mm'
       )
@@ -280,14 +275,21 @@ window.LNbits = {
       obj.fsat = new Intl.NumberFormat(window.LOCALE).format(obj.sat)
       obj.isIn = obj.amount > 0
       obj.isOut = obj.amount < 0
-      obj.isPaid = !obj.pending
+      obj.isPending = obj.status === 'pending'
+      obj.isPaid = obj.status === 'success'
+      obj.isFailed = obj.status === 'failed'
       obj._q = [obj.memo, obj.sat].join(' ').toLowerCase()
+      try {
+        obj.details = JSON.parse(data.extra?.details || '{}')
+      } catch {
+        obj.details = {extraDetails: data.extra?.details}
+      }
       return obj
     }
   },
   utils: {
     confirmDialog: function (msg) {
-      return Quasar.plugins.Dialog.create({
+      return Quasar.Dialog.create({
         message: msg,
         ok: {
           flat: true,
@@ -321,6 +323,7 @@ window.LNbits = {
       return this.formatSat(value / 1000)
     },
     notifyApiError: function (error) {
+      console.error(error)
       var types = {
         400: 'warning',
         401: 'warning',
@@ -403,14 +406,14 @@ window.LNbits = {
         )
         .join('\r\n')
 
-      var status = Quasar.utils.exportFile(
+      var status = Quasar.exportFile(
         `${fileName || 'table-export'}.csv`,
         content,
         'text/csv'
       )
 
       if (status !== true) {
-        Quasar.plugins.Notify.create({
+        Quasar.Notify.create({
           message: 'Browser denied file download...',
           color: 'negative',
           icon: null
@@ -422,6 +425,18 @@ window.LNbits = {
       converter.setFlavor('github')
       converter.setOption('simpleLineBreaks', true)
       return converter.makeHtml(text)
+    },
+    hexToRgb: function (hex) {
+      return Quasar.colors.hexToRgb(hex)
+    },
+    hexDarken: function (hex, percent) {
+      return Quasar.colors.lighten(hex, percent)
+    },
+    hexAlpha: function (hex, alpha) {
+      return Quasar.colors.changeAlpha(hex, alpha)
+    },
+    getPaletteColor: function (color) {
+      return Quasar.colors.getPaletteColor(color)
     }
   }
 }
@@ -432,6 +447,8 @@ window.windowMixin = {
     return {
       toggleSubs: true,
       reactionChoice: 'confettiBothSides',
+      gradientChoice:
+        this.$q.localStorage.getItem('lnbits.gradientBg') || false,
       isUserAuthorized: false,
       g: {
         offline: !navigator.onLine,
@@ -451,9 +468,43 @@ window.windowMixin = {
       document.body.setAttribute('data-theme', newValue)
       this.$q.localStorage.set('lnbits.theme', newValue)
     },
+    applyGradient: function () {
+      if (this.$q.localStorage.getItem('lnbits.gradientBg')) {
+        this.setColors()
+        darkBgColor = this.$q.localStorage.getItem('lnbits.darkBgColor')
+        primaryColor = this.$q.localStorage.getItem('lnbits.primaryColor')
+        const gradientStyle = `linear-gradient(to bottom right, ${LNbits.utils.hexDarken(String(primaryColor), -70)}, #0a0a0a)`
+        document.body.style.setProperty(
+          'background-image',
+          gradientStyle,
+          'important'
+        )
+        const gradientStyleCards = `background-color: ${LNbits.utils.hexAlpha(String(darkBgColor), 0.4)} !important`
+        const style = document.createElement('style')
+        style.innerHTML =
+          `body[data-theme="${this.$q.localStorage.getItem('lnbits.theme')}"] .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark), body.body${this.$q.dark.isActive ? '--dark' : ''} .q-header, body.body${this.$q.dark.isActive ? '--dark' : ''} .q-drawer { ${gradientStyleCards} }` +
+          `body[data-theme="${this.$q.localStorage.getItem('lnbits.theme')}"].body--dark{background: ${LNbits.utils.hexDarken(String(primaryColor), -88)} !important; }` +
+          `[data-theme="${this.$q.localStorage.getItem('lnbits.theme')}"] .q-card--dark{background: ${String(darkBgColor)} !important;} }`
+        document.head.appendChild(style)
+      }
+    },
+    setColors: function () {
+      this.$q.localStorage.set(
+        'lnbits.primaryColor',
+        LNbits.utils.getPaletteColor('primary')
+      )
+      this.$q.localStorage.set(
+        'lnbits.secondaryColor',
+        LNbits.utils.getPaletteColor('secondary')
+      )
+      this.$q.localStorage.set(
+        'lnbits.darkBgColor',
+        LNbits.utils.getPaletteColor('dark')
+      )
+    },
     copyText: function (text, message, position) {
       var notify = this.$q.notify
-      Quasar.utils.copyToClipboard(text).then(function () {
+      Quasar.copyToClipboard(text).then(function () {
         notify({
           message: message || 'Copied to clipboard!',
           position: position || 'bottom'
@@ -500,6 +551,52 @@ window.windowMixin = {
             LNbits.utils.notifyApiError(e)
           }
         })
+    },
+    themeParams() {
+      const url = new URL(window.location.href)
+      const params = new URLSearchParams(window.location.search)
+      const fields = ['theme', 'dark', 'gradient']
+      const toBoolean = value =>
+        value.trim().toLowerCase() === 'true' || value === '1'
+
+      // Check if any of the relevant parameters ('theme', 'dark', 'gradient') are present in the URL.
+      if (fields.some(param => params.has(param))) {
+        const theme = params.get('theme')
+        const darkMode = params.get('dark')
+        const gradient = params.get('gradient')
+
+        if (
+          theme &&
+          this.g.allowedThemes.includes(theme.trim().toLowerCase())
+        ) {
+          const normalizedTheme = theme.trim().toLowerCase()
+          document.body.setAttribute('data-theme', normalizedTheme)
+          this.$q.localStorage.set('lnbits.theme', normalizedTheme)
+        }
+
+        if (darkMode) {
+          const isDark = toBoolean(darkMode)
+          this.$q.localStorage.set('lnbits.darkMode', isDark)
+          if (!isDark) {
+            this.$q.localStorage.set('lnbits.gradientBg', false)
+          }
+        }
+
+        if (gradient) {
+          const isGradient = toBoolean(gradient)
+          this.$q.localStorage.set('lnbits.gradientBg', isGradient)
+          if (isGradient) {
+            this.$q.localStorage.set('lnbits.darkMode', true)
+          }
+        }
+
+        // Remove processed parameters
+        fields.forEach(param => params.delete(param))
+
+        window.history.replaceState(null, null, url.pathname)
+      }
+
+      this.setColors()
     }
   },
   created: async function () {
@@ -552,6 +649,8 @@ window.windowMixin = {
       )
     }
 
+    this.applyGradient()
+
     if (window.user) {
       this.g.user = Object.freeze(window.LNbits.map.user(window.user))
     }
@@ -590,6 +689,7 @@ window.windowMixin = {
       this.g.extensions = extensions
     }
     await this.checkUsrInUrl()
+    this.themeParams()
   }
 }
 

lnbits/static/js/components.js

@@ -1,6 +1,6 @@
-/* global _, Vue, moment, LNbits, EventHub, decryptLnurlPayAES */
+window.app.component(QrcodeVue)
 
-Vue.component('lnbits-fsat', {
+window.app.component('lnbits-fsat', {
   props: {
     amount: {
       type: Number,
@@ -15,12 +15,13 @@ Vue.component('lnbits-fsat', {
   }
 })
 
-Vue.component('lnbits-wallet-list', {
+window.app.component('lnbits-wallet-list', {
+  props: ['balance'],
   data: function () {
     return {
       user: null,
       activeWallet: null,
-      activeBalance: [],
+      balance: 0,
       showForm: false,
       walletName: '',
       LNBITS_DENOMINATION: LNBITS_DENOMINATION
@@ -74,7 +75,7 @@ Vue.component('lnbits-wallet-list', {
   `,
   computed: {
     wallets: function () {
-      var bal = this.activeBalance
+      var bal = this.balance
       return this.user.wallets.map(function (obj) {
         obj.live_fsat =
           bal.length && bal[0] === obj.id
@@ -87,9 +88,6 @@ Vue.component('lnbits-wallet-list', {
   methods: {
     createWallet: function () {
       LNbits.api.createWallet(this.user.wallets[0], this.walletName)
-    },
-    updateWalletBalance: function (payload) {
-      this.activeBalance = payload
     }
   },
   created: function () {
@@ -99,11 +97,11 @@ Vue.component('lnbits-wallet-list', {
     if (window.wallet) {
       this.activeWallet = LNbits.map.wallet(window.wallet)
     }
-    EventHub.$on('update-wallet-balance', this.updateWalletBalance)
+    document.addEventListener('updateWalletBalance', this.updateWalletBalance)
   }
 })
 
-Vue.component('lnbits-extension-list', {
+window.app.component('lnbits-extension-list', {
   data: function () {
     return {
       extensions: [],
@@ -169,7 +167,7 @@ Vue.component('lnbits-extension-list', {
   }
 })
 
-Vue.component('lnbits-manage', {
+window.app.component('lnbits-manage', {
   props: ['showAdmin', 'showNode', 'showExtensions', 'showUsers'],
   methods: {
     isActive: function (path) {
@@ -229,9 +227,9 @@ Vue.component('lnbits-manage', {
   }
 })
 
-Vue.component('lnbits-payment-details', {
+window.app.component('lnbits-payment-details', {
   props: ['payment'],
-  mixins: [windowMixin],
+  mixins: [window.windowMixin],
   data: function () {
     return {
       LNBITS_DENOMINATION: LNBITS_DENOMINATION
@@ -345,7 +343,7 @@ Vue.component('lnbits-payment-details', {
   }
 })
 
-Vue.component('lnbits-lnurlpay-success-action', {
+window.app.component('lnbits-lnurlpay-success-action', {
   props: ['payment', 'success_action'],
   data() {
     return {
@@ -374,10 +372,12 @@ Vue.component('lnbits-lnurlpay-success-action', {
   }
 })
 
-Vue.component('lnbits-qrcode', {
-  mixins: [windowMixin],
+window.app.component('lnbits-qrcode', {
+  mixins: [window.windowMixin],
+  components: {
+    QrcodeVue
+  },
   props: ['value'],
-  components: {[VueQrcode.name]: VueQrcode},
   data() {
     return {
       logo: LNBITS_QR_LOGO
@@ -385,15 +385,14 @@ Vue.component('lnbits-qrcode', {
   },
   template: `
   <div class="qrcode__wrapper">
-    <qrcode :value="value"
-    :options="{errorCorrectionLevel: 'Q', width: 800}" class="rounded-borders"></qrcode>
+    <qrcode-vue :value="value" size="350" class="rounded-borders"></qrcode-vue>
     <img class="qrcode__image" :src="logo" alt="..." />
   </div>
   `
 })
 
-Vue.component('lnbits-notifications-btn', {
-  mixins: [windowMixin],
+window.app.component('lnbits-notifications-btn', {
+  mixins: [window.windowMixin],
   props: ['pubkey'],
   data() {
     return {
@@ -605,12 +604,13 @@ Vue.component('lnbits-notifications-btn', {
   }
 })
 
-Vue.component('lnbits-dynamic-fields', {
-  mixins: [windowMixin],
+window.app.component('lnbits-dynamic-fields', {
+  mixins: [window.windowMixin],
   props: ['options', 'value'],
   data() {
     return {
-      formData: null
+      formData: null,
+      rules: [val => !!val || 'Field is required']
     }
   },
 
@@ -619,49 +619,109 @@ Vue.component('lnbits-dynamic-fields', {
       <div class="row q-mb-lg" v-for="o in options">
         <div class="col auto-width">
           <p v-if=o.options?.length class="q-ml-xl">
-            <span v-text="o.name"></span> <small v-if="o.description"> (<span v-text="o.description"></span>)</small>
+            <span v-text="o.label || o.name"></span> <small v-if="o.description"> (<span v-text="o.description"></span>)</small>
           </p>
           <lnbits-dynamic-fields v-if="o.options?.length" :options="o.options" v-model="formData[o.name]"
             @input="handleValueChanged" class="q-ml-xl">
           </lnbits-dynamic-fields>
           <div v-else>
-            <q-input v-if="o.type === 'number'" v-model="formData[o.name]" @input="handleValueChanged" type="number"
-              :label="o.name" :hint="o.description" filled dense>
-            </q-input>
-            <q-input v-else-if="o.type === 'text'" v-model="formData[o.name]" @input="handleValueChanged" type="textarea"
-              rows="5" :label="o.name" :hint="o.description" filled dense>
-            </q-input>
-            <q-input v-else-if="o.type === 'password'" v-model="formData[o.name]" @input="handleValueChanged" type="password"
-                :label="o.name" :hint="o.description" filled dense>
-            </q-input>
+            <q-input
+              v-if="o.type === 'number'"
+              type="number"
+              v-model="formData[o.name]"
+              @input="handleValueChanged"
+              :label="o.label || o.name"
+              :hint="o.description"
+              :rules="applyRules(o.required)"
+              filled
+              dense
+            ></q-input>
+            <q-input
+              v-else-if="o.type === 'text'"
+              type="textarea"
+              rows="5"
+              v-model="formData[o.name]"
+              @input="handleValueChanged"
+              :label="o.label || o.name"
+              :hint="o.description"
+              :rules="applyRules(o.required)"
+              filled
+              dense
+            ></q-input>
+            <q-input
+              v-else-if="o.type === 'password'"
+              v-model="formData[o.name]"
+              @input="handleValueChanged"
+              type="password"
+              :label="o.label || o.name"
+              :hint="o.description"
+              :rules="applyRules(o.required)"
+              filled
+              dense
+            ></q-input>
+            <q-select
+              v-else-if="o.type === 'select'"
+              v-model="formData[o.name]"
+              @input="handleValueChanged"
+              :label="o.label || o.name"
+              :hint="o.description"
+              :options="o.values"
+              :rules="applyRules(o.required)"
+            ></q-select>
+            <q-select
+              v-else-if="o.isList"
+              v-model.trim="formData[o.name]"
+              @input="handleValueChanged"
+              input-debounce="0"
+              new-value-mode="add-unique"
+              :label="o.label || o.name"
+              :hint="o.description"
+              :rules="applyRules(o.required)"
+              filled
+              multiple
+              dense
+              use-input
+              use-chips
+              multiple
+              hide-dropdown-icon
+            ></q-select>
             <div v-else-if="o.type === 'bool'">
               <q-item tag="label" v-ripple>
                 <q-item-section avatar top>
                   <q-checkbox v-model="formData[o.name]" @input="handleValueChanged" />
                 </q-item-section>
                 <q-item-section>
-                  <q-item-label><span v-text="o.name"></span></q-item-label>
+                  <q-item-label><span v-text="o.label || o.name"></span></q-item-label>
                   <q-item-label caption> <span v-text="o.description"></span> </q-item-label>
                 </q-item-section>
               </q-item>
             </div>
-            <q-select v-else-if="o.type === 'select'" v-model="formData[o.name]" @input="handleValueChanged" :label="o.name"
-              :hint="o.description" :options="o.values"></q-select>
-
-            <q-select v-else-if="o.isList" filled multiple dense v-model.trim="formData[o.name]" use-input use-chips
-              @input="handleValueChanged" multiple hide-dropdown-icon input-debounce="0" new-value-mode="add-unique"
-              :label="o.name" :hint="o.description">
-            </q-select>
-            <q-input v-else v-model="formData[o.name]" @input="handleValueChanged" :label="o.name" :hint="o.description"
-              filled dense>
-            </q-input>
-
+            <q-input
+              v-else-if="o.type === 'hidden'"
+              v-model="formData[o.name]"
+              type="text"
+              style="display: none"
+              :rules="applyRules(o.required)"
+            ></q-input>
+            <q-input
+              v-else
+              v-model="formData[o.name]"
+              @input="handleValueChanged"
+              :hint="o.description"
+              :label="o.label || o.name"
+              :rules="applyRules(o.required)"
+              filled
+              dense
+            ></q-input>
           </div>
         </div>
       </div>
     </div>
   `,
   methods: {
+    applyRules(required) {
+      return required ? this.rules : []
+    },
     buildData(options, data = {}) {
       return options.reduce((d, option) => {
         if (option.options?.length) {
@@ -681,8 +741,8 @@ Vue.component('lnbits-dynamic-fields', {
   }
 })
 
-Vue.component('lnbits-update-balance', {
-  mixins: [windowMixin],
+window.app.component('lnbits-update-balance', {
+  mixins: [window.windowMixin],
   props: ['wallet_id', 'callback'],
   computed: {
     denomination() {

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

@@ -0,0 +1,16 @@
+window.app.component('lnbits-extension-rating', {
+  name: 'lnbits-extension-rating',
+  props: ['rating'],
+  template: `
+    <div style="margin-bottom: 3px">
+        <q-rating
+          v-model="rating"
+          size="1.5em"
+          :max="5"
+          color="primary"
+          ><q-tooltip>
+            <span v-text="$t('extension_rating_soon')"></span> </q-tooltip
+        ></q-rating>
+    </div>
+  `
+})

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

@@ -1,10 +1,10 @@
-Vue.component('lnbits-extension-settings-form', {
+window.app.component('lnbits-extension-settings-form', {
   name: 'lnbits-extension-settings-form',
   props: ['options', 'adminkey', 'endpoint'],
   methods: {
-    updateSettings: async function () {
+    async updateSettings() {
       if (!this.settings) {
-        return Quasar.plugins.Notify.create({
+        return this.$q.notify({
           message: 'No settings to update',
           type: 'negative'
         })
@@ -66,7 +66,7 @@ Vue.component('lnbits-extension-settings-form', {
   }
 })
 
-Vue.component('lnbits-extension-settings-btn-dialog', {
+window.app.component('lnbits-extension-settings-btn-dialog', {
   name: 'lnbits-extension-settings-btn-dialog',
   props: ['options', 'adminkey', 'endpoint'],
   template: `

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

@@ -1,6 +1,14 @@
-Vue.component('lnbits-funding-sources', {
-  mixins: [windowMixin],
+window.app.component('lnbits-funding-sources', {
+  mixins: [window.windowMixin],
   props: ['form-data', 'allowed-funding-sources'],
+  methods: {
+    getFundingSourceLabel(item) {
+      const fundingSource = this.rawFundingSources.find(
+        fundingSource => fundingSource[0] === item
+      )
+      return fundingSource ? fundingSource[1] : item
+    }
+  },
   computed: {
     fundingSources() {
       let tmp = []
@@ -14,6 +22,9 @@ Vue.component('lnbits-funding-sources', {
         tmp.push([key, tmpObj])
       }
       return new Map(tmp)
+    },
+    sortedAllowedFundingSources() {
+      return this.allowedFundingSources.sort()
     }
   },
   data() {
@@ -93,12 +104,21 @@ Vue.component('lnbits-funding-sources', {
         ],
         [
           'LNbitsWallet',
-          'LNBits',
+          'LNbits',
           {
             lnbits_endpoint: 'Endpoint',
             lnbits_key: 'Admin Key'
           }
         ],
+        [
+          'BlinkWallet',
+          'Blink',
+          {
+            blink_api_endpoint: 'Endpoint',
+            blink_ws_endpoint: 'WebSocket',
+            blink_token: 'Key'
+          }
+        ],
         [
           'AlbyWallet',
           'Alby',
@@ -107,6 +127,16 @@ Vue.component('lnbits-funding-sources', {
             alby_access_token: 'Key'
           }
         ],
+        [
+          'BoltzWallet',
+          'Boltz',
+          {
+            boltz_client_endpoint: 'Endpoint',
+            boltz_client_macaroon: 'Admin Macaroon path or hex',
+            boltz_client_cert: 'Certificate path or hex',
+            boltz_client_wallet: 'Wallet Name'
+          }
+        ],
         [
           'ZBDWallet',
           'ZBD',
@@ -145,6 +175,24 @@ Vue.component('lnbits-funding-sources', {
             spark_url: 'Endpoint',
             spark_token: 'Token'
           }
+        ],
+        [
+          'NWCWallet',
+          'Nostr Wallet Connect',
+          {
+            nwc_pairing_url: 'Pairing URL'
+          }
+        ],
+        [
+          'BreezSdkWallet',
+          'Breez SDK',
+          {
+            breez_api_key: 'Breez API Key',
+            breez_greenlight_seed: 'Greenlight Seed',
+            breez_greenlight_device_key: 'Greenlight Device Key',
+            breez_greenlight_device_cert: 'Greenlight Device Cert',
+            breez_greenlight_invite_code: 'Greenlight Invite Code'
+          }
         ]
       ]
     }
@@ -159,7 +207,8 @@ Vue.component('lnbits-funding-sources', {
               filled
               v-model="formData.lnbits_backend_wallet_class"
               hint="Select the active funding wallet"
-              :options="allowedFundingSources"
+              :options="sortedAllowedFundingSources"
+              :option-label="(item) => getFundingSourceLabel(item)"
             ></q-select>
           </div>
         </div>

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

@@ -80,10 +80,10 @@ function generateChart(canvas, rawData) {
   })
 }
 
-Vue.component('payment-chart', {
+window.app.component('payment-chart', {
   name: 'payment-chart',
   props: ['wallet'],
-  mixins: [windowMixin],
+  mixins: [window.windowMixin],
   data: function () {
     return {
       paymentsChart: {

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

@@ -1,7 +1,7 @@
-Vue.component('payment-list', {
+window.app.component('payment-list', {
   name: 'payment-list',
   props: ['update', 'wallet', 'mobileSimple', 'lazy'],
-  mixins: [windowMixin],
+  mixins: [window.windowMixin],
   data: function () {
     return {
       denomination: LNBITS_DENOMINATION,
@@ -33,6 +33,8 @@ Vue.component('payment-list', {
         search: null,
         loading: false
       },
+      exportTagName: '',
+      exportPaymentTagList: [],
       paymentsCSV: {
         columns: [
           {
@@ -146,7 +148,7 @@ Vue.component('payment-list', {
     paymentTableRowKey: function (row) {
       return row.payment_hash + row.amount
     },
-    exportCSV: function () {
+    exportCSV(detailed = false) {
       // status is important for export but it is not in paymentsTable
       // because it is manually added with payment detail link and icons
       // and would cause duplication in the list
@@ -157,14 +159,51 @@ Vue.component('payment-list', {
       }
       const params = new URLSearchParams(query)
       LNbits.api.getPayments(this.wallet, params).then(response => {
-        const payments = response.data.data.map(LNbits.map.payment)
+        let payments = response.data.data.map(LNbits.map.payment)
+        let columns = this.paymentsCSV.columns
+
+        if (detailed) {
+          if (this.exportPaymentTagList.length) {
+            payments = payments.filter(p =>
+              this.exportPaymentTagList.includes(p.tag)
+            )
+          }
+          const extraColumns = Object.keys(
+            payments.reduce((e, p) => ({...e, ...p.details}), {})
+          ).map(col => ({
+            name: col,
+            align: 'right',
+            label:
+              col.charAt(0).toUpperCase() +
+              col.slice(1).replace(/([A-Z])/g, ' $1'),
+            field: row => row.details[col],
+            format: data =>
+              typeof data === 'object' ? JSON.stringify(data) : data
+          }))
+          columns = this.paymentsCSV.columns.concat(extraColumns)
+        }
+
         LNbits.utils.exportCSV(
-          this.paymentsCSV.columns,
+          columns,
           payments,
           this.wallet.name + '-payments'
         )
       })
     },
+    addFilterTag: function () {
+      if (!this.exportTagName) return
+      const value = this.exportTagName.trim()
+      this.exportPaymentTagList = this.exportPaymentTagList.filter(
+        v => v !== value
+      )
+      this.exportPaymentTagList.push(value)
+      this.exportTagName = ''
+    },
+    removeExportTag: function (value) {
+      this.exportPaymentTagList = this.exportPaymentTagList.filter(
+        v => v !== value
+      )
+    },
     formatCurrency: function (amount, currency) {
       try {
         return LNbits.utils.formatCurrency(amount, currency)
@@ -202,7 +241,59 @@ Vue.component('payment-list', {
             ></h5>
           </div>
           <div class="gt-sm col-auto">
-            <q-btn flat color="grey" @click="exportCSV" :label="$t('export_csv')" ></q-btn>
+            <q-btn-dropdown
+              outline
+              persistent
+              class="q-mr-sm"
+              color="grey"
+              :label="$t('export_csv')"
+              split
+              @click="exportCSV(false)"
+            >
+              <q-list>
+                <q-item>
+                  <q-item-section>
+                    <q-input
+                    @keydown.enter="addFilterTag"
+                      filled
+                      dense
+                      v-model="exportTagName"
+                      type="text"
+                      label="Payment Tags"
+                      class="q-pa-sm"
+                    >
+                      <q-btn
+                        @click="addFilterTag"
+                        dense
+                        flat
+                        icon="add"
+                      ></q-btn>
+                    </q-input>
+                  </q-item-section>
+                </q-item>
+                <q-item v-if="exportPaymentTagList.length">
+                  <q-item-section>
+                    <div>
+                      <q-chip
+                        v-for="tag in exportPaymentTagList"
+                        :key="tag"
+                        removable
+                        @remove="removeExportTag(tag)"
+                        color="primary"
+                        text-color="white"
+                        :label="tag"
+                      ></q-chip>
+                    </div>
+                  </q-item-section>
+                </q-item>
+
+                <q-item>
+                  <q-item-section>
+                    <q-btn v-close-popup outline color="grey" @click="exportCSV(true)" label="Export to CSV with details" ></q-btn>
+                  </q-item-section>
+                </q-item>
+              </q-list>
+            </q-btn-dropdown>
             <payment-chart :wallet="wallet" />
           </div>
         </div>
@@ -222,7 +313,7 @@ Vue.component('payment-list', {
         <q-table
           dense
           flat
-          :data="paymentsOmitter"
+          :rows="paymentsOmitter"
           :row-key="paymentTableRowKey"
           :columns="paymentsTable.columns"
           :pagination.sync="paymentsTable.pagination"
@@ -254,6 +345,16 @@ Vue.component('payment-list', {
                   :color="props.row.isOut ? 'pink' : 'green'"
                   @click="props.expand = !props.expand"
                 ></q-icon>
+                <q-icon
+                  v-else-if="props.row.isFailed"
+                  name="warning"
+                  color="yellow"
+                  @click="props.expand = !props.expand"
+                >
+                  <q-tooltip
+                    ><span>failed</span
+                  ></q-tooltip>
+                </q-icon>
                 <q-icon
                   v-else
                   name="settings_ethernet"
@@ -319,7 +420,7 @@ Vue.component('payment-list', {
                 <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">
+                      <div v-if="props.row.isIn && props.row.isPending">
                         <q-icon name="settings_ethernet" color="grey"></q-icon>
                         <span v-text="$t('invoice_waiting')"></span>
                         <lnbits-payment-details
@@ -353,6 +454,13 @@ Vue.component('payment-list', {
                           ></q-btn>
                         </div>
                       </div>
+                      <div v-else-if="props.row.isOut && props.row.isPending">
+                        <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 v-else-if="props.row.isPaid && props.row.isIn">
                         <q-icon
                           size="18px"
@@ -375,9 +483,9 @@ Vue.component('payment-list', {
                           :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>
+                      <div v-else-if="props.row.isFailed">
+                        <q-icon name="warning" color="yellow"></q-icon>
+                        <span>Payment failed</span>
                         <lnbits-payment-details
                           :payment="props.row"
                         ></lnbits-payment-details>

lnbits/static/js/index.js

@@ -1,6 +1,6 @@
-new Vue({
+window.app = Vue.createApp({
   el: '#vue',
-  mixins: [windowMixin],
+  mixins: [window.windowMixin],
   data: function () {
     return {
       disclaimerDialog: {
@@ -93,7 +93,6 @@ new Vue({
   },
   created() {
     this.description = SITE_DESCRIPTION
-
     this.isUserAuthorized = !!this.$q.cookies.get('is_lnbits_user_authorized')
     if (this.isUserAuthorized) {
       window.location.href = '/wallet'

lnbits/static/js/init-app.js

@@ -0,0 +1,4 @@
+window.app.use(VueQrcodeReader)
+window.app.use(Quasar)
+window.app.use(window.i18n)
+window.app.mount('#vue')

lnbits/static/js/node.js

@@ -4,7 +4,7 @@ function shortenNodeId(nodeId) {
     : '...'
 }
 
-Vue.component('lnbits-node-ranks', {
+window.app.component('lnbits-node-ranks', {
   props: ['ranks'],
   data: function () {
     return {
@@ -35,7 +35,7 @@ Vue.component('lnbits-node-ranks', {
   `
 })
 
-Vue.component('lnbits-channel-stats', {
+window.app.component('lnbits-channel-stats', {
   props: ['stats'],
   data: function () {
     return {
@@ -71,7 +71,7 @@ Vue.component('lnbits-channel-stats', {
   }
 })
 
-Vue.component('lnbits-stat', {
+window.app.component('lnbits-stat', {
   props: ['title', 'amount', 'msat', 'btc'],
   computed: {
     value: function () {
@@ -99,20 +99,20 @@ Vue.component('lnbits-stat', {
   `
 })
 
-Vue.component('lnbits-node-qrcode', {
+window.app.component('lnbits-node-qrcode', {
   props: ['info'],
-  mixins: [windowMixin],
+  mixins: [window.windowMixin],
   template: `
     <q-card class="my-card">
       <q-card-section>
         <div class="text-h6">
           <div style="text-align: center">
-            <qrcode
+            <vue-qrcode
               :value="info.addresses[0]"
               :options="{width: 250}"
               v-if='info.addresses[0]'
               class="rounded-borders"
-            ></qrcode>
+            ></vue-qrcode>
             <div v-else class='text-subtitle1'>
               No addresses available
             </div>
@@ -132,14 +132,14 @@ Vue.component('lnbits-node-qrcode', {
   `
 })
 
-Vue.component('lnbits-node-info', {
+window.app.component('lnbits-node-info', {
   props: ['info'],
   data() {
     return {
       showDialog: false
     }
   },
-  mixins: [windowMixin],
+  mixins: [window.windowMixin],
   methods: {
     shortenNodeId
   },
@@ -177,7 +177,7 @@ Vue.component('lnbits-node-info', {
   `
 })
 
-Vue.component('lnbits-stat', {
+window.app.component('lnbits-stat', {
   props: ['title', 'amount', 'msat', 'btc'],
   computed: {
     value: function () {
@@ -205,7 +205,7 @@ Vue.component('lnbits-stat', {
       `
 })
 
-Vue.component('lnbits-channel-balance', {
+window.app.component('lnbits-channel-balance', {
   props: ['balance', 'color'],
   methods: {
     formatMsat: function (msat) {
@@ -246,7 +246,7 @@ Vue.component('lnbits-channel-balance', {
   `
 })
 
-Vue.component('lnbits-date', {
+window.app.component('lnbits-date', {
   props: ['ts'],
   computed: {
     date: function () {

lnbits/static/js/users.js

@@ -1,6 +1,6 @@
-new Vue({
+window.app = Vue.createApp({
   el: '#vue',
-  mixins: [windowMixin],
+  mixins: [window.windowMixin],
   data: function () {
     return {
       isSuperUser: false,
@@ -164,6 +164,41 @@ new Vue({
     this.chart1 = new Chart(this.$refs.chart1.getContext('2d'), {
       type: 'bubble',
       options: {
+        scales: {
+          xAxes: [
+            {
+              type: 'linear',
+              ticks: {
+                beginAtZero: true
+              },
+              scaleLabel: {
+                display: true,
+                labelString: 'Tx count'
+              }
+            }
+          ],
+          yAxes: [
+            {
+              type: 'linear',
+              ticks: {
+                beginAtZero: true
+              },
+              scaleLabel: {
+                display: true,
+                labelString: 'User balance in million sats'
+              }
+            }
+          ]
+        },
+        tooltips: {
+          callbacks: {
+            label: function (tooltipItem, data) {
+              const dataset = data.datasets[tooltipItem.datasetIndex]
+              const dataPoint = dataset.data[tooltipItem.index]
+              return dataPoint.customLabel || ''
+            }
+          }
+        },
         layout: {
           padding: 10
         }
@@ -171,7 +206,7 @@ new Vue({
       data: {
         datasets: [
           {
-            label: 'Balance - TX Count in million sats',
+            label: 'Wallet balance vs transaction count',
             backgroundColor: 'rgb(255, 99, 132)',
             data: []
           }
@@ -183,9 +218,6 @@ new Vue({
     formatSat: function (value) {
       return LNbits.utils.formatSat(Math.floor(value / 1000))
     },
-    usersTableRowKey: function (row) {
-      return row.id
-    },
     createUser() {
       LNbits.api
         .request('POST', '/users/api/v1/user', null, this.createUserDialog.data)
@@ -291,10 +323,20 @@ new Vue({
       })
 
       const data = filtered.map(user => {
+        const labelUsername = `${user.username ? 'User: ' + user.username + '. ' : ''}`
+        const userBalanceSats = Math.floor(
+          user.balance_msat / 1000
+        ).toLocaleString()
         return {
           x: user.transaction_count,
           y: user.balance_msat / 1000000000,
-          r: 3
+          r: 4,
+          customLabel:
+            labelUsername +
+            'Balance: ' +
+            userBalanceSats +
+            ' sats. Tx count: ' +
+            user.transaction_count
         }
       })
       this.chart1.data.datasets[0].data = data

lnbits/static/js/wallet.js

@@ -1,11 +1,6 @@
-/* globals windowMixin, decode, Vue, VueQrcodeReader, VueQrcode, Quasar, LNbits, _, EventHub, decryptLnurlPayAES */
-
-Vue.component(VueQrcode.name, VueQrcode)
-Vue.use(VueQrcodeReader)
-
-new Vue({
+window.app = Vue.createApp({
   el: '#vue',
-  mixins: [windowMixin],
+  mixins: [window.windowMixin],
   data: function () {
     return {
       updatePayments: false,
@@ -56,7 +51,9 @@ new Vue({
       update: {
         name: null,
         currency: null
-      }
+      },
+      inkeyHidden: true,
+      adminkeyHidden: true
     }
   },
   computed: {
@@ -209,6 +206,54 @@ new Vue({
         })
       }
     },
+    lnurlScan() {
+      LNbits.api
+        .request(
+          'GET',
+          '/api/v1/lnurlscan/' + this.parse.data.request,
+          this.g.wallet.adminkey
+        )
+        .catch(err => {
+          LNbits.utils.notifyApiError(err)
+        })
+        .then(response => {
+          let data = response.data
+
+          if (data.status === 'ERROR') {
+            this.$q.notify({
+              timeout: 5000,
+              type: 'warning',
+              message: `${data.domain} lnurl call failed.`,
+              caption: data.reason
+            })
+            return
+          }
+
+          if (data.kind === 'pay') {
+            this.parse.lnurlpay = Object.freeze(data)
+            this.parse.data.amount = data.minSendable / 1000
+          } else if (data.kind === 'auth') {
+            this.parse.lnurlauth = Object.freeze(data)
+          } else if (data.kind === 'withdraw') {
+            this.parse.show = false
+            this.receive.show = true
+            this.receive.status = 'pending'
+            this.receive.paymentReq = null
+            this.receive.paymentHash = null
+            this.receive.data.amount = data.maxWithdrawable / 1000
+            this.receive.data.memo = data.defaultDescription
+            this.receive.minMax = [
+              data.minWithdrawable / 1000,
+              data.maxWithdrawable / 1000
+            ]
+            this.receive.lnurl = {
+              domain: data.domain,
+              callback: data.callback,
+              fixed: data.fixed
+            }
+          }
+        })
+    },
     decodeQR: function (res) {
       this.parse.data.request = res
       this.decodeRequest()
@@ -216,67 +261,18 @@ new Vue({
     },
     decodeRequest: function () {
       this.parse.show = true
-      let req = this.parse.data.request.toLowerCase()
-      if (this.parse.data.request.toLowerCase().startsWith('lightning:')) {
-        this.parse.data.request = this.parse.data.request.slice(10)
-      } else if (this.parse.data.request.toLowerCase().startsWith('lnurl:')) {
-        this.parse.data.request = this.parse.data.request.slice(6)
-      } else if (req.indexOf('lightning=lnurl1') !== -1) {
-        this.parse.data.request = this.parse.data.request
-          .split('lightning=')[1]
-          .split('&')[0]
+      this.parse.data.request = this.parse.data.request.trim().toLowerCase()
+      let req = this.parse.data.request
+      if (req.startsWith('lightning:')) {
+        this.parse.data.request = req.slice(10)
+      } else if (req.startsWith('lnurl:')) {
+        this.parse.data.request = req.slice(6)
+      } else if (req.includes('lightning=lnurl1')) {
+        this.parse.data.request = req.split('lightning=')[1].split('&')[0]
       }
-
-      if (
-        this.parse.data.request.toLowerCase().startsWith('lnurl1') ||
-        this.parse.data.request.match(/[\w.+-~_]+@[\w.+-~_]/)
-      ) {
-        LNbits.api
-          .request(
-            'GET',
-            '/api/v1/lnurlscan/' + this.parse.data.request,
-            this.g.wallet.adminkey
-          )
-          .catch(err => {
-            LNbits.utils.notifyApiError(err)
-          })
-          .then(response => {
-            let data = response.data
-
-            if (data.status === 'ERROR') {
-              this.$q.notify({
-                timeout: 5000,
-                type: 'warning',
-                message: `${data.domain} lnurl call failed.`,
-                caption: data.reason
-              })
-              return
-            }
-
-            if (data.kind === 'pay') {
-              this.parse.lnurlpay = Object.freeze(data)
-              this.parse.data.amount = data.minSendable / 1000
-            } else if (data.kind === 'auth') {
-              this.parse.lnurlauth = Object.freeze(data)
-            } else if (data.kind === 'withdraw') {
-              this.parse.show = false
-              this.receive.show = true
-              this.receive.status = 'pending'
-              this.receive.paymentReq = null
-              this.receive.paymentHash = null
-              this.receive.data.amount = data.maxWithdrawable / 1000
-              this.receive.data.memo = data.defaultDescription
-              this.receive.minMax = [
-                data.minWithdrawable / 1000,
-                data.maxWithdrawable / 1000
-              ]
-              this.receive.lnurl = {
-                domain: data.domain,
-                callback: data.callback,
-                fixed: data.fixed
-              }
-            }
-          })
+      req = this.parse.data.request
+      if (req.startsWith('lnurl1') || req.match(/[\w.+-~_]+@[\w.+-~_]/)) {
+        this.lnurlScan()
         return
       }
 
@@ -320,7 +316,7 @@ new Vue({
             var expireDate = new Date(
               (invoice.data.time_stamp + tag.value) * 1000
             )
-            cleanInvoice.expireDate = Quasar.utils.date.formatDate(
+            cleanInvoice.expireDate = this.$q.utils.date.formatDate(
               expireDate,
               'YYYY-MM-DDTHH:mm:ss.SSSZ'
             )
@@ -513,10 +509,11 @@ new Vue({
     fetchBalance: function () {
       LNbits.api.getWallet(this.g.wallet).then(response => {
         this.balance = Math.floor(response.data.balance / 1000)
-        EventHub.$emit('update-wallet-balance', [
-          this.g.wallet.id,
-          this.balance
-        ])
+        document.dispatchEvent(
+          new CustomEvent('updateWalletBalance', {
+            detail: [this.g.wallet.id, this.balance]
+          })
+        )
       })
       if (this.g.wallet.currency) {
         this.updateFiatBalance()
@@ -542,7 +539,7 @@ new Vue({
     pasteToTextArea: function () {
       this.$refs.textArea.focus() // Set cursor to textarea
       navigator.clipboard.readText().then(text => {
-        this.$refs.textArea.value = text
+        this.parse.data.request = text.trim()
       })
     }
   },
@@ -560,6 +557,7 @@ new Vue({
     this.update.name = this.g.wallet.name
     this.update.currency = this.g.wallet.currency
     this.receive.units = ['sat', ...window.currencies]
+    this.updateFiatBalance()
   },
   watch: {
     updatePayments: function () {

lnbits/static/scss/base.scss

@@ -231,3 +231,10 @@ video {
 .whitespace-pre-line {
   white-space: pre-line;
 }
+.q-carousel__slide {
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+.q-dialog__inner--minimized {
+  padding: 12px;
+}

lnbits/static/vendor.json

@@ -3,15 +3,14 @@
     "vendor/moment.js",
     "vendor/underscore.js",
     "vendor/axios.js",
-    "vendor/vue.js",
-    "vendor/vue-router.js",
-    "vendor/VueQrcodeReader.umd.js",
-    "vendor/vue-qrcode.js",
-    "vendor/vuex.js",
-    "vendor/quasar.ie.polyfills.umd.min.js",
-    "vendor/quasar.umd.js",
-    "vendor/Chart.bundle.js",
-    "vendor/vue-i18n.js",
+    "vendor/vue.global.prod.js",
+    "vendor/quasar.umd.prod.js",
+    "vendor/vuex.global.js",
+    "vendor/vue-i18n.global.prod.js",
+    "vendor/vue-router.global.js",
+    "vendor/vue-qrcode-reader.umd.js",
+    "vendor/qrcode.vue.browser.js",
+    "vendor/chart.umd.js",
     "vendor/showdown.js",
     "i18n/i18n.js",
     "i18n/de.js",
@@ -34,13 +33,17 @@
     "i18n/kr.js",
     "i18n/fi.js",
     "js/base.js",
-    "js/components.js",
-    "js/components/lnbits-funding-sources.js",
-    "js/components/extension-settings.js",
-    "js/components/payment-list.js",
-    "js/components/payment-chart.js",
     "js/event-reactions.js",
     "js/bolt11-decoder.js"
   ],
-  "css": ["vendor/quasar.css", "vendor/Chart.css", "css/base.css"]
+  "components": [
+    "js/components/lnbits-funding-sources.js",
+    "js/components/extension-settings.js",
+    "js/components/extension-rating.js",
+    "js/components/payment-list.js",
+    "js/components/payment-chart.js",
+    "js/components.js",
+    "js/init-app.js"
+  ],
+  "css": ["vendor/quasar.css", "css/base.css"]
 }