init

.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, StrikeWallet"
+# LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, BlinkWallet, AlbyWallet, ZBDWallet, PhoenixdWallet, OpenNodeWallet, NWCWallet, BreezSdkWallet, BoltzWallet"
 
 LNBITS_BACKEND_WALLET_CLASS=VoidWallet
 # VoidWallet is just a fallback that works without any actual Lightning capabilities,
@@ -105,10 +105,6 @@ BOLTZ_CLIENT_MACAROON="/home/bob/.boltz/macaroon" # or HEXSTRING
 BOLTZ_CLIENT_CERT="/home/bob/.boltz/tls.cert" # or HEXSTRING
 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
@@ -167,16 +163,14 @@ GITHUB_CLIENT_SECRET=""
 KEYCLOAK_CLIENT_ID=""
 KEYCLOAK_CLIENT_SECRET=""
 KEYCLOAK_DISCOVERY_URL=""
-KEYCLOAK_CLIENT_CUSTOM_ORG=""
-KEYCLOAK_CLIENT_CUSTOM_ICON=""
 
 
 ######################################
 
-# uvicorn variable, allow https behind a proxy
+# uvicorn variable, uncomment to 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

@@ -7,7 +7,7 @@ inputs:
     default: "3.10"
   poetry-version:
     description: "Poetry Version"
-    default: "1.8.5"
+    default: "1.7.0"
   node-version:
     description: "Node Version"
     default: "20.x"

.github/packaging/linux/AppDir/AppRun

@@ -36,6 +36,7 @@ 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/release-rc.yml

@@ -3,7 +3,7 @@ name: release-rc
 on:
   push:
     tags:
-      - "*-rc[0-9]+"
+      - "*-rc[0-9]"
 
 permissions:
   contents: write

Dockerfile

@@ -19,8 +19,7 @@ ENV POETRY_NO_INTERACTION=1 \
     POETRY_VIRTUALENVS_CREATE=1 \
     POETRY_CACHE_DIR=/tmp/poetry_cache
 
-ARG POETRY_INSTALL_ARGS="--only main"
-RUN poetry install ${POETRY_INSTALL_ARGS}
+RUN poetry install --only main
 
 FROM python:3.12-slim-bookworm
 
@@ -47,12 +46,11 @@ WORKDIR /app
 COPY . .
 COPY --from=builder /app/.venv .venv
 
-ARG POETRY_INSTALL_ARGS="--only main"
-RUN poetry install ${POETRY_INSTALL_ARGS}
+RUN poetry install --only main
 
 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 --forwarded-allow-ips='*'"]
+CMD ["sh", "-c", "poetry run lnbits --port $LNBITS_PORT --host $LNBITS_HOST"]

docs/guide/funding-sources-table.md

@@ -1,30 +0,0 @@
-# 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_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-latest.AppImage --host 0.0.0.0 --port 5000
 ```
 
 LNbits will create a folder for db and extension files in the folder the AppImage runs from.
@@ -29,13 +29,11 @@ It is recommended to use the latest version of Poetry. Make sure you have Python
 
 ### Install Python 3.12
 
-## Option 2 (recommended): Poetry
-
-It is recommended to use the latest version of Poetry. Make sure you have Python version 3.9 or higher installed.
-
-### Verify Python version
-
 ```sh
+sudo add-apt-repository -y ppa:deadsnakes/ppa
+sudo apt update -y
+sudo apt install -y python3.12 python3.12-dev # ensure correct headers needed for secp256k1
+sudo apt install -y pkg-config python3-dev build-essential # ensure correct headers
 python3 --version
 ```
 
@@ -78,38 +76,13 @@ poetry run lnbits-cli --help
 
 ```sh
 cd lnbits
-# 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
+# Stop LNbits with `ctrl + x`
+git pull
+# Keep your poetry install up to date, this can be done with `poetry self update`
 poetry install --only main
-poetry run lnbits
-
-# use LNbits admin UI Extensions page function "Update All" do get extensions onto proper level
+# Start LNbits with `poetry run lnbits`
 ```
 
-## Option 2: Install script (on Debian/Ubuntu)
-
-```sh
-wget https://raw.githubusercontent.com/lnbits/lnbits/main/lnbits.sh &&
-chmod +x lnbits.sh &&
-./lnbits.sh
-```
-
-Now visit `0.0.0.0:5000` to make a super-user account.
-
-`./lnbits.sh` can be used to run, but for more control `cd lnbits` and use `poetry run lnbits` (see previous option).
-
 ## Option 3: Nix
 
 ```sh
@@ -150,7 +123,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
@@ -159,7 +132,7 @@ mkdir data
 docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits/lnbits
 ```
 
-Build the image yourself.
+build the image yourself
 
 ```sh
 git clone https://github.com/lnbits/lnbits.git
@@ -170,12 +143,6 @@ 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.
@@ -583,12 +550,3 @@ 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,8 +10,6 @@ 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**
@@ -53,7 +51,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 lnbits-cli encrypt macaroon`.
+To encrypt your macaroon, run `poetry run python lnbits/wallets/macaroon/macaroon.py`.
 
 ### LNbits
 

lnbits.sh

@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# Check install has not already run
-if [ ! -d lnbits/data ]; then
-
-  # Update package list and install prerequisites non-interactively
-  sudo apt update -y
-  sudo apt install -y software-properties-common
-  
-  # Add the deadsnakes PPA repository non-interactively
-  sudo add-apt-repository -y ppa:deadsnakes/ppa
-  
-  # Install Python 3.9 and distutils non-interactively
-  sudo apt install -y python3.9 python3.9-distutils
-
-  # Install Poetry
-  curl -sSL https://install.python-poetry.org | python3.9 -
-
-  # Add Poetry to PATH for the current session
-  export PATH="/home/$USER/.local/bin:$PATH"
-
-  if [ ! -d lnbits/wallets ]; then
-    # Clone the LNbits repository
-    git clone https://github.com/lnbits/lnbits.git
-    if [ $? -ne 0 ]; then
-      echo "Failed to clone the repository ... FAIL"
-      exit 1
-    fi
-    # Ensure we are in the lnbits directory
-    cd lnbits || { echo "Failed to cd into lnbits ... FAIL"; exit 1; }
-  fi
-
-  git checkout main
-  # Make data folder
-  mkdir data
-
-  # Copy the .env.example to .env
-  cp .env.example .env
-
-elif [ ! -d lnbits/wallets ]; then
-  # cd into lnbits
-  cd lnbits || { echo "Failed to cd into lnbits ... FAIL"; exit 1; }
-fi
-
-# Install the dependencies using Poetry
-poetry env use python3.9
-poetry install --only main
-
-# Set environment variables for LNbits
-export LNBITS_ADMIN_UI=true
-export HOST=0.0.0.0
-
-# Run LNbits
-poetry run lnbits

lnbits/app.py

@@ -163,13 +163,9 @@ def create_app() -> FastAPI:
     core_app_extra.register_new_ratelimiter = register_new_ratelimiter(app)
 
     # register static files
-    app.mount("/static", StaticFiles(directory=Path("lnbits", "static")), name="static")
-    Path(settings.lnbits_data_folder, "images").mkdir(parents=True, exist_ok=True)
-    app.mount(
-        "/library",
-        StaticFiles(directory=Path(settings.lnbits_data_folder, "images")),
-        name="library",
-    )
+    static_path = Path("lnbits", "static")
+    static = StaticFiles(directory=static_path)
+    app.mount("/static", static, name="static")
 
     g().base_url = f"http://{settings.host}:{settings.port}"
 

lnbits/commands.py

@@ -3,10 +3,8 @@ 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
 
 import click
 import httpx
@@ -29,21 +27,19 @@ from lnbits.core.crud import (
     update_payment,
 )
 from lnbits.core.helpers import is_valid_url, migrate_databases
-from lnbits.core.models import Account, Payment, PaymentState
+from lnbits.core.models import Payment, PaymentState
 from lnbits.core.models.extensions import (
     CreateExtension,
     ExtensionRelease,
     InstallableExtension,
 )
-from lnbits.core.services import check_admin_settings, create_user_account_no_ckeck
+from lnbits.core.services import check_admin_settings
 from lnbits.core.views.extension_api import (
     api_install_extension,
     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):
@@ -68,13 +64,6 @@ def db():
     """
 
 
-@lnbits_cli.group()
-def users():
-    """
-    Users related commands
-    """
-
-
 @lnbits_cli.group()
 def extensions():
     """
@@ -82,20 +71,6 @@ 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")
@@ -134,7 +109,7 @@ async def delete_settings():
     """Deletes the settings"""
 
     async with core_db.connect() as conn:
-        await conn.execute("DELETE from system_settings")
+        await conn.execute("DELETE from settings")
 
 
 @db.command("migrate")
@@ -205,6 +180,17 @@ async def database_revert_payment(checking_id: str):
         click.echo(f"Payment '{checking_id}' marked as pending.")
 
 
+@db.command("cleanup-accounts")
+@click.argument("days", type=int, required=False)
+@coro
+async def database_cleanup_accounts(days: Optional[int] = None):
+    """Delete all accounts that have no wallets"""
+    async with core_db.connect() as conn:
+        delta = days or settings.cleanup_wallets_days
+        delta = delta * 24 * 60 * 60
+        await delete_accounts_no_wallets(delta, conn)
+
+
 @db.command("check-payments")
 @click.option("-d", "--days", help="Maximum age of payments in days.")
 @click.option("-l", "--limit", help="Maximum number of payments to be checked.")
@@ -285,32 +271,6 @@ async def check_invalid_payments(
         click.echo(" ".join([w, str(data[0]), str(data[1] / 1000).ljust(10)]))
 
 
-@users.command("new")
-@click.option("-u", "--username", required=True, help="Username.")
-@click.option("-p", "--password", required=True, help="Password.")
-@coro
-async def create_user(username: str, password: str):
-    """Create a new user bypassing the system 'new_accounts_allowed' rules"""
-    account = Account(
-        id=uuid4().hex,
-        username=username,
-    )
-    account.hash_password(password)
-    user = await create_user_account_no_ckeck(account)
-    click.echo(f"User '{user.username}' created. Id: '{user.id}'")
-
-
-@users.command("cleanup-accounts")
-@click.argument("days", type=int, required=False)
-@coro
-async def database_cleanup_accounts(days: Optional[int] = None):
-    """Delete all accounts that have no wallets"""
-    async with core_db.connect() as conn:
-        delta = days or settings.cleanup_wallets_days
-        delta = delta * 24 * 60 * 60
-        await delete_accounts_no_wallets(delta, conn)
-
-
 @extensions.command("list")
 @coro
 async def extensions_list():
@@ -496,62 +456,6 @@ 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,7 +43,6 @@ from .settings import (
     delete_admin_settings,
     get_admin_settings,
     get_super_settings,
-    reset_core_settings,
     update_admin_settings,
     update_super_user,
 )
@@ -130,7 +129,6 @@ __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 typing import Optional, Tuple
 
-from lnbits.core.crud.wallets import get_total_balance, get_wallet, get_wallets_ids
+from lnbits.core.crud.wallets import get_total_balance, get_wallet
 from lnbits.core.db import db
 from lnbits.core.models import PaymentState
 from lnbits.db import Connection, DateTrunc, Filters, Page
@@ -95,7 +95,6 @@ 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,
@@ -111,7 +110,8 @@ async def get_payments_paginated(
       - complete | pending | failed | outgoing | incoming.
     """
 
-    values: dict[str, Any] = {
+    values: dict = {
+        "wallet_id": wallet_id,
         "time": since,
     }
     clause: list[str] = []
@@ -120,11 +120,7 @@ async def get_payments_paginated(
         clause.append(f"time > {db.timestamp_placeholder('time')}")
 
     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(
@@ -362,19 +358,12 @@ 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()
-    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)
+    clause = filters.where()
     data = await (conn or db).fetchall(
         query=f"""
             SELECT {field} as field, count(*) as total
@@ -392,26 +381,18 @@ 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_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)
-
+    in_clause = filters.where(
+        ["(apipayments.status = 'success' AND apipayments.amount > 0)"]
+    )
+    out_clause = filters.where(
+        ["(apipayments.status IN ('success', 'pending') AND apipayments.amount < 0)"]
+    )
     date_trunc = db.datetime_grouping("day")
     query = """
         SELECT {date_trunc} date,
@@ -442,7 +423,6 @@ 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]:
 
@@ -461,10 +441,6 @@ 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(
@@ -532,7 +508,7 @@ async def is_internal_status_success(
     return payment.status == PaymentState.SUCCESS.value
 
 
-async def mark_webhook_sent(payment_hash: str, status: str) -> None:
+async def mark_webhook_sent(payment_hash: str, status: int) -> None:
     await db.execute(
         """
         UPDATE apipayments SET webhook_status = :status
@@ -540,14 +516,3 @@ async def mark_webhook_sent(payment_hash: str, status: str) -> 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,23 +61,7 @@ async def update_super_user(super_user: str) -> SuperSettings:
 
 
 async def delete_admin_settings(tag: Optional[str] = "core") -> None:
-    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'
-        )
-        """,
-    )
+    await db.execute("DELETE FROM settings WHERE tag = :tag", {"tag": tag})
 
 
 async def create_admin_settings(super_user: str, new_settings: dict) -> SuperSettings:

lnbits/core/crud/wallets.py

@@ -4,8 +4,7 @@ from typing import Optional
 from uuid import uuid4
 
 from lnbits.core.db import db
-from lnbits.core.models.wallets import WalletsFilters
-from lnbits.db import Connection, Filters, Page
+from lnbits.db import Connection
 from lnbits.settings import settings
 
 from ..models import Wallet
@@ -136,43 +135,6 @@ 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/misc.py

@@ -1,9 +1,7 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
 from typing import Callable
 
-import bcrypt
 from pydantic import BaseModel
 
 
@@ -11,15 +9,6 @@ def _do_nothing(*_):
     pass
 
 
-@dataclass
-class SolveBugBcryptWarning:
-    __version__: str = getattr(bcrypt, "__version__")  # noqa
-
-
-# fix annoying warning in the logs
-setattr(bcrypt, "__about__", SolveBugBcryptWarning())  # noqa
-
-
 class CoreAppExtra:
     register_new_ext_routes: Callable = _do_nothing
     register_new_ratelimiter: Callable
@@ -57,8 +46,3 @@ class SimpleItem(BaseModel):
 class DbVersion(BaseModel):
     db: str
     version: int
-
-
-class Image(BaseModel):
-    filename: str
-    directory: str = "library"

lnbits/core/models/notifications.py

@@ -29,8 +29,7 @@ NOTIFICATION_TEMPLATES = {
         *In/Out payments*: `{in_payments_count}`/`{out_payments_count}`.
         *Pending payments*: `{pending_payments_count}`.
         *Failed payments*: `{failed_payments_count}`.
-        *LNbits balance*: `{lnbits_balance_sats}` sats.
-        *Node balance*: `{node_balance_sats}` sats.""",
+        *LNbits balance*: `{lnbits_balance_sats}` sats.""",
     "server_start_stop": """*SERVER*
         {message}
         *Time*: `{up_time}` seconds.

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: str | None = None
+    webhook_status: int | None = None
     preimage: str | None = None
     tag: str | None = None
     extension: str | None = None
@@ -198,7 +198,7 @@ class CreateInvoice(BaseModel):
     internal: bool = False
     out: bool = True
     amount: float = Query(None, ge=0)
-    memo: str | None = Query(None, max_length=640)
+    memo: str | None = None
     description_hash: str | None = None
     unhashed_description: str | None = None
     expiry: int | None = None

lnbits/core/models/users.py

@@ -27,9 +27,6 @@ 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,7 +9,6 @@ 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
@@ -26,7 +25,6 @@ class BaseWallet(BaseModel):
 class WalletExtra(BaseModel):
     icon: str = "flash_on"
     color: str = "primary"
-    pinned: bool = False
 
 
 class Wallet(BaseModel):
@@ -85,13 +83,3 @@ 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/__init__.py

@@ -24,6 +24,7 @@ from .users import (
     check_admin_settings,
     create_user_account,
     create_user_account_no_ckeck,
+    init_admin_settings,
     update_user_account,
     update_user_extensions,
 )
@@ -57,6 +58,7 @@ __all__ = [
     "check_admin_settings",
     "create_user_account",
     "create_user_account_no_ckeck",
+    "init_admin_settings",
     "update_user_account",
     "update_user_extensions",
     # websockets

lnbits/core/services/notifications.py

@@ -24,7 +24,7 @@ from lnbits.core.models.notifications import (
 )
 from lnbits.core.services.nostr import fetch_nip5_details, send_nostr_dm
 from lnbits.core.services.websockets import websocket_manager
-from lnbits.helpers import check_callback_url, is_valid_email_address
+from lnbits.helpers import check_callback_url
 from lnbits.settings import settings
 from lnbits.utils.nostr import normalize_private_key
 
@@ -111,56 +111,41 @@ async def send_telegram_message(token: str, chat_id: str, message: str) -> dict:
         return response.json()
 
 
-async def send_email_notification(
-    message: str, subject: str = "LNbits Notification"
-) -> dict:
-    if not settings.lnbits_email_notifications_enabled:
-        return {"status": "error", "message": "Email notifications are disabled"}
-    try:
-        await send_email(
-            settings.lnbits_email_notifications_server,
-            settings.lnbits_email_notifications_port,
-            settings.lnbits_email_notifications_username,
-            settings.lnbits_email_notifications_password,
-            settings.lnbits_email_notifications_email,
-            settings.lnbits_email_notifications_to_emails,
-            subject,
-            message,
-        )
-        return {"status": "ok"}
-    except Exception as e:
-        logger.error(f"Error sending email notification: {e}")
-        return {"status": "error", "message": str(e)}
+async def send_email_notification(message: str) -> dict:
+    await send_email(
+        settings.lnbits_email_notifications_server,
+        settings.lnbits_email_notifications_port,
+        settings.lnbits_email_notifications_password,
+        settings.lnbits_email_notifications_email,
+        settings.lnbits_email_notifications_to_emails,
+        "LNbits Notification",
+        message,
+    )
+    return {"status": "ok"}
 
 
 async def send_email(
     server: str,
     port: int,
-    username: str,
     password: str,
     from_email: str,
-    to_emails: list[str],
+    to_emails: list,
     subject: str,
     message: str,
-) -> bool:
-    if not is_valid_email_address(from_email):
-        raise ValueError(f"Invalid from email address: {from_email}")
-    if len(to_emails) == 0:
-        raise ValueError("No email addresses provided")
-    for email in to_emails:
-        if not is_valid_email_address(email):
-            raise ValueError(f"Invalid email address: {email}")
+):
     msg = MIMEMultipart()
     msg["From"] = from_email
     msg["To"] = ", ".join(to_emails)
     msg["Subject"] = subject
     msg.attach(MIMEText(message, "plain"))
-    username = username if len(username) > 0 else from_email
-    with smtplib.SMTP(server, port) as smtp_server:
-        smtp_server.starttls()
-        smtp_server.login(username, password)
-        smtp_server.sendmail(from_email, to_emails, msg.as_string())
-        return True
+    try:
+        with smtplib.SMTP(server, port) as smtp_server:
+            smtp_server.starttls()
+            smtp_server.login(from_email, password)
+            smtp_server.sendmail(from_email, to_emails, msg.as_string())
+            logger.debug(f"Emails sent successfully to: {', '.join(to_emails)}")
+    except Exception as e:
+        logger.debug(f"Failed to send email: {e}")
 
 
 def is_message_type_enabled(message_type: NotificationType) -> bool:
@@ -205,23 +190,24 @@ 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=payment.json(), timeout=40)
+            r = await client.post(payment.webhook, json=data, timeout=40)
             r.raise_for_status()
-            await mark_webhook_sent(payment.payment_hash, str(r.status_code))
+            await mark_webhook_sent(payment.payment_hash, r.status_code)
         except httpx.HTTPStatusError as exc:
-            await mark_webhook_sent(payment.payment_hash, str(exc.response.status_code))
+            await mark_webhook_sent(payment.payment_hash, 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}")
 
 
@@ -229,21 +215,18 @@ async def send_payment_notification(wallet: Wallet, payment: Payment):
     try:
         await send_ws_payment_notification(wallet, payment)
     except Exception as e:
-        logger.error(f"Error sending websocket payment notification {e!s}")
+        logger.error("Error sending websocket payment notification", e)
     try:
         send_chat_payment_notification(wallet, payment)
     except Exception as e:
-        logger.error(f"Error sending chat payment notification {e!s}")
+        logger.error("Error sending chat payment notification", e)
     try:
         await send_payment_push_notification(wallet, payment)
     except Exception as e:
-        logger.error(f"Error sending push payment notification {e!s}")
+        logger.error("Error sending push payment notification", e)
 
-    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}")
+    if payment.webhook and not payment.webhook_status:
+        await dispatch_webhook(payment)
 
 
 async def send_ws_payment_notification(wallet: Wallet, payment: Payment):
@@ -263,8 +246,7 @@ async def send_ws_payment_notification(wallet: Wallet, payment: Payment):
     await websocket_manager.send_data(payment_notification, wallet.adminkey)
 
     await websocket_manager.send_data(
-        json.dumps({"pending": payment.pending, "status": payment.status}),
-        payment.payment_hash,
+        json.dumps({"pending": payment.pending}), payment.payment_hash
     )
 
 

lnbits/core/services/payments.py

@@ -44,9 +44,6 @@ from ..models import (
 )
 from .notifications import send_payment_notification
 
-payment_lock = asyncio.Lock()
-wallets_payments_lock: dict[str, asyncio.Lock] = {}
-
 
 async def pay_invoice(
     *,
@@ -82,16 +79,12 @@ async def pay_invoice(
             extra=extra,
         )
 
-    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})."""
+    payment = await _pay_invoice(wallet, create_payment_model, conn)
 
     async with db.reuse_conn(conn) if conn else db.connect() as new_conn:
-        await _credit_service_fee_wallet(payment, service_fee_memo, new_conn)
+        await _credit_service_fee_wallet(payment, new_conn)
 
-    return payment
+        return payment
 
 
 async def create_invoice(
@@ -115,7 +108,7 @@ async def create_invoice(
     if not user_wallet:
         raise InvoiceError(f"Could not fetch wallet '{wallet_id}'.", status="failed")
 
-    invoice_memo = None if description_hash else memo[:640]
+    invoice_memo = None if description_hash else memo
 
     # use the fake wallet if the invoice is for internal use only
     funding_source = fake_wallet if internal else get_funding_source()
@@ -139,29 +132,29 @@ async def create_invoice(
             status="failed",
         )
 
-    payment_response = await funding_source.create_invoice(
+    (
+        ok,
+        checking_id,
+        payment_request,
+        error_message,
+    ) = 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 payment_response.ok
-        or not payment_response.payment_request
-        or not payment_response.checking_id
-    ):
+    if not ok or not payment_request or not checking_id:
         raise InvoiceError(
-            message=payment_response.error_message or "unexpected backend error.",
-            status="pending",
+            error_message or "unexpected backend error.", status="pending"
         )
-    invoice = bolt11_decode(payment_response.payment_request)
+
+    invoice = bolt11_decode(payment_request)
 
     create_payment_model = CreatePayment(
         wallet_id=wallet_id,
-        bolt11=payment_response.payment_request,
+        bolt11=payment_request,
         payment_hash=invoice.payment_hash,
-        preimage=payment_response.preimage,
         amount_msat=amount_sat * 1000,
         expiry=invoice.expiry_date,
         memo=memo,
@@ -170,7 +163,7 @@ async def create_invoice(
     )
 
     payment = await create_payment(
-        checking_id=payment_response.checking_id,
+        checking_id=checking_id,
         data=create_payment_model,
         conn=conn,
     )
@@ -206,7 +199,6 @@ 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)
 
 
@@ -403,9 +395,8 @@ 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, user_id=user_id)
+    data_in, data_out = await get_daily_stats(filters)
     balance_total: float = 0
 
     _none = PaymentDailyStats(date=datetime.now(timezone.utc))
@@ -418,16 +409,13 @@ async def get_payments_daily_stats(
 
     data: list[PaymentDailyStats] = []
 
-    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))
+    start_date = min(data_in[0].date, data_out[0].date)
+    end_date = max(data_in[-1].date, data_out[-1].date)
     delta = timedelta(days=1)
     while start_date <= end_date:
 
-        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)
+        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)
 
         balance_total += data_in_point.balance + data_out_point.balance
         data.append(
@@ -449,27 +437,11 @@ async def get_payments_daily_stats(
     return data
 
 
-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_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_internal_invoice(
@@ -504,15 +476,12 @@ async def _pay_internal_invoice(
     ):
         raise PaymentError("Invalid invoice. Bolt11 changed.", status="failed")
 
-    fee_reserve_total_msat = fee_reserve_total(amount_msat, internal=True)
+    fee_reserve_total_msat = fee_reserve_total(abs(amount_msat), internal=True)
     create_payment_model.fee = abs(fee_reserve_total_msat)
 
     if wallet.balance_msat < abs(amount_msat) + fee_reserve_total_msat:
         raise PaymentError("Insufficient balance.", status="failed")
 
-    # 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(
@@ -550,8 +519,6 @@ 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)}"
@@ -709,7 +676,7 @@ def _validate_payment_request(
 
 
 async def _credit_service_fee_wallet(
-    payment: Payment, memo: str, conn: Optional[Connection] = None
+    payment: Payment, conn: Optional[Connection] = None
 ):
     service_fee_msat = service_fee(payment.amount, internal=payment.is_internal)
     if not settings.lnbits_service_fee_wallet or not service_fee_msat:
@@ -720,7 +687,7 @@ async def _credit_service_fee_wallet(
         bolt11=payment.bolt11,
         payment_hash=payment.payment_hash,
         amount_msat=abs(service_fee_msat),
-        memo=memo,
+        memo="Service fee",
     )
     await create_payment(
         checking_id=f"service_fee_{payment.payment_hash}",

lnbits/core/services/users.py

@@ -8,6 +8,7 @@ from lnbits.core.models.extensions import UserExtension
 from lnbits.settings import (
     EditableSettings,
     SuperSettings,
+    send_admin_user_to_saas,
     settings,
 )
 
@@ -46,9 +47,7 @@ async def create_user_account(
 
 
 async def create_user_account_no_ckeck(
-    account: Optional[Account] = None,
-    wallet_name: Optional[str] = None,
-    default_exts: Optional[list[str]] = None,
+    account: Optional[Account] = None, wallet_name: Optional[str] = None
 ) -> User:
 
     if account:
@@ -71,13 +70,9 @@ async def create_user_account_no_ckeck(
         wallet_name=wallet_name or settings.lnbits_default_wallet_name,
     )
 
-    user_extensions = (default_exts or []) + settings.lnbits_user_default_extensions
-    for ext_id in user_extensions:
-        try:
-            user_ext = UserExtension(user=account.id, extension=ext_id, active=True)
-            await create_user_extension(user_ext)
-        except Exception as e:
-            logger.error(f"Error enabeling default extension {ext_id}: {e}")
+    for ext_id in settings.lnbits_user_default_extensions:
+        user_ext = UserExtension(user=account.id, extension=ext_id, active=True)
+        await update_user_extension(user_ext)
 
     user = await get_user_from_account(account)
     assert user, "Cannot find user for account."
@@ -159,6 +154,14 @@ async def check_admin_settings():
         with open(Path(settings.lnbits_data_folder) / ".super_user", "w") as file:
             file.write(settings.super_user)
 
+        # callback for saas
+        if (
+            settings.lnbits_saas_callback
+            and settings.lnbits_saas_secret
+            and settings.lnbits_saas_instance_id
+        ):
+            send_admin_user_to_saas()
+
         account = await get_account(settings.super_user)
         if account and account.extra and account.extra.provider == "env":
             settings.first_install = True

lnbits/core/templates/admin/_tab_library.html

@@ -1,67 +0,0 @@
-<q-tab-panel name="library">
-  <q-card-section class="q-pa-none">
-    <h6 class="q-my-none q-mb-sm">
-      <span v-text="$t('image_library')"></span>
-    </h6>
-    <q-btn
-      color="primary"
-      label="Add Image"
-      @click="$refs.imageInput.click()"
-      class="q-mb-md"
-    />
-    <input
-      type="file"
-      ref="imageInput"
-      accept="image/png, image/jpeg, image/gif"
-      style="display: none"
-      @change="onImageInput"
-    />
-  </q-card-section>
-  <div class="row q-col-gutter-sm q-pa-sm">
-    <div
-      v-for="image in library_images"
-      :key="image.filename"
-      class="col-6 col-sm-4 col-md-3 col-lg-2"
-      style="max-width: 200px"
-    >
-      <q-card class="q-mb-sm">
-        <q-img :src="image.url" style="height: 150px" />
-
-        <q-card-section
-          class="q-pt-md q-pb-md row items-center justify-between"
-        >
-          <small
-            ><div
-              class="text-caption ellipsis"
-              style="max-width: 100px"
-              :title="image.filename"
-              v-text="image.filename"
-            ></div
-          ></small>
-          <q-btn
-            dense
-            flat
-            size="sm"
-            icon="content_copy"
-            @click="copyText(image.url)"
-            :title="$t('copy')"
-            ><q-tooltip>Copy image link</q-tooltip></q-btn
-          >
-          <q-btn
-            dense
-            flat
-            size="sm"
-            icon="delete"
-            color="negative"
-            @click="deleteImage(image.filename)"
-            :title="$t('delete')"
-            ><q-tooltip>Delete image</q-tooltip></q-btn
-          >
-        </q-card-section>
-      </q-card>
-    </div>
-  </div>
-  <div v-if="library_images.length === 0" class="q-pa-xl">
-    <div class="text-subtitle2 text-grey">No images uploaded yet.</div>
-  </div>
-</q-tab-panel>

lnbits/core/templates/admin/_tab_notifications.html

@@ -150,6 +150,7 @@
       <div class="col-sm-12">
         <q-separator></q-separator>
       </div>
+
       <div class="col-12">
         <strong v-text="$t('notifications_email_config')"></strong>
         <q-item tag="label" v-ripple>
@@ -193,24 +194,6 @@
                 />
               </q-item-section>
             </q-item>
-            <q-item tag="label" v-ripple>
-              <q-item-section>
-                <q-item-label
-                  v-text="$t('notifications_send_email_username')"
-                ></q-item-label>
-                <q-item-label
-                  caption
-                  v-text="$t('notifications_send_email_username_desc')"
-                ></q-item-label>
-              </q-item-section>
-              <q-item-section>
-                <q-input
-                  :type="hideInputToggle ? 'password' : 'text'"
-                  filled
-                  v-model="formData.lnbits_email_notifications_username"
-                />
-              </q-item-section>
-            </q-item>
             <q-item tag="label" v-ripple>
               <q-item-section>
                 <q-item-label
@@ -229,17 +212,7 @@
                 />
               </q-item-section>
             </q-item>
-            <q-item>
-              <q-btn
-                @click="sendTestEmail()"
-                :label="$t('notifications_send_test_email')"
-                color="primary"
-                class="q-mt-md"
-              ></q-btn>
-            </q-item>
-          </div>
 
-          <div class="col">
             <q-item tag="label" v-ripple>
               <q-item-section>
                 <q-item-label
@@ -276,6 +249,9 @@
                 </div>
               </q-item-section>
             </q-item>
+          </div>
+
+          <div class="col">
             <q-item tag="label" v-ripple>
               <q-item-section>
                 <q-item-label

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 q-col-gutter-sm q-col-gutter-y-md">
-      <div class="col-md-4 col-sm-12">
+    <div class="row">
+      <div class="col-md-4 col-sm-12 q-pr-sm">
         <q-input
           filled
           v-model="formData.keycloak_discovery_url"
@@ -141,7 +141,7 @@
         >
         </q-input>
       </div>
-      <div class="col-md-4 col-sm-12">
+      <div class="col-md-4 col-sm-12 q-pr-sm">
         <q-input
           filled
           v-model="formData.keycloak_client_id"
@@ -159,22 +159,6 @@
         >
         </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/_tab_theme.html

@@ -10,7 +10,7 @@
             filled
             type="text"
             v-model="formData.lnbits_site_title"
-            :label="$t('ui_site_title') + $t('ui_changing_remove_lnbits_elements')"
+            :label="$t('ui_site_title')"
           ></q-input>
           <br />
         </div>
@@ -53,6 +53,17 @@
             :label="$t('lnbits_wallet')"
           ></q-input>
         </div>
+        <div class="col-12 col-md-4">
+          <p><span v-text="$t('denomination')"></span></p>
+          <q-input
+            filled
+            type="text"
+            v-model="formData.lnbits_denomination"
+            label="sats"
+            :hint="$t('denomination_hint')"
+            :rules="[(val) => !val || val.length == 3 || val == 'sats' || $t('denomination_error')]"
+          ></q-input>
+        </div>
         <div class="col-12 col-md-4">
           <p><span v-text="$t('ui_qr_code_logo')"></span></p>
           <q-input

lnbits/core/templates/admin/index.html

@@ -149,14 +149,6 @@ import window_vars with context %} {% block scripts %} {{ window_vars(user) }}
               ><q-tooltip v-if="!$q.screen.gt.sm"
                 ><span v-text="$t('audit')"></span></q-tooltip
             ></q-tab>
-            <q-tab
-              name="library"
-              icon="image"
-              :label="$q.screen.gt.sm ? $t('library') : null"
-              @update="val => tab = val.name"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('library')"></span></q-tooltip
-            ></q-tab>
             <q-tab
               style="word-break: break-all"
               name="site_customisation"
@@ -171,26 +163,22 @@ import window_vars with context %} {% block scripts %} {{ window_vars(user) }}
 
         <template v-slot:after>
           <q-form name="settings_form" id="settings_form">
-            <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-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"%}
+            </q-tab-panels>
           </q-form>
         </template>
       </q-splitter>

lnbits/core/templates/core/_api_docs.html

@@ -85,12 +85,7 @@
       <q-card-section>
         <code><span class="text-light-green">GET</span> /api/v1/wallet</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code
-          >{"X-Api-Key": "<i
-            v-text="inkeyHidden ? '****************' : wallet.inkey"
-          ></i
-          >"}</code
-        ><br />
+        <code>{"X-Api-Key": "<i v-text="wallet.inkey"></i>"}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">
           Returns 200 OK (application/json)
         </h5>
@@ -101,8 +96,7 @@
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
         <code
           >curl <span v-text="baseUrl"></span>api/v1/wallet -H "X-Api-Key:
-          <i v-text="inkeyHidden ? '****************' : wallet.inkey"></i
-          >"</code
+          <i v-text="wallet.inkey"></i>"</code
         >
       </q-card-section>
     </q-card>
@@ -118,12 +112,7 @@
       <q-card-section>
         <code><span class="text-light-green">POST</span> /api/v1/payments</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code
-          >{"X-Api-Key": "<i
-            v-text="inkeyHidden ? '****************' : wallet.inkey"
-          ></i
-          >"}</code
-        ><br />
+        <code>{"X-Api-Key": "<i v-text="wallet.inkey"></i>"}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
         <code
           >{"out": false, "amount": &lt;int&gt;, "memo": &lt;string&gt;,
@@ -141,9 +130,8 @@
         <code
           >curl -X POST <span v-text="baseUrl"></span>api/v1/payments -d
           '{"out": false, "amount": &lt;int&gt;, "memo": &lt;string&gt;}' -H
-          "X-Api-Key:
-          <i v-text="inkeyHidden ? '****************' : wallet.inkey"></i>" -H
-          "Content-type: application/json"</code
+          "X-Api-Key: <i v-text="wallet.inkey"></i>" -H "Content-type:
+          application/json"</code
         >
       </q-card-section>
     </q-card>
@@ -230,12 +218,7 @@
           /api/v1/payments/&lt;payment_hash&gt;</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code
-          >{"X-Api-Key": "<i
-            v-text="inkeyHidden ? '****************' : wallet.inkey"
-          ></i
-          >"}</code
-        >
+        <code>{"X-Api-Key": "{{ wallet.inkey }}"}</code>
         <h5 class="text-caption q-mt-sm q-mb-none">
           Returns 200 OK (application/json)
         </h5>
@@ -244,33 +227,11 @@
         <code
           >curl -X GET
           <span v-text="baseUrl"></span>api/v1/payments/&lt;payment_hash&gt; -H
-          "X-Api-Key:
-          <i v-text="inkeyHidden ? '****************' : wallet.inkey"></i>" -H
-          "Content-type: application/json"</code
+          "X-Api-Key: <i v-text="wallet.inkey"></i>" -H "Content-type:
+          application/json"</code
         >
       </q-card-section>
     </q-card>
-    <q-card>
-      <q-card-section>
-        <code
-          ><span class="text-pink">WS</span>
-          /api/v1/ws/&lt;invoice_key&gt;</code
-        >
-        <h5
-          class="text-caption q-mt-sm q-mb-none"
-          v-text="$t('websocket_example')"
-        ></h5>
-        <code
-          >wscat -c <span v-text="websocketUrl"></span>/<span
-            v-text="inkeyHidden ? '****************' : wallet.inkey"
-          ></span
-        ></code>
-        <h5 class="text-caption q-mt-sm q-mb-none">
-          Returns 200 OK (application/json)/payments
-        </h5>
-        <code>{"balance": &lt;int&gt;, "payment": &lt;object&gt;}</code>
-      </q-card-section>
-    </q-card>
   </q-expansion-item>
   <q-separator></q-separator>
   <q-card-section>

lnbits/core/templates/core/account.html

@@ -45,7 +45,7 @@
                     <div class="row">
                       <div class="col">
                         <h4 class="q-my-none">
-                          <span v-text="$t('password')"></span>
+                          <span v-text="$t('password_config')"></span>
                         </h4>
                       </div>
                       <div class="col">
@@ -102,7 +102,7 @@
                       unelevated
                       color="primary"
                       class="float-right"
-                      :label="$t('update_password')"
+                      :label="$t('change_password')"
                     >
                     </q-btn>
                   </q-card-section>
@@ -110,7 +110,7 @@
                   <q-card-section>
                     <div class="col q-mb-sm">
                       <h4 class="q-my-none">
-                        Nostr <span v-text="$t('pubkey')"></span>
+                        <span v-text="$t('pubkey')"></span>
                       </h4>
                     </div>
                     <q-input
@@ -287,7 +287,7 @@
                     </q-btn>
                     <q-btn
                       @click="showUpdateCredentials()"
-                      :label="$t('change_password')"
+                      :label="$t('update_credentials')"
                       filled
                       color="primary"
                       class="float-right"
@@ -335,22 +335,6 @@
                     </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>
@@ -372,7 +356,7 @@
                       flat
                       @click="themeChoiceFunc('bitcoin')"
                       icon="circle"
-                      color="deep-orange"
+                      color="orange"
                       size="md"
                       ><q-tooltip>bitcoin</q-tooltip>
                     </q-btn>

lnbits/core/templates/core/first_install.html

@@ -38,7 +38,7 @@
                   :type="loginData.isPwdRepeat ? 'password' : 'text'"
                   autocomplete="off"
                   :label="$t('password_repeat')"
-                  :rules="[(val) => !val || val.length >= 8 || $t('invalid_password'), (val) => val === loginData.password || $t('invalid_password_repeat')]"
+                  :rules="[(val) => !val || val.length >= 8 || $t('invalid_password'), (val) => val === loginData.password || 'Passwords_dont_match']"
                   ><template v-slot:append>
                     <q-icon
                       :name="loginData.isPwdRepeat ? 'visibility_off' : 'visibility'"

lnbits/core/templates/core/index.html

@@ -59,6 +59,9 @@
     }
   }
 </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>
@@ -84,20 +87,18 @@
               >
                 {{SITE_TITLE}}
               </h5>
-              <template v-if="$q.screen.gt.sm">
-                <h6
-                  class="q-my-sm"
-                  v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'"
-                >
-                  {{SITE_TAGLINE}}
-                </h6>
-                <p
-                  class="q-my-sm"
-                  v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'"
-                >
-                  {{SITE_DESCRIPTION}}
-                </p>
-              </template>
+              <h6
+                class="q-my-sm"
+                v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'"
+              >
+                {{SITE_TAGLINE}}
+              </h6>
+              <p
+                class="q-my-sm"
+                v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'"
+              >
+                {{SITE_DESCRIPTION}}
+              </p>
               <!-- <div
             class="gt-sm"
             v-html="formatDescription"
@@ -148,7 +149,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"
@@ -179,14 +180,14 @@
                     >
                       <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>
 
+                    <p v-else-if="authAction === 'register'" class="q-mb-none">
+                      Aready have an account?
                       <span
-                        class="text-secondary cursor-pointer q-ml-sm"
+                        class="text-secondary cursor-pointer"
                         @click="showLogin('username-password')"
-                        v-text="$t('login')"
-                      ></span>
+                        >Login</span
+                      >
                     </p>
                   </div>
                 </username-password>
@@ -222,7 +223,7 @@
         </div>
       </div>
       <div
-        v-if="'{{ LNBITS_DENOMINATION }}' == 'sats' && '{{ SITE_TITLE }}' == 'LNbits' && '{{ LNBITS_SHOW_HOME_PAGE_ELEMENTS }}' == 'True'"
+        v-if="'{{ LNBITS_DENOMINATION }}' == 'sats'"
         class="full-width q-mb-lg q-mt-sm"
       >
         <div class="flex flex-center q-gutter-md q-py-md">
@@ -248,7 +249,7 @@
           ></q-btn>
         </div>
       </div>
-      {% if AD_SPACE_ENABLED and AD_SPACE %}
+      {% if AD_SPACE %}
       <div class="q-pt-md full-width">
         <div class="row justify-center q-mb-xl">
           <div class="full-width text-center">
@@ -278,10 +279,7 @@
         </div>
       </div>
       {% endif %}
-      <div
-        v-if="'{{ LNBITS_DENOMINATION }}' == 'sats' && '{{ SITE_TITLE }}' == 'LNbits' && '{{ LNBITS_SHOW_HOME_PAGE_ELEMENTS }}' == 'True'"
-        class="full-width"
-      >
+      <div v-if="'{{ LNBITS_DENOMINATION }}' == 'sats'" class="full-width">
         <div class="wrapper">
           <div class="marquee">
             <div class="marquee__group">

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_ENABLED and AD_SPACE %}
+  {% if HIDE_API 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="isSatsDenomination"
+                v-if="'{{ LNBITS_DENOMINATION }}' == 'sats'"
                 class="col-1"
                 style="max-width: 30px"
               >
@@ -59,11 +59,9 @@
                   <div class="col-7">
                     <div class="row">
                       <div class="col-auto">
-                        <div class="text-h3 q-my-none full-width">
+                        <div class="text-h3 q-my-none text-no-wrap">
                           <strong
                             v-text="walletFormatBalance(this.g.wallet.sat)"
-                            class="text-no-wrap"
-                            :style="{fontSize: 'clamp(0.75rem, 10vw, 3rem)', display: 'inline-block', maxWidth: '100%'}"
                           ></strong>
                         </div>
                       </div>
@@ -168,12 +166,7 @@
                 @click="showReceiveDialog"
                 :label="$t('create_invoice')"
               ></q-btn>
-              <q-btn
-                unelevated
-                color="secondary"
-                icon="qr_code_scanner"
-                @click="showCamera"
-              >
+              <q-btn unelevated color="secondary" icon="qr_code_scanner">
                 <q-tooltip
                   ><span v-text="$t('camera_tooltip')"></span
                 ></q-tooltip>
@@ -242,23 +235,6 @@
                   {{ 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">
@@ -485,7 +461,7 @@
               </q-list>
             </q-card-section>
           </q-card>
-          {% endif %} {% if AD_SPACE_ENABLED and AD_SPACE %}
+          {% endif %} {% if AD_SPACE %}
           <q-card>
             <q-card-section>
               <h6 class="text-subtitle1 q-mt-none q-mb-sm">
@@ -656,7 +632,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>
@@ -750,13 +726,6 @@
               </div>
               <div v-if="g.fiatTracking">
                 <div v-if="isFiatPriority">
-                  <h5 class="q-my-none text-bold">
-                    <span
-                      v-text="walletFormatBalance(parse.invoice.sat)"
-                    ></span>
-                  </h5>
-                </div>
-                <div v-else style="opacity: 0.75">
                   <div class="text-h5 text-italic">
                     <span
                       v-text="parse.invoice.fiatAmount"
@@ -764,6 +733,13 @@
                     ></span>
                   </div>
                 </div>
+                <div v-else style="opacity: 0.75">
+                  <h5 class="q-my-none text-bold">
+                    <span
+                      v-text="walletFormatBalance(parse.invoice.sat)"
+                    ></span>
+                  </h5>
+                </div>
               </div>
             </div>
             <q-separator></q-separator>
@@ -978,8 +954,8 @@
                     dense
                     v-model.number="parse.data.amount"
                     :label="$t('amount') + ' (' + parse.data.unit + ') *'"
-                    :mask="parse.data.unit == 'sat' ? '#' : ''"
-                    :step="parse.data.unit == 'sat' ? '1': '0.01'"
+                    :mask="parse.data.unit != 'sat' ? '#.##' : '#'"
+                    :step="parse.data.unit != 'sat' ? '0.01' : '1'"
                     fill-mask="0"
                     reverse-fill-mask
                     :min="parse.lnurlpay.minSendable / 1000"

lnbits/core/templates/core/wallets.html

@@ -1,165 +0,0 @@
-{% 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/users/_manageWallet.html

@@ -15,36 +15,19 @@
   </q-card>
 </div>
 <div v-else-if="activeWallet.show">
-  <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 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>
   </div>
   <q-card class="q-pa-md">

lnbits/core/templates/users/index.html

@@ -127,17 +127,7 @@
                   :label="props.row.wallet_count"
                   @click="fetchWallets(props.row.id)"
                 >
-                </q-btn>
-                <q-btn
-                  v-if="(users.length == 1) && searchData.wallet_id"
-                  round
-                  icon="menu"
-                  size="sm"
-                  color="secondary"
-                  class="q-ml-sm"
-                  @click="showWalletPayments(searchData.wallet_id)"
-                >
-                  <q-tooltip>Show Payments</q-tooltip>
+                  <q-tooltip>Show Wallets</q-tooltip>
                 </q-btn>
               </q-td>
 

lnbits/core/views/admin_api.py

@@ -1,38 +1,31 @@
 import os
 import time
 from http import HTTPStatus
-from pathlib import Path
-from shutil import make_archive, move
+from shutil import make_archive
 from subprocess import Popen
-from tempfile import NamedTemporaryFile
-from typing import IO, Optional
+from typing import Optional
 from urllib.parse import urlparse
 
-import filetype
-from fastapi import APIRouter, Depends, File, Header, HTTPException, UploadFile
+from fastapi import APIRouter, Depends
 from fastapi.responses import FileResponse
 
 from lnbits.core.models import User
-from lnbits.core.models.misc import Image, SimpleStatus
 from lnbits.core.models.notifications import NotificationType
 from lnbits.core.services import (
     enqueue_notification,
     get_balance_delta,
     update_cached_settings,
 )
-from lnbits.core.services.notifications import send_email_notification
 from lnbits.core.services.settings import dict_to_settings
 from lnbits.decorators import check_admin, check_super_user
-from lnbits.helpers import safe_upload_file_path
 from lnbits.server import server_restart
 from lnbits.settings import AdminSettings, Settings, UpdateSettings, settings
 from lnbits.tasks import invoice_listeners
 
 from .. import core_app_extra
-from ..crud import get_admin_settings, reset_core_settings, update_admin_settings
+from ..crud import delete_admin_settings, get_admin_settings, update_admin_settings
 
 admin_router = APIRouter(tags=["Admin UI"], prefix="/admin")
-file_upload = File(...)
 
 
 @admin_router.get(
@@ -57,18 +50,6 @@ async def api_monitor():
     }
 
 
-@admin_router.get(
-    "/api/v1/testemail",
-    name="TestEmail",
-    description="send a test email to the admin",
-    dependencies=[Depends(check_admin)],
-)
-async def api_test_email():
-    return await send_email_notification(
-        "This is a LNbits test email.", "LNbits Test Email"
-    )
-
-
 @admin_router.get("/api/v1/settings", response_model=Optional[AdminSettings])
 async def api_get_settings(
     user: User = Depends(check_admin),
@@ -113,7 +94,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 reset_core_settings()
+    await delete_admin_settings()
     server_restart.set()
 
 
@@ -165,93 +146,3 @@ async def api_download_backup() -> FileResponse:
     return FileResponse(
         path=f"{last_filename}.zip", filename=filename, media_type="application/zip"
     )
-
-
-@admin_router.post(
-    "/api/v1/images",
-    status_code=HTTPStatus.OK,
-    dependencies=[Depends(check_admin)],
-)
-async def upload_image(
-    file: UploadFile = file_upload,
-    content_length: int = Header(..., le=settings.lnbits_upload_size_bytes),
-) -> Image:
-    if not file.filename:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST, detail="No filename provided."
-        )
-
-    # validate file types
-    file_info = filetype.guess(file.file)
-    if file_info is None:
-        raise HTTPException(
-            status_code=HTTPStatus.UNSUPPORTED_MEDIA_TYPE,
-            detail="Unable to determine file type",
-        )
-    detected_content_type = file_info.extension.lower()
-    if (
-        file.content_type not in settings.lnbits_upload_allowed_types
-        or detected_content_type not in settings.lnbits_upload_allowed_types
-    ):
-        raise HTTPException(HTTPStatus.UNSUPPORTED_MEDIA_TYPE, "Unsupported file type")
-
-    # validate file name
-    try:
-        file_path = safe_upload_file_path(file.filename)
-    except ValueError as e:
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN,
-            detail=f"The requested filename '{file.filename}' is forbidden.",
-        ) from e
-
-    # validate file size
-    real_file_size = 0
-    temp: IO = NamedTemporaryFile(delete=False)
-    for chunk in file.file:
-        real_file_size += len(chunk)
-        if real_file_size > content_length:
-            raise HTTPException(
-                status_code=HTTPStatus.REQUEST_ENTITY_TOO_LARGE,
-                detail=f"File too large ({content_length / 1000} KB max)",
-            )
-        temp.write(chunk)
-    temp.close()
-
-    move(temp.name, file_path)
-    return Image(filename=file.filename)
-
-
-@admin_router.get(
-    "/api/v1/images",
-    status_code=HTTPStatus.OK,
-    dependencies=[Depends(check_admin)],
-)
-async def list_uploaded_images() -> list[Image]:
-    image_folder = Path(settings.lnbits_data_folder, "images")
-    files = image_folder.glob("*")
-    images = []
-    for file in files:
-        if file.is_file():
-            images.append(Image(filename=file.name))
-    return images
-
-
-@admin_router.delete(
-    "/api/v1/images/{filename}",
-    status_code=HTTPStatus.OK,
-    dependencies=[Depends(check_admin)],
-)
-async def delete_uploaded_image(filename: str) -> SimpleStatus:
-    try:
-        file_path = safe_upload_file_path(filename)
-    except ValueError as e:
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN,
-            detail=f"The requested filename '{filename}' is forbidden.",
-        ) from e
-
-    if not file_path.exists():
-        raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="Image not found.")
-
-    file_path.unlink()
-    return SimpleStatus(success=True, message=f"{filename} deleted")

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.FORBIDDEN, "Login by 'Username and Password' not allowed."
+            HTTPStatus.UNAUTHORIZED, "Login by 'Username and Password' not allowed."
         )
     account = await get_account_by_username_or_email(data.username)
     if not account or not account.verify_password(data.password):
@@ -85,7 +85,9 @@ 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.FORBIDDEN, "Login with Nostr Auth not allowed.")
+        raise HTTPException(
+            HTTPStatus.UNAUTHORIZED, "Login with Nostr Auth not allowed."
+        )
     event = _nostr_nip98_event(request)
     account = await get_account_by_pubkey(event["pubkey"])
     if not account:
@@ -102,7 +104,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.FORBIDDEN,
+            HTTPStatus.UNAUTHORIZED,
             "Login by 'User ID' not allowed.",
         )
     account = await get_account(data.usr)
@@ -110,7 +112,7 @@ async def login_usr(data: LoginUsr) -> JSONResponse:
         raise HTTPException(HTTPStatus.UNAUTHORIZED, "User ID does not exist.")
     if account.is_admin:
         raise HTTPException(
-            HTTPStatus.FORBIDDEN, "Admin users cannot login with user id only."
+            HTTPStatus.UNAUTHORIZED, "Admin users cannot login with user id only."
         )
     return _auth_success_response(account.username, account.id, account.email)
 
@@ -240,7 +242,7 @@ async def login_with_sso_provider(
     provider_sso = _new_sso(provider)
     if not provider_sso:
         raise HTTPException(
-            HTTPStatus.FORBIDDEN,
+            HTTPStatus.UNAUTHORIZED,
             f"Login by '{provider}' not allowed.",
         )
 
@@ -255,7 +257,7 @@ async def handle_oauth_token(request: Request, provider: str) -> RedirectRespons
     provider_sso = _new_sso(provider)
     if not provider_sso:
         raise HTTPException(
-            HTTPStatus.FORBIDDEN,
+            HTTPStatus.UNAUTHORIZED,
             f"Login by '{provider}' not allowed.",
         )
 
@@ -283,7 +285,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.FORBIDDEN,
+            HTTPStatus.UNAUTHORIZED,
             "Register by 'Username and Password' not allowed.",
         )
 
@@ -373,7 +375,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.FORBIDDEN, "Auth by 'Username and Password' not allowed."
+            HTTPStatus.UNAUTHORIZED, "Auth by 'Username and Password' not allowed."
         )
 
     assert data.password == data.password_repeat, "Passwords do not match."
@@ -447,7 +449,7 @@ async def update(
 @auth_router.put("/first_install")
 async def first_install(data: UpdateSuperuserPassword) -> JSONResponse:
     if not settings.first_install:
-        raise HTTPException(HTTPStatus.FORBIDDEN, "This is not your first install")
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "This is not your first install")
     account = await get_account(settings.super_user)
     if not account:
         raise HTTPException(HTTPStatus.INTERNAL_SERVER_ERROR, "Superuser not found.")
@@ -470,10 +472,10 @@ async def _handle_sso_login(userinfo: OpenID, verified_user_id: Optional[str] =
 
     if verified_user_id:
         if account:
-            raise HTTPException(HTTPStatus.FORBIDDEN, "Email already used.")
+            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Email already used.")
         account = await get_account(verified_user_id)
         if not account:
-            raise HTTPException(HTTPStatus.FORBIDDEN, "Cannot verify user email.")
+            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Cannot verify user email.")
         redirect_path = "/account"
 
     if account:
@@ -497,12 +499,9 @@ 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, max_age=max_age
-    )
-    response.set_cookie("is_lnbits_user_authorized", "true", max_age=max_age)
+    response.set_cookie("cookie_access_token", access_token, httponly=True)
+    response.set_cookie("is_lnbits_user_authorized", "true")
     response.delete_cookie("is_access_token_expired")
 
     return response
@@ -522,12 +521,9 @@ 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, max_age=max_age
-    )
-    response.set_cookie("is_lnbits_user_authorized", "true", max_age=max_age)
+    response.set_cookie("cookie_access_token", access_token, httponly=True)
+    response.set_cookie("is_lnbits_user_authorized", "true")
     response.delete_cookie("is_access_token_expired")
     return response
 
@@ -578,10 +574,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.BAD_REQUEST, "Nostr Auth header missing.")
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Nostr Auth header missing.")
     scheme, token = auth_header.split()
     if scheme.lower() != "nostr":
-        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid Authorization scheme.")
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid Authorization scheme.")
     event = None
     try:
         event_json = base64.b64decode(token.encode("ascii"))

lnbits/core/views/generic.py

@@ -1,4 +1,5 @@
 from http import HTTPStatus
+from pathlib import Path
 from typing import Annotated, List, Optional, Union
 from urllib.parse import urlencode, urlparse
 
@@ -36,7 +37,7 @@ generic_router = APIRouter(
 
 @generic_router.get("/favicon.ico", response_class=FileResponse)
 async def favicon():
-    return RedirectResponse(settings.lnbits_qr_logo)
+    return FileResponse(Path("lnbits", "static", "favicon.ico"))
 
 
 @generic_router.get("/", response_class=HTMLResponse)
@@ -216,25 +217,6 @@ 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(
@@ -421,7 +403,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_user_exists)):
+async def payments_index(request: Request, user: User = Depends(check_admin)):
     return template_renderer().TemplateResponse(
         "payments/index.html",
         {

lnbits/core/views/node_api.py

@@ -212,10 +212,7 @@ 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()
-            data = r.json()
-            if "noderank" not in data:
-                return None
-            return data["noderank"]
+            return r.json()["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,6 +44,7 @@ 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,
@@ -115,44 +116,30 @@ 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),
 ):
 
-    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)
+    return await get_payment_count_stats(count_by, filters)
 
 
 @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),
 ):
 
-    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)
+    return await get_wallets_stats(filters)
 
 
 @payment_router.get(
@@ -166,13 +153,22 @@ async def api_payments_daily_stats(
     filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
 ):
 
-    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)
+    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)
 
 
 @payment_router.get(
@@ -268,21 +264,13 @@ 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,
     )
 
 
@@ -326,7 +314,7 @@ async def api_payments_create(
         return await _api_payments_create_invoice(invoice_data, wallet.wallet)
     else:
         raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN,
+            status_code=HTTPStatus.UNAUTHORIZED,
             detail="Invoice (or Admin) key required.",
         )
 

lnbits/core/views/user_api.py

@@ -104,24 +104,16 @@ async def api_create_user(data: CreateUser) -> CreateUser:
     )
     account.validate_fields()
     account.hash_password(data.password)
-    user = await create_user_account_no_ckeck(account, default_exts=data.extensions)
+    user = await create_user_account_no_ckeck(account)
     data.id = user.id
     return data
 
 
 @users_router.put("/user/{user_id}", name="Update user")
-async def api_update_user(
-    user_id: str, data: CreateUser, user: User = Depends(check_admin)
-) -> CreateUser:
+async def api_update_user(user_id: str, data: CreateUser) -> CreateUser:
     if user_id != data.id:
         raise HTTPException(HTTPStatus.BAD_REQUEST, "User Id missmatch.")
 
-    if user_id == settings.super_user and user.id != settings.super_user:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail="Action only allowed for super user.",
-        )
-
     if data.password or data.password_repeat:
         raise HTTPException(
             HTTPStatus.BAD_REQUEST, "Use 'reset password' functionality."
@@ -148,7 +140,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, deleted=False)
+    wallets = await get_wallets(user_id)
     if len(wallets) > 0:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST,
@@ -257,50 +249,19 @@ 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",
     summary="First time it is called it does a soft delete (only sets a flag)."
     "The second time it is called will delete the entry from the DB",
 )
-async def api_users_delete_user_wallet(
-    user_id: str, wallet: str, user: User = Depends(check_admin)
-) -> SimpleStatus:
+async def api_users_delete_user_wallet(user_id: str, wallet: str) -> SimpleStatus:
     wal = await get_wallet(wallet)
     if not wal:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND,
             detail="Wallet does not exist.",
         )
-
-    if user_id == settings.super_user and user.id != settings.super_user:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail="Action only allowed for super user.",
-        )
-
     if wal.deleted:
         await force_delete_wallet(wallet)
     await delete_wallet(user_id=user_id, wallet_id=wallet)

lnbits/core/views/wallet_api.py

@@ -9,18 +9,13 @@ 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,
@@ -43,26 +38,6 @@ 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)
@@ -99,7 +74,6 @@ 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)
@@ -108,7 +82,6 @@ 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,13 +554,9 @@ 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__:
-            # 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(concat({', '.join(self.model.__search_fields__)})) LIKE :search"
             )
-            where_stmts.append(f"lower({search_expr}) LIKE :search")
 
         if where_stmts:
             return "WHERE " + " AND ".join(where_stmts)
@@ -580,7 +576,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.lower()}%"
+            values["search"] = f"%{self.search}%"
         return values
 
 
@@ -648,9 +644,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" or value == "":
+        if value == "null":
             return None
-        _subdict = _safe_load_json(value)
+        _subdict = json.loads(value)
     elif isinstance(value, dict):
         _subdict = value
 
@@ -674,7 +670,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 = _safe_load_json(value) if isinstance(value, str) else value
+            _items = json.loads(value) if isinstance(value, str) else value
             _dict[key] = [
                 dict_to_submodel(type_, v) if issubclass(type_, BaseModel) else v
                 for v in _items
@@ -695,7 +691,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] = _safe_load_json(value)
+            _dict[key] = json.loads(value)
             continue
         _dict[key] = value
         continue
@@ -703,12 +699,3 @@ 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

@@ -5,7 +5,7 @@ import jwt
 from fastapi import Cookie, Depends, Query, Request, Security
 from fastapi.exceptions import HTTPException
 from fastapi.openapi.models import APIKey, APIKeyIn, SecuritySchemeType
-from fastapi.security import APIKeyHeader, APIKeyQuery, HTTPBearer, OAuth2PasswordBearer
+from fastapi.security import APIKeyHeader, APIKeyQuery, OAuth2PasswordBearer
 from fastapi.security.base import SecurityBase
 from loguru import logger
 from pydantic.types import UUID4
@@ -31,15 +31,8 @@ from lnbits.db import Connection, Filter, Filters, TFilterModel
 from lnbits.helpers import path_segments
 from lnbits.settings import AuthMethods, settings
 
-oauth2_scheme = OAuth2PasswordBearer(
-    tokenUrl="api/v1/auth",
-    auto_error=False,
-    description="OAuth2 access token for authentication with username and password.",
-)
-http_bearer = HTTPBearer(
-    auto_error=False,
-    description="Bearer Token for custom ACL based access control",
-)
+oauth2_scheme = OAuth2PasswordBearer(tokenUrl="api/v1/auth", auto_error=False)
+
 api_key_header = APIKeyHeader(
     name="X-API-KEY",
     auto_error=False,
@@ -102,7 +95,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.FORBIDDEN,
+                status_code=HTTPStatus.UNAUTHORIZED,
                 detail="Invalid adminkey.",
             )
 
@@ -139,9 +132,8 @@ async def require_invoice_key(
 async def check_access_token(
     header_access_token: Annotated[Union[str, None], Depends(oauth2_scheme)],
     cookie_access_token: Annotated[Union[str, None], Cookie()] = None,
-    bearer_access_token: Annotated[Union[str, None], Depends(http_bearer)] = None,
 ) -> Optional[str]:
-    return header_access_token or cookie_access_token or bearer_access_token
+    return header_access_token or cookie_access_token
 
 
 async def check_user_exists(
@@ -165,7 +157,7 @@ async def check_user_exists(
 
     r.scope["user_id"] = account.id
     if not settings.is_user_allowed(account.id):
-        raise HTTPException(HTTPStatus.FORBIDDEN, "User not allowed.")
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User not allowed.")
 
     user = await get_user_from_account(account)
     if not user:
@@ -201,7 +193,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.FORBIDDEN, "User not authorized. No admin privileges."
+            HTTPStatus.UNAUTHORIZED, "User not authorized. No admin privileges."
         )
     if not user.has_password:
         raise HTTPException(
@@ -214,7 +206,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.FORBIDDEN, "User not authorized. No super user privileges."
+            HTTPStatus.UNAUTHORIZED, "User not authorized. No super user privileges."
         )
     if not user.has_password:
         raise HTTPException(

lnbits/exceptions.py

@@ -7,7 +7,6 @@ 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
 
@@ -72,11 +71,10 @@ 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)
-        exception_id = uuid()
-        logger.error(f"Exception ID: {exception_id}\n{exc!s}")
+        logger.error(f"Exception: {exc!s}")
         return render_html_error(request, exc) or JSONResponse(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            content={"detail": f"Unexpected error! ID: {exception_id}"},
+            content={"detail": str(exc)},
         )
 
     @app.exception_handler(AssertionError)

lnbits/helpers.py

@@ -10,8 +10,8 @@ from urllib.parse import urlparse
 import jinja2
 import jwt
 import shortuuid
+from fastapi import Request
 from fastapi.routing import APIRoute
-from loguru import logger
 from packaging import version
 from pydantic.schema import field_schema
 
@@ -65,52 +65,59 @@ def template_renderer(additional_folders: Optional[list] = None) -> Jinja2Templa
     t = Jinja2Templates(loader=jinja2.FileSystemLoader(folders))
     t.env.globals["static_url_for"] = static_url_for
 
-    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"
-        ),
-    }
+    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
 
-    t.env.globals["WINDOW_SETTINGS"] = window_settings
-    for key, value in window_settings.items():
-        t.env.globals[key] = value
+    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
+    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
 
     if settings.bundle_assets:
         t.env.globals["INCLUDED_JS"] = ["bundle.min.js"]
@@ -124,6 +131,8 @@ 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
 
 
@@ -282,21 +291,12 @@ def is_lnbits_version_ok(
 
 
 def check_callback_url(url: str):
-    if not settings.lnbits_callback_url_rules:
-        # no rules, all urls are allowed
-        return
-    u = urlparse(url)
+    netloc = urlparse(url).netloc
     for rule in settings.lnbits_callback_url_rules:
-        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."
-    )
+        if re.match(rule, netloc) is None:
+            raise ValueError(
+                f"Callback not allowed. URL: {url}. Netloc: {netloc}. Rule: {rule}"
+            )
 
 
 def download_url(url, save_path):
@@ -346,12 +346,5 @@ def normalize_path(path: Optional[str]) -> str:
     return "/" + "/".join(path_segments(path))
 
 
-def safe_upload_file_path(filename: str, directory: str = "images") -> Path:
-    image_folder = Path(settings.lnbits_data_folder, directory)
-    file_path = image_folder / filename
-    # Prevent dir traversal attack
-    if image_folder.resolve() not in file_path.resolve().parents:
-        raise ValueError("Unsafe filename.")
-    # Prevent filename with subdirectories
-    file_path = image_folder / filename.split("/")[-1]
-    return file_path.resolve()
+def normalized_path(request: Request) -> str:
+    return "/" + "/".join(path_segments(request.url.path))

lnbits/nodes/pheonixd.py

@@ -0,0 +1,477 @@
+from __future__ import annotations
+
+import asyncio
+import base64
+import json
+from http import HTTPStatus
+from typing import TYPE_CHECKING
+
+from fastapi import HTTPException
+from httpx import HTTPStatusError
+from loguru import logger
+
+from lnbits.db import Filters, Page
+from lnbits.nodes import Node
+from lnbits.nodes.base import (
+    ChannelBalance,
+    ChannelPoint,
+    ChannelState,
+    ChannelStats,
+    NodeChannel,
+    NodeFees,
+    NodeInfoResponse,
+    NodeInvoice,
+    NodeInvoiceFilters,
+    NodePayment,
+    NodePaymentsFilters,
+    NodePeerInfo,
+    PublicNodeInfo,
+)
+from lnbits.utils.cache import cache
+
+if TYPE_CHECKING:
+    from lnbits.wallets import PhoenixdWallet
+
+
+def msat(raw: str) -> int:
+    return int(raw) * 1000
+
+
+def _decode_bytes(data: str) -> str:
+    return base64.b64decode(data).hex()
+
+
+def _encode_bytes(data: str) -> str:
+    return base64.b64encode(bytes.fromhex(data)).decode()
+
+
+def _encode_urlsafe_bytes(data: str) -> str:
+    return base64.urlsafe_b64encode(bytes.fromhex(data)).decode()
+
+
+def _parse_channel_point(raw: str) -> ChannelPoint:
+    funding_tx, output_index = raw.split(":")
+    return ChannelPoint(
+        funding_txid=funding_tx,
+        output_index=int(output_index),
+    )
+
+
+class PhoenixdNode(Node):
+    wallet: PhoenixdWallet
+
+    async def request(self, method: str, path: str, json: dict | None = None, **kwargs):
+        response = await self.wallet.client.request(
+            method, f"{self.wallet.endpoint}{path}", json=json, **kwargs
+        )
+        try:
+            response.raise_for_status()
+        except HTTPStatusError as exc:
+            json = exc.response.json()
+            if json:
+                error = json.get("error") or json
+                raise HTTPException(
+                    exc.response.status_code, detail=error.get("message")
+                ) from exc
+        return response.json()
+
+    def get(self, path: str, **kwargs):
+        return self.request("GET", path, **kwargs)
+
+    async def _get_id(self) -> str:
+        info = await self.get("/v1/getinfo")
+        return info["identity_pubkey"]
+
+    async def get_peer_ids(self) -> list[str]:
+        response = await self.get("/v1/peers")
+        return [p["pub_key"] for p in response["peers"]]
+
+    async def connect_peer(self, uri: str):
+        try:
+            pubkey, host = uri.split("@")
+        except ValueError as exc:
+            raise HTTPException(400, detail="Invalid peer URI") from exc
+        await self.request(
+            "POST",
+            "/v1/peers",
+            json={
+                "addr": {"pubkey": pubkey, "host": host},
+                "perm": True,
+                "timeout": 30,
+            },
+        )
+
+    async def disconnect_peer(self, peer_id: str):
+        try:
+            await self.request("DELETE", "/v1/peers/" + peer_id)
+        except HTTPException as exc:
+            if "unable to disconnect" in exc.detail:
+                raise HTTPException(
+                    HTTPStatus.BAD_REQUEST, detail="Peer is not connected"
+                ) from exc
+            raise
+
+    async def _get_peer_info(self, peer_id: str) -> NodePeerInfo:
+        try:
+            response = await self.get("/v1/graph/node/" + peer_id)
+        except HTTPException:
+            return NodePeerInfo(id=peer_id)
+        node = response["node"]
+        return NodePeerInfo(
+            id=peer_id,
+            alias=node["alias"],
+            color=node["color"].strip("#"),
+            last_timestamp=node["last_update"],
+            addresses=[a["addr"] for a in node["addresses"]],
+        )
+
+    async def open_channel(
+        self,
+        peer_id: str,
+        local_amount: int,
+        push_amount: int | None = None,
+        fee_rate: int | None = None,
+    ) -> ChannelPoint:
+        response = await self.request(
+            "POST",
+            "/v1/channels",
+            json={
+                "node_pubkey": _encode_bytes(peer_id),
+                "sat_per_vbyte": fee_rate,
+                "local_funding_amount": local_amount,
+                "push_sat": push_amount,
+            },
+        )
+        return ChannelPoint(
+            # WHY IS THIS REVERSED?!
+            funding_txid=bytes(
+                reversed(base64.b64decode(response["funding_txid_bytes"]))
+            ).hex(),
+            output_index=response["output_index"],
+        )
+
+    async def _close_channel(
+        self,
+        point: ChannelPoint,
+        force: bool = False,
+    ):
+        async with self.wallet.client.stream(
+            "DELETE",
+            f"{self.wallet.endpoint}/v1/channels/{point.funding_txid}/{point.output_index}",
+            params={"force": force},
+            timeout=None,
+        ) as stream:
+            async for chunk in stream.aiter_text():
+                if not chunk:
+                    continue
+                chunk = json.loads(chunk)
+                if "error" in chunk:
+                    raise HTTPException(
+                        status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+                        detail=chunk["error"].get("message"),
+                    )
+                logger.info(f"LND Channel close update: {chunk.get('result')}")
+
+    async def close_channel(
+        self,
+        short_id: str | None = None,
+        point: ChannelPoint | None = None,
+        force: bool = False,
+    ):
+        if short_id:
+            logger.debug(f"Closing channel with short_id: {short_id}")
+        if not point:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST, detail="Channel point required"
+            )
+
+        asyncio.create_task(self._close_channel(point, force))  # noqa: RUF006
+
+    async def set_channel_fee(self, channel_id: str, base_msat: int, ppm: int):
+        # https://lightning.engineering/api-docs/api/lnd/lightning/update-channel-policy/
+        channel = await self.get_channel(channel_id)
+        if not channel:
+            raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND, detail="Channel not found"
+            )
+        if not channel.point:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST, detail="Channel point required"
+            )
+        await self.request(
+            "POST",
+            "/v1/chanpolicy",
+            json={
+                "base_fee_msat": base_msat,
+                "fee_rate_ppm": ppm,
+                "chan_point": {
+                    "funding_txid_str": channel.point.funding_txid,
+                    "output_index": channel.point.output_index,
+                },
+                # https://docs.lightning.engineering/lightning-network-tools/lnd/optimal-configuration-of-a-routing-node#channel-defaults
+                "time_lock_delta": 80,
+                # 'max_htlc_msat': <uint64>,
+                # 'min_htlc_msat': <uint64>,
+                # 'inbound_fee': <InboundFee>,
+            },
+        )
+
+    async def get_channel(self, channel_id: str) -> NodeChannel | None:
+        channel_info = await self.get(f"/v1/graph/edge/{channel_id}")
+        info = await self.get("/v1/getinfo")
+        if info["identity_pubkey"] == channel_info["node1_pub"]:
+            my_node_key = "node1"
+            peer_node_key = "node2"
+        else:
+            my_node_key = "node2"
+            peer_node_key = "node1"
+        peer_id = channel_info[f"{peer_node_key}_pub"]
+        peer_b64 = _encode_urlsafe_bytes(peer_id)
+        channels = await self.get(f"/v1/channels?peer={peer_b64}")
+        if "error" in channel_info and "error" in channels:
+            logger.debug("LND get_channel", channels)
+            return None
+        if len(channels["channels"]) == 0:
+            logger.debug(f"LND get_channel no channels founds with id {peer_b64}")
+            return None
+        for channel in channels["channels"]:
+            if channel["chan_id"] == channel_id:
+                peer_info = await self.get_peer_info(peer_id)
+                return NodeChannel(
+                    id=channel.get("chan_id"),
+                    peer_id=peer_info.id,
+                    name=peer_info.alias,
+                    color=peer_info.color,
+                    state=(
+                        ChannelState.ACTIVE
+                        if channel["active"]
+                        else ChannelState.INACTIVE
+                    ),
+                    fee_ppm=channel_info[f"{my_node_key}_policy"][
+                        "fee_rate_milli_msat"
+                    ],
+                    fee_base_msat=channel_info[f"{my_node_key}_policy"][
+                        "fee_base_msat"
+                    ],
+                    point=_parse_channel_point(channel["channel_point"]),
+                    balance=ChannelBalance(
+                        local_msat=msat(channel["local_balance"]),
+                        remote_msat=msat(channel["remote_balance"]),
+                        total_msat=msat(channel["capacity"]),
+                    ),
+                )
+        return None
+
+    async def get_channels(self) -> list[NodeChannel]:
+        normal, pending, closed = await asyncio.gather(
+            self.get("/v1/channels"),
+            self.get("/v1/channels/pending"),
+            self.get("/v1/channels/closed"),
+        )
+
+        channels = []
+
+        async def parse_pending(raw_channels, state):
+            for channel in raw_channels:
+                channel = channel["channel"]
+                info = await self.get_peer_info(channel["remote_node_pub"])
+                channels.append(
+                    NodeChannel(
+                        peer_id=info.id,
+                        state=state,
+                        name=info.alias,
+                        color=info.color,
+                        id=channel.get("chan_id", "node is for pending channels"),
+                        point=_parse_channel_point(channel["channel_point"]),
+                        balance=ChannelBalance(
+                            local_msat=msat(channel["local_balance"]),
+                            remote_msat=msat(channel["remote_balance"]),
+                            total_msat=msat(channel["capacity"]),
+                        ),
+                    )
+                )
+
+        await parse_pending(pending["pending_open_channels"], ChannelState.PENDING)
+        await parse_pending(
+            pending["pending_force_closing_channels"], ChannelState.CLOSED
+        )
+        await parse_pending(pending["waiting_close_channels"], ChannelState.CLOSED)
+
+        for channel in closed["channels"]:
+            info = await self.get_peer_info(channel["remote_pubkey"])
+            channels.append(
+                NodeChannel(
+                    id=channel.get("chan_id", "node is for closing channels"),
+                    peer_id=info.id,
+                    state=ChannelState.CLOSED,
+                    name=info.alias,
+                    color=info.color,
+                    point=_parse_channel_point(channel["channel_point"]),
+                    balance=ChannelBalance(
+                        local_msat=0,
+                        remote_msat=0,
+                        total_msat=msat(channel["capacity"]),
+                    ),
+                )
+            )
+
+        for channel in normal["channels"]:
+            info = await self.get_peer_info(channel["remote_pubkey"])
+            channels.append(
+                NodeChannel(
+                    id=channel["chan_id"],
+                    short_id=channel["chan_id"],
+                    point=_parse_channel_point(channel["channel_point"]),
+                    peer_id=channel["remote_pubkey"],
+                    balance=ChannelBalance(
+                        local_msat=msat(channel["local_balance"]),
+                        remote_msat=msat(channel["remote_balance"]),
+                        total_msat=msat(channel["capacity"]),
+                    ),
+                    state=(
+                        ChannelState.ACTIVE
+                        if channel["active"]
+                        else ChannelState.INACTIVE
+                    ),
+                    # name=channel['peer_alias'],
+                    name=info.alias,
+                    color=info.color,
+                )
+            )
+
+        return channels
+
+    async def get_public_info(self) -> PublicNodeInfo:
+        info = await self.get("/v1/getinfo")
+        channels = await self.get_channels()
+        return PublicNodeInfo(
+            backend_name="LND",
+            id=info["identity_pubkey"],
+            color=info["color"].lstrip("#"),
+            alias=info["alias"],
+            num_peers=info["num_peers"],
+            blockheight=info["block_height"],
+            addresses=info["uris"],
+            channel_stats=ChannelStats.from_list(channels),
+        )
+
+    async def get_info(self) -> NodeInfoResponse:
+        public = await self.get_public_info()
+        onchain = await self.get("/v1/balance/blockchain")
+        fee_report = await self.get("/v1/fees")
+        balance = await self.get("/v1/balance/channels")
+        return NodeInfoResponse(
+            **public.dict(),
+            onchain_balance_sat=onchain["total_balance"],
+            onchain_confirmed_sat=onchain["confirmed_balance"],
+            balance_msat=balance["local_balance"]["msat"],
+            fees=NodeFees(
+                total_msat=0,
+                daily_msat=fee_report["day_fee_sum"],
+                weekly_msat=fee_report["week_fee_sum"],
+                monthly_msat=fee_report["month_fee_sum"],
+            ),
+        )
+
+    async def get_payments(
+        self, filters: Filters[NodePaymentsFilters]
+    ) -> Page[NodePayment]:
+        count_key = "node:payments_count"
+        payments_count = cache.get(count_key)
+        if not payments_count and filters.offset:
+            # this forces fetching the payments count
+            await self.get_payments(Filters(limit=1))
+            payments_count = cache.get(count_key)
+
+        if filters.offset and payments_count:
+            index_offset = max(payments_count + 1 - filters.offset, 0)
+        else:
+            index_offset = 0
+
+        response = await self.get(
+            "/v1/payments",
+            params={
+                "index_offset": index_offset,
+                "max_payments": filters.limit,
+                "include_incomplete": True,
+                "reversed": True,
+                "count_total_payments": not index_offset,
+            },
+        )
+
+        if not filters.offset:
+            payments_count = int(response["total_num_payments"])
+
+        cache.set(count_key, payments_count)
+
+        payments = [
+            NodePayment(
+                payment_hash=payment["payment_hash"],
+                pending=payment["status"] == "IN_FLIGHT",
+                amount=payment["value_msat"],
+                fee=payment["fee_msat"],
+                time=payment["creation_date"],
+                destination=(
+                    await self.get_peer_info(
+                        payment["htlcs"][0]["route"]["hops"][-1]["pub_key"]
+                    )
+                    if payment["htlcs"]
+                    else None
+                ),
+                bolt11=payment["payment_request"],
+                preimage=payment["payment_preimage"],
+            )
+            for payment in response["payments"]
+        ]
+
+        payments.sort(key=lambda p: p.time, reverse=True)
+
+        return Page(data=payments, total=payments_count or 0)
+
+    async def get_invoices(
+        self, filters: Filters[NodeInvoiceFilters]
+    ) -> Page[NodeInvoice]:
+        last_invoice_key = "node:last_invoice_index"
+        last_invoice_index = cache.get(last_invoice_key)
+        if not last_invoice_index and filters.offset:
+            # this forces fetching the last invoice index so
+            await self.get_invoices(Filters(limit=1))
+            last_invoice_index = cache.get(last_invoice_key)
+
+        if filters.offset and last_invoice_index:
+            index_offset = max(last_invoice_index + 1 - filters.offset, 0)
+        else:
+            index_offset = 0
+
+        response = await self.get(
+            "/v1/invoices",
+            params={
+                "index_offset": index_offset,
+                "num_max_invoices": filters.limit,
+                "reversed": True,
+            },
+        )
+
+        if not filters.offset:
+            last_invoice_index = int(response["last_index_offset"])
+
+        cache.set(last_invoice_key, last_invoice_index)
+
+        invoices = [
+            NodeInvoice(
+                payment_hash=_decode_bytes(invoice["r_hash"]),
+                amount=invoice["value_msat"],
+                memo=invoice["memo"],
+                pending=invoice["state"] == "OPEN",
+                paid_at=invoice["settle_date"],
+                expiry=int(invoice["creation_date"]) + int(invoice["expiry"]),
+                preimage=_decode_bytes(invoice["r_preimage"]),
+                bolt11=invoice["payment_request"],
+            )
+            for invoice in reversed(response["invoices"])
+        ]
+
+        return Page(
+            data=invoices,
+            total=last_invoice_index or 0,
+        )

lnbits/settings.py

@@ -4,16 +4,16 @@ import importlib
 import importlib.metadata
 import inspect
 import json
-import os
 import re
 from datetime import datetime, timezone
 from enum import Enum
+from hashlib import sha256
 from os import path
 from pathlib import Path
 from time import gmtime, strftime, time
 from typing import Any
-from uuid import uuid4
 
+import httpx
 from loguru import logger
 from pydantic import BaseModel, BaseSettings, Extra, Field, validator
 
@@ -260,7 +260,7 @@ class ThemesSettings(LNbitsSettings):
     lnbits_ad_space_enabled: bool = Field(default=False)
     lnbits_allowed_currencies: list[str] = Field(default=[])
     lnbits_default_accounting_currency: str | None = Field(default=None)
-    lnbits_qr_logo: str = Field(default="/static/images/favicon_qr_logo.png")
+    lnbits_qr_logo: str = Field(default="/static/images/logos/lnbits.png")
     lnbits_default_reaction: str = Field(default="confettiBothSides")
     lnbits_default_theme: str = Field(default="salvador")
     lnbits_default_border: str = Field(default="hard-border")
@@ -271,29 +271,13 @@ class ThemesSettings(LNbitsSettings):
 class OpsSettings(LNbitsSettings):
     lnbits_baseurl: str = Field(default="http://127.0.0.1:5000/")
     lnbits_hide_api: bool = Field(default=False)
-    lnbits_upload_size_bytes: int = Field(default=512_000, ge=0)  # 500kb
-    lnbits_upload_allowed_types: list[str] = Field(
-        default=[
-            "image/png",
-            "image/jpeg",
-            "image/jpg",
-            "image/heic",
-            "image/heif",
-            "image/heics",
-            "png",
-            "jpeg",
-            "jpg",
-            "heic",
-            "heif",
-            "heics",
-        ]
-    )
+    lnbits_denomination: str = Field(default="sats")
 
 
 class FeeSettings(LNbitsSettings):
-    lnbits_reserve_fee_min: int = Field(default=2000, ge=0)
-    lnbits_reserve_fee_percent: float = Field(default=1.0, ge=0)
-    lnbits_service_fee: float = Field(default=0, ge=0)
+    lnbits_reserve_fee_min: int = Field(default=2000)
+    lnbits_reserve_fee_percent: float = Field(default=1.0)
+    lnbits_service_fee: float = Field(default=0)
     lnbits_service_fee_ignore_internal: bool = Field(default=True)
     lnbits_service_fee_max: int = Field(default=0)
     lnbits_service_fee_wallet: str | None = Field(default=None)
@@ -309,9 +293,9 @@ class FeeSettings(LNbitsSettings):
 
 
 class ExchangeProvidersSettings(LNbitsSettings):
-    lnbits_exchange_rate_cache_seconds: int = Field(default=30, ge=0)
-    lnbits_exchange_history_size: int = Field(default=60, ge=0)
-    lnbits_exchange_history_refresh_interval_seconds: int = Field(default=300, ge=0)
+    lnbits_exchange_rate_cache_seconds: int = Field(default=30)
+    lnbits_exchange_history_size: int = Field(default=60)
+    lnbits_exchange_history_refresh_interval_seconds: int = Field(default=300)
 
     lnbits_exchange_rate_providers: list[ExchangeRateProvider] = Field(
         default=[
@@ -376,24 +360,24 @@ class ExchangeProvidersSettings(LNbitsSettings):
 
 
 class SecuritySettings(LNbitsSettings):
-    lnbits_rate_limit_no: int = Field(default=200, ge=0)
+    lnbits_rate_limit_no: str = Field(default="200")
     lnbits_rate_limit_unit: str = Field(default="minute")
     lnbits_allowed_ips: list[str] = Field(default=[])
     lnbits_blocked_ips: list[str] = Field(default=[])
     lnbits_callback_url_rules: list[str] = Field(
-        default=["https?://([a-zA-Z0-9.-]+\\.[a-zA-Z]{2,})(:\\d+)?"]
+        default=["^(?!\\d+\\.\\d+\\.\\d+\\.\\d+$)(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$"]
     )
 
-    lnbits_wallet_limit_max_balance: int = Field(default=0, ge=0)
-    lnbits_wallet_limit_daily_max_withdraw: int = Field(default=0, ge=0)
-    lnbits_wallet_limit_secs_between_trans: int = Field(default=0, ge=0)
+    lnbits_wallet_limit_max_balance: int = Field(default=0)
+    lnbits_wallet_limit_daily_max_withdraw: int = Field(default=0)
+    lnbits_wallet_limit_secs_between_trans: int = Field(default=0)
     lnbits_only_allow_incoming_payments: bool = Field(default=False)
     lnbits_watchdog_switch_to_voidwallet: bool = Field(default=False)
-    lnbits_watchdog_interval_minutes: int = Field(default=60, gt=0)
-    lnbits_watchdog_delta: int = Field(default=1_000_000, gt=0)
+    lnbits_watchdog_interval_minutes: int = Field(default=60)
+    lnbits_watchdog_delta: int = Field(default=1_000_000)
 
-    lnbits_max_outgoing_payment_amount_sats: int = Field(default=10_000_000, ge=0)
-    lnbits_max_incoming_payment_amount_sats: int = Field(default=10_000_000, ge=0)
+    lnbits_max_outgoing_payment_amount_sats: int = Field(default=10_000_000)
+    lnbits_max_incoming_payment_amount_sats: int = Field(default=10_000_000)
 
     def is_wallet_max_balance_exceeded(self, amount):
         return (
@@ -412,7 +396,6 @@ class NotificationsSettings(LNbitsSettings):
     lnbits_telegram_notifications_chat_id: str = Field(default="")
     lnbits_email_notifications_enabled: bool = Field(default=False)
     lnbits_email_notifications_email: str = Field(default="")
-    lnbits_email_notifications_username: str = Field(default="")
     lnbits_email_notifications_password: str = Field(default="")
     lnbits_email_notifications_server: str = Field(default="smtp.protonmail.ch")
     lnbits_email_notifications_port: int = Field(default=587)
@@ -423,18 +406,13 @@ class NotificationsSettings(LNbitsSettings):
     notification_balance_delta_changed: bool = Field(default=True)
     lnbits_notification_server_start_stop: bool = Field(default=True)
     lnbits_notification_watchdog: bool = Field(default=False)
-    lnbits_notification_server_status_hours: int = Field(default=24, gt=0)
-    lnbits_notification_incoming_payment_amount_sats: int = Field(
-        default=1_000_000, ge=0
-    )
-    lnbits_notification_outgoing_payment_amount_sats: int = Field(
-        default=1_000_000, ge=0
-    )
+    lnbits_notification_server_status_hours: int = Field(default=24)
+    lnbits_notification_incoming_payment_amount_sats: int = Field(default=1_000_000)
+    lnbits_notification_outgoing_payment_amount_sats: int = Field(default=1_000_000)
 
 
 class FakeWalletFundingSource(LNbitsSettings):
     fake_wallet_secret: str = Field(default="ToTheMoon1")
-    lnbits_denomination: str = Field(default="sats")
 
 
 class LNbitsFundingSource(LNbitsSettings):
@@ -556,15 +534,8 @@ class BoltzFundingSource(LNbitsSettings):
     boltz_client_cert: 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):
-    lightning_invoice_expiry: int = Field(default=3600, gt=0)
+    lightning_invoice_expiry: int = Field(default=3600)
 
 
 class FundingSourcesSettings(
@@ -587,12 +558,11 @@ 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
     # It will not fail the payment, it will make it return pending after the timeout
-    lnbits_funding_source_pay_invoice_wait_seconds: int = Field(default=5, ge=0)
+    lnbits_funding_source_pay_invoice_wait_seconds: int = Field(default=5)
 
 
 class WebPushSettings(LNbitsSettings):
@@ -631,7 +601,7 @@ class AuthMethods(Enum):
 
 
 class AuthSettings(LNbitsSettings):
-    auth_token_expire_minutes: int = Field(default=525600, gt=0)
+    auth_token_expire_minutes: int = Field(default=525600)
     auth_all_methods = [a.value for a in AuthMethods]
     auth_allowed_methods: list[str] = Field(
         default=[
@@ -641,7 +611,7 @@ class AuthSettings(LNbitsSettings):
     )
     # How many seconds after login the user is allowed to update its credentials.
     # A fresh login is required afterwards.
-    auth_credetials_update_threshold: int = Field(default=120, gt=0)
+    auth_credetials_update_threshold: int = Field(default=120)
 
     def is_auth_method_allowed(self, method: AuthMethods):
         return method.value in self.auth_allowed_methods
@@ -667,15 +637,13 @@ 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):
     lnbits_audit_enabled: bool = Field(default=True)
 
     # number of days to keep the audit entry
-    lnbits_audit_retention_days: int = Field(default=7, ge=0)
+    lnbits_audit_retention_days: int = Field(default=7)
 
     lnbits_audit_log_ip_address: bool = Field(default=False)
     lnbits_audit_log_path_params: bool = Field(default=True)
@@ -812,7 +780,7 @@ class EnvSettings(LNbitsSettings):
     debug_database: bool = Field(default=False)
     bundle_assets: bool = Field(default=True)
     host: str = Field(default="127.0.0.1")
-    port: int = Field(default=5000, gt=0)
+    port: int = Field(default=5000)
     forwarded_allow_ips: str = Field(default="*")
     lnbits_title: str = Field(default="LNbits API")
     lnbits_path: str = Field(default=".")
@@ -824,27 +792,24 @@ class EnvSettings(LNbitsSettings):
     enable_log_to_file: bool = Field(default=True)
     log_rotation: str = Field(default="100 MB")
     log_retention: str = Field(default="3 months")
-
-    cleanup_wallets_days: int = Field(default=90, ge=0)
-    funding_source_max_retries: int = Field(default=4, ge=0)
+    server_startup_time: int = Field(default=time())
+    cleanup_wallets_days: int = Field(default=90)
+    funding_source_max_retries: int = Field(default=4)
 
     @property
     def has_default_extension_path(self) -> bool:
         return self.lnbits_extensions_path == "lnbits"
 
-    def check_auth_secret_key(self):
-        if self.auth_secret_key:
-            return
-        if not os.path.isdir(settings.lnbits_data_folder):
-            os.mkdir(settings.lnbits_data_folder)
-        auth_key_file = Path(settings.lnbits_data_folder, ".lnbits_auth_key")
-        if auth_key_file.is_file():
-            with open(auth_key_file) as file:
-                self.auth_secret_key = file.readline()
-            return
-        self.auth_secret_key = uuid4().hex
-        with open(auth_key_file, "w+") as file:
-            file.write(self.auth_secret_key)
+    @property
+    def lnbits_server_up_time(self) -> str:
+        up_time = int(time() - self.server_startup_time)
+        return strftime("%H:%M:%S", gmtime(up_time))
+
+
+class SaaSSettings(LNbitsSettings):
+    lnbits_saas_callback: str | None = Field(default=None)
+    lnbits_saas_secret: str | None = Field(default=None)
+    lnbits_saas_instance_id: str | None = Field(default=None)
 
 
 class PersistenceSettings(LNbitsSettings):
@@ -873,7 +838,6 @@ class SuperUserSettings(LNbitsSettings):
             "VoidWallet",
             "ZBDWallet",
             "NWCWallet",
-            "StrikeWallet",
         ]
     )
 
@@ -897,13 +861,6 @@ class TransientSettings(InstalledExtensionsSettings, ExchangeHistorySettings):
 
     lnbits_all_extensions_ids: set[str] = Field(default=[])
 
-    server_startup_time: int = Field(default=time())
-
-    @property
-    def lnbits_server_up_time(self) -> str:
-        up_time = int(time() - self.server_startup_time)
-        return strftime("%H:%M:%S", gmtime(up_time))
-
     @classmethod
     def readonly_fields(cls):
         return [f for f in inspect.signature(cls).parameters if not f.startswith("_")]
@@ -912,6 +869,7 @@ class TransientSettings(InstalledExtensionsSettings, ExchangeHistorySettings):
 class ReadOnlySettings(
     EnvSettings,
     ExtensionsInstallSettings,
+    SaaSSettings,
     PersistenceSettings,
     SuperUserSettings,
 ):
@@ -990,6 +948,31 @@ def set_cli_settings(**kwargs):
         setattr(settings, key, value)
 
 
+def send_admin_user_to_saas():
+    if settings.lnbits_saas_callback:
+        with httpx.Client() as client:
+            headers = {
+                "Content-Type": "application/json; charset=utf-8",
+                "X-API-KEY": settings.lnbits_saas_secret,
+            }
+            payload = {
+                "instance_id": settings.lnbits_saas_instance_id,
+                "adminuser": settings.super_user,
+            }
+            try:
+                client.post(
+                    settings.lnbits_saas_callback,
+                    headers=headers,
+                    json=payload,
+                )
+                logger.success("sent super_user to saas application")
+            except Exception as e:
+                logger.error(
+                    "error sending super_user to saas:"
+                    f" {settings.lnbits_saas_callback}. Error: {e!s}"
+                )
+
+
 readonly_variables = ReadOnlySettings.readonly_fields()
 transient_variables = TransientSettings.readonly_fields()
 
@@ -998,8 +981,9 @@ settings = Settings()
 settings.lnbits_path = str(path.dirname(path.realpath(__file__)))
 
 settings.version = importlib.metadata.version("lnbits")
-
-settings.check_auth_secret_key()
+settings.auth_secret_key = (
+    settings.auth_secret_key or sha256(settings.super_user.encode("utf-8")).hexdigest()
+)
 
 if not settings.user_agent:
     settings.user_agent = f"LNbits/{settings.version}"

lnbits/static/css/base.css

@@ -110,16 +110,16 @@ body[data-theme=bitcoin].body--light {
 }
 
 [data-theme=bitcoin] .bg-primary {
-  background: #ea611d !important;
+  background: #ff9853 !important;
 }
 [data-theme=bitcoin] .text-primary {
-  color: #ea611d !important;
+  color: #ff9853 !important;
 }
 [data-theme=bitcoin] .bg-secondary {
-  background: #e56f35 !important;
+  background: #ff7353 !important;
 }
 [data-theme=bitcoin] .text-secondary {
-  color: #e56f35 !important;
+  color: #ff7353 !important;
 }
 [data-theme=bitcoin] .bg-dark {
   background: #2d293b !important;
@@ -134,10 +134,10 @@ body[data-theme=bitcoin].body--light {
   color: #333646 !important;
 }
 [data-theme=bitcoin] .bg-marginal-bg {
-  background: #000000 !important;
+  background: #2d293b !important;
 }
 [data-theme=bitcoin] .text-marginal-bg {
-  color: #000000 !important;
+  color: #2d293b !important;
 }
 [data-theme=bitcoin] .bg-marginal-text {
   background: #fff !important;

lnbits/static/i18n/en.js

@@ -27,7 +27,6 @@ window.localisation.en = {
   close_channel: 'Close Channel',
   close: 'Close',
   restart: 'Restart server',
-  image_library: 'Image Library',
   save: 'Save',
   save_tooltip: 'Save your changes',
   credit_debit: 'Credit / Debit',
@@ -49,11 +48,8 @@ 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 wallet',
-  add_new_wallet: 'Add a new wallet',
-  pin_wallet: 'Pin wallet',
+  add_wallet: 'Add a new wallet',
   delete_wallet: 'Delete wallet',
   delete_wallet_desc:
     'This whole wallet will be deleted, the funds will be UNRECOVERABLE.',
@@ -68,9 +64,9 @@ window.localisation.en = {
   donate: 'Donate',
   view_github: 'View on GitHub',
   voidwallet_active: 'VoidWallet is active! Payments disabled',
-  service_fee_badge: 'Service fee: {amount} % per transaction',
-  service_fee_max_badge:
-    'Service fee: {amount} % per transaction (max {max} {denom})',
+  use_with_caution: 'USE WITH CAUTION - {name} wallet is still in BETA',
+  service_fee: 'Service fee: {amount} % per transaction',
+  service_fee_max: 'Service fee: {amount} % per transaction (max {max} sats)',
   service_fee_tooltip:
     'Service fee charged by the LNbits server admin per outgoing transaction',
   toggle_darkmode: 'Toggle Dark Mode',
@@ -120,7 +116,7 @@ window.localisation.en = {
   copy_wallet_url: 'Copy wallet URL',
   disclaimer_dialog_title: 'Important!',
   disclaimer_dialog:
-    'You *must* save your  login credentials to be able to access your wallet again. If you lose them, you will lose access to your wallet and funds.\n\nFind your  login credentials on your account settings page.\n\nLNbits holds no responsibility for loss of access to funds.',
+    'You *must* save your  login credentials to be able to access your wallet again. If you lose them, you will lose access to your wallet and funds.\n\nFind your  login credentials on your account settings page.\n\nThis service is in BETA. LNbits holds no responsibility for loss of access to funds.',
   no_transactions: 'No transactions made yet',
   manage: 'Manage',
   exchanges: 'Exchanges',
@@ -128,7 +124,6 @@ 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:
@@ -180,7 +175,6 @@ window.localisation.en = {
   payment_proof: 'Payment Proof',
   update: 'Update',
   update_available: 'Update {version} available!',
-  funding_sources: 'Funding Sources',
   latest_update: 'You are on the latest version {version}.',
   notifications: 'Notifications',
   notifications_configure: 'Configure Notifications',
@@ -204,13 +198,9 @@ window.localisation.en = {
 
   notifications_email_config: 'Email Configuration',
   notifications_enable_email: 'Enable Email',
-  notifications_enable_email_desc: 'Send notifications over email',
-  notifications_send_test_email: 'Send test email',
+  notifications_enable_email_desc: 'Send notfications over Email',
   notifications_send_email: 'Send email',
   notifications_send_email_desc: 'Email you will send from',
-  notifications_send_email_username: 'Username',
-  notifications_send_email_username_desc:
-    'Username, will use the email if not set',
   notifications_send_email_password: 'Send email password',
   notifications_send_email_password_desc:
     'Password for the email you will send from',
@@ -268,7 +258,6 @@ 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',
@@ -283,7 +272,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 these rules. At leat one rule must match. No rule means all URLs are allowed.',
+    'Callback URLs (like LNURL one) will be validated against all of these rules. No rule means all URLs are allowed.',
   wallet_limiter: 'Wallet Limiter',
   wallet_config: 'Wallet Config',
   wallet_charts: 'Wallet Charts',
@@ -308,9 +297,6 @@ 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',
@@ -319,26 +305,21 @@ 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_custom_org: 'Sign in with {custom_org}',
+  signin_with_keycloak: 'Sign in with Keycloak',
   username_or_email: 'Username or Email',
   password: 'Password',
   password_config: 'Password Config',
   password_repeat: 'Password repeat',
-  update_password: 'Update Password',
   change_password: 'Change Password',
   update_credentials: 'Update Credentials',
   update_pubkey: 'Update Public Key',
   set_password: 'Set Password',
   invalid_password: 'Password must have at least 8 characters',
-  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',
@@ -349,7 +330,6 @@ window.localisation.en = {
   invalid_username: 'Invalid Username',
   auth_provider: 'Auth Provider',
   my_account: 'My Account',
-  existing_account_question: 'Already have an account?',
   background_image: 'Background Image',
   back: 'Back',
   logout: 'Logout',
@@ -365,7 +345,6 @@ 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.',
@@ -456,7 +435,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 (sec)',
+  payment_wait_time: 'Payment Wait Time',
   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',
@@ -482,8 +461,6 @@ 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',
@@ -511,11 +488,9 @@ window.localisation.en = {
     'Disable Service Fee for Internal Lightning Payments',
   ui_management: 'UI Management',
   ui_site_title: 'Site Title',
-  ui_changing_remove_lnbits_elements:
-    ' (changing will remove LNbits elements on the homepage and footer)',
   ui_site_tagline: 'Site Tagline',
-  ui_elements_enable: 'Enable elements on homepage/footer',
-  ui_elements_disable: 'Disable elements on homepage/footer',
+  ui_elements_enable: 'Enable elements on homepage',
+  ui_elements_disable: 'Disable elements on homepage',
   ui_toggle_elements_tip: "Remove homepage elements like 'runs on' etc",
   ui_site_description: 'Site Description',
   ui_site_description_hint: 'Use plain text, Markdown, or raw HTML',
@@ -525,13 +500,14 @@ window.localisation.en = {
   denomination: 'Denomination',
   denomination_hint: 'The name for the FakeWallet token',
   denomination_error: 'Denomination must be 3 characters, or `sats`',
-  ui_qr_code_logo: 'QR Code/Favicon Logo',
-  ui_qr_code_logo_hint: 'QR code and favicon logo url',
+  ui_qr_code_logo: 'QR Code Logo',
+  ui_qr_code_logo_hint: 'URL to logo image in QR code',
   ui_custom_image: 'Custom Image',
   ui_custom_image_label: 'URL to custom image',
   ui_custom_image_hint: 'Image showed at homepage/login',
   ui_custom_badge: 'Custom Badge',
-  ui_custom_badge_label: "Custom Badge 'USE WITH CAUTION'",
+  ui_custom_badge_label:
+    "Custom Badge 'USE WITH CAUTION - LNbits wallet is still in BETA'",
   ui_custom_badge_color_label: 'Custom Badge Color',
   themes: 'Themes',
   themes_hint: 'Choose themes available for users',
@@ -584,6 +560,5 @@ window.localisation.en = {
   view_list: 'View wallets as list',
   view_column: 'View wallets as rows',
   filter_payments: 'Filter payments',
-  filter_date: 'Filter by date',
-  websocket_example: 'Websocket example'
+  filter_date: 'Filter by date'
 }

lnbits/static/i18n/fi.js

@@ -5,8 +5,8 @@ window.localisation.fi = {
   site_customisation: 'Sivuston kustomointi',
   funding: 'Rahoitus',
   users: 'Käyttäjät',
-  audit: 'Seuranta',
-  api_watch: 'API-seuranta',
+  audit: 'Auditointi',
+  api_watch: 'Api Watch',
   apps: 'Sovellukset',
   channels: 'Kanavat',
   transactions: 'Tapahtumat',
@@ -27,7 +27,6 @@ window.localisation.fi = {
   close_channel: 'Sulje kanava',
   close: 'Sulje',
   restart: 'Palvelimen uudelleen käynnistys',
-  image_library: 'Kuvakirjasto',
   save: 'Tallenna',
   save_tooltip: 'Tallenna muutokset',
   credit_debit: 'Hyvitä / Veloita',
@@ -38,7 +37,7 @@ window.localisation.fi = {
     'Virtuaalivarojen ({amount} sat) hyvitys-/veloitustapahtuma onnistui. Maksukyky riippuuu rahoituslähteen todellisista varoista.',
   restart_tooltip: 'Uudelleenkäynnistä palvelu muutosten käyttöönottamiseksi',
   add_funds_tooltip: 'Lisää varoja lompakkoon',
-  reset_defaults: 'Palauta oletusasetukset',
+  reset_defaults: 'Peruuta muutokset',
   reset_defaults_tooltip:
     'Poista kaikki asetusten muutokset ja palauta järjestelmän oletusasetukset.',
   download_backup: 'Lataa tietokannan varmuuskopio',
@@ -66,7 +65,8 @@ window.localisation.fi = {
     'Näyttää että sinulla on lunastamattomia bitcoin varoja, mutta sinulla ei vielä ole lompakkoa. Lunasta varat allaolevaa nappia painamalla, ja sinulle luodaan lompakko.',
   donate: 'Lahjoita',
   view_github: 'Näytä GitHub:ssa',
-  voidwallet_active: 'VoidWallet on aktiivinen. Se ei tue maksutapahtumia!',
+  voidwallet_active:
+    'Maksutapahtumat ovat poissa käytöstä, koska VoidWallet on aktiivinen!',
   use_with_caution:
     'KÄYTÄ VAROEN - BETA-ohjelmisto on käytössä palvelussa: {name}',
   service_fee_tooltip:
@@ -84,7 +84,6 @@ window.localisation.fi = {
   create_invoice: 'Laskuta',
   camera_tooltip: 'Kuvaa lasku tai QR-koodi',
   export_csv: 'Vie CSV-tiedostoon',
-  export_csv_details: 'Vie CSV-tiedostoon lisätietoineen',
   chart_tooltip: 'Näytä kaaviokuva',
   pending: 'Odottaa',
   copy_invoice: 'Kopioi lasku',
@@ -100,7 +99,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 odottaa maksua',
+  invoice_waiting: 'Lasku osottaa maksamista',
   payment_received: 'Maksu vastaanotettu',
   payment_sent: 'Maksu lähetetty',
   payment_failed: 'Maksu epäonnistui',
@@ -114,10 +113,10 @@ window.localisation.fi = {
   copy_wallet_url: 'Kopioi lompakon URL',
   disclaimer_dialog_title: 'Tärkeää!',
   disclaimer_dialog:
-    'Sinun *PITÄÄ TALLETTAA*  kirjautumistietosi turvallisesta ja helposti saataville, jotta pääset jatkossa kirjautumaan lompakkoosi! Löydät kirjautumistiedot Tilin asetukset -sivulta. Kukaan ei ota mitään vastuuta varojen säilymisestä tai niiden käytettävyyden takaamisesta.',
+    'Sinun *PITÄÄ TALLETTAA*  kirjautumistietosi turvallisesta ja helposti saataville, jotta pääset jatkossa kirjautumaan lompakkoosi! Löydät kirjautumistiedot Tilin asetukset -sivulta. Tämä palvelu on kokeiluvaiheessa (eli BETA), ja niinpä kukaan ei ota mitään vastuuta varojen säilymisestä tai niiden käytettävyyden takaamisesta.',
   no_transactions: 'Lompakossa ei ole yhtään tapahtumaa',
   manage: 'Hallinnointi',
-  exchanges: 'Vaihtokurssit',
+  exchanges: 'Pörssit',
   extensions: 'Laajennukset',
   no_extensions: 'Laajennuksia ei ole asennettu :(',
   created: 'Luotu',
@@ -125,7 +124,7 @@ window.localisation.fi = {
   extension_sources: 'Laajennuslähteet',
   ext_sources_hint: 'Lähteet joista laajennuksia voi ladata',
   ext_sources_label:
-    'Lähde-URL (käytä vain virallista LNbits tai muuta luotettaa laajennuslähdettä)',
+    'Lähde-URL (käytä vain virallista LNbits ja luotettavia laajennuslähteitä)',
   warning: 'Varoitus',
   repository: 'Laajennuksien lähde',
   confirm_continue: 'Haluatko varmasti jatkaa?',
@@ -169,12 +168,11 @@ window.localisation.fi = {
   tag: 'Tunniste',
   unit: 'Yksikkö',
   description: 'Kuvaus',
-  expiry: 'Vanhenee',
+  expiry: 'Vanheneminen',
   webhook: 'Webhook',
   payment_proof: 'Maksun varmenne',
   update: 'Päivitä',
   update_available: 'Saatavilla on päivitys {version}-versioon!',
-  update_available: 'Rahoituslähteet',
   latest_update:
     'Käytössä oleva versio {version}, on viimeisin saatavilla oleva.',
   notifications: 'Tiedotteet',
@@ -184,7 +182,7 @@ window.localisation.fi = {
   notifications_enable_nostr_desc: 'Lähetä tietodukset Nostr:in kautta',
   notifications_nostr_private_key: 'Nostr-yksityisavain',
   notifications_nostr_private_key_desc:
-    'Yksityinen avain (hex tai nsec) Nostr-viestien lähettämisen allekirjoitukseen',
+    'Yksityinen avain (hex tai nsec) Nostr viestien lähettämisen allekirjoitukseen',
   notifications_nostr_identifiers: 'Nostr-tunnisteet',
   notifications_nostr_identifiers_desc:
     'Lista tunnisteista kenelle tiedotukset lähetetään',
@@ -197,25 +195,6 @@ window.localisation.fi = {
   notifications_chat_id: 'Keskustelun tunnus',
   notifications_chat_id_desc: 'Keskustelun tunnus minne tiedotukset lähetetään',
 
-  notifications_email_config: 'Sähköposti määritykset',
-  notifications_enable_email: 'Käytä sähköpostia',
-  notifications_enable_email_desc: 'Lähetä tiedotteet sähköpostilla',
-  notifications_send_test_email: 'Lähetä testiposti',
-  notifications_send_email: 'Lähetä sähköpostiosoitteella',
-  notifications_send_email_desc: 'Lähettäjänä näkyvä sähköpostiosoite',
-  notifications_send_email_username: 'Käyttäjätunnus',
-  notifications_send_email_username_desc:
-    'Käyttäjätunnus, mikäli tyhjä, käytetään sähköpostiosoitetta',
-  notifications_send_email_password: 'Lähtevän sähköpostin salasana',
-  notifications_send_email_password_desc: 'Salasana lähettävälle sähköpostille',
-  notifications_send_email_server_port: 'Lähtevän sähköpostin SMTP-portti',
-  notifications_send_email_server_port_desc: 'SMTP-palvelimen portti',
-  notifications_send_email_server: 'Lähtevän sähköpostin SMTP-palvelin',
-  notifications_send_email_server_desc:
-    'SMTP-palvelin jonka kautta sähköpostit lähetetään',
-  notifications_send_to_emails: 'Sähköpostien vastaanottaja',
-  notifications_send_to_emails_desc: 'Kenelle sähköpostit lähetetään',
-
   notification_settings_update: 'Asetuksia päivitetty',
   notification_settings_update_desc:
     'Tiedota kun palvelimen asetuksia on päivitetty',
@@ -234,15 +213,15 @@ window.localisation.fi = {
 
   notification_incoming_payment: 'Saapuvat maksut',
   notification_incoming_payment_desc:
-    'Tiedota kun lompakon vastaanottaman ja saapuvan maksun määrä ylittää rajan (sat)',
+    'Tiedota kun lompakko vastaanottaa ja saapuvan maksun määrä ylittää rajan (sat)',
 
   notification_outgoing_payment: 'Lähtevät maksut',
   notification_outgoing_payment_desc:
-    'Tiedota kun lompakon lähettävän ja maksettavan maksun määrä ylittää rajan (sat)',
+    'Tiedota kun lompakko lähettää ja lähtevän maksun määrä ylittää rajan (sat)',
 
-  notification_credit_debit: 'Hyvitys / Veloitus',
+  notification_credit_debit: 'Hyvitä / Veloita',
   notification_credit_debit_desc:
-    'Tiedota kun Superuser tekee lompakon hyvitys- tai veloitustapahtumia',
+    'Tiedota kun lompakkoa Superuser hyvittää tai veloittaa lompakkoa',
 
   notification_balance_delta_changed: 'Saldon määrän muutos',
   notification_balance_delta_changed_desc:
@@ -256,48 +235,48 @@ window.localisation.fi = {
     'Tällä määritetään kuinka usein taustatoiminto tarkistaa varojen Delta-muutokset [node_balance - lnbits_balance] killswitch-signaalille. Hakujen väli ilmoitetaan minuutteina.',
   watchdog_delta: 'Watchdog Delta',
   watchdog_delta_desc:
-    'Mikäli rahoituslähteen saldo laskee alle LNbits kokonaissaldon, muutetaan rahoituslähteeksi heti VoidWallet. Päivittämisen jälkeen asetus pitää päivittää manuaalisestsi.',
+    'Mikäli rahoituslähteen saldo laskee alle LNbits kokonaissaldon, muutetaan Rahoituslähteeksi muutetaan heti VoidWallet. Päivittämisen jälkeen asetus pitää päivittää manuaalisestsi.',
   status: 'Tilanne',
   notification_source: 'Tiedotteiden lähde',
   notification_source_label:
     'Lähde-URL (käytä ainoastaan LNbits:iä tai muuta luotettavaa lähdettä)',
-  more: 'näytä lisää',
+  more: 'laajenna',
   less: 'supista',
   releases: 'Julkaisut',
   watchdog: 'Watchdog',
   server_logs: 'Palvelimen lokit',
-  ip_blocker: 'Palvelimen suojaus IP-osoitesuodattimella',
+  ip_blocker: 'IP-suodatin',
   security: 'Turvallisuus',
   security_tools: 'Turvallisuus työkalut',
   block_access_hint: 'Estä pääsy IP-osoitteen perusteella',
   allow_access_hint: 'Salli pääsy IP-osoitteen perusteella (ohittaa estot)',
   enter_ip: 'Anna IP ja paina +',
   rate_limiter: 'Toiston rajoitin',
-  callback_url_rules: 'Callback URL -säännöt',
-  enter_callback_url_rule: 'Anna URL-sääntö regex-muodossa ja paina enter',
+  callback_url_rules: 'Callback URL säännöt',
+  enter_callback_url_rule: 'Anna URL säätö regex-muodossa ja paina enter',
   callback_url_rule_hint:
     'Callback URL:it (kuten LNURL) tarkistetaan näiden sääntöjen mukaisesti. Jos sääntöjä ei ole määritetty, kaikki URL:it ovat sallittuja.',
   wallet_limiter: 'Lompakon käyttörajoitin',
   wallet_config: 'Wallet Config',
   wallet_charts: 'Wallet Charts',
   wallet_limit_max_withdraw_per_day:
-    'Päivittäin nostettavissa sat maksimi (0 poistaa käytöstä)',
-  wallet_max_ballance: 'Maksimisaldo (sat) (0 poistaa käytöstä)',
+    'Päivittäinen lompakosta nostettavissa oleva määrä satosheissa (0 poistaa käytöstä)',
+  wallet_max_ballance: 'Lompakon maksimisaldo satosheina (0 poistaa käytöstä)',
   wallet_limit_secs_between_trans:
-    'Tapahtumien välinen minimi (sec) (0 poistaa käytöstä)',
-  only_incoming_payments_allowed: 'Vain saapuvat maksut sallittuna',
-  disable_outgoing_payments: 'Poista lähtevät maksut käytöstä',
+    'Min sekuntia transaktioiden välillä lompakkoa kohden (0 poistaa käytöstä)',
+  only_incoming_payments_allowed: 'Only incoming payments allowed',
+  disable_outgoing_payments: 'Disable outgoing payments',
   number_of_requests: 'Pyyntöjen lukumäärä',
   time_unit: 'aikayksikkö',
   minute: 'minuutti',
-  settings: 'Asetukset',
+  settings: 'Settings',
   second: 'sekunti',
   hour: 'tunti',
-  disable_server_log: 'Piilota palvelimen loki',
-  enable_server_log: 'Näytä palvelimen loki',
+  disable_server_log: 'Poista palvelimen loki käytöstä',
+  enable_server_log: 'Ota palvelimen loki käyttöön',
   coming_soon: 'Ominaisuus on tulossa pian',
   session_has_expired: 'Käyttämätön sessio on vanhentunut. Kirjaudu uudelleen.',
-  instant_access_question: 'perinteinen kirjautuminen',
+  instant_access_question: 'tai kirjaudu suoraan',
   login_with_user_id: 'Kirjaudu käyttäjä-ID:llä',
   or: 'tai',
   create_new_wallet: 'Avaa uusi lompakko',
@@ -314,15 +293,11 @@ window.localisation.fi = {
   password: 'Anna uusi salasana',
   password_config: 'Salasanan määritys',
   password_repeat: 'Toista uusi salasana',
-  update_password: 'Päivitä salasana',
   change_password: 'Vaihda salasana',
   update_credentials: 'Päivitä käyttöoikeustiedot',
   update_pubkey: 'Päivitä julkinen avain',
   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',
@@ -337,8 +312,7 @@ window.localisation.fi = {
   update_account: 'Päivitä tiliä',
   invalid_username: 'Virheellinen käyttäjänimi',
   auth_provider: 'Tunnistamisen toimittaja',
-  my_account: 'Tilini',
-  existing_account_question: 'Onkohan sinulla jo tili?',
+  my_account: 'Minun tili',
   background_image: 'Taustakuva',
   back: 'Takaisin',
   logout: 'Poistu',
@@ -384,7 +358,7 @@ window.localisation.fi = {
   welcome_lnbits: 'Tervetuloa LNbits-palveluun',
   setup_su_account: 'Määritä Superuser-tili alta.',
   create_ticker_converter: 'Luo valuuttamuuntimen Ticker',
-  enable_audit: 'Ota seuranta käyttöön',
+  enable_audit: 'Ota auditointi käyttöön',
   recommended: 'Suositeltu',
   audit_desc: 'Tallenna HTTP-pyyntöjä seuraavien suodattimien mukaisesti',
   audit_record_req: 'Tallenna pyynnön Body',
@@ -392,16 +366,16 @@ window.localisation.fi = {
   audit_record_req_warning_1:
     'Luottamukselliset tiedot (kuten salasanat) tallennetaan.',
   audit_record_req_warning_2: 'Body-datamäätä voi olla iso.',
-  audit_record_use: 'Käytä varoen!',
+  audit_record_use: 'Käytä sitä varoen.',
   audit_ip: 'Tallenna IP-osoite',
   audit_ip_desc: 'Tallenna asiakkaan IP-osoite',
   audit_path_params: 'Tallenna Path-parametrit',
   audit_query_params: 'Tallenna Query-parametrit',
-  audit_http_methods: 'Tallenna HTTP-menetelmät',
+  audit_http_methods: 'Sisällytä HTTP-menetelmät',
   audit_http_methods_hint:
     'Luettelo mukaan otettavista HTTP-menetelmistä. Tyhjä luettelo tallettaa kaikki.',
   audit_http_methods_label: 'HTTP-metodit',
-  audit_resp_codes: 'Tallenna HTTP-vastauskoodit',
+  audit_resp_codes: 'Sisällytä HTTP-vastauskoodit',
   audit_resp_codes_hint:
     'HTTP-koodien lista, jotka sisällytetään (regex-match). Tyhjä luettelo tallettaa kaikki. Esim: 4.*, 5.*',
   audit_resp_codes_label: 'HTTP-vastauskoodi (säännöllinen lauseke)',
@@ -436,7 +410,7 @@ window.localisation.fi = {
   funding_reserve_percent: 'Omavaraisuusaste: {percent} %',
   node_managment: 'Solmun hallinta',
   node_management_not_supported:
-    'Solmun hallinta ei ole mahdollista valitun rahoituslähteen kanssa.',
+    'Valittu rahoituslähde ei mahdollista solmun hallintaan.',
   toggle_node_ui: 'Solmun käyttöliittymä',
   toggle_public_node_ui: 'Julkinen näkymä solmun tietoihin',
   toggle_transactions_node_ui:
@@ -444,21 +418,17 @@ window.localisation.fi = {
   invoice_expiry: 'Laskun vanhenemisaika',
   invoice_expiry_label: 'Laskun vanhentuminen (sekunteina)',
   fee_reserve: 'Kuluvaraus',
-  fee_reserve_percent: 'Kuluvaraus prosentteina',
   fee_reserve_msats: 'Kuluvaraus milli-sat',
-  reserve_fee_in_percent: 'Kuluvaraus prosentteina',
-  payment_wait_time: 'Maksun odotusaika',
-  payment_wait_time_desc:
-    'Kuinka pitkään maksua odotetaan saapuvaksi ennenkuin se merkitään Odotetaan -tilaan. Aseta pidemmäksi käytettäessä HODL-laskuja, Boltz-palvelua tms',
+  fee_reserve_percent: 'Kuluvaraus prosentteina',
   server_management: 'Palvelimen hallinta',
-  base_url: 'Palvelimen URL-osoite',
-  base_url_label: 'Palvelun staattinen pohja-URL',
-  authentication: 'Käyttäjän todennus',
-  auth_token_expiry_label: 'Kirjautumisen vanhentumisaika minuutteina',
-  auth_token_expiry_hint: 'Aika minuuteissa, jossa kirjautuminen vanhenee',
+  base_url: 'Perus-URL',
+  base_url_label: 'Staattinen/pohjan URL palvelimelle',
+  authentication: 'Todennus',
+  auth_token_expiry_label: 'Tunnuksen vanhentumisaika minuutteina',
+  auth_token_expiry_hint: 'Aika minuuteissa, kunnes tunnus vanhenee',
   auth_allowed_methods_label: 'Sallitut kirjautumismenetelmät',
   auth_allowed_methods_hint: 'Valitse kirjautumismenetelmät',
-  auth_nostr_label: 'Nostr kutsujen URL',
+  auth_nostr_label: 'Nostr Request URL',
   auth_nostr_hint:
     'Asiakkaiden kirjautumiseen käyttämä absoluuttinen URL-osoite.',
   auth_google_ci_label: 'Google-asiakastunnus',
@@ -476,33 +446,27 @@ window.localisation.fi = {
   auth_keycloak_cs_label: 'Keycloak-asiakassalasana',
   currency_settings: 'Valuutta-asetukset',
   allowed_currencies: 'Käytettävät valuutat',
-  allowed_currencies_hint: 'Valitse käytettävissä olevat fiat-valuutat',
+  allowed_currencies_hint:
+    'Rajoita käytettävissä olevien fiat-valuuttojen määrää',
   default_account_currency: 'Tilin oletusvaluutta',
   default_account_currency_hint: 'Kirjanpidon oletusvaluutta',
-
-  max_incoming_payment_amount: 'Saapuvan maksun enimmäismäärä',
-  max_incoming_payment_amount_desc: 'Enimmäismäärä jonka voi laskuttaa',
-  max_outgoing_payment_amount: 'Lähtevän maksun enimmäismäärä',
-  max_outgoing_payment_amount_desc: 'Enimmäismäärä jonka voi maksaa',
-  service_fee: 'Palvelumaksut',
+  service_fee: 'Palvelumaksu',
   service_fee_label: 'Palvelumaksu (%)',
   service_fee_hint: 'Tapahtumastakohtainen palvelumaksu (%)',
   service_fee_max: 'Palvelumaksun enimmäismäärä',
-  service_fee_max_label: 'Palvelumaksu max (sat)',
+  service_fee_max_label: 'Palvelumaksu enintään (sat)',
   service_fee_max_hint: 'Suurin veloitettava palvelumaksu (sat)',
   fee_wallet: 'Palvelumaksujen lompakko',
-  fee_wallet_label: 'Palvelumaksujen tilityslompakko (lompakon tunnus)',
-  fee_wallet_hint: 'Lompakon tunnus, johon palvelumaksut tilitetään',
+  fee_wallet_label: 'Palvelumaksujen lompakko (lompakon tunnus)',
+  fee_wallet_hint: 'Lompakon tunnus, johon lähetetään maksut lähtetetään',
   disable_fee: 'Poista maksu käytöstä',
   disable_fee_internal: 'Poista palvelumaksu sisäisiltä maksuilta',
-  disable_fee_internal_desc: 'Poista palvelumaksu sisäisiltä salamaksuilta',
+  disable_fee_internal_desc: 'Poista palvelumaksu sisäisiltä salamamaksuilta',
   ui_management: 'Käyttöliittymän hallinta',
   ui_site_title: 'Sivuston nimi',
-  ui_changing_remove_lnbits_elements:
-    ' (tämän muuttamalla LNbits elementit poistuvat kotisivulla ja alareunasta)',
   ui_site_tagline: 'Sivuston iskulause',
-  ui_elements_enable: 'Ota käyttöön elementit etusivulla/alareunassa',
-  ui_elements_disable: 'Poista elementit käytöstä etusivulla/alareunassa',
+  ui_elements_enable: 'Ota käyttöön elementit etusivulla',
+  ui_elements_disable: 'Poista elementit käytöstä etusivulla',
   ui_toggle_elements_tip: "Poista kotisivuelementit kuten 'toimii' jne.",
   ui_site_description: 'Sivuston kuvaus',
   ui_site_description_hint:
@@ -512,11 +476,10 @@ window.localisation.fi = {
   lnbits_wallet: 'LNbits-lompakko',
   denomination: 'Valuutan nimi',
   denomination_hint: 'FakeWallet-lompakon valuutan nimi',
-  denomination_error: 'Valuutta tunnisssa on oltava 3 merkkiä, tai `sat`',
-  ui_qr_code_logo: 'QR- ja Favicon-logo',
+  ui_qr_code_logo: 'QR-koodin logo',
   ui_qr_code_logo_hint:
-    'Anna QR-koodissa ja Faviconissa käytettävän logo-kuvan URL',
-  ui_custom_image: 'Yksilöity kuva',
+    'Anna QR-koodissa käytettävää logo-kuvaan osoittava URL',
+  ui_custom_image: 'Yksilöyty kuva',
   ui_custom_image_label: 'Anna yksilöidyn kuvan URL-osoite',
   ui_custom_image_hint:
     'Yksilöity kuva näytetään aloitus- ja kirjautumissivuilla',
@@ -544,8 +507,7 @@ window.localisation.fi = {
   allowed_users_hint: 'Vain nämä käyttäjät voivat käyttää LNbitsiä',
   allowed_users_label: 'Käyttäjätunnus',
   allow_creation_user: 'Salli uusien käyttäjien luominen',
-  allow_creation_user_desc: 'Etusivulta on mahdollisuus luoda uusia käyttäjiä',
-  new_user_not_allowed: 'Tunnusten luonti on estetty.',
+  allow_creation_user_desc: 'Salli uusien käyttäjien luominen etusivulla',
   components: 'Komponentit',
   long_running_endpoints: 'Top 5 pisimpään yhteydessä ollutta päätepistettä',
   http_request_methods: 'HTTP-pyynnön menetelmät',
@@ -573,9 +535,6 @@ window.localisation.fi = {
   reset_wallet_keys: 'Uusi API-avaimet',
   reset_wallet_keys_desc:
     'Tämän lompakon API-avaimet uusitaan. Edelliset API-avaimet lakkaavat toimimasta ja uudet luodaan niiden tilalle..',
-  view_list: 'Näytä lompakot allekain',
-  view_column: 'Näytä lompakot rinnakkain',
-  filter_payments: 'Suodata maksuja',
-  filter_date: 'Suodata päiväyksellä',
-  websocket_example: 'Websocket esimerkki'
+  view_list: 'Näytä lompakot listana',
+  view_column: 'Näytä lompakot riveinä'
 }

lnbits/static/js/admin.js

@@ -4,7 +4,6 @@ window.AdminPageLogic = {
     return {
       settings: {},
       logs: [],
-      library_images: [],
       serverlogEnabled: false,
       lnbits_theme_options: [
         'classic',
@@ -141,7 +140,6 @@ window.AdminPageLogic = {
   async created() {
     await this.getSettings()
     await this.getAudit()
-    await this.getUploadedImages()
     this.balance = +'{{ balance|safe }}'
     const hash = window.location.hash.replace('#', '')
     if (hash === 'exchange_providers') {
@@ -440,7 +438,7 @@ window.AdminPageLogic = {
       LNbits.api
         .request('GET', '/admin/api/v1/restart/')
         .then(response => {
-          this.$q.notify({
+          Quasar.Notify.create({
             type: 'positive',
             message: 'Success! Restarted Server',
             icon: null
@@ -450,31 +448,9 @@ window.AdminPageLogic = {
         .catch(LNbits.utils.notifyApiError)
     },
     formatDate(date) {
-      return moment.utc(date * 1000).fromNow()
-    },
-    sendTestEmail() {
-      LNbits.api
-        .request(
-          'GET',
-          '/admin/api/v1/testemail',
-          this.g.user.wallets[0].adminkey
-        )
-        .then(response => {
-          if (response.data.status === 'error') {
-            throw new Error(response.data.message)
-          }
-          this.$q.notify({
-            message: 'Test email sent!',
-            color: 'positive'
-          })
-        })
-        .catch(error => {
-          this.$q.notify({
-            message: error.message,
-            color: 'negative'
-          })
-        })
+      return moment(date * 1000).fromNow()
     },
+
     getAudit() {
       LNbits.api
         .request('GET', '/admin/api/v1/audit', this.g.user.wallets[0].adminkey)
@@ -546,69 +522,10 @@ window.AdminPageLogic = {
               Quasar.Notify.create({
                 type: 'positive',
                 message:
-                  'Success! Restored settings to defaults. Restarting...',
+                  'Success! Restored settings to defaults, restart required!',
                 icon: null
               })
-              this.$q.localStorage.clear()
-            })
-            .catch(LNbits.utils.notifyApiError)
-        })
-    },
-    onImageInput(e) {
-      const file = e.target.files[0]
-      if (file) {
-        this.uploadImage(file)
-      }
-    },
-    uploadImage(file) {
-      const formData = new FormData()
-      formData.append('file', file)
-      LNbits.api
-        .request(
-          'POST',
-          '/admin/api/v1/images',
-          this.g.user.wallets[0].adminkey,
-          formData,
-          {headers: {'Content-Type': 'multipart/form-data'}}
-        )
-        .then(() => {
-          this.$q.notify({
-            type: 'positive',
-            message: 'Image uploaded!',
-            icon: null
-          })
-          this.getUploadedImages()
-        })
-        .catch(LNbits.utils.notifyApiError)
-    },
-    getUploadedImages() {
-      LNbits.api
-        .request('GET', '/admin/api/v1/images', this.g.user.wallets[0].inkey)
-        .then(response => {
-          this.library_images = response.data.map(image => ({
-            ...image,
-            url: `${window.origin}/${image.directory}/${image.filename}`
-          }))
-        })
-        .catch(LNbits.utils.notifyApiError)
-    },
-    deleteImage(filename) {
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this image?')
-        .onOk(() => {
-          LNbits.api
-            .request(
-              'DELETE',
-              `/admin/api/v1/images/${filename}`,
-              this.g.user.wallets[0].adminkey
-            )
-            .then(() => {
-              this.$q.notify({
-                type: 'positive',
-                message: 'Image deleted!',
-                icon: null
-              })
-              this.getUploadedImages()
+              this.needsRestart = true
             })
             .catch(LNbits.utils.notifyApiError)
         })

lnbits/static/js/base.js

@@ -197,8 +197,7 @@ window.LNbits = {
         email: data.email,
         extensions: data.extensions,
         wallets: data.wallets,
-        super_user: data.super_user,
-        extra: data.extra ?? {}
+        super_user: data.super_user
       }
       const mapWallet = this.wallet
       obj.wallets = obj.wallets
@@ -206,21 +205,14 @@ 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 => {
         return {
-          label: [obj.name, ' - ', obj.id.substring(0, 5), '...'].join(''),
+          label: [obj.name, ' - ', obj.id].join(''),
           value: obj.id
         }
       })
-      obj.hiddenWalletsCount = Math.max(
-        0,
-        data.wallets.length - data.extra.visible_wallet_count
-      )
       return obj
     },
     wallet(data) {
@@ -260,11 +252,13 @@ window.LNbits = {
         fiat_currency: data.fiat_currency
       }
 
-      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.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.msat = obj.amount
       obj.sat = obj.msat / 1000
       obj.tag = obj.extra?.tag
@@ -501,10 +495,8 @@ window.windowMixin = {
         ? this.$q.localStorage.getItem('lnbits.backgroundImage')
         : USE_DEFAULT_BGIMAGE,
       isUserAuthorized: false,
-      isSatsDenomination: WINDOW_SETTINGS['LNBITS_DENOMINATION'] == 'sats',
       walletEventListeners: [],
-      backgroundImage: '',
-      ...WINDOW_SETTINGS
+      backgroundImage: ''
     }
   },
 
@@ -516,9 +508,6 @@ window.windowMixin = {
       }
       this.$q.localStorage.set('lnbits.walletFlip', this.walletFlip)
     },
-    goToWallets() {
-      window.location = '/wallets'
-    },
     submitAddWallet() {
       if (
         this.showAddWalletDialog.name &&
@@ -592,10 +581,9 @@ window.windowMixin = {
           query: {wal: this.g.wallet.id}
         })
       } else {
-        this.$router.replace({
-          path: '/wallet',
-          query: {wal: this.g.wallet.id}
-        })
+        const url = new URL(window.location.href)
+        url.searchParams.set('wal', this.g.wallet.id)
+        window.history.replaceState({}, '', url.toString())
       }
     },
     formatBalance(amount) {
@@ -855,7 +843,6 @@ window.windowMixin = {
         ? this.$q.localStorage.getItem('lnbits.darkMode')
         : true
     )
-    Chart.defaults.color = this.$q.dark.isActive ? '#fff' : '#000'
     this.changeTheme(this.themeChoice)
     this.applyBorder()
     if (this.$q.dark.isActive) {

lnbits/static/js/components.js

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

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

@@ -37,8 +37,7 @@ window.app.component('lnbits-funding-sources', {
           'FakeWallet',
           'Fake Wallet',
           {
-            fake_wallet_secret: 'Secret',
-            lnbits_denomination: '"sats" or 3 Letter Custom Denomination'
+            fake_wallet_secret: 'Secret'
           }
         ],
         [
@@ -197,14 +196,6 @@ 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/components/payment-list.js

@@ -178,26 +178,6 @@ window.app.component('payment-list', {
             return LNbits.map.payment(obj)
           })
         })
-        .catch(err => {
-          this.paymentsTable.loading = false
-          if (g.user.admin) {
-            this.fetchPaymentsAsAdmin(this.currentWallet.id, params)
-          } else {
-            LNbits.utils.notifyApiError(err)
-          }
-        })
-    },
-    fetchPaymentsAsAdmin(walletId, params) {
-      params = (params || '') + '&wallet_id=' + walletId
-      return LNbits.api
-        .request('GET', '/api/v1/payments/all/paginated?' + params)
-        .then(response => {
-          this.paymentsTable.loading = false
-          this.paymentsTable.pagination.rowsNumber = response.data.total
-          this.payments = response.data.data.map(obj => {
-            return LNbits.map.payment(obj)
-          })
-        })
         .catch(err => {
           this.paymentsTable.loading = false
           LNbits.utils.notifyApiError(err)

lnbits/static/js/index.js

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

lnbits/static/js/init-app.js

@@ -193,15 +193,6 @@ 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.utc(this.date).fromNow()
+      return moment(this.date).fromNow()
     }
   },
   template: `

lnbits/static/js/payments.js

@@ -148,7 +148,7 @@ window.PaymentsPageLogic = {
           if (p.extra && p.extra.tag) {
             p.tag = p.extra.tag
           }
-          p.timeFrom = moment.utc(p.created_at).fromNow()
+          p.timeFrom = moment(p.created_at).fromNow()
           p.outgoing = p.amount < 0
           p.amount =
             new Intl.NumberFormat(window.LOCALE).format(p.amount / 1000) +
@@ -229,10 +229,11 @@ window.PaymentsPageLogic = {
           'GET',
           `/api/v1/payments/stats/count?${params}&count_by=status`
         )
-
-        data.sort((a, b) => a.field - b.field).reverse()
-
-        this.searchOptions.status = data.map(s => s.field)
+        data.sort((a, b) => a.field - b.field)
+        this.searchOptions.status = data
+          .map(s => s.field)
+          .sort()
+          .reverse()
         this.paymentsStatusChart.data.datasets[0].data = data.map(s => s.total)
         this.paymentsStatusChart.data.labels = [...this.searchOptions.status]
 
@@ -418,8 +419,11 @@ window.PaymentsPageLogic = {
                 data: [],
                 backgroundColor: [
                   'rgb(0, 205, 86)',
-                  'rgb(64, 72, 78)',
-                  'rgb(255, 99, 132)'
+                  'rgb(54, 162, 235)',
+                  'rgb(255, 99, 132)',
+                  'rgb(255, 5, 86)',
+                  'rgb(25, 205, 86)',
+                  'rgb(255, 205, 250)'
                 ],
                 hoverOffset: 4
               }

lnbits/static/js/users.js

@@ -188,7 +188,7 @@ window.UsersPageLogic = {
         .then(res => {
           LNbits.utils
             .confirmDialog(
-              this.$t('reset_key_generated') + ' ' + this.$t('reset_key_copy')
+              'A reset key has been generated. Click OK to copy the rest key to your clipboard.'
             )
             .onOk(() => {
               const url = window.location.origin + '?reset_key=' + res.data
@@ -312,23 +312,6 @@ 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)
@@ -346,7 +329,7 @@ window.UsersPageLogic = {
         .catch(LNbits.utils.notifyApiError)
     },
     fetchWallets(userId) {
-      return LNbits.api
+      LNbits.api
         .request('GET', `/users/api/v1/user/${userId}/wallet`)
         .then(res => {
           this.wallets = res.data
@@ -395,13 +378,8 @@ window.UsersPageLogic = {
         this.activeUser.show = false
       }
     },
-    async showWalletPayments(walletId) {
-      this.activeUser.show = false
-      await this.fetchWallets(this.users[0].id)
-      await this.showPayments(walletId)
-    },
-    showPayments(walletId) {
-      this.paymentsWallet = this.wallets.find(wallet => wallet.id === walletId)
+    showPayments(wallet_id) {
+      this.paymentsWallet = this.wallets.find(wallet => wallet.id === wallet_id)
       this.paymentPage.show = true
     },
     searchUserBy(fieldName) {

lnbits/static/js/wallet.js

@@ -4,7 +4,6 @@ window.WalletPageLogic = {
     return {
       origin: window.location.origin,
       baseUrl: `${window.location.protocol}//${window.location.host}/`,
-      websocketUrl: `${'http:' ? 'ws://' : 'wss://'}${window.location.host}/api/v1/ws`,
       parse: {
         show: false,
         invoice: null,
@@ -261,9 +260,7 @@ window.WalletPageLogic = {
           this.receive.paymentReq = response.data.bolt11
           this.receive.amountMsat = response.data.amount
           this.receive.paymentHash = response.data.payment_hash
-          if (!this.receive.lnurl) {
-            this.readNfcTag()
-          }
+          this.readNfcTag()
           // TODO: lnurl_callback and lnurl_response
           // WITHDRAW
           if (response.data.lnurl_response !== null) {
@@ -451,8 +448,8 @@ window.WalletPageLogic = {
               createdDate,
               'YYYY-MM-DDTHH:mm:ss.SSSZ'
             )
-            cleanInvoice.expireDateFrom = moment.utc(expireDate).fromNow()
-            cleanInvoice.createdDateFrom = moment.utc(createdDate).fromNow()
+            cleanInvoice.expireDateFrom = moment(expireDate).fromNow()
+            cleanInvoice.createdDateFrom = moment(createdDate).fromNow()
 
             cleanInvoice.expired = false // TODO
           }
@@ -662,7 +659,7 @@ window.WalletPageLogic = {
             }
           }
           Quasar.Notify.create({
-            message: 'Wallet updated.',
+            message: 'Wallet and user updated.',
             type: 'positive',
             timeout: 3500
           })
@@ -1114,7 +1111,15 @@ window.WalletPageLogic = {
     }
   },
   watch: {
+    'g.wallet.id'(newVal, oldVal) {
+      try {
+        this.fetchChartData()
+      } catch (error) {
+        console.warn(`Chart creation failed: ${error}`)
+      }
+    },
     'g.updatePayments'(newVal, oldVal) {
+      console.log('updatePayments changed:', {newVal, oldVal})
       this.parse.show = false
       if (this.receive.paymentHash === this.g.updatePaymentsHash) {
         this.receive.show = false
@@ -1140,12 +1145,8 @@ window.WalletPageLogic = {
       }
     },
     'g.wallet': {
-      handler() {
-        try {
-          this.createdTasks()
-        } catch (error) {
-          console.warn(`Chart creation failed: ${error}`)
-        }
+      handler(newWallet) {
+        this.createdTasks()
       },
       deep: true
     }

lnbits/static/js/wallets.js

@@ -1,89 +0,0 @@
-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/static/scss/base.scss

@@ -8,11 +8,11 @@ $themes: (
     marginal-text: #fff
   ),
   'bitcoin': (
-    primary: #ea611d,
-    secondary: #e56f35,
+    primary: #ff9853,
+    secondary: #ff7353,
     dark: #2d293b,
     info: #333646,
-    marginal-bg: #000000,
+    marginal-bg: #2d293b,
     marginal-text: #fff
   ),
   'freedom': (

lnbits/static/vendor/axios.js

@@ -1,4 +1,4 @@
-/*! Axios v1.8.2 Copyright (c) 2025 Matt Zabriskie and contributors */
+// Axios v1.7.7 Copyright (c) 2024 Matt Zabriskie and contributors
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -1266,6 +1266,23 @@
   var toFiniteNumber = function toFiniteNumber(value, defaultValue) {
     return value != null && Number.isFinite(value = +value) ? value : defaultValue;
   };
+  var ALPHA = 'abcdefghijklmnopqrstuvwxyz';
+  var DIGIT = '0123456789';
+  var ALPHABET = {
+    DIGIT: DIGIT,
+    ALPHA: ALPHA,
+    ALPHA_DIGIT: ALPHA + ALPHA.toUpperCase() + DIGIT
+  };
+  var generateString = function generateString() {
+    var size = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 16;
+    var alphabet = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ALPHABET.ALPHA_DIGIT;
+    var str = '';
+    var length = alphabet.length;
+    while (size--) {
+      str += alphabet[Math.random() * length | 0];
+    }
+    return str;
+  };
 
   /**
    * If the thing is a FormData object, return true, otherwise return false.
@@ -1382,6 +1399,8 @@
     findKey: findKey,
     global: _global,
     isContextDefined: isContextDefined,
+    ALPHABET: ALPHABET,
+    generateString: generateString,
     isSpecCompliantForm: isSpecCompliantForm,
     toJSONObject: toJSONObject,
     isAsyncFn: isAsyncFn,
@@ -1716,7 +1735,7 @@
    *
    * @param {string} url The base of the url (e.g., http://www.google.com)
    * @param {object} [params] The params to be appended
-   * @param {?(object|Function)} options
+   * @param {?object} options
    *
    * @returns {string} The formatted url
    */
@@ -1726,11 +1745,6 @@
       return url;
     }
     var _encode = options && options.encode || encode;
-    if (utils$1.isFunction(options)) {
-      options = {
-        serialize: options
-      };
-    }
     var serializeFn = options && options.serialize;
     var serializedParams;
     if (serializeFn) {
@@ -2628,14 +2642,60 @@
     };
   };
 
-  var isURLSameOrigin = platform.hasStandardBrowserEnv ? function (origin, isMSIE) {
-    return function (url) {
-      url = new URL(url, platform.origin);
-      return origin.protocol === url.protocol && origin.host === url.host && (isMSIE || origin.port === url.port);
+  var isURLSameOrigin = platform.hasStandardBrowserEnv ?
+  // Standard browser envs have full support of the APIs needed to test
+  // whether the request URL is of the same origin as current location.
+  function standardBrowserEnv() {
+    var msie = platform.navigator && /(msie|trident)/i.test(platform.navigator.userAgent);
+    var urlParsingNode = document.createElement('a');
+    var originURL;
+
+    /**
+    * Parse a URL to discover its components
+    *
+    * @param {String} url The URL to be parsed
+    * @returns {Object}
+    */
+    function resolveURL(url) {
+      var href = url;
+      if (msie) {
+        // IE needs attribute set twice to normalize properties
+        urlParsingNode.setAttribute('href', href);
+        href = urlParsingNode.href;
+      }
+      urlParsingNode.setAttribute('href', href);
+
+      // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
+      return {
+        href: urlParsingNode.href,
+        protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
+        host: urlParsingNode.host,
+        search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
+        hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
+        hostname: urlParsingNode.hostname,
+        port: urlParsingNode.port,
+        pathname: urlParsingNode.pathname.charAt(0) === '/' ? urlParsingNode.pathname : '/' + urlParsingNode.pathname
+      };
+    }
+    originURL = resolveURL(window.location.href);
+
+    /**
+    * Determine if a URL shares the same origin as the current location
+    *
+    * @param {String} requestURL The URL to test
+    * @returns {boolean} True if URL shares the same origin, otherwise false
+    */
+    return function isURLSameOrigin(requestURL) {
+      var parsed = utils$1.isString(requestURL) ? resolveURL(requestURL) : requestURL;
+      return parsed.protocol === originURL.protocol && parsed.host === originURL.host;
     };
-  }(new URL(platform.origin), platform.navigator && /(msie|trident)/i.test(platform.navigator.userAgent)) : function () {
-    return true;
-  };
+  }() :
+  // Non standard browser envs (web workers, react-native) lack needed support.
+  function nonStandardBrowserEnv() {
+    return function isURLSameOrigin() {
+      return true;
+    };
+  }();
 
   var cookies = platform.hasStandardBrowserEnv ?
   // Standard browser envs support document.cookie
@@ -2701,9 +2761,8 @@
    *
    * @returns {string} The combined full path
    */
-  function buildFullPath(baseURL, requestedURL, allowAbsoluteUrls) {
-    var isRelativeUrl = !isAbsoluteURL(requestedURL);
-    if (baseURL && isRelativeUrl || allowAbsoluteUrls == false) {
+  function buildFullPath(baseURL, requestedURL) {
+    if (baseURL && !isAbsoluteURL(requestedURL)) {
       return combineURLs(baseURL, requestedURL);
     }
     return requestedURL;
@@ -2726,7 +2785,7 @@
     // eslint-disable-next-line no-param-reassign
     config2 = config2 || {};
     var config = {};
-    function getMergedValue(target, source, prop, caseless) {
+    function getMergedValue(target, source, caseless) {
       if (utils$1.isPlainObject(target) && utils$1.isPlainObject(source)) {
         return utils$1.merge.call({
           caseless: caseless
@@ -2740,11 +2799,11 @@
     }
 
     // eslint-disable-next-line consistent-return
-    function mergeDeepProperties(a, b, prop, caseless) {
+    function mergeDeepProperties(a, b, caseless) {
       if (!utils$1.isUndefined(b)) {
-        return getMergedValue(a, b, prop, caseless);
+        return getMergedValue(a, b, caseless);
       } else if (!utils$1.isUndefined(a)) {
-        return getMergedValue(undefined, a, prop, caseless);
+        return getMergedValue(undefined, a, caseless);
       }
     }
 
@@ -2801,8 +2860,8 @@
       socketPath: defaultToConfig2,
       responseEncoding: defaultToConfig2,
       validateStatus: mergeDirectKeys,
-      headers: function headers(a, b, prop) {
-        return mergeDeepProperties(headersToObject(a), headersToObject(b), prop, true);
+      headers: function headers(a, b) {
+        return mergeDeepProperties(headersToObject(a), headersToObject(b), true);
       }
     };
     utils$1.forEach(Object.keys(Object.assign({}, config1, config2)), function computeConfigValue(prop) {
@@ -3658,7 +3717,7 @@
     });
   }
 
-  var VERSION = "1.8.2";
+  var VERSION = "1.7.7";
 
   var validators$1 = {};
 
@@ -3697,13 +3756,6 @@
       return validator ? validator(value, opt, opts) : true;
     };
   };
-  validators$1.spelling = function spelling(correctSpelling) {
-    return function (value, opt) {
-      // eslint-disable-next-line no-console
-      console.warn("".concat(opt, " is likely a misspelling of ").concat(correctSpelling));
-      return true;
-    };
-  };
 
   /**
    * Assert object's properties type
@@ -3786,8 +3838,7 @@
                 _context.prev = 6;
                 _context.t0 = _context["catch"](0);
                 if (_context.t0 instanceof Error) {
-                  dummy = {};
-                  Error.captureStackTrace ? Error.captureStackTrace(dummy) : dummy = new Error();
+                  Error.captureStackTrace ? Error.captureStackTrace(dummy = {}) : dummy = new Error();
 
                   // slice off the Error: ... line
                   stack = dummy.stack ? dummy.stack.replace(/^.+\n/, '') : '';
@@ -3850,17 +3901,6 @@
           }
         }
 
-        // Set config.allowAbsoluteUrls
-        if (config.allowAbsoluteUrls !== undefined) ; else if (this.defaults.allowAbsoluteUrls !== undefined) {
-          config.allowAbsoluteUrls = this.defaults.allowAbsoluteUrls;
-        } else {
-          config.allowAbsoluteUrls = true;
-        }
-        validator.assertOptions(config, {
-          baseUrl: validators.spelling('baseURL'),
-          withXsrfToken: validators.spelling('withXSRFToken')
-        }, true);
-
         // Set config.method
         config.method = (config.method || this.defaults.method || 'get').toLowerCase();
 
@@ -3928,7 +3968,7 @@
       key: "getUri",
       value: function getUri(config) {
         config = mergeConfig(this.defaults, config);
-        var fullPath = buildFullPath(config.baseURL, config.url, config.allowAbsoluteUrls);
+        var fullPath = buildFullPath(config.baseURL, config.url);
         return buildURL(fullPath, config.params, config.paramsSerializer);
       }
     }]);

lnbits/tasks.py

@@ -203,8 +203,7 @@ 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
-        # only overwrite preimage if status.preimage provides it
-        payment.preimage = status.preimage or payment.preimage
+        payment.preimage = status.preimage
         payment.status = PaymentState.SUCCESS
         await update_payment(payment)
         internal = "internal" if is_internal else ""

lnbits/templates/base.html

@@ -89,11 +89,11 @@
             >
               {% if LNBITS_SERVICE_FEE_MAX > 0 %}
               <span
-                v-text='$t("service_fee_max_badge", { amount: "{{ LNBITS_SERVICE_FEE }}", max: "{{ LNBITS_SERVICE_FEE_MAX }}", denom: "{{ LNBITS_DENOMINATION }}"})'
+                v-text='$t("service_fee_max", { amount: "{{ LNBITS_SERVICE_FEE }}", max: "{{ LNBITS_SERVICE_FEE_MAX }}"})'
               ></span>
               {%else%}
               <span
-                v-text='$t("service_fee_badge", { amount: "{{ LNBITS_SERVICE_FEE}}"})'
+                v-text='$t("service_fee", { amount: "{{ LNBITS_SERVICE_FEE }}" })'
               ></span>
               {%endif%}
               <q-tooltip
@@ -179,12 +179,12 @@
         >
           <q-scroll-area style="height: 100%">
             <q-item>
-              <q-item-section class="cursor-pointer" @click="goToWallets()">
+              <q-item-section>
                 <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') + ' (' + g.user.wallets.length + ')'"
+                  v-text="$t('wallets')"
                 ></q-item-label>
               </q-item-section>
               <q-item-section side>
@@ -211,6 +211,7 @@
               :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>
@@ -247,7 +248,7 @@
                         @click="showAddWalletDialog.show = true"
                       >
                         <q-tooltip
-                          ><span v-text="$t('add_new_wallet')"></span
+                          ><span v-text="$t('add_wallet')"></span
                         ></q-tooltip>
                       </q-btn>
                       <q-dialog
@@ -257,9 +258,7 @@
                       >
                         <q-card style="min-width: 350px">
                           <q-card-section>
-                            <div class="text-h6">
-                              <span v-text="$t('wallet_name')"></span>
-                            </div>
+                            <div class="text-h6">Wallet name</div>
                           </q-card-section>
 
                           <q-card-section class="q-pt-none">
@@ -272,14 +271,10 @@
                           </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="$t('cancel')"
-                              v-close-popup
-                            ></q-btn>
-                            <q-btn
-                              flat
-                              :label="$t('add_wallet')"
+                              label="Add wallet"
                               v-close-popup
                               @click="submitAddWallet()"
                             ></q-btn>
@@ -290,7 +285,7 @@
                   </q-card-section>
                 </q-card>
                 <q-card
-                  v-for="wallet in g.user.wallets.slice(0, g.user.extra.visible_wallet_count || 10)"
+                  v-for="wallet in g.user.wallets"
                   :key="wallet.id"
                   clickable
                   @click="selectWallet(wallet)"
@@ -336,29 +331,6 @@
                     </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>
 
@@ -371,7 +343,6 @@
         {% endblock %} {% block footer %}
 
         <q-footer
-          v-if="'{{ SITE_TITLE }}' == 'LNbits' && '{{ LNBITS_SHOW_HOME_PAGE_ELEMENTS }}' == 'True'"
           class="bg-transparent q-px-lg q-py-md"
           :class="{'text-dark': !$q.dark.isActive}"
         >
@@ -418,38 +389,42 @@
       </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,10 +5,7 @@
     class="lnbits-drawer__q-list"
   >
     <q-item
-      v-for="walletRec in g.user.wallets.slice(
-        0,
-        g.user.extra.visible_wallet_count || 10
-      )"
+      v-for="walletRec in g.user.wallets"
       :key="walletRec.id"
       clickable
       :active="g.wallet && g.wallet.id === walletRec.id"
@@ -46,22 +43,6 @@
       <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
@@ -74,7 +55,7 @@
         <q-item-label
           lines="1"
           class="text-caption"
-          v-text="$t('add_new_wallet')"
+          v-text="$t('add_wallet')"
         ></q-item-label>
       </q-item-section>
     </q-item>
@@ -197,19 +178,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
@@ -339,26 +320,7 @@
     <q-item v-if="payment.preimage">
       <q-item-section>
         <q-item-label v-text="$t('payment_proof')"></q-item-label>
-        <q-item-label
-          caption
-          v-text="
-            `${payment.preimage.slice(0, 12)}...${payment.preimage.slice(-12)}`
-          "
-        ></q-item-label>
-      </q-item-section>
-      <q-item-section side>
-        <q-item-label>
-          <q-icon
-            name="content_copy"
-            @click="copyText(payment.preimage)"
-            size="1em"
-            color="grey"
-            class="cursor-pointer"
-          />
-        </q-item-label>
-        <q-tooltip>
-          <span v-text="payment.preimage"></span>
-        </q-tooltip>
+        <q-item-label caption v-text="payment.preimage"></q-item-label>
       </q-item-section>
     </q-item>
 
@@ -1006,7 +968,7 @@
               </div>
             </q-card-section>
             <q-card-section>
-              <div class="row q-gutter-x-sm">
+              <div class="row">
                 <q-btn
                   v-if="
                     props.row.isIn && props.row.isPending && props.row.bolt11
@@ -1095,16 +1057,7 @@
 
 <template id="lnbits-funding-sources">
   <div class="funding-sources">
-    <h6 class="q-my-none q-mb-sm">
-      <span v-text="$t('funding_sources')"></span>
-      <q-btn
-        round
-        flat
-        @click="this.hideInput = !this.hideInput"
-        :icon="this.hideInput ? 'visibility_off' : 'visibility'"
-      ></q-btn>
-    </h6>
-
+    <h6 class="q-mt-xl q-mb-md">Funding Sources</h6>
     <div class="row">
       <div class="col-12">
         <p>Active Funding<small> (Requires server restart)</small></p>
@@ -1142,6 +1095,13 @@
               :label="prop.label"
               :hint="prop.hint"
             >
+              <template v-slot:append>
+                <q-icon
+                  :name="hideInput ? 'visibility_off' : 'visibility'"
+                  class="cursor-pointer"
+                  @click="this.hideInput = !this.hideInput"
+                ></q-icon>
+              </template>
             </q-input>
           </div>
         </div>
@@ -1204,7 +1164,7 @@
             color="primary"
             :disable="walletName == ''"
             type="submit"
-            :label="$t('add_new_wallet')"
+            :label="$t('add_wallet')"
             class="full-width q-mb-sm"
           ></q-btn>
           <q-btn
@@ -1472,22 +1432,10 @@
       >
         <q-avatar size="32px" class="q-mr-md">
           <q-img
-            :src="
-              keycloakIcon
-                ? keycloakIcon
-                : `{{ static_url_for('static', 'images/keycloak-logo.png') }}`
-            "
+            :src="`{{ static_url_for('static', 'images/keycloak-logo.png') }}`"
           ></q-img>
         </q-avatar>
-        <div>
-          <span
-            v-text="
-              $t('signin_with_custom_org', {
-                custom_org: keycloakOrg
-              })
-            "
-          ></span>
-        </div>
+        <div><span v-text="$t('signin_with_keycloak')"></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 v-if="statusCode">
+      <div>
         <div class="error-code" v-text="statusCode"></div>
 
         <div class="error-message" v-text="message"></div>
@@ -65,15 +65,19 @@
       goToExtension() {
         window.location.href = `/extensions#${this.extension}`
       },
-      async logOut() {
-
-        try {
-          await LNbits.api.logout()
-          window.location = '/'
-        } catch (e) {
-          LNbits.utils.notifyApiError(e)
-        }
-
+      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)
+            }
+          })
     },
     },
     computed: {
@@ -82,17 +86,10 @@
         if (this.message.startsWith('Extension ')) return true
       }
     },
-    async created() {
+    created() {
       this.err = '{{ err }}'
-      const statusCode = '{{ status_code }}' || 404
+      this.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,20 +44,15 @@
       </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 %} {% block scripts %}{% endblock %} {% for url in
-    INCLUDED_COMPONENTS %}
+    {% endfor %}
+    <script>
+      const LNBITS_QR_LOGO = {{ LNBITS_QR_LOGO | tojson }}
+    </script>
+    <!---->
+    {% block scripts %}{% endblock %} {% for url in INCLUDED_COMPONENTS %}
     <script src="{{ static_url_for('static', url) }}"></script>
     {% endfor %}
   </body>

lnbits/utils/crypto.py

@@ -1,13 +1,15 @@
-from base64 import b64decode, b64encode, urlsafe_b64decode, urlsafe_b64encode
+import base64
+import getpass
 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(length: int = 32) -> tuple[str, str]:
-    secret = Random.new().read(length)
+
+def random_secret_and_hash() -> tuple[str, str]:
+    secret = Random.new().read(32)
     return secret.hex(), sha256(secret).hexdigest()
 
 
@@ -21,100 +23,74 @@ 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:
-    """
-    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
 
-    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: 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 __init__(self, key=None, description=""):
+        self.key = key
+        self.description = description + " "
 
-    def pad(self, data: bytes) -> bytes:
-        length = self.block_size - (len(data) % self.block_size)
+    def pad(self, data):
+        length = BLOCK_SIZE - (len(data) % BLOCK_SIZE)
         return data + (chr(length) * length).encode()
 
-    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]
+    def unpad(self, data):
+        return data[: -(data[-1] if isinstance(data[-1], int) else ord(data[-1]))]
 
-    def derive_iv_and_key(
-        self, salt: bytes, output_len: int = 32 + 16
-    ) -> tuple[bytes, bytes]:
+    @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):
         # extended from https://gist.github.com/gsakkis/4546068
-        assert len(salt) == 8, "Salt must be 8 bytes"
-        data = self.key + salt
+        assert len(salt) == 8, len(salt)
+        data += salt
         key = md5(data).digest()
         final_key = key
-        while len(final_key) < output_len:
+        while len(final_key) < output:
             key = md5(key + data).digest()
             final_key += key
-        iv_key = final_key[:output_len]
-        return iv_key[32:], iv_key[:32]
+        return final_key[:output]
 
     def decrypt(self, encrypted: str, urlsafe: bool = False) -> str:
-        """Decrypts a salted base64 encoded string using AES-256-CBC."""
+        """Decrypts a string using AES-256-CBC."""
+        passphrase = self.passphrase
+
         if urlsafe:
-            decoded = urlsafe_b64decode(encrypted)
+            encrypted_bytes = base64.urlsafe_b64decode(encrypted)
         else:
-            decoded = b64decode(encrypted)
+            encrypted_bytes = base64.b64decode(encrypted)
 
-        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)
+        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:]
         aes = AES.new(key, AES.MODE_CBC, iv)
-
         try:
-            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()
+            return self.unpad(aes.decrypt(encrypted_bytes[16:])).decode()
         except UnicodeDecodeError as exc:
-            raise ValueError("Decryption resulted in invalid UTF-8 data.") from exc
+            raise ValueError("Wrong passphrase") from exc
 
     def encrypt(self, message: bytes, urlsafe: bool = False) -> str:
-        """
-        Encrypts a string using AES-256-CBC and returns a salted base64 encoded string.
-        """
+        passphrase = self.passphrase
         salt = Random.new().read(8)
-        iv, key = self.derive_iv_and_key(salt, 32 + 16)
+        key_iv = self.bytes_to_key(passphrase.encode(), salt, 32 + 16)
+        key = key_iv[:32]
+        iv = key_iv[32:]
         aes = AES.new(key, AES.MODE_CBC, iv)
-        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()
+        encoded = b"Salted__" + salt + aes.encrypt(self.pad(message))
+        return (
+            base64.urlsafe_b64encode(encoded) if urlsafe else base64.b64encode(encoded)
+        ).decode()

lnbits/utils/exchange_rates.py

@@ -1,4 +1,3 @@
-import asyncio
 from typing import Optional
 
 import httpx
@@ -213,7 +212,7 @@ async def btc_rates(currency: str) -> list[tuple[str, float]]:
         try:
             headers = {"User-Agent": settings.user_agent}
             async with httpx.AsyncClient(headers=headers) as client:
-                r = await client.get(url, timeout=3)
+                r = await client.get(url, timeout=0.5)
                 r.raise_for_status()
 
                 if not provider.path:
@@ -231,10 +230,11 @@ async def btc_rates(currency: str) -> list[tuple[str, float]]:
 
         return None
 
-    calls = [
-        fetch_price(provider) for provider in settings.lnbits_exchange_rate_providers
+    # OK to be in squence: fetch_price times out after 0.5 seconds
+    results = [
+        await fetch_price(provider)
+        for provider in settings.lnbits_exchange_rate_providers
     ]
-    results = await asyncio.gather(*calls)
 
     return [r for r in results if r is not None]
 

lnbits/wallets/__init__.py

@@ -28,7 +28,6 @@ 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
 
@@ -73,7 +72,6 @@ __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, Optional
+from typing import AsyncGenerator, Dict, 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,31 +95,25 @@ class AlbyWallet(Wallet):
 
             if r.is_error:
                 error_message = data["message"] if "message" in data else r.text
-                return InvoiceResponse(ok=False, error_message=error_message)
+                return InvoiceResponse(False, None, None, error_message)
 
             checking_id = data["payment_hash"]
             payment_request = data["payment_request"]
-            preimage = data.get("payment_preimage")
-            return InvoiceResponse(
-                ok=True,
-                checking_id=checking_id,
-                payment_request=payment_request,
-                preimage=preimage,
-            )
+            return InvoiceResponse(True, checking_id, payment_request, None)
         except KeyError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message="Server error: 'missing required fields'"
+                False, None, None, "Server error: 'missing required fields'"
             )
         except json.JSONDecodeError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message="Server error: 'invalid json response'"
+                False, None, None, "Server error: 'invalid json response'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message=f"Unable to connect to {self.endpoint}."
+                False, None, None, f"Unable to connect to {self.endpoint}."
             )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -135,31 +129,30 @@ class AlbyWallet(Wallet):
 
             if r.is_error:
                 error_message = data["message"] if "message" in data else r.text
-                return PaymentResponse(error_message=error_message)
+                return PaymentResponse(None, None, None, None, 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(
-                ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
-            )
+
+            return PaymentResponse(True, checking_id, fee_msat, preimage, None)
         except KeyError as exc:
             logger.warning(exc)
             return PaymentResponse(
-                error_message="Server error: 'missing required fields'"
+                None, None, None, None, "Server error: 'missing required fields'"
             )
         except json.JSONDecodeError as exc:
             logger.warning(exc)
             return PaymentResponse(
-                error_message="Server error: 'invalid json response'"
+                None, None, None, None, "Server error: 'invalid json response'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
             return PaymentResponse(
-                error_message=f"Unable to connect to {self.endpoint}."
+                None, None, None, None, f"Unable to connect to {self.endpoint}."
             )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:

lnbits/wallets/base.py

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

lnbits/wallets/breez.py

@@ -182,16 +182,15 @@ else:
                     )
                 )
 
-                # TODO: add preimage
                 return InvoiceResponse(
-                    ok=True,
-                    checking_id=breez_invoice.ln_invoice.payment_hash,
-                    payment_request=breez_invoice.ln_invoice.bolt11,
-                    # preimage=breez_invoice.ln_invoice.payment_preimage,
+                    True,
+                    breez_invoice.ln_invoice.payment_hash,
+                    breez_invoice.ln_invoice.bolt11,
+                    None,
                 )
             except Exception as e:
                 logger.warning(e)
-                return InvoiceResponse(ok=False, error_message=str(e))
+                return InvoiceResponse(False, None, None, str(e))
 
         async def pay_invoice(
             self, bolt11: str, fee_limit_msat: int
@@ -218,19 +217,22 @@ else:
                 except Exception as ex:
                     logger.info(ex)
                 # assume that payment failed?
-                return PaymentResponse(ok=False, error_message=f"payment failed: {exc}")
+                return PaymentResponse(
+                    False, None, None, None, f"payment failed: {exc}"
+                )
 
             if payment.status != breez_sdk.PaymentStatus.COMPLETE:
-                return PaymentResponse(ok=False, error_message="payment is pending")
+                return PaymentResponse(False, None, None, None, "payment is pending")
 
             # let's use the payment_hash as the checking_id
             checking_id = invoice.payment_hash
 
             return PaymentResponse(
-                ok=True,
-                checking_id=checking_id,
-                fee_msat=payment.fee_msat,
-                preimage=payment.details.data.payment_preimage,
+                True,
+                checking_id,
+                payment.fee_msat,
+                payment.details.data.payment_preimage,
+                None,
             )
 
         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,13 +79,12 @@ 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(
-                ok=False, checking_id=checking_id, error_message=error_message
-            )
+            return InvoiceResponse(False, checking_id, payment_request, error_message)
 
         if data.get("result") is not None:
             checking_id, payment_request = (
@@ -93,19 +92,15 @@ class ClicheWallet(Wallet):
                 data["result"]["invoice"],
             )
         else:
-            return InvoiceResponse(ok=False, error_message="Could not get payment hash")
+            return InvoiceResponse(False, None, None, "Could not get payment hash")
 
-        return InvoiceResponse(
-            ok=True,
-            checking_id=checking_id,
-            payment_request=payment_request,
-            preimage=data["result"].get("preimage"),
-        )
+        return InvoiceResponse(True, checking_id, payment_request, error_message)
 
     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, payment_ok = (
+        checking_id, fee_msat, preimage, error_message, payment_ok = (
+            None,
             None,
             None,
             None,
@@ -114,7 +109,8 @@ class ClicheWallet(Wallet):
         for _ in range(2):
             r = ws.recv()
             data = json.loads(r)
-            checking_id, fee_msat, preimage, payment_ok = (
+            checking_id, fee_msat, preimage, error_message, payment_ok = (
+                None,
                 None,
                 None,
                 None,
@@ -123,7 +119,7 @@ class ClicheWallet(Wallet):
 
             if data.get("error") is not None:
                 error_message = data["error"].get("message")
-                return PaymentResponse(ok=False, error_message=error_message)
+                return PaymentResponse(False, None, None, None, error_message)
 
             if data.get("method") == "payment_succeeded":
                 payment_ok = True
@@ -133,10 +129,10 @@ class ClicheWallet(Wallet):
                 continue
 
             if data.get("result") is None:
-                return PaymentResponse(error_message="result is None")
+                return PaymentResponse(None)
 
         return PaymentResponse(
-            ok=payment_ok, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
+            payment_ok, checking_id, fee_msat, preimage, error_message
         )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:

lnbits/wallets/corelightning.py

@@ -1,7 +1,6 @@
 import asyncio
 import random
-from collections.abc import AsyncGenerator
-from typing import Any, Optional
+from typing import Any, AsyncGenerator, Optional
 
 from bolt11.decode import decode as bolt11_decode
 from bolt11.exceptions import Bolt11Exception
@@ -10,7 +9,6 @@ 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,
@@ -102,11 +100,6 @@ 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,
@@ -114,7 +107,6 @@ 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
@@ -123,39 +115,35 @@ class CoreLightningWallet(Wallet):
 
             if r.get("code") and r.get("code") < 0:  # type: ignore
                 raise Exception(r.get("message"))
-            return InvoiceResponse(
-                ok=True,
-                checking_id=r["payment_hash"],
-                payment_request=r["bolt11"],
-                preimage=preimage,
-            )
+
+            return InvoiceResponse(True, r["payment_hash"], r["bolt11"], None)
         except RpcError as exc:
             logger.warning(exc)
             error_message = f"RPC '{exc.method}' failed with '{exc.error}'."
-            return InvoiceResponse(ok=False, error_message=error_message)
+            return InvoiceResponse(False, None, None, error_message)
         except KeyError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message="Server error: 'missing required fields'"
+                False, None, None, "Server error: 'missing required fields'"
             )
         except Exception as e:
             logger.warning(e)
-            return InvoiceResponse(ok=False, error_message=str(e))
+            return InvoiceResponse(False, None, None, 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(ok=False, error_message=str(exc))
+            return PaymentResponse(False, None, None, None, str(exc))
 
         try:
             previous_payment = await self.get_payment_status(invoice.payment_hash)
             if previous_payment.paid:
-                return PaymentResponse(ok=False, error_message="invoice already paid")
+                return PaymentResponse(False, None, None, None, "invoice already paid")
 
             if not invoice.amount_msat or invoice.amount_msat <= 0:
                 return PaymentResponse(
-                    ok=False, error_message="CLN 0 amount invoice not supported"
+                    False, None, None, None, "CLN 0 amount invoice not supported"
                 )
 
             # maxfee overrides both maxfeepercent and exemptfee defaults (and
@@ -182,23 +170,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(
-                        ok=False, error_message=f"Payment failed: {error_message}"
+                        False, None, None, None, f"Payment failed: {error_message}"
                     )
                 else:
                     error_message = f"Payment failed: {exc.error}"
-                    return PaymentResponse(error_message=error_message)
+                    return PaymentResponse(None, None, None, None, error_message)
             except Exception:
                 error_message = f"RPC '{exc.method}' failed with '{exc.error}'."
-                return PaymentResponse(error_message=error_message)
+                return PaymentResponse(None, None, None, None, error_message)
         except KeyError as exc:
             logger.warning(exc)
             return PaymentResponse(
-                error_message="Server error: 'missing required fields'"
+                None, None, None, None, "Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
-            return PaymentResponse(error_message=f"Payment failed: '{exc}'.")
+            return PaymentResponse(None, None, None, None, f"Payment failed: '{exc}'.")
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         try:

lnbits/wallets/corelightningrest.py

@@ -1,8 +1,7 @@
 import asyncio
 import json
 import random
-from collections.abc import AsyncGenerator
-from typing import Optional
+from typing import AsyncGenerator, Dict, Optional
 
 import httpx
 from bolt11 import Bolt11Exception
@@ -10,7 +9,6 @@ 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,
@@ -111,7 +109,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,
@@ -128,10 +126,8 @@ class CoreLightningRestWallet(Wallet):
         if kwargs.get("expiry"):
             data["expiry"] = kwargs["expiry"]
 
-        preimage, _ = random_secret_and_hash()
-
-        # https://github.com/Ride-The-Lightning/c-lightning-REST/blob/master/controllers/invoice.js#L52C17-L52C25
-        data["preimage"] = preimage
+        if kwargs.get("preimage"):
+            data["preimage"] = kwargs["preimage"]
 
         try:
             r = await self.client.post(
@@ -143,48 +139,41 @@ class CoreLightningRestWallet(Wallet):
             data = r.json()
 
             if len(data) == 0:
-                return InvoiceResponse(ok=False, error_message="no data")
+                return InvoiceResponse(False, None, None, "no data")
 
             if "error" in data:
                 return InvoiceResponse(
-                    ok=False, error_message=f"""Server error: '{data["error"]}'"""
+                    False, None, None, f"""Server error: '{data["error"]}'"""
                 )
 
             if r.is_error:
-                return InvoiceResponse(
-                    ok=False, error_message=f"Server error: '{r.text}'"
-                )
+                return InvoiceResponse(False, None, None, f"Server error: '{r.text}'")
 
             if "payment_hash" not in data or "bolt11" not in data:
                 return InvoiceResponse(
-                    ok=False, error_message="Server error: 'missing required fields'"
+                    False, None, None, "Server error: 'missing required fields'"
                 )
 
-            return InvoiceResponse(
-                ok=True,
-                checking_id=data["payment_hash"],
-                payment_request=data["bolt11"],
-                preimage=preimage,
-            )
+            return InvoiceResponse(True, data["payment_hash"], data["bolt11"], None)
         except json.JSONDecodeError:
             return InvoiceResponse(
-                ok=False, error_message="Server error: 'invalid json response'"
+                False, None, None, "Server error: 'invalid json response'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message=f"Unable to connect to {self.url}."
+                False, None, None, 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(ok=False, error_message=str(exc))
+            return PaymentResponse(False, None, None, None, str(exc))
 
         if not invoice.amount_msat or invoice.amount_msat <= 0:
             error_message = "0 amount invoices are not allowed"
-            return PaymentResponse(ok=False, error_message=error_message)
+            return PaymentResponse(False, None, None, None, error_message)
         try:
             r = await self.client.post(
                 f"{self.url}/v1/pay",
@@ -201,16 +190,18 @@ class CoreLightningRestWallet(Wallet):
             status = self.statuses.get(data["status"])
             if "payment_preimage" not in data:
                 return PaymentResponse(
-                    ok=status, error_message=data.get("error") or "unknown error"
+                    status,
+                    None,
+                    None,
+                    None,
+                    data.get("error"),
                 )
 
             checking_id = data["payment_hash"]
             preimage = data["payment_preimage"]
             fee_msat = data["msatoshi_sent"] - data["msatoshi"]
 
-            return PaymentResponse(
-                ok=status, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
-            )
+            return PaymentResponse(status, checking_id, fee_msat, preimage, None)
         except httpx.HTTPStatusError as exc:
             try:
                 logger.debug(exc)
@@ -218,26 +209,28 @@ 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(ok=False, error_message=error_message)
+                    return PaymentResponse(False, None, None, None, error_message)
                 error_message = f"REST failed with {data['error']['message']}."
-                return PaymentResponse(error_message=error_message)
+                return PaymentResponse(None, None, None, None, error_message)
             except Exception as exc:
                 error_message = f"Unable to connect to {self.url}."
-                return PaymentResponse(error_message=error_message)
+                return PaymentResponse(None, None, None, None, error_message)
 
         except json.JSONDecodeError:
             return PaymentResponse(
-                error_message="Server error: 'invalid json response'"
+                None, None, None, None, "Server error: 'invalid json response'"
             )
         except KeyError as exc:
             logger.warning(exc)
             return PaymentResponse(
-                error_message="Server error: 'missing required fields'"
+                None, None, None, None, "Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
-            return PaymentResponse(error_message=f"Unable to connect to {self.url}.")
+            return PaymentResponse(
+                None, None, None, None, 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,14 +3,13 @@ import base64
 import hashlib
 import json
 import urllib.parse
-from typing import Any, AsyncGenerator, Optional
+from typing import Any, AsyncGenerator, Dict, 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,
@@ -86,7 +85,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"):
@@ -100,45 +99,36 @@ 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(ok=False, error_message="no data")
+                return InvoiceResponse(False, None, None, "no data")
 
             if "error" in data:
                 return InvoiceResponse(
-                    ok=False, error_message=f"""Server error: '{data["error"]}'"""
+                    False, None, None, f"""Server error: '{data["error"]}'"""
                 )
 
             if r.is_error:
-                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,
-            )
+                return InvoiceResponse(False, None, None, f"Server error: '{r.text}'")
+
+            return InvoiceResponse(True, data["paymentHash"], data["serialized"], None)
         except json.JSONDecodeError:
             return InvoiceResponse(
-                ok=False, error_message="Server error: 'invalid json response'"
+                False, None, None, "Server error: 'invalid json response'"
             )
         except KeyError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message="Server error: 'missing required fields'"
+                False, None, None, "Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message=f"Unable to connect to {self.url}."
+                False, None, None, f"Unable to connect to {self.url}."
             )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -152,36 +142,35 @@ class EclairWallet(Wallet):
             data = r.json()
 
             if "error" in data:
-                return PaymentResponse(error_message=data["error"])
+                return PaymentResponse(None, None, None, None, data["error"])
             if r.is_error:
-                return PaymentResponse(error_message=r.text)
+                return PaymentResponse(None, None, None, None, r.text)
 
             if data["type"] == "payment-failed":
-                return PaymentResponse(ok=False, error_message="payment failed")
+                return PaymentResponse(False, None, None, None, "payment failed")
 
             checking_id = data["paymentHash"]
             preimage = data["paymentPreimage"]
 
         except json.JSONDecodeError:
             return PaymentResponse(
-                error_message="Server error: 'invalid json response'"
+                None, None, None, None, "Server error: 'invalid json response'"
             )
         except KeyError:
             return PaymentResponse(
-                error_message="Server error: 'missing required fields'"
+                None, None, None, None, "Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
-            return PaymentResponse(error_message=f"Unable to connect to {self.url}.")
+            return PaymentResponse(
+                None, None, None, None, 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(
-            ok=success,
-            checking_id=checking_id,
-            fee_msat=payment_status.fee_msat,
-            preimage=preimage,
+            success, checking_id, payment_status.fee_msat, preimage, None
         )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:

lnbits/wallets/fake.py

@@ -2,7 +2,7 @@ import asyncio
 from datetime import datetime
 from hashlib import sha256
 from os import urandom
-from typing import AsyncGenerator, Optional
+from typing import AsyncGenerator, Dict, Optional, Set
 
 from bolt11 import (
     Bolt11,
@@ -34,8 +34,8 @@ class FakeWallet(Wallet):
 
     def __init__(self) -> None:
         self.queue: asyncio.Queue = asyncio.Queue(0)
-        self.payment_secrets: dict[str, str] = {}
-        self.paid_invoices: set[str] = set()
+        self.payment_secrets: Dict[str, str] = {}
+        self.paid_invoices: Set[str] = set()
         self.secret = settings.fake_wallet_secret
         self.privkey = fake_privkey(self.secret)
 
@@ -80,12 +80,11 @@ class FakeWallet(Wallet):
             secret = urandom(32).hex()
         tags.add(TagChar.payment_secret, secret)
 
-        preimage = urandom(32)
-        payment_hash = sha256(preimage).hexdigest()
+        payment_hash = sha256(secret.encode()).hexdigest()
 
         tags.add(TagChar.payment_hash, payment_hash)
 
-        self.payment_secrets[payment_hash] = preimage.hex()
+        self.payment_secrets[payment_hash] = secret
 
         bolt11 = Bolt11(
             currency="bc",
@@ -97,10 +96,7 @@ class FakeWallet(Wallet):
         payment_request = encode(bolt11, self.privkey)
 
         return InvoiceResponse(
-            ok=True,
-            checking_id=payment_hash,
-            payment_request=payment_request,
-            preimage=preimage.hex(),
+            ok=True, checking_id=payment_hash, payment_request=payment_request
         )
 
     async def pay_invoice(self, bolt11: str, _: int) -> PaymentResponse:

lnbits/wallets/lnbits.py

@@ -87,33 +87,26 @@ class LNbitsWallet(Wallet):
             r.raise_for_status()
             data = r.json()
 
-            # Backwards compatibility for pre-v1 which used the key "payment_request"
-            payment_str = data.get("bolt11") or data.get("payment_request")
-            if r.is_error or not payment_str:
+            if r.is_error or "bolt11" not in data:
                 error_message = data["detail"] if "detail" in data else r.text
                 return InvoiceResponse(
-                    ok=False, error_message=f"Server error: '{error_message}'"
+                    False, None, None, f"Server error: '{error_message}'"
                 )
 
-            return InvoiceResponse(
-                ok=True,
-                checking_id=data["checking_id"],
-                payment_request=payment_str,
-                preimage=data.get("preimage"),
-            )
+            return InvoiceResponse(True, data["checking_id"], data["bolt11"], None)
         except json.JSONDecodeError:
             return InvoiceResponse(
-                ok=False, error_message="Server error: 'invalid json response'"
+                False, None, None, "Server error: 'invalid json response'"
             )
         except KeyError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message="Server error: 'missing required fields'"
+                False, None, None, "Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message=f"Unable to connect to {self.endpoint}."
+                False, None, None, f"Unable to connect to {self.endpoint}."
             )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -134,10 +127,7 @@ class LNbitsWallet(Wallet):
 
             success = True if payment.success else None
             return PaymentResponse(
-                ok=success,
-                checking_id=checking_id,
-                fee_msat=payment.fee_msat,
-                preimage=payment.preimage,
+                success, checking_id, payment.fee_msat, payment.preimage
             )
 
         except httpx.HTTPStatusError as exc:
@@ -146,25 +136,25 @@ class LNbitsWallet(Wallet):
                 data = exc.response.json()
                 error_message = f"Payment {data['status']}: {data['detail']}."
                 if data["status"] == "failed":
-                    return PaymentResponse(ok=False, error_message=error_message)
-                return PaymentResponse(error_message=error_message)
+                    return PaymentResponse(False, None, None, None, error_message)
+                return PaymentResponse(None, None, None, None, error_message)
             except Exception as exc:
                 error_message = f"Unable to connect to {self.endpoint}."
-                return PaymentResponse(error_message=error_message)
+                return PaymentResponse(None, None, None, None, error_message)
 
         except json.JSONDecodeError:
             return PaymentResponse(
-                error_message="Server error: 'invalid json response'"
+                None, None, None, None, "Server error: 'invalid json response'"
             )
         except KeyError:
             return PaymentResponse(
-                error_message="Server error: 'missing required fields'"
+                None, None, None, None, "Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
             return PaymentResponse(
-                error_message=f"Unable to connect to {self.endpoint}."
+                None, None, None, None, 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
-from hashlib import sha256
+import hashlib
 from os import environ
 from typing import AsyncGenerator, Dict, Optional
 
@@ -12,11 +12,10 @@ 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 random_secret_and_hash
+from lnbits.utils.crypto import AESCipher
 
 from .base import (
     InvoiceResponse,
-    PaymentFailedStatus,
     PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
@@ -72,11 +71,6 @@ 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
@@ -85,11 +79,23 @@ class LndWallet(Wallet):
             or settings.lnd_invoice_macaroon
         )
         encrypted_macaroon = settings.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
+        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"
+            )
 
+        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)
@@ -133,38 +139,21 @@ class LndWallet(Wallet):
         if description_hash:
             data["description_hash"] = description_hash
         elif unhashed_description:
-            data["description_hash"] = sha256(unhashed_description).digest()
+            data["description_hash"] = hashlib.sha256(
+                unhashed_description
+            ).digest()  # as bytes directly
 
-        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)
-            return InvoiceResponse(ok=False, error_message=str(exc))
+            error_message = str(exc)
+            return InvoiceResponse(False, None, None, error_message)
 
         checking_id = bytes_to_hex(resp.r_hash)
         payment_request = str(resp.payment_request)
-        return InvoiceResponse(
-            ok=True,
-            checking_id=checking_id,
-            payment_request=payment_request,
-            preimage=preimage,
-        )
+        return InvoiceResponse(True, checking_id, payment_request, None)
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
         # fee_limit_fixed = ln.FeeLimit(fixed=fee_limit_msat // 1000)
@@ -178,7 +167,7 @@ class LndWallet(Wallet):
             resp = await self.routerpc.SendPaymentV2(req).read()
         except Exception as exc:
             logger.warning(exc)
-            return PaymentResponse(error_message=str(exc))
+            return PaymentResponse(None, None, None, None, str(exc))
 
         # PaymentStatus from https://github.com/lightningnetwork/lnd/blob/master/channeldb/payments.go#L178
         statuses = {
@@ -206,18 +195,12 @@ 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(ok=False, error_message=error_message)
-        else:
-            return PaymentResponse(
-                ok=None,
-                checking_id=checking_id,
-                error_message="Payment in flight or non-existant.",
-            )
+
+        return PaymentResponse(
+            statuses[resp.status], checking_id, fee_msat, preimage, error_message
+        )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         try:
@@ -228,11 +211,10 @@ class LndWallet(Wallet):
                 raise ValueError
 
             resp = await self.rpc.LookupInvoice(ln.PaymentHash(r_hash=r_hash))
-            if resp.settled:
-                return PaymentSuccessStatus(preimage=resp.r_preimage.hex())
 
-            if resp.state == "CANCELED":
-                return PaymentFailedStatus()
+            # todo: where is the FAILED status
+            if resp.settled:
+                return PaymentSuccessStatus()
 
             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 random_secret_and_hash
+from lnbits.utils.crypto import AESCipher
 
 from .base import (
     InvoiceResponse,
@@ -35,6 +35,26 @@ 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! "
@@ -48,21 +68,7 @@ class LndRestWallet(Wallet):
         # even on startup
         cert = settings.lnd_rest_cert or True
 
-        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
-
+        macaroon = load_macaroon(macaroon)
         headers = {
             "Grpc-Metadata-macaroon": macaroon,
             "User-Agent": settings.user_agent,
@@ -104,67 +110,56 @@ 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(ok=False, error_message="no data")
+                return InvoiceResponse(False, None, None, "no data")
 
             if "error" in data:
                 return InvoiceResponse(
-                    ok=False, error_message=f"""Server error: '{data["error"]}'"""
+                    False, None, None, f"""Server error: '{data["error"]}'"""
                 )
 
             if r.is_error:
-                return InvoiceResponse(
-                    ok=False, error_message=f"Server error: '{r.text}'"
-                )
+                return InvoiceResponse(False, None, None, f"Server error: '{r.text}'")
 
             if "payment_request" not in data or "r_hash" not in data:
                 return InvoiceResponse(
-                    ok=False, error_message="Server error: 'missing required fields'"
+                    False, None, None, "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(
-                ok=False, error_message="Server error: 'invalid json response'"
+                False, None, None, "Server error: 'invalid json response'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message=f"Unable to connect to {self.endpoint}."
+                False, None, None, f"Unable to connect to {self.endpoint}."
             )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -190,27 +185,25 @@ class LndRestWallet(Wallet):
             payment_error = data.get("payment_error")
             if payment_error:
                 logger.warning(f"LndRestWallet payment_error: {payment_error}.")
-                return PaymentResponse(ok=False, error_message=payment_error)
+                return PaymentResponse(False, None, None, None, 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(
-                ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
-            )
+            return PaymentResponse(True, checking_id, fee_msat, preimage, None)
         except KeyError as exc:
             logger.warning(exc)
             return PaymentResponse(
-                error_message="Server error: 'missing required fields'"
+                None, None, None, None, "Server error: 'missing required fields'"
             )
         except json.JSONDecodeError:
             return PaymentResponse(
-                error_message="Server error: 'invalid json response'"
+                None, None, None, None, "Server error: 'invalid json response'"
             )
         except Exception as exc:
             logger.warning(f"LndRestWallet pay_invoice POST error: {exc}.")
             return PaymentResponse(
-                error_message=f"Unable to connect to {self.endpoint}."
+                None, None, None, None, f"Unable to connect to {self.endpoint}."
             )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
@@ -219,22 +212,15 @@ 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()
-
-        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()
+        return PaymentSuccessStatus()
 
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         """
@@ -280,12 +266,7 @@ class LndRestWallet(Wallet):
                     if payment is not None and payment.get("status"):
                         return PaymentStatus(
                             paid=statuses[payment["status"]],
-                            # API returns fee_msat as string, explicitly convert to int
-                            fee_msat=(
-                                int(payment["fee_msat"])
-                                if payment.get("fee_msat")
-                                else None
-                            ),
+                            fee_msat=payment.get("fee_msat"),
                             preimage=payment.get("payment_preimage"),
                         )
                     else:

lnbits/wallets/lnpay.py

@@ -91,18 +91,21 @@ class LNPayWallet(Wallet):
             json=data,
             timeout=60,
         )
-        if r.status_code == 201:
-            data = r.json()
-            self.pending_invoices.append(data["id"])
-            return InvoiceResponse(
-                ok=True,
-                payment_request=data["payment_request"],
-            )
-        return InvoiceResponse(
-            ok=False,
-            error_message=r.text,
+        ok, checking_id, payment_request, error_message = (
+            r.status_code == 201,
+            None,
+            None,
+            r.text,
         )
 
+        if ok:
+            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)
+
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
         r = await self.client.post(
             f"/wallet/{self.wallet_key}/withdraw",
@@ -113,17 +116,17 @@ class LNPayWallet(Wallet):
         try:
             data = r.json()
         except Exception:
-            return PaymentResponse(ok=False, error_message="Got invalid JSON.")
+            return PaymentResponse(
+                False, None, 0, None, f"Got invalid JSON: {r.text[:200]}"
+            )
 
         if r.is_error:
-            return PaymentResponse(ok=False, error_message=data["message"])
+            return PaymentResponse(False, None, None, None, data["message"])
 
         checking_id = data["lnTx"]["id"]
         fee_msat = 0
         preimage = data["lnTx"]["payment_preimage"]
-        return PaymentResponse(
-            ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
-        )
+        return PaymentResponse(True, checking_id, fee_msat, preimage, None)
 
     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,14 +91,11 @@ class LnTipsWallet(Wallet):
             except Exception:
                 error_message = r.text
 
-            return InvoiceResponse(ok=False, error_message=error_message)
+            return InvoiceResponse(False, None, None, error_message)
 
         data = r.json()
         return InvoiceResponse(
-            ok=True,
-            checking_id=data["payment_hash"],
-            payment_request=data["payment_request"],
-            preimage=data.get("preimage"),
+            True, data["payment_hash"], data["payment_request"], None
         )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -108,7 +105,7 @@ class LnTipsWallet(Wallet):
             timeout=None,
         )
         if r.is_error:
-            return PaymentResponse(ok=False, error_message=r.text)
+            return PaymentResponse(False, None, 0, None, r.text)
 
         if "error" in r.json():
             try:
@@ -116,15 +113,13 @@ class LnTipsWallet(Wallet):
                 error_message = data["error"]
             except Exception:
                 error_message = r.text
-            return PaymentResponse(ok=False, error_message=error_message)
+            return PaymentResponse(False, None, 0, None, error_message)
 
         data = r.json()["details"]
         checking_id = data["payment_hash"]
         fee_msat = -data["fee"]
         preimage = data["preimage"]
-        return PaymentResponse(
-            ok=True, checking_id=checking_id, fee_msat=fee_msat, preimage=preimage
-        )
+        return PaymentResponse(True, checking_id, fee_msat, preimage, None)
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         try:

lnbits/wallets/macaroon/macaroon.py

@@ -1,45 +1,45 @@
 import base64
-from getpass import getpass
-from typing import Optional
+
+from loguru import logger
 
 from lnbits.utils.crypto import AESCipher
 
 
-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."""
+def load_macaroon(macaroon: str) -> str:
+    """Returns hex version of a macaroon encoded in base64 or the file path.
 
-    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"
+    :param macaroon: Macaroon encoded in base64 or file path.
+    :type macaroon: str
+    :return: Hex version of macaroon.
+    :rtype: str
+    """
 
     # 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()
-
-    # 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
-
+    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
     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,8 +148,10 @@ class NWCWallet(Wallet):
             info = await self.conn.get_info()
             if "make_invoice" not in info["supported_methods"]:
                 return InvoiceResponse(
-                    ok=False,
-                    error_message="make_invoice is not supported by this NWC service.",
+                    False,
+                    None,
+                    None,
+                    "make_invoice is not supported by this NWC service.",
                 )
             resp = await self.conn.call(
                 "make_invoice",
@@ -173,9 +175,7 @@ class NWCWallet(Wallet):
                         "expired": False,
                     }
                 )
-            return InvoiceResponse(
-                ok=True, checking_id=checking_id, payment_request=payment_request
-            )
+            return InvoiceResponse(True, checking_id, payment_request, None)
         except Exception as e:
             return InvoiceResponse(ok=False, error_message=str(e))
 
@@ -203,9 +203,7 @@ class NWCWallet(Wallet):
 
             if "lookup_invoice" not in info["supported_methods"]:
                 # if not supported, we assume it succeeded
-                return PaymentResponse(
-                    ok=True, checking_id=payment_hash, preimage=preimage, fee_msat=0
-                )
+                return PaymentResponse(True, payment_hash, None, preimage, None)
 
             try:
                 payment_data = await self.conn.call(
@@ -215,20 +213,15 @@ class NWCWallet(Wallet):
                     "preimage", None
                 )
                 if not settled:
-                    return PaymentResponse(checking_id=payment_hash)
+                    return PaymentResponse(None, payment_hash, None, None, None)
                 else:
                     fee_msat = payment_data.get("fees_paid", None)
-                    return PaymentResponse(
-                        ok=True,
-                        checking_id=payment_hash,
-                        fee_msat=fee_msat,
-                        preimage=preimage,
-                    )
+                    return PaymentResponse(True, payment_hash, fee_msat, preimage, None)
             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(checking_id=payment_hash)
+                return PaymentResponse(None, payment_hash, None, None, None)
         except NWCError as e:
             logger.error("Error paying invoice: " + str(e))
             failure_codes = [
@@ -244,14 +237,13 @@ class NWCWallet(Wallet):
             ]
             failed = e.code in failure_codes
             return PaymentResponse(
-                ok=None if not failed else False,
+                None if not failed else False,
                 error_message=e.message if failed else None,
             )
         except Exception as e:
-            msg = "Error paying invoice: " + str(e)
-            logger.error(msg)
+            logger.error("Error paying invoice: " + str(e))
             # assume pending
-            return PaymentResponse(error_message=msg)
+            return PaymentResponse(None)
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
         return await self.get_payment_status(checking_id)
@@ -308,7 +300,6 @@ 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,15 +88,13 @@ class OpenNodeWallet(Wallet):
 
         if r.is_error:
             error_message = r.json()["message"]
-            return InvoiceResponse(ok=False, error_message=error_message)
+            return InvoiceResponse(False, None, None, error_message)
 
         data = r.json()["data"]
         checking_id = data["id"]
         payment_request = data["lightning_invoice"]["payreq"]
         self.pending_invoices.append(checking_id)
-        return InvoiceResponse(
-            ok=True, checking_id=checking_id, payment_request=payment_request
-        )
+        return InvoiceResponse(True, checking_id, payment_request, None)
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
         r = await self.client.post(
@@ -107,15 +105,16 @@ class OpenNodeWallet(Wallet):
 
         if r.is_error:
             error_message = r.json()["message"]
-            return PaymentResponse(ok=False, error_message=error_message)
+            return PaymentResponse(False, None, None, None, error_message)
 
         data = r.json()["data"]
         checking_id = data["id"]
         fee_msat = -data["fee"] * 1000
-        # pending
+
         if data["status"] != "paid":
-            return PaymentResponse(ok=None, checking_id=checking_id, fee_msat=fee_msat)
-        return PaymentResponse(ok=True, checking_id=checking_id, fee_msat=fee_msat)
+            return PaymentResponse(None, checking_id, fee_msat, None, "payment failed")
+
+        return PaymentResponse(True, checking_id, fee_msat, None, None)
 
     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,31 +133,25 @@ class PhoenixdWallet(Wallet):
             if r.is_error or "paymentHash" not in data:
                 error_message = data["message"]
                 return InvoiceResponse(
-                    ok=False, error_message=f"Server error: '{error_message}'"
+                    False, None, None, f"Server error: '{error_message}'"
                 )
 
             checking_id = data["paymentHash"]
             payment_request = data["serialized"]
-            preimage = data.get("paymentPreimage", None)  # if available
-            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(
-                ok=False, error_message="Server error: 'invalid json response'"
+                False, None, None, "Server error: 'invalid json response'"
             )
         except KeyError as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message="Server error: 'missing required fields'"
+                False, None, None, "Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.warning(exc)
             return InvoiceResponse(
-                ok=False, error_message=f"Unable to connect to {self.endpoint}."
+                False, None, None, f"Unable to connect to {self.endpoint}."
             )
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@@ -174,35 +168,31 @@ class PhoenixdWallet(Wallet):
             data = r.json()
 
             if "routingFeeSat" not in data and "reason" in data:
-                return PaymentResponse(error_message=data["reason"])
+                return PaymentResponse(None, None, None, None, data["reason"])
 
             if r.is_error or "paymentHash" not in data:
                 error_message = data["message"] if "message" in data else r.text
-                return PaymentResponse(error_message=error_message)
+                return PaymentResponse(None, None, None, None, error_message)
 
             checking_id = data["paymentHash"]
-            fee_msat = -int(data["routingFeeSat"]) * 1000
+            fee_msat = -int(data["routingFeeSat"])
             preimage = data["paymentPreimage"]
-            return PaymentResponse(
-                ok=True,
-                checking_id=checking_id,
-                fee_msat=fee_msat,
-                preimage=preimage,
-            )
+
+            return PaymentResponse(True, checking_id, fee_msat, preimage, None)
 
         except json.JSONDecodeError:
             return PaymentResponse(
-                error_message="Server error: 'invalid json response'"
+                None, None, None, None, "Server error: 'invalid json response'"
             )
         except KeyError:
             return PaymentResponse(
-                error_message="Server error: 'missing required fields'"
+                None, None, None, None, "Server error: 'missing required fields'"
             )
         except Exception as exc:
             logger.info(f"Failed to pay invoice {bolt11}")
             logger.warning(exc)
             return PaymentResponse(
-                error_message=f"Unable to connect to {self.endpoint}."
+                None, None, None, None, f"Unable to connect to {self.endpoint}."
             )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:

lnbits/wallets/spark.py

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