feat: add nostr-sdk library (#3217)

Co-authored-by: jackstar12 <62219658+jackstar12@users.noreply.github.com>
Co-authored-by: Vlad Stan <stan.v.vlad@gmail.com>
Co-authored-by: dni ⚡ <office@dnilabs.com>

.env.example

@@ -40,7 +40,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, BlinkWallet, AlbyWallet, ZBDWallet, PhoenixdWallet, OpenNodeWallet, NWCWallet, BreezSdkWallet, BoltzWallet"
+# LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, BlinkWallet, AlbyWallet, ZBDWallet, PhoenixdWallet, OpenNodeWallet, NWCWallet, BreezSdkWallet, BoltzWallet, StrikeWallet"
 
 LNBITS_BACKEND_WALLET_CLASS=VoidWallet
 # VoidWallet is just a fallback that works without any actual Lightning capabilities,
@@ -101,10 +101,16 @@ 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
+# HEXSTRING instead of path also possible
+BOLTZ_CLIENT_MACAROON="/home/bob/.boltz/macaroons/admin.macaroon"
+# HEXSTRING instead of path also possible
+BOLTZ_CLIENT_CERT="/home/bob/.boltz/tls.cert"
 BOLTZ_CLIENT_WALLET="lnbits"
 
+# StrikeWallet
+STRIKE_API_ENDPOINT=https://api.strike.me/v1
+STRIKE_API_KEY=YOUR_STRIKE_API_KEY
+
 # ZBDWallet
 ZBD_API_ENDPOINT=https://api.zebedee.io/v0/
 ZBD_API_KEY=ZBD_ACCESS_TOKEN
@@ -163,14 +169,16 @@ GITHUB_CLIENT_SECRET=""
 KEYCLOAK_CLIENT_ID=""
 KEYCLOAK_CLIENT_SECRET=""
 KEYCLOAK_DISCOVERY_URL=""
+KEYCLOAK_CLIENT_CUSTOM_ORG=""
+KEYCLOAK_CLIENT_CUSTOM_ICON=""
 
 
 ######################################
 
-# uvicorn variable, uncomment to allow https behind a proxy
+# uvicorn variable, allow https behind a proxy
 # IMPORTANT: this also needs the webserver to be configured to forward the headers
 # http://docs.lnbits.org/guide/installation.html#running-behind-an-apache2-reverse-proxy-over-https
-# FORWARDED_ALLOW_IPS="*"
+FORWARDED_ALLOW_IPS="*"
 
 # Server security, rate limiting ips, blocked ips, allowed ips
 LNBITS_RATE_LIMIT_NO="200"

.github/actions/prepare/action.yml

@@ -5,9 +5,6 @@ inputs:
     description: "Python Version"
     required: true
     default: "3.10"
-  poetry-version:
-    description: "Poetry Version"
-    default: "1.8.5"
   node-version:
     description: "Node Version"
     default: "20.x"
@@ -27,10 +24,8 @@ runs:
         # cache poetry install via pip
         cache: "pip"
 
-    - name: Set up Poetry ${{ inputs.poetry-version }}
+    - name: Set up Poetry
       uses: abatilo/actions-poetry@v2
-      with:
-        poetry-version: ${{ inputs.poetry-version }}
 
     - name: Setup a local virtual environment (if no poetry.toml file)
       shell: bash

.github/packaging/linux/AppDir/AppRun

@@ -36,7 +36,6 @@ LNBITS_DATA_FOLDER="${LNBITS_DATA_FOLDER:-$LAUNCH_DIR/lnbits/database}"
 LNBITS_EXTENSIONS_PATH="${LNBITS_EXTENSIONS_PATH:-$LAUNCH_DIR/lnbits/extensions}"
 export LNBITS_DATA_FOLDER
 export LNBITS_EXTENSIONS_PATH
-export LNBITS_ADMIN_UI=true
 
 # Define the LNbits URL
 URL="http://0.0.0.0:5000"

.github/workflows/ci.yml

@@ -88,8 +88,6 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10"]
-        poetry-version: ["1.5.1"]
     uses: ./.github/workflows/jmeter.yml
     with:
       python-version: ${{ matrix.python-version }}
-      poetry-version: ${{ matrix.poetry-version }}

.github/workflows/docker.yml

@@ -51,3 +51,14 @@ jobs:
             platforms: linux/amd64,linux/arm64
             cache-from: type=local,src=/tmp/.buildx-cache
             cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Build and push boltz
+        uses: docker/build-push-action@v5
+        with:
+            context: .
+            file: Dockerfile.boltz
+            push: true
+            tags: ${{ secrets.DOCKER_USERNAME }}/lnbits-boltz:${{ inputs.tag }}
+            platforms: linux/amd64,linux/arm64
+            cache-from: type=local,src=/tmp/.buildx-cache
+            cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/jmeter.yml

@@ -8,11 +8,6 @@ on:
         required: true
         default: "3.10"
         type: string
-      poetry-version:
-        description: "Poetry Version"
-        required: true
-        default: "1.5.1"
-        type: string
 
 jobs:
   jmeter:

.github/workflows/nix.yml

@@ -25,6 +25,7 @@ on:
 
 jobs:
   nix:
+    if: false # temporarly disable nix support until the `poetry2nix` issue is resolved
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -7,6 +7,7 @@ __pycache__
 .mypy_cache
 .vscode
 *-lock.json
+.python-version
 
 *.egg
 *.egg-info

Dockerfile

@@ -4,13 +4,14 @@ RUN apt-get clean
 RUN apt-get update
 RUN apt-get install -y curl pkg-config build-essential libnss-myhostname
 
-RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.5
+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 touch README.md
 
 RUN mkdir data
 
@@ -19,7 +20,8 @@ ENV POETRY_NO_INTERACTION=1 \
     POETRY_VIRTUALENVS_CREATE=1 \
     POETRY_CACHE_DIR=/tmp/poetry_cache
 
-RUN poetry install --only main
+ARG POETRY_INSTALL_ARGS="--only main"
+RUN poetry install --no-root ${POETRY_INSTALL_ARGS}
 
 FROM python:3.12-slim-bookworm
 
@@ -32,7 +34,7 @@ RUN apt-get update && apt-get -y upgrade && \
     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 - --version 1.8.5
+RUN curl -sSL https://install.python-poetry.org | python3 -
 ENV PATH="/root/.local/bin:$PATH"
 
 ENV POETRY_NO_INTERACTION=1 \
@@ -46,11 +48,12 @@ WORKDIR /app
 COPY . .
 COPY --from=builder /app/.venv .venv
 
-RUN poetry install --only main
+ARG POETRY_INSTALL_ARGS="--only main"
+RUN poetry install ${POETRY_INSTALL_ARGS}
 
 ENV LNBITS_PORT="5000"
 ENV LNBITS_HOST="0.0.0.0"
 
 EXPOSE 5000
 
-CMD ["sh", "-c", "poetry run lnbits --port $LNBITS_PORT --host $LNBITS_HOST"]
+CMD ["sh", "-c", "poetry run lnbits --port $LNBITS_PORT --host $LNBITS_HOST --forwarded-allow-ips='*'"]

Dockerfile.boltz

@@ -0,0 +1,30 @@
+FROM boltz/boltz-client:latest AS boltz
+
+FROM lnbits/lnbits:latest
+
+COPY --from=boltz /bin/boltzd /bin/boltzcli /usr/local/bin/
+RUN ls -l /usr/local/bin/boltzd
+RUN apt-get update && apt-get -y upgrade && \
+    apt-get install -y netcat-openbsd
+
+# Reinstall dependencies just in case (needed for CMD usage)
+ARG POETRY_INSTALL_ARGS="--only main"
+RUN poetry install ${POETRY_INSTALL_ARGS}
+
+# LNbits + boltzd configuration
+ENV LNBITS_PORT="5000"
+ENV LNBITS_HOST="0.0.0.0"
+ENV LNBITS_BACKEND_WALLET_CLASS="BoltzWallet"
+ENV FUNDING_SOURCE_MAX_RETRIES=10
+ENV BOLTZ_CLIENT_ENDPOINT="127.0.0.1:9002"
+ENV BOLTZ_CLIENT_MACAROON="/root/.boltz/macaroons/admin.macaroon"
+ENV BOLTZ_CLIENT_CERT="/root/.boltz/tls.cert"
+ENV BOLTZ_CLIENT_WALLET="lnbits"
+
+EXPOSE 5000
+
+# Entrypoint to start boltzd and LNbits
+COPY dockerboltz.sh /dockerboltz.sh
+RUN chmod +x /dockerboltz.sh
+
+CMD ["/dockerboltz.sh"]

dockerboltz.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e
+
+boltzd --standalone --referralId lnbits &
+
+# Capture boltzd PID to monitor if needed
+BOLTZ_PID=$!
+
+# Wait for boltzd to start
+for i in {1..10}; do
+  if nc -z localhost 9002; then
+    echo "boltzd is up!"
+    break
+  fi
+  echo "Waiting for boltzd to start..."
+  sleep 1
+done
+
+# Optional: check if still not up
+if ! nc -z localhost 9002; then
+  echo "boltzd did not start successfully."
+  exit 1
+fi
+
+echo "Starting LNbits on $LNBITS_HOST:$LNBITS_PORT..."
+exec poetry run lnbits --port "$LNBITS_PORT" --host "$LNBITS_HOST" --forwarded-allow-ips='*'

docs/guide/funding-sources-table.md

@@ -0,0 +1,30 @@
+# LNbits Funding Sources Comparison Table
+
+LNbits can use a number of different Lightning Network funding source.
+
+There may be trade-offs between the funding sources used, for example funding LNbits using Strike requires the user to KYC themselves and has some
+privacy compromises versus running your own LND node. However the technical barrier to entry of using Strike is lower than using LND.
+
+The table below offers a comparison of the different Lightning Network funding sources that can be used with LNbits.
+
+## LNbits Lightning Network Funding Sources Comparison Table
+
+| **Funding Source**         | **Custodial Type** | **KYC Required**    | **Technical Knowledge Needed** | **Node Hosting Required** | **Privacy Level** | **Liquidity Management** | **Ease of Setup** | **Maintenance Effort** | **Cost Implications**                        | **Scalability** | **Notes**                                                        |
+| -------------------------- | ------------------ | ------------------- | ------------------------------ | ------------------------- | ----------------- | ------------------------ | ----------------- | ---------------------- | -------------------------------------------- | --------------- | ---------------------------------------------------------------- |
+| LND (gRPC)                 | Self-custodial     | ❌                  | Higher                         | ✅                        | High              | Manual                   | Moderate          | High                   | Infrastructure cost and channel opening fees | High            | gRPC interface for LND; suitable for advanced integrations.      |
+| CoreLightning (CLN)        | Self-custodial     | ❌                  | Higher                         | ✅                        | High              | Manual                   | Moderate          | High                   | Infrastructure cost and channel opening fees | High            | Requires setting up and managing your own CLN node.              |
+| Phoenixd                   | Self-custodial     | ❌                  | Medium                         | ❌                        | Medium            | Automatic                | Moderate          | Low                    | Minimal fees                                 | Medium          | Mobile wallet backend; suitable for mobile integrations.         |
+| Nostr Wallet Connect (NWC) | Custodial          | Depends on provider | Low                            | ❌                        | Variable          | Provider-managed         | Easy              | Low                    | May incur fees                               | Medium          | Connects via Nostr protocol; depends on provider's policies.     |
+| Boltz                      | Self-custodial     | ❌                  | Medium                         | ❌                        | Medium            | Provider-managed         | Moderate          | Moderate               | Minimal fees                                 | Medium          | Uses submarine swaps; connects to Boltz client.                  |
+| LND (REST)                 | Self-custodial     | ❌                  | Higher                         | ✅                        | High              | Manual                   | Moderate          | High                   | Infrastructure cost and channel opening fees | High            | REST interface for LND; suitable for web integrations.           |
+| CoreLightning REST         | Self-custodial     | ❌                  | Higher                         | ✅                        | High              | Manual                   | Moderate          | High                   | Infrastructure cost and channel opening fees | High            | REST interface for CLN; suitable for web integrations.           |
+| LNbits (another instance)  | Custodial          | Depends on host     | Low                            | ❌                        | Variable          | Provider-managed         | Easy              | Low                    | May incur hosting fees                       | Medium          | Connects to another LNbits instance; depends on host's policies. |
+| Alby                       | Custodial          | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Browser extension wallet; suitable for web users.                |
+| Breez SDK                  | Self-custodial     | ❌                  | Medium                         | ❌                        | High              | Automatic                | Moderate          | Low                    | Minimal fees                                 | Medium          | SDK for integrating Breez wallet functionalities.                |
+| OpenNode                   | Custodial          | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Third-party service; suitable for merchants.                     |
+| Blink                      | Custodial          | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Third-party service; focuses on mobile integrations.             |
+| ZBD                        | Custodial          | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Gaming-focused payment platform.                                 |
+| Spark (CLN)                | Self-custodial     | ❌                  | Higher                         | ✅                        | High              | Manual                   | Moderate          | High                   | Infrastructure cost and channel opening fees | High            | Web interface for CLN; requires Spark server setup.              |
+| Cliche Wallet              | Self-custodial     | ❌                  | Medium                         | ❌                        | Medium            | Manual                   | Moderate          | Moderate               | Minimal fees                                 | Medium          | Lightweight wallet; suitable for embedded systems.               |
+| Strike                     | Custodial          | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Third-party service; suitable for quick setups.                  |
+| LNPay                      | Custodial          | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Third-party service; suitable for quick setups.                  |

docs/guide/installation.md

@@ -18,7 +18,7 @@ Go to [releases](https://github.com/lnbits/lnbits/releases) and pull latest AppI
 sudo apt-get install libfuse2
 wget $(curl -s https://api.github.com/repos/lnbits/lnbits/releases/latest | jq -r '.assets[] | select(.name | endswith(".AppImage")) | .browser_download_url') -O LNbits-latest.AppImage
 chmod +x LNbits-latest.AppImage
-./LNbits-latest.AppImage --host 0.0.0.0 --port 5000
+LNBITS_ADMIN_UI=true HOST=0.0.0.0 PORT=5000 ./LNbits-latest.AppImage # most system settings are now in the admin UI, but pass additional .env variables here
 ```
 
 LNbits will create a folder for db and extension files in the folder the AppImage runs from.
@@ -78,11 +78,24 @@ poetry run lnbits-cli --help
 
 ```sh
 cd lnbits
-# Stop LNbits with `ctrl + x`
-git pull
-# Keep your poetry install up to date, this can be done with `poetry self update`
+# Stop LNbits with `ctrl + x` or with service manager
+# sudo systemctl stop lnbits
+
+# Update LNbits
+git pull --rebase
+
+# Check your poetry version with
+poetry env list
+# If version is less 3.12, update it by running
+poetry env use python3.12
+poetry env remove python3.9
+poetry env list
+
+# Run install and start LNbits with
 poetry install --only main
-# Start LNbits with `poetry run lnbits`
+poetry run lnbits
+
+# use LNbits admin UI Extensions page function "Update All" do get extensions onto proper level
 ```
 
 ## Option 2: Install script (on Debian/Ubuntu)
@@ -137,7 +150,7 @@ SUPER_USER=be54db7f245346c8833eaa430e1e0405 LNBITS_ADMIN_UI=true ./result/bin/ln
 
 ## Option 4: Docker
 
-use latest version from docker hub
+Use latest version from Docker Hub.
 
 ```sh
 docker pull lnbits/lnbits
@@ -146,7 +159,7 @@ mkdir data
 docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits/lnbits
 ```
 
-build the image yourself
+Build the image yourself.
 
 ```sh
 git clone https://github.com/lnbits/lnbits.git
@@ -157,6 +170,12 @@ mkdir data
 docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits/lnbits
 ```
 
+You can optionally override the arguments that are passed to `poetry install` during the build process by setting the Docker build argument named `POETRY_INSTALL_ARGS`. For example, to enable the Breez funding source, build the Docker image with the command:
+
+```sh
+docker build --build-arg POETRY_INSTALL_ARGS="-E breez" -t lnbits/lnbits .
+```
+
 ## 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.
@@ -564,3 +583,12 @@ docker run --detach --publish 5000:5000 --name lnbits -e "LNBITS_BACKEND_WALLET_
 ```
 
 Finally you can access your lnbits on your machine at port 5000.
+
+### FreeBSD notes
+
+Currently there is an issue with secp256k1 0.14.0 on FreeBSD. Thanks to @GitKalle
+
+1. Install package `py311-secp256k1` with `pkg install py311-secp256k1`
+2. Change version in `pyproject.toml` from 0.14.0 to 0.13.2
+3. Rewrite `poetry.lock` file with command `poetry lock`
+4. Follow install instruction with Poetry

docs/guide/wallets.md

@@ -10,6 +10,8 @@ LNbits can run on top of many Lightning Network funding sources with more being
 
 A backend wallet can be configured using the following LNbits environment variables:
 
+You can [compare the LNbits compatible Lightning Network funding sources here](wallets.md).
+
 ### CoreLightning
 
 - `LNBITS_BACKEND_WALLET_CLASS`: **CoreLightningWallet**
@@ -51,7 +53,7 @@ You can also use an AES-encrypted macaroon (more info) instead by using
 
 - `LND_GRPC_MACAROON_ENCRYPTED`: eNcRyPtEdMaCaRoOn
 
-To encrypt your macaroon, run `poetry run python lnbits/wallets/macaroon/macaroon.py`.
+To encrypt your macaroon, run `poetry run lnbits-cli encrypt macaroon`.
 
 ### LNbits
 

lnbits.sh

@@ -6,15 +6,15 @@ 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 Python 3.10 and distutils non-interactively
+  sudo apt install -y python3.10 python3.10-distutils
 
   # Install Poetry
-  curl -sSL https://install.python-poetry.org | python3.9 -
+  curl -sSL https://install.python-poetry.org | python3.10 -
 
   # Add Poetry to PATH for the current session
   export PATH="/home/$USER/.local/bin:$PATH"
@@ -51,4 +51,4 @@ export LNBITS_ADMIN_UI=true
 export HOST=0.0.0.0
 
 # Run LNbits
-poetry run lnbits
+poetry run lnbits

lnbits/commands.py

@@ -3,6 +3,7 @@ import importlib
 import sys
 import time
 from functools import wraps
+from getpass import getpass
 from pathlib import Path
 from typing import Optional
 from uuid import uuid4
@@ -40,7 +41,9 @@ from lnbits.core.views.extension_api import (
     api_uninstall_extension,
 )
 from lnbits.settings import settings
+from lnbits.utils.crypto import AESCipher
 from lnbits.wallets.base import Wallet
+from lnbits.wallets.macaroon import load_macaroon
 
 
 def coro(f):
@@ -79,6 +82,20 @@ def extensions():
     """
 
 
+@lnbits_cli.group()
+def encrypt():
+    """
+    Encryption commands
+    """
+
+
+@lnbits_cli.group()
+def decrypt():
+    """
+    Decryption commands
+    """
+
+
 def get_super_user() -> Optional[str]:
     """Get the superuser"""
     superuser_file = Path(settings.lnbits_data_folder, ".super_user")
@@ -479,6 +496,62 @@ async def extensions_uninstall(
         return False, str(ex)
 
 
+@encrypt.command("macaroon")
+def encrypt_macaroon():
+    """Encrypts a macaroon (LND wallets)"""
+    _macaroon = getpass("Enter macaroon: ")
+    try:
+        macaroon = load_macaroon(_macaroon)
+    except Exception as ex:
+        click.echo(f"Error loading macaroon: {ex}")
+        return
+    key = getpass("Enter encryption key: ")
+    aes = AESCipher(key.encode())
+    try:
+        encrypted_macaroon = aes.encrypt(bytes.fromhex(macaroon))
+    except Exception as ex:
+        click.echo(f"Error encrypting macaroon: {ex}")
+        return
+    click.echo("Encrypted macaroon: ")
+    click.echo(encrypted_macaroon)
+
+
+@encrypt.command("aes")
+@click.option("-p", "--payload", required=True, help="Payload to encrypt.")
+@click.option(
+    "-u", "--urlsafe", is_flag=True, required=False, help="Urlsafe b64encode."
+)
+def encrypt_aes(payload: str, urlsafe: bool = False):
+    """AES encrypts a payload"""
+    key = getpass("Enter encryption key: ")
+    aes = AESCipher(key.encode())
+    try:
+        encrypted = aes.encrypt(payload.encode(), urlsafe=urlsafe)
+    except Exception as ex:
+        click.echo(f"Error encrypting payload: {ex}")
+        return
+    click.echo("Encrypted payload: ")
+    click.echo(encrypted)
+
+
+@decrypt.command("aes")
+@click.option("-p", "--payload", required=True, help="Payload to decrypt.")
+@click.option(
+    "-u", "--urlsafe", is_flag=True, required=False, help="Urlsafe b64decode."
+)
+def decrypt_aes(payload: str, urlsafe: bool = False):
+    """AES decrypts a payload"""
+    key = getpass("Enter encryption key: ")
+    aes = AESCipher(key.encode())
+    try:
+        decrypted = aes.decrypt(payload, urlsafe=urlsafe)
+    except Exception as ex:
+        click.echo(f"Error decrypting payload: {ex}")
+        return
+    click.echo("Decrypted payload: ")
+    click.echo(decrypted)
+
+
 def main():
     """main function"""
     lnbits_cli()

lnbits/core/crud/__init__.py

@@ -43,6 +43,7 @@ from .settings import (
     delete_admin_settings,
     get_admin_settings,
     get_super_settings,
+    reset_core_settings,
     update_admin_settings,
     update_super_user,
 )
@@ -129,6 +130,7 @@ __all__ = [
     "get_super_settings",
     "update_admin_settings",
     "update_super_user",
+    "reset_core_settings",
     # tinyurl
     "create_tinyurl",
     "delete_tinyurl",

lnbits/core/crud/payments.py

@@ -1,7 +1,7 @@
 from time import time
 from typing import Any, Optional, Tuple
 
-from lnbits.core.crud.wallets import get_total_balance, get_wallet
+from lnbits.core.crud.wallets import get_total_balance, get_wallet, get_wallets_ids
 from lnbits.core.db import db
 from lnbits.core.models import PaymentState
 from lnbits.db import Connection, DateTrunc, Filters, Page
@@ -95,6 +95,7 @@ async def get_latest_payments_by_extension(
 async def get_payments_paginated(
     *,
     wallet_id: Optional[str] = None,
+    user_id: Optional[str] = None,
     complete: bool = False,
     pending: bool = False,
     failed: bool = False,
@@ -121,6 +122,9 @@ async def get_payments_paginated(
     if wallet_id:
         values["wallet_id"] = wallet_id
         clause.append("wallet_id = :wallet_id")
+    elif user_id:
+        only_user_wallets = await _only_user_wallets_statement(user_id, conn=conn)
+        clause.append(only_user_wallets)
 
     if complete and pending:
         clause.append(
@@ -358,12 +362,19 @@ async def get_payments_history(
 async def get_payment_count_stats(
     field: PaymentCountField,
     filters: Optional[Filters[PaymentFilters]] = None,
+    user_id: Optional[str] = None,
     conn: Optional[Connection] = None,
 ) -> list[PaymentCountStat]:
 
     if not filters:
         filters = Filters()
-    clause = filters.where()
+    extra_stmts = []
+
+    if user_id:
+        only_user_wallets = await _only_user_wallets_statement(user_id, conn=conn)
+        extra_stmts.append(only_user_wallets)
+
+    clause = filters.where(extra_stmts)
     data = await (conn or db).fetchall(
         query=f"""
             SELECT {field} as field, count(*) as total
@@ -381,18 +392,26 @@ async def get_payment_count_stats(
 
 async def get_daily_stats(
     filters: Optional[Filters[PaymentFilters]] = None,
+    user_id: Optional[str] = None,
     conn: Optional[Connection] = None,
 ) -> Tuple[list[PaymentDailyStats], list[PaymentDailyStats]]:
 
     if not filters:
         filters = Filters()
 
-    in_clause = filters.where(
-        ["(apipayments.status = 'success' AND apipayments.amount > 0)"]
-    )
-    out_clause = filters.where(
-        ["(apipayments.status IN ('success', 'pending') AND apipayments.amount < 0)"]
-    )
+    in_where_stmts = ["(apipayments.status = 'success' AND apipayments.amount > 0)"]
+    out_where_stmts = [
+        "(apipayments.status IN ('success', 'pending') AND apipayments.amount < 0)"
+    ]
+
+    if user_id:
+        only_user_wallets = await _only_user_wallets_statement(user_id, conn=conn)
+        in_where_stmts.append(only_user_wallets)
+        out_where_stmts.append(only_user_wallets)
+
+    in_clause = filters.where(in_where_stmts)
+    out_clause = filters.where(out_where_stmts)
+
     date_trunc = db.datetime_grouping("day")
     query = """
         SELECT {date_trunc} date,
@@ -423,6 +442,7 @@ async def get_daily_stats(
 
 async def get_wallets_stats(
     filters: Optional[Filters[PaymentFilters]] = None,
+    user_id: Optional[str] = None,
     conn: Optional[Connection] = None,
 ) -> list[PaymentWalletStats]:
 
@@ -441,6 +461,10 @@ async def get_wallets_stats(
         )
         """,
     ]
+    if user_id:
+        only_user_wallets = await _only_user_wallets_statement(user_id, conn=conn)
+        where_stmts.append(only_user_wallets)
+
     clauses = filters.where(where_stmts)
 
     data = await (conn or db).fetchall(
@@ -508,7 +532,7 @@ async def is_internal_status_success(
     return payment.status == PaymentState.SUCCESS.value
 
 
-async def mark_webhook_sent(payment_hash: str, status: int) -> None:
+async def mark_webhook_sent(payment_hash: str, status: str) -> None:
     await db.execute(
         """
         UPDATE apipayments SET webhook_status = :status
@@ -516,3 +540,14 @@ async def mark_webhook_sent(payment_hash: str, status: int) -> None:
         """,
         {"status": status, "hash": payment_hash},
     )
+
+
+async def _only_user_wallets_statement(
+    user_id: str, conn: Optional[Connection] = None
+) -> str:
+    wallet_ids = await get_wallets_ids(user_id=user_id, conn=conn) or [
+        "no-wallets-for-user"
+    ]
+    # wallet ids are safe to use in sql queries
+    wallet_ids_str = [f"'{w}'" for w in wallet_ids]
+    return f""" wallet_id IN ({", ".join(wallet_ids_str)}) """

lnbits/core/crud/settings.py

@@ -61,7 +61,23 @@ async def update_super_user(super_user: str) -> SuperSettings:
 
 
 async def delete_admin_settings(tag: Optional[str] = "core") -> None:
-    await db.execute("DELETE FROM settings WHERE tag = :tag", {"tag": tag})
+    await db.execute(
+        "DELETE FROM system_settings WHERE tag = :tag",
+        {"tag": tag},
+    )
+
+
+async def reset_core_settings() -> None:
+    await db.execute(
+        """
+        DELETE FROM system_settings WHERE tag = 'core'
+        AND id NOT IN (
+            'super_user',
+            'lnbits_webpush_pubkey',
+            'lnbits_webpush_privkey'
+        )
+        """,
+    )
 
 
 async def create_admin_settings(super_user: str, new_settings: dict) -> SuperSettings:

lnbits/core/crud/wallets.py

@@ -4,7 +4,8 @@ from typing import Optional
 from uuid import uuid4
 
 from lnbits.core.db import db
-from lnbits.db import Connection
+from lnbits.core.models.wallets import WalletsFilters
+from lnbits.db import Connection, Filters, Page
 from lnbits.settings import settings
 
 from ..models import Wallet
@@ -135,6 +136,43 @@ async def get_wallets(
     )
 
 
+async def get_wallets_paginated(
+    user_id: str,
+    deleted: Optional[bool] = None,
+    filters: Optional[Filters[WalletsFilters]] = None,
+    conn: Optional[Connection] = None,
+) -> Page[Wallet]:
+    if deleted is None:
+        deleted = False
+
+    where: list[str] = [""" "user" = :user AND deleted = :deleted """]
+    return await (conn or db).fetch_page(
+        """
+            SELECT *, COALESCE((
+                SELECT balance FROM balances WHERE wallet_id = wallets.id
+            ), 0) AS balance_msat FROM wallets
+        """,
+        where=where,
+        values={"user": user_id, "deleted": deleted},
+        filters=filters,
+        model=Wallet,
+    )
+
+
+async def get_wallets_ids(
+    user_id: str, deleted: Optional[bool] = None, conn: Optional[Connection] = None
+) -> list[str]:
+    where = "AND deleted = :deleted" if deleted is not None else ""
+    result: list[dict] = await (conn or db).fetchall(
+        f"""
+        SELECT id FROM wallets
+        WHERE "user" = :user {where}
+        """,
+        {"user": user_id, "deleted": deleted},
+    )
+    return [row["id"] for row in result]
+
+
 async def get_wallets_count():
     result = await db.execute("SELECT COUNT(*) as count FROM wallets")
     row = result.mappings().first()

lnbits/core/models/payments.py

@@ -64,7 +64,7 @@ class Payment(BaseModel):
     memo: str | None = None
     expiry: datetime | None = None
     webhook: str | None = None
-    webhook_status: int | None = None
+    webhook_status: str | None = None
     preimage: str | None = None
     tag: str | None = None
     extension: str | None = None

lnbits/core/models/users.py

@@ -27,6 +27,9 @@ class UserExtra(BaseModel):
     # - "google | github | ...": the user was created using an SSO provider
     provider: str | None = "lnbits"  # auth provider
 
+    # how many wallets are shown in the user interface
+    visible_wallet_count: int | None = 10
+
 
 class EndpointAccess(BaseModel):
     path: str

lnbits/core/models/wallets.py

@@ -9,6 +9,7 @@ from enum import Enum
 from ecdsa import SECP256k1, SigningKey
 from pydantic import BaseModel, Field
 
+from lnbits.db import FilterModel
 from lnbits.helpers import url_for
 from lnbits.lnurl import encode as lnurl_encode
 from lnbits.settings import settings
@@ -25,6 +26,7 @@ class BaseWallet(BaseModel):
 class WalletExtra(BaseModel):
     icon: str = "flash_on"
     color: str = "primary"
+    pinned: bool = False
 
 
 class Wallet(BaseModel):
@@ -83,3 +85,13 @@ class KeyType(Enum):
 class WalletTypeInfo:
     key_type: KeyType
     wallet: Wallet
+
+
+class WalletsFilters(FilterModel):
+    __search_fields__ = ["id", "name", "currency"]
+
+    __sort_fields__ = ["id", "name", "currency", "created_at", "updated_at"]
+
+    id: str | None
+    name: str | None
+    currency: str | None

lnbits/core/services/notifications.py

@@ -205,24 +205,23 @@ async def dispatch_webhook(payment: Payment):
     logger.debug("sending webhook", payment.webhook)
 
     if not payment.webhook:
-        return await mark_webhook_sent(payment.payment_hash, -1)
+        return await mark_webhook_sent(payment.payment_hash, "-1")
 
     headers = {"User-Agent": settings.user_agent}
     async with httpx.AsyncClient(headers=headers) as client:
-        data = payment.dict()
         try:
             check_callback_url(payment.webhook)
-            r = await client.post(payment.webhook, json=data, timeout=40)
+            r = await client.post(payment.webhook, json=payment.json(), timeout=40)
             r.raise_for_status()
-            await mark_webhook_sent(payment.payment_hash, r.status_code)
+            await mark_webhook_sent(payment.payment_hash, str(r.status_code))
         except httpx.HTTPStatusError as exc:
-            await mark_webhook_sent(payment.payment_hash, exc.response.status_code)
+            await mark_webhook_sent(payment.payment_hash, str(exc.response.status_code))
             logger.warning(
                 f"webhook returned a bad status_code: {exc.response.status_code} "
                 f"while requesting {exc.request.url!r}."
             )
         except httpx.RequestError:
-            await mark_webhook_sent(payment.payment_hash, -1)
+            await mark_webhook_sent(payment.payment_hash, "-1")
             logger.warning(f"Could not send webhook to {payment.webhook}")
 
 
@@ -230,18 +229,21 @@ async def send_payment_notification(wallet: Wallet, payment: Payment):
     try:
         await send_ws_payment_notification(wallet, payment)
     except Exception as e:
-        logger.error("Error sending websocket payment notification", e)
+        logger.error(f"Error sending websocket payment notification {e!s}")
     try:
         send_chat_payment_notification(wallet, payment)
     except Exception as e:
-        logger.error("Error sending chat payment notification", e)
+        logger.error(f"Error sending chat payment notification {e!s}")
     try:
         await send_payment_push_notification(wallet, payment)
     except Exception as e:
-        logger.error("Error sending push payment notification", e)
+        logger.error(f"Error sending push payment notification {e!s}")
 
-    if payment.webhook and not payment.webhook_status:
-        await dispatch_webhook(payment)
+    try:
+        if payment.webhook and not payment.webhook_status:
+            await dispatch_webhook(payment)
+    except Exception as e:
+        logger.error(f"Error dispatching webhook: {e!s}")
 
 
 async def send_ws_payment_notification(wallet: Wallet, payment: Payment):

lnbits/core/services/payments.py

@@ -44,6 +44,9 @@ from ..models import (
 )
 from .notifications import send_payment_notification
 
+payment_lock = asyncio.Lock()
+wallets_payments_lock: dict[str, asyncio.Lock] = {}
+
 
 async def pay_invoice(
     *,
@@ -79,12 +82,16 @@ async def pay_invoice(
             extra=extra,
         )
 
-    payment = await _pay_invoice(wallet, create_payment_model, conn)
+    payment = await _pay_invoice(wallet.id, create_payment_model, conn)
+
+    service_fee_memo = f"""
+        Service fee for payment of {abs(payment.sat)} sats.
+        Wallet: '{wallet.name}' ({wallet.id})."""
 
     async with db.reuse_conn(conn) if conn else db.connect() as new_conn:
-        await _credit_service_fee_wallet(payment, new_conn)
+        await _credit_service_fee_wallet(payment, service_fee_memo, new_conn)
 
-        return payment
+    return payment
 
 
 async def create_invoice(
@@ -132,29 +139,29 @@ async def create_invoice(
             status="failed",
         )
 
-    (
-        ok,
-        checking_id,
-        payment_request,
-        error_message,
-    ) = await funding_source.create_invoice(
+    payment_response = await funding_source.create_invoice(
         amount=amount_sat,
         memo=invoice_memo,
         description_hash=description_hash,
         unhashed_description=unhashed_description,
         expiry=expiry or settings.lightning_invoice_expiry,
     )
-    if not ok or not payment_request or not checking_id:
+    if (
+        not payment_response.ok
+        or not payment_response.payment_request
+        or not payment_response.checking_id
+    ):
         raise InvoiceError(
-            error_message or "unexpected backend error.", status="pending"
+            message=payment_response.error_message or "unexpected backend error.",
+            status="pending",
         )
-
-    invoice = bolt11_decode(payment_request)
+    invoice = bolt11_decode(payment_response.payment_request)
 
     create_payment_model = CreatePayment(
         wallet_id=wallet_id,
-        bolt11=payment_request,
+        bolt11=payment_response.payment_request,
         payment_hash=invoice.payment_hash,
+        preimage=payment_response.preimage,
         amount_msat=amount_sat * 1000,
         expiry=invoice.expiry_date,
         memo=memo,
@@ -163,7 +170,7 @@ async def create_invoice(
     )
 
     payment = await create_payment(
-        checking_id=checking_id,
+        checking_id=payment_response.checking_id,
         data=create_payment_model,
         conn=conn,
     )
@@ -199,6 +206,7 @@ def fee_reserve_total(amount_msat: int, internal: bool = False) -> int:
 
 
 def fee_reserve(amount_msat: int, internal: bool = False) -> int:
+    amount_msat = abs(amount_msat)
     return settings.fee_reserve(amount_msat, internal)
 
 
@@ -395,8 +403,9 @@ async def check_transaction_status(
 
 async def get_payments_daily_stats(
     filters: Filters[PaymentFilters],
+    user_id: Optional[str] = None,
 ) -> list[PaymentDailyStats]:
-    data_in, data_out = await get_daily_stats(filters)
+    data_in, data_out = await get_daily_stats(filters, user_id=user_id)
     balance_total: float = 0
 
     _none = PaymentDailyStats(date=datetime.now(timezone.utc))
@@ -409,13 +418,16 @@ async def get_payments_daily_stats(
 
     data: list[PaymentDailyStats] = []
 
-    start_date = min(data_in[0].date, data_out[0].date)
-    end_date = max(data_in[-1].date, data_out[-1].date)
+    def _tz(dt: datetime) -> datetime:
+        return dt.replace(tzinfo=timezone.utc)
+
+    start_date = min(_tz(data_in[0].date), _tz(data_out[0].date))
+    end_date = max(_tz(data_in[-1].date), _tz(data_out[-1].date))
     delta = timedelta(days=1)
     while start_date <= end_date:
 
-        data_in_point = next((x for x in data_in if x.date == start_date), _none)
-        data_out_point = next((x for x in data_out if x.date == start_date), _none)
+        data_in_point = next((x for x in data_in if _tz(x.date) == start_date), _none)
+        data_out_point = next((x for x in data_out if _tz(x.date) == start_date), _none)
 
         balance_total += data_in_point.balance + data_out_point.balance
         data.append(
@@ -437,11 +449,27 @@ async def get_payments_daily_stats(
     return data
 
 
-async def _pay_invoice(wallet, create_payment_model, conn):
-    payment = await _pay_internal_invoice(wallet, create_payment_model, conn)
-    if not payment:
-        payment = await _pay_external_invoice(wallet, create_payment_model, conn)
-    return payment
+async def _pay_invoice(
+    wallet_id: str,
+    create_payment_model: CreatePayment,
+    conn: Optional[Connection] = None,
+):
+    async with payment_lock:
+        if wallet_id not in wallets_payments_lock:
+            wallets_payments_lock[wallet_id] = asyncio.Lock()
+
+    async with wallets_payments_lock[wallet_id]:
+        # get the wallet again to make sure we have the latest balance
+        wallet = await get_wallet(wallet_id, conn=conn)
+        if not wallet:
+            raise PaymentError(
+                f"Could not fetch wallet '{wallet_id}'.", status="failed"
+            )
+
+        payment = await _pay_internal_invoice(wallet, create_payment_model, conn)
+        if not payment:
+            payment = await _pay_external_invoice(wallet, create_payment_model, conn)
+        return payment
 
 
 async def _pay_internal_invoice(
@@ -476,12 +504,15 @@ async def _pay_internal_invoice(
     ):
         raise PaymentError("Invalid invoice. Bolt11 changed.", status="failed")
 
-    fee_reserve_total_msat = fee_reserve_total(abs(amount_msat), internal=True)
+    fee_reserve_total_msat = fee_reserve_total(amount_msat, internal=True)
     create_payment_model.fee = abs(fee_reserve_total_msat)
 
     if wallet.balance_msat < abs(amount_msat) + fee_reserve_total_msat:
         raise PaymentError("Insufficient balance.", status="failed")
 
+    # release the preimage
+    create_payment_model.preimage = internal_invoice.preimage
+
     internal_id = f"internal_{create_payment_model.payment_hash}"
     logger.debug(f"creating temporary internal payment with id {internal_id}")
     payment = await create_payment(
@@ -519,6 +550,8 @@ async def _pay_external_invoice(
 
     fee_reserve_total_msat = fee_reserve_total(amount_msat, internal=False)
 
+    if wallet.balance_msat < abs(amount_msat):
+        raise PaymentError("Insufficient balance.", status="failed")
     if wallet.balance_msat < abs(amount_msat) + fee_reserve_total_msat:
         raise PaymentError(
             f"You must reserve at least ({round(fee_reserve_total_msat/1000)}"
@@ -676,7 +709,7 @@ def _validate_payment_request(
 
 
 async def _credit_service_fee_wallet(
-    payment: Payment, conn: Optional[Connection] = None
+    payment: Payment, memo: str, conn: Optional[Connection] = None
 ):
     service_fee_msat = service_fee(payment.amount, internal=payment.is_internal)
     if not settings.lnbits_service_fee_wallet or not service_fee_msat:
@@ -687,7 +720,7 @@ async def _credit_service_fee_wallet(
         bolt11=payment.bolt11,
         payment_hash=payment.payment_hash,
         amount_msat=abs(service_fee_msat),
-        memo="Service fee",
+        memo=memo,
     )
     await create_payment(
         checking_id=f"service_fee_{payment.payment_hash}",

lnbits/core/templates/admin/_tab_security.html

@@ -132,8 +132,8 @@
   >
     <strong class="q-my-none q-mb-sm">Keycloak Auth</strong>
 
-    <div class="row">
-      <div class="col-md-4 col-sm-12 q-pr-sm">
+    <div class="row q-col-gutter-sm q-col-gutter-y-md">
+      <div class="col-md-4 col-sm-12">
         <q-input
           filled
           v-model="formData.keycloak_discovery_url"
@@ -141,7 +141,7 @@
         >
         </q-input>
       </div>
-      <div class="col-md-4 col-sm-12 q-pr-sm">
+      <div class="col-md-4 col-sm-12">
         <q-input
           filled
           v-model="formData.keycloak_client_id"
@@ -159,6 +159,22 @@
         >
         </q-input>
       </div>
+      <div class="col-md-4 col-sm-12">
+        <q-input
+          filled
+          v-model="formData.keycloak_client_custom_org"
+          :label="$t('auth_keycloak_custom_org_label')"
+        >
+        </q-input>
+      </div>
+      <div class="col-md-8 col-sm-12">
+        <q-input
+          filled
+          v-model="formData.keycloak_client_custom_icon"
+          :label="$t('auth_keycloak_custom_icon_label')"
+        >
+        </q-input>
+      </div>
     </div>
   </q-card-section>
   <q-separator></q-separator>

lnbits/core/templates/admin/index.html

@@ -171,23 +171,26 @@ import window_vars with context %} {% block scripts %} {{ window_vars(user) }}
 
         <template v-slot:after>
           <q-form name="settings_form" id="settings_form">
-            <q-tab-panels
-              v-model="tab"
-              animated
-              swipeable
-              vertical
-              transition-prev="jump-up"
-              transition-next="jump-up"
-            >
-              {% include "admin/_tab_funding.html" %} {% include
-              "admin/_tab_users.html" %} {% include "admin/_tab_server.html" %}
-              {% include "admin/_tab_exchange_providers.html" %} {% include
-              "admin/_tab_extensions.html" %} {% include
-              "admin/_tab_notifications.html" %} {% include
-              "admin/_tab_security.html" %} {% include "admin/_tab_theme.html"
-              %}{% include "admin/_tab_audit.html"%}{% include
-              "admin/_tab_library.html"%}
-            </q-tab-panels>
+            <q-scroll-area style="height: 100vh">
+              <q-tab-panels
+                v-model="tab"
+                animated
+                swipeable
+                vertical
+                scroll
+                transition-prev="jump-up"
+                transition-next="jump-up"
+              >
+                {% include "admin/_tab_funding.html" %} {% include
+                "admin/_tab_users.html" %} {% include "admin/_tab_server.html"
+                %} {% include "admin/_tab_exchange_providers.html" %} {% include
+                "admin/_tab_extensions.html" %} {% include
+                "admin/_tab_notifications.html" %} {% include
+                "admin/_tab_security.html" %} {% include "admin/_tab_theme.html"
+                %}{% include "admin/_tab_audit.html"%}{% include
+                "admin/_tab_library.html"%}
+              </q-tab-panels>
+            </q-scroll-area>
           </q-form>
         </template>
       </q-splitter>

lnbits/core/templates/core/_api_docs.html

@@ -48,6 +48,17 @@
               class="cursor-pointer q-ml-sm"
               @click="copyText(wallet.adminkey)"
             ></q-icon>
+            <q-icon name="qr_code" class="cursor-pointer q-ml-sm">
+              <q-popup-proxy>
+                <div class="q-pa-md">
+                  <lnbits-qrcode
+                    :value="wallet.adminkey"
+                    :options="{ width: 250 }"
+                    class="rounded-borders"
+                  ></lnbits-qrcode>
+                </div>
+              </q-popup-proxy>
+            </q-icon>
           </div>
         </q-item-section>
       </q-item>
@@ -70,6 +81,17 @@
               class="cursor-pointer q-ml-sm"
               @click="copyText(wallet.inkey)"
             ></q-icon>
+            <q-icon name="qr_code" class="cursor-pointer q-ml-sm">
+              <q-popup-proxy>
+                <div class="q-pa-md">
+                  <lnbits-qrcode
+                    :value="wallet.inkey"
+                    :options="{ width: 250 }"
+                    class="rounded-borders"
+                  ></lnbits-qrcode>
+                </div>
+              </q-popup-proxy>
+            </q-icon>
           </div>
         </q-item-section>
       </q-item>

lnbits/core/templates/core/account.html

@@ -335,6 +335,22 @@
                     </q-btn-dropdown>
                   </div>
                 </div>
+                <div class="row q-mb-md">
+                  <div class="col-4">
+                    <span v-text="$t('visible_wallet_count')"></span>
+                  </div>
+                  <div class="col-8">
+                    <q-input
+                      v-model="user.extra.visible_wallet_count"
+                      :label="$t('visible_wallet_count')"
+                      filled
+                      dense
+                      type="number"
+                      class="q-mb-md"
+                    ></q-input>
+                  </div>
+                </div>
+
                 <div class="row q-mb-md">
                   <div class="col-4">
                     <span v-text="$t('color_scheme')"></span>
@@ -532,6 +548,12 @@
                     </q-select>
                   </div>
                 </div>
+                <q-separator></q-separator>
+                <div class="row q-mb-md q-mt-md">
+                  <q-btn @click="updateAccount" unelevated color="primary">
+                    <span v-text="$t('update_account')"></span>
+                  </q-btn>
+                </div>
               </q-tab-panel>
               <q-tab-panel name="api_acls">
                 <div class="row q-mb-md">

lnbits/core/templates/core/index.html

@@ -59,9 +59,6 @@
     }
   }
 </style>
-<script>
-  const ALLOWED_REGISTER = {{ LNBITS_NEW_ACCOUNTS_ALLOWED | tojson }};
-</script>
 <script src="{{ static_url_for('static', 'js/index.js') }}"></script>
 {% endblock %} {% block page_container %}
 <q-page-container>
@@ -151,7 +148,7 @@
                 <username-password
                   v-if="authMethod != 'user-id-only'"
                   :allowed_new_users="allowedRegister"
-                  :auth-methods="{{ LNBITS_AUTH_METHODS }}"
+                  :auth-methods="LNBITS_AUTH_METHODS"
                   :auth-action="authAction"
                   v-model:user-name="username"
                   v-model:password_1="password"
@@ -182,12 +179,11 @@
                     >
                       <span v-text="$t('new_user_not_allowed')"></span>
                     </p>
-
                     <p v-else-if="authAction === 'register'" class="q-mb-none">
                       <span v-text="$t('existing_account_question')"></span>
 
                       <span
-                        class="text-secondary cursor-pointer"
+                        class="text-secondary cursor-pointer q-ml-sm"
                         @click="showLogin('username-password')"
                         v-text="$t('login')"
                       ></span>
@@ -252,7 +248,7 @@
           ></q-btn>
         </div>
       </div>
-      {% if AD_SPACE %}
+      {% if AD_SPACE_ENABLED and AD_SPACE %}
       <div class="q-pt-md full-width">
         <div class="row justify-center q-mb-xl">
           <div class="full-width text-center">

lnbits/core/templates/core/wallet.html

@@ -5,7 +5,7 @@
 {% block scripts %} {{ window_vars(user, wallet) }}{% endblock %} {% block page
 %}
 <div class="row q-col-gutter-md">
-  {% if HIDE_API and AD_SPACE %}
+  {% if HIDE_API and AD_SPACE_ENABLED and AD_SPACE %}
   <div class="col-12 col-md-8 q-gutter-y-md">
     {% elif HIDE_API %}
     <div class="col-12 q-gutter-y-md">
@@ -31,7 +31,7 @@
           <q-card-section style="height: 130px">
             <div class="row q-gutter-md">
               <div
-                v-if="'{{ LNBITS_DENOMINATION }}' == 'sats'"
+                v-if="isSatsDenomination"
                 class="col-1"
                 style="max-width: 30px"
               >
@@ -242,6 +242,23 @@
                   {{ SITE_TITLE }} Wallet:
                   <strong><em v-text="g.wallet.name"></em></strong>
                 </div>
+                <q-space></q-space>
+                <div class="float-right">
+                  <q-btn
+                    @click="updateWallet({ pinned: !g.wallet.extra.pinned })"
+                    round
+                    class="float-right"
+                    :color="g.wallet.extra.pinned ? 'primary' : 'grey-5'"
+                    text-color="black"
+                    size="sm"
+                    icon="push_pin"
+                    style="transform: rotate(30deg)"
+                  >
+                    <q-tooltip
+                      ><span v-text="$t('pin_wallet')"></span
+                    ></q-tooltip>
+                  </q-btn>
+                </div>
               </div>
             </q-card-section>
             <q-card-section class="q-pa-none">
@@ -468,7 +485,7 @@
               </q-list>
             </q-card-section>
           </q-card>
-          {% endif %} {% if AD_SPACE %}
+          {% endif %} {% if AD_SPACE_ENABLED and AD_SPACE %}
           <q-card>
             <q-card-section>
               <h6 class="text-subtitle1 q-mt-none q-mb-sm">
@@ -639,7 +656,7 @@
               >
                 <span
                   v-if="receive.lnurl"
-                  v-text="$t('withdraw_from') + receive.lnurl.domain"
+                  v-text="`${$t('withdraw_from')} ${receive.lnurl.domain}`"
                 ></span>
                 <span v-else v-text="$t('create_invoice')"></span>
               </q-btn>
@@ -961,8 +978,8 @@
                     dense
                     v-model.number="parse.data.amount"
                     :label="$t('amount') + ' (' + parse.data.unit + ') *'"
-                    :mask="parse.data.unit != 'sat' ? '#.##' : '#'"
-                    :step="parse.data.unit != 'sat' ? '0.01' : '1'"
+                    :mask="parse.data.unit == 'sat' ? '#' : ''"
+                    :step="parse.data.unit == 'sat' ? '1': '0.01'"
                     fill-mask="0"
                     reverse-fill-mask
                     :min="parse.lnurlpay.minSendable / 1000"

lnbits/core/templates/core/wallets.html

@@ -0,0 +1,165 @@
+{% if not ajax %} {% extends "base.html" %} {% endif %}
+<!---->
+{% from "macros.jinja" import window_vars with context %}
+<!---->
+{% block scripts %} {{ window_vars(user) }}{% endblock %} {% block page %}
+
+<div class="row q-col-gutter-md q-mb-md">
+  <div class="col-12">
+    <q-card>
+      <div class="q-pa-sm q-pl-lg">
+        <div class="row items-center justify-between q-gutter-xs">
+          <div class="col">
+            <q-btn
+              @click="showAddWalletDialog.show = true"
+              :label="$t('add_wallet')"
+              color="primary"
+            >
+            </q-btn>
+          </div>
+          <div class="float-left">
+            <q-input
+              :label="$t('search_wallets')"
+              dense
+              class="float-right q-pr-xl"
+              v-model="walletsTable.search"
+            >
+              <template v-slot:before>
+                <q-icon name="search"> </q-icon>
+              </template>
+              <template v-slot:append>
+                <q-icon
+                  v-if="walletsTable.search !== ''"
+                  name="close"
+                  @click="walletsTable.search = ''"
+                  class="cursor-pointer"
+                >
+                </q-icon>
+              </template>
+            </q-input>
+          </div>
+        </div>
+      </div>
+    </q-card>
+  </div>
+</div>
+<div>
+  <div>
+    <div>
+      <q-table
+        grid
+        grid-header
+        flat
+        bordered
+        :rows="wallets"
+        :columns="walletsTable.columns"
+        v-model:pagination="walletsTable.pagination"
+        :loading="walletsTable.loading"
+        @request="getUserWallets"
+        row-key="id"
+        :filter="filter"
+        hide-header
+      >
+        <template v-slot:item="props">
+          <div class="q-pa-xs col-xs-12 col-sm-6 col-md-4">
+            <q-card
+              class="q-ma-sm cursor-pointer wallet-list-card"
+              style="text-decoration: none"
+              @click="goToWallet(props.row.id)"
+            >
+              <q-card-section>
+                <div class="row items-center">
+                  <q-avatar
+                    size="lg"
+                    :text-color="$q.dark.isActive ? 'black' : 'grey-3'"
+                    :color="props.row.extra.color"
+                    :icon="props.row.extra.icon"
+                  >
+                  </q-avatar>
+
+                  <div
+                    class="text-h6 q-pl-md ellipsis"
+                    class="text-bold"
+                    v-text="props.row.name"
+                  ></div>
+                  <q-space> </q-space>
+                  <q-btn
+                    v-if="props.row.extra.pinned"
+                    round
+                    color="primary"
+                    text-color="black"
+                    size="xs"
+                    icon="push_pin"
+                    class="float-right"
+                    style="transform: rotate(30deg)"
+                  ></q-btn>
+                </div>
+
+                <div class="row items-center q-pt-sm">
+                  <h6 class="q-my-none ellipsis full-width">
+                    <strong
+                      v-text="formatBalance(props.row.balance_msat / 1000)"
+                    ></strong>
+                  </h6>
+                </div>
+              </q-card-section>
+              <q-separator />
+
+              <q-card-section class="text-left">
+                <small>
+                  <strong>
+                    <span v-text="$t('currency')"></span>
+                  </strong>
+                  <span v-text="props.row.currency || 'sat'"></span>
+                </small>
+                <br />
+                <small>
+                  <strong>
+                    <span v-text="$t('id')"></span>
+                    :
+                  </strong>
+                  <span v-text="props.row.id"></span>
+                </small>
+              </q-card-section>
+            </q-card>
+          </div>
+        </template>
+      </q-table>
+    </div>
+  </div>
+</div>
+
+<q-dialog
+  v-model="showAddWalletDialog.show"
+  persistent
+  @hide="showAddWalletDialog = {show: false}"
+>
+  <q-card style="min-width: 350px">
+    <q-card-section>
+      <div class="text-h6">
+        <span v-text="$t('wallet_name')"></span>
+      </div>
+    </q-card-section>
+
+    <q-card-section class="q-pt-none">
+      <q-input
+        dense
+        v-model="showAddWalletDialog.name"
+        autofocus
+        @keyup.enter="submitAddWallet()"
+      ></q-input>
+    </q-card-section>
+
+    <q-card-actions align="right" class="text-primary">
+      <q-btn flat :label="$t('cancel')" v-close-popup></q-btn>
+      <q-btn
+        flat
+        :label="$t('add_wallet')"
+        v-close-popup
+        @click="submitAddWallet()"
+      ></q-btn>
+    </q-card-actions>
+  </q-card>
+</q-dialog>
+
+{% endblock %}

lnbits/core/templates/payments/index.html

@@ -232,15 +232,57 @@
                     />
                   </template>
                 </q-input>
-                <q-select
+                <q-btn
                   v-else-if="['status'].includes(col.name)"
-                  v-model="searchData[col.name]"
-                  :options="searchOptions[col.name]"
-                  @update:model-value="searchPaymentsBy()"
-                  :label="col.label"
-                  clearable
-                  style="width: 100px"
-                ></q-select>
+                  flat
+                  dense
+                  :label="$q.screen.gt.md ? 'Status' : null"
+                  icon="filter_alt"
+                  color="grey"
+                  class="text-capitalize"
+                >
+                  <q-menu anchor="top right" self="top start">
+                    <q-item dense>
+                      <q-checkbox
+                        v-model="statusFilters.success"
+                        @click="handleFilterChanged"
+                        label="Success Payments"
+                      ></q-checkbox>
+                    </q-item>
+                    <q-item dense>
+                      <q-checkbox
+                        v-model="statusFilters.pending"
+                        @click="handleFilterChanged"
+                        label="Pending Payments"
+                      ></q-checkbox>
+                    </q-item>
+                    <q-item dense>
+                      <q-checkbox
+                        v-model="statusFilters.failed"
+                        @click="handleFilterChanged"
+                        label="Failed Payments"
+                      ></q-checkbox>
+                    </q-item>
+                    <q-separator></q-separator>
+                    <q-item dense>
+                      <q-checkbox
+                        v-model="statusFilters.incoming"
+                        @click="handleFilterChanged"
+                        label="Incoming Payments"
+                      ></q-checkbox>
+                    </q-item>
+                    <q-item dense>
+                      <q-checkbox
+                        v-model="statusFilters.outgoing"
+                        @click="handleFilterChanged"
+                        label="Outgoing Payments"
+                      ></q-checkbox>
+                    </q-item>
+                  </q-menu>
+                  <q-tooltip>
+                    <span v-text="$t('filter_payments')"></span>
+                  </q-tooltip>
+                </q-btn>
                 <q-select
                   v-else-if="['tag'].includes(col.name)"
                   v-model="searchData[col.name]"

lnbits/core/templates/users/_manageUser.html

@@ -61,7 +61,7 @@
       :label="$t('set_password')"
       v-model="activeUser.setPassword"
     >
-      <q-tooltip>Toggle Admin</q-tooltip>
+      <q-tooltip v-text="$t('set_password_tooltip')"></q-tooltip>
     </q-toggle>
 
     <q-input
@@ -105,11 +105,12 @@
 
     <q-input
       v-model="activeUser.data.pubkey"
-      :label="$t('pubkey')"
+      :label="'Nostr '+ $t('pubkey')"
       filled
       dense
       class="q-mb-md"
     >
+      <q-tooltip v-text="$t('nostr_pubkey_tooltip')"></q-tooltip>
     </q-input>
     <q-input
       v-model="activeUser.data.email"

lnbits/core/templates/users/_manageWallet.html

@@ -15,19 +15,36 @@
   </q-card>
 </div>
 <div v-else-if="activeWallet.show">
-  <div class="row q-mb-lg">
-    <div class="col">
-      <q-btn
-        icon="arrow_back_ios"
-        @click="backToUsersPage()"
-        :label="$t('back')"
-      ></q-btn>
-      <q-btn
-        @click="createWalletDialog.show = true"
-        :label="$t('create_new_wallet')"
-        color="primary"
-        class="q-ml-md"
-      ></q-btn>
+  <div class="row q-col-gutter-md q-mb-md">
+    <div class="col-12">
+      <q-card>
+        <div class="q-pa-sm">
+          <div class="row">
+            <div class="q-pa-xs">
+              <q-btn
+                icon="arrow_back_ios"
+                @click="backToUsersPage()"
+                :label="$t('back')"
+              ></q-btn>
+            </div>
+            <div class="q-pa-xs">
+              <q-btn
+                @click="createWalletDialog.show = true"
+                :label="$t('create_new_wallet')"
+                color="primary"
+              ></q-btn>
+            </div>
+            <div class="q-pa-xs">
+              <q-btn
+                @click="deleteAllUserWallets(activeWallet.userId)"
+                :label="$t('delete_all_wallets')"
+                icon="delete"
+                color="negative"
+              ></q-btn>
+            </div>
+          </div>
+        </div>
+      </q-card>
     </div>
   </div>
   <q-card class="q-pa-md">

lnbits/core/views/admin_api.py

@@ -29,7 +29,7 @@ from lnbits.settings import AdminSettings, Settings, UpdateSettings, settings
 from lnbits.tasks import invoice_listeners
 
 from .. import core_app_extra
-from ..crud import delete_admin_settings, get_admin_settings, update_admin_settings
+from ..crud import get_admin_settings, reset_core_settings, update_admin_settings
 
 admin_router = APIRouter(tags=["Admin UI"], prefix="/admin")
 file_upload = File(...)
@@ -113,7 +113,7 @@ async def api_reset_settings(field_name: str):
 @admin_router.delete("/api/v1/settings", status_code=HTTPStatus.OK)
 async def api_delete_settings(user: User = Depends(check_super_user)) -> None:
     enqueue_notification(NotificationType.settings_update, {"username": user.username})
-    await delete_admin_settings()
+    await reset_core_settings()
     server_restart.set()
 
 

lnbits/core/views/api.py

@@ -130,14 +130,20 @@ async def api_lnurlscan(
         headers = {"User-Agent": settings.user_agent}
         async with httpx.AsyncClient(headers=headers, follow_redirects=True) as client:
             check_callback_url(url)
-            r = await client.get(url, timeout=5)
-            r.raise_for_status()
-            if r.is_error:
+            try:
+                r = await client.get(url, timeout=5)
+                r.raise_for_status()
+            except httpx.HTTPStatusError as exc:
+                if exc.response.status_code == 404:
+                    raise HTTPException(HTTPStatus.NOT_FOUND, "Not found") from exc
+
                 raise HTTPException(
                     status_code=HTTPStatus.SERVICE_UNAVAILABLE,
-                    detail={"domain": domain, "message": "failed to get parameters"},
-                )
-
+                    detail={
+                        "domain": domain,
+                        "message": "failed to get parameters",
+                    },
+                ) from exc
         try:
             data = json.loads(r.text)
         except json.decoder.JSONDecodeError as exc:

lnbits/core/views/auth_api.py

@@ -74,7 +74,7 @@ async def get_auth_user(user: User = Depends(check_user_exists)) -> User:
 async def login(data: LoginUsernamePassword) -> JSONResponse:
     if not settings.is_auth_method_allowed(AuthMethods.username_and_password):
         raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "Login by 'Username and Password' not allowed."
+            HTTPStatus.FORBIDDEN, "Login by 'Username and Password' not allowed."
         )
     account = await get_account_by_username_or_email(data.username)
     if not account or not account.verify_password(data.password):
@@ -85,9 +85,7 @@ async def login(data: LoginUsernamePassword) -> JSONResponse:
 @auth_router.post("/nostr", description="Login via Nostr")
 async def nostr_login(request: Request) -> JSONResponse:
     if not settings.is_auth_method_allowed(AuthMethods.nostr_auth_nip98):
-        raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "Login with Nostr Auth not allowed."
-        )
+        raise HTTPException(HTTPStatus.FORBIDDEN, "Login with Nostr Auth not allowed.")
     event = _nostr_nip98_event(request)
     account = await get_account_by_pubkey(event["pubkey"])
     if not account:
@@ -104,7 +102,7 @@ async def nostr_login(request: Request) -> JSONResponse:
 async def login_usr(data: LoginUsr) -> JSONResponse:
     if not settings.is_auth_method_allowed(AuthMethods.user_id_only):
         raise HTTPException(
-            HTTPStatus.UNAUTHORIZED,
+            HTTPStatus.FORBIDDEN,
             "Login by 'User ID' not allowed.",
         )
     account = await get_account(data.usr)
@@ -112,7 +110,7 @@ async def login_usr(data: LoginUsr) -> JSONResponse:
         raise HTTPException(HTTPStatus.UNAUTHORIZED, "User ID does not exist.")
     if account.is_admin:
         raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "Admin users cannot login with user id only."
+            HTTPStatus.FORBIDDEN, "Admin users cannot login with user id only."
         )
     return _auth_success_response(account.username, account.id, account.email)
 
@@ -242,7 +240,7 @@ async def login_with_sso_provider(
     provider_sso = _new_sso(provider)
     if not provider_sso:
         raise HTTPException(
-            HTTPStatus.UNAUTHORIZED,
+            HTTPStatus.FORBIDDEN,
             f"Login by '{provider}' not allowed.",
         )
 
@@ -257,7 +255,7 @@ async def handle_oauth_token(request: Request, provider: str) -> RedirectRespons
     provider_sso = _new_sso(provider)
     if not provider_sso:
         raise HTTPException(
-            HTTPStatus.UNAUTHORIZED,
+            HTTPStatus.FORBIDDEN,
             f"Login by '{provider}' not allowed.",
         )
 
@@ -285,7 +283,7 @@ async def logout() -> JSONResponse:
 async def register(data: RegisterUser) -> JSONResponse:
     if not settings.is_auth_method_allowed(AuthMethods.username_and_password):
         raise HTTPException(
-            HTTPStatus.UNAUTHORIZED,
+            HTTPStatus.FORBIDDEN,
             "Register by 'Username and Password' not allowed.",
         )
 
@@ -375,7 +373,7 @@ async def update_password(
 async def reset_password(data: ResetUserPassword) -> JSONResponse:
     if not settings.is_auth_method_allowed(AuthMethods.username_and_password):
         raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "Auth by 'Username and Password' not allowed."
+            HTTPStatus.FORBIDDEN, "Auth by 'Username and Password' not allowed."
         )
 
     assert data.password == data.password_repeat, "Passwords do not match."
@@ -449,7 +447,7 @@ async def update(
 @auth_router.put("/first_install")
 async def first_install(data: UpdateSuperuserPassword) -> JSONResponse:
     if not settings.first_install:
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "This is not your first install")
+        raise HTTPException(HTTPStatus.FORBIDDEN, "This is not your first install")
     account = await get_account(settings.super_user)
     if not account:
         raise HTTPException(HTTPStatus.INTERNAL_SERVER_ERROR, "Superuser not found.")
@@ -472,10 +470,10 @@ async def _handle_sso_login(userinfo: OpenID, verified_user_id: Optional[str] =
 
     if verified_user_id:
         if account:
-            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Email already used.")
+            raise HTTPException(HTTPStatus.FORBIDDEN, "Email already used.")
         account = await get_account(verified_user_id)
         if not account:
-            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Cannot verify user email.")
+            raise HTTPException(HTTPStatus.FORBIDDEN, "Cannot verify user email.")
         redirect_path = "/account"
 
     if account:
@@ -499,9 +497,12 @@ def _auth_success_response(
         sub=username or "", usr=user_id, email=email, auth_time=int(time())
     )
     access_token = create_access_token(data=payload.dict())
+    max_age = settings.auth_token_expire_minutes * 60
     response = JSONResponse({"access_token": access_token, "token_type": "bearer"})
-    response.set_cookie("cookie_access_token", access_token, httponly=True)
-    response.set_cookie("is_lnbits_user_authorized", "true")
+    response.set_cookie(
+        "cookie_access_token", access_token, httponly=True, max_age=max_age
+    )
+    response.set_cookie("is_lnbits_user_authorized", "true", max_age=max_age)
     response.delete_cookie("is_access_token_expired")
 
     return response
@@ -521,9 +522,12 @@ def _auth_api_token_response(
 def _auth_redirect_response(path: str, email: str) -> RedirectResponse:
     payload = AccessTokenPayload(sub="" or "", email=email, auth_time=int(time()))
     access_token = create_access_token(data=payload.dict())
+    max_age = settings.auth_token_expire_minutes * 60
     response = RedirectResponse(path)
-    response.set_cookie("cookie_access_token", access_token, httponly=True)
-    response.set_cookie("is_lnbits_user_authorized", "true")
+    response.set_cookie(
+        "cookie_access_token", access_token, httponly=True, max_age=max_age
+    )
+    response.set_cookie("is_lnbits_user_authorized", "true", max_age=max_age)
     response.delete_cookie("is_access_token_expired")
     return response
 
@@ -574,10 +578,10 @@ def _find_auth_provider_class(provider: str) -> Callable:
 def _nostr_nip98_event(request: Request) -> dict:
     auth_header = request.headers.get("Authorization")
     if not auth_header:
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Nostr Auth header missing.")
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Nostr Auth header missing.")
     scheme, token = auth_header.split()
     if scheme.lower() != "nostr":
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid Authorization scheme.")
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid Authorization scheme.")
     event = None
     try:
         event_json = base64.b64decode(token.encode("ascii"))

lnbits/core/views/generic.py

@@ -216,6 +216,25 @@ async def account(
     )
 
 
+@generic_router.get(
+    "/wallets",
+    response_class=HTMLResponse,
+    description="show wallets page",
+)
+async def wallets(
+    request: Request,
+    user: User = Depends(check_user_exists),
+):
+    return template_renderer().TemplateResponse(
+        request,
+        "core/wallets.html",
+        {
+            "user": user.json(),
+            "ajax": _is_ajax_request(request),
+        },
+    )
+
+
 @generic_router.get("/service-worker.js")
 async def service_worker(request: Request):
     return template_renderer().TemplateResponse(
@@ -402,7 +421,7 @@ async def audit_index(request: Request, user: User = Depends(check_admin)):
 
 
 @generic_router.get("/payments", response_class=HTMLResponse)
-async def payments_index(request: Request, user: User = Depends(check_admin)):
+async def payments_index(request: Request, user: User = Depends(check_user_exists)):
     return template_renderer().TemplateResponse(
         "payments/index.html",
         {

lnbits/core/views/node_api.py

@@ -212,7 +212,10 @@ async def api_get_1ml_stats(node: Node = Depends(require_node)) -> Optional[Node
         r = await client.get(url=f"https://1ml.com/node/{node_id}/json", timeout=15)
         try:
             r.raise_for_status()
-            return r.json()["noderank"]
+            data = r.json()
+            if "noderank" not in data:
+                return None
+            return data["noderank"]
         except httpx.HTTPStatusError as exc:
             raise HTTPException(
                 status_code=HTTPStatus.NOT_FOUND, detail="Node not found on 1ml.com"

lnbits/core/views/payment_api.py

@@ -44,7 +44,6 @@ from lnbits.core.services.payments import (
 from lnbits.db import Filters, Page
 from lnbits.decorators import (
     WalletTypeInfo,
-    check_admin,
     check_user_exists,
     parse_filters,
     require_admin_key,
@@ -116,30 +115,44 @@ async def api_payments_history(
 @payment_router.get(
     "/stats/count",
     name="Get payments history for all users",
-    dependencies=[Depends(check_admin)],
     response_model=List[PaymentCountStat],
     openapi_extra=generate_filter_params_openapi(PaymentFilters),
 )
 async def api_payments_counting_stats(
     count_by: PaymentCountField = Query("tag"),
     filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
+    user: User = Depends(check_user_exists),
 ):
 
-    return await get_payment_count_stats(count_by, filters)
+    if user.admin:
+        # admin user can see payments from all wallets
+        for_user_id = None
+    else:
+        # regular user can only see payments from their wallets
+        for_user_id = user.id
+
+    return await get_payment_count_stats(count_by, filters=filters, user_id=for_user_id)
 
 
 @payment_router.get(
     "/stats/wallets",
     name="Get payments history for all users",
-    dependencies=[Depends(check_admin)],
     response_model=List[PaymentWalletStats],
     openapi_extra=generate_filter_params_openapi(PaymentFilters),
 )
 async def api_payments_wallets_stats(
     filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
+    user: User = Depends(check_user_exists),
 ):
 
-    return await get_wallets_stats(filters)
+    if user.admin:
+        # admin user can see payments from all wallets
+        for_user_id = None
+    else:
+        # regular user can only see payments from their wallets
+        for_user_id = user.id
+
+    return await get_wallets_stats(filters, user_id=for_user_id)
 
 
 @payment_router.get(
@@ -153,22 +166,13 @@ async def api_payments_daily_stats(
     filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
 ):
 
-    if not user.admin:
-        exc = HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail="Missing wallet id.",
-        )
-        wallet_filter = next(
-            (f for f in filters.filters if f.field == "wallet_id"), None
-        )
-        if not wallet_filter:
-            raise exc
-        wallet_id = list((wallet_filter.values or {}).values())
-        if len(wallet_id) == 0:
-            raise exc
-        if not user.get_wallet(wallet_id[0]):
-            raise exc
-    return await get_payments_daily_stats(filters)
+    if user.admin:
+        # admin user can see payments from all wallets
+        for_user_id = None
+    else:
+        # regular user can only see payments from their wallets
+        for_user_id = user.id
+    return await get_payments_daily_stats(filters, user_id=for_user_id)
 
 
 @payment_router.get(
@@ -264,13 +268,21 @@ async def _api_payments_create_invoice(data: CreateInvoice, wallet: Wallet):
     response_description="list of payments",
     response_model=Page[Payment],
     openapi_extra=generate_filter_params_openapi(PaymentFilters),
-    dependencies=[Depends(check_admin)],
 )
 async def api_all_payments_paginated(
     filters: Filters = Depends(parse_filters(PaymentFilters)),
+    user: User = Depends(check_user_exists),
 ):
+    if user.admin:
+        # admin user can see payments from all wallets
+        for_user_id = None
+    else:
+        # regular user can only see payments from their wallets
+        for_user_id = user.id
+
     return await get_payments_paginated(
         filters=filters,
+        user_id=for_user_id,
     )
 
 
@@ -314,7 +326,7 @@ async def api_payments_create(
         return await _api_payments_create_invoice(invoice_data, wallet.wallet)
     else:
         raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
+            status_code=HTTPStatus.FORBIDDEN,
             detail="Invoice (or Admin) key required.",
         )
 

lnbits/core/views/user_api.py

@@ -148,7 +148,7 @@ async def api_update_user(
 async def api_users_delete_user(
     user_id: str, user: User = Depends(check_admin)
 ) -> SimpleStatus:
-    wallets = await get_wallets(user_id)
+    wallets = await get_wallets(user_id, deleted=False)
     if len(wallets) > 0:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST,
@@ -257,6 +257,28 @@ async def api_users_undelete_user_wallet(user_id: str, wallet: str) -> SimpleSta
     return SimpleStatus(success=True, message="Wallet is already active.")
 
 
+@users_router.delete(
+    "/user/{user_id}/wallets",
+    name="Delete all wallets for user",
+    summary="Soft delete (only sets a flag) all user wallets.",
+)
+async def api_users_delete_all_user_wallet(user_id: str) -> SimpleStatus:
+    if user_id == settings.super_user:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Action not allowed.",
+        )
+
+    wallets = await get_wallets(user_id, deleted=False)
+    for wallet in wallets:
+        await delete_wallet(user_id=user_id, wallet_id=wallet.id)
+
+    return SimpleStatus(
+        success=True,
+        message=f"Deleted '{len(wallets)}' wallets. ",
+    )
+
+
 @users_router.delete(
     "/user/{user_id}/wallet/{wallet}",
     name="Delete wallet by id",

lnbits/core/views/wallet_api.py

@@ -9,13 +9,18 @@ from fastapi import (
     HTTPException,
 )
 
+from lnbits.core.crud.wallets import get_wallets_paginated
 from lnbits.core.models import CreateWallet, KeyType, User, Wallet
+from lnbits.core.models.wallets import WalletsFilters
+from lnbits.db import Filters, Page
 from lnbits.decorators import (
     WalletTypeInfo,
     check_user_exists,
+    parse_filters,
     require_admin_key,
     require_invoice_key,
 )
+from lnbits.helpers import generate_filter_params_openapi
 
 from ..crud import (
     create_wallet,
@@ -38,6 +43,26 @@ async def api_wallet(key_info: WalletTypeInfo = Depends(require_invoice_key)):
     return res
 
 
+@wallet_router.get(
+    "/paginated",
+    name="Wallet List",
+    summary="get paginated list of user wallets",
+    response_description="list of user wallets",
+    response_model=Page[Wallet],
+    openapi_extra=generate_filter_params_openapi(WalletsFilters),
+)
+async def api_wallets_paginated(
+    user: User = Depends(check_user_exists),
+    filters: Filters = Depends(parse_filters(WalletsFilters)),
+):
+    page = await get_wallets_paginated(
+        user_id=user.id,
+        filters=filters,
+    )
+
+    return page
+
+
 @wallet_router.put("/{new_name}")
 async def api_update_wallet_name(
     new_name: str, key_info: WalletTypeInfo = Depends(require_admin_key)
@@ -74,6 +99,7 @@ async def api_update_wallet(
     icon: Optional[str] = Body(None),
     color: Optional[str] = Body(None),
     currency: Optional[str] = Body(None),
+    pinned: Optional[bool] = Body(None),
     key_info: WalletTypeInfo = Depends(require_admin_key),
 ) -> Wallet:
     wallet = await get_wallet(key_info.wallet.id)
@@ -82,6 +108,7 @@ async def api_update_wallet(
     wallet.name = name or wallet.name
     wallet.extra.icon = icon or wallet.extra.icon
     wallet.extra.color = color or wallet.extra.color
+    wallet.extra.pinned = pinned if pinned is not None else wallet.extra.pinned
     wallet.currency = currency if currency is not None else wallet.currency
     await update_wallet(wallet)
     return wallet

lnbits/db.py

@@ -554,9 +554,13 @@ class Filters(BaseModel, Generic[TFilterModel]):
             for page_filter in self.filters:
                 where_stmts.append(page_filter.statement)
         if self.search and self.model and self.model.__search_fields__:
-            where_stmts.append(
-                f"lower(concat({', '.join(self.model.__search_fields__)})) LIKE :search"
+            # Use `COALESCE` to handle `NULL` values and `||`
+            # for cross-database compatible string concatenation
+            _fields = self.model.__search_fields__
+            search_expr = " || ".join(
+                f"COALESCE(CAST({field} AS TEXT), '')" for field in _fields
             )
+            where_stmts.append(f"lower({search_expr}) LIKE :search")
 
         if where_stmts:
             return "WHERE " + " AND ".join(where_stmts)
@@ -576,7 +580,7 @@ class Filters(BaseModel, Generic[TFilterModel]):
                     for key, value in page_filter.values.items():
                         values[key] = value
         if self.search and self.model:
-            values["search"] = f"%{self.search}%"
+            values["search"] = f"%{self.search.lower()}%"
         return values
 
 
@@ -644,9 +648,9 @@ def model_to_dict(model: BaseModel) -> dict:
 def dict_to_submodel(model: type[TModel], value: dict | str) -> TModel | None:
     """convert a dictionary or JSON string to a Pydantic model"""
     if isinstance(value, str):
-        if value == "null":
+        if value == "null" or value == "":
             return None
-        _subdict = json.loads(value)
+        _subdict = _safe_load_json(value)
     elif isinstance(value, dict):
         _subdict = value
 
@@ -670,7 +674,7 @@ def dict_to_model(_row: dict, model: type[TModel]) -> TModel:
         type_ = model.__fields__[key].type_
         outertype_ = model.__fields__[key].outer_type_
         if get_origin(outertype_) is list:
-            _items = json.loads(value) if isinstance(value, str) else value
+            _items = _safe_load_json(value) if isinstance(value, str) else value
             _dict[key] = [
                 dict_to_submodel(type_, v) if issubclass(type_, BaseModel) else v
                 for v in _items
@@ -691,7 +695,7 @@ def dict_to_model(_row: dict, model: type[TModel]) -> TModel:
         # TODO: remove this when all sub models are migrated to Pydantic
         # NOTE: this is for type dict on BaseModel, (used in Payment class)
         if type_ is dict and value:
-            _dict[key] = json.loads(value)
+            _dict[key] = _safe_load_json(value)
             continue
         _dict[key] = value
         continue
@@ -699,3 +703,12 @@ def dict_to_model(_row: dict, model: type[TModel]) -> TModel:
     if isinstance(_model, BaseModel):
         _model.__init__(**_dict)  # type: ignore
     return _model
+
+
+def _safe_load_json(value: str) -> dict:
+    try:
+        return json.loads(value)
+    except json.JSONDecodeError:
+        # DB is corrupted if it gets here
+        logger.error(f"Failed to decode JSON: '{value}'")
+        return {}

lnbits/decorators.py

@@ -102,7 +102,7 @@ class KeyChecker(SecurityBase):
         request.scope["user_id"] = wallet.user
         if self.expected_key_type is KeyType.admin and wallet.adminkey != key_value:
             raise HTTPException(
-                status_code=HTTPStatus.UNAUTHORIZED,
+                status_code=HTTPStatus.FORBIDDEN,
                 detail="Invalid adminkey.",
             )
 
@@ -165,7 +165,7 @@ async def check_user_exists(
 
     r.scope["user_id"] = account.id
     if not settings.is_user_allowed(account.id):
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User not allowed.")
+        raise HTTPException(HTTPStatus.FORBIDDEN, "User not allowed.")
 
     user = await get_user_from_account(account)
     if not user:
@@ -201,7 +201,7 @@ async def access_token_payload(
 async def check_admin(user: Annotated[User, Depends(check_user_exists)]) -> User:
     if user.id != settings.super_user and user.id not in settings.lnbits_admin_users:
         raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "User not authorized. No admin privileges."
+            HTTPStatus.FORBIDDEN, "User not authorized. No admin privileges."
         )
     if not user.has_password:
         raise HTTPException(
@@ -214,7 +214,7 @@ async def check_admin(user: Annotated[User, Depends(check_user_exists)]) -> User
 async def check_super_user(user: Annotated[User, Depends(check_user_exists)]) -> User:
     if user.id != settings.super_user:
         raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "User not authorized. No super user privileges."
+            HTTPStatus.FORBIDDEN, "User not authorized. No super user privileges."
         )
     if not user.has_password:
         raise HTTPException(

lnbits/exceptions.py

@@ -7,6 +7,7 @@ from fastapi import FastAPI, HTTPException, Request
 from fastapi.exceptions import RequestValidationError
 from fastapi.responses import JSONResponse, RedirectResponse, Response
 from loguru import logger
+from shortuuid import uuid
 
 from lnbits.settings import settings
 
@@ -71,10 +72,11 @@ def register_exception_handlers(app: FastAPI):
     async def exception_handler(request: Request, exc: Exception):
         etype, _, tb = sys.exc_info()
         traceback.print_exception(etype, exc, tb)
-        logger.error(f"Exception: {exc!s}")
+        exception_id = uuid()
+        logger.error(f"Exception ID: {exception_id}\n{exc!s}")
         return render_html_error(request, exc) or JSONResponse(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            content={"detail": str(exc)},
+            content={"detail": f"Unexpected error! ID: {exception_id}"},
         )
 
     @app.exception_handler(AssertionError)

lnbits/helpers.py

@@ -11,6 +11,7 @@ import jinja2
 import jwt
 import shortuuid
 from fastapi.routing import APIRoute
+from loguru import logger
 from packaging import version
 from pydantic.schema import field_schema
 
@@ -64,63 +65,52 @@ def template_renderer(additional_folders: Optional[list] = None) -> Jinja2Templa
     t = Jinja2Templates(loader=jinja2.FileSystemLoader(folders))
     t.env.globals["static_url_for"] = static_url_for
 
-    if settings.lnbits_ad_space_enabled:
-        t.env.globals["AD_SPACE"] = settings.lnbits_ad_space.split(",")
-        t.env.globals["AD_SPACE_TITLE"] = settings.lnbits_ad_space_title
+    window_settings = {
+        "AD_SPACE": settings.lnbits_ad_space.split(","),
+        "AD_SPACE_ENABLED": settings.lnbits_ad_space_enabled,
+        "AD_SPACE_TITLE": settings.lnbits_ad_space_title,
+        "EXTENSIONS": list(settings.lnbits_installed_extensions_ids),
+        "HIDE_API": settings.lnbits_hide_api,
+        "SITE_TITLE": settings.lnbits_site_title,
+        "SITE_TAGLINE": settings.lnbits_site_tagline,
+        "SITE_DESCRIPTION": settings.lnbits_site_description,
+        "LNBITS_ADMIN_UI": settings.lnbits_admin_ui,
+        "LNBITS_AUDIT_ENABLED": settings.lnbits_audit_enabled,
+        "LNBITS_AUTH_METHODS": settings.auth_allowed_methods,
+        "LNBITS_AUTH_KEYCLOAK_ORG": settings.keycloak_client_custom_org,
+        "LNBITS_AUTH_KEYCLOAK_ICON": settings.keycloak_client_custom_icon,
+        "LNBITS_CUSTOM_IMAGE": settings.lnbits_custom_image,
+        "LNBITS_CUSTOM_BADGE": settings.lnbits_custom_badge,
+        "LNBITS_CUSTOM_BADGE_COLOR": settings.lnbits_custom_badge_color,
+        "LNBITS_EXTENSIONS_DEACTIVATE_ALL": settings.lnbits_extensions_deactivate_all,
+        "LNBITS_NEW_ACCOUNTS_ALLOWED": settings.new_accounts_allowed,
+        "LNBITS_NODE_UI": settings.lnbits_node_ui and get_node_class() is not None,
+        "LNBITS_NODE_UI_AVAILABLE": get_node_class() is not None,
+        "LNBITS_QR_LOGO": settings.lnbits_qr_logo,
+        "LNBITS_SERVICE_FEE": settings.lnbits_service_fee,
+        "LNBITS_SERVICE_FEE_MAX": settings.lnbits_service_fee_max,
+        "LNBITS_SERVICE_FEE_WALLET": settings.lnbits_service_fee_wallet,
+        "LNBITS_SHOW_HOME_PAGE_ELEMENTS": settings.lnbits_show_home_page_elements,
+        "LNBITS_THEME_OPTIONS": settings.lnbits_theme_options,
+        "LNBITS_VERSION": settings.version,
+        "USE_CUSTOM_LOGO": settings.lnbits_custom_logo,
+        "USE_DEFAULT_REACTION": settings.lnbits_default_reaction,
+        "USE_DEFAULT_THEME": settings.lnbits_default_theme,
+        "USE_DEFAULT_BORDER": settings.lnbits_default_border,
+        "USE_DEFAULT_GRADIENT": settings.lnbits_default_gradient,
+        "USE_DEFAULT_BGIMAGE": settings.lnbits_default_bgimage,
+        "VOIDWALLET": settings.lnbits_backend_wallet_class == "VoidWallet",
+        "WEBPUSH_PUBKEY": settings.lnbits_webpush_pubkey,
+        "LNBITS_DENOMINATION": (
+            settings.lnbits_denomination
+            if settings.lnbits_denomination == "FakeWallet"
+            else "sats"
+        ),
+    }
 
-    t.env.globals["VOIDWALLET"] = settings.lnbits_backend_wallet_class == "VoidWallet"
-    t.env.globals["HIDE_API"] = settings.lnbits_hide_api
-    t.env.globals["SITE_TITLE"] = settings.lnbits_site_title
-    t.env.globals["LNBITS_DENOMINATION"] = (
-        settings.lnbits_denomination
-        if settings.lnbits_backend_wallet_class == "FakeWallet"
-        else "sats"
-    )
-    t.env.globals["SITE_TAGLINE"] = settings.lnbits_site_tagline
-    t.env.globals["SITE_DESCRIPTION"] = settings.lnbits_site_description
-    t.env.globals["LNBITS_SHOW_HOME_PAGE_ELEMENTS"] = (
-        settings.lnbits_show_home_page_elements
-    )
-    t.env.globals["LNBITS_CUSTOM_IMAGE"] = settings.lnbits_custom_image
-    t.env.globals["LNBITS_CUSTOM_BADGE"] = settings.lnbits_custom_badge
-    t.env.globals["LNBITS_CUSTOM_BADGE_COLOR"] = settings.lnbits_custom_badge_color
-    t.env.globals["LNBITS_THEME_OPTIONS"] = settings.lnbits_theme_options
-    t.env.globals["LNBITS_QR_LOGO"] = settings.lnbits_qr_logo
-    t.env.globals["LNBITS_VERSION"] = settings.version
-    t.env.globals["LNBITS_NEW_ACCOUNTS_ALLOWED"] = settings.new_accounts_allowed
-    t.env.globals["LNBITS_AUTH_METHODS"] = settings.auth_allowed_methods
-    t.env.globals["LNBITS_ADMIN_UI"] = settings.lnbits_admin_ui
-    t.env.globals["LNBITS_EXTENSIONS_DEACTIVATE_ALL"] = (
-        settings.lnbits_extensions_deactivate_all
-    )
-    t.env.globals["LNBITS_AUDIT_ENABLED"] = settings.lnbits_audit_enabled
-
-    t.env.globals["LNBITS_SERVICE_FEE"] = settings.lnbits_service_fee
-    t.env.globals["LNBITS_SERVICE_FEE_MAX"] = settings.lnbits_service_fee_max
-    t.env.globals["LNBITS_SERVICE_FEE_WALLET"] = settings.lnbits_service_fee_wallet
-    t.env.globals["LNBITS_NODE_UI"] = (
-        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"] = list(settings.lnbits_installed_extensions_ids)
-
-    if settings.lnbits_custom_logo:
-        t.env.globals["USE_CUSTOM_LOGO"] = settings.lnbits_custom_logo
-
-    if settings.lnbits_default_reaction:
-        t.env.globals["USE_DEFAULT_REACTION"] = settings.lnbits_default_reaction
-
-    if settings.lnbits_default_theme:
-        t.env.globals["USE_DEFAULT_THEME"] = settings.lnbits_default_theme
-
-    if settings.lnbits_default_border:
-        t.env.globals["USE_DEFAULT_BORDER"] = settings.lnbits_default_border
-
-    if settings.lnbits_default_gradient:
-        t.env.globals["USE_DEFAULT_GRADIENT"] = settings.lnbits_default_gradient
-
-    if settings.lnbits_default_bgimage:
-        t.env.globals["USE_DEFAULT_BGIMAGE"] = settings.lnbits_default_bgimage
+    t.env.globals["WINDOW_SETTINGS"] = window_settings
+    for key, value in window_settings.items():
+        t.env.globals[key] = value
 
     if settings.bundle_assets:
         t.env.globals["INCLUDED_JS"] = ["bundle.min.js"]
@@ -134,8 +124,6 @@ def template_renderer(additional_folders: Optional[list] = None) -> Jinja2Templa
             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
-
     return t
 
 
@@ -294,12 +282,21 @@ def is_lnbits_version_ok(
 
 
 def check_callback_url(url: str):
-    netloc = urlparse(url).netloc
+    if not settings.lnbits_callback_url_rules:
+        # no rules, all urls are allowed
+        return
+    u = urlparse(url)
     for rule in settings.lnbits_callback_url_rules:
-        if re.match(rule, netloc) is None:
-            raise ValueError(
-                f"Callback not allowed. URL: {url}. Netloc: {netloc}. Rule: {rule}"
-            )
+        try:
+            if re.match(rule, f"{u.scheme}://{u.netloc}") is not None:
+                return
+        except re.error:
+            logger.debug(f"Invalid regex rule: '{rule}'. ")
+            continue
+    raise ValueError(
+        f"Callback not allowed. URL: {url}. Netloc: {u.netloc}. "
+        f"Please check your admin settings."
+    )
 
 
 def download_url(url, save_path):

lnbits/settings.py

@@ -381,7 +381,7 @@ class SecuritySettings(LNbitsSettings):
     lnbits_allowed_ips: list[str] = Field(default=[])
     lnbits_blocked_ips: list[str] = Field(default=[])
     lnbits_callback_url_rules: list[str] = Field(
-        default=["^(?!\\d+\\.\\d+\\.\\d+\\.\\d+$)(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$"]
+        default=["https?://([a-zA-Z0-9.-]+\\.[a-zA-Z]{2,})(:\\d+)?"]
     )
 
     lnbits_wallet_limit_max_balance: int = Field(default=0, ge=0)
@@ -553,7 +553,16 @@ class BoltzFundingSource(LNbitsSettings):
     boltz_client_endpoint: str | None = Field(default="127.0.0.1:9002")
     boltz_client_macaroon: str | None = Field(default=None)
     boltz_client_wallet: str | None = Field(default="lnbits")
+    boltz_client_password: str = Field(default="")
     boltz_client_cert: str | None = Field(default=None)
+    boltz_mnemonic: str | None = Field(default=None)
+
+
+class StrikeFundingSource(LNbitsSettings):
+    strike_api_endpoint: str | None = Field(
+        default="https://api.strike.me/v1", env="STRIKE_API_ENDPOINT"
+    )
+    strike_api_key: str | None = Field(default=None, env="STRIKE_API_KEY")
 
 
 class LightningSettings(LNbitsSettings):
@@ -580,6 +589,7 @@ class FundingSourcesSettings(
     LnTipsFundingSource,
     NWCFundingSource,
     BreezSdkFundingSource,
+    StrikeFundingSource,
 ):
     lnbits_backend_wallet_class: str = Field(default="VoidWallet")
     # How long to wait for the payment to be confirmed before returning a pending status
@@ -659,6 +669,8 @@ class KeycloakAuthSettings(LNbitsSettings):
     keycloak_discovery_url: str = Field(default="")
     keycloak_client_id: str = Field(default="")
     keycloak_client_secret: str = Field(default="")
+    keycloak_client_custom_org: str | None = Field(default=None)
+    keycloak_client_custom_icon: str | None = Field(default=None)
 
 
 class AuditSettings(LNbitsSettings):
@@ -863,6 +875,7 @@ class SuperUserSettings(LNbitsSettings):
             "VoidWallet",
             "ZBDWallet",
             "NWCWallet",
+            "StrikeWallet",
         ]
     )
 

lnbits/static/i18n/en.js

@@ -49,8 +49,11 @@ window.localisation.en = {
     'This QR code contains your wallet URL with full access. You can scan it from your phone to open your wallet from there.',
   access_wallet_on_mobile: 'Mobile Access',
   wallet: 'Wallet: ',
+  wallet_name: 'Wallet name',
   wallets: 'Wallets',
-  add_wallet: 'Add a new wallet',
+  add_wallet: 'Add wallet',
+  add_new_wallet: 'Add a new wallet',
+  pin_wallet: 'Pin wallet',
   delete_wallet: 'Delete wallet',
   delete_wallet_desc:
     'This whole wallet will be deleted, the funds will be UNRECOVERABLE.',
@@ -125,6 +128,7 @@ window.localisation.en = {
   no_extensions: "You don't have any extensions installed :(",
   created: 'Created',
   search_extensions: 'Search extensions',
+  search_wallets: 'Search wallets',
   extension_sources: 'Extension Sources',
   ext_sources_hint: 'Repositories from where the extensions can be downloaded',
   ext_sources_label:
@@ -264,6 +268,7 @@ window.localisation.en = {
   notification_source_label:
     'Source URL (only use the official LNbits status source, and sources you can trust)',
   more: 'more',
+  more_count: '{count} more',
   less: 'less',
   releases: 'Releases',
   watchdog: 'Watchdog',
@@ -278,7 +283,7 @@ window.localisation.en = {
   callback_url_rules: 'Callback URL Rules',
   enter_callback_url_rule: 'Enter URL rule as regex and hit enter',
   callback_url_rule_hint:
-    'Callback URLs (like LNURL one) will be validated against all of these rules. No rule means all URLs are allowed.',
+    'Callback URLs (like LNURL one) will be validated against these rules. At leat one rule must match. No rule means all URLs are allowed.',
   wallet_limiter: 'Wallet Limiter',
   wallet_config: 'Wallet Config',
   wallet_charts: 'Wallet Charts',
@@ -303,6 +308,9 @@ window.localisation.en = {
   login_with_user_id: 'Login with user ID',
   or: 'or',
   create_new_wallet: 'Create New Wallet',
+  delete_all_wallets: 'Delete All Wallets',
+  confirm_delete_all_wallets:
+    'Are you sure you want to delete ALL wallets for this user?',
   login_to_account: 'Login to your account',
   create_account: 'Create account',
   account_settings: 'Account Settings',
@@ -311,7 +319,7 @@ window.localisation.en = {
   signin_with_nostr: 'Continue with Nostr',
   signin_with_google: 'Sign in with Google',
   signin_with_github: 'Sign in with GitHub',
-  signin_with_keycloak: 'Sign in with Keycloak',
+  signin_with_custom_org: 'Sign in with {custom_org}',
   username_or_email: 'Username or Email',
   password: 'Password',
   password_config: 'Password Config',
@@ -320,14 +328,19 @@ window.localisation.en = {
   change_password: 'Change Password',
   update_credentials: 'Update Credentials',
   update_pubkey: 'Update Public Key',
+  nostr_pubkey_tooltip: "Enter this user's Nostr public key (hex value)",
   set_password: 'Set Password',
+  set_password_tooltip: 'Set a password for this user',
   invalid_password: 'Password must have at least 8 characters',
   invalid_password_repeat: 'Passwords do not match',
+  reset_key_generated: 'A reset key has been generated.',
+  reset_key_copy: 'Click OK to copy the reset URL to your clipboard.',
   login: 'Login',
   register: 'Register',
   username: 'Username',
   pubkey: 'Public Key',
   user_id: 'User ID',
+  id: 'ID',
   email: 'Email',
   first_name: 'First Name',
   last_name: 'Last Name',
@@ -354,6 +367,7 @@ window.localisation.en = {
   gradient_background: 'Gradient Background',
   language: 'Language',
   color_scheme: 'Color Scheme',
+  visible_wallet_count: 'Visible Wallet Count',
   admin_settings: 'Admin Settings',
   extension_cost: 'This release requires a payment of minimum {cost} sats.',
   extension_paid_sats: 'You have already paid {paid_sats} sats.',
@@ -444,7 +458,7 @@ window.localisation.en = {
   fee_reserve_percent: 'Fee Reserve Percent',
   fee_reserve_msats: 'Reserve fee in msats',
   reserve_fee_in_percent: 'Reserve fee in percent',
-  payment_wait_time: 'Payment Wait Time',
+  payment_wait_time: 'Payment Wait Time (sec)',
   payment_wait_time_desc:
     'How long to wait when making a payment before marking it as pending. Set higher values for HODL invoices, Boltz, etc.',
   server_management: 'Server Management',
@@ -470,6 +484,8 @@ window.localisation.en = {
   auth_keycloak_ci_hint:
     'Make sure thant the authorization callback URL is set to https://{domain}/api/v1/auth/keycloak/token',
   auth_keycloak_cs_label: 'Keycloak Client Secret',
+  auth_keycloak_custom_org_label: 'Keycloak Custom Organization',
+  auth_keycloak_custom_icon_label: 'Keycloak Custom Icon (URL)',
   currency_settings: 'Currency Settings',
   allowed_currencies: 'Allowed Currencies',
   allowed_currencies_hint: 'Limit the number of available fiat currencies',

lnbits/static/i18n/fi.js

@@ -100,7 +100,7 @@ window.localisation.fi = {
   payment_processing: 'Maksua käsitellään...',
   not_enough_funds: 'Varat eivät riitä!',
   search_by_tag_memo_amount: 'Etsi tunnisteella, muistiolla tai määrällä',
-  invoice_waiting: 'Lasku osottaa maksamista',
+  invoice_waiting: 'Lasku odottaa maksua',
   payment_received: 'Maksu vastaanotettu',
   payment_sent: 'Maksu lähetetty',
   payment_failed: 'Maksu epäonnistui',
@@ -261,7 +261,7 @@ window.localisation.fi = {
   notification_source: 'Tiedotteiden lähde',
   notification_source_label:
     'Lähde-URL (käytä ainoastaan LNbits:iä tai muuta luotettavaa lähdettä)',
-  more: 'laajenna',
+  more: 'näytä lisää',
   less: 'supista',
   releases: 'Julkaisut',
   watchdog: 'Watchdog',
@@ -321,6 +321,8 @@ window.localisation.fi = {
   set_password: 'Aseta salasana',
   invalid_password: 'Salasanassa tulee olla vähintään kahdeksan merkkiä',
   invalid_password_repeat: 'Salasanat eivät täsmää',
+  reset_key_generated: 'Salasanan vaihtoavain on luotu.',
+  reset_key_copy: 'Kopioi vaihto-URL leikepöydälle painamalla OK.',
   login: 'Kirjaudu',
   register: 'Rekisteröidy',
   username: 'Käyttäjänimi',

lnbits/static/js/admin.js

@@ -450,7 +450,7 @@ window.AdminPageLogic = {
         .catch(LNbits.utils.notifyApiError)
     },
     formatDate(date) {
-      return moment(date * 1000).fromNow()
+      return moment.utc(date * 1000).fromNow()
     },
     sendTestEmail() {
       LNbits.api
@@ -546,10 +546,10 @@ window.AdminPageLogic = {
               Quasar.Notify.create({
                 type: 'positive',
                 message:
-                  'Success! Restored settings to defaults, restart required!',
+                  'Success! Restored settings to defaults. Restarting...',
                 icon: null
               })
-              this.needsRestart = true
+              this.$q.localStorage.clear()
             })
             .catch(LNbits.utils.notifyApiError)
         })

lnbits/static/js/base.js

@@ -197,7 +197,8 @@ window.LNbits = {
         email: data.email,
         extensions: data.extensions,
         wallets: data.wallets,
-        super_user: data.super_user
+        super_user: data.super_user,
+        extra: data.extra ?? {}
       }
       const mapWallet = this.wallet
       obj.wallets = obj.wallets
@@ -205,6 +206,9 @@ window.LNbits = {
           return mapWallet(obj)
         })
         .sort((a, b) => {
+          if (a.extra.pinned !== b.extra.pinned) {
+            return a.extra.pinned ? -1 : 1
+          }
           return a.name.localeCompare(b.name)
         })
       obj.walletOptions = obj.wallets.map(obj => {
@@ -213,6 +217,10 @@ window.LNbits = {
           value: obj.id
         }
       })
+      obj.hiddenWalletsCount = Math.max(
+        0,
+        data.wallets.length - data.extra.visible_wallet_count
+      )
       return obj
     },
     wallet(data) {
@@ -252,13 +260,11 @@ window.LNbits = {
         fiat_currency: data.fiat_currency
       }
 
-      obj.date = Quasar.date.formatDate(new Date(obj.time), window.dateFormat)
-      obj.dateFrom = moment(obj.date).fromNow()
-      obj.expirydate = Quasar.date.formatDate(
-        new Date(obj.expiry),
-        window.dateFormat
-      )
-      obj.expirydateFrom = moment(obj.expirydate).fromNow()
+      obj.date = moment.utc(data.created_at).local().format(window.dateFormat)
+      obj.dateFrom = moment.utc(data.created_at).fromNow()
+
+      obj.expirydate = moment.utc(obj.expiry).local().format(window.dateFormat)
+      obj.expirydateFrom = moment.utc(obj.expiry).fromNow()
       obj.msat = obj.amount
       obj.sat = obj.msat / 1000
       obj.tag = obj.extra?.tag
@@ -495,8 +501,10 @@ window.windowMixin = {
         ? this.$q.localStorage.getItem('lnbits.backgroundImage')
         : USE_DEFAULT_BGIMAGE,
       isUserAuthorized: false,
+      isSatsDenomination: WINDOW_SETTINGS['LNBITS_DENOMINATION'] == 'sats',
       walletEventListeners: [],
-      backgroundImage: ''
+      backgroundImage: '',
+      ...WINDOW_SETTINGS
     }
   },
 
@@ -508,6 +516,11 @@ window.windowMixin = {
       }
       this.$q.localStorage.set('lnbits.walletFlip', this.walletFlip)
     },
+    goToWallets() {
+      this.$router.push({
+        path: '/wallets'
+      })
+    },
     submitAddWallet() {
       if (
         this.showAddWalletDialog.name &&

lnbits/static/js/components.js

@@ -103,14 +103,7 @@ window.app.component('lnbits-extension-list', {
 window.app.component('lnbits-manage', {
   mixins: [window.windowMixin],
   template: '#lnbits-manage',
-  props: [
-    'showAdmin',
-    'showNode',
-    'showExtensions',
-    'showUsers',
-    'showAudit',
-    'showPayments'
-  ],
+  props: ['showAdmin', 'showNode', 'showExtensions', 'showUsers', 'showAudit'],
   methods: {
     isActive(path) {
       return window.location.pathname === path
@@ -210,7 +203,7 @@ window.app.component('lnbits-qrcode', {
   data() {
     return {
       custom: {
-        margin: 1,
+        margin: 3,
         width: 350,
         size: 350,
         logo: LNBITS_QR_LOGO
@@ -566,7 +559,9 @@ window.app.component('username-password', {
       username: this.userName,
       password: this.password_1,
       passwordRepeat: this.password_2,
-      reset_key: this.resetKey
+      reset_key: this.resetKey,
+      keycloakOrg: LNBITS_AUTH_KEYCLOAK_ORG || 'Keycloak',
+      keycloakIcon: LNBITS_AUTH_KEYCLOAK_ICON
     }
   },
   methods: {

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

@@ -8,6 +8,10 @@ window.app.component('lnbits-funding-sources', {
         fundingSource => fundingSource[0] === item
       )
       return fundingSource ? fundingSource[1] : item
+    },
+    showQRValue(value) {
+      this.qrValue = value
+      this.showQRDialog = true
     }
   },
   computed: {
@@ -17,7 +21,8 @@ window.app.component('lnbits-funding-sources', {
         const tmpObj = {}
         if (obj !== null) {
           for (let [k, v] of Object.entries(obj)) {
-            tmpObj[k] = {label: v, value: null}
+            tmpObj[k] =
+              typeof v === 'string' ? {label: v, value: null} : v || {}
           }
         }
         tmp.push([key, tmpObj])
@@ -31,6 +36,8 @@ window.app.component('lnbits-funding-sources', {
   data() {
     return {
       hideInput: true,
+      showQRDialog: false,
+      qrValue: '',
       rawFundingSources: [
         ['VoidWallet', 'Void Wallet', null],
         [
@@ -138,7 +145,14 @@ window.app.component('lnbits-funding-sources', {
             boltz_client_endpoint: 'Endpoint',
             boltz_client_macaroon: 'Admin Macaroon path or hex',
             boltz_client_cert: 'Certificate path or hex',
-            boltz_client_wallet: 'Wallet Name'
+            boltz_client_wallet: 'Wallet Name',
+            boltz_client_password: 'Wallet Password (can be empty)',
+            boltz_mnemonic: {
+              label: 'Liquid mnemonic (copy into greenwallet)',
+              readonly: true,
+              copy: true,
+              qrcode: true
+            }
           }
         ],
         [
@@ -197,6 +211,14 @@ window.app.component('lnbits-funding-sources', {
             breez_greenlight_device_cert: 'Greenlight Device Cert',
             breez_greenlight_invite_code: 'Greenlight Invite Code'
           }
+        ],
+        [
+          'StrikeWallet',
+          'Strike (alpha)',
+          {
+            strike_api_endpoint: 'API Endpoint',
+            strike_api_key: 'API Key'
+          }
         ]
       ]
     }

lnbits/static/js/index.js

@@ -101,8 +101,8 @@ window.app = Vue.createApp({
     }
   },
   created() {
-    this.description = SITE_DESCRIPTION
-    this.allowedRegister = ALLOWED_REGISTER
+    this.description = this.SITE_DESCRIPTION
+    this.allowedRegister = this.LNBITS_NEW_ACCOUNTS_ALLOWED
     this.authAction =
       !this.allowedRegister ||
       Quasar.LocalStorage.getItem('lnbits.disclaimerShown')

lnbits/static/js/init-app.js

@@ -193,6 +193,15 @@ const routes = [
       scripts: ['/static/js/account.js']
     }
   },
+  {
+    path: '/wallets',
+    name: 'Wallets',
+    component: DynamicComponent,
+    props: {
+      fetchUrl: '/wallets',
+      scripts: ['/static/js/wallets.js']
+    }
+  },
   {
     path: '/node',
     name: 'Node',

lnbits/static/js/node.js

@@ -600,7 +600,7 @@ window.app.component('lnbits-date', {
       return LNbits.utils.formatDate(this.ts)
     },
     dateFrom() {
-      return moment(this.date).fromNow()
+      return moment.utc(this.date).fromNow()
     }
   },
   template: `

lnbits/static/js/payments.js

@@ -8,9 +8,15 @@ window.PaymentsPageLogic = {
       searchData: {
         wallet_id: null,
         payment_hash: null,
-        status: null,
         memo: null
       },
+      statusFilters: {
+        success: true,
+        pending: true,
+        failed: true,
+        incoming: true,
+        outgoing: true
+      },
       chartData: {
         showPaymentStatus: true,
         showPaymentTags: true,
@@ -131,6 +137,7 @@ window.PaymentsPageLogic = {
       if (this.searchDate.to) {
         filter['time[le]'] = this.searchDate.to + 'T23:59:59'
       }
+
       this.paymentsTable.filter = filter
 
       try {
@@ -148,7 +155,7 @@ window.PaymentsPageLogic = {
           if (p.extra && p.extra.tag) {
             p.tag = p.extra.tag
           }
-          p.timeFrom = moment(p.created_at).fromNow()
+          p.timeFrom = moment.utc(p.created_at).fromNow()
           p.outgoing = p.amount < 0
           p.amount =
             new Intl.NumberFormat(window.LOCALE).format(p.amount / 1000) +
@@ -198,7 +205,38 @@ window.PaymentsPageLogic = {
 
       this.fetchPayments()
     },
+    handleFilterChanged() {
+      const {success, pending, failed, incoming, outgoing} = this.statusFilters
 
+      delete this.searchData['status[ne]']
+      delete this.searchData['status[eq]']
+      if (success && pending && failed) {
+        // do nothing, all statuses are selected
+      } else if (success && pending) {
+        this.searchData['status[ne]'] = 'failed'
+      } else if (success && failed) {
+        this.searchData['status[ne]'] = 'pending'
+      } else if (failed && pending) {
+        this.searchData['status[ne]'] = 'success'
+      } else if (success) {
+        this.searchData['status[eq]'] = 'success'
+      } else if (pending) {
+        this.searchData['status[eq]'] = 'pending'
+      } else if (failed) {
+        this.searchData['status[eq]'] = 'failed'
+      }
+
+      delete this.searchData['amount[ge]']
+      delete this.searchData['amount[le]']
+      if (incoming && outgoing) {
+        // do nothing
+      } else if (incoming) {
+        this.searchData['amount[ge]'] = '0'
+      } else if (outgoing) {
+        this.searchData['amount[le]'] = '0'
+      }
+      this.fetchPayments()
+    },
     showDetailsToggle(payment) {
       this.paymentDetails = payment
       return (this.showDetails = !this.showDetails)
@@ -229,11 +267,10 @@ window.PaymentsPageLogic = {
           'GET',
           `/api/v1/payments/stats/count?${params}&count_by=status`
         )
-        data.sort((a, b) => a.field - b.field)
-        this.searchOptions.status = data
-          .map(s => s.field)
-          .sort()
-          .reverse()
+
+        data.sort((a, b) => a.field - b.field).reverse()
+
+        this.searchOptions.status = data.map(s => s.field)
         this.paymentsStatusChart.data.datasets[0].data = data.map(s => s.total)
         this.paymentsStatusChart.data.labels = [...this.searchOptions.status]
 
@@ -419,11 +456,8 @@ window.PaymentsPageLogic = {
                 data: [],
                 backgroundColor: [
                   'rgb(0, 205, 86)',
-                  'rgb(54, 162, 235)',
-                  'rgb(255, 99, 132)',
-                  'rgb(255, 5, 86)',
-                  'rgb(25, 205, 86)',
-                  'rgb(255, 205, 250)'
+                  'rgb(64, 72, 78)',
+                  'rgb(255, 99, 132)'
                 ],
                 hoverOffset: 4
               }

lnbits/static/js/users.js

@@ -188,7 +188,7 @@ window.UsersPageLogic = {
         .then(res => {
           LNbits.utils
             .confirmDialog(
-              'A reset key has been generated. Click OK to copy the rest key to your clipboard.'
+              this.$t('reset_key_generated') + ' ' + this.$t('reset_key_copy')
             )
             .onOk(() => {
               const url = window.location.origin + '?reset_key=' + res.data
@@ -312,6 +312,23 @@ window.UsersPageLogic = {
           .catch(LNbits.utils.notifyApiError)
       })
     },
+    deleteAllUserWallets(userId) {
+      LNbits.utils
+        .confirmDialog(this.$t('confirm_delete_all_wallets'))
+        .onOk(() => {
+          LNbits.api
+            .request('DELETE', `/users/api/v1/user/${userId}/wallets`)
+            .then(response => {
+              Quasar.Notify.create({
+                type: 'positive',
+                message: response.data.message,
+                icon: null
+              })
+              this.fetchWallets(userId)
+            })
+            .catch(LNbits.utils.notifyApiError)
+        })
+    },
     copyWalletLink(walletId) {
       const url = `${window.location.origin}/wallet?usr=${this.activeWallet.userId}&wal=${walletId}`
       this.copyText(url)

lnbits/static/js/wallet.js

@@ -261,7 +261,9 @@ window.WalletPageLogic = {
           this.receive.paymentReq = response.data.bolt11
           this.receive.amountMsat = response.data.amount
           this.receive.paymentHash = response.data.payment_hash
-          this.readNfcTag()
+          if (!this.receive.lnurl) {
+            this.readNfcTag()
+          }
           // TODO: lnurl_callback and lnurl_response
           // WITHDRAW
           if (response.data.lnurl_response !== null) {
@@ -336,9 +338,6 @@ window.WalletPageLogic = {
           '/api/v1/lnurlscan/' + this.parse.data.request,
           this.g.wallet.adminkey
         )
-        .catch(err => {
-          LNbits.utils.notifyApiError(err)
-        })
         .then(response => {
           const data = response.data
 
@@ -376,6 +375,9 @@ window.WalletPageLogic = {
             }
           }
         })
+        .catch(err => {
+          LNbits.utils.notifyApiError(err)
+        })
     },
     decodeQR(res) {
       this.parse.data.request = res[0].rawValue
@@ -449,8 +451,8 @@ window.WalletPageLogic = {
               createdDate,
               'YYYY-MM-DDTHH:mm:ss.SSSZ'
             )
-            cleanInvoice.expireDateFrom = moment(expireDate).fromNow()
-            cleanInvoice.createdDateFrom = moment(createdDate).fromNow()
+            cleanInvoice.expireDateFrom = moment.utc(expireDate).fromNow()
+            cleanInvoice.createdDateFrom = moment.utc(createdDate).fromNow()
 
             cleanInvoice.expired = false // TODO
           }
@@ -660,7 +662,7 @@ window.WalletPageLogic = {
             }
           }
           Quasar.Notify.create({
-            message: 'Wallet and user updated.',
+            message: 'Wallet updated.',
             type: 'positive',
             timeout: 3500
           })
@@ -1112,13 +1114,6 @@ window.WalletPageLogic = {
     }
   },
   watch: {
-    'g.wallet.id'(newVal, oldVal) {
-      try {
-        this.fetchChartData()
-      } catch (error) {
-        console.warn(`Chart creation failed: ${error}`)
-      }
-    },
     'g.updatePayments'(newVal, oldVal) {
       this.parse.show = false
       if (this.receive.paymentHash === this.g.updatePaymentsHash) {

lnbits/static/js/wallets.js

@@ -0,0 +1,89 @@
+window.WalletsPageLogic = {
+  mixins: [window.windowMixin],
+  data() {
+    return {
+      user: null,
+      tab: 'wallets',
+      wallets: [],
+      showAddWalletDialog: {show: false},
+      walletsTable: {
+        columns: [
+          {
+            name: 'name',
+            align: 'left',
+            label: 'Name',
+            field: 'name',
+            sortable: true
+          },
+          {
+            name: 'currency',
+            align: 'center',
+            label: 'Currency',
+            field: 'currency',
+            sortable: true
+          },
+          {
+            name: 'updated_at',
+            align: 'right',
+            label: 'Last Updated',
+            field: 'updated_at',
+            sortable: true
+          }
+        ],
+        pagination: {
+          sortBy: 'updated_at',
+          rowsPerPage: 12,
+          page: 1,
+          descending: true,
+          rowsNumber: 10
+        },
+        search: '',
+        hideEmpty: true,
+        loading: false
+      }
+    }
+  },
+  watch: {
+    'walletsTable.search': {
+      handler() {
+        const props = {}
+        if (this.walletsTable.search) {
+          props['search'] = this.walletsTable.search
+        }
+        this.getUserWallets()
+      }
+    }
+  },
+  methods: {
+    async getUserWallets(props) {
+      try {
+        this.walletsTable.loading = true
+        const params = LNbits.utils.prepareFilterQuery(this.walletsTable, props)
+        const {data} = await LNbits.api.request(
+          'GET',
+          `/api/v1/wallet/paginated?${params}`,
+          null
+        )
+        this.wallets = data.data
+        this.walletsTable.pagination.rowsNumber = data.total
+      } catch (e) {
+        LNbits.utils.notifyApiError(e)
+      } finally {
+        this.walletsTable.loading = false
+      }
+    },
+
+    goToWallet(walletId) {
+      window.location = `/wallet?wal=${walletId}`
+    },
+    formattedFiatAmount(amount, currency) {
+      return LNbits.utils.formatCurrency(Number(amount).toFixed(2), currency)
+    },
+    formattedSatAmount(amount) {
+      return LNbits.utils.formatMsat(amount) + ' sat'
+    }
+  },
+  async created() {
+    await this.getUserWallets()
+  }
+}

lnbits/tasks.py

@@ -203,7 +203,8 @@ async def invoice_callback_dispatcher(checking_id: str, is_internal: bool = Fals
     if payment and payment.is_in:
         status = await payment.check_status()
         payment.fee = status.fee_msat or 0
-        payment.preimage = status.preimage
+        # only overwrite preimage if status.preimage provides it
+        payment.preimage = status.preimage or payment.preimage
         payment.status = PaymentState.SUCCESS
         await update_payment(payment)
         internal = "internal" if is_internal else ""

lnbits/templates/base.html

@@ -179,12 +179,12 @@
         >
           <q-scroll-area style="height: 100%">
             <q-item>
-              <q-item-section>
+              <q-item-section class="cursor-pointer" @click="goToWallets()">
                 <q-item-label
                   :style="$q.dark.isActive ? 'color:rgba(255, 255, 255, 0.64)' : ''"
                   class="q-item__label q-item__label--header q-pa-none"
                   header
-                  v-text="$t('wallets')"
+                  v-text="$t('wallets') + ' (' + g.user.wallets.length + ')'"
                 ></q-item-label>
               </q-item-section>
               <q-item-section side>
@@ -211,7 +211,6 @@
               :show-admin="'{{LNBITS_ADMIN_UI}}' == 'True'"
               :show-users="'{{LNBITS_ADMIN_UI}}' == 'True'"
               :show-audit="'{{LNBITS_AUDIT_ENABLED}}' == 'True'"
-              :show-payments="'{{LNBITS_ADMIN_UI}}' == 'True'"
               :show-node="'{{LNBITS_NODE_UI}}' == 'True'"
               :show-extensions="'{{LNBITS_EXTENSIONS_DEACTIVATE_ALL}}' == 'False'"
             ></lnbits-manage>
@@ -248,7 +247,7 @@
                         @click="showAddWalletDialog.show = true"
                       >
                         <q-tooltip
-                          ><span v-text="$t('add_wallet')"></span
+                          ><span v-text="$t('add_new_wallet')"></span
                         ></q-tooltip>
                       </q-btn>
                       <q-dialog
@@ -258,7 +257,9 @@
                       >
                         <q-card style="min-width: 350px">
                           <q-card-section>
-                            <div class="text-h6">Wallet name</div>
+                            <div class="text-h6">
+                              <span v-text="$t('wallet_name')"></span>
+                            </div>
                           </q-card-section>
 
                           <q-card-section class="q-pt-none">
@@ -271,10 +272,14 @@
                           </q-card-section>
 
                           <q-card-actions align="right" class="text-primary">
-                            <q-btn flat label="Cancel" v-close-popup></q-btn>
                             <q-btn
                               flat
-                              label="Add wallet"
+                              :label="$t('cancel')"
+                              v-close-popup
+                            ></q-btn>
+                            <q-btn
+                              flat
+                              :label="$t('add_wallet')"
                               v-close-popup
                               @click="submitAddWallet()"
                             ></q-btn>
@@ -285,7 +290,7 @@
                   </q-card-section>
                 </q-card>
                 <q-card
-                  v-for="wallet in g.user.wallets"
+                  v-for="wallet in g.user.wallets.slice(0, g.user.extra.visible_wallet_count || 10)"
                   :key="wallet.id"
                   clickable
                   @click="selectWallet(wallet)"
@@ -331,6 +336,29 @@
                     </div>
                   </q-card-section>
                 </q-card>
+                <q-card
+                  v-if="g.user.hiddenWalletsCount"
+                  class="wallet-list-card"
+                >
+                  <q-card-section
+                    class="flex flex-center column full-height text-center"
+                  >
+                    <div>
+                      <q-btn
+                        round
+                        color="primary"
+                        icon="more_horiz"
+                        @click="goToWallets()"
+                      >
+                        <q-tooltip
+                          ><span
+                            v-text="$t('more_count', {count: g.user.hiddenWalletsCount})"
+                          ></span
+                        ></q-tooltip>
+                      </q-btn>
+                    </div>
+                  </q-card-section>
+                </q-card>
               </div>
             </q-scroll-area>
 
@@ -390,42 +418,38 @@
       </q-layout>
     </div>
 
+    <script type="text/javascript">
+      const WINDOW_SETTINGS = {{ WINDOW_SETTINGS | tojson }}
+      Object.keys(WINDOW_SETTINGS).forEach(key => {
+        window[key] = WINDOW_SETTINGS[key]
+      })
+      if (LNBITS_THEME_OPTIONS && LNBITS_THEME_OPTIONS.length) {
+        window.allowedThemes = LNBITS_THEME_OPTIONS.map(str => str.trim())
+      }
+    </script>
     {% include('components.vue') %} {% block vue_templates %}{% endblock %} {%
     for url in INCLUDED_JS %}
     <script src="{{ static_url_for('static', url) }}"></script>
     {% endfor %}
     <script type="text/javascript">
-      const SITE_DESCRIPTION = {{ SITE_DESCRIPTION | tojson}}
-      const themes = {{ LNBITS_THEME_OPTIONS | tojson }}
-      const LNBITS_DENOMINATION = {{ LNBITS_DENOMINATION | tojson }}
-      const LNBITS_VERSION = {{ LNBITS_VERSION | tojson }}
-      const LNBITS_QR_LOGO = {{ LNBITS_QR_LOGO | tojson }}
-      const USE_DEFAULT_REACTION = {{ USE_DEFAULT_REACTION | tojson }}
-      const USE_DEFAULT_THEME = {{ USE_DEFAULT_THEME | tojson }}
-      const USE_DEFAULT_BORDER = {{ USE_DEFAULT_BORDER | tojson }}
-      const USE_DEFAULT_GRADIENT = {{ USE_DEFAULT_GRADIENT | lower | tojson }}
-      const USE_DEFAULT_BGIMAGE = "{{ USE_DEFAULT_BGIMAGE or None | tojson }}"
-      if (themes && themes.length) {
-        window.allowedThemes = themes.map(str => str.trim())
-      }
       window.langs = [
-        { value: 'en', label: 'English', display: '🇬🇧 EN' },
-        { value: 'de', label: 'Deutsch', display: '🇩🇪 DE' },
-        { value: 'es', label: 'Español', display: '🇪🇸 ES' },
-        { value: 'jp', label: '日本語', display: '🇯🇵 JP' },
-        { value: 'cn', label: '中文', display: '🇨🇳 CN' },
-        { value: 'fr', label: 'Français', display: '🇫🇷 FR' },
-        { value: 'it', label: 'Italiano', display: '🇮🇹 IT' },
-        { value: 'pi', label: 'Pirate', display: '🏴‍☠️ PI' },
-        { value: 'nl', label: 'Nederlands', display: '🇳🇱 NL' },
-        { value: 'we', label: 'Cymraeg', display: '🏴󠁧󠁢󠁷󠁬󠁳󠁿 CY' },
-        { value: 'pl', label: 'Polski', display: '🇵🇱 PL' },
-        { value: 'pt', label: 'Português', display: '🇵🇹 PT' },
-        { value: 'br', label: 'Português do Brasil', display: '🇧🇷 BR' },
-        { value: 'cs', label: 'Česky', display: '🇨🇿 CS' },
-        { value: 'sk', label: 'Slovensky', display: '🇸🇰 SK' },
-        { value: 'kr', label: '한국어', display: '🇰🇷 KR' },
-        { value: 'fi', label: 'Suomi', display: '🇫🇮 FI' }
+        {value: 'en', label: 'English', display: '🇬🇧 EN'},
+        {value: 'de', label: 'Deutsch', display: '🇩🇪 DE'},
+        {value: 'es', label: 'Español', display: '🇪🇸 ES'},
+        {value: 'jp', label: '日本語', display: '🇯🇵 JP'},
+        {value: 'cn', label: '中文', display: '🇨🇳 CN'},
+        {value: 'fr', label: 'Français', display: '🇫🇷 FR'},
+        {value: 'it', label: 'Italiano', display: '🇮🇹 IT'},
+        {value: 'pi', label: 'Pirate', display: '🏴‍☠️ PI'},
+        {value: 'nl', label: 'Nederlands', display: '🇳🇱 NL'},
+        {value: 'we', label: 'Cymraeg', display: '🏴󠁧󠁢󠁷󠁬󠁳󠁿 CY'},
+        {value: 'pl', label: 'Polski', display: '🇵🇱 PL'},
+        {value: 'pt', label: 'Português', display: '🇵🇹 PT'},
+        {value: 'br', label: 'Português do Brasil', display: '🇧🇷 BR'},
+        {value: 'cs', label: 'Česky', display: '🇨🇿 CS'},
+        {value: 'sk', label: 'Slovensky', display: '🇸🇰 SK'},
+        {value: 'kr', label: '한국어', display: '🇰🇷 KR'},
+        {value: 'fi', label: 'Suomi', display: '🇫🇮 FI'}
       ]
       window.LOCALE = 'en'
       window.dateFormat = 'YYYY-MM-DD HH:mm'

lnbits/templates/components.vue

@@ -5,7 +5,10 @@
     class="lnbits-drawer__q-list"
   >
     <q-item
-      v-for="walletRec in g.user.wallets"
+      v-for="walletRec in g.user.wallets.slice(
+        0,
+        g.user.extra.visible_wallet_count || 10
+      )"
       :key="walletRec.id"
       clickable
       :active="g.wallet && g.wallet.id === walletRec.id"
@@ -43,6 +46,22 @@
       <q-item-section side v-show="g.wallet && g.wallet.id === walletRec.id">
       </q-item-section>
     </q-item>
+    <q-item
+      v-if="g.user.hiddenWalletsCount > 0"
+      clickable
+      @click="goToWallets()"
+    >
+      <q-item-section side>
+        <q-icon name="more_horiz" color="grey-5" size="md"></q-icon>
+      </q-item-section>
+      <q-item-section>
+        <q-item-label
+          lines="1"
+          class="text-caption"
+          v-text="$t('more_count', {count: g.user.hiddenWalletsCount})"
+        ></q-item-label>
+      </q-item-section>
+    </q-item>
     <q-item clickable @click="showForm = !showForm">
       <q-item-section side>
         <q-icon
@@ -55,7 +74,7 @@
         <q-item-label
           lines="1"
           class="text-caption"
-          v-text="$t('add_wallet')"
+          v-text="$t('add_new_wallet')"
         ></q-item-label>
       </q-item-section>
     </q-item>
@@ -178,19 +197,19 @@
           <q-item-label lines="1" v-text="$t('api_watch')"></q-item-label>
         </q-item-section>
       </q-item>
-      <q-item v-if="showPayments" to="/payments">
-        <q-item-section side>
-          <q-icon
-            name="query_stats"
-            :color="isActive('/payments') ? 'primary' : 'grey-5'"
-            size="md"
-          ></q-icon>
-        </q-item-section>
-        <q-item-section>
-          <q-item-label lines="1" v-text="$t('payments')"></q-item-label>
-        </q-item-section>
-      </q-item>
     </div>
+    <q-item to="/payments">
+      <q-item-section side>
+        <q-icon
+          name="query_stats"
+          :color="isActive('/payments') ? 'primary' : 'grey-5'"
+          size="md"
+        ></q-icon>
+      </q-item-section>
+      <q-item-section>
+        <q-item-label lines="1" v-text="$t('payments')"></q-item-label>
+      </q-item-section>
+    </q-item>
     <q-item v-if="showExtensions" to="/extensions">
       <q-item-section side>
         <q-icon
@@ -987,7 +1006,7 @@
               </div>
             </q-card-section>
             <q-card-section>
-              <div class="row">
+              <div class="row q-gutter-x-sm">
                 <q-btn
                   v-if="
                     props.row.isIn && props.row.isPending && props.row.bolt11
@@ -1122,12 +1141,41 @@
               :type="hideInput ? 'password' : 'text'"
               :label="prop.label"
               :hint="prop.hint"
+              :readonly="prop.readonly || false"
             >
+              <q-btn
+                v-if="prop.copy"
+                @click="copyText(formData[key])"
+                icon="content_copy"
+                class="cursor-pointer"
+                color="grey"
+                flat
+                dense
+              ></q-btn>
+              <q-btn
+                v-if="prop.qrcode"
+                @click="showQRValue(formData[key])"
+                icon="qr_code"
+                class="cursor-pointer"
+                color="grey"
+                flat
+                dense
+              ></q-btn>
             </q-input>
           </div>
         </div>
       </div>
     </q-list>
+    <q-dialog v-model="showQRDialog">
+      <q-card class="q-pa-md">
+        <q-card-section>
+          <lnbits-qrcode :value="qrValue" :size="200"></lnbits-qrcode>
+        </q-card-section>
+        <q-card-actions align="right">
+          <q-btn flat label="Close" v-close-popup />
+        </q-card-actions>
+      </q-card>
+    </q-dialog>
   </div>
 </template>
 
@@ -1185,7 +1233,7 @@
             color="primary"
             :disable="walletName == ''"
             type="submit"
-            :label="$t('add_wallet')"
+            :label="$t('add_new_wallet')"
             class="full-width q-mb-sm"
           ></q-btn>
           <q-btn
@@ -1453,10 +1501,22 @@
       >
         <q-avatar size="32px" class="q-mr-md">
           <q-img
-            :src="`{{ static_url_for('static', 'images/keycloak-logo.png') }}`"
+            :src="
+              keycloakIcon
+                ? keycloakIcon
+                : `{{ static_url_for('static', 'images/keycloak-logo.png') }}`
+            "
           ></q-img>
         </q-avatar>
-        <div><span v-text="$t('signin_with_keycloak')"></span></div>
+        <div>
+          <span
+            v-text="
+              $t('signin_with_custom_org', {
+                custom_org: keycloakOrg
+              })
+            "
+          ></span>
+        </div>
       </q-btn>
     </div>
   </q-card-section>

lnbits/templates/error.html

@@ -6,7 +6,7 @@
   >
     {% block page %}
     <div class="text-center q-pa-md flex flex-center">
-      <div>
+      <div v-if="statusCode">
         <div class="error-code" v-text="statusCode"></div>
 
         <div class="error-message" v-text="message"></div>
@@ -65,19 +65,15 @@
       goToExtension() {
         window.location.href = `/extensions#${this.extension}`
       },
-      logOut() {
-        LNbits.utils
-          .confirmDialog(
-            'Do you really want to logout?'
-          )
-          .onOk( async () => {
-            try {
-              await LNbits.api.logout()
-              window.location = '/'
-            } catch (e) {
-              LNbits.utils.notifyApiError(e)
-            }
-          })
+      async logOut() {
+
+        try {
+          await LNbits.api.logout()
+          window.location = '/'
+        } catch (e) {
+          LNbits.utils.notifyApiError(e)
+        }
+
     },
     },
     computed: {
@@ -86,10 +82,17 @@
         if (this.message.startsWith('Extension ')) return true
       }
     },
-    created() {
+    async created() {
       this.err = '{{ err }}'
-      this.statusCode = '{{ status_code }}' || 404
+      const statusCode = '{{ status_code }}' || 404
       this.message = String({{ message | tojson }}) || 'Page not found'
+      if (statusCode == 401) {
+        console.warn(`Unauthorized: ${this.message}`)
+        this.logOut()
+        return
+      }
+      this.statusCode = statusCode
+
       if (this.isExtension) {
         this.extension = this.message.match(/'([^']+)'/)[1]
       }

lnbits/templates/print.html

@@ -44,15 +44,20 @@
       </q-layout>
     </div>
 
+    <script type="text/javascript">
+      const WINDOW_SETTINGS = {{ WINDOW_SETTINGS | tojson }}
+      Object.keys(WINDOW_SETTINGS).forEach(key => {
+        window[key] = WINDOW_SETTINGS[key]
+      })
+      if (LNBITS_THEME_OPTIONS && LNBITS_THEME_OPTIONS.length) {
+        window.allowedThemes = LNBITS_THEME_OPTIONS.map(str => str.trim())
+      }
+    </script>
     {% include('components.vue') %}{% block vue_templates %}{% endblock %} {%
     for url in INCLUDED_JS %}
     <script src="{{ static_url_for('static', url) }}"></script>
-    {% endfor %}
-    <script>
-      const LNBITS_QR_LOGO = {{ LNBITS_QR_LOGO | tojson }}
-    </script>
-    <!---->
-    {% block scripts %}{% endblock %} {% for url in INCLUDED_COMPONENTS %}
+    {% endfor %} {% block scripts %}{% endblock %} {% for url in
+    INCLUDED_COMPONENTS %}
     <script src="{{ static_url_for('static', url) }}"></script>
     {% endfor %}
   </body>

lnbits/utils/crypto.py

@@ -1,15 +1,13 @@
-import base64
-import getpass
+from base64 import b64decode, b64encode, urlsafe_b64decode, urlsafe_b64encode
 from hashlib import md5, pbkdf2_hmac, sha256
+from typing import Union
 
 from Cryptodome import Random
 from Cryptodome.Cipher import AES
 
-BLOCK_SIZE = 16
 
-
-def random_secret_and_hash() -> tuple[str, str]:
-    secret = Random.new().read(32)
+def random_secret_and_hash(length: int = 32) -> tuple[str, str]:
+    secret = Random.new().read(length)
     return secret.hex(), sha256(secret).hexdigest()
 
 
@@ -23,74 +21,100 @@ def fake_privkey(secret: str) -> str:
     ).hex()
 
 
+def verify_preimage(preimage: str, payment_hash: str) -> bool:
+    preimage_bytes = bytes.fromhex(preimage)
+    calculated_hash = sha256(preimage_bytes).hexdigest()
+    return calculated_hash == payment_hash
+
+
 class AESCipher:
-    """This class is compatible with crypto-js/aes.js
+    """
+    AES-256-CBC encryption/decryption with salt and base64 encoding.
+    :param key: The key to use for en-/decryption. It can be bytes, a hex or a string.
 
+    This class is compatible with crypto-js/aes.js
     Encrypt and decrypt in Javascript using:
-        import AES from "crypto-js/aes.js";
-        import Utf8 from "crypto-js/enc-utf8.js";
-        AES.encrypt(decrypted, password).toString()
-        AES.decrypt(encrypted, password).toString(Utf8);
-
+    import AES from "crypto-js/aes.js";
+    import Utf8 from "crypto-js/enc-utf8.js";
+    AES.encrypt(decrypted, password).toString()
+    AES.decrypt(encrypted, password).toString(Utf8);
     """
 
-    def __init__(self, key=None, description=""):
-        self.key = key
-        self.description = description + " "
+    def __init__(self, key: Union[bytes, str], block_size: int = 16):
+        self.block_size = block_size
+        if isinstance(key, bytes):
+            self.key = key
+            return
+        try:
+            self.key = bytes.fromhex(key)
+        except ValueError:
+            pass
+        self.key = key.encode()
 
-    def pad(self, data):
-        length = BLOCK_SIZE - (len(data) % BLOCK_SIZE)
+    def pad(self, data: bytes) -> bytes:
+        length = self.block_size - (len(data) % self.block_size)
         return data + (chr(length) * length).encode()
 
-    def unpad(self, data):
-        return data[: -(data[-1] if isinstance(data[-1], int) else ord(data[-1]))]
+    def unpad(self, data: bytes) -> bytes:
+        padding = data[-1]
+        # Ensure padding is within valid range else there is no padding
+        if padding <= 0 or padding >= self.block_size:
+            return data
+        return data[:-padding]
 
-    @property
-    def passphrase(self):
-        passphrase = self.key if self.key is not None else None
-        if passphrase is None:
-            passphrase = getpass.getpass(f"Enter {self.description}password:")
-        return passphrase
-
-    def bytes_to_key(self, data, salt, output=48):
+    def derive_iv_and_key(
+        self, salt: bytes, output_len: int = 32 + 16
+    ) -> tuple[bytes, bytes]:
         # extended from https://gist.github.com/gsakkis/4546068
-        assert len(salt) == 8, len(salt)
-        data += salt
+        assert len(salt) == 8, "Salt must be 8 bytes"
+        data = self.key + salt
         key = md5(data).digest()
         final_key = key
-        while len(final_key) < output:
+        while len(final_key) < output_len:
             key = md5(key + data).digest()
             final_key += key
-        return final_key[:output]
+        iv_key = final_key[:output_len]
+        return iv_key[32:], iv_key[:32]
 
     def decrypt(self, encrypted: str, urlsafe: bool = False) -> str:
-        """Decrypts a string using AES-256-CBC."""
-        passphrase = self.passphrase
-
+        """Decrypts a salted base64 encoded string using AES-256-CBC."""
         if urlsafe:
-            encrypted_bytes = base64.urlsafe_b64decode(encrypted)
+            decoded = urlsafe_b64decode(encrypted)
         else:
-            encrypted_bytes = base64.b64decode(encrypted)
+            decoded = b64decode(encrypted)
 
-        assert encrypted_bytes[0:8] == b"Salted__"
-        salt = encrypted_bytes[8:16]
-        key_iv = self.bytes_to_key(passphrase.encode(), salt, 32 + 16)
-        key = key_iv[:32]
-        iv = key_iv[32:]
+        if decoded[0:8] != b"Salted__":
+            raise ValueError("Invalid salt.")
+
+        salt = decoded[8:16]
+        encrypted_bytes = decoded[16:]
+
+        iv, key = self.derive_iv_and_key(salt, 32 + 16)
         aes = AES.new(key, AES.MODE_CBC, iv)
+
         try:
-            return self.unpad(aes.decrypt(encrypted_bytes[16:])).decode()
+            decrypted_bytes = aes.decrypt(encrypted_bytes)
+        except Exception as exc:
+            raise ValueError("Could not decrypt payload") from exc
+
+        unpadded = self.unpad(decrypted_bytes)
+        if len(unpadded) == 0:
+            raise ValueError("Unpadding resulted in empty data.")
+
+        try:
+            return unpadded.decode()
         except UnicodeDecodeError as exc:
-            raise ValueError("Wrong passphrase") from exc
+            raise ValueError("Decryption resulted in invalid UTF-8 data.") from exc
 
     def encrypt(self, message: bytes, urlsafe: bool = False) -> str:
-        passphrase = self.passphrase
+        """
+        Encrypts a string using AES-256-CBC and returns a salted base64 encoded string.
+        """
         salt = Random.new().read(8)
-        key_iv = self.bytes_to_key(passphrase.encode(), salt, 32 + 16)
-        key = key_iv[:32]
-        iv = key_iv[32:]
+        iv, key = self.derive_iv_and_key(salt, 32 + 16)
         aes = AES.new(key, AES.MODE_CBC, iv)
-        encoded = b"Salted__" + salt + aes.encrypt(self.pad(message))
-        return (
-            base64.urlsafe_b64encode(encoded) if urlsafe else base64.b64encode(encoded)
-        ).decode()
+        msg = self.pad(message)
+        encrypted = aes.encrypt(msg)
+        salted = b"Salted__" + salt + encrypted
+        encoded = urlsafe_b64encode(salted) if urlsafe else b64encode(salted)
+        return encoded.decode()

lnbits/utils/exchange_rates.py

@@ -1,4 +1,5 @@
 import asyncio
+import statistics
 from typing import Optional
 
 import httpx
@@ -187,6 +188,54 @@ def allowed_currencies() -> list[str]:
     return list(currencies.keys())
 
 
+def apply_trimmed_mean_filter(
+    rates: list[tuple[str, float]], threshold_percentage: float = 0.01
+) -> list[tuple[str, float]]:
+    """
+    Apply trimmed mean filtering to remove outliers from exchange rates.
+
+    Args:
+        rates: List of (provider_name, rate_value) tuples
+        threshold_percentage: Percentage threshold for outlier removal (default 1%)
+
+    Returns:
+        Filtered list of rates with outliers removed
+    """
+    if len(rates) < 3:
+        # Need at least 3 rates to apply filtering
+        return rates
+
+    rates_values = [r[1] for r in rates]
+    median_value = statistics.median(rates_values)
+
+    # Filter out values that are more than threshold_percentage away from median
+    filtered_rates = []
+    for rate in rates:
+        provider_name, value = rate
+        deviation = abs(value - median_value) / median_value
+        if deviation <= threshold_percentage:
+            logger.debug(
+                f"Keeping {provider_name}: {value} (deviation: {deviation:.4f})"
+            )
+            filtered_rates.append(rate)
+        else:
+            logger.debug(
+                f"Removing outlier {provider_name}: {value} "
+                f"(deviation: {deviation:.4f})"
+            )
+
+    # If we still have at least 2 rates after filtering, use them
+    if len(filtered_rates) >= 2:
+        logger.debug(f"Filtered rates: {filtered_rates}")
+        return filtered_rates
+    else:
+        # Fall back to median if filtering removed too many values
+        logger.debug("Filtering removed too many values, using median instead")
+        # Find the rate closest to median
+        closest_rate = min(rates, key=lambda x: abs(x[1] - median_value))
+        return [closest_rate]
+
+
 async def btc_rates(currency: str) -> list[tuple[str, float]]:
     if currency.upper() not in allowed_currencies():
         raise ValueError(f"Currency '{currency}' not allowed.")
@@ -236,7 +285,9 @@ async def btc_rates(currency: str) -> list[tuple[str, float]]:
     ]
     results = await asyncio.gather(*calls)
 
-    return [r for r in results if r is not None]
+    all_rates = [r for r in results if r is not None]
+
+    return apply_trimmed_mean_filter(all_rates)
 
 
 async def btc_price(currency: str) -> float:

lnbits/wallets/__init__.py

@@ -28,6 +28,7 @@ from .nwc import NWCWallet
 from .opennode import OpenNodeWallet
 from .phoenixd import PhoenixdWallet
 from .spark import SparkWallet
+from .strike import StrikeWallet
 from .void import VoidWallet
 from .zbd import ZBDWallet
 
@@ -72,6 +73,7 @@ __all__ = [
     "OpenNodeWallet",
     "PhoenixdWallet",
     "SparkWallet",
+    "StrikeWallet",
     "VoidWallet",
     "ZBDWallet",
 ]

lnbits/wallets/alby.py

@@ -1,7 +1,7 @@
 import asyncio
 import hashlib
 import json
-from typing import AsyncGenerator, Dict, Optional
+from typing import AsyncGenerator, Optional
 
 import httpx
 from loguru import logger
@@ -72,10 +72,10 @@ class AlbyWallet(Wallet):
         memo: Optional[str] = None,
         description_hash: Optional[bytes] = None,
         unhashed_description: Optional[bytes] = None,
-        **kwargs,
+        **_,
     ) -> InvoiceResponse:
         # https://api.getalby.com/invoices
-        data: Dict = {"amount": f"{amount}"}
+        data: dict = {"amount": f"{amount}"}
         if description_hash:
             data["description_hash"] = description_hash.hex()
         elif unhashed_description:
@@ -95,25 +95,31 @@ class AlbyWallet(Wallet):
 
             if r.is_error:
                 error_message = data["message"] if "message" in data else r.text
-                return InvoiceResponse(False, None, None, error_message)
+                return InvoiceResponse(ok=False, error_message=error_message)
 
             checking_id = data["payment_hash"]
             payment_request = data["payment_request"]
-            return InvoiceResponse(True, checking_id, payment_request, None)
+            preimage = data.get("payment_preimage")
+            return InvoiceResponse(
+                ok=True,
+                checking_id=checking_id,
+                payment_request=payment_request,
+                preimage=preimage,
+            )
         except KeyError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, "Server error: 'missing required fields'"
+                ok=False, error_message="Server error: 'missing required fields'"
             )
         except json.JSONDecodeError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, "Server error: 'invalid json response'"
+                ok=False, error_message="Server error: 'invalid json response'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, f"Unable to connect to {self.endpoint}."
+                ok=False, error_message=f"Unable to connect to {self.endpoint}."
             )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -129,30 +135,31 @@ class AlbyWallet(Wallet):
 
             if r.is_error:
                 error_message = data["message"] if "message" in data else r.text
-                return PaymentResponse(None, None, None, None, error_message)
+                return PaymentResponse(error_message=error_message)
 
             checking_id = data["payment_hash"]
             # todo: confirm with bitkarrot that having the minus is fine
             # other funding sources return a positive fee value
             fee_msat = -data["fee"]
             preimage = data["payment_preimage"]
-
-            return PaymentResponse(True, checking_id, fee_msat, preimage, None)
+            return PaymentResponse(
+                ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
+            )
         except KeyError as exc:
             logger.warning(exc)
             return PaymentResponse(
-                None, None, None, None, "Server error: 'missing required fields'"
+                error_message="Server error: 'missing required fields'"
             )
         except json.JSONDecodeError as exc:
             logger.warning(exc)
             return PaymentResponse(
-                None, None, None, None, "Server error: 'invalid json response'"
+                error_message="Server error: 'invalid json response'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
             return PaymentResponse(
-                None, None, None, None, f"Unable to connect to {self.endpoint}."
+                error_message=f"Unable to connect to {self.endpoint}."
             )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:

lnbits/wallets/base.py

@@ -20,6 +20,7 @@ class InvoiceResponse(NamedTuple):
     checking_id: str | None = None  # payment_hash, rpc_id
     payment_request: str | None = None
     error_message: str | None = None
+    preimage: str | None = None
 
     @property
     def success(self) -> bool:

lnbits/wallets/blink.py

@@ -135,7 +135,7 @@ class BlinkWallet(Wallet):
             )
             if len(errors) > 0:
                 error_message = errors[0].get("message")
-                return InvoiceResponse(False, None, None, error_message)
+                return InvoiceResponse(ok=False, error_message=error_message)
 
             payment_request = (
                 response.get("data", {})
@@ -150,15 +150,18 @@ class BlinkWallet(Wallet):
                 .get("paymentHash", None)
             )
 
-            return InvoiceResponse(True, checking_id, payment_request, None)
+            # TODO: add preimage to response
+            return InvoiceResponse(
+                ok=True, checking_id=checking_id, payment_request=payment_request
+            )
         except json.JSONDecodeError:
             return InvoiceResponse(
-                False, None, None, "Server error: 'invalid json response'"
+                ok=False, error_message="Server error: 'invalid json response'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, f"Unable to connect to {self.endpoint}."
+                ok=False, error_message=f"Unable to connect to {self.endpoint}."
             )
 
     async def pay_invoice(
@@ -185,19 +188,21 @@ class BlinkWallet(Wallet):
             )
             if len(errors) > 0:
                 error_message = errors[0].get("message")
-                return PaymentResponse(False, None, None, None, error_message)
+                return PaymentResponse(ok=False, error_message=error_message)
 
             checking_id = bolt11.decode(bolt11_invoice).payment_hash
 
             payment_status = await self.get_payment_status(checking_id)
             fee_msat = payment_status.fee_msat
             preimage = payment_status.preimage
-            return PaymentResponse(True, checking_id, fee_msat, preimage, None)
+            return PaymentResponse(
+                ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
+            )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11_invoice}")
             logger.warning(exc)
             return PaymentResponse(
-                None, None, None, None, f"Unable to connect to {self.endpoint}."
+                error_message=f"Unable to connect to {self.endpoint}."
             )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:

lnbits/wallets/boltz.py

@@ -63,6 +63,27 @@ class BoltzWallet(Wallet):
         self.rpc = boltzrpc_pb2_grpc.BoltzStub(channel)
         self.wallet_id: int = 0
 
+        # Auto-create wallet if running in Docker mode
+        async def _init_boltz_wallet():
+            try:
+                wallet_name = settings.boltz_client_wallet or "lnbits"
+                mnemonic = await self._fetch_wallet(wallet_name)
+                if mnemonic:
+                    logger.info(
+                        "✅ Mnemonic found for Boltz wallet, saving to settings"
+                    )
+                    settings.boltz_mnemonic = mnemonic
+
+                    from lnbits.core.crud.settings import set_settings_field
+
+                    await set_settings_field("boltz_mnemonic", mnemonic)
+                else:
+                    logger.warning("⚠️ No mnemonic returned from Boltz")
+            except Exception as e:
+                logger.error(f"❌ Failed to auto-create Boltz wallet: {e}")
+
+        self._init_wallet_task = asyncio.create_task(_init_boltz_wallet())
+
     async def status(self) -> StatusResponse:
         try:
             request = boltzrpc_pb2.GetWalletRequest(name=settings.boltz_client_wallet)
@@ -70,9 +91,10 @@ class BoltzWallet(Wallet):
                 request, metadata=self.metadata
             )
         except AioRpcError as exc:
+            logger.warning(exc)
             return StatusResponse(
-                exc.details()
-                + " make sure you have macaroon and certificate configured, unless your client runs without",  # noqa: E501
+                "make sure you have macaroon and certificate configured,"
+                "unless your client runs without",
                 0,
             )
 
@@ -193,7 +215,10 @@ class BoltzWallet(Wallet):
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         try:
             response: boltzrpc_pb2.GetSwapInfoResponse = await self.rpc.GetSwapInfo(
-                boltzrpc_pb2.GetSwapInfoRequest(id=checking_id), metadata=self.metadata
+                boltzrpc_pb2.GetSwapInfoRequest(
+                    payment_hash=bytes.fromhex(checking_id)
+                ),
+                metadata=self.metadata,
             )
             swap = response.swap
         except AioRpcError:
@@ -225,3 +250,25 @@ class BoltzWallet(Wallet):
                     " 5 seconds"
                 )
                 await asyncio.sleep(5)
+
+    async def _fetch_wallet(self, wallet_name: str) -> Optional[str]:
+        try:
+            request = boltzrpc_pb2.GetWalletRequest(name=wallet_name)
+            response = await self.rpc.GetWallet(request, metadata=self.metadata)
+            logger.info(f"Wallet '{wallet_name}' already exists with ID {response.id}")
+            return settings.boltz_mnemonic
+        except AioRpcError as exc:
+            details = exc.details() or "unknown error"
+            if exc.code() != grpc.StatusCode.NOT_FOUND:
+                logger.error(f"Error checking wallet existence: {details}")
+                raise
+
+        logger.info(f"Creating new wallet '{wallet_name}'")
+        params = boltzrpc_pb2.WalletParams(
+            name=wallet_name,
+            currency=boltzrpc_pb2.LBTC,
+            password=settings.boltz_client_password,
+        )
+        create_request = boltzrpc_pb2.CreateWalletRequest(params=params)
+        response = await self.rpc.CreateWallet(create_request, metadata=self.metadata)
+        return response.mnemonic

lnbits/wallets/boltz_grpc_files/boltzrpc.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package boltzrpc;
-option go_package = "github.com/BoltzExchange/boltz-client/boltzrpc";
+option go_package = "github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc";
 import "google/protobuf/empty.proto";
 
 service Boltz {
@@ -122,6 +122,23 @@ service Boltz {
      */
     rpc GetWallet (GetWalletRequest) returns (Wallet);
 
+    /*
+    Calculates the fee for an equivalent `WalletSend` request.
+    If `address` is left empty, a dummy swap address will be used, allowing for a fee estimation of a swap lockup transaction.
+     */
+    rpc GetWalletSendFee (WalletSendRequest) returns (WalletSendFee);
+
+    /*
+    Returns recent transactions from a wallet.
+     */
+    rpc ListWalletTransactions (ListWalletTransactionsRequest) returns (ListWalletTransactionsResponse);
+
+    /*
+    Increase the fee of a transaction using RBF.
+    The transaction has to belong to one of the clients wallets.
+     */
+    rpc BumpTransaction (BumpTransactionRequest) returns (BumpTransactionResponse);
+
     /*
     Returns the credentials of a wallet. The password will be required if the wallet is encrypted.
      */
@@ -132,6 +149,16 @@ service Boltz {
      */
     rpc RemoveWallet (RemoveWalletRequest) returns (RemoveWalletResponse);
 
+    /*
+    Send coins from a wallet. Only the confirmed balance can be spent.
+     */
+    rpc WalletSend (WalletSendRequest) returns (WalletSendResponse);
+
+    /*
+    Get a new address of the wallet.
+     */
+    rpc WalletReceive (WalletReceiveRequest) returns (WalletReceiveResponse);
+
     /*
     Gracefully stops the daemon.
      */
@@ -265,11 +292,12 @@ message SwapInfo {
     repeated ChannelId chan_ids = 14;
     optional string blinding_key = 15;
     int64 created_at = 16;
-    optional uint64 service_fee = 17;
+    optional int64 service_fee = 17;
     optional uint64 onchain_fee = 18;
     // internal wallet which was used to pay the swap
     optional uint64 wallet_id = 20;
     uint64 tenant_id = 21;
+    bool is_auto = 23;
 }
 
 enum SwapType {
@@ -322,7 +350,8 @@ message ReverseSwapInfo {
     string redeem_script = 7;
     string invoice = 8;
     string claim_address = 9;
-    int64 onchain_amount = 10;
+    uint64 onchain_amount = 10;
+    uint64 invoice_amount = 25;
     uint32 timeout_block_height = 11;
     string lockup_transaction_id = 12;
     string claim_transaction_id = 13;
@@ -331,11 +360,12 @@ message ReverseSwapInfo {
     optional string blinding_key = 16;
     int64 created_at = 17;
     optional int64 paid_at = 23; // the time when the invoice was paid
-    optional uint64 service_fee = 18;
+    optional int64 service_fee = 18;
     optional uint64 onchain_fee = 19;
     optional uint64 routing_fee_msat = 20;
     bool external_pay = 21;
     uint64 tenant_id = 22;
+    bool is_auto = 24;
 }
 
 message BlockHeights {
@@ -406,17 +436,44 @@ enum IncludeSwaps {
     AUTO = 2;
 }
 
+message AnySwapInfo {
+    string id = 1;
+    SwapType type = 2;
+    Pair pair = 3;
+    SwapState state = 4;
+    optional string error = 5;
+    string status = 6;
+    // The expected amount to be sent to the lockup address for submarine and chain swaps and
+    // the invoice amount for reverse swaps.
+    uint64 from_amount = 7;
+    // `from_amount` minus the service and network fee.
+    uint64 to_amount = 13;
+    int64 created_at = 8;
+    optional int64 service_fee = 9;
+    // inclues the routing fee for reverse swaps
+    optional uint64 onchain_fee = 10;
+    bool is_auto = 11;
+    uint64 tenant_id = 12;
+}
+
 message ListSwapsRequest {
     optional Currency from = 1;
     optional Currency to = 2;
     optional SwapState state = 4;
     IncludeSwaps include = 5;
+    optional uint64 limit = 6;
+    optional uint64 offset = 7;
+    // wether to return swaps in the shared `all_swaps` list or in the detailed lists.
+    // the `limit` and `offset` are only considered when `unify` is true.
+    optional bool unify = 8;
 }
 message ListSwapsResponse {
     repeated SwapInfo swaps = 1;
-    repeated CombinedChannelSwapInfo channel_creations = 2;
+    repeated CombinedChannelSwapInfo channel_creations = 2 [deprecated = true];
     repeated ReverseSwapInfo reverse_swaps = 3;
     repeated ChainSwapInfo chain_swaps = 4;
+    // populated when `unify` is set to true in the request
+    repeated AnySwapInfo all_swaps = 5;
 }
 
 message GetStatsRequest {
@@ -448,7 +505,12 @@ message ClaimSwapsResponse {
 }
 
 message GetSwapInfoRequest {
-    string id = 1;
+    string id = 1 [deprecated = true];
+    oneof identifier {
+        string swap_id = 2;
+        // Only implemented for submarine swaps
+        bytes payment_hash = 3;
+    }
 }
 message GetSwapInfoResponse {
     SwapInfo swap = 1;
@@ -471,22 +533,29 @@ message DepositResponse {
 }
 
 message CreateSwapRequest {
+    // amount of sats to be received on lightning. 
+    // related: `invoice` field
     uint64 amount = 1;
     Pair pair = 2;
-    // not yet supported
-    // repeated string chan_ids = 3;
 
-    // the daemon will pay the swap using the onchain wallet specified in the `wallet` field or any wallet otherwise.
+    // the daemon will pay the swap using the onchain wallet specified in the `wallet` field 
+    // or the first internal wallet with the correct currency otherwise.
     bool send_from_internal = 4;
     // address where the coins should go if the swap fails. Refunds will go to any of the daemons wallets otherwise.
     optional string refund_address = 5;
     // wallet to pay swap from. only used if `send_from_internal` is set to true
     optional uint64 wallet_id = 6;
-    // invoice to use for the swap. if not set, the daemon will get a new invoice from the lightning node
+    // bolt11 invoice, lnurl, or lnaddress to use for the swap.
+    // required in standalone mode.
+    // when connected to a lightning node, a new invoice for `amount` sats will be fetched
+    // the `amount` field has to be populated in case of a lnurl and lnaddress
     optional string invoice = 7;
-    // Boltz does not accept 0-conf for Liquid transactions with a fee of 0.01 sat/vByte;
-    // when `zero_conf` is enabled, a fee of 0.1 sat/vByte will be used for Liquid lockup transactions
-    optional bool zero_conf = 8;
+    optional bool zero_conf = 8 [deprecated = true];
+    // Fee rate to use when sending from internal wallet
+    optional double sat_per_vbyte = 9;
+    // Rates to accept for the swap. Queries latest from boltz otherwise
+    // The recommended way to use this is to pass a user approved value from a previous `GetPairInfo` call
+    optional PairInfo accepted_pair = 10;
 }
 message CreateSwapResponse {
     string id = 1;
@@ -530,6 +599,16 @@ message CreateReverseSwapRequest {
     optional bool external_pay = 8;
     // Description of the invoice which will be created for the swap
     optional string description = 9;
+    // Description hash of the invoice which will be created for the swap. Takes precedence over `description`
+    optional bytes description_hash = 10;
+    // Expiry of the reverse swap invoice in seconds
+    optional uint64 invoice_expiry = 11;
+    // Rates to accept for the swap. Queries latest from boltz otherwise
+    // The recommended way to use this is to pass a user approved value from a previous `GetPairInfo` call
+    optional PairInfo accepted_pair = 12;
+
+    // The routing fee limit for paying the lightning invoice in ppm (parts per million)
+    optional uint64 routing_fee_limit_ppm = 13;
 }
 message CreateReverseSwapResponse {
     string id = 1;
@@ -545,7 +624,8 @@ message CreateReverseSwapResponse {
 
 message CreateChainSwapRequest {
     // Amount of satoshis to swap. It is the amount expected to be sent to the lockup address.
-    uint64 amount = 1;
+    // If left empty, any amount within the limits will be accepted.
+    optional uint64 amount = 1;
     Pair pair = 2;
     // Address where funds will be swept to if the swap succeeds
     optional string to_address = 3;
@@ -561,9 +641,12 @@ message CreateChainSwapRequest {
     optional bool accept_zero_conf = 7;
     // If set, the daemon will not pay the swap from an internal wallet.
     optional bool external_pay = 8;
-    // Boltz does not accept 0-conf for Liquid transactions with a fee of 0.01 sat/vByte;
-    // when `lockup_zero_conf` is enabled, a fee of 0.1 sat/vByte will be used for Liquid lockup transactions
-    optional bool lockup_zero_conf = 9;
+    optional bool lockup_zero_conf = 9 [deprecated = true];
+    // Fee rate to use when sending from internal wallet
+    optional double sat_per_vbyte = 10;
+    // Rates to accept for the swap. Queries latest from boltz otherwise
+    // The recommended way to use this is to pass a user approved value from a previous `GetPairInfo` call
+    optional PairInfo accepted_pair = 11;
 }
 
 message ChainSwapInfo {
@@ -574,7 +657,7 @@ message ChainSwapInfo {
     string status = 5;
     string preimage = 6;
     bool is_auto = 8;
-    optional uint64 service_fee = 9;
+    optional int64 service_fee = 9;
     double service_fee_percent = 10;
     optional uint64 onchain_fee = 11;
     int64 created_at = 12;
@@ -614,9 +697,9 @@ message LightningChannel {
 }
 
 message SwapStats {
-    uint64 total_fees = 1;
+    int64 total_fees = 1;
     uint64 total_amount = 2;
-    uint64 avg_fees = 3;
+    int64 avg_fees = 3;
     uint64 avg_amount = 4;
     uint64 count = 5;
     uint64 success_count = 6;
@@ -687,6 +770,75 @@ message GetWalletRequest {
     optional uint64 id = 2;
 }
 
+message WalletSendFee {
+    // amount of sats which would be sent
+    uint64 amount = 1;
+    uint64 fee = 2;
+    // the fee rate used for the estimation in sat/vbyte
+    double fee_rate = 3;
+}
+
+message ListWalletTransactionsRequest {
+    uint64 id = 1;
+    optional bool exclude_swap_related = 2;
+    optional uint64 limit = 3;
+    optional uint64 offset = 4;
+}
+
+enum TransactionType {
+    UNKNOWN = 0;
+    LOCKUP = 1;
+    REFUND = 2;
+    CLAIM = 3;
+    CONSOLIDATION = 4;
+}
+
+message WalletTransaction {
+    string id = 1;
+    // balance change of the wallet in satoshis.
+    // its the sum of all output values minus the sum of all input values which are controlled by the wallet.
+    // positive values indicate incoming transactions, negative values outgoing transactions
+    int64 balance_change = 2;
+    int64 timestamp = 3;
+    repeated TransactionOutput outputs = 4;
+    uint32 block_height = 6;
+    // additional informations about the tx (type, related swaps etc.)
+    repeated TransactionInfo infos = 7;
+}
+
+message BumpTransactionRequest {
+    oneof previous {
+        // Id of the transaction to bump. The transaction has to belong to one of the clients wallets
+        string tx_id = 1;
+        // Depending on the state of the swap, the lockup, refund or claim transaction will be bumped
+        string swap_id = 2;
+    }
+    // Fee rate for the new transaction. if not specified, the daemon will query the fee rate from the configured provider
+    // and bump the fee by at least 1 sat/vbyte.
+    optional double sat_per_vbyte = 3;
+}
+
+message BumpTransactionResponse {
+    string tx_id = 1;
+}
+
+message TransactionInfo {
+    // will be populated for LOCKUP, REFUND and CLAIM
+    optional string swap_id = 1;
+    TransactionType type = 2;
+}
+
+message TransactionOutput {
+    string address = 1;
+    uint64 amount = 2;
+    // wether the address is controlled by the wallet
+    bool is_our_address = 3;
+}
+
+message ListWalletTransactionsResponse {
+    repeated WalletTransaction transactions = 1;
+}
+
 message GetWalletCredentialsRequest {
     uint64 id = 1;
     optional string password = 2;
@@ -696,6 +848,31 @@ message RemoveWalletRequest {
     uint64 id = 1;
 }
 
+message WalletSendRequest {
+    uint64 id = 1;
+    string address = 2;
+    // Amount of satoshis to be sent to 'address`
+    uint64 amount = 3;
+    // Fee rate to use for the transaction
+    optional double sat_per_vbyte = 4;
+    // Sends all available funds to the address. The `amount` field is ignored.
+    optional bool send_all = 5;
+    // whether `address` is the lockup of a swap.
+    optional bool is_swap_address = 6;
+}
+
+message WalletSendResponse {
+    string tx_id = 1;
+}
+
+message WalletReceiveRequest {
+    uint64 id = 1;
+}
+
+message WalletReceiveResponse {
+    string address = 1;
+}
+
 
 message Wallet {
     uint64 id = 1;
@@ -720,6 +897,7 @@ message Subaccount {
     Balance balance = 1;
     uint64 pointer = 2;
     string type = 3;
+    repeated string descriptors = 4;
 }
 
 message RemoveWalletResponse {}

lnbits/wallets/boltz_grpc_files/update.sh

@@ -1,3 +1,3 @@
 
-wget https://raw.githubusercontent.com/BoltzExchange/boltz-client/master/boltzrpc/boltzrpc.proto -O lnbits/wallets/boltz_grpc_files/boltzrpc.proto
-poetry run python -m grpc_tools.protoc -I . --python_out=. --grpc_python_out=. --pyi_out=. lnbits/wallets/boltz_grpc_files/boltzrpc.proto
+wget https://raw.githubusercontent.com/BoltzExchange/boltz-client/refs/heads/master/pkg/boltzrpc/boltzrpc.proto -O boltz_grpc_files/boltzrpc.proto
+poetry run python -m grpc_tools.protoc -I . --python_out=. --grpc_python_out=. --pyi_out=. boltz_grpc_files/boltzrpc.proto

lnbits/wallets/breez.py

@@ -182,15 +182,16 @@ else:
                     )
                 )
 
+                # TODO: add preimage
                 return InvoiceResponse(
-                    True,
-                    breez_invoice.ln_invoice.payment_hash,
-                    breez_invoice.ln_invoice.bolt11,
-                    None,
+                    ok=True,
+                    checking_id=breez_invoice.ln_invoice.payment_hash,
+                    payment_request=breez_invoice.ln_invoice.bolt11,
+                    # preimage=breez_invoice.ln_invoice.payment_preimage,
                 )
             except Exception as e:
                 logger.warning(e)
-                return InvoiceResponse(False, None, None, str(e))
+                return InvoiceResponse(ok=False, error_message=str(e))
 
         async def pay_invoice(
             self, bolt11: str, fee_limit_msat: int
@@ -217,22 +218,19 @@ else:
                 except Exception as ex:
                     logger.info(ex)
                 # assume that payment failed?
-                return PaymentResponse(
-                    False, None, None, None, f"payment failed: {exc}"
-                )
+                return PaymentResponse(ok=False, error_message=f"payment failed: {exc}")
 
             if payment.status != breez_sdk.PaymentStatus.COMPLETE:
-                return PaymentResponse(False, None, None, None, "payment is pending")
+                return PaymentResponse(ok=False, error_message="payment is pending")
 
             # let's use the payment_hash as the checking_id
             checking_id = invoice.payment_hash
 
             return PaymentResponse(
-                True,
-                checking_id,
-                payment.fee_msat,
-                payment.details.data.payment_preimage,
-                None,
+                ok=True,
+                checking_id=checking_id,
+                fee_msat=payment.fee_msat,
+                preimage=payment.details.data.payment_preimage,
             )
 
         async def get_invoice_status(self, checking_id: str) -> PaymentStatus:

lnbits/wallets/cliche.py

@@ -54,7 +54,7 @@ class ClicheWallet(Wallet):
         memo: Optional[str] = None,
         description_hash: Optional[bytes] = None,
         unhashed_description: Optional[bytes] = None,
-        **kwargs,
+        **_,
     ) -> InvoiceResponse:
         if unhashed_description or description_hash:
             description_hash_str = (
@@ -79,12 +79,13 @@ class ClicheWallet(Wallet):
         data = json.loads(r)
         checking_id = None
         payment_request = None
-        error_message = None
 
         if data.get("error") is not None and data["error"].get("message"):
             logger.error(data["error"]["message"])
             error_message = data["error"]["message"]
-            return InvoiceResponse(False, checking_id, payment_request, error_message)
+            return InvoiceResponse(
+                ok=False, checking_id=checking_id, error_message=error_message
+            )
 
         if data.get("result") is not None:
             checking_id, payment_request = (
@@ -92,15 +93,19 @@ class ClicheWallet(Wallet):
                 data["result"]["invoice"],
             )
         else:
-            return InvoiceResponse(False, None, None, "Could not get payment hash")
+            return InvoiceResponse(ok=False, error_message="Could not get payment hash")
 
-        return InvoiceResponse(True, checking_id, payment_request, error_message)
+        return InvoiceResponse(
+            ok=True,
+            checking_id=checking_id,
+            payment_request=payment_request,
+            preimage=data["result"].get("preimage"),
+        )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
         ws = create_connection(self.endpoint)
         ws.send(f"pay-invoice --invoice {bolt11}")
-        checking_id, fee_msat, preimage, error_message, payment_ok = (
-            None,
+        checking_id, fee_msat, preimage, payment_ok = (
             None,
             None,
             None,
@@ -109,8 +114,7 @@ class ClicheWallet(Wallet):
         for _ in range(2):
             r = ws.recv()
             data = json.loads(r)
-            checking_id, fee_msat, preimage, error_message, payment_ok = (
-                None,
+            checking_id, fee_msat, preimage, payment_ok = (
                 None,
                 None,
                 None,
@@ -119,7 +123,7 @@ class ClicheWallet(Wallet):
 
             if data.get("error") is not None:
                 error_message = data["error"].get("message")
-                return PaymentResponse(False, None, None, None, error_message)
+                return PaymentResponse(ok=False, error_message=error_message)
 
             if data.get("method") == "payment_succeeded":
                 payment_ok = True
@@ -129,10 +133,10 @@ class ClicheWallet(Wallet):
                 continue
 
             if data.get("result") is None:
-                return PaymentResponse(None)
+                return PaymentResponse(error_message="result is None")
 
         return PaymentResponse(
-            payment_ok, checking_id, fee_msat, preimage, error_message
+            ok=payment_ok, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
         )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:

lnbits/wallets/corelightning.py

@@ -1,6 +1,7 @@
 import asyncio
 import random
-from typing import Any, AsyncGenerator, Optional
+from collections.abc import AsyncGenerator
+from typing import Any, Optional
 
 from bolt11.decode import decode as bolt11_decode
 from bolt11.exceptions import Bolt11Exception
@@ -9,6 +10,7 @@ from pyln.client import LightningRpc, RpcError
 
 from lnbits.nodes.cln import CoreLightningNode
 from lnbits.settings import settings
+from lnbits.utils.crypto import random_secret_and_hash
 
 from .base import (
     InvoiceResponse,
@@ -100,6 +102,11 @@ class CoreLightningWallet(Wallet):
                 )
             if unhashed_description and not self.supports_description_hash:
                 raise UnsupportedError("unhashed_description")
+
+            preimage = kwargs.get("preimage")
+            if not preimage:
+                preimage, _ = random_secret_and_hash()
+
             r: dict = self.ln.invoice(  # type: ignore
                 amount_msat=msat,
                 label=label,
@@ -107,6 +114,7 @@ class CoreLightningWallet(Wallet):
                     unhashed_description.decode() if unhashed_description else memo
                 ),
                 exposeprivatechannels=True,
+                preimage=preimage,
                 deschashonly=(
                     True if unhashed_description else False
                 ),  # we can't pass None here
@@ -115,35 +123,39 @@ class CoreLightningWallet(Wallet):
 
             if r.get("code") and r.get("code") < 0:  # type: ignore
                 raise Exception(r.get("message"))
-
-            return InvoiceResponse(True, r["payment_hash"], r["bolt11"], None)
+            return InvoiceResponse(
+                ok=True,
+                checking_id=r["payment_hash"],
+                payment_request=r["bolt11"],
+                preimage=preimage,
+            )
         except RpcError as exc:
             logger.warning(exc)
             error_message = f"RPC '{exc.method}' failed with '{exc.error}'."
-            return InvoiceResponse(False, None, None, error_message)
+            return InvoiceResponse(ok=False, error_message=error_message)
         except KeyError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, "Server error: 'missing required fields'"
+                ok=False, error_message="Server error: 'missing required fields'"
             )
         except Exception as e:
             logger.warning(e)
-            return InvoiceResponse(False, None, None, str(e))
+            return InvoiceResponse(ok=False, error_message=str(e))
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
         try:
             invoice = bolt11_decode(bolt11)
         except Bolt11Exception as exc:
-            return PaymentResponse(False, None, None, None, str(exc))
+            return PaymentResponse(ok=False, error_message=str(exc))
 
         try:
             previous_payment = await self.get_payment_status(invoice.payment_hash)
             if previous_payment.paid:
-                return PaymentResponse(False, None, None, None, "invoice already paid")
+                return PaymentResponse(ok=False, error_message="invoice already paid")
 
             if not invoice.amount_msat or invoice.amount_msat <= 0:
                 return PaymentResponse(
-                    False, None, None, None, "CLN 0 amount invoice not supported"
+                    ok=False, error_message="CLN 0 amount invoice not supported"
                 )
 
             # maxfee overrides both maxfeepercent and exemptfee defaults (and
@@ -170,23 +182,23 @@ class CoreLightningWallet(Wallet):
                 if error_code in self.pay_failure_error_codes:
                     error_message = exc.error.get("message", error_code)  # type: ignore
                     return PaymentResponse(
-                        False, None, None, None, f"Payment failed: {error_message}"
+                        ok=False, error_message=f"Payment failed: {error_message}"
                     )
                 else:
                     error_message = f"Payment failed: {exc.error}"
-                    return PaymentResponse(None, None, None, None, error_message)
+                    return PaymentResponse(error_message=error_message)
             except Exception:
                 error_message = f"RPC '{exc.method}' failed with '{exc.error}'."
-                return PaymentResponse(None, None, None, None, error_message)
+                return PaymentResponse(error_message=error_message)
         except KeyError as exc:
             logger.warning(exc)
             return PaymentResponse(
-                None, None, None, None, "Server error: 'missing required fields'"
+                error_message="Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
-            return PaymentResponse(None, None, None, None, f"Payment failed: '{exc}'.")
+            return PaymentResponse(error_message=f"Payment failed: '{exc}'.")
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         try:

lnbits/wallets/corelightningrest.py

@@ -1,7 +1,8 @@
 import asyncio
 import json
 import random
-from typing import AsyncGenerator, Dict, Optional
+from collections.abc import AsyncGenerator
+from typing import Optional
 
 import httpx
 from bolt11 import Bolt11Exception
@@ -9,6 +10,7 @@ from bolt11.decode import decode
 from loguru import logger
 
 from lnbits.settings import settings
+from lnbits.utils.crypto import random_secret_and_hash
 
 from .base import (
     InvoiceResponse,
@@ -109,7 +111,7 @@ class CoreLightningRestWallet(Wallet):
         **kwargs,
     ) -> InvoiceResponse:
         label = kwargs.get("label", f"lbl{random.random()}")
-        data: Dict = {
+        data: dict = {
             "amount": amount * 1000,
             "description": memo,
             "label": label,
@@ -126,8 +128,10 @@ class CoreLightningRestWallet(Wallet):
         if kwargs.get("expiry"):
             data["expiry"] = kwargs["expiry"]
 
-        if kwargs.get("preimage"):
-            data["preimage"] = kwargs["preimage"]
+        preimage, _ = random_secret_and_hash()
+
+        # https://github.com/Ride-The-Lightning/c-lightning-REST/blob/master/controllers/invoice.js#L52C17-L52C25
+        data["preimage"] = preimage
 
         try:
             r = await self.client.post(
@@ -139,41 +143,48 @@ class CoreLightningRestWallet(Wallet):
             data = r.json()
 
             if len(data) == 0:
-                return InvoiceResponse(False, None, None, "no data")
+                return InvoiceResponse(ok=False, error_message="no data")
 
             if "error" in data:
                 return InvoiceResponse(
-                    False, None, None, f"""Server error: '{data["error"]}'"""
+                    ok=False, error_message=f"""Server error: '{data["error"]}'"""
                 )
 
             if r.is_error:
-                return InvoiceResponse(False, None, None, f"Server error: '{r.text}'")
+                return InvoiceResponse(
+                    ok=False, error_message=f"Server error: '{r.text}'"
+                )
 
             if "payment_hash" not in data or "bolt11" not in data:
                 return InvoiceResponse(
-                    False, None, None, "Server error: 'missing required fields'"
+                    ok=False, error_message="Server error: 'missing required fields'"
                 )
 
-            return InvoiceResponse(True, data["payment_hash"], data["bolt11"], None)
+            return InvoiceResponse(
+                ok=True,
+                checking_id=data["payment_hash"],
+                payment_request=data["bolt11"],
+                preimage=preimage,
+            )
         except json.JSONDecodeError:
             return InvoiceResponse(
-                False, None, None, "Server error: 'invalid json response'"
+                ok=False, error_message="Server error: 'invalid json response'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, f"Unable to connect to {self.url}."
+                ok=False, error_message=f"Unable to connect to {self.url}."
             )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
         try:
             invoice = decode(bolt11)
         except Bolt11Exception as exc:
-            return PaymentResponse(False, None, None, None, str(exc))
+            return PaymentResponse(ok=False, error_message=str(exc))
 
         if not invoice.amount_msat or invoice.amount_msat <= 0:
             error_message = "0 amount invoices are not allowed"
-            return PaymentResponse(False, None, None, None, error_message)
+            return PaymentResponse(ok=False, error_message=error_message)
         try:
             r = await self.client.post(
                 f"{self.url}/v1/pay",
@@ -190,18 +201,16 @@ class CoreLightningRestWallet(Wallet):
             status = self.statuses.get(data["status"])
             if "payment_preimage" not in data:
                 return PaymentResponse(
-                    status,
-                    None,
-                    None,
-                    None,
-                    data.get("error"),
+                    ok=status, error_message=data.get("error") or "unknown error"
                 )
 
             checking_id = data["payment_hash"]
             preimage = data["payment_preimage"]
             fee_msat = data["msatoshi_sent"] - data["msatoshi"]
 
-            return PaymentResponse(status, checking_id, fee_msat, preimage, None)
+            return PaymentResponse(
+                ok=status, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
+            )
         except httpx.HTTPStatusError as exc:
             try:
                 logger.debug(exc)
@@ -209,28 +218,26 @@ class CoreLightningRestWallet(Wallet):
                 error_code = int(data["error"]["code"])
                 if error_code in self.pay_failure_error_codes:
                     error_message = f"Payment failed: {data['error']['message']}"
-                    return PaymentResponse(False, None, None, None, error_message)
+                    return PaymentResponse(ok=False, error_message=error_message)
                 error_message = f"REST failed with {data['error']['message']}."
-                return PaymentResponse(None, None, None, None, error_message)
+                return PaymentResponse(error_message=error_message)
             except Exception as exc:
                 error_message = f"Unable to connect to {self.url}."
-                return PaymentResponse(None, None, None, None, error_message)
+                return PaymentResponse(error_message=error_message)
 
         except json.JSONDecodeError:
             return PaymentResponse(
-                None, None, None, None, "Server error: 'invalid json response'"
+                error_message="Server error: 'invalid json response'"
             )
         except KeyError as exc:
             logger.warning(exc)
             return PaymentResponse(
-                None, None, None, None, "Server error: 'missing required fields'"
+                error_message="Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
-            return PaymentResponse(
-                None, None, None, None, f"Unable to connect to {self.url}."
-            )
+            return PaymentResponse(error_message=f"Unable to connect to {self.url}.")
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         r = await self.client.get(

lnbits/wallets/eclair.py

@@ -3,13 +3,16 @@ import base64
 import hashlib
 import json
 import urllib.parse
-from typing import Any, AsyncGenerator, Dict, Optional
+from collections.abc import AsyncGenerator
+from decimal import Decimal
+from typing import Any, Optional
 
 import httpx
 from loguru import logger
 from websockets.client import connect
 
 from lnbits.settings import settings
+from lnbits.utils.crypto import random_secret_and_hash
 
 from .base import (
     InvoiceResponse,
@@ -69,8 +72,8 @@ class EclairWallet(Wallet):
 
             if r.is_error or "total" not in data:
                 return StatusResponse(f"Server error: '{r.text}'", 0)
-
-            return StatusResponse(None, int(data.get("total") * 100_000_000_000))
+            total = round(Decimal(data.get("total")), 8) * 100_000_000_000
+            return StatusResponse(balance_msat=int(total), error_message=None)
         except json.JSONDecodeError:
             return StatusResponse("Server error: 'invalid json response'", 0)
         except Exception as exc:
@@ -85,7 +88,7 @@ class EclairWallet(Wallet):
         unhashed_description: Optional[bytes] = None,
         **kwargs,
     ) -> InvoiceResponse:
-        data: Dict[str, Any] = {
+        data: dict[str, Any] = {
             "amountMsat": amount * 1000,
         }
         if kwargs.get("expiry"):
@@ -99,36 +102,45 @@ class EclairWallet(Wallet):
         else:
             data["description"] = memo
 
+        preimage, _ = random_secret_and_hash()
+        data["paymentPreimage"] = preimage
+
         try:
             r = await self.client.post("/createinvoice", data=data, timeout=40)
             r.raise_for_status()
             data = r.json()
 
             if len(data) == 0:
-                return InvoiceResponse(False, None, None, "no data")
+                return InvoiceResponse(ok=False, error_message="no data")
 
             if "error" in data:
                 return InvoiceResponse(
-                    False, None, None, f"""Server error: '{data["error"]}'"""
+                    ok=False, error_message=f"""Server error: '{data["error"]}'"""
                 )
 
             if r.is_error:
-                return InvoiceResponse(False, None, None, f"Server error: '{r.text}'")
-
-            return InvoiceResponse(True, data["paymentHash"], data["serialized"], None)
+                return InvoiceResponse(
+                    ok=False, error_message=f"Server error: '{r.text}'"
+                )
+            return InvoiceResponse(
+                ok=True,
+                checking_id=data["paymentHash"],
+                payment_request=data["serialized"],
+                preimage=preimage,
+            )
         except json.JSONDecodeError:
             return InvoiceResponse(
-                False, None, None, "Server error: 'invalid json response'"
+                ok=False, error_message="Server error: 'invalid json response'"
             )
         except KeyError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, "Server error: 'missing required fields'"
+                ok=False, error_message="Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, f"Unable to connect to {self.url}."
+                ok=False, error_message=f"Unable to connect to {self.url}."
             )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -142,35 +154,36 @@ class EclairWallet(Wallet):
             data = r.json()
 
             if "error" in data:
-                return PaymentResponse(None, None, None, None, data["error"])
+                return PaymentResponse(error_message=data["error"])
             if r.is_error:
-                return PaymentResponse(None, None, None, None, r.text)
+                return PaymentResponse(error_message=r.text)
 
             if data["type"] == "payment-failed":
-                return PaymentResponse(False, None, None, None, "payment failed")
+                return PaymentResponse(ok=False, error_message="payment failed")
 
             checking_id = data["paymentHash"]
             preimage = data["paymentPreimage"]
 
         except json.JSONDecodeError:
             return PaymentResponse(
-                None, None, None, None, "Server error: 'invalid json response'"
+                error_message="Server error: 'invalid json response'"
             )
         except KeyError:
             return PaymentResponse(
-                None, None, None, None, "Server error: 'missing required fields'"
+                error_message="Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
-            return PaymentResponse(
-                None, None, None, None, f"Unable to connect to {self.url}."
-            )
+            return PaymentResponse(error_message=f"Unable to connect to {self.url}.")
 
         payment_status: PaymentStatus = await self.get_payment_status(checking_id)
         success = True if payment_status.success else None
         return PaymentResponse(
-            success, checking_id, payment_status.fee_msat, preimage, None
+            ok=success,
+            checking_id=checking_id,
+            fee_msat=payment_status.fee_msat,
+            preimage=preimage,
         )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:

lnbits/wallets/fake.py

@@ -100,7 +100,7 @@ class FakeWallet(Wallet):
             ok=True,
             checking_id=payment_hash,
             payment_request=payment_request,
-            # preimage=preimage.hex(),
+            preimage=preimage.hex(),
         )
 
     async def pay_invoice(self, bolt11: str, _: int) -> PaymentResponse:

lnbits/wallets/lnbits.py

@@ -92,23 +92,28 @@ class LNbitsWallet(Wallet):
             if r.is_error or not payment_str:
                 error_message = data["detail"] if "detail" in data else r.text
                 return InvoiceResponse(
-                    False, None, None, f"Server error: '{error_message}'"
+                    ok=False, error_message=f"Server error: '{error_message}'"
                 )
 
-            return InvoiceResponse(True, data["checking_id"], payment_str, None)
+            return InvoiceResponse(
+                ok=True,
+                checking_id=data["checking_id"],
+                payment_request=payment_str,
+                preimage=data.get("preimage"),
+            )
         except json.JSONDecodeError:
             return InvoiceResponse(
-                False, None, None, "Server error: 'invalid json response'"
+                ok=False, error_message="Server error: 'invalid json response'"
             )
         except KeyError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, "Server error: 'missing required fields'"
+                ok=False, error_message="Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, f"Unable to connect to {self.endpoint}."
+                ok=False, error_message=f"Unable to connect to {self.endpoint}."
             )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -129,7 +134,10 @@ class LNbitsWallet(Wallet):
 
             success = True if payment.success else None
             return PaymentResponse(
-                success, checking_id, payment.fee_msat, payment.preimage
+                ok=success,
+                checking_id=checking_id,
+                fee_msat=payment.fee_msat,
+                preimage=payment.preimage,
             )
 
         except httpx.HTTPStatusError as exc:
@@ -138,25 +146,25 @@ class LNbitsWallet(Wallet):
                 data = exc.response.json()
                 error_message = f"Payment {data['status']}: {data['detail']}."
                 if data["status"] == "failed":
-                    return PaymentResponse(False, None, None, None, error_message)
-                return PaymentResponse(None, None, None, None, error_message)
+                    return PaymentResponse(ok=False, error_message=error_message)
+                return PaymentResponse(error_message=error_message)
             except Exception as exc:
                 error_message = f"Unable to connect to {self.endpoint}."
-                return PaymentResponse(None, None, None, None, error_message)
+                return PaymentResponse(error_message=error_message)
 
         except json.JSONDecodeError:
             return PaymentResponse(
-                None, None, None, None, "Server error: 'invalid json response'"
+                error_message="Server error: 'invalid json response'"
             )
         except KeyError:
             return PaymentResponse(
-                None, None, None, None, "Server error: 'missing required fields'"
+                error_message="Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
             return PaymentResponse(
-                None, None, None, None, f"Unable to connect to {self.endpoint}."
+                error_message=f"Unable to connect to {self.endpoint}."
             )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:

lnbits/wallets/lndgrpc.py

@@ -1,6 +1,6 @@
 import asyncio
 import base64
-import hashlib
+from hashlib import sha256
 from os import environ
 from typing import AsyncGenerator, Dict, Optional
 
@@ -12,10 +12,11 @@ import lnbits.wallets.lnd_grpc_files.lightning_pb2_grpc as lnrpc
 import lnbits.wallets.lnd_grpc_files.router_pb2 as router
 import lnbits.wallets.lnd_grpc_files.router_pb2_grpc as routerrpc
 from lnbits.settings import settings
-from lnbits.utils.crypto import AESCipher
+from lnbits.utils.crypto import random_secret_and_hash
 
 from .base import (
     InvoiceResponse,
+    PaymentFailedStatus,
     PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
@@ -71,6 +72,11 @@ class LndWallet(Wallet):
                 "cannot initialize LndWallet: missing lnd_grpc_cert or lnd_cert"
             )
 
+        self.endpoint = self.normalize_endpoint(
+            settings.lnd_grpc_endpoint, add_proto=False
+        )
+        self.port = int(settings.lnd_grpc_port)
+
         macaroon = (
             settings.lnd_grpc_macaroon
             or settings.lnd_grpc_admin_macaroon
@@ -79,23 +85,11 @@ class LndWallet(Wallet):
             or settings.lnd_invoice_macaroon
         )
         encrypted_macaroon = settings.lnd_grpc_macaroon_encrypted
-        if encrypted_macaroon:
-            macaroon = AESCipher(description="macaroon decryption").decrypt(
-                encrypted_macaroon
-            )
-        if not macaroon:
-            raise ValueError(
-                "cannot initialize LndWallet: "
-                "missing lnd_grpc_macaroon or lnd_grpc_admin_macaroon or "
-                "lnd_admin_macaroon or lnd_grpc_invoice_macaroon or "
-                "lnd_invoice_macaroon or lnd_grpc_macaroon_encrypted"
-            )
+        try:
+            self.macaroon = load_macaroon(macaroon, encrypted_macaroon)
+        except ValueError as exc:
+            raise ValueError(f"cannot load macaroon for LndWallet: {exc!s}") from exc
 
-        self.endpoint = self.normalize_endpoint(
-            settings.lnd_grpc_endpoint, add_proto=False
-        )
-        self.port = int(settings.lnd_grpc_port)
-        self.macaroon = load_macaroon(macaroon)
         cert = open(cert_path, "rb").read()
         creds = grpc.ssl_channel_credentials(cert)
         auth_creds = grpc.metadata_call_credentials(self.metadata_callback)
@@ -139,21 +133,38 @@ class LndWallet(Wallet):
         if description_hash:
             data["description_hash"] = description_hash
         elif unhashed_description:
-            data["description_hash"] = hashlib.sha256(
-                unhashed_description
-            ).digest()  # as bytes directly
+            data["description_hash"] = sha256(unhashed_description).digest()
 
+        preimage = kwargs.get("preimage")
+        if preimage:
+            payment_hash = sha256(preimage.encode()).hexdigest()
+        else:
+            preimage, payment_hash = random_secret_and_hash()
+
+        data["r_hash"] = bytes.fromhex(payment_hash)
+        data["r_preimage"] = bytes.fromhex(preimage)
         try:
             req = ln.Invoice(**data)
             resp = await self.rpc.AddInvoice(req)
+            # response model
+            # {
+            #    "r_hash": <bytes>,
+            #    "payment_request": <string>,
+            #    "add_index": <uint64>,
+            #    "payment_addr": <bytes>,
+            # }
         except Exception as exc:
             logger.warning(exc)
-            error_message = str(exc)
-            return InvoiceResponse(False, None, None, error_message)
+            return InvoiceResponse(ok=False, error_message=str(exc))
 
         checking_id = bytes_to_hex(resp.r_hash)
         payment_request = str(resp.payment_request)
-        return InvoiceResponse(True, checking_id, payment_request, None)
+        return InvoiceResponse(
+            ok=True,
+            checking_id=checking_id,
+            payment_request=payment_request,
+            preimage=preimage,
+        )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
         # fee_limit_fixed = ln.FeeLimit(fixed=fee_limit_msat // 1000)
@@ -167,7 +178,7 @@ class LndWallet(Wallet):
             resp = await self.routerpc.SendPaymentV2(req).read()
         except Exception as exc:
             logger.warning(exc)
-            return PaymentResponse(None, None, None, None, str(exc))
+            return PaymentResponse(error_message=str(exc))
 
         # PaymentStatus from https://github.com/lightningnetwork/lnd/blob/master/channeldb/payments.go#L178
         statuses = {
@@ -195,12 +206,18 @@ class LndWallet(Wallet):
             fee_msat = -resp.htlcs[-1].route.total_fees_msat
             preimage = resp.payment_preimage
             checking_id = resp.payment_hash
+            return PaymentResponse(
+                ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
+            )
         elif statuses[resp.status] is False:
             error_message = failure_reasons[resp.failure_reason]
-
-        return PaymentResponse(
-            statuses[resp.status], checking_id, fee_msat, preimage, error_message
-        )
+            return PaymentResponse(ok=False, error_message=error_message)
+        else:
+            return PaymentResponse(
+                ok=None,
+                checking_id=checking_id,
+                error_message="Payment in flight or non-existant.",
+            )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         try:
@@ -211,10 +228,11 @@ class LndWallet(Wallet):
                 raise ValueError
 
             resp = await self.rpc.LookupInvoice(ln.PaymentHash(r_hash=r_hash))
-
-            # todo: where is the FAILED status
             if resp.settled:
-                return PaymentSuccessStatus()
+                return PaymentSuccessStatus(preimage=resp.r_preimage.hex())
+
+            if resp.state == "CANCELED":
+                return PaymentFailedStatus()
 
             return PaymentPendingStatus()
         except grpc.RpcError as exc:

lnbits/wallets/lndrest.py

@@ -9,7 +9,7 @@ from loguru import logger
 
 from lnbits.nodes.lndrest import LndRestNode
 from lnbits.settings import settings
-from lnbits.utils.crypto import AESCipher
+from lnbits.utils.crypto import random_secret_and_hash
 
 from .base import (
     InvoiceResponse,
@@ -35,26 +35,6 @@ class LndRestWallet(Wallet):
                 "cannot initialize LndRestWallet: missing lnd_rest_endpoint"
             )
 
-        macaroon = (
-            settings.lnd_rest_macaroon
-            or settings.lnd_admin_macaroon
-            or settings.lnd_rest_admin_macaroon
-            or settings.lnd_invoice_macaroon
-            or settings.lnd_rest_invoice_macaroon
-        )
-        encrypted_macaroon = settings.lnd_rest_macaroon_encrypted
-        if encrypted_macaroon:
-            macaroon = AESCipher(description="macaroon decryption").decrypt(
-                encrypted_macaroon
-            )
-        if not macaroon:
-            raise ValueError(
-                "cannot initialize LndRestWallet: "
-                "missing lnd_rest_macaroon or lnd_admin_macaroon or "
-                "lnd_rest_admin_macaroon or lnd_invoice_macaroon or "
-                "lnd_rest_invoice_macaroon or lnd_rest_macaroon_encrypted"
-            )
-
         if not settings.lnd_rest_cert:
             logger.warning(
                 "No certificate for LndRestWallet provided! "
@@ -68,7 +48,21 @@ class LndRestWallet(Wallet):
         # even on startup
         cert = settings.lnd_rest_cert or True
 
-        macaroon = load_macaroon(macaroon)
+        macaroon = (
+            settings.lnd_rest_macaroon
+            or settings.lnd_admin_macaroon
+            or settings.lnd_rest_admin_macaroon
+            or settings.lnd_invoice_macaroon
+            or settings.lnd_rest_invoice_macaroon
+        )
+        encrypted_macaroon = settings.lnd_rest_macaroon_encrypted
+        try:
+            macaroon = load_macaroon(macaroon, encrypted_macaroon)
+        except ValueError as exc:
+            raise ValueError(
+                f"cannot load macaroon for LndRestWallet: {exc!s}"
+            ) from exc
+
         headers = {
             "Grpc-Metadata-macaroon": macaroon,
             "User-Agent": settings.user_agent,
@@ -110,56 +104,67 @@ class LndRestWallet(Wallet):
         unhashed_description: Optional[bytes] = None,
         **kwargs,
     ) -> InvoiceResponse:
-        data: Dict = {
+        _data: Dict = {
             "value": amount,
             "private": settings.lnd_rest_route_hints,
             "memo": memo or "",
         }
         if kwargs.get("expiry"):
-            data["expiry"] = kwargs["expiry"]
+            _data["expiry"] = kwargs["expiry"]
         if description_hash:
-            data["description_hash"] = base64.b64encode(description_hash).decode(
+            _data["description_hash"] = base64.b64encode(description_hash).decode(
                 "ascii"
             )
         elif unhashed_description:
-            data["description_hash"] = base64.b64encode(
+            _data["description_hash"] = base64.b64encode(
                 hashlib.sha256(unhashed_description).digest()
             ).decode("ascii")
 
+        preimage, _payment_hash = random_secret_and_hash()
+        _data["r_hash"] = base64.b64encode(bytes.fromhex(_payment_hash)).decode()
+        _data["r_preimage"] = base64.b64encode(bytes.fromhex(preimage)).decode()
+
         try:
-            r = await self.client.post(url="/v1/invoices", json=data)
+            r = await self.client.post(url="/v1/invoices", json=_data)
             r.raise_for_status()
             data = r.json()
 
             if len(data) == 0:
-                return InvoiceResponse(False, None, None, "no data")
+                return InvoiceResponse(ok=False, error_message="no data")
 
             if "error" in data:
                 return InvoiceResponse(
-                    False, None, None, f"""Server error: '{data["error"]}'"""
+                    ok=False, error_message=f"""Server error: '{data["error"]}'"""
                 )
 
             if r.is_error:
-                return InvoiceResponse(False, None, None, f"Server error: '{r.text}'")
+                return InvoiceResponse(
+                    ok=False, error_message=f"Server error: '{r.text}'"
+                )
 
             if "payment_request" not in data or "r_hash" not in data:
                 return InvoiceResponse(
-                    False, None, None, "Server error: 'missing required fields'"
+                    ok=False, error_message="Server error: 'missing required fields'"
                 )
 
             payment_request = data["payment_request"]
             payment_hash = base64.b64decode(data["r_hash"]).hex()
             checking_id = payment_hash
+            return InvoiceResponse(
+                ok=True,
+                checking_id=checking_id,
+                payment_request=payment_request,
+                preimage=preimage,
+            )
 
-            return InvoiceResponse(True, checking_id, payment_request, None)
         except json.JSONDecodeError:
             return InvoiceResponse(
-                False, None, None, "Server error: 'invalid json response'"
+                ok=False, error_message="Server error: 'invalid json response'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, f"Unable to connect to {self.endpoint}."
+                ok=False, error_message=f"Unable to connect to {self.endpoint}."
             )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -185,25 +190,27 @@ class LndRestWallet(Wallet):
             payment_error = data.get("payment_error")
             if payment_error:
                 logger.warning(f"LndRestWallet payment_error: {payment_error}.")
-                return PaymentResponse(False, None, None, None, payment_error)
+                return PaymentResponse(ok=False, error_message=payment_error)
 
             checking_id = base64.b64decode(data["payment_hash"]).hex()
             fee_msat = int(data["payment_route"]["total_fees_msat"])
             preimage = base64.b64decode(data["payment_preimage"]).hex()
-            return PaymentResponse(True, checking_id, fee_msat, preimage, None)
+            return PaymentResponse(
+                ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
+            )
         except KeyError as exc:
             logger.warning(exc)
             return PaymentResponse(
-                None, None, None, None, "Server error: 'missing required fields'"
+                error_message="Server error: 'missing required fields'"
             )
         except json.JSONDecodeError:
             return PaymentResponse(
-                None, None, None, None, "Server error: 'invalid json response'"
+                error_message="Server error: 'invalid json response'"
             )
         except Exception as exc:
             logger.warning(f"LndRestWallet pay_invoice POST error: {exc}.")
             return PaymentResponse(
-                None, None, None, None, f"Unable to connect to {self.endpoint}."
+                error_message=f"Unable to connect to {self.endpoint}."
             )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
@@ -212,15 +219,22 @@ class LndRestWallet(Wallet):
         try:
             r.raise_for_status()
             data = r.json()
-
-            if r.is_error or not data.get("settled"):
-                # this must also work when checking_id is not a hex recognizable by lnd
-                # it will return an error and no "settled" attribute on the object
-                return PaymentPendingStatus()
         except Exception as e:
             logger.error(f"Error getting invoice status: {e}")
             return PaymentPendingStatus()
-        return PaymentSuccessStatus()
+
+        if r.is_error or data.get("settled") is None:
+            # this must also work when checking_id is not a hex recognizable by lnd
+            # it will return an error and no "settled" attribute on the object
+            return PaymentPendingStatus()
+
+        if data.get("settled") is True:
+            return PaymentSuccessStatus()
+
+        if data.get("state") == "CANCELED":
+            return PaymentFailedStatus()
+
+        return PaymentPendingStatus()
 
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         """
@@ -266,7 +280,12 @@ class LndRestWallet(Wallet):
                     if payment is not None and payment.get("status"):
                         return PaymentStatus(
                             paid=statuses[payment["status"]],
-                            fee_msat=payment.get("fee_msat"),
+                            # API returns fee_msat as string, explicitly convert to int
+                            fee_msat=(
+                                int(payment["fee_msat"])
+                                if payment.get("fee_msat")
+                                else None
+                            ),
                             preimage=payment.get("payment_preimage"),
                         )
                     else:

lnbits/wallets/lnpay.py

@@ -91,20 +91,17 @@ class LNPayWallet(Wallet):
             json=data,
             timeout=60,
         )
-        ok, checking_id, payment_request, error_message = (
-            r.status_code == 201,
-            None,
-            None,
-            r.text,
-        )
-
-        if ok:
+        if r.status_code == 201:
             data = r.json()
-            checking_id, payment_request = data["id"], data["payment_request"]
-
-            self.pending_invoices.append(checking_id)
-
-        return InvoiceResponse(ok, checking_id, payment_request, error_message)
+            self.pending_invoices.append(data["id"])
+            return InvoiceResponse(
+                ok=True,
+                payment_request=data["payment_request"],
+            )
+        return InvoiceResponse(
+            ok=False,
+            error_message=r.text,
+        )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
         r = await self.client.post(
@@ -116,17 +113,17 @@ class LNPayWallet(Wallet):
         try:
             data = r.json()
         except Exception:
-            return PaymentResponse(
-                False, None, 0, None, f"Got invalid JSON: {r.text[:200]}"
-            )
+            return PaymentResponse(ok=False, error_message="Got invalid JSON.")
 
         if r.is_error:
-            return PaymentResponse(False, None, None, None, data["message"])
+            return PaymentResponse(ok=False, error_message=data["message"])
 
         checking_id = data["lnTx"]["id"]
         fee_msat = 0
         preimage = data["lnTx"]["payment_preimage"]
-        return PaymentResponse(True, checking_id, fee_msat, preimage, None)
+        return PaymentResponse(
+            ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
+        )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         return await self.get_payment_status(checking_id)

lnbits/wallets/lntips.py

@@ -70,7 +70,7 @@ class LnTipsWallet(Wallet):
         memo: Optional[str] = None,
         description_hash: Optional[bytes] = None,
         unhashed_description: Optional[bytes] = None,
-        **kwargs,
+        **_,
     ) -> InvoiceResponse:
         data: Dict = {"amount": amount, "description_hash": "", "memo": memo or ""}
         if description_hash:
@@ -91,11 +91,14 @@ class LnTipsWallet(Wallet):
             except Exception:
                 error_message = r.text
 
-            return InvoiceResponse(False, None, None, error_message)
+            return InvoiceResponse(ok=False, error_message=error_message)
 
         data = r.json()
         return InvoiceResponse(
-            True, data["payment_hash"], data["payment_request"], None
+            ok=True,
+            checking_id=data["payment_hash"],
+            payment_request=data["payment_request"],
+            preimage=data.get("preimage"),
         )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -105,7 +108,7 @@ class LnTipsWallet(Wallet):
             timeout=None,
         )
         if r.is_error:
-            return PaymentResponse(False, None, 0, None, r.text)
+            return PaymentResponse(ok=False, error_message=r.text)
 
         if "error" in r.json():
             try:
@@ -113,13 +116,15 @@ class LnTipsWallet(Wallet):
                 error_message = data["error"]
             except Exception:
                 error_message = r.text
-            return PaymentResponse(False, None, 0, None, error_message)
+            return PaymentResponse(ok=False, error_message=error_message)
 
         data = r.json()["details"]
         checking_id = data["payment_hash"]
         fee_msat = -data["fee"]
         preimage = data["preimage"]
-        return PaymentResponse(True, checking_id, fee_msat, preimage, None)
+        return PaymentResponse(
+            ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
+        )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         try:

lnbits/wallets/macaroon/macaroon.py

@@ -1,45 +1,45 @@
 import base64
-
-from loguru import logger
+from getpass import getpass
+from typing import Optional
 
 from lnbits.utils.crypto import AESCipher
 
 
-def load_macaroon(macaroon: str) -> str:
-    """Returns hex version of a macaroon encoded in base64 or the file path.
+def load_macaroon(
+    macaroon: Optional[str] = None,
+    encrypted_macaroon: Optional[str] = None,
+) -> str:
+    """Returns hex version of a macaroon encoded in base64 or the file path."""
 
-    :param macaroon: Macaroon encoded in base64 or file path.
-    :type macaroon: str
-    :return: Hex version of macaroon.
-    :rtype: str
-    """
+    if macaroon is None and encrypted_macaroon is None:
+        raise ValueError("Either macaroon or encrypted_macaroon must be provided.")
+
+    if encrypted_macaroon:
+        # if the macaroon is encrypted, decrypt it and return the hex version
+        key = getpass("Enter the macaroon decryption key: ")
+        aes = AESCipher(key.encode())
+        return aes.decrypt(encrypted_macaroon)
+
+    assert macaroon, "macaroon must be set here"
 
     # if the macaroon is a file path, load it and return hex version
     if macaroon.split(".")[-1] == "macaroon":
         with open(macaroon, "rb") as f:
             macaroon_bytes = f.read()
             return macaroon_bytes.hex()
-    else:
-        # if macaroon is a provided string
-        # check if it is hex, if so, return
-        try:
-            bytes.fromhex(macaroon)
-            return macaroon
-        except ValueError:
-            pass
-        # convert the bas64 macaroon to hex
-        try:
-            macaroon = base64.b64decode(macaroon).hex()
-        except Exception:
-            pass
+
+    # if macaroon is a provided string check if it is hex, if so, return
+    try:
+        bytes.fromhex(macaroon)
+        return macaroon
+    except ValueError:
+        pass
+
+    # convert the base64 macaroon to hex
+    try:
+        macaroon = base64.b64decode(macaroon).hex()
+        return macaroon
+    except Exception:
+        pass
+
     return macaroon
-
-
-# todo: move to its own (crypto.py) file
-# if this file is executed directly, ask for a macaroon and encrypt it
-if __name__ == "__main__":
-    macaroon = input("Enter macaroon: ")
-    macaroon = load_macaroon(macaroon)
-    macaroon = AESCipher(description="encryption").encrypt(macaroon.encode())
-    logger.info("Encrypted macaroon:")
-    logger.info(macaroon)

lnbits/wallets/nwc.py

@@ -132,7 +132,7 @@ class NWCWallet(Wallet):
         memo: Optional[str] = None,
         description_hash: Optional[bytes] = None,
         unhashed_description: Optional[bytes] = None,
-        **kwargs,
+        **_,
     ) -> InvoiceResponse:
         desc = ""
         desc_hash = None
@@ -148,10 +148,8 @@ class NWCWallet(Wallet):
             info = await self.conn.get_info()
             if "make_invoice" not in info["supported_methods"]:
                 return InvoiceResponse(
-                    False,
-                    None,
-                    None,
-                    "make_invoice is not supported by this NWC service.",
+                    ok=False,
+                    error_message="make_invoice is not supported by this NWC service.",
                 )
             resp = await self.conn.call(
                 "make_invoice",
@@ -175,7 +173,9 @@ class NWCWallet(Wallet):
                         "expired": False,
                     }
                 )
-            return InvoiceResponse(True, checking_id, payment_request, None)
+            return InvoiceResponse(
+                ok=True, checking_id=checking_id, payment_request=payment_request
+            )
         except Exception as e:
             return InvoiceResponse(ok=False, error_message=str(e))
 
@@ -203,7 +203,9 @@ class NWCWallet(Wallet):
 
             if "lookup_invoice" not in info["supported_methods"]:
                 # if not supported, we assume it succeeded
-                return PaymentResponse(True, payment_hash, None, preimage, None)
+                return PaymentResponse(
+                    ok=True, checking_id=payment_hash, preimage=preimage, fee_msat=0
+                )
 
             try:
                 payment_data = await self.conn.call(
@@ -213,15 +215,20 @@ class NWCWallet(Wallet):
                     "preimage", None
                 )
                 if not settled:
-                    return PaymentResponse(None, payment_hash, None, None, None)
+                    return PaymentResponse(checking_id=payment_hash)
                 else:
                     fee_msat = payment_data.get("fees_paid", None)
-                    return PaymentResponse(True, payment_hash, fee_msat, preimage, None)
+                    return PaymentResponse(
+                        ok=True,
+                        checking_id=payment_hash,
+                        fee_msat=fee_msat,
+                        preimage=preimage,
+                    )
             except Exception:
                 # Workaround: some nwc service providers might not store the invoice
                 # right away, so this call may raise an exception.
                 # We will assume the payment is pending anyway
-                return PaymentResponse(None, payment_hash, None, None, None)
+                return PaymentResponse(checking_id=payment_hash)
         except NWCError as e:
             logger.error("Error paying invoice: " + str(e))
             failure_codes = [
@@ -237,13 +244,14 @@ class NWCWallet(Wallet):
             ]
             failed = e.code in failure_codes
             return PaymentResponse(
-                None if not failed else False,
+                ok=None if not failed else False,
                 error_message=e.message if failed else None,
             )
         except Exception as e:
-            logger.error("Error paying invoice: " + str(e))
+            msg = "Error paying invoice: " + str(e)
+            logger.error(msg)
             # assume pending
-            return PaymentResponse(None)
+            return PaymentResponse(error_message=msg)
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         return await self.get_payment_status(checking_id)
@@ -300,6 +308,7 @@ class NWCConnection:
         self.account_private_key = secp256k1.PrivateKey(bytes.fromhex(secret))
         self.account_private_key_hex = secret
         self.account_public_key = self.account_private_key.pubkey
+        assert self.account_public_key
         self.account_public_key_hex = self.account_public_key.serialize().hex()[2:]
 
         # Extract service key (used for encryption to identify the nwc service provider)

lnbits/wallets/opennode.py

@@ -72,7 +72,7 @@ class OpenNodeWallet(Wallet):
         memo: Optional[str] = None,
         description_hash: Optional[bytes] = None,
         unhashed_description: Optional[bytes] = None,
-        **kwargs,
+        **_,
     ) -> InvoiceResponse:
         if description_hash or unhashed_description:
             raise UnsupportedError("description_hash")
@@ -88,13 +88,15 @@ class OpenNodeWallet(Wallet):
 
         if r.is_error:
             error_message = r.json()["message"]
-            return InvoiceResponse(False, None, None, error_message)
+            return InvoiceResponse(ok=False, error_message=error_message)
 
         data = r.json()["data"]
         checking_id = data["id"]
         payment_request = data["lightning_invoice"]["payreq"]
         self.pending_invoices.append(checking_id)
-        return InvoiceResponse(True, checking_id, payment_request, None)
+        return InvoiceResponse(
+            ok=True, checking_id=checking_id, payment_request=payment_request
+        )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
         r = await self.client.post(
@@ -105,16 +107,15 @@ class OpenNodeWallet(Wallet):
 
         if r.is_error:
             error_message = r.json()["message"]
-            return PaymentResponse(False, None, None, None, error_message)
+            return PaymentResponse(ok=False, error_message=error_message)
 
         data = r.json()["data"]
         checking_id = data["id"]
         fee_msat = -data["fee"] * 1000
-
+        # pending
         if data["status"] != "paid":
-            return PaymentResponse(None, checking_id, fee_msat, None, "payment failed")
-
-        return PaymentResponse(True, checking_id, fee_msat, None, None)
+            return PaymentResponse(ok=None, checking_id=checking_id, fee_msat=fee_msat)
+        return PaymentResponse(ok=True, checking_id=checking_id, fee_msat=fee_msat)
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         r = await self.client.get(f"/v1/charge/{checking_id}")

lnbits/wallets/phoenixd.py

@@ -133,25 +133,31 @@ class PhoenixdWallet(Wallet):
             if r.is_error or "paymentHash" not in data:
                 error_message = data["message"]
                 return InvoiceResponse(
-                    False, None, None, f"Server error: '{error_message}'"
+                    ok=False, error_message=f"Server error: '{error_message}'"
                 )
 
             checking_id = data["paymentHash"]
             payment_request = data["serialized"]
-            return InvoiceResponse(True, checking_id, payment_request, None)
+            preimage = data.get("paymentPreimage", None)  # if available
+            return InvoiceResponse(
+                ok=True,
+                checking_id=checking_id,
+                payment_request=payment_request,
+                preimage=preimage,
+            )
         except json.JSONDecodeError:
             return InvoiceResponse(
-                False, None, None, "Server error: 'invalid json response'"
+                ok=False, error_message="Server error: 'invalid json response'"
             )
         except KeyError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, "Server error: 'missing required fields'"
+                ok=False, error_message="Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                False, None, None, f"Unable to connect to {self.endpoint}."
+                ok=False, error_message=f"Unable to connect to {self.endpoint}."
             )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -168,31 +174,35 @@ class PhoenixdWallet(Wallet):
             data = r.json()
 
             if "routingFeeSat" not in data and "reason" in data:
-                return PaymentResponse(None, None, None, None, data["reason"])
+                return PaymentResponse(error_message=data["reason"])
 
             if r.is_error or "paymentHash" not in data:
                 error_message = data["message"] if "message" in data else r.text
-                return PaymentResponse(None, None, None, None, error_message)
+                return PaymentResponse(error_message=error_message)
 
             checking_id = data["paymentHash"]
             fee_msat = -int(data["routingFeeSat"]) * 1000
             preimage = data["paymentPreimage"]
-
-            return PaymentResponse(True, checking_id, fee_msat, preimage, None)
+            return PaymentResponse(
+                ok=True,
+                checking_id=checking_id,
+                fee_msat=fee_msat,
+                preimage=preimage,
+            )
 
         except json.JSONDecodeError:
             return PaymentResponse(
-                None, None, None, None, "Server error: 'invalid json response'"
+                error_message="Server error: 'invalid json response'"
             )
         except KeyError:
             return PaymentResponse(
-                None, None, None, None, "Server error: 'missing required fields'"
+                error_message="Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
             return PaymentResponse(
-                None, None, None, None, f"Unable to connect to {self.endpoint}."
+                error_message=f"Unable to connect to {self.endpoint}."
             )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:

lnbits/wallets/spark.py

@@ -115,8 +115,6 @@ class SparkWallet(Wallet):
         **kwargs,
     ) -> InvoiceResponse:
         label = f"lbs{random.random()}"
-        checking_id = label
-
         try:
             if description_hash:
                 r = await self.invoicewithdescriptionhash(
@@ -138,11 +136,14 @@ class SparkWallet(Wallet):
                     exposeprivatechannels=True,
                     expiry=kwargs.get("expiry"),
                 )
-            ok, payment_request, error_message = True, r["bolt11"], ""
+            return InvoiceResponse(
+                ok=True,
+                payment_request=r["bolt11"],
+                checking_id=label,
+                preimage=r.get("preimage"),
+            )
         except (SparkError, UnknownError) as e:
-            ok, payment_request, error_message = False, None, str(e)
-
-        return InvoiceResponse(ok, checking_id, payment_request, error_message)
+            return InvoiceResponse(ok=False, error_message=str(e))
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
         try:
@@ -152,17 +153,22 @@ class SparkWallet(Wallet):
             )
             fee_msat = -int(r["msatoshi_sent"] - r["msatoshi"])
             preimage = r["payment_preimage"]
-            return PaymentResponse(True, r["payment_hash"], fee_msat, preimage, None)
+            return PaymentResponse(
+                ok=True,
+                checking_id=r["payment_hash"],
+                fee_msat=fee_msat,
+                preimage=preimage,
+            )
 
         except (SparkError, UnknownError) as exc:
             listpays = await self.listpays(bolt11)
             if not listpays:
-                return PaymentResponse(False, None, None, None, str(exc))
+                return PaymentResponse(ok=False, error_message=str(exc))
 
             pays = listpays["pays"]
 
             if len(pays) == 0:
-                return PaymentResponse(False, None, None, None, str(exc))
+                return PaymentResponse(ok=False, error_message=str(exc))
 
             pay = pays[0]
             payment_hash = pay["payment_hash"]
@@ -174,10 +180,10 @@ class SparkWallet(Wallet):
                 ) from exc
 
             if pay["status"] == "failed":
-                return PaymentResponse(False, None, None, None, str(exc))
+                return PaymentResponse(ok=False, error_message=str(exc))
 
             if pay["status"] == "pending":
-                return PaymentResponse(None, payment_hash, None, None, None)
+                return PaymentResponse(ok=None, checking_id=payment_hash)
 
             if pay["status"] == "complete":
                 r = pay
@@ -190,10 +196,13 @@ class SparkWallet(Wallet):
                 fee_msat = -int(r["msatoshi_sent"] - r["msatoshi"])
                 preimage = r["payment_preimage"]
                 return PaymentResponse(
-                    True, r["payment_hash"], fee_msat, preimage, None
+                    ok=True,
+                    checking_id=r["payment_hash"],
+                    fee_msat=fee_msat,
+                    preimage=preimage,
                 )
             else:
-                return PaymentResponse(False, None, None, None, str(exc))
+                return PaymentResponse(ok=False, error_message=str(exc))
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         try:

lnbits/wallets/strike.py

@@ -0,0 +1,546 @@
+import asyncio
+import time
+from decimal import Decimal
+from typing import Any, AsyncGenerator, Dict, Optional
+
+import httpx
+from loguru import logger
+
+from lnbits.settings import settings
+
+from .base import (
+    InvoiceResponse,
+    PaymentFailedStatus,
+    PaymentPendingStatus,
+    PaymentResponse,
+    PaymentStatus,
+    PaymentSuccessStatus,
+    StatusResponse,
+    Wallet,
+)
+
+
+class TokenBucket:
+    """
+    Token bucket rate limiter for Strike API endpoints.
+    """
+
+    def __init__(self, rate: int, period_seconds: int):
+        """
+        Initialize a token bucket.
+
+        Args:
+            rate: Max requests allowed in the period
+            period_seconds: Time period in seconds.
+        """
+        self.rate = rate
+        self.period = period_seconds
+        self.tokens = rate
+        self.last_refill = time.monotonic()
+        self.lock = asyncio.Lock()
+
+    async def consume(self) -> None:
+        """Wait until a token is available and consume it."""
+        async with self.lock:
+            # Refill tokens based on elapsed time
+            now = time.monotonic()
+            elapsed = now - self.last_refill
+
+            if elapsed > 0:
+                new_tokens = int((elapsed / self.period) * self.rate)
+                self.tokens = min(self.rate, self.tokens + new_tokens)
+                self.last_refill = now
+
+            # If no tokens available, calculate wait time and wait for a token
+            if self.tokens < 1:
+                # Calculate time needed for one token
+                wait_time = (self.period / self.rate) * (1 - self.tokens)
+                await asyncio.sleep(wait_time)
+
+                # After waiting, update time and add one token
+                self.last_refill = time.monotonic()
+                self.tokens = 1
+
+            # Consume a token (will be 0 or more after consumption)
+            self.tokens -= 1
+
+
+class StrikeWallet(Wallet):
+    """
+    https://developer.strike.me/api
+    A minimal LNbits wallet backend for Strike.
+    """
+
+    # --------------------------------------------------------------------- #
+    # construction / teardown                                               #
+    # --------------------------------------------------------------------- #
+
+    def __init__(self):
+        if not settings.strike_api_endpoint:
+            raise ValueError("Missing strike_api_endpoint")
+        if not settings.strike_api_key:
+            raise ValueError("Missing strike_api_key")
+
+        super().__init__()
+
+        # throttle
+        self._sem = asyncio.Semaphore(value=20)
+
+        # Rate limiters for different API endpoints
+        # Invoice/payment operations: 250 requests / 1 minute
+        self._invoice_limiter = TokenBucket(250, 60)
+        self._payment_limiter = TokenBucket(250, 60)
+        # All other operations: 1,000 requests / 10 minutes
+        self._general_limiter = TokenBucket(1000, 600)
+
+        self.client = httpx.AsyncClient(
+            base_url=self.normalize_endpoint(settings.strike_api_endpoint),
+            headers={
+                "Authorization": f"Bearer {settings.strike_api_key}",
+                "Content-Type": "application/json",
+                "Accept": "application/json",
+                "User-Agent": settings.user_agent,
+            },
+            timeout=httpx.Timeout(connect=5.0, read=40.0, write=10.0, pool=None),
+            transport=httpx.AsyncHTTPTransport(
+                limits=httpx.Limits(max_connections=20, max_keepalive_connections=10),
+                retries=0,  # we handle retries ourselves
+            ),
+        )
+
+        # runtime state
+        self.pending_invoices: list[str] = []  # Keep it as a list
+        self.pending_payments: Dict[str, str] = {}
+        self.failed_payments: Dict[str, str] = {}
+
+        # balance cache
+        self._cached_balance: Optional[int] = None
+        self._cached_balance_ts: float = 0.0
+        self._cache_ttl = 30  # seconds
+
+    async def cleanup(self):
+        try:
+            await self.client.aclose()
+        except Exception:
+            logger.warning("Error closing Strike client")
+
+    # --------------------------------------------------------------------- #
+    # low-level request helpers                                             #
+    # --------------------------------------------------------------------- #
+
+    async def _req(self, method: str, path: str, /, **kw) -> httpx.Response:
+        """Make a Strike HTTP call with:
+        One Strike HTTP call with
+            • rate limiting based on endpoint type
+            • concurrency throttle
+            • exponential back-off + jitter
+            • explicit retry on 429/5xx
+            • latency logging
+        """
+        # Apply the appropriate rate limiter based on the endpoint path.
+        if path.startswith("/invoices") or path.startswith("/receive-requests"):
+            await self._invoice_limiter.consume()
+        elif path.startswith("/payment-quotes"):
+            await self._payment_limiter.consume()
+        else:
+            await self._general_limiter.consume()
+
+        async with self._sem:
+            return await self.client.request(method, path, **kw)
+
+    # Typed wrappers - so call-sites stay tidy.
+    async def _get(self, path: str, **kw) -> httpx.Response:  # GET request.
+        return await self._req("GET", path, **kw)
+
+    async def _post(self, path: str, **kw) -> httpx.Response:
+        return await self._req("POST", path, **kw)
+
+    async def _patch(self, path: str, **kw) -> httpx.Response:
+        return await self._req("PATCH", path, **kw)
+
+    # --------------------------------------------------------------------- #
+    # LNbits wallet API implementation                                      #
+    # --------------------------------------------------------------------- #
+
+    async def status(self) -> StatusResponse:
+        """
+        Return wallet balance (millisatoshis) with a 30-second cache.
+        """
+        now = time.time()
+        if (
+            self._cached_balance is not None
+            and now - self._cached_balance_ts < self._cache_ttl
+        ):
+            return StatusResponse(None, self._cached_balance)
+
+        try:
+            r = await self._get("/balances")
+            r.raise_for_status()
+            data = r.json()
+            balances = data.get("data", []) if isinstance(data, dict) else data
+            btc = next((b for b in balances if b.get("currency") == "BTC"), None)
+            if btc and "available" in btc:
+                available_btc = Decimal(btc["available"])  # Get available BTC amount.
+                msats = int(
+                    available_btc * Decimal(1e11)
+                )  # Convert BTC to millisatoshis.
+                self._cached_balance = msats
+                self._cached_balance_ts = now
+                return StatusResponse(None, msats)
+
+            return StatusResponse(None, 0)
+
+        except Exception as e:
+            logger.warning(e)
+            return StatusResponse("Connection error", 0)
+
+    async def create_invoice(
+        self,
+        amount: int,
+        memo: Optional[str] = None,
+        description_hash: Optional[bytes] = None,
+        unhashed_description: bytes | None = None,  # Add this parameter
+        **kwargs,
+    ) -> InvoiceResponse:
+        try:
+            btc_amt = (Decimal(amount) / Decimal(1e8)).quantize(
+                Decimal("0.00000001")
+            )  # Convert amount from millisatoshis to BTC.
+            payload: Dict[str, Any] = {
+                "bolt11": {
+                    "amount": {
+                        "currency": "BTC",
+                        "amount": str(btc_amt),
+                    },
+                    "description": memo or "",
+                },
+                "targetCurrency": "BTC",
+            }
+            if description_hash:
+                payload["bolt11"]["descriptionHash"] = description_hash.hex()
+
+            r = await self._post(
+                "/receive-requests",
+                json=payload,
+            )
+            r.raise_for_status()
+            resp = r.json()
+            invoice_id = resp.get("receiveRequestId")
+            bolt11 = resp.get("bolt11", {}).get("invoice")
+            if not invoice_id or not bolt11:
+                return InvoiceResponse(
+                    ok=False, error_message="Invalid invoice response"
+                )
+
+            self.pending_invoices.append(invoice_id)
+            return InvoiceResponse(
+                ok=True, checking_id=invoice_id, payment_request=bolt11
+            )
+        except httpx.HTTPStatusError as e:
+            logger.warning(e)
+            msg = e.response.json().get("message", e.response.text)
+            return InvoiceResponse(ok=False, error_message=f"Strike API error: {msg}")
+        except Exception as e:
+            logger.warning(e)
+            return InvoiceResponse(ok=False, error_message="Connection error")
+
+    async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
+        try:
+            # 1) Create a payment quote.
+            q = await self._post(
+                "/payment-quotes/lightning",
+                json={"lnInvoice": bolt11},
+            )
+            q.raise_for_status()
+            quote_id = q.json().get("paymentQuoteId")
+            if not quote_id:
+                return PaymentResponse(
+                    ok=False, error_message="Strike: missing payment quote Id"
+                )
+
+            # 2) Execute the payment quote.
+            e = await self._patch(f"/payment-quotes/{quote_id}/execute")
+            e.raise_for_status()
+
+            data = e.json() if e.content else {}
+            payment_id = data.get("paymentId")
+            state = data.get("state", "").upper()
+
+            # Network fee → msat.
+            fee_obj = data.get("lightningNetworkFee") or data.get("totalFee") or {}
+            fee_btc = Decimal(fee_obj.get("amount", "0"))
+            fee_msat = int(fee_btc * Decimal(1e11))  # millisatoshis.
+
+            if state in {"SUCCEEDED", "COMPLETED"}:
+                preimage = data.get("preimage") or data.get("preImage")
+                return PaymentResponse(
+                    ok=True,
+                    checking_id=payment_id,
+                    fee_msat=fee_msat,
+                    preimage=preimage,
+                )
+
+            failed_states = {
+                "CANCELED",
+                "FAILED",
+                "TIMED_OUT",
+            }
+            if state in failed_states:
+                return PaymentResponse(
+                    ok=False, checking_id=payment_id, error_message=f"State: {state}"
+                )
+
+            # Store mapping for later polling.
+            if payment_id:
+                # todo: this will be lost on server restart
+                self.pending_payments[payment_id] = quote_id
+
+            # Treat all other states as pending (including unknown states).
+            return PaymentResponse(ok=None, checking_id=payment_id)
+
+        except Exception as e:
+            logger.warning(e)
+            # Keep pending. Not sure if the payment went trough or not.
+            return PaymentResponse(ok=None, error_message="Connection error")
+
+    async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+        try:
+            r = await self._get(f"/receive-requests/{checking_id}/receives")
+
+            if r.status_code == 200:
+                data = r.json()
+                items = data.get("items", [])
+
+                if not items:
+                    # Still pending.
+                    return PaymentPendingStatus()
+
+                for item in items:
+                    if item.get("state") == "COMPLETED":
+                        preimage = None
+                        lightning_data = item.get("lightning")
+                        if lightning_data:
+                            preimage = lightning_data.get(
+                                "preimage"
+                            ) or lightning_data.get("preImage")
+
+                        return PaymentSuccessStatus(fee_msat=0, preimage=preimage)
+
+                return PaymentPendingStatus()
+
+            if r.status_code == 404:
+                logger.warning(f"Payment '{checking_id}' not found. Marking as failed.")
+                return PaymentFailedStatus(False)
+
+            r.raise_for_status()
+            return PaymentPendingStatus()
+
+        except httpx.HTTPStatusError as e:
+            logger.warning(
+                f"HTTPStatusError in get_invoice_status for checking_id {checking_id} "
+                f"on URL {e.request.url}: {e.response.status_code} - {e.response.text}"
+            )
+            # Default to Pending to allow retries by paid_invoices_stream.
+            return PaymentPendingStatus()
+        except Exception as e:
+            logger.warning(e)
+            return PaymentPendingStatus()
+
+    async def get_payment_status(self, checking_id: str) -> PaymentStatus:
+        quote_id = self.pending_payments.get(checking_id)
+
+        try:
+            # Attempt 1: Use quote_id if available (from in-memory store)
+            if quote_id:
+                status = await self._get_payment_status_by_quote_id(
+                    checking_id, quote_id
+                )
+                if status:
+                    return status
+        except Exception as e:
+            logger.warning(e)
+            logger.debug(f"Error while fetching payment by quote id {checking_id}.")
+
+        try:
+            # Attempt 2: Fallback - Use paymentId (checking_id) directly.
+            return await self._get_payment_status_by_checking_id(checking_id)
+        except Exception as e:
+            logger.warning(e)
+            logger.debug(f"Error while fetching payment {checking_id}.")
+            return PaymentPendingStatus()
+
+    async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
+        """
+        Poll Strike for invoice settlement while respecting the documented API limits.
+
+        Uses dynamic adjustment of polling frequency based on activity.
+        """
+        min_poll, max_poll = 1, 15
+        # 1,000 requests / 10 minutes = ~100 requests/minute.
+        rate_limit = 100
+        sleep_s = min_poll
+        # Main loop for polling invoices.
+        self._running = True
+
+        while self._running and settings.lnbits_running:
+            loop_start = time.time()
+            had_activity = False
+
+            req_budget = max(
+                1, rate_limit * sleep_s // 60
+            )  # Calculate request budget based on sleep time.
+            processed = 0
+
+            for inv in list(self.pending_invoices):
+                if processed >= req_budget:  # If request budget is exhausted.
+                    break
+                status = await self.get_invoice_status(inv)
+                processed += 1
+
+                if status.success or status.failed:
+                    self.pending_invoices.remove(inv)
+                    if status.success:
+                        had_activity = True
+                        yield inv
+
+            # Dynamic adjustment of polling frequency based on activity.
+            sleep_s = (
+                max(min_poll, sleep_s // 2)
+                if had_activity
+                else min(max_poll, sleep_s * 2)
+            )
+
+            # Sleep to respect rate limits.
+            elapsed = time.time() - loop_start
+            # Ensure we respect the rate limit, even with dynamic adjustment.
+            min_sleep_for_rate = processed * 60 / rate_limit - elapsed
+            await asyncio.sleep(max(sleep_s, min_sleep_for_rate, 0))
+
+    # ------------------------------------------------------------------ #
+    # misc Strike helpers                                                #
+    # ------------------------------------------------------------------ #
+
+    async def get_invoices(
+        self,
+        filters: Optional[str] = None,
+        orderby: Optional[str] = None,
+        skip: Optional[int] = None,
+        top: Optional[int] = None,
+    ) -> Dict[str, Any]:
+        try:
+            params: Dict[str, Any] = {}
+            if filters:
+                params["$filter"] = filters
+            if orderby:
+                params["$orderby"] = orderby
+            if skip is not None:
+                params["$skip"] = skip
+            if top is not None:
+                params["$top"] = top
+            r = await self._get(
+                "/invoices", params=params
+            )  # Get invoices from Strike API.
+            r.raise_for_status()
+            return r.json()
+        except Exception:
+            logger.warning("Error in get_invoices()")
+            return {"error": "unable to fetch invoices"}
+
+    async def _get_payment_status_by_quote_id(
+        self, checking_id: str, quote_id: str
+    ) -> Optional[PaymentStatus]:
+        resp = await self._get(f"/payment-quotes/{quote_id}")
+        resp.raise_for_status()
+
+        data = resp.json()
+        state = data.get("state", "").upper()
+        preimage = data.get("preimage") or data.get("preImage")
+
+        fee_msat = 0
+        fee_obj = data.get("lightningNetworkFee") or data.get("totalFee")
+        if fee_obj and fee_obj.get("amount") and fee_obj.get("currency"):
+            amount_str = fee_obj.get("amount")
+            currency_str = fee_obj.get("currency").upper()
+            try:
+                if currency_str == "BTC":
+                    fee_btc_decimal = Decimal(amount_str)
+                    fee_msat = int(fee_btc_decimal * Decimal(1e11))
+                elif currency_str == "SAT":
+                    fee_sat_decimal = Decimal(amount_str)
+                    fee_msat = int(fee_sat_decimal * 1000)
+            except Exception as e:
+                logger.warning(e)
+                logger.warning(
+                    f"Fee parse error. Quote: '{quote_id}'. "
+                    f"Payment '{checking_id}'."
+                )
+                fee_msat = 0
+
+        if state in {"SUCCEEDED", "COMPLETED"}:
+            self.pending_payments.pop(checking_id, None)
+            return PaymentSuccessStatus(fee_msat=fee_msat, preimage=preimage)
+        if state == "FAILED":
+            self.pending_payments.pop(checking_id, None)
+            return PaymentFailedStatus()
+
+        return None
+
+    async def _get_payment_status_by_checking_id(
+        self, checking_id: str
+    ) -> PaymentStatus:
+        r_payment = await self._get(f"/payments/{checking_id}")
+
+        if r_payment.status_code == 200:
+            data = r_payment.json()
+            state = data.get("state", "").upper()
+            preimage = None
+            fee_msat = 0
+
+            if state in {"SUCCEEDED", "COMPLETED"}:
+                self.pending_payments.pop(checking_id, None)
+                return PaymentSuccessStatus(fee_msat=fee_msat, preimage=preimage)
+            if state == "FAILED":
+                self.pending_payments.pop(checking_id, None)
+                return PaymentFailedStatus()
+
+            return PaymentPendingStatus()
+
+        if r_payment.status_code == 400:
+            try:
+                error_data = r_payment.json()
+                # Check for Strike's specific validation
+                # error structure for paymentId format
+                if error_data.get("data", {}).get("code") == "INVALID_DATA":
+                    validation_errors = error_data.get("data", {}).get(
+                        "validationErrors", {}
+                    )
+                    if "paymentId" in validation_errors:
+                        for err_detail in validation_errors["paymentId"]:
+                            is_invalid = err_detail.get(
+                                "code"
+                            ) == "INVALID_DATA" and "is not valid." in err_detail.get(
+                                "message", ""
+                            )
+                            if not is_invalid:
+                                continue
+                            logger.error(
+                                f"Payment '{checking_id}' not a valid Strike payment. "
+                                f"Marked as failed. Response: {r_payment.text}"
+                            )
+                            self.pending_payments.pop(checking_id, None)
+                            return PaymentFailedStatus()
+            except Exception as e:
+                logger.warning(e)
+
+            return PaymentPendingStatus()
+
+        if r_payment.status_code == 404:
+            logger.warning(f"Payment {checking_id} not found. Marking as failed.")
+            self.pending_payments.pop(checking_id, None)
+            return PaymentFailedStatus()
+
+        logger.debug(
+            f"Error fetching payment {checking_id} directly: "
+            f"{r_payment.status_code} - {r_payment.text}"
+        )
+        return PaymentPendingStatus()

lnbits/wallets/zbd.py

@@ -3,9 +3,9 @@ import hashlib
 from typing import AsyncGenerator, Dict, Optional
 
 import httpx
+from bolt11 import decode as bolt11_decode
 from loguru import logger
 
-from lnbits import bolt11
 from lnbits.settings import settings
 
 from .base import (
@@ -61,7 +61,7 @@ class ZBDWallet(Wallet):
         memo: Optional[str] = None,
         description_hash: Optional[bytes] = None,
         unhashed_description: Optional[bytes] = None,
-        **kwargs,
+        **_,
     ) -> InvoiceResponse:
         # https://api.zebedee.io/v0/charges
 
@@ -89,21 +89,25 @@ class ZBDWallet(Wallet):
 
         if r.is_error:
             error_message = r.json()["message"]
-            return InvoiceResponse(False, None, None, error_message)
+            return InvoiceResponse(ok=False, error_message=error_message)
 
         data = r.json()["data"]
         checking_id = data["id"]  # this is a zbd id
         payment_request = data["invoice"]["request"]
-        return InvoiceResponse(True, checking_id, payment_request, None)
+        preimage = data["invoice"].get("preimage")
+        return InvoiceResponse(
+            ok=True,
+            checking_id=checking_id,
+            payment_request=payment_request,
+            preimage=preimage,
+        )
 
-    async def pay_invoice(
-        self, bolt11_invoice: str, fee_limit_msat: int
-    ) -> PaymentResponse:
+    async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
         # https://api.zebedee.io/v0/payments
         r = await self.client.post(
             "payments",
             json={
-                "invoice": bolt11_invoice,
+                "invoice": bolt11,
                 "description": "",
                 "amount": "",
                 "internalId": "",
@@ -114,15 +118,17 @@ class ZBDWallet(Wallet):
 
         if r.is_error:
             error_message = r.json()["message"]
-            return PaymentResponse(False, None, None, None, error_message)
+            return PaymentResponse(ok=False, error_message=error_message)
 
         data = r.json()
 
-        checking_id = bolt11.decode(bolt11_invoice).payment_hash
+        checking_id = bolt11_decode(bolt11).payment_hash
         fee_msat = -int(data["data"]["fee"])
         preimage = data["data"]["preimage"]
 
-        return PaymentResponse(True, checking_id, fee_msat, preimage, None)
+        return PaymentResponse(
+            ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
+        )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         r = await self.client.get(f"charges/{checking_id}")
@@ -137,7 +143,7 @@ class ZBDWallet(Wallet):
             "expired": False,
             "completed": True,
         }
-        return PaymentStatus(statuses[data.get("status")])
+        return PaymentStatus(paid=statuses[data.get("status")])
 
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         r = await self.client.get(f"payments/{checking_id}")
@@ -155,7 +161,7 @@ class ZBDWallet(Wallet):
             "failed": False,
         }
 
-        return PaymentStatus(statuses[data.get("status")], fee_msat=None, preimage=None)
+        return PaymentStatus(paid=statuses[data.get("status")])
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
         self.queue: asyncio.Queue = asyncio.Queue(0)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lnbits"
-version = "1.0.0"
+version = "1.2.0-rc2"
 description = "LNbits, free and open-source Lightning wallet and accounts system."
 authors = ["Alan Bits <alan@lnbits.com>"]
 readme = "README.md"
@@ -25,7 +25,7 @@ pyqrcode = "1.2.1"
 shortuuid = "1.0.13"
 sse-starlette = "1.8.2"
 typing-extensions = "4.12.2"
-uvicorn = "0.30.6"
+uvicorn = "0.34.2"
 sqlalchemy = "1.4.54"
 aiosqlite = "0.20.0"
 asyncpg = "0.30.0"
@@ -33,7 +33,7 @@ uvloop = "0.21.0"
 websockets = "11.0.3"
 loguru = "0.7.2"
 grpcio = "1.69.0"
-protobuf = "5.28.0"
+protobuf = "5.29.1"
 pyln-client = "24.11"
 pywebpush = "1.14.1"
 slowapi = "0.1.9"
@@ -41,8 +41,6 @@ websocket-client = "1.8.0"
 pycryptodomex = "3.20.0"
 packaging = "24.0"
 bolt11 = "2.1.0"
-# needed for new login methods: username-password, google-auth, github-auth
-bcrypt = "4.2.0"
 pyjwt = "2.9.0"
 passlib = "1.7.4"
 itsdangerous = "2.2.0"
@@ -56,7 +54,7 @@ environs = "9.5.0"
 # needed for scheduler extension
 python-crontab = "3.2.0"
 # needed for liquid support boltz
-wallycore = {version = "1.3.0", optional = true}
+wallycore = {version = "1.4.0", optional = true}
 # needed for breez funding source
 breez-sdk = {version = "0.6.6", optional = true}
 
@@ -64,6 +62,7 @@ jsonpath-ng = "^1.7.0"
 pynostr = "^0.6.2"
 python-multipart = "^0.0.20"
 filetype = "^1.2.0"
+nostr-sdk = "^0.42.1"
 
 [tool.poetry.extras]
 breez = ["breez-sdk"]