make fe tests run

.env.example

@@ -6,10 +6,6 @@
 # The following settings are ONLY set in your .env file.
 # They are NOT managed by the Admin UI and are not stored in the database.
 
-# === First Install Token ===
-# if set the user is required to enter this token on the /first_install page
-# FIRST_INSTALL_TOKEN="myaccesstoken"
-
 # === Logging and Development ===
 
 DEBUG=False
@@ -59,7 +55,7 @@ LNBITS_EXTENSIONS_DEFAULT_INSTALL="tpos"
 # LNBITS_EXT_GITHUB_TOKEN=github_pat_xxxxxxxxxxxxxxxxxx
 
 # 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, CLNRestWallet, SparkWallet, SparkL2Wallet"
+# LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, BlinkWallet, AlbyWallet, ZBDWallet, PhoenixdWallet, OpenNodeWallet, NWCWallet, BreezSdkWallet, BoltzWallet, StrikeWallet, CLNRestWallet"
 
 # uvicorn variable, allow https behind a proxy
 # IMPORTANT: this also needs the webserver to be configured to forward the headers
@@ -191,15 +187,6 @@ BOLTZ_CLIENT_MACAROON="/home/bob/.boltz/macaroons/admin.macaroon"
 # HEXSTRING instead of path also possible
 BOLTZ_CLIENT_CERT="/home/bob/.boltz/tls.cert"
 
-# SparkL2Wallet (external sidecar: https://github.com/lnbits/spark_sidecar)
-SPARK_L2_NETWORK=MAINNET
-SPARK_L2_EXTERNAL_ENDPOINT=http://127.0.0.1:8765
-SPARK_L2_EXTERNAL_API_KEY=
-# optional tuning
-# SPARK_L2_PAY_WAIT_MS=4000
-# SPARK_L2_PAY_POLL_MS=500
-# SPARK_L2_STREAM_KEEPALIVE_MS=15000
-
 # StrikeWallet
 STRIKE_API_ENDPOINT=https://api.strike.me/v1
 STRIKE_API_KEY=YOUR_STRIKE_API_KEY

.github/workflows/ci.yml

@@ -12,6 +12,13 @@ jobs:
   lint:
     uses: ./.github/workflows/lint.yml
 
+  test-frontend:
+    needs: [ lint ]
+    uses: ./.github/workflows/make.yml
+    with:
+      make: test-frontend
+      npm: true
+
   test-api:
     needs: [ lint ]
     strategy:

.github/workflows/docker.yml

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

.github/workflows/regtest.yml

@@ -38,7 +38,8 @@ jobs:
 
       - name: Setup Regtest
         run: |
-          cd docker/regtest
+          git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
+          cd docker
           chmod +x ./start-regtest
           ./start-regtest
           sudo chmod -R a+rwx .
@@ -49,16 +50,16 @@ jobs:
           LNBITS_DATABASE_URL: ${{ inputs.db-url }}
           LNBITS_BACKEND_WALLET_CLASS: ${{ inputs.backend-wallet-class }}
           LND_REST_ENDPOINT: https://localhost:8081/
-          LND_REST_CERT: ./docker/regtest/data/lnd-3/tls.cert
-          LND_REST_MACAROON: ./docker/regtest/data/lnd-3/data/chain/bitcoin/regtest/admin.macaroon
+          LND_REST_CERT: ./docker/data/lnd-3/tls.cert
+          LND_REST_MACAROON: ./docker/data/lnd-3/data/chain/bitcoin/regtest/admin.macaroon
           LND_GRPC_ENDPOINT: localhost
           LND_GRPC_PORT: 10009
-          LND_GRPC_CERT: ./docker/regtest/data/lnd-3/tls.cert
-          LND_GRPC_MACAROON: ./docker/regtest/data/lnd-3/data/chain/bitcoin/regtest/admin.macaroon
-          CORELIGHTNING_RPC: ./docker/regtest/data/clightning-1/regtest/lightning-rpc
+          LND_GRPC_CERT: docker/data/lnd-3/tls.cert
+          LND_GRPC_MACAROON: docker/data/lnd-3/data/chain/bitcoin/regtest/admin.macaroon
+          CORELIGHTNING_RPC: ./docker/data/clightning-1/regtest/lightning-rpc
           CORELIGHTNING_REST_URL: https://localhost:3001
-          CORELIGHTNING_REST_MACAROON: ./docker/regtest/data/clightning-2-rest/access.macaroon
-          CORELIGHTNING_REST_CERT: ./docker/regtest/data/clightning-2-rest/certificate.pem
+          CORELIGHTNING_REST_MACAROON: ./docker/data/clightning-2-rest/access.macaroon
+          CORELIGHTNING_REST_CERT: ./docker/data/clightning-2-rest/certificate.pem
           LNBITS_ENDPOINT: http://localhost:5001
           LNBITS_KEY: "d08a3313322a4514af75d488bcc27eee"
           ECLAIR_URL: http://127.0.0.1:8082

.github/workflows/release-rc.yml

@@ -44,19 +44,15 @@ jobs:
     if: github.repository == 'lnbits/lnbits'
     runs-on: ubuntu-24.04
     steps:
+      - name: Install dependencies for building secp256k1
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential automake libtool libffi-dev libgmp-dev
       - uses: actions/checkout@v4
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v5
+      - name: Build and publish to pypi
+        uses: JRubics/poetry-publish@v1.15
         with:
-          python-version: "3.10"
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-      - name: Build the project
-        run: uv build
-      - name: Publish to pypi
-        env:
-          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_API_KEY }}
-        run: uv publish
+          pypi_token: ${{ secrets.PYPI_API_KEY }}
 
   appimage:
     needs: [ release ]

.github/workflows/release.yml

@@ -56,19 +56,15 @@ jobs:
     if: github.repository == 'lnbits/lnbits'
     runs-on: ubuntu-24.04
     steps:
+      - name: Install dependencies for building secp256k1
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential automake libtool libffi-dev libgmp-dev
       - uses: actions/checkout@v4
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v5
+      - name: Build and publish to pypi
+        uses: JRubics/poetry-publish@v1.15
         with:
-          python-version: "3.10"
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-      - name: Build the project
-        run: uv build
-      - name: Publish to pypi
-        env:
-          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_API_KEY }}
-        run: uv publish
+          pypi_token: ${{ secrets.PYPI_API_KEY }}
 
   appimage:
     needs: [ release ]

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: tests
+name: tests pytest
 
 on:
   workflow_call:

.gitignore

@@ -42,6 +42,7 @@ lnbits/static/bundle.min.js.old
 lnbits/static/bundle.min.css.old
 lnbits/static/bundle-components.min.js.old
 lnbits/upgrades
+docker
 
 # Nix
 *result*

Dockerfile.boltz

@@ -14,13 +14,11 @@ ENV PATH="/root/.local/bin:$PATH"
 # Reinstall dependencies just in case (needed for CMD usage)
 RUN uv sync --all-extras
 
-# LNbits
+# LNbits + boltzd configuration
 ENV LNBITS_PORT="5000"
 ENV LNBITS_HOST="0.0.0.0"
 ENV LNBITS_BACKEND_WALLET_CLASS="BoltzWallet"
 ENV FUNDING_SOURCE_MAX_RETRIES=10
-
-# Boltzd
 ENV BOLTZ_CLIENT_ENDPOINT="127.0.0.1:9002"
 ENV BOLTZ_CLIENT_MACAROON="/root/.boltz/macaroons/admin.macaroon"
 ENV BOLTZ_CLIENT_CERT="/root/.boltz/tls.cert"
@@ -28,7 +26,8 @@ ENV BOLTZ_CLIENT_WALLET="lnbits"
 
 EXPOSE 5000
 
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
+# Entrypoint to start boltzd and LNbits
+COPY dockerboltz.sh /dockerboltz.sh
+RUN chmod +x /dockerboltz.sh
 
-CMD ["/entrypoint.sh"]
+CMD ["/dockerboltz.sh"]

Makefile

@@ -41,6 +41,10 @@ dev:
 docker:
 	docker build -t lnbits/lnbits .
 
+test-frontend:
+	npm install
+	npm test
+
 test-wallets:
 	LNBITS_DATA_FOLDER="./tests/data" \
 	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \

docker/regtest/.gitignore

@@ -1,18 +0,0 @@
-!data
-data/*
-
-!data/boltz
-data/boltz/*
-!data/boltz/boltz.conf
-
-!data/boltz-client
-data/boltz-client/*
-!data/boltz-client/boltz.toml
-
-!data/boltz-nginx
-data/boltz-nginx/*
-!data/boltz-nginx/default.conf
-
-!data/eclair
-data/eclair/*
-!data/eclair/eclair.conf

docker/regtest/README.md

@@ -1,99 +0,0 @@
-![TESTS](https://github.com/lnbits/legend-regtest-enviroment/actions/workflows/ci.yml/badge.svg)
-
-# nodes
-
-- lnd-1: for locally testing your current lnbits
-- lnd-2: used for boltz backend
-- lnd-3: used for lnbits inside docker
-- cln-1: for locally testing your current lnbits
-- cln-2: used for clightning-REST
-- eclair-1: for locally testing your current lnbits
-
-# Installing regtest
-
-get the regtest enviroment ready
-
-```sh
-# Install docker https://docs.docker.com/engine/install/
-# Make sure your user has permission to use docker 'sudo usermod -aG docker ${USER}' then reboot
-# Stop/start docker 'sudo systemctl stop docker' 'sudo systemctl start docker'
-
-sudo apt install jq
-git clone https://github.com/lnbits/lnbits.git
-cd lnbits
-docker build -t lnbits/lnbits .
-mkdir docker
-git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
-cd docker
-chmod +x ./start-regtest
-./start-regtest # start the regtest and also run tests
-sudo chown -R $USER ./data # Give the data file permissions for user
-```
-
-# Running LNbits on regtest
-
-add this ENV variables to your `.env` file
-
-```sh
-DEBUG=true
-
-# LND
-LNBITS_BACKEND_WALLET_CLASS="LndRestWallet"
-LND_REST_ENDPOINT=https://127.0.0.1:8081/
-LND_REST_CERT=/home/user/repos/lnbits/docker/data/lnd-1/tls.cert
-LND_REST_MACAROON=/home/user/repos/lnbits/docker/data/lnd-1/data/chain/bitcoin/regtest/admin.macaroon
-
-# CLN
-LNBITS_BACKEND_WALLET_CLASS="CoreLightningWallet"
-CORELIGHTNING_RPC=./docker/data/clightning-1/regtest/lightning-rpc
-
-
-# Run LNbits
-uv run lnbits
-
-# Run LNbits with hot reload
-make dev
-```
-
-# testing
-
-```sh
-chmod +x ./start-regtest
-./start-regtest
-# short answer :)
-./start-regtest && echo "PASSED" || echo "FAILED" > /dev/null
-```
-
-usage of the `bitcoin-cli-sim`, `lightning-cli-sim` and `lncli-sim` aliases
-
-```sh
-cd ~/lnbits/docker
-source docker-scripts.sh
-# use bitcoin core, mine a block
-bitcoin-cli-sim -generate 1
-
-# use c-lightning nodes
-lightning-cli-sim 1 newaddr | jq -r '.bech32' # use node 1
-lightning-cli-sim 2 getinfo # use node 2
-lightning-cli-sim 3 getinfo # use node 3
-
-# use lnd nodes
-lncli-sim 1 newaddr p2wsh
-lncli-sim 2 listpeers
-```
-
-# urls
-
-- mempool: http://localhost:8080/
-- boltz api: http://localhost:9001/
-- lnd-1 rest: http://localhost:8081/
-- lnbits: http://localhost:5001/
-
-# debugging docker logs
-
-```sh
-docker logs lnbits-lnbits-1 -f
-docker logs lnbits-boltz-1 -f
-docker logs lnbits-clightning-1-1 -f
-docker logs lnbits-lnd-2-1 -f
-```

docker/regtest/data/boltz-client/boltz.toml

@@ -1,49 +0,0 @@
-standalone = true
-network = "regtest"
-
-# Path the the log file
-logfile = ""
-
-electrumUrl = "electrs:19001"
-electrumLiquidUrl = "electrs-liquid:19002"
-
-[BOLTZ]
-# By default the daemon automatically connects to the official Boltz instance for the network LND is on
-# This value is used to override that
-url = "http://boltz-nginx:9001"
-
-[DATABASE]
-# Path to the SQLite database file
-# path = "/home/michael/test.db"
-
-[RPC]
-# Host of
-host = "0.0.0.0"
-
-# Port of the gRPC interface
-port = 9002
-
-# Whether the REST proxy for the gRPC interface should be disabled
-restDisabled = false
-
-# Host of the REST proxy
-restHost = "0.0.0.0"
-
-# Port of the REST proxy
-restPort = 9003
-
-# Path to the TLS cert for the gRPC and REST interface
-tlsCert = ""
-
-# Path to the TLS private key for the gRPC and REST interface
-tlsKey = ""
-noTls = true
-
-# Whether the macaroon authentication for the gRPC and REST interface should be disabled
-noMacaroons = true
-
-# Path to the admin macaroon for the gRPC and REST interface
-adminMacaroonPath = ""
-
-# Path to the read only macaroon for the gRPC and REST interface
-readOnlyMacaroonPath = ""

docker/regtest/data/boltz-nginx/default.conf

@@ -1,49 +0,0 @@
-upstream boltz {
-    server boltz:9001;
-}
-
-upstream boltzr {
-    server boltz:9005;
-}
-
-upstream ws {
-    server boltz:9004;
-}
-
-server {
-    listen 9001;
-    listen [::]:9001;
-    server_name localhost;
-
-    add_header Access-Control-Allow-Origin "*" always;
-    add_header Access-Control-Allow-Methods 'GET, PATCH, DELETE, POST, OPTIONS' always;
-    add_header Access-Control-Allow-Headers "*" always;
-
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-
-    if ($request_method = OPTIONS) {
-        return 204;
-    }
-
-    location /v2/ws {
-        proxy_pass http://ws/;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-    }
-
-    location ~ ^/v2/(lightning|swap/rescue|swap/restore) {
-        proxy_pass http://boltzr;
-    }
-
-    location /streamswapstatus {
-        proxy_pass http://boltzr;
-    }
-
-    location / {
-        proxy_pass http://boltz;
-    }
-}

docker/regtest/data/boltz/boltz.conf

@@ -1,114 +0,0 @@
-[api]
-host = "0.0.0.0"
-port = 9_001
-
-[grpc]
-host = "0.0.0.0"
-port = 9_000
-
-[postgres]
-host = "boltz-postgres"
-port = 5432
-database = "boltz"
-username = "boltz"
-password = "boltz"
-
-[sidecar]
-  [sidecar.grpc]
-  host = "127.0.0.1"
-  port = 9003
-
-  [sidecar.ws]
-  host = "0.0.0.0"
-  port = 9004
-
-  [sidecar.api]
-  host = "0.0.0.0"
-  port = 9005
-
-[swap]
-deferredClaimSymbols = ["BTC", "L-BTC"]
-
-[[pairs]]
-base = "BTC"
-quote = "BTC"
-rate = 1
-fee = 0.5
-swapInFee = 0.1
-maxSwapAmount = 40_294_967
-minSwapAmount = 50_000
-
-  [pairs.timeoutDelta]
-  chain = 1440
-  reverse = 1440
-  swapMinimal = 1440
-  swapMaximal = 2880
-  swapTaproot = 10080
-
-[[pairs]]
-base = "L-BTC"
-quote = "BTC"
-fee = 0.25
-swapInFee = 0.1
-rate = 1
-maxSwapAmount = 40_294_967
-minSwapAmount = 100
-
-  [pairs.submarineSwap]
-  minSwapAmount = 1_000
-  minBatchedAmount = 21
-
-  [pairs.chainSwap]
-  minSwapAmount = 25_000
-
-  [pairs.timeoutDelta]
-  chain = 1440
-  reverse = 1440
-  swapMinimal = 1440
-  swapMaximal = 2880
-  swapTaproot = 10080
-
-[[currencies]]
-symbol = "BTC"
-network = "bitcoinRegtest"
-minWalletBalance = 10_000_000
-minChannelBalance = 10_000_000
-maxSwapAmount = 40_294_967
-minSwapAmount = 10_000
-maxZeroConfAmount = 0
-
-  [currencies.chain]
-  # mempoolSpace = "http://mempool-web:8090/api"
-  host = "bitcoind"
-  zmqpubrawtx = "tcp://bitcoind:29000"
-  zmqpubrawblock = "tcp://bitcoind:29001"
-  port = 18_443
-  cookie = "/root/.bitcoin/regtest/.cookie"
-  feeFloor = 0.2
-
-  wallet = "lnbits"
-
-  [currencies.lnd]
-  host = "lnd-2"
-  port = 10_009
-  certpath = "/data/lnd/tls.cert"
-  macaroonpath = "/data/lnd/data/chain/bitcoin/regtest/admin.macaroon"
-
-
-[liquid]
-symbol = "L-BTC"
-network = "liquidRegtest"
-
-maxSwapAmount = 40_294_967
-minSwapAmount = 10_000
-maxZeroConfAmount = 40_294_967
-
-
-  [liquid.chain]
-  host = "elementsd"
-  port = 18884
-  cookie = "/root/.elements/liquidregtest/.cookie"
-  zmqpubrawtx = "tcp://elementsd:31000"
-  zmqpubhashblock = "tcp://elementsd:31002"
-
-  wallet = "lnbits"

docker/regtest/data/eclair/eclair.conf

@@ -1,28 +0,0 @@
-eclair {
-  chain = "regtest"
-
-  api {
-    binding-ip = "0.0.0.0"
-    enabled = true
-    port = 8080
-    password = "lnbits"
-  }
-
-  bitcoind {
-    host = "bitcoind"
-    rpcport = 18443
-    auth = "safecookie"
-    cookie = "/root/.bitcoin/regtest/.cookie"
-
-    zmqblock = "tcp://bitcoind:29002"
-    zmqtx = "tcp://bitcoind:29000"
-  }
-
-  channel {
-    max-funding-satoshis = 10000000000
-  }
-
-  features {
-    option_support_large_channel = mandatory
-  }
-}

docker/regtest/docker-compose.yml

@@ -1,434 +0,0 @@
-services:
-
-  lnbits:
-    hostname: lnbits
-    depends_on:
-      - lnd-3
-    image: lnbits/lnbits
-    restart: on-failure
-    user: "0:0"
-    environment:
-      LNBITS_PORT: 5001
-      DEBUG: true
-      LNBITS_ADMIN_UI: false
-      LNBITS_BACKEND_WALLET_CLASS: "LndRestWallet"
-      LNBITS_DATA_FOLDER: "./data"
-      LND_REST_ENDPOINT: "https://lnd-3:8081/"
-      LND_REST_CERT: "./lnd/tls.cert"
-      LND_REST_MACAROON: "./lnd/data/chain/bitcoin/regtest/admin.macaroon"
-    ports:
-      - 5001:5001
-    volumes:
-      - lnbits-data:/app/data
-      - ./data/lnd-3:/app/lnd:uid=1000,gid=1000
-
-  boltz:
-    hostname: boltz
-    depends_on:
-      - lnd-2
-      - boltz-postgres
-    restart: always
-    image: boltz/boltz:v3.12.1
-    ports:
-      - 9000:9000
-    entrypoint: "sh -c 'sleep 30; /boltz-backend/bin/boltzd'"
-    volumes:
-      - ./data/lnd-2:/data/lnd/
-      - ./data/boltz/:/root/.boltz/
-      - elements-data:/root/.elements
-      - bitcoin-data:/root/.bitcoin
-
-  boltz-client:
-    hostname: boltz-client
-    depends_on:
-      - boltz
-    restart: always
-    image: boltz/boltz-client:latest
-    ports:
-      - 9002:9002
-      - 9003:9003
-    expose:
-      - 9002
-    healthcheck:
-      test: ['CMD', 'boltzcli', '--host', 'boltz-client', 'getinfo']
-      interval: 5s
-      timeout: 3s
-      retries: 10
-      start_period: 0s
-    volumes:
-      - elements-data:/root/.elements
-      - ./data/boltz-client:/root/.boltz
-
-  boltz-backend-nginx:
-    hostname: boltz-nginx
-    restart: always
-    image: nginx:latest
-    ports:
-      - 9001:9001
-    volumes:
-      - nginx-data:/etc/nginx/conf.d
-    healthcheck:
-      test: ['CMD-SHELL', 'curl http://localhost:9001/version']
-      timeout: 1s
-      retries: 10
-      interval: 1s
-      start_period: 0s
-
-  boltz-postgres:
-    hostname: boltz-postgres
-    restart: always
-    image: postgres:14-alpine
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready --dbname boltz --username boltz"]
-      interval: 5s
-      timeout: 30s
-      retries: 10
-      start_period: 5s
-    environment:
-      - POSTGRES_DB=boltz
-      - POSTGRES_USER=boltz
-      - POSTGRES_PASSWORD=boltz
-    expose:
-      - 5432
-
-  bitcoind:
-    hostname: bitcoind
-    image: boltz/bitcoin-core:25.0
-    command:
-      - -regtest
-      - -fallbackfee=0.00000253
-      - -zmqpubrawtx=tcp://0.0.0.0:29000
-      - -zmqpubrawblock=tcp://0.0.0.0:29001
-      - -zmqpubhashblock=tcp://0.0.0.0:29002
-      - -txindex
-      - -rpcallowip=0.0.0.0/0
-      - -rpcbind=0.0.0.0
-      - -addresstype=bech32
-      - -changetype=bech32
-      - -dbcache=2048
-      - -rpcworkqueue=256
-    volumes:
-      - bitcoin-data:/root/.bitcoin
-    expose:
-      - 29000
-      - 29001
-      - 29002
-      - 18443
-      - 18444
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "bitcoin-cli",
-          "--rpccookiefile=/root/.bitcoin/regtest/.cookie",
-          "-regtest",
-          "getblockchaininfo",
-        ]
-      timeout: 1s
-      retries: 1
-      interval: 1s
-      start_period: 0s
-
-  clightning-1:
-    hostname: clightning-1
-    depends_on:
-      - bitcoind
-    image: boltz/c-lightning:24.11
-    command:
-      - --large-channels
-      - --network=regtest
-      - --grpc-port=9736
-      - --bind-addr=0.0.0.0:9735
-      - --bitcoin-rpcconnect=bitcoind
-      - --bitcoin-rpcport=18443
-      - --clnrest-host=0.0.0.0
-      - --clnrest-port=3010
-    expose:
-      - 9735
-    ports:
-      - 9736:9736
-      - 3010:3010
-    volumes:
-      - ./data/clightning-1:/root/.lightning/
-      - bitcoin-data:/root/.bitcoin
-
-  clightning-2:
-    hostname: clightning-2
-    depends_on:
-      - bitcoind
-    image: boltz/c-lightning:22.11.1
-    command:
-      - --large-channels
-      - --network=regtest
-      - --grpc-port=9737
-      - --bind-addr=0.0.0.0:9735
-      - --bitcoin-rpcconnect=bitcoind
-      - --bitcoin-rpcport=18443
-    expose:
-      - 9735
-    ports:
-      - 9737:9737
-    volumes:
-      - ./data/clightning-2:/root/.lightning/
-      - bitcoin-data:/root/.bitcoin
-
-  clightning-2-rest:
-    hostname: clightning-2-rest
-    depends_on:
-      - clightning-2
-    image: saubyk/c-lightning-rest:0.10.7
-    entrypoint: "sh -c 'sleep 35 && /sbin/tini -g -- ./docker-entrypoint.sh'"
-    ports:
-      - 3001:3001
-    expose:
-      - 3001
-    volumes:
-      - ./data/clightning-2:/root/.lightning/:uid=1000,gid=1000
-      - ./data/clightning-2-rest:/usr/src/app/certs/
-      - bitcoin-data:/root/.bitcoin
-
-  clightning-3:
-    hostname: clightning-3
-    depends_on:
-      - bitcoind
-    image: boltz/c-lightning:24.11
-    command:
-      - --large-channels
-      - --network=regtest
-      - --grpc-port=9738
-      - --bind-addr=0.0.0.0:9735
-      - --bitcoin-rpcconnect=bitcoind
-      - --bitcoin-rpcport=18443
-    expose:
-      - 9735
-    ports:
-      - 9738:9738
-    volumes:
-      - ./data/clightning-3:/root/.lightning/
-      - bitcoin-data:/root/.bitcoin
-
-  lnd-1:
-    hostname: lnd-1
-    depends_on:
-      - bitcoind
-    image: boltz/lnd:0.18.4-beta
-    restart: on-failure
-    command:
-      - --listen=lnd-1:9735
-      - --rpclisten=lnd-1:10009
-      - --restlisten=lnd-1:8081
-      - --bitcoin.active
-      - --bitcoin.regtest
-      - --bitcoin.node=bitcoind
-      - --bitcoind.rpchost=bitcoind
-      - --bitcoind.rpccookie=/root/.bitcoin/regtest/.cookie
-      - --bitcoind.zmqpubrawtx=bitcoind:29000
-      - --bitcoind.zmqpubrawblock=bitcoind:29001
-      - --noseedbackup
-      - --protocol.wumbo-channels
-    expose:
-      - 8081
-      - 9735
-      - 10009
-    volumes:
-      - ./data/lnd-1:/root/.lnd/
-      - bitcoin-data:/root/.bitcoin
-
-  lnd-2:
-    hostname: lnd-2
-    depends_on:
-      - bitcoind
-    image: boltz/lnd:0.19.3-beta
-    restart: on-failure
-    command:
-      - --listen=lnd-2:9735
-      - --rpclisten=lnd-2:10009
-      - --restlisten=lnd-2:8081
-      - --bitcoin.active
-      - --bitcoin.regtest
-      - --bitcoin.node=bitcoind
-      - --bitcoind.rpchost=bitcoind
-      - --bitcoind.rpccookie=/root/.bitcoin/regtest/.cookie
-      - --bitcoind.zmqpubrawtx=bitcoind:29000
-      - --bitcoind.zmqpubrawblock=bitcoind:29001
-      - --noseedbackup
-      - --protocol.wumbo-channels
-    expose:
-      - 8081
-      - 9735
-      - 10009
-    volumes:
-      - ./data/lnd-2:/root/.lnd/
-      - bitcoin-data:/root/.bitcoin
-
-  lnd-3:
-    hostname: lnd-3
-    depends_on:
-      - bitcoind
-    image: boltz/lnd:0.18.4-beta
-    restart: on-failure
-    command:
-      - --listen=lnd-3:9735
-      - --rpclisten=lnd-3:10009
-      - --restlisten=lnd-3:8081
-      - --bitcoin.active
-      - --bitcoin.regtest
-      - --bitcoin.node=bitcoind
-      - --bitcoind.rpchost=bitcoind
-      - --bitcoind.rpccookie=/root/.bitcoin/regtest/.cookie
-      - --bitcoind.zmqpubrawtx=bitcoind:29000
-      - --bitcoind.zmqpubrawblock=bitcoind:29001
-      - --noseedbackup
-      - --protocol.wumbo-channels
-    ports:
-      - 8081:8081
-      - 10009:10009
-    expose:
-      - 8081
-      - 9735
-      - 10009
-    volumes:
-      - ./data/lnd-3:/root/.lnd/
-      - bitcoin-data:/root/.bitcoin
-
-  lnd-4:
-    hostname: lnd-4
-    depends_on:
-      - bitcoind
-    image: boltz/lnd:0.18.4-beta
-    restart: on-failure
-    command:
-      - --listen=lnd-4:9735
-      - --rpclisten=lnd-4:10009
-      - --restlisten=lnd-4:8081
-      - --bitcoin.active
-      - --bitcoin.regtest
-      - --bitcoin.node=bitcoind
-      - --bitcoind.rpchost=bitcoind
-      - --bitcoind.rpccookie=/root/.bitcoin/regtest/.cookie
-      - --bitcoind.zmqpubrawtx=bitcoind:29000
-      - --bitcoind.zmqpubrawblock=bitcoind:29001
-      - --noseedbackup
-      - --protocol.wumbo-channels
-    expose:
-      - 8081
-      - 9735
-      - 10009
-    volumes:
-      - ./data/lnd-4:/root/.lnd/
-      - bitcoin-data:/root/.bitcoin
-
-  eclair:
-    hostname: eclair
-    depends_on:
-      - bitcoind
-    image: boltz/eclair:0.8.0
-    restart: on-failure
-    entrypoint: "sh -c 'JAVA_OPTS=-Xmx512m /eclair-node/bin/eclair-node.sh -Declair.datadir=/root/eclair -Declair.printToConsole'"
-    ports:
-      - 8082:8080
-    expose:
-      - 9735
-      - 8080
-    volumes:
-      - ./data/eclair:/root/eclair
-      - bitcoin-data:/root/.bitcoin
-
-  electrs:
-    hostname: electrs
-    restart: always
-    image: boltz/electrs:latest
-    entrypoint: ["electrs-bitcoin"]
-    command:
-      - --electrum-rpc-addr
-      - electrs:19001
-      - --http-addr
-      - electrs:3002
-      - --daemon-rpc-addr
-      - bitcoind:18443
-      - --network
-      - regtest
-      - --jsonrpc-import
-    healthcheck:
-      test: ["CMD-SHELL", "curl -s $(hostname):3002/blocks/tip/height"]
-      timeout: 1s
-      retries: 20
-      interval: 2s
-      start_period: 5s
-    ports:
-      - 19001:19001
-      - 3002:3002
-    volumes:
-      - bitcoin-data:/root/.bitcoin
-
-  elementsd:
-    hostname: elementsd
-    restart: always
-    image: boltz/elements:latest
-    expose:
-      - 31001
-    ports:
-      - 31000:31000
-      - 31002:31002
-      - 18884:18884
-    command:
-    - -chain=liquidregtest
-    - -txindex=1
-    - -rest=1
-    - -server=1
-    - -rpcallowip=0.0.0.0/0
-    - -validatepegin=0
-    - -initialfreecoins=2100000000000000
-    - -fallbackfee=0.000001
-    - -rpcbind=0.0.0.0
-    - -rpcport=18884
-    - -zmqpubrawtx=tcp://0.0.0.0:31000
-    - -zmqpubrawblock=tcp://0.0.0.0:31001
-    - -zmqpubhashblock=tcp://0.0.0.0:31002
-    - -acceptdiscountct=1
-    - -creatediscountct=1
-    volumes:
-      - elements-data:/root/.elements
-
-  electrs-liquid:
-    hostname: electrs-liquid
-    restart: always
-    image: boltz/electrs:latest
-    entrypoint: ["electrs-liquid"]
-    command:
-      - --electrum-rpc-addr
-      - electrs-liquid:19002
-      - --http-addr
-      - electrs-liquid:3003
-      - --daemon-rpc-addr
-      - elementsd:18884
-      - --daemon-dir
-      - /root/.elements
-      - --network
-      - liquidregtest
-      - --parent-network
-      - regtest
-      - --jsonrpc-import
-    healthcheck:
-      test: ["CMD-SHELL", "curl -s $(hostname):3003/blocks/tip/height"]
-      timeout: 15s
-      retries: 20
-      interval: 2s
-      start_period: 5s
-    ports:
-      - 19002:19002
-      - 3003:3003
-    volumes:
-      - elements-data:/root/.elements
-
-volumes:
-  lnbits-data:
-  bitcoin-data:
-  elements-data:
-  nginx-data:
-    name: nginx-data
-    driver: local
-    driver_opts:
-      type: none
-      o: bind
-      device: ./data/boltz-nginx/

docker/regtest/docker-scripts.sh

@@ -1,322 +0,0 @@
-#!/bin/sh
-export COMPOSE_PROJECT_NAME=lnbits
-
-boltzcli-sim() {
-  docker exec -it lnbits-boltz-client-1 boltzcli "$@"
-}
-
-bitcoin-cli-sim() {
-  docker exec lnbits-bitcoind-1 bitcoin-cli -regtest "$@"
-}
-
-elements-cli-sim() {
-  docker exec lnbits-elementsd-1 elements-cli -rpcport=18884 -chain=liquidregtest "$@"
-}
-
-# args(i, cmd)
-lightning-cli-sim() {
-  i=$1
-  shift # shift first argument so we can use $@
-  docker exec lnbits-clightning-$i-1 lightning-cli --network regtest "$@"
-}
-
-# args(i, cmd)
-lncli-sim() {
-  i=$1
-  shift # shift first argument so we can use $@
-  docker exec lnbits-lnd-$i-1 lncli --network regtest --rpcserver=lnd-$i:10009 "$@"
-}
-
-get-eclair-pubkey() {
-  while true; do
-    pubkey=$(docker exec lnbits-eclair-1 curl http://localhost:8080/getinfo -X POST -s -u :lnbits | jq -r .nodeId 2> /dev/null)
-    pubkeyPrefix=$(echo $pubkey | cut -c1,2)
-    if [[ "$pubkeyPrefix" == "02" || "$pubkeyPrefix" == "03" ]]; then
-      echo $pubkey
-      break
-    fi
-    sleep 1
-  done
-}
-
-wait-for-eclair-channel() {
-  while true; do
-    state=$(docker exec lnbits-eclair-1 curl http://localhost:8080/channels -X POST -s -u :lnbits | jq -r ".[0].state")
-    pending=$(docker exec lnbits-eclair-1 curl -s http://localhost:8080/channels -X POST -u :lnbits| jq '. | length')
-    echo "eclair-1 pendingchannels: $pending, current state: $state"
-    if [[ "$state" == "NORMAL" ]]; then
-      break
-    fi
-    sleep 1
-  done
-}
-
-# args(i)
-fund_boltz_client() {
-  # first address of seed: abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about
-  address="el1qq2xvpcvfup5j8zscjq05u2wxxjcyewk7979f3mmz5l7uw5pqmx6xf5xy50hsn6vhkm5euwt72x878eq6zxx2z0z676mna6kdq"
-  echo "funding: $address on boltz-client"
-  elements-cli-sim -named sendtoaddress address=$address amount=30 fee_rate=100 > /dev/null
-}
-
-
-# args(i)
-fund_clightning_node() {
-  address=$(lightning-cli-sim $1 newaddr | jq -r .bech32)
-  echo "funding: $address on clightning-node: $1"
-  bitcoin-cli-sim -named sendtoaddress address=$address amount=30 fee_rate=100 > /dev/null
-}
-
-# args(i)
-fund_lnd_node() {
-  address=$(lncli-sim $1 newaddress p2wkh | jq -r .address)
-  echo "funding: $address on lnd-node: $1"
-  bitcoin-cli-sim -named sendtoaddress address=$address amount=30 fee_rate=100 > /dev/null
-}
-
-# args(i, j)
-connect_clightning_node() {
-  pubkey=$(lightning-cli-sim $2 getinfo | jq -r '.id')
-  lightning-cli-sim $1 connect $pubkey@lnbits-clightning-$2-1:9735 | jq -r '.id'
-}
-
-lnbits-regtest-start(){
-  if ! command -v jq &> /dev/null
-  then
-      echo "jq is not installed"
-      exit
-  fi
-  if ! command -v docker &> /dev/null
-  then
-      echo "docker is not installed"
-      exit
-  fi
-  if ! command -v docker version &> /dev/null
-  then
-      echo "dockerd is not running"
-      exit
-  fi
-  lnbits-regtest-stop
-  docker compose up -d --remove-orphans
-  lnbits-regtest-init
-}
-
-lnbits-regtest-start-log(){
-  lnbits-regtest-stop
-  docker compose up --remove-orphans
-  lnbits-regtest-init
-}
-
-lnbits-regtest-stop(){
-  docker compose down --volumes
-  # clean up lightning node data
-  sudo rm -rf ./data/clightning-1 ./data/clightning-2 ./data/clightning-3 ./data/lnd-1  ./data/lnd-2 ./data/lnd-3 ./data/lnd-4 ./data/boltz/boltz.db ./data/eclair/regtest ./data/boltz-client/liquid-wallet ./data/boltz-client/bitcoin-wallet ./data/boltz-client/wallet ./data/boltz-client/boltz.db
-  # recreate lightning node data folders preventing permission errors
-  mkdir ./data/clightning-1 ./data/clightning-2 ./data/clightning-3 ./data/lnd-1 ./data/lnd-2 ./data/lnd-3 ./data/lnd-4
-}
-
-lnbits-regtest-restart(){
-  lnbits-regtest-stop
-  lnbits-regtest-start
-}
-
-boltz-client-init(){
-  for i in 0 1 2; do
-    fund_boltz_client
-  done
-  elements-cli-sim -generate 3 > /dev/null
-}
-
-lnbits-bitcoin-init(){
-  echo "init_bitcoin_wallet..."
-  bitcoin-cli-sim createwallet lnbits || bitcoin-cli-sim loadwallet lnbits
-  echo "mining 150 blocks..."
-  bitcoin-cli-sim -generate 150 > /dev/null
-}
-
-lnbits-elements-init(){
-  echo "init_elements_wallet..."
-  elements-cli-sim createwallet lnbits || elements-cli-sim loadwallet lnbits
-  echo "mining 150 blocks..."
-  elements-cli-sim -generate 150 > /dev/null
-  elements-cli-sim rescanblockchain
-}
-
-lnbits-init(){
-  echo "init_lnbits..."
-  docker exec lnbits-lnbits-1 uv run python tools/create_fake_admin.py
-}
-
-lnbits-regtest-init(){
-  lnbits-bitcoin-init
-  lnbits-elements-init
-  lnbits-lightning-sync
-  lnbits-lightning-init
-  boltz-client-init
-  lnbits-init
-}
-
-lnbits-lightning-sync(){
-  wait-for-clightning-sync 1
-  wait-for-clightning-sync 2
-  wait-for-clightning-sync 3
-  wait-for-lnd-sync 1
-  wait-for-lnd-sync 2
-  wait-for-lnd-sync 3
-  wait-for-lnd-sync 4
-}
-
-lnbits-lightning-init(){
-
-  # create 10 UTXOs for each node
-  for i in 0 1 2; do
-    fund_clightning_node 1
-    fund_clightning_node 2
-    fund_clightning_node 3
-    fund_lnd_node 1
-    fund_lnd_node 2
-    fund_lnd_node 3
-    fund_lnd_node 4
-  done
-
-  echo "mining 3 blocks..."
-  bitcoin-cli-sim -generate 3 > /dev/null
-
-  lnbits-lightning-sync
-
-  channel_confirms=6
-  channel_size=24000000 # 0.024 btc
-  balance_size=12000000 # 0.12 btc
-  balance_size_msat=12000000000 # 0.12 btc
-
-  # lnd-1 -> lnd-2
-  lncli-sim 1 connect $(lncli-sim 2 getinfo | jq -r '.identity_pubkey')@lnbits-lnd-2-1 > /dev/null
-  echo "open channel from lnd-1 to lnd-2"
-  lncli-sim 1 openchannel $(lncli-sim 2 getinfo | jq -r '.identity_pubkey') $channel_size $balance_size > /dev/null
-  bitcoin-cli-sim -generate $channel_confirms > /dev/null
-  wait-for-lnd-channel 1
-
-  # lnd-1 -> lnd-3
-  lncli-sim 1 connect $(lncli-sim 3 getinfo | jq -r '.identity_pubkey')@lnbits-lnd-3-1 > /dev/null
-  echo "open channel from lnd-1 to lnd-3"
-  lncli-sim 1 openchannel $(lncli-sim 3 getinfo | jq -r '.identity_pubkey') $channel_size $balance_size > /dev/null
-  bitcoin-cli-sim -generate $channel_confirms > /dev/null
-  wait-for-lnd-channel 1
-
-  # lnd-1 -> cln-1
-  lncli-sim 1 connect $(lightning-cli-sim 1 getinfo | jq -r '.id')@lnbits-clightning-1-1 > /dev/null
-  echo "open channel from lnd-1 to cln-1"
-  lncli-sim 1 openchannel $(lightning-cli-sim 1 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
-  bitcoin-cli-sim -generate $channel_confirms > /dev/null
-  wait-for-lnd-channel 1
-
-  # lnd-1 -> cln-2
-  lncli-sim 1 connect $(lightning-cli-sim 2 getinfo | jq -r '.id')@lnbits-clightning-2-1 > /dev/null
-  echo "open channel from lnd-1 to cln-2"
-  lncli-sim 1 openchannel $(lightning-cli-sim 2 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
-  bitcoin-cli-sim -generate $channel_confirms > /dev/null
-  wait-for-lnd-channel 1
-
-  # lnd-1 -> cln-3
-  lncli-sim 1 connect $(lightning-cli-sim 3 getinfo | jq -r '.id')@lnbits-clightning-3-1 > /dev/null
-  echo "open channel from lnd-1 to cln-3"
-  lncli-sim 1 openchannel $(lightning-cli-sim 3 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
-  bitcoin-cli-sim -generate $channel_confirms > /dev/null
-  wait-for-lnd-channel 1
-
-  # lnd-2 -> cln-2
-  lncli-sim 2 connect $(lightning-cli-sim 2 getinfo | jq -r '.id')@lnbits-clightning-2-1 > /dev/null
-  echo "open channel from lnd-2 to cln-2"
-  lncli-sim 2 openchannel $(lightning-cli-sim 2 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
-  bitcoin-cli-sim -generate $channel_confirms > /dev/null
-  wait-for-lnd-channel 2
-
-  # lnd-3 -> cln-3
-  lncli-sim 3 connect $(lightning-cli-sim 3 getinfo | jq -r '.id')@lnbits-clightning-3-1 > /dev/null
-  echo "open channel from lnd-3 to cln-1"
-  lncli-sim 3 openchannel $(lightning-cli-sim 3 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
-  bitcoin-cli-sim -generate $channel_confirms > /dev/null
-  wait-for-lnd-channel 3
-
-  # lnd-3 -> cln-1
-  lncli-sim 3 connect $(lightning-cli-sim 1 getinfo | jq -r '.id')@lnbits-clightning-1-1 > /dev/null
-  echo "open channel from lnd-3 to cln-1"
-  lncli-sim 3 openchannel $(lightning-cli-sim 1 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
-  bitcoin-cli-sim -generate $channel_confirms > /dev/null
-  wait-for-lnd-channel 3
-
-  # lnd-1 -> eclair-1
-  lncli-sim 1 connect $(get-eclair-pubkey)@lnbits-eclair-1 > /dev/null
-  echo "open channel from lnd-2 to eclair-1"
-  lncli-sim 1 openchannel $(get-eclair-pubkey) $channel_size $balance_size > /dev/null
-  bitcoin-cli-sim -generate $channel_confirms > /dev/null
-  wait-for-lnd-channel 1
-
-  # lnd-2 -> eclair-1
-  lncli-sim 2 connect $(get-eclair-pubkey)@lnbits-eclair-1 > /dev/null
-  echo "open channel from lnd-2 to eclair-1"
-  lncli-sim 2 openchannel $(get-eclair-pubkey) $channel_size $balance_size > /dev/null
-  bitcoin-cli-sim -generate $channel_confirms > /dev/null
-  wait-for-lnd-channel 2
-
-  wait-for-clightning-channel 1
-  wait-for-clightning-channel 2
-  wait-for-clightning-channel 3
-
-  wait-for-eclair-channel
-
-  lnbits-lightning-sync
-
-}
-
-wait-for-lnd-channel(){
-  while true; do
-    pending=$(lncli-sim $1 pendingchannels | jq -r '.pending_open_channels | length')
-    echo "lnd-$1 pendingchannels: $pending"
-    if [[ "$pending" == "0" ]]; then
-      break
-    fi
-    sleep 1
-  done
-}
-
-wait-for-lnd-sync(){
-  while true; do
-    if [[ "$(lncli-sim $1 getinfo 2>&1 | jq -r '.synced_to_chain' 2> /dev/null)" == "true" ]]; then
-      echo "lnd-$1 is synced!"
-      break
-    fi
-    echo "waiting for lnd-$1 to sync..."
-    sleep 1
-  done
-}
-
-wait-for-clightning-channel(){
-  while true; do
-    pending=$(lightning-cli-sim $1 getinfo | jq -r '.num_pending_channels | length')
-    echo "cln-$1 pendingchannels: $pending"
-    if [[ "$pending" == "0" ]]; then
-      if [[ "$(lightning-cli-sim $1 getinfo 2>&1 | jq -r '.warning_bitcoind_sync' 2> /dev/null)" == "null" ]]; then
-        if [[ "$(lightning-cli-sim $1 getinfo 2>&1 | jq -r '.warning_lightningd_sync' 2> /dev/null)" == "null" ]]; then
-          break
-        fi
-      fi
-    fi
-    sleep 1
-  done
-}
-
-wait-for-clightning-sync(){
-  while true; do
-    if [[ ! "$(lightning-cli-sim $1 getinfo 2>&1 | jq -r '.id' 2> /dev/null)" == "null" ]]; then
-      if [[ "$(lightning-cli-sim $1 getinfo 2>&1 | jq -r '.warning_bitcoind_sync' 2> /dev/null)" == "null" ]]; then
-        if [[ "$(lightning-cli-sim $1 getinfo 2>&1 | jq -r '.warning_lightningd_sync' 2> /dev/null)" == "null" ]]; then
-          echo "cln-$1 is synced!"
-          break
-        fi
-      fi
-    fi
-    echo "waiting for cln-$1 to sync..."
-    sleep 1
-  done
-}

docker/regtest/start-regtest

@@ -1,74 +0,0 @@
-#!/bin/bash
-print_success() {
-  printf "\033[;1;32mPASSED\033[;0m $1\n"
-}
-
-print_error() {
-  printf "\033[;1;31mFAILED\033[;0m $1\n"
-}
-
-run(){
-  label=$1
-  value=$2
-  cmd=$3
-  if [[ "$cmd" == "$value" ]]; then
-    print_success "$label is $cmd"
-  else
-    print_error "$label is $cmd, should be $value"
-    failed="true"
-  fi
-}
-
-failed="false"
-blockheight=213
-utxos=3
-channel_size=24000000 # 0.024 btc
-balance_size=12000000 # 0.012 btc
-
-source $(pwd)/docker-scripts.sh
-lnbits-regtest-start
-echo "=================================="
-printf "\033[;1;36mregtest started! starting tests...\033[;0m\n"
-echo "=================================="
-echo ""
-
-for i in 1 2 3; do
-  run "lnd-$i .synced_to_chain" "true" $(lncli-sim $i getinfo | jq -r ".synced_to_chain")
-  run "lnd-$i utxo count" $utxos $(lncli-sim $i listunspent | jq -r ".utxos | length")
-  run "lnd-$i .block_height" $blockheight $(lncli-sim $i getinfo | jq -r ".block_height")
-  if [[ "$i" == "1" ]]; then
-    channel_count=6
-  else
-    channel_count=3
-  fi
-  run "lnd-$i openchannels" $channel_count $(lncli-sim $i listchannels | jq -r ".channels | length")
-  run "lnd-$i .channels[0].capacity" $channel_size $(lncli-sim $i listchannels | jq -r ".channels[0].capacity")
-  run "lnd-$i .channels[0].push_amount_sat" $balance_size $(lncli-sim $i listchannels | jq -r ".channels[0].push_amount_sat")
-done
-for i in 1 2 3; do
-  # run "cln-$i blockheight" $blockheight $(lightning-cli-sim $i getinfo | jq -r ".blockheight")
-  run "cln-$i utxo count" $utxos $(lightning-cli-sim $i listfunds | jq -r ".outputs | length")
-  run "cln-$i openchannels" 2 $(lightning-cli-sim $i getinfo | jq -r ".num_active_channels")
-  run "cln-$i channel[0].state" "CHANNELD_NORMAL" $(lightning-cli-sim $i listfunds | jq -r ".channels[0].state")
-  run "cln-$i channel[0].amount_msat" $(($channel_size * 1000)) $(lightning-cli-sim $i listfunds | jq -r ".channels[0].amount_msat" | sed 's/msat//g')
-  run "cln-$i channel[0].our_amount_msat" $(($balance_size * 1000)) $(lightning-cli-sim $i listfunds | jq -r ".channels[0].our_amount_msat" | sed 's/msat//g')
-done
-
-run "eclair-1 openchannels" 2 $(docker exec lnbits-eclair-1 curl -s http://localhost:8080/channels -X POST -u :lnbits| jq '. | length')
-run "eclair-1 blockHeight" $blockheight $(docker exec lnbits-eclair-1 curl -s http://localhost:8080/getinfo -X POST -u :lnbits| jq '.blockHeight')
-run "lnbits service status" "200" $(curl -s -o /dev/null -w "%{http_code}" "http://localhost:5001/")
-run "boltz service status" "200" $(curl -s -o /dev/null --head -w "%{http_code}" "http://localhost:9001/version")
-
-# return non-zero exit code if a test fails
-if [[ "$failed" == "true" ]]; then
-  echo ""
-  echo "=================================="
-  print_error "one more more tests failed"
-  echo "=================================="
-  exit 1
-else
-  echo ""
-  echo "=================================="
-  print_success "all tests passed! yay!"
-  echo "=================================="
-fi

docker/sparkl2/Dockerfile

@@ -1,36 +0,0 @@
-ARG LNBITS_TAG=latest
-
-FROM lnbits/lnbits:${LNBITS_TAG}
-
-RUN apt-get update && apt-get -y upgrade
-RUN apt-get install -y netcat-openbsd npm nodejs git
-
-RUN curl -LsSf https://astral.sh/uv/install.sh | sh
-ENV PATH="/root/.local/bin:$PATH"
-
-# install sparksidecar
-RUN git clone https://github.com/lnbits/spark_sidecar
-RUN cd spark_sidecar && npm install
-
-# Reinstall dependencies for lnbits just in case (needed for CMD usage)
-RUN uv sync --all-extras
-
-# LNBITS
-ENV LNBITS_PORT="5000"
-ENV LNBITS_HOST="0.0.0.0"
-ENV LNBITS_BACKEND_WALLET_CLASS="SparkL2Wallet"
-ENV FUNDING_SOURCE_MAX_RETRIES=10
-
-# spark sidecar
-ENV SPARK_MNEMONIC="bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom"
-ENV SPARK_NETWORK="MAINNET"
-ENV SPARK_SIDECAR_PORT="8765"
-ENV SPARK_PAY_WAIT_MS="20000"
-
-EXPOSE 5000
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-# Entrypoint to start sparksidebar and LNbits
-CMD ["/entrypoint.sh"]

docker/sparkl2/entrypoint.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-set -e
-
-node spark_sidecar/server.mjs &
-
-SIDECAR_PID=$!
-
-# Wait for startup
-for i in {1..10}; do
-  if nc -z localhost $SPARK_SIDECAR_PORT; then
-    echo "sparksidebar is up!"
-    break
-  fi
-  echo "Waiting for sparksidebar to start..."
-  sleep 1
-done
-
-# Optional: check if still not up
-if ! nc -z localhost $SPARK_SIDECAR_PORT; then
-  echo "sparksidebar did not start successfully."
-  exit 1
-fi
-
-echo "Starting LNbits on $LNBITS_HOST:$LNBITS_PORT..."
-exec uv run lnbits --port "$LNBITS_PORT" --host "$LNBITS_HOST" --forwarded-allow-ips='*'

docs/guide/funding-sources-table.md

@@ -50,7 +50,6 @@ Below is a side-by-side comparison of Lightning funding sources you can use with
 | **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.                                        |
-| **Spark (L2)**                 | Self-custodial           | ❌                  | Medium                         | ❌                        | High              | Automatic                | Easy              | Low                    | Minimal fees                                 | Medium          | Runs via Spark sidecar; seed-based self-custody.                                           |
 | **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.                                            |
@@ -58,9 +57,7 @@ Below is a side-by-side comparison of Lightning funding sources you can use with
 | **LN.tips**                    | Custodial/Self-Custodial | Depends on provider | Medium                         | ❌                        | Low               | Provider-managed         | Moderate          | Low                    | Transaction fees may apply                   | Medium          | Simple hosted service; use LN.tips API as your backend.                                    |
 | **Fake Wallet**                | Testing (simulated)      | ❌                  | Low                            | ❌                        | N/A               | N/A                      | Easy              | Low                    | None (test only)                             | N/A             | For testing only; mints accounting units in LNbits (no real sats, unit name configurable). |
 
-## Spark (L2)
-
-Spark L2 uses a local Node.js sidecar to expose an HTTP API that LNbits can use as a funding source. It is self-custodial and secured by a standard mnemonic seed. Sidecar repo `https://github.com/lnbits/spark_sidecar`.
+---
 
 ### Notes for readers
 

docs/guide/wallets.md

@@ -41,8 +41,7 @@ A backend wallet is selected and configured entirely through LNbits environment
 | [CoreLightning](#corelightning)                 | [LND (gRPC)](#lnd-grpc)               | [Blink](#blink)                                   |
 | [CoreLightning REST](#corelightning-rest)       | [LNbits](#lnbits)                     | [Alby](#alby)                                     |
 | [Spark (Core Lightning)](#spark-core-lightning) | [LNPay](#lnpay)                       | [Boltz](#boltz)                                   |
-| [Spark L2](#spark-l2)                           | [ZBD](#zbd)                           | [Phoenixd](#phoenixd)                             |
-| [Cliche Wallet](#cliche-wallet)                 |                                       |                                                   |
+| [Cliche Wallet](#cliche-wallet)                 | [ZBD](#zbd)                           | [Phoenixd](#phoenixd)                             |
 | [Breez SDK](#breez-sdk)                         | [Breez Liquid SDK](#breez-liquid-sdk) | [Nostr Wallet Connect](#nostr-wallet-connect-nwc) |
 | [Strike](#strike)                               | [Eclair (ACINQ)](#eclair-acinq)       | [LN.tips](#lntips)                                |
 | [Fake Wallet](#fake-wallet)                     |                                       |                                                   |
@@ -53,7 +52,7 @@ A backend wallet is selected and configured entirely through LNbits environment
 
 ### CLNRest (using [runes](https://docs.corelightning.org/reference/lightning-createrune))
 
-[Core Lightning REST API docs](https://docs.corelightning.org/docs/rest)
+[Core Lightning REST API docs](https://docs.corelightning.org/docs/rest)  
 Should also work with the [Rust version of CLNRest](https://github.com/daywalker90/clnrest-rs)
 
 **Environment variables**
@@ -128,33 +127,6 @@ Old REST interface using [RTL c-lightning-REST](https://github.com/Ride-The-Ligh
 - `SPARK_URL`: `http://10.147.17.230:9737/rpc`
 - `SPARK_TOKEN`: `secret_access_key`
 
-## Spark L2
-
-Self-custodial funding source using the [Spark L2](https://docs.spark.money/start/overview) network. Requires a Node.js [sidecar](https://github.com/lnbits/spark_sidecar) that bridges lnbits talking to Spark. Works in addition with any Spark-compatible seed (Wallet of Satoshi, BuhoGO, BlitzWallet).
-If the sidecar is started with a `mnemonic` then that mnemonic will be used. Otherwhise if a mnemonic is set for the `Spark L2` LNbits funding source then that mnemonic will be used.
-
-### Optional tuning
-
-- `SPARK_L2_PAY_WAIT_MS`: `4000` _(payment timeout in ms)_
-- `SPARK_L2_PAY_POLL_MS`: `500` _(polling interval in ms)_
-- `SPARK_L2_STREAM_KEEPALIVE_MS`: `15000` _(SSE keepalive in ms)_
-
-### Example: run the sidecar
-
-```bash
-git clone https://github.com/lnbits/spark_sidecar.git
-cd spark_sidecar
-npm install
-
-SPARK_MNEMONIC="bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom" \
-SPARK_NETWORK=MAINNET \
-SPARK_SIDECAR_PORT=8765 \
-SPARK_PAY_WAIT_MS=20000 \
-node server.mjs
-```
-
-For testing, you can generate a 12-word mnemonic at https://iancoleman.io/bip39/. Store it securely — it controls your funds. Then select Spark (L2) as the funding source in LNbits.
-
 ## LND (REST)
 
 **Required env vars**

lnbits/core/crud/payments.py

@@ -1,4 +1,3 @@
-from datetime import datetime, timezone
 from time import time
 from typing import Any
 
@@ -305,16 +304,8 @@ async def update_payment_checking_id(
     checking_id: str, new_checking_id: str, conn: Connection | None = None
 ) -> None:
     await (conn or db).execute(
-        f"""
-            UPDATE apipayments
-            SET checking_id = :new_id, updated_at = {db.timestamp_placeholder('now')}
-            WHERE checking_id = :old_id
-        """,  # noqa: S608
-        {
-            "new_id": new_checking_id,
-            "old_id": checking_id,
-            "now": int(time()),
-        },
+        "UPDATE apipayments SET checking_id = :new_id WHERE checking_id = :old_id",
+        {"new_id": new_checking_id, "old_id": checking_id},
     )
 
 
@@ -323,7 +314,6 @@ async def update_payment(
     new_checking_id: str | None = None,
     conn: Connection | None = None,
 ) -> None:
-    payment.updated_at = datetime.now(timezone.utc)
     await (conn or db).update(
         "apipayments", payment, "WHERE checking_id = :checking_id"
     )

lnbits/core/crud/users.py

@@ -4,12 +4,10 @@ from typing import Any
 from uuid import uuid4
 
 from lnbits.core.crud.extensions import get_user_active_extensions_ids
-from lnbits.core.crud.wallets import clear_wallet_cache, create_wallet, get_wallets
+from lnbits.core.crud.wallets import create_wallet, get_wallets
 from lnbits.core.db import db
 from lnbits.core.models import UserAcls
 from lnbits.db import Connection, Filters, Page
-from lnbits.helpers import sha256s
-from lnbits.utils.cache import cache
 
 from ..models import (
     Account,
@@ -43,7 +41,6 @@ async def delete_account(user_id: str, conn: Connection | None = None) -> None:
         "DELETE from accounts WHERE id = :user",
         {"user": user_id},
     )
-    await clear_user_id_cache(user_id)
 
 
 async def get_accounts(
@@ -72,7 +69,6 @@ async def get_accounts(
             accounts.email,
             accounts.pubkey,
             accounts.external_id,
-            accounts.activated,
             SUM(COALESCE((
                 SELECT balance FROM balances WHERE wallet_id = wallets.id
             ), 0)) as balance_msat,
@@ -97,18 +93,12 @@ async def get_accounts(
     )
 
 
-async def get_account(
-    user_id: str, active_only: bool = True, conn: Connection | None = None
-) -> Account | None:
+async def get_account(user_id: str, conn: Connection | None = None) -> Account | None:
     if len(user_id) == 0:
         return None
-
     return await (conn or db).fetchone(
-        """
-            SELECT * FROM accounts
-            WHERE id = :id AND (activated = true OR activated = :activated)
-        """,
-        {"id": user_id, "activated": active_only},
+        "SELECT * FROM accounts WHERE id = :id",
+        {"id": user_id},
         Account,
     )
 
@@ -134,79 +124,55 @@ async def delete_accounts_no_wallets(
 
 
 async def get_account_by_username(
-    username: str, active_only: bool = True, conn: Connection | None = None
+    username: str, conn: Connection | None = None
 ) -> Account | None:
     if len(username) == 0:
         return None
-
     return await (conn or db).fetchone(
-        """
-            SELECT * FROM accounts
-            WHERE
-                LOWER(username) = :username
-                AND (activated = true OR activated = :activated)
-        """,
-        {"username": username.lower(), "activated": active_only},
+        "SELECT * FROM accounts WHERE LOWER(username) = :username",
+        {"username": username.lower()},
         Account,
     )
 
 
 async def get_account_by_pubkey(
-    pubkey: str, active_only: bool = True, conn: Connection | None = None
+    pubkey: str, conn: Connection | None = None
 ) -> Account | None:
     return await (conn or db).fetchone(
-        """
-            SELECT * FROM accounts
-            WHERE
-                LOWER(pubkey) = :pubkey
-                AND (activated = true OR activated = :activated)
-        """,
-        {"pubkey": pubkey.lower(), "activated": active_only},
+        "SELECT * FROM accounts WHERE LOWER(pubkey) = :pubkey",
+        {"pubkey": pubkey.lower()},
         Account,
     )
 
 
 async def get_account_by_email(
-    email: str, active_only: bool = True, conn: Connection | None = None
+    email: str, conn: Connection | None = None
 ) -> Account | None:
     if len(email) == 0:
         return None
-
     return await (conn or db).fetchone(
-        """
-            SELECT * FROM accounts
-            WHERE
-                LOWER(email) = :email
-                AND (activated = true OR activated = :activated)
-        """,
-        {"email": email.lower(), "activated": active_only},
+        "SELECT * FROM accounts WHERE LOWER(email) = :email",
+        {"email": email.lower()},
         Account,
     )
 
 
 async def get_account_by_username_or_email(
-    username_or_email: str,
-    active_only: bool = True,
-    conn: Connection | None = None,
+    username_or_email: str, conn: Connection | None = None
 ) -> Account | None:
-
     return await (conn or db).fetchone(
         """
             SELECT * FROM accounts
-            WHERE
-                (LOWER(email) = :value or LOWER(username) = :value)
-                AND (activated = true OR activated = :activated)
+            WHERE LOWER(email) = :value or LOWER(username) = :value
         """,
-        {"value": username_or_email.lower(), "activated": active_only},
+        {"value": username_or_email.lower()},
         Account,
     )
 
 
-async def get_user(
-    user_id: str, active_only: bool = True, conn: Connection | None = None
-) -> User | None:
+async def get_user(user_id: str, conn: Connection | None = None) -> User | None:
     async with db.reuse_conn(conn) if conn else db.connect() as conn:
-        account = await get_account(user_id, active_only, conn=conn)
+        account = await get_account(user_id, conn=conn)
         if not account:
             return None
         return await get_user_from_account(account, conn=conn)
@@ -225,7 +191,6 @@ async def get_user_from_account(
 
     return User(
         id=account.id,
-        activated=account.activated,
         email=account.email,
         username=account.username,
         pubkey=account.pubkey,
@@ -239,7 +204,6 @@ async def get_user_from_account(
         super_user=account.is_super_user,
         fiat_providers=account.fiat_providers,
         has_password=account.password_hash is not None,
-        ui_customization=account.ui_customization or {},
     )
 
 
@@ -251,31 +215,12 @@ async def update_user_access_control_list(
 
 
 async def get_user_access_control_lists(
-    user_id: str, active_only: bool = True, conn: Connection | None = None
+    user_id: str, conn: Connection | None = None
 ) -> UserAcls:
     user_acls = await (conn or db).fetchone(
-        """
-            SELECT id, access_control_list FROM accounts
-            WHERE id = :user_id AND (activated = true OR activated = :activated)
-        """,
-        {"user_id": user_id, "activated": active_only},
+        "SELECT id, access_control_list FROM accounts WHERE id = :id",
+        {"id": user_id},
         UserAcls,
     )
 
     return user_acls or UserAcls(id=user_id)
-
-
-async def clear_user_id_cache(user_id: str):
-    user = await get_user(user_id, active_only=True)
-    if user:
-        clear_user_cache(user)
-
-
-def clear_user_cache(user: User):
-    user_cache_key: str | None = cache.pop(
-        f"auth:user:cache_key:{sha256s(user.id)}", None
-    )
-    if user_cache_key:
-        cache.pop(user_cache_key)
-    for wallet in user.wallets:
-        clear_wallet_cache(wallet)

lnbits/core/crud/wallets.py

@@ -45,13 +45,17 @@ async def update_wallet(
 
 
 async def delete_wallet(
+    *,
     user_id: str,
     wallet_id: str,
     deleted: bool = True,
     conn: Connection | None = None,
 ) -> None:
-    clear_wallet_id_cache(wallet_id)
     now = int(time())
+    cached_wallet: BaseWallet | None = cache.pop(f"auth:wallet:{wallet_id}")
+    if cached_wallet:
+        cache.pop(f"auth:x-api-key:{cached_wallet.adminkey}")
+        cache.pop(f"auth:x-api-key:{cached_wallet.inkey}")
 
     await (conn or db).execute(
         # Timestamp placeholder is safe from SQL injection (not user input)
@@ -65,7 +69,6 @@ async def delete_wallet(
 
 
 async def force_delete_wallet(wallet_id: str, conn: Connection | None = None) -> None:
-    clear_wallet_id_cache(wallet_id)
     await (conn or db).execute(
         "DELETE FROM wallets WHERE id = :wallet",
         {"wallet": wallet_id},
@@ -75,7 +78,6 @@ async def force_delete_wallet(wallet_id: str, conn: Connection | None = None) ->
 async def delete_wallet_by_id(
     wallet_id: str, conn: Connection | None = None
 ) -> int | None:
-    clear_wallet_id_cache(wallet_id)
     now = int(time())
     result = await (conn or db).execute(
         # Timestamp placeholder is safe from SQL injection (not user input)
@@ -226,14 +228,11 @@ async def get_wallet_for_key(
 ) -> Wallet | None:
     wallet = await (conn or db).fetchone(
         """
-        SELECT wallets.*, COALESCE((
+        SELECT *, COALESCE((
             SELECT balance FROM balances WHERE wallet_id = wallets.id
         ), 0)
         AS balance_msat FROM wallets
-        INNER JOIN accounts ON wallets.user = accounts.id
-        WHERE (adminkey = :key OR inkey = :key)
-            AND deleted = false
-            AND accounts.activated = true
+        WHERE (adminkey = :key OR inkey = :key) AND deleted = false
         """,
         {"key": key},
         Wallet,
@@ -253,11 +252,8 @@ async def get_base_wallet_for_key(
 ) -> BaseWallet | None:
     wallet = await (conn or db).fetchone(
         """
-        SELECT wallets.id, "user", wallet_type, adminkey, inkey FROM wallets
-        INNER JOIN accounts ON wallets.user = accounts.id
-        WHERE (adminkey = :key OR inkey = :key)
-            AND deleted = false
-            AND accounts.activated = true
+        SELECT id, "user", wallet_type, adminkey, inkey FROM wallets
+        WHERE (adminkey = :key OR inkey = :key) AND deleted = false
         """,
         {"key": key},
         BaseWallet,
@@ -298,16 +294,3 @@ async def get_total_balance(conn: Connection | None = None):
     result = await (conn or db).execute("SELECT SUM(balance) as balance FROM balances")
     row = result.mappings().first()
     return row.get("balance", 0) or 0
-
-
-def clear_wallet_id_cache(wallet_id: str):
-    cached_wallet: BaseWallet | None = cache.pop(f"auth:wallet:{wallet_id}")
-    if cached_wallet:
-        cache.pop(f"auth:x-api-key:{cached_wallet.adminkey}")
-        cache.pop(f"auth:x-api-key:{cached_wallet.inkey}")
-
-
-def clear_wallet_cache(wallet: Wallet):
-    cache.pop(f"auth:wallet:{wallet.id}")
-    cache.pop(f"auth:x-api-key:{wallet.adminkey}")
-    cache.pop(f"auth:x-api-key:{wallet.inkey}")

lnbits/core/migrations.py

@@ -848,19 +848,3 @@ async def m042_index_accounts(db: Connection):
             CREATE INDEX IF NOT EXISTS idx_accounts_{index} ON accounts ("{index}");
             """
         )
-
-
-async def m043_add_ui_customization_to_accounts(db: Connection):
-    """
-    Adds ui_customization column to accounts.
-    Used for server side persistence of UI customization settings.
-    """
-    await db.execute("ALTER TABLE accounts ADD COLUMN ui_customization TEXT")
-
-
-async def m044_add_activated_to_accounts(db: Connection):
-    """
-    Adds activated column to accounts.
-    Used for account activation status.
-    """
-    await db.execute("ALTER TABLE accounts ADD COLUMN activated BOOLEAN DEFAULT true")

lnbits/core/models/extensions.py

@@ -12,7 +12,7 @@ from typing import Any
 
 import httpx
 from loguru import logger
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 
 from lnbits.helpers import (
     download_url,
@@ -269,30 +269,10 @@ class ExtensionRelease(BaseModel):
     async def get_github_releases(cls, org: str, repo: str) -> list[ExtensionRelease]:
         try:
             github_releases = await cls.fetch_github_releases(org, repo)
-            extension_releases = [
+            return [
                 ExtensionRelease.from_github_release(f"{org}/{repo}", r)
                 for r in github_releases
             ]
-            for release in extension_releases:
-                if not release.details_link:
-                    continue
-                try:
-                    config = await ExtensionConfig.fetch_github_release_config(
-                        org, repo, release.version
-                    )
-                except Exception as e:
-                    logger.warning(e)
-                    config = None
-                if not config:
-                    continue
-
-                release.min_lnbits_version = config.min_lnbits_version
-                release.max_lnbits_version = config.max_lnbits_version
-                release.is_version_compatible = config.is_version_compatible()
-
-                release.icon = icon_to_github_url(f"{org}/{repo}", config.tile)
-
-            return extension_releases
         except Exception as e:
             logger.warning(e)
             return []
@@ -797,32 +777,6 @@ class ExtensionDetailsRequest(BaseModel):
     version: str
 
 
-class ExtensionReviewsStatus(BaseModel):
-    tag: str
-    avg_rating: float
-    review_count: int
-
-
-class CreateExtensionReview(BaseModel):
-    tag: str
-    name: str | None = Field(None)
-    rating: int = Field(..., ge=0, le=1000)
-    comment: str | None = Field(None)
-
-
-class ExtensionReviewPaymentRequest(BaseModel):
-    payment_hash: str
-    payment_request: str
-
-
-class ExtensionReview(BaseModel):
-    id: str
-    name: str | None = Field(default=None)
-    tag: str | None = Field(default=None)
-    rating: int = Field(default=0, ge=0, le=1000)
-    comment: str | None = Field(default=None)
-
-
 async def github_api_get(url: str, error_msg: str | None) -> Any:
     headers = {"User-Agent": settings.user_agent}
     if settings.lnbits_ext_github_token:

lnbits/core/models/extensions_builder.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
 import json
-import random
-import uuid
 from datetime import datetime, timedelta, timezone
 from typing import Any, Literal
 
@@ -57,29 +55,6 @@ class DataField(BaseModel):
             field_type += ' = "sat"'
         return f"{field_name}: {field_type}"
 
-    def field_to_random_value(self) -> str:
-        field_name = camel_to_snake(self.name)
-        field_value: Any = f'"{self.type}"'
-        if self.type == "json":
-            field_value = '"{}"'
-        elif self.type == "wallet":
-            field_value = f'"{uuid.uuid4()}"'
-        elif self.type == "currency":
-            field_value = '"sat"'
-        elif self.type in ["str", "text"]:
-            field_value = f'"{field_name}_{urlsafe_short_hash()}"'
-        elif self.type == "int":
-            field_value = random.randint(1, 100)  # noqa: S311
-        elif self.type == "float":
-            field_value = random.uniform(1.0, 100.0)  # noqa: S311
-        elif self.type == "bool":
-            field_value = random.choice([True, False])  # noqa: S311
-        elif self.type == "datetime":
-            random_days = random.randint(-30, 30)  # noqa: S311
-            random_date = datetime.now(timezone.utc) - timedelta(days=random_days)
-            field_value = f"""datetime.fromisoformat("{random_date.isoformat()}")"""
-        return f"{field_name} = {field_value},"
-
     def field_to_js(self) -> str:
         field_name = camel_to_snake(self.name)
         default_value = "null"

lnbits/core/models/payments.py

@@ -6,16 +6,23 @@ from typing import Literal
 
 from fastapi import Query
 from lnurl import LnurlWithdrawResponse
-from loguru import logger
 from pydantic import BaseModel, Field, validator
 
 from lnbits.db import FilterModel
+from lnbits.fiat import get_fiat_provider
 from lnbits.fiat.base import (
+    FiatPaymentFailedStatus,
+    FiatPaymentPendingStatus,
     FiatPaymentStatus,
+    FiatPaymentSuccessStatus,
 )
 from lnbits.utils.exchange_rates import allowed_currencies
+from lnbits.wallets import get_funding_source
 from lnbits.wallets.base import (
+    PaymentFailedStatus,
+    PaymentPendingStatus,
     PaymentStatus,
+    PaymentSuccessStatus,
 )
 
 
@@ -123,23 +130,59 @@ class Payment(BaseModel):
             "fiat_"
         )
 
-    # DEPRECATED: in v1.5.0, use service check_payment_status instead
     async def check_status(
         self, skip_internal_payment_notifications: bool | None = False
     ) -> PaymentStatus:
-        logger.warning("payment.check_status() is deprecated.")
-        from lnbits.core.services.payments import check_payment_status
+        if self.is_internal:
+            if self.success:
+                return PaymentSuccessStatus()
+            if self.failed:
+                return PaymentFailedStatus()
+            if self.is_in and self.fiat_provider:
+                fiat_status = await self.check_fiat_status(
+                    skip_internal_payment_notifications
+                )
+                return PaymentStatus(paid=fiat_status.paid)
+            return PaymentPendingStatus()
+        funding_source = get_funding_source()
+        if self.is_out:
+            status = await funding_source.get_payment_status(self.checking_id)
+        else:
+            status = await funding_source.get_invoice_status(self.checking_id)
+        return status
 
-        return await check_payment_status(self, skip_internal_payment_notifications)
-
-    # DEPRECATED: in v1.5.0, use service check_payment_status instead
     async def check_fiat_status(
         self, skip_internal_payment_notifications: bool | None = False
     ) -> FiatPaymentStatus:
-        logger.warning("payment.check_fiat_status() is deprecated.")
-        from lnbits.core.services.fiat_providers import check_fiat_status
+        if not self.is_internal:
+            return FiatPaymentPendingStatus()
+        if self.success:
+            return FiatPaymentSuccessStatus()
+        if self.failed:
+            return FiatPaymentFailedStatus()
 
-        return await check_fiat_status(self, skip_internal_payment_notifications)
+        if not self.fiat_provider:
+            return FiatPaymentPendingStatus()
+
+        checking_id = self.extra.get("fiat_checking_id")
+        if not checking_id:
+            return FiatPaymentPendingStatus()
+
+        fiat_provider = await get_fiat_provider(self.fiat_provider)
+        if not fiat_provider:
+            return FiatPaymentPendingStatus()
+        fiat_status = await fiat_provider.get_invoice_status(checking_id)
+
+        if skip_internal_payment_notifications:
+            return fiat_status
+
+        if fiat_status.success:
+            # notify receivers asynchronously
+            from lnbits.tasks import internal_invoice_queue
+
+            await internal_invoice_queue.put(self.checking_id)
+
+        return fiat_status
 
 
 class PaymentFilters(FilterModel):

lnbits/core/models/users.py

@@ -181,14 +181,12 @@ class AccountId(BaseModel):
 
 
 class Account(AccountId):
-    activated: bool = True
     external_id: str | None = None  # for external account linking
     username: str | None = None
     password_hash: str | None = None
     pubkey: str | None = None
     email: str | None = None
     extra: UserExtra = UserExtra()
-    ui_customization: dict = Field(default_factory=dict)
 
     created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
@@ -242,7 +240,6 @@ class Account(AccountId):
 
 
 class AccountOverview(Account):
-    activated: bool = True
     transaction_count: int | None = 0
     wallet_count: int | None = 0
     balance_msat: int | None = 0
@@ -278,7 +275,6 @@ class AccountFilters(FilterModel):
 
 class User(BaseModel):
     id: str
-    activated: bool = True
     created_at: datetime
     updated_at: datetime
     email: str | None = None
@@ -292,7 +288,6 @@ class User(BaseModel):
     fiat_providers: list[str] = []
     has_password: bool = False
     extra: UserExtra = UserExtra()
-    ui_customization: dict = Field(default_factory=dict)
 
     @property
     def wallet_ids(self) -> list[str]:
@@ -318,7 +313,6 @@ class RegisterUser(BaseModel):
     username: str = Query(default=..., min_length=2, max_length=20)
     password: str = Query(default=..., min_length=8, max_length=50)
     password_repeat: str = Query(default=..., min_length=8, max_length=50)
-    invitation_code: str | None = Query(default=None, max_length=256)
 
 
 class CreateUser(BaseModel):
@@ -362,7 +356,6 @@ class UpdateSuperuserPassword(BaseModel):
     username: str = Query(default=..., min_length=2, max_length=20)
     password: str = Query(default=..., min_length=8, max_length=50)
     password_repeat: str = Query(default=..., min_length=8, max_length=50)
-    first_install_token: str | None = Query(None)
 
 
 class LoginUsr(BaseModel):

lnbits/core/services/__init__.py

@@ -1,4 +1,3 @@
-from .fiat_providers import check_fiat_status
 from .funding_source import (
     get_balance_delta,
     switch_to_voidwallet,
@@ -8,7 +7,6 @@ from .notifications import enqueue_admin_notification, send_payment_notification
 from .payments import (
     calculate_fiat_amounts,
     cancel_hold_invoice,
-    check_payment_status,
     check_transaction_status,
     check_wallet_limits,
     create_fiat_invoice,
@@ -42,8 +40,6 @@ __all__ = [
     "calculate_fiat_amounts",
     "cancel_hold_invoice",
     "check_admin_settings",
-    "check_fiat_status",
-    "check_payment_status",
     "check_transaction_status",
     "check_wallet_limits",
     "check_webpush_settings",

lnbits/core/services/assets.py

@@ -3,7 +3,6 @@ import io
 from uuid import uuid4
 
 from fastapi import UploadFile
-from loguru import logger
 from PIL import Image
 
 from lnbits.core.crud.assets import create_asset, get_user_assets_count
@@ -30,7 +29,17 @@ async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) ->
             f"File limit of {settings.lnbits_max_asset_size_mb}MB exceeded."
         )
 
-    thumb_buffer = thumbnail_from_bytes(contents)
+    image = Image.open(io.BytesIO(contents))
+
+    thumbnail_width = min(256, settings.lnbits_asset_thumbnail_width)
+    thumbnail_height = min(256, settings.lnbits_asset_thumbnail_height)
+    image.thumbnail((thumbnail_width, thumbnail_height))
+
+    # Save thumbnail to an in-memory buffer
+    thumb_buffer = io.BytesIO()
+    thumbnail_format = settings.lnbits_asset_thumbnail_format or "PNG"
+    image.save(thumb_buffer, format=thumbnail_format)
+    thumb_buffer.seek(0)
 
     asset = Asset(
         id=uuid4().hex,
@@ -39,32 +48,9 @@ async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) ->
         is_public=is_public,
         name=file.filename or "unnamed",
         size_bytes=len(contents),
-        thumbnail_base64=(
-            base64.b64encode(thumb_buffer.getvalue()).decode("utf-8")
-            if thumb_buffer
-            else None
-        ),
+        thumbnail_base64=base64.b64encode(thumb_buffer.getvalue()).decode("utf-8"),
         data=contents,
     )
 
     await create_asset(asset)
     return asset
-
-
-def thumbnail_from_bytes(contents: bytes) -> io.BytesIO | None:
-    try:
-        image = Image.open(io.BytesIO(contents))
-
-        thumbnail_width = min(256, settings.lnbits_asset_thumbnail_width)
-        thumbnail_height = min(256, settings.lnbits_asset_thumbnail_height)
-        image.thumbnail((thumbnail_width, thumbnail_height))
-
-        # Save thumbnail to an in-memory buffer
-        thumb_buffer = io.BytesIO()
-        thumbnail_format = settings.lnbits_asset_thumbnail_format or "PNG"
-        image.save(thumb_buffer, format=thumbnail_format)
-        thumb_buffer.seek(0)
-        return thumb_buffer
-    except Exception as exc:
-        logger.warning(f"Failed to create thumbnail: {exc}")
-        return None

lnbits/core/services/extensions_builder.py

@@ -20,7 +20,6 @@ from lnbits.helpers import (
     camel_to_words,
     download_url,
     lowercase_first_letter,
-    snake_to_camel,
 )
 from lnbits.settings import settings
 
@@ -196,29 +195,13 @@ def _copy_ext_stub_to_build_dir(
     ext_build_dir = Path(working_dir, new_ext_id, working_dir_name, new_ext_id)
     shutil.rmtree(ext_build_dir, True)
 
-    shutil.copytree(
-        ext_stub_cache_dir,
-        ext_build_dir,
-        ignore=shutil.ignore_patterns(
-            "__pycache__",
-            ".git",
-            ".env",
-            ".venv",
-            "*.env",
-            "*.log",
-            "node_modules",
-            ".mypy_cache",
-            ".pytest_cache",
-            ".ruff_cache",
-        ),
-    )
+    shutil.copytree(ext_stub_cache_dir, ext_build_dir)
     return ext_build_dir
 
 
 def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None:
     parsed_data = _parse_extension_data(data)
-    test_files = [f"tests/{p.name}" for p in Path(ext_stub_dir, "tests").glob("*.py")]
-    for py_file in py_files + test_files:
+    for py_file in py_files:
         template_path = Path(ext_stub_dir, py_file).as_posix()
         rederer = _render_file(template_path, parsed_data)
         with open(template_path, "w", encoding="utf-8") as f:
@@ -226,7 +209,7 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
 
         _remove_lines_with_string(template_path, remove_line_marker)
 
-    template_path = Path(ext_stub_dir, "static", "index.js").as_posix()
+    template_path = Path(ext_stub_dir, "static", "js", "index.js").as_posix()
     rederer = _render_file(
         template_path, {"preview": data.preview_action, **parsed_data}
     )
@@ -251,7 +234,9 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
         "settingsFormDialog.data",
         ext_stub_dir,
     )
-    template_path = Path(ext_stub_dir, "static", "index.vue").as_posix()
+    template_path = Path(
+        ext_stub_dir, "templates", "extension_builder_stub", "index.html"
+    ).as_posix()
     rederer = _render_file(
         template_path,
         {
@@ -278,12 +263,12 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
         "publicClientData",
         ext_stub_dir,
     )
-    public_template_path = Path(ext_stub_dir, "static", "public_page.vue")
-    public_component_path = Path(ext_stub_dir, "static", "public_page.js")
+    public_template_path = Path(
+        ext_stub_dir, "templates", "extension_builder_stub", "public_page.html"
+    )
     template_path = public_template_path.as_posix()
     if not data.public_page.has_public_page:
         public_template_path.unlink(missing_ok=True)
-        public_component_path.unlink(missing_ok=True)
     else:
         rederer = _render_file(
             template_path,
@@ -323,10 +308,8 @@ def zip_directory(source_dir, zip_path):
 
 def _rename_extension_builder_stub(data: ExtensionData, extension_dir: Path) -> None:
     extension_dir_path = extension_dir.as_posix()
-    # the order of fields is important, do not chage
     rename_values = {
         "extension_builder_stub_name": data.name,
-        "extension_builder_stub_camel_name": snake_to_camel(data.id, True),
         "extension_builder_stub_short_description": data.short_description or "",
         "extension_builder_stub": data.id,
         "OwnerData": data.owner_data.name,
@@ -345,7 +328,7 @@ def _rename_extension_builder_stub(data: ExtensionData, extension_dir: Path) ->
             directory=extension_dir_path,
             old_text=old_text,
             new_text=new_text,
-            file_extensions=[".py", ".js", ".vue", ".html", ".md", ".json", ".toml"],
+            file_extensions=[".py", ".js", ".html", ".md", ".json", ".toml"],
         )
 
     _rename_files_and_dirs_in_directory(
@@ -423,7 +406,6 @@ def _parse_extension_data(data: ExtensionData) -> dict:
         "owner_data": {
             "name": data.owner_data.name,
             "editable": data.owner_data.editable,
-            "fields": [field.name for field in data.owner_data.fields],
             "js_fields": [
                 field.field_to_js()
                 for field in data.owner_data.fields
@@ -450,18 +432,6 @@ def _parse_extension_data(data: ExtensionData) -> dict:
             ],
             "db_fields": [field.field_to_db() for field in data.owner_data.fields],
             "all_fields": [field.field_to_py() for field in data.owner_data.fields],
-            "random_fields_values": [
-                field.field_to_random_value() for field in data.owner_data.fields
-            ],
-            "public_fields": [
-                field.field_to_py()
-                for field in data.owner_data.fields
-                if field.name
-                in [
-                    data.public_page.owner_data_fields.name,
-                    data.public_page.owner_data_fields.description,
-                ]
-            ],
         },
         "client_data": {
             "name": data.client_data.name,
@@ -487,9 +457,6 @@ def _parse_extension_data(data: ExtensionData) -> dict:
             ],
             "db_fields": [field.field_to_db() for field in data.client_data.fields],
             "all_fields": [field.field_to_py() for field in data.client_data.fields],
-            "random_fields_values": [
-                field.field_to_random_value() for field in data.client_data.fields
-            ],
         },
         "settings_data": {
             "enabled": data.settings_data.enabled,
@@ -569,7 +536,7 @@ def _rename_files_and_dirs_in_directory(directory, old_text, new_text):
                     logger.warning(f"Failed to rename directory {old_dir_path}: {e}")
 
 
-def _is_excluded_dir(path: str) -> bool:
+def _is_excluded_dir(path):
     for excluded_dir in excluded_dirs:
         if path.startswith(excluded_dir):
             return True

lnbits/core/services/fiat_providers.py

@@ -12,12 +12,6 @@ from lnbits.core.models import CreatePayment, Payment, PaymentState
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.db import Connection
 from lnbits.fiat import get_fiat_provider
-from lnbits.fiat.base import (
-    FiatPaymentFailedStatus,
-    FiatPaymentPendingStatus,
-    FiatPaymentStatus,
-    FiatPaymentSuccessStatus,
-)
 from lnbits.settings import settings
 
 
@@ -35,40 +29,6 @@ async def handle_fiat_payment_confirmation(
         logger.warning(e)
 
 
-async def check_fiat_status(
-    payment: Payment, skip_internal_payment_notifications: bool | None = False
-) -> FiatPaymentStatus:
-    if not payment.is_internal:
-        return FiatPaymentPendingStatus()
-    if payment.success:
-        return FiatPaymentSuccessStatus()
-    if payment.failed:
-        return FiatPaymentFailedStatus()
-
-    if not payment.fiat_provider:
-        return FiatPaymentPendingStatus()
-
-    checking_id = payment.extra.get("fiat_checking_id")
-    if not checking_id:
-        return FiatPaymentPendingStatus()
-
-    fiat_provider = await get_fiat_provider(payment.fiat_provider)
-    if not fiat_provider:
-        return FiatPaymentPendingStatus()
-    fiat_status = await fiat_provider.get_invoice_status(checking_id)
-
-    if skip_internal_payment_notifications:
-        return fiat_status
-
-    if fiat_status.success:
-        # notify receivers asynchronously
-        from lnbits.tasks import internal_invoice_queue
-
-        await internal_invoice_queue.put(payment.checking_id)
-
-    return fiat_status
-
-
 def check_stripe_signature(
     payload: bytes,
     sig_header: str | None,
@@ -118,8 +78,8 @@ async def verify_paypal_webhook(headers, payload: bytes):
     """
     webhook_id = settings.paypal_webhook_id
     if not webhook_id:
-        logger.warning("PayPal webhook ID not set.")
-        raise ValueError("PayPal webhook cannot be verified. Missing webhook ID.")
+        logger.warning("PayPal webhook ID not set; skipping verification.")
+        return
 
     required_headers = {
         "PAYPAL-TRANSMISSION-ID": headers.get("PAYPAL-TRANSMISSION-ID"),
@@ -129,8 +89,8 @@ async def verify_paypal_webhook(headers, payload: bytes):
         "PAYPAL-AUTH-ALGO": headers.get("PAYPAL-AUTH-ALGO"),
     }
     if not all(required_headers.values()):
-        logger.warning("Missing PayPal webhook headers.")
-        raise ValueError("PayPal webhook cannot be verified. Missing headers.")
+        logger.warning("Missing PayPal webhook headers; skipping verification.")
+        return
 
     try:
         async with httpx.AsyncClient(base_url=settings.paypal_api_endpoint) as client:

lnbits/core/services/payments.py

@@ -25,7 +25,6 @@ from lnbits.utils.exchange_rates import fiat_amount_as_satoshis, satoshis_amount
 from lnbits.wallets import fake_wallet, get_funding_source
 from lnbits.wallets.base import (
     InvoiceResponse,
-    PaymentFailedStatus,
     PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
@@ -48,7 +47,6 @@ from ..models import (
     PaymentState,
     Wallet,
 )
-from .fiat_providers import check_fiat_status
 from .notifications import send_payment_notification_in_background
 
 payment_lock = asyncio.Lock()
@@ -366,7 +364,7 @@ async def update_pending_payments(wallet_id: str):
 async def update_pending_payment(
     payment: Payment, conn: Connection | None = None
 ) -> Payment:
-    status = await check_payment_status(payment)
+    status = await payment.check_status()
     if status.failed:
         payment.status = PaymentState.FAILED
         await update_payment(payment, conn=conn)
@@ -620,29 +618,7 @@ async def check_transaction_status(
     if payment.status == PaymentState.SUCCESS.value:
         return PaymentSuccessStatus(fee_msat=payment.fee)
 
-    return await check_payment_status(payment)
-
-
-async def check_payment_status(
-    payment: Payment, skip_internal_payment_notifications: bool | None = False
-) -> PaymentStatus:
-    if payment.is_internal:
-        if payment.success:
-            return PaymentSuccessStatus()
-        if payment.failed:
-            return PaymentFailedStatus()
-        if payment.is_in and payment.fiat_provider:
-            fiat_status = await check_fiat_status(
-                payment, skip_internal_payment_notifications
-            )
-            return PaymentStatus(paid=fiat_status.paid)
-        return PaymentPendingStatus()
-    funding_source = get_funding_source()
-    if payment.is_out:
-        status = await funding_source.get_payment_status(payment.checking_id)
-    else:
-        status = await funding_source.get_invoice_status(payment.checking_id)
-    return status
+    return await payment.check_status()
 
 
 async def get_payments_daily_stats(
@@ -776,7 +752,7 @@ async def _pay_internal_invoice(
     await update_payment(internal_payment, conn=conn)
     logger.success(f"internal payment successful {internal_payment.checking_id}")
 
-    await _send_payment_notification_in_background(wallet.id, payment, conn=conn)
+    send_payment_notification_in_background(wallet, payment)
 
     # notify receiver asynchronously
     from lnbits.tasks import internal_invoice_queue
@@ -849,8 +825,7 @@ async def _pay_external_invoice(
         payment = await update_payment_success_status(
             payment, payment_response, conn=conn
         )
-
-        await _send_payment_notification_in_background(wallet.id, payment, conn=conn)
+        send_payment_notification_in_background(wallet, payment)
         logger.success(f"payment successful {payment_response.checking_id}")
 
     payment.checking_id = payment_response.checking_id
@@ -893,7 +868,7 @@ async def _verify_external_payment(
         raise PaymentError("Payment already paid.", status="success")
 
     # payment failed
-    status = await check_payment_status(payment)
+    status = await payment.check_status()
     if status.failed:
         raise PaymentError(
             "Payment is failed node, retrying is not possible.", status="failed"
@@ -1058,13 +1033,3 @@ async def cancel_hold_invoice(payment: Payment) -> InvoiceResponse:
     await update_payment(payment)
 
     return response
-
-
-async def _send_payment_notification_in_background(
-    wallet_id: str, payment: Payment, conn: Connection | None = None
-):
-    # fetch balance again
-    wallet = await get_wallet(wallet_id, conn=conn)
-    if not wallet:
-        raise PaymentError(f"Could not fetch wallet '{wallet_id}'.", status="failed")
-    send_payment_notification_in_background(wallet, payment)

lnbits/core/services/users.py

@@ -3,10 +3,8 @@ from uuid import uuid4
 
 from loguru import logger
 
-from lnbits.core.crud.settings import set_settings_field
 from lnbits.core.db import db
 from lnbits.core.models.extensions import UserExtension
-from lnbits.core.models.users import RegisterUser
 from lnbits.db import Connection
 from lnbits.settings import (
     EditableSettings,
@@ -194,25 +192,3 @@ async def init_admin_settings(super_user: str | None = None) -> SuperSettings:
 
     editable_settings = EditableSettings.from_dict(settings.dict())
     return await create_admin_settings(account.id, editable_settings.dict())
-
-
-async def check_register_activation_settings(data: RegisterUser):
-    if not settings.lnbits_require_user_activation:
-        return None
-    if settings.lnbits_user_activation_by_invitation_code:
-        code = data.invitation_code.strip() if data.invitation_code else ""
-        if len(code) == 0:
-            raise ValueError("Invitation code cannot be empty.")
-
-        if code == settings.lnbits_register_reusable_activation_code:
-            return None
-        if code in settings.lnbits_register_one_time_activation_codes:
-            settings.lnbits_register_one_time_activation_codes.remove(code)
-            await set_settings_field(
-                "lnbits_register_one_time_activation_codes",
-                settings.lnbits_register_one_time_activation_codes,
-            )
-            return None
-        raise ValueError("Invalid invitation code.")
-
-    raise ValueError("No activation method provided.")

lnbits/core/views/asset_api.py

@@ -57,11 +57,11 @@ async def api_get_asset(
 
 
 @asset_router.get(
-    "/{asset_id}/data",
-    name="Get user asset data",
-    summary="Get user asset data data by ID",
+    "/{asset_id}/binary",
+    name="Get user asset binary",
+    summary="Get user asset binary data by ID",
 )
-async def api_get_asset_data(
+async def api_get_asset_binary(
     asset_id: str,
     user_id: str | None = Depends(optional_user_id),
 ) -> Response:

lnbits/core/views/auth_api.py

@@ -4,10 +4,9 @@ import json
 from collections.abc import Callable
 from http import HTTPStatus
 from time import time
-from typing import Annotated
 from uuid import uuid4
 
-from fastapi import APIRouter, Cookie, Depends, HTTPException, Request
+from fastapi import APIRouter, Depends, HTTPException, Request
 from fastapi.responses import JSONResponse, RedirectResponse
 from fastapi_sso.sso.base import OpenID, SSOBase
 from loguru import logger
@@ -26,14 +25,10 @@ from lnbits.core.models.users import (
     UpdateAccessControlList,
 )
 from lnbits.core.services import create_user_account
-from lnbits.core.services.users import (
-    check_register_activation_settings,
-    update_user_account,
-)
+from lnbits.core.services.users import update_user_account
 from lnbits.decorators import (
     access_token_payload,
     check_account_exists,
-    check_admin,
     check_user_exists,
 )
 from lnbits.helpers import (
@@ -89,7 +84,6 @@ async def login(data: LoginUsernamePassword) -> JSONResponse:
     account = await get_account_by_username_or_email(data.username)
     if not account or not account.verify_password(data.password):
         raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid credentials.")
-
     return _auth_success_response(account.username, account.id, account.email)
 
 
@@ -98,7 +92,7 @@ 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.")
     event = _nostr_nip98_event(request)
-    account = await get_account_by_pubkey(event["pubkey"], active_only=False)
+    account = await get_account_by_pubkey(event["pubkey"])
     if not account:
         account = Account(
             id=uuid4().hex,
@@ -106,8 +100,6 @@ async def nostr_login(request: Request) -> JSONResponse:
             extra=UserExtra(provider="nostr"),
         )
         await create_user_account(account)
-    if not account.activated:
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User is not activated.")
     return _auth_success_response(account.username or "", account.id, account.email)
 
 
@@ -128,63 +120,6 @@ async def login_usr(data: LoginUsr) -> JSONResponse:
     return _auth_success_response(account.username, account.id, account.email)
 
 
-@auth_router.post("/impersonate", description="Login via the User ID of another user")
-async def impersonate_user(
-    data: LoginUsr,
-    user: User = Depends(check_admin),
-    cookie_access_token: Annotated[str | None, Cookie()] = None,
-) -> JSONResponse:
-    if not cookie_access_token:
-        raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "Only cookie based impersonation is allowed."
-        )
-    if data.usr == user.id:
-        raise HTTPException(HTTPStatus.FORBIDDEN, "You cannot impersonate yourself.")
-    if settings.is_admin_user(data.usr):
-        # this check includes the superuser
-        raise HTTPException(
-            HTTPStatus.FORBIDDEN, "You cannot impersonate another admin user."
-        )
-
-    account = await get_account(data.usr)
-    if not account:
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User ID does not exist.")
-
-    response = _auth_success_response(account.username, account.id, account.email)
-
-    max_age = settings.auth_token_expire_minutes * 60
-    response.set_cookie(
-        "admin_access_token", cookie_access_token, httponly=True, max_age=max_age
-    )
-    response.set_cookie("is_lnbits_user_impersonated", "true", max_age=max_age)
-    return response
-
-
-@auth_router.delete(
-    "/impersonate", description="Stop impersonation and go back to admin"
-)
-async def stop_impersonate_user(
-    user: User = Depends(check_user_exists),
-    admin_access_token: Annotated[str | None, Cookie()] = None,
-) -> JSONResponse:
-    if not admin_access_token:
-        raise HTTPException(
-            HTTPStatus.UNAUTHORIZED,
-            "No admin access token found to stop impersonation.",
-        )
-    response = JSONResponse(
-        {"access_token": admin_access_token, "token_type": "bearer"}
-    )
-    max_age = settings.auth_token_expire_minutes * 60
-    response.set_cookie(
-        "cookie_access_token", admin_access_token, httponly=True, max_age=max_age
-    )
-    response.delete_cookie("admin_access_token")
-    response.delete_cookie("is_access_token_expired")
-    response.delete_cookie("is_lnbits_user_impersonated")
-    return response
-
-
 @auth_router.get("/acl")
 async def api_get_user_acls(
     request: Request,
@@ -363,14 +298,12 @@ async def register(data: RegisterUser) -> JSONResponse:
     if not is_valid_username(data.username):
         raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid username.")
 
-    if await get_account_by_username(data.username, active_only=False):
+    if await get_account_by_username(data.username):
         raise HTTPException(HTTPStatus.BAD_REQUEST, "Username already exists.")
 
     if data.email and not is_valid_email_address(data.email):
         raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid email.")
 
-    await check_register_activation_settings(data)
-
     account = Account(
         id=uuid4().hex,
         email=data.email,
@@ -475,7 +408,7 @@ async def reset_password(data: ResetUserPassword) -> JSONResponse:
     return _auth_success_response(account.username, user_id, account.email)
 
 
-@auth_router.patch("")
+@auth_router.put("/update")
 async def update(
     data: UpdateUser, account: Account = Depends(check_account_exists)
 ) -> User | None:
@@ -491,41 +424,13 @@ async def update(
     return await get_user_from_account(account)
 
 
-@auth_router.patch("/ui")
-async def update_ui_customization(
-    req: Request, account: Account = Depends(check_account_exists)
-) -> Account:
-    ui_customization = await req.json()
-    account.ui_customization = {**(account.ui_customization or {}), **ui_customization}
-
-    if len(account.ui_customization or {}) > 1000 * 1024:
-        raise HTTPException(
-            HTTPStatus.BAD_REQUEST, "UI customization too large. Drop some fields."
-        )
-
-    await update_user_account(account)
-    return account
-
-
 @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")
-
-    if settings.first_install_token:
-        if not data.first_install_token:
-            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Missing first_install_token.")
-        if settings.first_install_token != data.first_install_token:
-            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid first_install_token.")
-
-    account = await get_account_by_username(data.username, False)
-    if account:
-        raise HTTPException(HTTPStatus.BAD_REQUEST, "Username already exists.")
-
     account = await get_account(settings.super_user)
     if not account:
         raise HTTPException(HTTPStatus.INTERNAL_SERVER_ERROR, "Superuser not found.")
-
     account.username = data.username
     account.extra = account.extra or UserExtra()
     account.extra.provider = "lnbits"
@@ -541,7 +446,7 @@ async def _handle_sso_login(userinfo: OpenID, verified_user_id: str | None = Non
         raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid email.")
 
     redirect_path = "/wallet"
-    account = await get_account_by_email(email, active_only=False)
+    account = await get_account_by_email(email)
 
     if verified_user_id:
         if account:

lnbits/core/views/callback_api.py

@@ -9,7 +9,6 @@ from lnbits.core.crud.payments import (
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.core.models.payments import CreateInvoice
 from lnbits.core.services.fiat_providers import (
-    check_fiat_status,
     check_stripe_signature,
     verify_paypal_webhook,
 )
@@ -24,7 +23,7 @@ callback_router = APIRouter(prefix="/api/v1/callback", tags=["callback"])
 async def api_generic_webhook_handler(
     provider_name: str, request: Request
 ) -> SimpleStatus:
-    logger.info(f"Received callback from provider: '{provider_name}'.")
+
     if provider_name.lower() == "stripe":
         payload = await request.body()
         sig_header = request.headers.get("Stripe-Signature")
@@ -88,7 +87,7 @@ async def _handle_stripe_intent_session_completed(event: dict):
     if not payment:
         logger.warning(f"No payment found for hash: '{payment_hash}'.")
         return
-    await check_fiat_status(payment)
+    await payment.check_fiat_status()
 
 
 async def _handle_stripe_checkout_session_completed(event: dict):
@@ -111,7 +110,7 @@ async def _handle_stripe_checkout_session_completed(event: dict):
     payment = await get_standalone_payment(payment_hash)
     if not payment:
         raise ValueError(f"No payment found for hash: '{payment_hash}'.")
-    await check_fiat_status(payment)
+    await payment.check_fiat_status()
 
 
 async def _handle_stripe_subscription_invoice_paid(event: dict):
@@ -156,7 +155,7 @@ async def _handle_stripe_subscription_invoice_paid(event: dict):
         ),
     )
 
-    await check_fiat_status(payment)
+    await payment.check_fiat_status()
 
 
 async def _get_stripe_subscription_payment_options(
@@ -181,10 +180,8 @@ async def _get_stripe_subscription_payment_options(
 
 
 async def handle_paypal_event(event: dict):
-    event_id = event.get("id", "")
     event_type = event.get("event_type", "")
     resource = event.get("resource", {})
-    logger.info(f"Handling PayPal event: '{event_id}'. Type: '{event_type}'.")
 
     if event_type in ("CHECKOUT.ORDER.APPROVED", "PAYMENT.CAPTURE.COMPLETED"):
         payment_hash = _paypal_extract_payment_hash(resource)
@@ -195,20 +192,23 @@ async def handle_paypal_event(event: dict):
         if not payment:
             logger.warning(f"No payment found for hash: '{payment_hash}'.")
             return
-        await check_fiat_status(payment)
+        await payment.check_fiat_status()
         return
 
-    if event_type in ("PAYMENT.SALE.COMPLETED"):
+    if event_type in (
+        "PAYMENT.SALE.COMPLETED",
+        "BILLING.SUBSCRIPTION.PAYMENT.SUCCEEDED",
+    ):
         await _handle_paypal_subscription_payment(resource)
         return
 
-    logger.warning(f"Unhandled PayPal event type: '{event_type}'.")
+    logger.info(f"Unhandled PayPal event type: '{event_type}'.")
 
 
 async def _handle_paypal_subscription_payment(resource: dict):
     amount_info = resource.get("amount") or {}
-    currency = (amount_info.get("currency") or "").upper()
-    total = amount_info.get("total")
+    currency = (amount_info.get("currency_code") or "").upper()
+    total = amount_info.get("value")
     if not currency or total is None:
         raise ValueError("PayPal subscription event missing amount.")
 
@@ -216,14 +216,18 @@ async def _handle_paypal_subscription_payment(resource: dict):
     if not custom_id:
         raise ValueError("PayPal subscription event missing custom metadata.")
 
-    payment_options = _deserialize_paypal_metadata(custom_id)
+    try:
+        metadata = json.loads(custom_id)
+    except json.JSONDecodeError:
+        metadata = {}
+
+    payment_options = FiatSubscriptionPaymentOptions(**metadata)
     if not payment_options.wallet_id:
         raise ValueError("PayPal subscription event missing wallet_id.")
 
     memo = payment_options.memo or ""
     extra = {
         **(payment_options.extra or {}),
-        "subscription_request_id": resource.get("billing_agreement_id"),
         "fiat_method": "subscription",
         "tag": payment_options.tag,
         "subscription": {
@@ -243,7 +247,7 @@ async def _handle_paypal_subscription_payment(resource: dict):
         ),
     )
 
-    await check_fiat_status(payment)
+    await payment.check_fiat_status()
 
 
 def _paypal_extract_payment_hash(resource: dict) -> str | None:
@@ -254,29 +258,3 @@ def _paypal_extract_payment_hash(resource: dict) -> str | None:
         if pu.get("custom_id"):
             return pu.get("custom_id")
     return None
-
-
-def _deserialize_paypal_metadata(custom_id: str) -> FiatSubscriptionPaymentOptions:
-    try:
-        meta = json.loads(custom_id)
-        wallet_id = meta[0] if len(meta) > 0 else None
-        tag = meta[1] if len(meta) > 1 else None
-        subscription_request_id = meta[2] if len(meta) > 2 else None
-        extra_link = meta[3] if len(meta) > 3 else None
-        memo = meta[4] if len(meta) > 4 else None
-
-        extra = {
-            "link": extra_link,
-            "subscription_request_id": subscription_request_id,
-        }
-
-        return FiatSubscriptionPaymentOptions(
-            wallet_id=wallet_id,
-            tag=tag,
-            subscription_request_id=subscription_request_id,
-            extra=extra,
-            memo=memo,
-        )
-    except (json.JSONDecodeError, IndexError) as e:
-        logger.warning(f"Failed to deserialize PayPal metadata: {e}")
-        return FiatSubscriptionPaymentOptions()

lnbits/core/views/extension_api.py

@@ -2,10 +2,8 @@ import sys
 import traceback
 from http import HTTPStatus
 
-import httpx
 from bolt11 import decode as bolt11_decode
 from fastapi import APIRouter, Depends, HTTPException
-from fastapi.requests import Request
 from loguru import logger
 
 from lnbits.core.crud.extensions import get_user_extensions
@@ -16,14 +14,10 @@ from lnbits.core.models import (
 )
 from lnbits.core.models.extensions import (
     CreateExtension,
-    CreateExtensionReview,
     Extension,
     ExtensionConfig,
     ExtensionMeta,
     ExtensionRelease,
-    ExtensionReview,
-    ExtensionReviewPaymentRequest,
-    ExtensionReviewsStatus,
     InstallableExtension,
     PayToEnableInfo,
     ReleasePaymentInfo,
@@ -40,7 +34,6 @@ from lnbits.core.services.extensions import (
     install_extension,
     uninstall_extension,
 )
-from lnbits.db import Page
 from lnbits.decorators import (
     check_account_exists,
     check_account_id_exists,
@@ -596,49 +589,3 @@ async def extensions(account_id: AccountId = Depends(check_account_id_exists)):
         for ext in installable_exts
     ]
     return extension_data
-
-
-@extension_router.get(
-    "/reviews/tags",
-    dependencies=[Depends(check_account_exists)],
-)
-async def get_extension_reviews_tags() -> list[ExtensionReviewsStatus]:
-    async with httpx.AsyncClient() as client:
-        resp = await client.get(settings.lnbits_extensions_reviews_url + "/tags")
-        resp.raise_for_status()
-        data = resp.json()
-        return [ExtensionReviewsStatus(**item) for item in data]
-
-
-@extension_router.get(
-    "/reviews/{ext_id}",
-    dependencies=[Depends(check_account_exists)],
-)
-async def get_extension_reviews(ext_id: str, request: Request) -> Page[ExtensionReview]:
-    async with httpx.AsyncClient() as client:
-        query_string = str(request.query_params)
-        resp = await client.get(
-            settings.lnbits_extensions_reviews_url + f"/reviews/{ext_id}?{query_string}"
-        )
-        resp.raise_for_status()
-        reviews = resp.json()
-        return Page(
-            data=[ExtensionReview(**item) for item in reviews["data"]],
-            total=reviews["total"],
-        )
-
-
-@extension_router.put(
-    "/reviews",
-    dependencies=[Depends(check_account_exists)],
-)
-async def create_extension_review(
-    data: CreateExtensionReview,
-) -> ExtensionReviewPaymentRequest:
-    async with httpx.AsyncClient() as client:
-        resp = await client.post(
-            settings.lnbits_extensions_reviews_url + "/reviews", json=data.dict()
-        )
-        resp.raise_for_status()
-        payment_request = resp.json()
-        return ExtensionReviewPaymentRequest(**payment_request)

lnbits/core/views/fiat_api.py

@@ -1,7 +1,6 @@
 from http import HTTPStatus
 
 from fastapi import APIRouter, Depends, HTTPException
-from loguru import logger
 
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.core.models.wallets import WalletTypeInfo
@@ -31,11 +30,6 @@ async def create_subscription(
     data: CreateFiatSubscription,
     key_type: WalletTypeInfo = Depends(require_admin_key),
 ) -> FiatSubscriptionResponse:
-    logger.debug(
-        f"Creating subscription with provider '{provider}. '"
-        f"Subscription ID '{data.subscription_id}'."
-    )
-
     fiat_provider = await get_fiat_provider(provider)
     if not fiat_provider:
         raise HTTPException(404, "Fiat provider not found")
@@ -53,12 +47,6 @@ async def create_subscription(
     subscription_response = await fiat_provider.create_subscription(
         data.subscription_id, data.quantity, data.payment_options
     )
-    if subscription_response.error_message:
-        logger.warning(
-            f"Failed to create subscription with provider '{provider}': "
-            f"{subscription_response.error_message}"
-        )
-
     return subscription_response
 
 

lnbits/core/views/generic.py

@@ -42,38 +42,54 @@ async def robots():
 
 
 @generic_router.get(
-    "/extensions/builder/preview/{ext_id}/{resource}",
+    "/extensions/builder/preview/{ext_id}",
     name="extensions builder",
     dependencies=[Depends(check_extension_builder)],
 )
 async def extensions_builder_preview(
+    request: Request,
     ext_id: str,
-    resource: str | None = None,
     page_name: str | None = None,
     user: User = Depends(check_user_exists),
-) -> FileResponse:
+) -> HTMLResponse:
     working_dir_name = "preview_" + sha256(user.id.encode("utf-8")).hexdigest()
-
-    file_name = "index"
+    html_file_name = "index.html"
     if page_name == "public_page":
-        file_name = "public_page"
+        html_file_name = "public_page.html"
 
-    resource_path = Path(
-        settings.extension_builder_working_dir_path,
+    html_file_path = Path(
         "extension_builder_stub",
         ext_id,
         working_dir_name,
         ext_id,
-        "static",
+        "templates",
+        ext_id,
+        html_file_name,
     )
 
-    file_ext = ".vue" if resource == "template" else ".js"
-    file_full_path = Path(resource_path, file_name + file_ext)
+    html_file_full_path = Path(
+        settings.extension_builder_working_dir_path, html_file_path
+    )
 
-    if not file_full_path.is_file():
-        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
+    if not html_file_full_path.is_file():
+        return template_renderer().TemplateResponse(
+            request,
+            "error.html",
+            {
+                "status_code": 404,
+                "message": f"Extension {ext_id} not found, refresh Preview.",
+            },
+            status_code=HTTPStatus.NOT_FOUND,
+        )
+
+    response = template_renderer().TemplateResponse(
+        request,
+        html_file_path.as_posix(),
+        {
+            "user": user.json(),
+        },
+    )
 
-    response = FileResponse(file_full_path.absolute().as_posix())
     response.headers["Content-Security-Policy"] = (
         "default-src 'self'; "
         "style-src 'self' 'unsafe-inline'; "
@@ -192,9 +208,6 @@ admin_ui_checks = [Depends(check_admin), Depends(check_admin_ui)]
 @generic_router.get(
     "/extensions/builder", dependencies=[Depends(check_extension_builder)]
 )
-@generic_router.get(
-    "/extensions/builder/preview", dependencies=[Depends(check_extension_builder)]
-)
 async def index(
     request: Request, user: User = Depends(check_user_exists)
 ) -> HTMLResponse:

lnbits/core/views/user_api.py

@@ -20,8 +20,6 @@ from lnbits.core.crud import (
     update_admin_settings,
     update_wallet,
 )
-from lnbits.core.crud.users import clear_user_id_cache, get_account, update_account
-from lnbits.core.crud.wallets import delete_wallet_by_id
 from lnbits.core.models import (
     AccountFilters,
     AccountOverview,
@@ -74,7 +72,7 @@ async def api_get_users(
     summary="Get user by Id",
 )
 async def api_get_user(user_id: str) -> User:
-    user = await get_user(user_id, active_only=False)
+    user = await get_user(user_id)
     if not user:
         raise HTTPException(HTTPStatus.NOT_FOUND, "User not found.")
     return user
@@ -159,8 +157,11 @@ async def api_users_delete_user(
     user_id: str, account: Account = Depends(check_admin)
 ) -> SimpleStatus:
     wallets = await get_wallets(user_id, deleted=False)
-    for wallet in wallets:
-        await delete_wallet_by_id(wallet.id)
+    if len(wallets) > 0:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Cannot delete user with wallets.",
+        )
 
     if user_id == settings.super_user:
         raise HTTPException(
@@ -198,7 +199,7 @@ async def api_users_reset_password(user_id: str) -> str:
     return f"reset_key_{reset_key_b64}"
 
 
-@users_router.put(
+@users_router.get(
     "/user/{user_id}/admin",
     dependencies=[Depends(check_super_user)],
     name="Give or revoke admin permsisions to a user",
@@ -221,46 +222,9 @@ async def api_users_toggle_admin(user_id: str) -> SimpleStatus:
     )
 
 
-@users_router.put(
-    "/user/{user_id}/activate",
-    name="Activate or deactivate a user",
-)
-async def api_users_toggle_activated(
-    user_id: str, admin_account: Account = Depends(check_admin)
-) -> SimpleStatus:
-    if user_id == settings.super_user:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail="Cannot deactivate super user.",
-        )
-    if user_id == admin_account.id:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail="You cannot deactivate yourself.",
-        )
-
-    if settings.is_admin_user(user_id):
-        settings.lnbits_admin_users.remove(user_id)
-
-    user_account = await get_account(user_id, active_only=False)
-    if not user_account:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND,
-            detail="User not found.",
-        )
-    user_account.activated = not user_account.activated
-    await update_account(user_account)
-    await clear_user_id_cache(user_id)
-
-    return SimpleStatus(
-        success=True,
-        message=f"User {'activated' if user_account.activated else 'deactivated'}.",
-    )
-
-
 @users_router.get("/user/{user_id}/wallet", name="Get wallets for user")
 async def api_users_get_user_wallet(user_id: str) -> list[Wallet]:
-    return await get_wallets(user_id, deleted=None)
+    return await get_wallets(user_id)
 
 
 @users_router.post("/user/{user_id}/wallet", name="Create a new wallet for user")
@@ -283,7 +247,7 @@ async def api_users_create_user_wallet(
     "/user/{user_id}/wallet/{wallet}/undelete", name="Reactivate deleted wallet"
 )
 async def api_users_undelete_user_wallet(user_id: str, wallet: str) -> SimpleStatus:
-    wal = await get_wallet(wallet, deleted=True)
+    wal = await get_wallet(wallet)
     if not wal:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND,

lnbits/core/views/wallet_api.py

@@ -9,7 +9,6 @@ from fastapi import (
 )
 
 from lnbits.core.crud.wallets import (
-    clear_wallet_cache,
     create_wallet,
     get_wallets_paginated,
 )
@@ -38,6 +37,7 @@ from lnbits.decorators import (
     require_invoice_key,
 )
 from lnbits.helpers import generate_filter_params_openapi
+from lnbits.utils.cache import cache
 
 from ..crud import (
     delete_wallet,
@@ -134,7 +134,9 @@ async def api_reset_wallet_keys(
     if not wallet or wallet.user != account_id.id:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="Wallet not found")
 
-    clear_wallet_cache(wallet)
+    cache.pop(f"auth:wallet:{wallet.id}")
+    cache.pop(f"auth:x-api-key:{wallet.adminkey}")
+    cache.pop(f"auth:x-api-key:{wallet.inkey}")
 
     wallet.adminkey = uuid4().hex
     wallet.inkey = uuid4().hex

lnbits/db.py

@@ -12,6 +12,7 @@ from typing import Any, Generic, Literal, TypeVar, get_origin
 
 from loguru import logger
 from pydantic import BaseModel, ValidationError, root_validator
+from sqlalchemy import event
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine, create_async_engine
 from sqlalchemy.sql import text
 
@@ -55,6 +56,14 @@ def compat_timestamp_placeholder(key: str):
         return f":{key}"
 
 
+def get_placeholder(model: Any, field: str) -> str:
+    type_ = model.__fields__[field].type_
+    if type_ == datetime:
+        return compat_timestamp_placeholder(field)
+    else:
+        return f":{field}"
+
+
 class Compat:
     type: str | None = "<inherited>"
     schema: str | None = "<inherited>"
@@ -317,7 +326,30 @@ class Database(Compat):
         self.engine: AsyncEngine = create_async_engine(
             database_uri, echo=settings.debug_database
         )
+
+        if self.type in {POSTGRES, COCKROACH}:
+
+            @event.listens_for(self.engine.sync_engine, "connect")
+            def register_custom_types(dbapi_connection, *_):
+                def _parse_date(value) -> datetime:
+                    if value is None:
+                        value = "1970-01-01 00:00:00"
+                    f = "%Y-%m-%d %H:%M:%S.%f"
+                    if "." not in value:
+                        f = "%Y-%m-%d %H:%M:%S"
+                    return datetime.strptime(value, f)
+
+                dbapi_connection.run_async(
+                    lambda connection: connection.set_type_codec(
+                        "TIMESTAMP",
+                        encoder=datetime,
+                        decoder=_parse_date,
+                        schema="pg_catalog",
+                    )
+                )
+
         self.lock = asyncio.Lock()
+
         logger.trace(f"database {self.type} added for {self.name}")
 
     @asynccontextmanager
@@ -630,7 +662,7 @@ def insert_query(table_name: str, model: BaseModel) -> str:
     placeholders = []
     keys = model_to_dict(model).keys()
     for field in keys:
-        placeholders.append(f":{field}")
+        placeholders.append(get_placeholder(model, field))
     # add quotes to keys to avoid SQL conflicts (e.g. `user` is a reserved keyword)
     fields = ", ".join([f'"{key}"' for key in keys])
     values = ", ".join(placeholders)
@@ -648,8 +680,9 @@ def update_query(
     """
     fields = []
     for field in model_to_dict(model).keys():
+        placeholder = get_placeholder(model, field)
         # add quotes to keys to avoid SQL conflicts (e.g. `user` is a reserved keyword)
-        fields.append(f'"{field}" = :{field}')
+        fields.append(f'"{field}" = {placeholder}')
     query = ", ".join(fields)
     return f"UPDATE {table_name} SET {query} {where}"  # noqa: S608
 
@@ -667,12 +700,7 @@ def model_to_dict(model: BaseModel) -> dict:
         if model.__fields__[key].field_info.extra.get("no_database", False):
             continue
         if isinstance(value, datetime):
-            if DB_TYPE == SQLITE:
-                _dict[key] = value.timestamp()
-            else:
-                # remove tz. postgres and cockroach TIMESTAMP is not tz aware
-                # so it will throw if we dont remove the UTC.
-                _dict[key] = value.replace(tzinfo=None)
+            _dict[key] = value.timestamp()
             continue
         if (
             type(type_) is type(BaseModel)
@@ -728,7 +756,7 @@ def dict_to_model(_row: dict, model: type[TModel]) -> TModel:  # noqa: C901
             if DB_TYPE == SQLITE:
                 _dict[key] = datetime.fromtimestamp(value, timezone.utc)
             else:
-                _dict[key] = value.replace(tzinfo=timezone.utc)
+                _dict[key] = value
             continue
         if issubclass(type_, BaseModel):
             _dict[key] = dict_to_submodel(type_, value)

lnbits/decorators.py

@@ -261,7 +261,6 @@ async def check_account_id_exists(
             account_id,
             expiry=settings.auth_authentication_cache_minutes * 60,
         )
-        cache.set(f"auth:user:cache_key:{sha256s(account.id)}", cache_key)
 
     return account_id
 

lnbits/exceptions.py

@@ -109,7 +109,7 @@ def register_exception_handlers(app: FastAPI):  # noqa: C901
         logger.error(f"RequestValidationError: {exc!s}")
         return render_html_error(request, exc) or JSONResponse(
             status_code=HTTPStatus.BAD_REQUEST,
-            content={"detail": [dict(e) for e in exc.errors()]},
+            content={"detail": str(exc)},
         )
 
     @app.exception_handler(HTTPException)

lnbits/fiat/paypal.py

@@ -2,7 +2,7 @@ import asyncio
 import json
 import time
 from collections.abc import AsyncGenerator
-from typing import Any, Literal
+from typing import Any
 
 import httpx
 from loguru import logger
@@ -24,8 +24,6 @@ from .base import (
     FiatSubscriptionResponse,
 )
 
-FiatMethod = Literal["checkout", "subscription"]
-
 
 class PayPalCheckoutOptions(BaseModel):
     class Config:
@@ -36,21 +34,11 @@ class PayPalCheckoutOptions(BaseModel):
     metadata: dict[str, Any] = Field(default_factory=dict)
 
 
-class PayPalSubscriptionOptions(BaseModel):
-    class Config:
-        extra = "ignore"
-
-    checking_id: str | None = None
-    payment_request: str | None = None
-
-
 class PayPalCreateInvoiceOptions(BaseModel):
     class Config:
         extra = "ignore"
 
-    fiat_method: FiatMethod = "checkout"
     checkout: PayPalCheckoutOptions | None = None
-    subscription: PayPalSubscriptionOptions | None = None
 
 
 class PayPalWallet(FiatProvider):
@@ -108,14 +96,6 @@ class PayPalWallet(FiatProvider):
         opts = self._parse_create_opts(extra or {})
         if opts is None:
             return FiatInvoiceResponse(ok=False, error_message="Invalid PayPal options")
-        if opts.fiat_method == "subscription":
-            term = opts.subscription or PayPalSubscriptionOptions()
-            checking_id = term.checking_id or urlsafe_short_hash()
-            return FiatInvoiceResponse(
-                ok=True,
-                checking_id=f"subscription_{checking_id}",
-                payment_request=term.payment_request or "",
-            )
 
         try:
             await self._ensure_access_token()
@@ -191,7 +171,6 @@ class PayPalWallet(FiatProvider):
             or "https://lnbits.com"
         )
 
-        logger.debug(f"Creating PayPal subscription with ID '{subscription_id}'")
         if not payment_options.subscription_request_id:
             payment_options.subscription_request_id = urlsafe_short_hash()
         payment_options.extra = payment_options.extra or {}
@@ -203,6 +182,7 @@ class PayPalWallet(FiatProvider):
             await self._ensure_access_token()
             payload = {
                 "plan_id": subscription_id,
+                "quantity": str(quantity),
                 "custom_id": self._serialize_metadata(payment_options),
                 "application_context": {
                     "return_url": success_url,
@@ -225,7 +205,7 @@ class PayPalWallet(FiatProvider):
             return FiatSubscriptionResponse(
                 ok=True,
                 checkout_session_url=approval_url,
-                subscription_request_id=data.get("id"),
+                subscription_request_id=payment_options.subscription_request_id,
             )
         except Exception as exc:
             logger.warning(exc)
@@ -239,10 +219,6 @@ class PayPalWallet(FiatProvider):
         correlation_id: str,
         **kwargs,
     ) -> FiatSubscriptionResponse:
-        logger.debug(
-            f"Cancelling PayPal subscription '{subscription_id}'. "
-            f"Correlation ID '{correlation_id}'."
-        )
         try:
             await self._ensure_access_token()
             r = await self.client.post(
@@ -264,20 +240,12 @@ class PayPalWallet(FiatProvider):
     async def get_invoice_status(self, checking_id: str) -> FiatPaymentStatus:
         try:
             await self._ensure_access_token()
-            paypal_id = self._normalize_paypal_id(checking_id)
-            if paypal_id.startswith("subscription_"):
-                capture_id = paypal_id.replace("subscription_", "", 1)
-                r = await self.client.get(
-                    f"v2/payments/captures/{capture_id}", headers=self._auth_headers()
-                )
-                r.raise_for_status()
-                return self._status_from_capture(r.json())
-            else:
-                r = await self.client.get(
-                    f"/v2/checkout/orders/{paypal_id}", headers=self._auth_headers()
-                )
-                r.raise_for_status()
-                return self._status_from_order(r.json())
+            order_id = self._normalize_paypal_id(checking_id)
+            r = await self.client.get(
+                f"/v2/checkout/orders/{order_id}", headers=self._auth_headers()
+            )
+            r.raise_for_status()
+            return self._status_from_order(r.json())
         except Exception as exc:
             logger.debug(f"Error getting PayPal order status: {exc}")
             return FiatPaymentPendingStatus()
@@ -302,14 +270,6 @@ class PayPalWallet(FiatProvider):
             return FiatPaymentFailedStatus()
         return FiatPaymentPendingStatus()
 
-    def _status_from_capture(self, order: dict[str, Any]) -> FiatPaymentStatus:
-        status = (order.get("status") or "").upper()
-        if status in ["COMPLETED"]:
-            return FiatPaymentSuccessStatus()
-        if status in ["DECLINED", "FAILED", "CANCELLED", "CANCELED"]:
-            return FiatPaymentFailedStatus()
-        return FiatPaymentPendingStatus()
-
     def _normalize_paypal_id(self, checking_id: str) -> str:
         return (
             checking_id.replace("fiat_paypal_", "", 1)
@@ -320,20 +280,15 @@ class PayPalWallet(FiatProvider):
     def _serialize_metadata(
         self, payment_options: FiatSubscriptionPaymentOptions
     ) -> str:
-        meta = [
-            payment_options.wallet_id,
-            payment_options.tag,
-            payment_options.subscription_request_id,
-        ]
-        if payment_options.extra:
-            meta.append(payment_options.extra.get("link", None))
-
-        # Keep custom_id within PayPal's 127-char limit
-        memo_limit = 120 - len(json.dumps(meta))
-        if memo_limit > 0 and payment_options.memo:
-            meta.append(payment_options.memo[:memo_limit])
-
-        return json.dumps(meta)
+        md = {
+            "wallet_id": payment_options.wallet_id,
+            "memo": payment_options.memo,
+            "extra": payment_options.extra,
+            "tag": payment_options.tag,
+            "subscription_request_id": payment_options.subscription_request_id,
+        }
+        raw = json.dumps(md)
+        return raw[:127]  # PayPal custom_id limit
 
     def _parse_create_opts(
         self, raw_opts: dict[str, Any]

lnbits/helpers.py

@@ -70,11 +70,56 @@ def template_renderer(additional_folders: list | None = None) -> Jinja2Templates
     t.env.globals["static_url_for"] = static_url_for
     t.env.globals["normalize_path"] = normalize_path
 
-    # used in base.html
-    t.env.globals["SITE_TITLE"] = settings.lnbits_site_title
-    t.env.globals["LNBITS_APPLE_TOUCH_ICON"] = settings.lnbits_apple_touch_icon
-    t.env.globals["SETTINGS"] = settings.to_public().dict(by_alias=True)
-    t.env.globals["CURRENCIES"] = list(currencies.keys())
+    window_settings = {
+        "AD_SPACE": settings.lnbits_ad_space,
+        "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 settings.has_nodemanager,
+        "LNBITS_NODE_UI_AVAILABLE": settings.has_nodemanager,
+        "LNBITS_QR_LOGO": settings.lnbits_qr_logo,
+        "LNBITS_APPLE_TOUCH_ICON": settings.lnbits_apple_touch_icon,
+        "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,
+        "LNBITS_DEFAULT_REACTION": settings.lnbits_default_reaction,
+        "LNBITS_DEFAULT_THEME": settings.lnbits_default_theme,
+        "LNBITS_DEFAULT_BORDER": settings.lnbits_default_border,
+        "LNBITS_DEFAULT_GRADIENT": settings.lnbits_default_gradient,
+        "LNBITS_DEFAULT_BGIMAGE": settings.lnbits_default_bgimage,
+        "VOIDWALLET": settings.lnbits_backend_wallet_class == "VoidWallet",
+        "WEBPUSH_PUBKEY": settings.lnbits_webpush_pubkey,
+        "LNBITS_DENOMINATION": settings.lnbits_denomination,
+        "has_holdinvoice": settings.has_holdinvoice,
+        "LNBITS_NOSTR_CONFIGURED": settings.is_nostr_notifications_configured(),
+        "LNBITS_TELEGRAM_CONFIGURED": settings.is_telegram_notifications_configured(),
+        "LNBITS_EXT_BUILDER": settings.lnbits_extensions_builder_activate_non_admins,
+        "LNBITS_CURRENCIES": list(currencies.keys()),
+        "LNBITS_ALLOWED_CURRENCIES": settings.lnbits_allowed_currencies,
+        "CACHE_KEY": settings.server_startup_time,
+    }
+
+    t.env.globals["WINDOW_SETTINGS"] = window_settings
+    for key, value in window_settings.items():
+        t.env.globals[key] = value
 
     if settings.bundle_assets:
         t.env.globals["INCLUDED_JS"] = ["bundle.min.js"]
@@ -88,9 +133,6 @@ def template_renderer(additional_folders: list | None = None) -> Jinja2Templates
             t.env.globals["INCLUDED_CSS"] = vendor_files["css"]
             t.env.globals["INCLUDED_COMPONENTS"] = vendor_files["components"]
 
-    # backwards compatibility for extensions (tpos)
-    t.env.globals["LNBITS_DENOMINATION"] = settings.lnbits_denomination
-
     return t
 
 
@@ -348,14 +390,6 @@ def camel_to_snake(name: str) -> str:
     return name.lower()
 
 
-def snake_to_camel(name: str, capitalize_first: bool | None = False) -> str:
-    components = name.split("_")
-    camel = components[0] + "".join(x.capitalize() for x in components[1:])
-    if capitalize_first:
-        camel = camel[0].upper() + camel[1:]
-    return camel
-
-
 def is_camel_case(v: str) -> bool:
     return re.match(r"^[A-Z][a-z0-9]+([A-Z][a-z0-9]+)*$", v) is not None
 

lnbits/settings.py

@@ -41,14 +41,6 @@ class UsersSettings(LNbitsSettings):
     lnbits_admin_users: list[str] = Field(default=[])
     lnbits_allowed_users: list[str] = Field(default=[])
     lnbits_allow_new_accounts: bool = Field(default=True)
-    lnbits_require_user_activation: bool = Field(default=False)
-
-    lnbits_user_activation_by_email: bool = Field(default=False)
-    lnbits_user_activation_by_payment: bool = Field(default=False)
-    lnbits_user_activation_by_invitation_code: bool = Field(default=False)
-
-    lnbits_register_reusable_activation_code: str = Field(default="")
-    lnbits_register_one_time_activation_codes: list[str] = Field(default=[])
 
     @property
     def new_accounts_allowed(self) -> bool:
@@ -60,13 +52,6 @@ class ExtensionsSettings(LNbitsSettings):
     lnbits_user_default_extensions: list[str] = Field(default=[])
     lnbits_extensions_deactivate_all: bool = Field(default=False)
     lnbits_extensions_builder_activate_non_admins: bool = Field(default=False)
-    lnbits_extensions_reviews_url: str = Field(
-        default="https://demo.lnbits.com/paidreviews/api/v1/AdFzLjzuKFLsdk4Bcnff6r",
-        description="""
-            URL for the paid reviews.
-            Regular users can view this URL (not secret).
-            """,
-    )
     lnbits_extensions_manifests: list[str] = Field(
         default=[
             "https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions.json"
@@ -260,11 +245,6 @@ class ThemesSettings(LNbitsSettings):
     )
     lnbits_show_home_page_elements: bool = Field(default=True)
     lnbits_default_wallet_name: str = Field(default="LNbits wallet")
-
-    lnbits_wallet_featured_button_label: str | None = Field(default=None)
-    lnbits_wallet_featured_button_url: str | None = Field(default=None)
-    lnbits_wallet_featured_button_icon: str | None = Field(default=None)
-
     lnbits_custom_badge: str | None = Field(default=None)
     lnbits_custom_badge_color: str = Field(default="warning")
     lnbits_theme_options: list[str] = Field(
@@ -292,14 +272,10 @@ class ThemesSettings(LNbitsSettings):
     lnbits_qr_logo: str = Field(default="/static/images/favicon_qr_logo.png")
     lnbits_apple_touch_icon: str | None = Field(default=None)
     lnbits_default_reaction: str = Field(default="confettiBothSides")
-    lnbits_default_theme: str = Field(default="bitcoin")
+    lnbits_default_theme: str = Field(default="salvador")
     lnbits_default_border: str = Field(default="hard-border")
     lnbits_default_gradient: bool = Field(default=True)
     lnbits_default_bgimage: str | None = Field(default=None)
-    lnbits_default_dark: bool = Field(default=True)
-    lnbits_default_card_rounded: bool = Field(default=True)
-    lnbits_default_card_gradient: bool = Field(default=True)
-    lnbits_default_card_shadow: bool = Field(default=False)
 
 
 class OpsSettings(LNbitsSettings):
@@ -323,10 +299,6 @@ class AssetSettings(LNbitsSettings):
             "heic",
             "heif",
             "heics",
-            "text/plain",
-            "text/json" "text/xml",
-            "application/json",
-            "application/pdf",
         ]
     )
     lnbits_asset_thumbnail_width: int = Field(default=128, ge=0)
@@ -606,16 +578,6 @@ class SparkFundingSource(LNbitsSettings):
     spark_token: str | None = Field(default=None)
 
 
-class SparkL2FundingSource(LNbitsSettings):
-    spark_l2_network: str = Field(default="MAINNET")
-    spark_l2_external_endpoint: str | None = Field(default="http://localhost:8765")
-    spark_l2_external_api_key: str | None = Field(default=None)
-    spark_l2_mnemonic: str | None = Field(default=None)
-    spark_l2_pay_wait_ms: int = Field(default=4000, ge=0)
-    spark_l2_pay_poll_ms: int = Field(default=500, ge=0)
-    spark_l2_stream_keepalive_ms: int = Field(default=15000, ge=0)
-
-
 class LnTipsFundingSource(LNbitsSettings):
     lntips_api_endpoint: str | None = Field(default=None)
     lntips_api_key: str | None = Field(default=None)
@@ -721,7 +683,6 @@ class FundingSourcesSettings(
     PhoenixdFundingSource,
     OpenNodeFundingSource,
     SparkFundingSource,
-    SparkL2FundingSource,
     LnTipsFundingSource,
     NWCFundingSource,
     BreezSdkFundingSource,
@@ -1006,7 +967,6 @@ 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")
-    first_install_token: str | None = Field(default=None)
 
     cleanup_wallets_days: int = Field(default=90, ge=0)
     funding_source_max_retries: int = Field(default=4, ge=0)
@@ -1050,7 +1010,6 @@ class SuperUserSettings(LNbitsSettings):
             "FakeWallet",
             "LNPayWallet",
             "LNbitsWallet",
-            "SparkL2Wallet",
             "LnTipsWallet",
             "LndRestWallet",
             "LndWallet",
@@ -1156,133 +1115,6 @@ class Settings(EditableSettings, ReadOnlySettings, TransientSettings, BaseSettin
             and ext_id in self.lnbits_all_extensions_ids
         )
 
-    def to_public(self) -> PublicSettings:
-        return PublicSettings.from_settings(self)
-
-
-class PublicSettings(BaseModel):
-    """
-    PublicSettings is used for templating and public information.
-    WARNING: do not expose private information, PublicSettings is exposed publicly.
-    """
-
-    allow_register: bool = Field(alias="allowRegister")
-    qr_logo: str = Field(alias="qrLogo")
-    site_title: str = Field(alias="siteTitle")
-    site_tagline: str = Field(alias="siteTagline")
-    site_description: str | None = Field(alias="siteDescription")
-    auth_methods: list[str] = Field(alias="authMethods")
-    keycloak_org: str | None = Field(alias="keycloakOrg")
-    keycloak_icon: str | None = Field(alias="keycloakIcon")
-    has_holdinvoice: bool = Field(alias="hasHoldinvoice")
-    has_nodemanager: bool = Field(alias="hasNodemanager")
-    show_nodemanager: bool = Field(alias="showNodemanager")
-    custom_logo: str | None = Field(alias="customLogo")
-    show_voidwallet: bool = Field(alias="showVoidwallet")
-    version: str = Field(alias="version")
-    show_home_page_elements: bool = Field(alias="showHomePageElements")
-    hide_api: bool = Field(alias="hideApi")
-    cache_key: str = Field(alias="cacheKey")
-    webpush_pubkey: str | None = Field(alias="webpushPubkey")
-    show_extensions: bool = Field(alias="showExtensions")
-    show_audit: bool = Field(alias="showAudit")
-    show_admin: bool = Field(alias="showAdmin")
-    ad_space: list[list[str]] = Field(alias="adSpace")
-    ad_space_title: str = Field(alias="adSpaceTitle")
-    show_ad_space: bool = Field(alias="showAdSpace")
-    custom_image: str | None = Field(alias="customImage")
-    custom_badge: str | None = Field(alias="customBadge")
-    custom_badge_color: str | None = Field(alias="customBadgeColor")
-    service_fee: float = Field(alias="serviceFee")
-    service_fee_max: int = Field(alias="serviceFeeMax")
-    service_fee_wallet: str | None = Field(alias="serviceFeeWallet")
-    theme_options: list[str] = Field(alias="themeOptions")
-    default_reaction: str = Field(alias="defaultReaction")
-    default_theme: str = Field(alias="defaultTheme")
-    default_border: str = Field(alias="defaultBorder")
-    default_bgimage: str | None = Field(alias="defaultBgimage")
-    default_gradient: bool = Field(alias="defaultGradient")
-    default_dark: bool = Field(alias="defaultDark")
-    default_card_rounded: bool = Field(alias="defaultCardRounded")
-    default_card_gradient: bool = Field(alias="defaultCardGradient")
-    default_card_shadow: bool = Field(alias="defaultCardShadow")
-    denomination: str | None = Field()
-    extensions: list[str] = Field()
-    allowed_currencies: list[str] = Field(alias="allowedCurrencies")
-    extensions_reviews_url: str = Field(alias="extensionsReviewsUrl")
-    ext_builder: bool = Field(alias="extBuilder")
-    nostr_configured: bool = Field(alias="nostrConfigured")
-    telegram_configured: bool = Field(alias="telegramConfigured")
-    wallet_featured_button_label: str | None = Field(alias="walletFeaturedButtonLabel")
-    wallet_featured_button_url: str | None = Field(alias="walletFeaturedButtonUrl")
-    wallet_featured_button_icon: str | None = Field(alias="walletFeaturedButtonIcon")
-    lnbits_user_activation_by_email: bool = Field(alias="userActivationByEmail")
-    lnbits_user_activation_by_payment: bool = Field(alias="userActivationByPayment")
-    lnbits_user_activation_by_invitation_code: bool = Field(
-        alias="userActivationByInvitationCode"
-    )
-    has_first_install_token: bool = Field(alias="hasFirstInstallToken")
-
-    @classmethod
-    def from_settings(cls, settings: Settings):
-        ads = [x.split(";") for x in settings.lnbits_ad_space.split(",")]
-        return cls(
-            adSpace=ads,
-            adSpaceTitle=settings.lnbits_ad_space_title,
-            showAdSpace=settings.lnbits_ad_space_enabled and len(ads) > 0,
-            allowRegister=settings.new_accounts_allowed,
-            qrLogo=settings.lnbits_qr_logo,
-            siteDescription=settings.lnbits_site_description,
-            siteTitle=settings.lnbits_site_title,
-            siteTagline=settings.lnbits_site_tagline,
-            authMethods=settings.auth_allowed_methods,
-            keycloakOrg=settings.keycloak_client_custom_org,
-            keycloakIcon=settings.keycloak_client_custom_icon,
-            hasHoldinvoice=settings.has_holdinvoice,
-            hasNodemanager=settings.has_nodemanager,
-            showNodemanager=settings.lnbits_node_ui and settings.has_nodemanager,
-            customLogo=settings.lnbits_custom_logo,
-            showVoidwallet=settings.lnbits_backend_wallet_class == "VoidWallet",
-            version=settings.version,
-            showHomePageElements=settings.lnbits_show_home_page_elements,
-            hideApi=settings.lnbits_hide_api,
-            cacheKey=str(settings.server_startup_time),
-            webpushPubkey=settings.lnbits_webpush_pubkey,
-            showExtensions=not settings.lnbits_extensions_deactivate_all,
-            showAudit=settings.lnbits_audit_enabled,
-            showAdmin=settings.lnbits_admin_ui,
-            customImage=settings.lnbits_custom_image,
-            customBadge=settings.lnbits_custom_badge,
-            customBadgeColor=settings.lnbits_custom_badge_color,
-            serviceFee=settings.lnbits_service_fee,
-            serviceFeeMax=settings.lnbits_service_fee_max,
-            serviceFeeWallet=settings.lnbits_service_fee_wallet,
-            themeOptions=settings.lnbits_theme_options,
-            defaultReaction=settings.lnbits_default_reaction,
-            defaultTheme=settings.lnbits_default_theme,
-            defaultBorder=settings.lnbits_default_border,
-            defaultGradient=settings.lnbits_default_gradient,
-            defaultBgimage=settings.lnbits_default_bgimage,
-            defaultDark=settings.lnbits_default_dark,
-            defaultCardRounded=settings.lnbits_default_card_rounded,
-            defaultCardGradient=settings.lnbits_default_card_gradient,
-            defaultCardShadow=settings.lnbits_default_card_shadow,
-            denomination=settings.lnbits_denomination,
-            extensions=list(settings.lnbits_installed_extensions_ids),
-            allowedCurrencies=settings.lnbits_allowed_currencies,
-            extensionsReviewsUrl=settings.lnbits_extensions_reviews_url,
-            extBuilder=settings.lnbits_extensions_builder_activate_non_admins,
-            nostrConfigured=settings.is_nostr_notifications_configured(),
-            telegramConfigured=settings.is_telegram_notifications_configured(),
-            walletFeaturedButtonLabel=settings.lnbits_wallet_featured_button_label,
-            walletFeaturedButtonUrl=settings.lnbits_wallet_featured_button_url,
-            walletFeaturedButtonIcon=settings.lnbits_wallet_featured_button_icon,
-            userActivationByEmail=settings.lnbits_user_activation_by_email,
-            userActivationByPayment=settings.lnbits_user_activation_by_payment,
-            userActivationByInvitationCode=settings.lnbits_user_activation_by_invitation_code,
-            hasFirstInstallToken=settings.first_install_token is not None,
-        )
-
 
 class SuperSettings(EditableSettings):
     super_user: str

lnbits/static/components/lnbits-error.vue

@@ -1,5 +1,30 @@
-window.app.component('lnbits-error', {
-  template: '#lnbits-error',
+<template>
+  <div class="text-center q-pa-md flex flex-center">
+    <div>
+      <div class="error-code" v-text="code"></div>
+      <div class="error-message" v-text="message"></div>
+      <div class="q-mx-auto q-mt-lg justify-center" style="width: max-content">
+        <q-btn
+          v-if="isExtension"
+          color="primary"
+          @click="goToExtension()"
+          label="Go To Extension"
+        ></q-btn>
+        <q-btn
+          v-else-if="g.isUserAuthorized"
+          color="primary"
+          @click="goToWallet()"
+          label="Go to Wallet"
+        ></q-btn>
+        <q-btn v-else color="primary" @click="goBack()" label="Go Back"></q-btn>
+        <span class="q-mx-md">OR</span>
+        <q-btn color="secondary" @click="goHome()" label="Go Home"></q-btn>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
   props: ['dynamic', 'code', 'message'],
   computed: {
     isExtension() {
@@ -49,4 +74,5 @@ window.app.component('lnbits-error', {
       }
     }
   }
-})
+}
+</script>

lnbits/static/components/main.js

@@ -0,0 +1,3 @@
+import LnbitsError from './lnbits-error.vue'
+
+window.LnbitsError = LnbitsError

lnbits/static/css/base.css

@@ -220,181 +220,6 @@ body.body--dark .q-drawer {
   backdrop-filter: blur(6px) brightness(0.8);
 }
 
-body.rounded-ui .q-card,
-body.rounded-ui .q-btn {
-  border-radius: 10px;
-}
-
-body[data-theme=classic].card-gradient .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgba(103, 58, 183, 0.08), rgba(156, 39, 176, 0.06));
-}
-body[data-theme=classic].card-gradient .q-drawer {
-  background-image: linear-gradient(165deg, rgba(103, 58, 183, 0.06), rgba(156, 39, 176, 0.04));
-}
-
-body[data-theme=classic].card-gradient.body--dark .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgb(38.6192771084, 42.356626506, 64.7807228916), rgba(103, 58, 183, 0.07));
-}
-body[data-theme=classic].card-gradient.body--dark .q-drawer {
-  background-image: linear-gradient(165deg, rgb(36.7144578313, 40.2674698795, 61.5855421687), rgba(103, 58, 183, 0.05));
-}
-
-body[data-theme=bitcoin].card-gradient .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgba(234, 97, 29, 0.08), rgba(229, 111, 53, 0.06));
-}
-body[data-theme=bitcoin].card-gradient .q-drawer {
-  background-image: linear-gradient(165deg, rgba(234, 97, 29, 0.06), rgba(229, 111, 53, 0.04));
-}
-
-body[data-theme=bitcoin].card-gradient.body--dark .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgb(54.18, 49.364, 71.036), rgba(234, 97, 29, 0.07));
-}
-body[data-theme=bitcoin].card-gradient.body--dark .q-drawer {
-  background-image: linear-gradient(165deg, rgb(51.885, 47.273, 68.027), rgba(234, 97, 29, 0.05));
-}
-
-body[data-theme=freedom].card-gradient .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgba(226, 33, 86, 0.08), rgba(185, 26, 69, 0.06));
-}
-body[data-theme=freedom].card-gradient .q-drawer {
-  background-image: linear-gradient(165deg, rgba(226, 33, 86, 0.06), rgba(185, 26, 69, 0.04));
-}
-
-body[data-theme=freedom].card-gradient.body--dark .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgb(82.2051282051, 55.1948717949, 63.4153846154), rgba(226, 33, 86, 0.07));
-}
-body[data-theme=freedom].card-gradient.body--dark .q-drawer {
-  background-image: linear-gradient(165deg, rgb(79.1538461538, 53.1461538462, 61.0615384615), rgba(226, 33, 86, 0.05));
-}
-
-body[data-theme=cyber].card-gradient .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgba(124, 179, 66, 0.08), rgba(85, 139, 47, 0.06));
-}
-body[data-theme=cyber].card-gradient .q-drawer {
-  background-image: linear-gradient(165deg, rgba(124, 179, 66, 0.06), rgba(85, 139, 47, 0.04));
-}
-
-body[data-theme=cyber].card-gradient.body--dark .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgb(10.2, 10.2, 10.2), rgba(124, 179, 66, 0.07));
-}
-body[data-theme=cyber].card-gradient.body--dark .q-drawer {
-  background-image: linear-gradient(165deg, rgb(7.65, 7.65, 7.65), rgba(124, 179, 66, 0.05));
-}
-
-body[data-theme=mint].card-gradient .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgba(58, 183, 125, 0.08), rgba(39, 176, 101, 0.06));
-}
-body[data-theme=mint].card-gradient .q-drawer {
-  background-image: linear-gradient(165deg, rgba(58, 183, 125, 0.06), rgba(39, 176, 101, 0.04));
-}
-
-body[data-theme=mint].card-gradient.body--dark .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgb(38.6192771084, 64.7807228916, 53.5686746988), rgba(58, 183, 125, 0.07));
-}
-body[data-theme=mint].card-gradient.body--dark .q-drawer {
-  background-image: linear-gradient(165deg, rgb(36.7144578313, 61.5855421687, 50.9265060241), rgba(58, 183, 125, 0.05));
-}
-
-body[data-theme=autumn].card-gradient .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgba(183, 118, 58, 0.08), rgba(176, 121, 39, 0.06));
-}
-body[data-theme=autumn].card-gradient .q-drawer {
-  background-image: linear-gradient(165deg, rgba(183, 118, 58, 0.06), rgba(176, 121, 39, 0.04));
-}
-
-body[data-theme=autumn].card-gradient.body--dark .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgb(64.7807228916, 51.0771084337, 38.6192771084), rgba(183, 118, 58, 0.07));
-}
-body[data-theme=autumn].card-gradient.body--dark .q-drawer {
-  background-image: linear-gradient(165deg, rgb(61.5855421687, 48.5578313253, 36.7144578313), rgba(183, 118, 58, 0.05));
-}
-
-body[data-theme=flamingo].card-gradient .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgba(255, 0, 255, 0.08), rgba(253, 163, 253, 0.06));
-}
-body[data-theme=flamingo].card-gradient .q-drawer {
-  background-image: linear-gradient(165deg, rgba(255, 0, 255, 0.06), rgba(253, 163, 253, 0.04));
-}
-
-body[data-theme=flamingo].card-gradient.body--dark .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgb(66.176, 4.224, 66.176), rgba(255, 0, 255, 0.07));
-}
-body[data-theme=flamingo].card-gradient.body--dark .q-drawer {
-  background-image: linear-gradient(165deg, rgb(61.382, 3.918, 61.382), rgba(255, 0, 255, 0.05));
-}
-
-body[data-theme=monochrome].card-gradient .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgba(73, 73, 73, 0.08), rgba(107, 107, 107, 0.06));
-}
-body[data-theme=monochrome].card-gradient .q-drawer {
-  background-image: linear-gradient(165deg, rgba(73, 73, 73, 0.06), rgba(107, 107, 107, 0.04));
-}
-
-body[data-theme=monochrome].card-gradient.body--dark .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgb(10.2, 10.2, 10.2), rgba(73, 73, 73, 0.07));
-}
-body[data-theme=monochrome].card-gradient.body--dark .q-drawer {
-  background-image: linear-gradient(165deg, rgb(7.65, 7.65, 7.65), rgba(73, 73, 73, 0.05));
-}
-
-body[data-theme=salvador].card-gradient .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgba(25, 118, 210, 0.08), rgba(38, 166, 154, 0.06));
-}
-body[data-theme=salvador].card-gradient .q-drawer {
-  background-image: linear-gradient(165deg, rgba(25, 118, 210, 0.06), rgba(38, 166, 154, 0.04));
-}
-
-body[data-theme=salvador].card-gradient.body--dark .q-card:not(.q-dialog .q-card,
-.lnbits__dialog-card,
-.q-dialog-plugin--dark) {
-  background-image: linear-gradient(135deg, rgb(43.9888888889, 64.2, 84.4111111111), rgba(25, 118, 210, 0.07));
-}
-body[data-theme=salvador].card-gradient.body--dark .q-drawer {
-  background-image: linear-gradient(165deg, rgb(42.2416666667, 61.65, 81.0583333333), rgba(25, 118, 210, 0.05));
-}
-
-body.card-shadow .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-  filter: drop-shadow(0 10px 24px rgba(0, 0, 0, 0.18));
-}
-
-body.card-shadow.body--dark .q-card:not(.q-dialog .q-card, .lnbits__dialog-card, .q-dialog-plugin--dark) {
-  filter: drop-shadow(0 12px 28px rgba(0, 0, 0, 0.45));
-}
-
 :root {
   --size: 100px;
   --gap: 25px;

lnbits/static/i18n/en.js

@@ -6,7 +6,7 @@ window.localisation.en = {
   funding: 'Funding',
   users: 'Users',
   audit: 'Audit',
-  api_watch: 'API Watch',
+  api_watch: 'Api Watch',
   apps: 'Apps',
   channels: 'Channels',
   transactions: 'Transactions',
@@ -171,7 +171,6 @@ window.localisation.en = {
   drop_db: 'Remove Data',
   enable: 'Enable',
   enabled: 'Enabled',
-  disabled: 'Disabled',
   pay_to_enable: 'Pay To Enable',
   enable_extension_details: 'Enable extension for current user',
   disable: 'Disable',
@@ -179,8 +178,6 @@ window.localisation.en = {
   installed: 'Installed',
   activated: 'Activated',
   deactivated: 'Deactivated',
-  activate: 'Activate',
-  deactivate: 'Deactivate',
   release_notes: 'Release Notes',
   activate_extension_details: 'Make extension available/unavailable for users',
   featured: 'Featured',
@@ -189,28 +186,7 @@ window.localisation.en = {
   only_admins_can_create_extensions:
     'Only admin accounts can create extensions',
   admin_only: 'Admin Only',
-  make_user_admin: 'Make User Admin',
-  revoke_admin: 'Revoke Admin',
   new_version: 'New Version',
-  reviews_url: 'Reviews URL',
-  reviews_url_label: 'Reviews server URL',
-  reviews_url_hint:
-    'Full PaidReviews URL including the settings id (e.g. https://example.com/paidreviews/SETTINGS_ID)',
-  reviews_open: 'View reviews',
-  reviews_leave: 'Leave a review',
-  reviews_name: 'Your name',
-  reviews_comment: 'Your review',
-  reviews_rating: 'Rating',
-  reviews_submit: 'Submit review',
-  reviews_loading: 'Loading reviews...',
-  reviews_refresh: 'Refresh reviews',
-  reviews_error_load: 'Could not load reviews',
-  reviews_url_not_configured: 'Reviews URL not configured',
-  reviews_pay_invoice: 'Pay invoice',
-  reviews_invoice_paid: 'Invoice paid',
-  reviews_invoice_title: 'Pay this invoice to submit your review',
-  reviews_count: 'Reviews',
-  no_reviews: 'No reviews yet',
   extension_has_free_release: 'Has free releases',
   extension_has_paid_release: 'Has paid releases',
   extension_depends_on: 'Depends on:',
@@ -271,16 +247,12 @@ window.localisation.en = {
   update: 'Update',
   update_available: 'Update {version} available!',
   funding_sources: 'Funding Sources',
-  funding_source: 'Funding Source',
-  requires_server_restart:
-    'Changing these settings requires a server restart to take effect.',
-  funding_source_info: 'Select the active funding wallet',
   latest_update: 'You are on the latest version {version}.',
   notifications: 'Notifications',
   notifications_configure: 'Configure Notifications',
   notifications_nostr_config: 'Nostr Configuration',
   notifications_enable_nostr: 'Enable Nostr',
-  notifications_enable_nostr_desc: 'Send notifications over Nostr',
+  notifications_enable_nostr_desc: 'Send notfications over Nostr',
   notifications_nostr_private_key: 'Nostr Private Key',
   notifications_nostr_private_key_desc:
     'Private key (hex or nsec) to sign the messages sent to Nostr',
@@ -289,11 +261,11 @@ window.localisation.en = {
     'Nip5 identifier to send notifications to',
   notifications_nostr_identifiers: 'Nostr Identifiers',
   notifications_nostr_identifiers_desc:
-    'List of identifiers to send notifications to.',
+    'List of identifiers to send notifications to',
 
   notifications_telegram_config: 'Telegram Configuration',
   notifications_enable_telegram: 'Enable Telegram',
-  notifications_enable_telegram_desc: 'Send notifications over Telegram',
+  notifications_enable_telegram_desc: 'Send notfications over Telegram',
   notifications_telegram_access_token: 'Access Token',
   notifications_telegram_access_token_desc: 'Access token for the bot',
   notifications_chat_id: 'Telegram Chat ID',
@@ -322,15 +294,15 @@ window.localisation.en = {
 
   notification_settings_update: 'Settings updated',
   notification_settings_update_desc:
-    'Send a notification when server settings have been updated',
+    'Notify when server settings have been updated',
 
   notification_server_start_stop: 'Server Start/Stop',
   notification_server_start_stop_desc:
-    'Send a notification when the server has been started/stopped',
+    'Notify when the server has been started/stopped',
 
   notification_watchdog_limit: 'Watchdog Limit Notification',
   notification_watchdog_limit_desc:
-    'Send a notification when the watchdog limit has been reached (does not affect the funding source)',
+    'Notify when the watchdog limit has been reached (does not affect the funding source)',
 
   notification_server_status: 'Server Status',
   notification_server_status_desc:
@@ -338,31 +310,29 @@ window.localisation.en = {
 
   notification_incoming_payment: 'Incoming Payments',
   notification_incoming_payment_desc:
-    'Send a notification when a wallet has received a payment above the specified amount (sats)',
+    'Notify when a wallet has received a payment above the specified amount (sats)',
 
   notification_outgoing_payment: 'Outgoing Payments',
   notification_outgoing_payment_desc:
-    'Send a notification when a wallet has sent a payment above the specified amount (sats)',
+    'Notify when a wallet has sent a payment above the specified amount (sats)',
 
   notification_credit_debit: 'Credit / Debit',
   notification_credit_debit_desc:
-    'Send a notification when a wallet has been credited/debited by the superuser',
+    'Notify when a wallet has been credited/debited by the superuser',
 
   notification_balance_delta_changed: 'Balance Delta Changed',
   notification_balance_delta_changed_desc:
-    'Send a notification when the difference between the node balance and the LNbits balance has changed by more than the specified amount (in sats). Set to 0 to disable. This runs every minute.',
+    'Notify when the difference between the node balance and the LNbits balance has changed by more than the specified amount (in sats). Set to 0 to disable. This runs every minute.',
 
-  watchdog_introduction:
-    "Watchdog is a feature that allows you to automatically switch the LNbits funding source to VoidWallet if your node balance is lower than the LNbits balance by a certain threshold. This can help prevent overspending and keep your node's funds safe.",
-  enable_watchdog: 'Enable Watchdog',
+  enable_watchdog: 'Enable Watchdog Switch',
   enable_watchdog_desc:
-    'You will need to re-enable this manually after an update.',
-  watchdog_interval: 'Watchdog Check Interval',
+    'If enabled it will change your funding source to VoidWallet automatically if your balance is lower than the LNbits balance. You will need to enable manually after an update.',
+  watchdog_interval: 'Watchdog Interval',
   watchdog_interval_desc:
-    'How often LNbits should check for a killswitch signal in the watchdog threshold delta value [node_balance - lnbits_balance] (in minutes).',
-  watchdog_delta: 'Watchdog Threshold Delta',
+    'How often the background task should check for a killswitch signal in the watchdog delta [node_balance - lnbits_balance] (in minutes).',
+  watchdog_delta: 'Watchdog Delta',
   watchdog_delta_desc:
-    "The LNbit's > Node balance delta threshold.  If this threshold is exceeded, the funding source is changed to VoidWallet.",
+    'Limit before killswitch changes funding source to VoidWallet [lnbits_balance - node_balance > delta]',
   status: 'Status',
   notification_source: 'Notification Source',
   notification_source_label:
@@ -373,12 +343,12 @@ window.localisation.en = {
   releases: 'Releases',
   watchdog: 'Watchdog',
   server_logs: 'Server Logs',
-  ip_blocker: 'IP Blacklist/Whitelist',
+  ip_blocker: 'IP Blocker',
   security: 'Security',
-  security_tools: 'Security Tools',
+  security_tools: 'Security tools',
   block_access_hint: 'Block access by IP',
   allow_access_hint: 'Allow access by IP (will override blocked IPs)',
-  enter_ip: 'Enter an IP address and press enter',
+  enter_ip: 'Enter IP and hit enter',
   rate_limiter: 'Rate Limiter',
   callback_url_rules: 'Callback URL Rules',
   enter_callback_url_rule: 'Enter URL rule as regex and hit enter',
@@ -392,16 +362,14 @@ window.localisation.en = {
   wallet_max_ballance: 'Wallet max balance in sats (0 to disable)',
   wallet_limit_secs_between_trans:
     'Min secs between transactions per wallet (0 to disable)',
-  only_incoming_payments_allowed: 'Allow incoming payments only',
+  only_incoming_payments_allowed: 'Only incoming payments allowed',
   disable_outgoing_payments: 'Disable outgoing payments',
-  number_of_requests: 'Number of requests to allow',
-  number_of_requests_hint:
-    'Number of requests to allow per "time unit" for the rate limiter. Set to 0 to disable.',
+  number_of_requests: 'Number of requests',
   time_unit: 'Time unit',
-  minute: 'Minute',
+  minute: 'minute',
   settings: 'Settings',
-  second: 'Second',
-  hour: 'Hour',
+  second: 'second',
+  hour: 'hour',
   disable_server_log: 'Disable Server Log',
   enable_server_log: 'Enable Server Log',
   coming_soon: 'Feature coming soon',
@@ -473,12 +441,6 @@ window.localisation.en = {
   api_token_id: 'Token Id',
   toggle_gradient: 'Toggle Gradient',
   gradient_background: 'Gradient Background',
-  rounded_ui: 'Rounded Cards & Buttons',
-  toggle_rounded_ui: 'Toggle rounded corners for cards and buttons',
-  card_gradient: 'Card Gradient',
-  toggle_card_gradient: 'Toggle gradient on cards',
-  card_shadow: 'Card Shadow',
-  toggle_card_shadow: 'Toggle shadow on cards',
   language: 'Language',
   assets: 'Assets',
   max_asset_size_mb: 'Max Asset Size (MB)',
@@ -537,34 +499,36 @@ window.localisation.en = {
   hash: 'Hash: ',
   welcome_lnbits: 'Welcome to LNbits',
   setup_su_account: 'Set up the Superuser account below.',
-  first_install_token: 'First Install Token',
   create_ticker_converter: 'Create Currency Ticker Converter',
   enable_audit: 'Enable Audit',
   recommended: 'Recommended',
-  audit_desc: 'Log HTTP requests according to the filters specified below.',
-  audit_record_req: 'Log Request Body',
-  audit_record_warning: 'Warning!',
-  audit_record_req_warning_1: 'Sensitive data (like passwords) will be logged.',
-  audit_record_req_warning_2:
-    'The request body can be large. This can fill up your logs quickly.',
-  audit_record_use: 'Use this with caution!',
-  audit_ip: 'Log IP Address',
-  audit_ip_desc: 'Log the IP address of users making requests to LNbits.',
-  audit_path_params: 'Log Path Parameters',
-  audit_query_params: 'Log Query Parameters',
+  audit_desc: 'Record HTTP requests according with the specified filters',
+  audit_record_req: 'Record Request Body',
+  audit_record_warning: 'Warning: ',
+  audit_record_req_warning_1:
+    'confidential data (like passwords) will be logged.',
+  audit_record_req_warning_2: 'the request body can have large size.',
+  audit_record_use: 'Use it with caution.',
+  audit_ip: 'Record IP Address',
+  audit_ip_desc: 'Record the IP address of the client',
+  audit_path_params: 'Record Path Parameters',
+  audit_query_params: 'Record Query Parameters',
   audit_http_methods: 'Include HTTP Methods',
   audit_http_methods_hint:
-    'List of HTTP methods to be logged. No value means all methods will be logged.',
-  audit_http_methods_label: 'HTTP Methods to Log',
+    'List of HTTP methods to be included. Empty lists means all.',
+  audit_http_methods_label: 'HTTP Methods',
+  audit_resp_codes: 'Include HTTP Response Codes',
   audit_resp_codes_hint:
     'List of HTTP codes to be included (regex match). Empty lists means all. Eg: 4.*, 5.*',
-  audit_resp_codes_label: 'HTTP Response Codes to Log (regex)',
+  audit_resp_codes_label: 'HTTP Response code (regex)',
+  audit_paths: 'Include Paths',
   audit_paths_hint:
     'List of paths to be included (regex match). Empty list means all.',
-  audit_paths_label: 'HTTP Paths to Log (regex)',
+  audit_paths_label: 'HTTP Path (regex)',
+  audit_paths_exclude: 'Exclude Paths',
   audit_paths_exclude_hint:
     'List of paths to be excluded (regex match). Empty list means none.',
-  audit_paths_exclude_label: 'HTTP Paths to Exclude from Logging (regex)',
+  audit_paths_exclude_label: 'HTTP Path (regex)',
   exchange_providers: 'Exchange Providers',
   admin_extensions: 'Admin Extensions',
   admin_extensions_label: 'Admin extensions',
@@ -584,16 +548,16 @@ window.localisation.en = {
   misc_disable_extensions_builder_label:
     'Enable Extensions Builder for non admin users.',
   misc_hide_api: 'Hide API',
-  misc_hide_api_label: 'Hides wallet API, extensions can choose to honor',
+  misc_hide_api_label: 'Hides wallet api, extensions can choose to honor',
   wallets_management: 'Wallets Management',
-  funding_source_info: 'Funding Source Information',
-  funding_source: 'Funding source: {wallet_class}',
-  node_balance: 'Node balance: {balance} sats',
-  lnbits_balance: 'LNbits balance: {balance} sats',
-  funding_reserve_percent: 'Funding reserve percentage: {percent} %',
+  funding_source_info: 'Funding Source Info',
+  funding_source: 'Funding Source: {wallet_class}',
+  node_balance: 'Node Balance: {balance} sats',
+  lnbits_balance: 'LNbits Balance: {balance} sats',
+  funding_reserve_percent: 'Reserve Percent: {percent} %',
   node_management: 'Node Management',
   node_management_not_supported:
-    'Node management is not supported by the active funding source',
+    'Node Management not supported by active funding source',
   toggle_node_ui: 'Node UI',
   toggle_public_node_ui: 'Public Node UI',
   toggle_transactions_node_ui: 'Transactions Tab (Disable on large CLN nodes)',
@@ -609,15 +573,16 @@ window.localisation.en = {
   payment_wait_time_tooltip:
     'Controls how long LNbits waits for an outgoing payment attempt to confirm before marking it as pending. Higher values help when paying slow-settling invoices (e.g., HODL invoices, Boltz). The payment will be rechecked later and updated automatically or manually.',
   server_management: 'Server Management',
-  base_url_label: 'Base URL of the server',
+  base_url: 'Base URL',
+  base_url_label: 'Static/Base url for the server',
   authentication: 'Authentication',
-  auth_token_expiry_label: 'Token expiry (minutes)',
+  auth_token_expiry_label: 'Token expire minutes',
   auth_token_expiry_hint: 'Time in minutes until the token expires',
   auth_authentication_cache_label: 'Cache time (minutes)',
   auth_authentication_cache_hint:
     'Time in minutes to cache successful authentication (0 to disable)',
   auth_allowed_methods_label: 'Allowed authorization methods',
-  auth_allowed_methods_hint: 'Select allowed authorization methods',
+  auth_allowed_methods_hint: 'Select authorization methods',
   auth_nostr_label: 'Nostr Request URL',
   auth_nostr_hint: 'Absolute URL that the clients will use to login.',
   auth_google_ci_label: 'Google Client ID',
@@ -637,27 +602,31 @@ window.localisation.en = {
   auth_keycloak_custom_icon_label: 'Keycloak Custom Icon (URL)',
   currency_settings: 'Currency Settings',
   allowed_currencies: 'Allowed Currencies',
-  allowed_currencies_hint:
-    'Set the allowed fiat currencies for the exchange features',
-  default_account_currency: 'Default Accounting Currency',
-  default_account_currency_hint:
-    'The default currency to use for accounting features.',
+  allowed_currencies_hint: 'Limit the number of available fiat currencies',
+  default_account_currency: 'Default Account Currency',
+  default_account_currency_hint: 'Default currency for accounting',
   min_incoming_payment_amount: 'Min Incoming Payment Amount',
   min_incoming_payment_amount_desc:
     'Minimum amount allowed for generating an invoice',
-  max_incoming_payment_amount: 'Maximum Incoming Payment Amount',
+  max_incoming_payment_amount: 'Max Incoming Payment Amount',
   max_incoming_payment_amount_desc:
-    'Maximum amount allowed when generating an invoice',
-  max_outgoing_payment_amount: 'Maximum Outgoing Payment Amount',
+    'Maximum amount allowed for generating an invoice',
+  max_outgoing_payment_amount: 'Max Outgoing Payment Amount',
   max_outgoing_payment_amount_desc:
-    'Maximum amount allowed when making a payment',
-  service_fees: 'Service Fees',
+    'Maximum amount allowed for making a payment',
   service_fee: 'Service Fee',
-  service_fee_label: 'Service Fee Charged Per Transaction',
-  service_fee_max_label: 'Maximum Service Fee Limit',
-  fee_wallet_label: 'Service Fee Wallet ID',
-  fee_wallet_hint: 'The ID of the wallet to which to send service funds',
-  disable_fee: 'Disable Service Fees for Internal Payments',
+  service_fee_label: 'Service fee (%)',
+  service_fee_hint: 'Fee charged per tx (%)',
+  service_fee_max: 'Service Fee Max',
+  service_fee_max_label: 'Service fee max (sats)',
+  service_fee_max_hint: 'Max service fee to charge in (sats)',
+  fee_wallet: 'Fee Wallet',
+  fee_wallet_label: 'Fee wallet (wallet ID)',
+  fee_wallet_hint: 'Wallet ID to send funds to',
+  disable_fee: 'Disable Fee',
+  disable_fee_internal: 'Disable Service Fee for Internal Payments',
+  disable_fee_internal_desc:
+    'Disable Service Fee for Internal Lightning Payments',
   ui_management: 'UI Management',
   ui_site_title: 'Site Title',
   ui_changing_remove_lnbits_elements:
@@ -670,47 +639,32 @@ window.localisation.en = {
   ui_site_description_hint: 'Use plain text, Markdown, or raw HTML',
   ui_default_wallet_name: 'Default Wallet Name',
   ui_default_theme: 'Default Theme',
-  wallet_featured_button_title: 'Wallet - Featured Button',
-  wallet_featured_button_label: 'Wallet Featured Button Label',
-  wallet_featured_button_label_hint:
-    'Show featured button on the wallet homepage',
-  wallet_featured_button_url: 'Featured Button URL',
-  wallet_featured_button_url_hint:
-    'On click the button will open this URL. Leave empty to hide the button.',
-  wallet_featured_button_icon: 'Featured Button Icon',
-  wallet_featured_button_icon_hint:
-    'Icon shown on the featured button (Quasar icon name e.g. "bolt")',
   lnbits_wallet: 'LNbits wallet',
   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 icon and favicon logo URL',
+  ui_qr_code_logo_hint: 'QR code and favicon logo url',
   ui_apple_touch_icon: 'Apple Touch Icon',
-  ui_apple_touch_icon_hint: 'Apple touch icon URL',
+  ui_apple_touch_icon_hint: 'Apple touch icon url',
   ui_custom_image: 'Custom Image',
   ui_custom_image_label: 'URL to custom image',
-  ui_custom_image_hint:
-    'This image is shown on the LNbits homepage and login screen.',
-  ui_custom_badge_title: 'Custom Badge Settings',
-  ui_custom_badge_desc: 'Show a custom badge in the header of LNbits',
-  ui_custom_badge: 'Custom Badge Text',
+  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_color_label: 'Custom Badge Color',
   themes: 'Themes',
   themes_hint: 'Choose themes available for users',
   custom_logo: 'Custom Logo',
   custom_logo_hint: 'URL to logo image',
-  ad_space_section_title: 'Advertisement Space',
-  ad_space_section_desc:
-    'Configure the advertisement space on the wallet sidebar.',
-  ad_space_title: 'Advertisement Space Title',
-  ad_space_title_hint: 'Title shown above the advertisement space',
+  ad_space_title: 'Ad Space Title',
+  ad_space_title_label: 'Supported by',
   ad_slots: 'Advertisement Slots',
   ad_slots_hint:
-    'Advertisement image filepaths in CSV format, extensions can choose to honor. Format: url;img_light_url;img_dark_url, url..',
-  ads_enabled: 'Enable Advertisement',
-  ads_disabled: 'Disabled Advertisement',
+    'Ad url and image filepaths in CSV format, extensions can choose to honor',
+  ad_slots_label: 'url;img_light_url;img_dark_url, url...',
+  ads_enabled: 'Ads Enabled',
+  ads_disabled: 'Ads Disabled',
   user_management: 'User Management',
   admin_users: 'Admin Users',
   admin_users_hint: 'Users with admin privileges',
@@ -721,28 +675,7 @@ window.localisation.en = {
   allowed_users_label: 'User ID',
   allow_creation_user: 'Allow creation of new users',
   allow_creation_user_desc: 'Allow creation of new users on the index page',
-  require_user_activation: 'Require user activation',
-  require_user_activation_desc:
-    'New users will be activated only after they pass one of the confirmation methods. Admins can activate users manually from the admin panel.',
-  reusable_activation_code: 'Reusable activation code',
-  reusable_activation_code_label: 'Reusable activation code',
-  reusable_activation_code_hint:
-    'This activation code can be used multiple times by different users.',
-  one_time_activation_code: 'One-time activation codes',
-  one_time_activation_code_label: 'Add activation code',
-  one_time_activation_code_hint:
-    'List of one-time activation codes. Each code can be used only once, then will be reomved from the list.',
-  invitation_code: 'Invitation Code',
-  invitation_code_hint: 'The invitation code that you have received.',
-  email: 'Email',
-  email_confirmation_hint: 'Email address to send the confirmation code to.',
-  nostr_identifier: 'Nostr Identifier',
-  nostr_identifier_hint:
-    'Nostr nip5 identifier or <npub> to send the confirmation code to.',
-
   new_user_not_allowed: 'Registration is disabled.',
-  start_user_impersonation: 'Impersonate this user',
-  stop_user_impersonation: 'Stop User Impersonation',
   components: 'Components',
   long_running_endpoints: 'Top 5 Long Running Endpoints',
   http_request_methods: 'HTTP Request Methods',

lnbits/static/js/api.js

@@ -66,7 +66,7 @@ window._lnbitsApi = {
       name: name
     })
   },
-  register(username, email, password, password_repeat, invitation_code) {
+  register(username, email, password, password_repeat) {
     return axios({
       method: 'POST',
       url: '/api/v1/auth/register',
@@ -74,8 +74,7 @@ window._lnbitsApi = {
         username,
         email,
         password,
-        password_repeat,
-        invitation_code
+        password_repeat
       }
     })
   },
@@ -124,19 +123,6 @@ window._lnbitsApi = {
       url: '/api/v1/auth/logout'
     })
   },
-  impersonateUser(usr) {
-    return axios({
-      method: 'POST',
-      url: '/api/v1/auth/impersonate',
-      data: {usr}
-    })
-  },
-  stopImpersonation() {
-    return axios({
-      method: 'DELETE',
-      url: '/api/v1/auth/impersonate'
-    })
-  },
   getAuthenticatedUser() {
     return this.request('get', '/api/v1/auth')
   },
@@ -148,16 +134,13 @@ window._lnbitsApi = {
       name: name,
       wallet_type: walletType,
       ...opts
-    })
+    }).catch(LNbits.utils.notifyApiError)
   },
   updateWallet(name, wallet) {
     return this.request('patch', '/api/v1/wallet', wallet.adminkey, {
       name: name
     })
   },
-  updateUiCustomization(data = {}) {
-    return this.request('patch', '/api/v1/auth/ui', null, data)
-  },
   resetWalletKeys(wallet) {
     return this.request('put', `/api/v1/wallet/reset/${wallet.id}`).then(
       res => {

lnbits/static/js/base.js

@@ -13,9 +13,7 @@ window.LNbits = {
         wallets: data.wallets,
         fiat_providers: data.fiat_providers || [],
         super_user: data.super_user,
-        extra: data.extra ?? {},
-        hasPassword: data.has_password ?? false,
-        uiCustomization: data.ui_customization || {}
+        extra: data.extra ?? {}
       }
       const mapWallet = this.wallet
       obj.wallets = obj.wallets.map(mapWallet).sort((a, b) => {

lnbits/static/js/components.js

@@ -3,38 +3,44 @@ window.app.component(QrcodeVue)
 window.app.component('lnbits-extension-rating', {
   template: '#lnbits-extension-rating',
   name: 'lnbits-extension-rating',
+  props: ['rating']
+})
+
+window.app.component('lnbits-fsat', {
+  template: '<span>{{ fsat }}</span>',
   props: {
-    rating: {
+    amount: {
       type: Number,
       default: 0
-    },
-    count: {
-      type: Number,
-      default: null
-    },
-    clickable: {
-      type: Boolean,
-      default: false
     }
   },
   computed: {
-    displayRating() {
-      return Math.round((this.rating || 0) * 2) / 2
-    },
-    hasData() {
-      return this.count !== null && this.count !== undefined
-    }
-  },
-  methods: {
-    handleClick() {
-      if (!this.clickable) return
-      this.$emit('click')
+    fsat() {
+      return LNbits.utils.formatSat(this.amount)
     }
   }
 })
 
 window.app.component('lnbits-manage', {
+  mixins: [window.windowMixin],
   template: '#lnbits-manage',
+  computed: {
+    showAdmin() {
+      return this.LNBITS_ADMIN_UI
+    },
+    showUsers() {
+      return this.LNBITS_ADMIN_UI
+    },
+    showNode() {
+      return this.LNBITS_NODE_UI
+    },
+    showAudit() {
+      return this.LNBITS_AUDIT_ENABLED
+    },
+    showExtensions() {
+      return this.LNBITS_EXTENSIONS_DEACTIVATE_ALL === false
+    }
+  },
   methods: {
     isActive(path) {
       return window.location.pathname === path
@@ -48,8 +54,10 @@ window.app.component('lnbits-manage', {
 })
 
 window.app.component('lnbits-payment-details', {
+  mixins: [window.windowMixin],
   template: '#lnbits-payment-details',
   props: ['payment'],
+  mixins: [window.windowMixin],
   computed: {
     hasPreimage() {
       return (
@@ -93,6 +101,7 @@ window.app.component('lnbits-payment-details', {
 })
 
 window.app.component('lnbits-lnurlpay-success-action', {
+  mixins: [window.windowMixin],
   template: '#lnbits-lnurlpay-success-action',
   props: ['payment', 'success_action'],
   data() {
@@ -112,6 +121,7 @@ window.app.component('lnbits-lnurlpay-success-action', {
 
 window.app.component('lnbits-notifications-btn', {
   template: '#lnbits-notifications-btn',
+  mixins: [window.windowMixin],
   props: ['pubkey'],
   data() {
     return {
@@ -282,6 +292,7 @@ window.app.component('lnbits-notifications-btn', {
 
 window.app.component('lnbits-dynamic-fields', {
   template: '#lnbits-dynamic-fields',
+  mixins: [window.windowMixin],
   props: ['options', 'modelValue'],
   data() {
     return {
@@ -314,6 +325,7 @@ window.app.component('lnbits-dynamic-fields', {
 
 window.app.component('lnbits-dynamic-chips', {
   template: '#lnbits-dynamic-chips',
+  mixins: [window.windowMixin],
   props: ['modelValue'],
   data() {
     return {
@@ -344,6 +356,7 @@ window.app.component('lnbits-dynamic-chips', {
 
 window.app.component('lnbits-update-balance', {
   template: '#lnbits-update-balance',
+  mixins: [window.windowMixin],
   props: ['wallet_id', 'small_btn'],
   computed: {
     admin() {
@@ -382,6 +395,7 @@ window.app.component('lnbits-update-balance', {
 
 window.app.component('user-id-only', {
   template: '#user-id-only',
+  mixins: [window.windowMixin],
   props: {
     allowed_new_users: Boolean,
     authAction: String,
@@ -425,6 +439,7 @@ window.app.component('user-id-only', {
 
 window.app.component('username-password', {
   template: '#username-password',
+  mixins: [window.windowMixin],
   props: {
     allowed_new_users: Boolean,
     authMethods: Array,
@@ -432,10 +447,8 @@ window.app.component('username-password', {
     username: String,
     password_1: String,
     password_2: String,
-    invitationCode: String,
     resetKey: String
   },
-
   data() {
     return {
       oauth: [
@@ -448,10 +461,8 @@ window.app.component('username-password', {
       password: this.password_1,
       passwordRepeat: this.password_2,
       reset_key: this.resetKey,
-      confirmationMethod: 'code',
-      confirmationEmail: '',
-      confirmationCode: this.invitationCode || '',
-      showConfirmationCode: false
+      keycloakOrg: LNBITS_AUTH_KEYCLOAK_ORG || 'Keycloak',
+      keycloakIcon: LNBITS_AUTH_KEYCLOAK_ICON
     }
   },
   methods: {
@@ -464,7 +475,6 @@ window.app.component('username-password', {
       this.$emit('update:userName', this.username)
       this.$emit('update:password_1', this.password)
       this.$emit('update:password_2', this.passwordRepeat)
-      this.$emit('update:invitationCode', this.confirmationCode)
       this.$emit('register')
     },
     reset() {
@@ -556,25 +566,6 @@ window.app.component('username-password', {
   computed: {
     showOauth() {
       return this.oauth.some(m => this.authMethods.includes(m))
-    },
-    disableRegister() {
-      const usernameOK = !!this.username
-      const passwordOK = !!this.password && this.password.length >= 8
-      const passwordsMatch = this.password === this.passwordRepeat
-      const codeOk =
-        this.confirmationMethodsCount === 0 ||
-        this.confirmationMethod !== 'code' ||
-        this.confirmationCode.length > 0
-
-      return !usernameOK || !passwordOK || !passwordsMatch || !codeOk
-    },
-    confirmationMethodsCount() {
-      const methods = [
-        this.g.settings.userActivationByEmail,
-        this.g.settings.userActivationByPayment,
-        this.g.settings.userActivationByInvitationCode
-      ]
-      return methods.filter(Boolean).length
     }
   },
   created() {}
@@ -686,6 +677,7 @@ window.app.component('lnbits-stat', {
 
 window.app.component('lnbits-node-qrcode', {
   props: ['info'],
+  mixins: [window.windowMixin],
   template: `
     <q-card class="my-card">
       <q-card-section>
@@ -764,6 +756,7 @@ window.app.component('lnbits-node-info', {
       showDialog: false
     }
   },
+  mixins: [window.windowMixin],
   methods: {
     shortenNodeId(nodeId) {
       return nodeId

lnbits/static/js/components/admin/lnbits-admin-assets-config.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-assets-config', {
   props: ['form-data'],
   template: '#lnbits-admin-assets-config',
+  mixins: [window.windowMixin],
   data() {
     return {
       newAllowedAssetMimeType: '',
@@ -16,7 +17,6 @@ window.app.component('lnbits-admin-assets-config', {
           this.newAllowedAssetMimeType
         )
         this.newAllowedAssetMimeType = ''
-        this.formData.touch = null
       }
     },
     removeAllowedAssetMimeType(type) {
@@ -24,21 +24,18 @@ window.app.component('lnbits-admin-assets-config', {
       if (index !== -1) {
         this.formData.lnbits_assets_allowed_mime_types.splice(index, 1)
       }
-      this.formData.touch = null
     },
     addNewNoLimitUser() {
       if (this.newNoLimitUser) {
         this.removeNoLimitUser(this.newNoLimitUser)
         this.formData.lnbits_assets_no_limit_users.push(this.newNoLimitUser)
         this.newNoLimitUser = ''
-        this.formData.touch = null
       }
     },
     removeNoLimitUser(user) {
       if (user) {
         this.formData.lnbits_assets_no_limit_users =
           this.formData.lnbits_assets_no_limit_users.filter(u => u !== user)
-        this.formData.touch = null
       }
     }
   }

lnbits/static/js/components/admin/lnbits-admin-audit.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-audit', {
   props: ['form-data'],
   template: '#lnbits-admin-audit',
+  mixins: [window.windowMixin],
   data() {
     return {
       formAddIncludePath: '',

lnbits/static/js/components/admin/lnbits-admin-exchange-providers.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-exchange-providers', {
   props: ['form-data'],
   template: '#lnbits-admin-exchange-providers',
+  mixins: [window.windowMixin],
   data() {
     return {
       exchangeData: {

lnbits/static/js/components/admin/lnbits-admin-extensions.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-extensions', {
   props: ['form-data'],
   template: '#lnbits-admin-extensions',
+  mixins: [window.windowMixin],
   data() {
     return {
       formAddExtensionsManifest: ''

lnbits/static/js/components/admin/lnbits-admin-fiat-providers.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-fiat-providers', {
   props: ['form-data'],
   template: '#lnbits-admin-fiat-providers',
+  mixins: [window.windowMixin],
   data() {
     return {
       formAddStripeUser: '',

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

@@ -1,5 +1,6 @@
 window.app.component('lnbits-admin-funding-sources', {
   template: '#lnbits-admin-funding-sources',
+  mixins: [window.windowMixin],
   props: ['form-data', 'allowed-funding-sources'],
   methods: {
     getFundingSourceLabel(item) {
@@ -228,48 +229,6 @@ window.app.component('lnbits-admin-funding-sources', {
             spark_token: 'Token'
           }
         ],
-        [
-          'SparkL2Wallet',
-          'Spark (L2)',
-          {
-            spark_l2_external_endpoint: {
-              label: 'External Sidecar Endpoint',
-              hint: 'Make sure to also specify the API key if your sidecar requires authentication.',
-              value: ''
-            },
-            spark_l2_mnemonic: {
-              label: 'External Sidecar Mnemonic',
-              hint: 'Mnemonic for the Spark wallet on the external sidecar. Required if the side car does not have its own mnemonic.',
-              value: ''
-            },
-            spark_l2_external_api_key: {
-              label: 'External Sidecar API Key',
-              hint: 'API key for authenticating with the external sidecar if it requires authentication.',
-              value: ''
-            },
-            spark_l2_network: {
-              label: 'Network',
-              value: 'MAINNET',
-              hint: 'The network to use for the Spark wallet.',
-              advanced: true
-            },
-            spark_l2_pay_wait_ms: {
-              label: 'Payment Wait Time (ms)',
-              hint: 'The time to wait for a payment to be processed before considering it failed.',
-              advanced: true
-            },
-            spark_l2_pay_poll_ms: {
-              label: 'Payment Poll Time (ms)',
-              hint: 'The time to wait between polling for payment status updates.',
-              advanced: true
-            },
-            spark_l2_stream_keepalive_ms: {
-              label: 'Stream Keepalive Time (ms)',
-              hint: 'The time to wait between sending keepalive messages to the Spark sidecar to keep the connection open.',
-              advanced: true
-            }
-          }
-        ],
         [
           'NWCWallet',
           'Nostr Wallet Connect',

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

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-funding', {
   props: ['is-super-user', 'form-data', 'settings'],
   template: '#lnbits-admin-funding',
+  mixins: [window.windowMixin],
   data() {
     return {
       auditData: []

lnbits/static/js/components/admin/lnbits-admin-notifications.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-notifications', {
   props: ['form-data'],
   template: '#lnbits-admin-notifications',
+  mixins: [window.windowMixin],
   data() {
     return {
       nostrNotificationIdentifier: '',

lnbits/static/js/components/admin/lnbits-admin-security.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-security', {
   props: ['form-data'],
   template: '#lnbits-admin-security',
+  mixins: [window.windowMixin],
   data() {
     return {
       logs: [],

lnbits/static/js/components/admin/lnbits-admin-server.js

@@ -1,4 +1,5 @@
 window.app.component('lnbits-admin-server', {
   props: ['form-data'],
-  template: '#lnbits-admin-server'
+  template: '#lnbits-admin-server',
+  mixins: [window.windowMixin]
 })

lnbits/static/js/components/admin/lnbits-admin-site-customisation.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-admin-site-customisation', {
   props: ['form-data'],
   template: '#lnbits-admin-site-customisation',
+  mixins: [window.windowMixin],
   data() {
     return {
       lnbits_theme_options: [

lnbits/static/js/components/admin/lnbits-admin-users.js

@@ -1,12 +1,11 @@
 window.app.component('lnbits-admin-users', {
   props: ['form-data'],
   template: '#lnbits-admin-users',
+  mixins: [window.windowMixin],
   data() {
     return {
       formAddUser: '',
-      formAddAdmin: '',
-      formAddActivationCode: '',
-      showReusableActivationCode: false
+      formAddAdmin: ''
     }
   },
   methods: {
@@ -33,24 +32,6 @@ window.app.component('lnbits-admin-users', {
     removeAdminUser(user) {
       let admin_users = this.formData.lnbits_admin_users
       this.formData.lnbits_admin_users = admin_users.filter(u => u !== user)
-    },
-    addOneTimeActivationCode() {
-      const code = this.formAddActivationCode
-      const activationCodes =
-        this.formData.lnbits_register_one_time_activation_codes
-      if (code?.length && !activationCodes.includes(code)) {
-        this.formData.lnbits_register_one_time_activation_codes = [
-          ...activationCodes,
-          code
-        ]
-        this.formAddActivationCode = ''
-      }
-    },
-    removeOneTimeActivationCode(code) {
-      const codes = this.formData.lnbits_register_one_time_activation_codes
-      this.formData.lnbits_register_one_time_activation_codes = codes.filter(
-        u => u !== code
-      )
     }
   }
 })

lnbits/static/js/components/lnbits-disclaimer.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-disclaimer', {
   template: '#lnbits-disclaimer',
+  mixins: [window.windowMixin],
   computed: {
     showDisclaimer() {
       return !g.disclaimerShown && g.isUserAuthorized

lnbits/static/js/components/lnbits-drawer.js

@@ -1,3 +1,4 @@
 window.app.component('lnbits-drawer', {
-  template: '#lnbits-drawer'
+  template: '#lnbits-drawer',
+  mixins: [window.windowMixin]
 })

lnbits/static/js/components/lnbits-footer.js

@@ -1,11 +1,15 @@
 window.app.component('lnbits-footer', {
   template: '#lnbits-footer',
+  mixins: [window.windowMixin],
   computed: {
-    title() {
-      return `${this.g.settings.siteTitle}, ${this.g.settings.siteTagline}`
-    },
     version() {
-      return this.$t('lnbits_version') + ': ' + this.g.settings.version
+      return this.LNBITS_VERSION || 'unknown version'
+    },
+    title() {
+      return `${this.SITE_TITLE}, ${this.SITE_TAGLINE}`
+    },
+    showFooter() {
+      return this.LNBITS_SHOW_HOME_PAGE_ELEMENTS == true
     }
   }
 })

lnbits/static/js/components/lnbits-header-wallets.js

@@ -1,3 +1,4 @@
 window.app.component('lnbits-header-wallets', {
-  template: '#lnbits-header-wallets'
+  template: '#lnbits-header-wallets',
+  mixins: [window.windowMixin]
 })

lnbits/static/js/components/lnbits-header.js

@@ -1,9 +1,49 @@
 window.app.component('lnbits-header', {
   template: '#lnbits-header',
+  mixins: [window.windowMixin],
   computed: {
+    hasServiceFeeMax() {
+      return (
+        this.g.user &&
+        this.LNBITS_SERVICE_FEE_MAX &&
+        this.LNBITS_SERVICE_FEE_MAX > 0
+      )
+    },
+    serviceFeeMax() {
+      return this.LNBITS_SERVICE_FEE_MAX || 0
+    },
+    hasServiceFee() {
+      return (
+        this.g.user && this.LNBITS_SERVICE_FEE && this.LNBITS_SERVICE_FEE > 0
+      )
+    },
+    serviceFee() {
+      return this.LNBITS_SERVICE_FEE || 0
+    },
+    hasCustomBadge() {
+      return this.LNBITS_CUSTOM_BADGE && this.LNBITS_CUSTOM_BADGE != ''
+    },
+    customBadge() {
+      return this.LNBITS_CUSTOM_BADGE || ''
+    },
+    customBadgeColor() {
+      return this.LNBITS_CUSTOM_BADGE_COLOR || ''
+    },
+    title() {
+      return this.SITE_TITLE
+    },
+    titleIsLnbits() {
+      return this.SITE_TITLE == 'LNbits'
+    },
+    customLogoUrl() {
+      return this.USE_CUSTOM_LOGO || null
+    },
     showAdmin() {
       return this.g.user && (this.g.user.super_user || this.g.user.admin)
     },
+    showVoidwallet() {
+      return this.g.user && this.VOIDWALLET == true
+    },
     displayName() {
       return (
         this.g.user?.extra?.display_name ||
@@ -21,28 +61,5 @@ window.app.component('lnbits-header', {
         return 'User'
       }
     }
-  },
-  methods: {
-    async stopImpersonation() {
-      try {
-        await LNbits.api.stopImpersonation()
-        LNbits.utils.restoreLocalStorage('impersonation')
-        window.location = '/users'
-      } catch (e) {
-        console.warn(e)
-      }
-    },
-    async handleLanguageChanged(lang) {
-      try {
-        await LNbits.api.updateUiCustomization({locale: lang.locale})
-        this.$q.notify({
-          type: 'positive',
-          message: 'Language Updated',
-          caption: lang.locale
-        })
-      } catch (e) {
-        LNbits.utils.notifyApiError(e)
-      }
-    }
   }
 })

lnbits/static/js/components/lnbits-home-logos.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-home-logos', {
   template: '#lnbits-home-logos',
+  mixins: [window.windowMixin],
   data() {
     return {
       logos: [
@@ -95,8 +96,8 @@ window.app.component('lnbits-home-logos', {
     showLogos() {
       return (
         this.g.isSatsDenomination &&
-        this.g.settings.siteTitle == 'LNbits' &&
-        this.g.settings.showHomePageElements == true
+        this.SITE_TITLE == 'LNbits' &&
+        this.LNBITS_SHOW_HOME_PAGE_ELEMENTS == true
       )
     }
   }

lnbits/static/js/components/lnbits-label-selector.js

@@ -1,6 +1,7 @@
 window.app.component('lnbits-label-selector', {
   template: '#lnbits-label-selector',
   props: ['labels'],
+  mixins: [window.windowMixin],
   data() {
     return {
       labelFilter: '',

lnbits/static/js/components/lnbits-language-dropdown.js

@@ -1,16 +1,6 @@
 window.app.component('lnbits-language-dropdown', {
   template: '#lnbits-language-dropdown',
-  computed: {
-    currentLanguage() {
-      return (
-        this.langs.find(lang => lang.value === window.i18n.global.locale) || {
-          value: 'en',
-          label: 'English',
-          display: '🇬🇧 EN'
-        }
-      )
-    }
-  },
+  mixins: [window.windowMixin],
   methods: {
     activeLanguage(lang) {
       return window.i18n.global.locale === lang
@@ -19,7 +9,6 @@ window.app.component('lnbits-language-dropdown', {
       this.g.locale = newValue
       window.i18n.global.locale = newValue
       this.$q.localStorage.set('lnbits.lang', newValue)
-      this.$emit('language-changed', newValue)
     }
   },
   data() {

lnbits/static/js/components/lnbits-manage-extension-list.js

@@ -1,4 +1,5 @@
 window.app.component('lnbits-manage-extension-list', {
+  mixins: [window.windowMixin],
   template: '#lnbits-manage-extension-list',
   data() {
     return {

lnbits/static/js/components/lnbits-manage-wallet-list.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-manage-wallet-list', {
   template: '#lnbits-manage-wallet-list',
+  mixins: [window.windowMixin],
   data() {
     return {
       activeWalletId: null
@@ -17,13 +18,6 @@ window.app.component('lnbits-manage-wallet-list', {
       } else {
         this.activeWalletId = null
       }
-    },
-    'g.user.wallets': {
-      handler() {
-        this.paymentEvents()
-      },
-      deep: true,
-      immediate: true
     }
   },
   created() {

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

@@ -1,6 +1,7 @@
 window.app.component('lnbits-payment-list', {
   template: '#lnbits-payment-list',
   props: ['wallet', 'paymentFilter'],
+  mixins: [window.windowMixin],
   data() {
     return {
       payments: [],

lnbits/static/js/components/lnbits-qrcode-lnurl.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-qrcode-lnurl', {
   template: '#lnbits-qrcode-lnurl',
+  mixins: [window.windowMixin],
   props: {
     url: {
       required: true,

lnbits/static/js/components/lnbits-qrcode.js

@@ -1,4 +1,5 @@
 window.app.component('lnbits-qrcode', {
+  mixins: [window.windowMixin],
   template: '#lnbits-qrcode',
   components: {
     QrcodeVue: QrcodeVue.default
@@ -34,7 +35,7 @@ window.app.component('lnbits-qrcode', {
     },
     logo: {
       type: String,
-      default: window.g.settings.qrLogo || null
+      default: LNBITS_QR_LOGO
     }
   },
   data() {

lnbits/static/js/components/lnbits-theme.js

@@ -1,4 +1,5 @@
 window.app.component('lnbits-theme', {
+  mixins: [window.windowMixin],
   watch: {
     'g.walletFlip'(val) {
       this.$q.localStorage.setItem('lnbits.walletFlip', val)
@@ -9,10 +10,6 @@ window.app.component('lnbits-theme', {
     'g.disclaimerShown'(val) {
       this.$q.localStorage.setItem('lnbits.disclaimerShown', val)
     },
-    'g.locale'(val) {
-      this.$q.localStorage.setItem('lnbits.lang', val)
-      window.i18n.global.locale = val
-    },
     'g.isFiatPriority'(val) {
       this.$q.localStorage.setItem('lnbits.isFiatPriority', val)
     },
@@ -45,30 +42,6 @@ window.app.component('lnbits-theme', {
         document.body.classList.remove('gradient-bg')
       }
     },
-    'g.cardRoundedChoice'(val) {
-      this.$q.localStorage.set('lnbits.cardRounded', val)
-      if (val === true) {
-        document.body.classList.add('rounded-ui')
-      } else {
-        document.body.classList.remove('rounded-ui')
-      }
-    },
-    'g.cardGradientChoice'(val) {
-      this.$q.localStorage.set('lnbits.cardGradient', val)
-      if (val === true) {
-        document.body.classList.add('card-gradient')
-      } else {
-        document.body.classList.remove('card-gradient')
-      }
-    },
-    'g.cardShadowChoice'(val) {
-      this.$q.localStorage.set('lnbits.cardShadow', val)
-      if (val === true) {
-        document.body.classList.add('card-shadow')
-      } else {
-        document.body.classList.remove('card-shadow')
-      }
-    },
     'g.mobileSimple'(val) {
       this.$q.localStorage.set('lnbits.mobileSimple', val)
       if (val === true) {
@@ -141,15 +114,6 @@ window.app.component('lnbits-theme', {
     if (this.g.gradientChoice === true) {
       document.body.classList.add('gradient-bg')
     }
-    if (this.g.cardRoundedChoice === true) {
-      document.body.classList.add('rounded-ui')
-    }
-    if (this.g.cardGradientChoice === true) {
-      document.body.classList.add('card-gradient')
-    }
-    if (this.g.cardShadowChoice === true) {
-      document.body.classList.add('card-shadow')
-    }
     if (this.g.bgimageChoice !== '') {
       document.body.classList.add('bg-image')
       document.body.style.setProperty(
@@ -160,13 +124,6 @@ window.app.component('lnbits-theme', {
     if (this.g.mobileSimple === true) {
       document.body.classList.add('mobile-simple')
     }
-    Object.entries(this.g.user?.uiCustomization || {}).forEach(
-      ([key, value]) => {
-        if (key in this.g) {
-          this.g[key] = value
-        }
-      }
-    )
     this.checkUrlParams()
   }
 })

lnbits/static/js/components/lnbits-wallet-api-docs.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-api-docs', {
   template: '#lnbits-wallet-api-docs',
+  mixins: [window.windowMixin],
   methods: {
     resetKeys() {
       LNbits.utils

lnbits/static/js/components/lnbits-wallet-charts.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-charts', {
   template: '#lnbits-wallet-charts',
+  mixins: [window.windowMixin],
   props: ['paymentFilter', 'chartConfig'],
   data() {
     return {

lnbits/static/js/components/lnbits-wallet-extra.js

@@ -1,10 +1,9 @@
 window.app.component('lnbits-wallet-extra', {
   template: '#lnbits-wallet-extra',
+  mixins: [window.windowMixin],
   props: ['chartConfig'],
-  computed: {
-    exportUrl() {
-      return `${window.location.origin}/wallet?usr=${this.g.user.id}&wal=${this.g.wallet.id}`
-    }
+  data() {
+    return {}
   },
   methods: {
     handleSendLnurl(lnurl) {
@@ -71,10 +70,6 @@ window.app.component('lnbits-wallet-extra', {
             'lnbits.exchangeRate.' + this.g.wallet.currency,
             this.g.exchangeRate
           )
-          if (this.g.exchangeRate <= 0) {
-            this.g.fiatTracking = false
-            this.g.isFiatPriority = false
-          }
         })
         .catch(e => console.error(e))
     }

lnbits/static/js/components/lnbits-wallet-icon.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-icon', {
   template: '#lnbits-wallet-icon',
+  mixins: [window.windowMixin],
   data() {
     return {
       icon: {

lnbits/static/js/components/lnbits-wallet-new.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-new', {
   template: '#lnbits-wallet-new',
+  mixins: [window.windowMixin],
   data() {
     return {
       walletTypes: [{label: 'Lightning Wallet', value: 'lightning'}],
@@ -97,7 +98,6 @@ window.app.component('lnbits-wallet-new', {
           this.g.lastWalletId = res.data.id
           this.$router.push(`/wallet/${res.data.id}`)
         })
-        .catch(LNbits.utils.notifyApiError)
     }
   },
   created() {

lnbits/static/js/components/lnbits-wallet-paylinks.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-paylinks', {
   template: '#lnbits-wallet-paylinks',
+  mixins: [window.windowMixin],
   data() {
     return {
       storedPaylinks: []

lnbits/static/js/components/lnbits-wallet-share.js

@@ -1,5 +1,6 @@
 window.app.component('lnbits-wallet-share', {
   template: '#lnbits-wallet-share',
+  mixins: [window.windowMixin],
   computed: {
     walletApprovedShares() {
       return this.g.wallet.extra.shared_with.filter(

lnbits/static/js/globals.js

@@ -9,50 +9,16 @@ const localStore = (key, defaultValue) => {
 }
 
 window.g = Vue.reactive({
-  // vars from server
-  settings: SETTINGS,
-  currencies: CURRENCIES,
-  extensions: SETTINGS.extensions,
-  allowedCurrencies: SETTINGS.allowedCurrencies,
-  denomination: SETTINGS.denomination,
-  isSatsDenomination: SETTINGS.denomination == 'sats',
-  // local storage vars
-  themeChoice: localStore('lnbits.theme', SETTINGS.defaultTheme),
-  borderChoice: localStore('lnbits.border', SETTINGS.defaultBorder),
-  gradientChoice: localStore('lnbits.gradientBg', SETTINGS.defaultGradient),
-  cardRoundedChoice: localStore(
-    'lnbits.cardRounded',
-    SETTINGS.defaultCardRounded
-  ),
-  cardGradientChoice: localStore(
-    'lnbits.cardGradient',
-    SETTINGS.defaultCardGradient
-  ),
-  cardShadowChoice: localStore('lnbits.cardShadow', SETTINGS.defaultCardShadow),
-  reactionChoice: localStore('lnbits.reactions', SETTINGS.defaultReaction),
-  bgimageChoice: localStore(
-    'lnbits.backgroundImage',
-    SETTINGS.defaultBgimage || ''
-  ),
-  locale: localStore('lnbits.lang', navigator.languages[1] ?? 'en'),
-  disclaimerShown: localStore('lnbits.disclaimerShown', false),
-  isFiatPriority: localStore('lnbits.isFiatPriority', false),
-  mobileSimple: localStore('lnbits.mobileSimple', true),
-  walletFlip: localStore('lnbits.walletFlip', false),
-  lastActiveWallet: localStore('lnbits.lastActiveWallet', null),
-  darkChoice: localStore('lnbits.darkMode', SETTINGS.defaultDark),
-  // cookie vars
-  isUserAuthorized: !!Quasar.Cookies.get('is_lnbits_user_authorized'),
-  isUserImpersonated: !!Quasar.Cookies.get('is_lnbits_user_impersonated'),
-  // frontend vars
   errorCode: null,
   errorMessage: null,
   user: null,
   wallet: null,
   isPublicPage: true,
+  isUserAuthorized: !!Quasar.Cookies.get('is_lnbits_user_authorized'),
   offline: !navigator.onLine,
   hasCamera: false,
   visibleDrawer: false,
+  extensions: WINDOW_SETTINGS.EXTENSIONS,
   fiatBalance: 0,
   exchangeRate: 0,
   fiatTracking: false,
@@ -60,6 +26,35 @@ window.g = Vue.reactive({
   walletEventListeners: [],
   updatePayments: false, // used for updating the lnbits-payment-list
   updatePaymentsHash: false, // used for closing the receive dialog
+  currencies: WINDOW_SETTINGS.LNBITS_CURRENCIES ?? [],
+  allowedCurrencies: WINDOW_SETTINGS.LNBITS_ALLOWED_CURRENCIES ?? [],
+  locale: localStore('lnbits.lang', navigator.languages[1] ?? 'en'),
+  disclaimerShown: localStore('lnbits.disclaimerShown', false),
+  isFiatPriority: localStore('lnbits.isFiatPriority', false),
+  mobileSimple: localStore('lnbits.mobileSimple', true),
+  walletFlip: localStore('lnbits.walletFlip', false),
+  lastActiveWallet: localStore('lnbits.lastActiveWallet', null),
+  darkChoice: localStore('lnbits.darkMode', true),
+  themeChoice: localStore('lnbits.theme', WINDOW_SETTINGS.LNBITS_DEFAULT_THEME),
+  borderChoice: localStore(
+    'lnbits.border',
+    WINDOW_SETTINGS.LNBITS_DEFAULT_BORDER || 'hard-border'
+  ),
+  gradientChoice: localStore(
+    'lnbits.gradientBg',
+    WINDOW_SETTINGS.LNBITS_DEFAULT_GRADIENT || false
+  ),
+  reactionChoice: localStore(
+    'lnbits.reactions',
+    WINDOW_SETTINGS.LNBITS_DEFAULT_REACTION || 'confettiBothSides'
+  ),
+  bgimageChoice: localStore(
+    'lnbits.backgroundImage',
+    WINDOW_SETTINGS.LNBITS_DEFAULT_BGIMAGE || ''
+  ),
+  ads: WINDOW_SETTINGS.AD_SPACE.split(',').map(ad => ad.split(';')),
+  denomination: WINDOW_SETTINGS.LNBITS_DENOMINATION,
+  isSatsDenomination: WINDOW_SETTINGS.LNBITS_DENOMINATION == 'sats',
   scanner: null,
   newWalletType: null
 })

lnbits/static/js/init-app.js

@@ -106,11 +106,6 @@ const routes = [
     name: 'ExtensionsBuilder',
     component: PageExtensionBuilder
   },
-  {
-    path: '/extensions/builder/preview',
-    name: 'ExtensionsBuilderPreview',
-    component: PageExtensionBuilderPreview
-  },
   {
     path: '/extensions',
     name: 'Extensions',
@@ -157,7 +152,8 @@ window.app.mixin({
     return {
       api: window._lnbitsApi,
       utils: window._lnbitsUtils,
-      g: window.g
+      g: window.g,
+      ...WINDOW_SETTINGS
     }
   },
   // backwards compatibility for extensions, should not be used in the future
@@ -172,4 +168,8 @@ window.app.use(Quasar, quasarConfig)
 
 window.app.use(window.i18n)
 window.app.use(window.router)
+
+window.app.component(QrcodeVue)
+window.app.component('lnbits-error', window.LnbitsError)
+
 window.app.mount('#vue')

lnbits/static/js/pages/account.js

@@ -1,5 +1,6 @@
 window.PageAccount = {
   template: '#page-account',
+  mixins: [window.windowMixin],
   data() {
     return {
       untouchedUser: null,
@@ -39,9 +40,6 @@ window.PageAccount = {
           color: 'pink-3'
         }
       ],
-      defaultSiteCustomisation: {
-        locale: 'en'
-      },
       reactionOptions: [
         'None',
         'confettiBothSides',
@@ -216,18 +214,26 @@ window.PageAccount = {
     }
   },
   methods: {
+    activeLanguage(lang) {
+      return window.i18n.global.locale === lang
+    },
     changeLanguage(newValue) {
       window.i18n.global.locale = newValue
       this.$q.localStorage.set('lnbits.lang', newValue)
     },
     async updateAccount() {
       try {
-        const {data} = await LNbits.api.request('PATCH', '/api/v1/auth', null, {
-          user_id: this.g.user.id,
-          username: this.g.user.username,
-          email: this.g.user.email,
-          extra: this.g.user.extra
-        })
+        const {data} = await LNbits.api.request(
+          'PUT',
+          '/api/v1/auth/update',
+          null,
+          {
+            user_id: this.g.user.id,
+            username: this.g.user.username,
+            email: this.g.user.email,
+            extra: this.g.user.extra
+          }
+        )
         this.untouchedUser = JSON.parse(JSON.stringify(this.g.user))
         this.hasUsername = !!data.username
         Quasar.Notify.create({
@@ -604,7 +610,7 @@ window.PageAccount = {
       }
     },
     copyAssetLinkToClipboard(asset) {
-      const assetUrl = `${window.location.origin}/api/v1/assets/${asset.id}/data`
+      const assetUrl = `${window.location.origin}/api/v1/assets/${asset.id}/binary`
       this.utils.copyText(assetUrl)
     },
     addUserLabel() {
@@ -675,37 +681,6 @@ window.PageAccount = {
             l => l.name !== label.name
           )
         })
-    },
-
-    async siteCustomisationChanged(options = {}) {
-      try {
-        Object.entries(options || {}).forEach(([key, value]) => {
-          if (key in this.g) {
-            this.g[key] = value
-          }
-        })
-        await LNbits.api.updateUiCustomization(options)
-        this.$q.notify({
-          type: 'positive',
-          message: 'UI Customization updated.'
-        })
-      } catch (e) {
-        LNbits.utils.notifyApiError(e)
-      }
-    },
-    resetThemeDefaults() {
-      const defaults = {
-        themeChoice: this.g.settings.defaultTheme,
-        borderChoice: this.g.settings.defaultBorder,
-        gradientChoice: this.g.settings.defaultGradient,
-        bgimageChoice: this.g.settings.defaultBgimage || '',
-        reactionChoice: this.g.settings.defaultReaction,
-        darkChoice: this.g.settings.defaultDark,
-        cardRoundedChoice: this.g.settings.defaultCardRounded,
-        cardGradientChoice: this.g.settings.defaultCardGradient,
-        cardShadowChoice: this.g.settings.defaultCardShadow
-      }
-      this.siteCustomisationChanged(defaults)
     }
   },
 
@@ -719,7 +694,7 @@ window.PageAccount = {
     await this.getUserAssets()
     // filter out themes that are not allowed
     this.themeOptions = this.themeOptions.filter(theme =>
-      this.g.settings.themeOptions.includes(theme.name)
+      this.LNBITS_THEME_OPTIONS.includes(theme.name)
     )
   }
 }

lnbits/static/js/pages/admin.js

@@ -1,5 +1,6 @@
 window.PageAdmin = {
   template: '#page-admin',
+  mixins: [windowMixin],
   data() {
     return {
       tab: 'funding',

lnbits/static/js/pages/audit.js

@@ -1,5 +1,6 @@
 window.PageAudit = {
   template: '#page-audit',
+  mixins: [window.windowMixin],
   data() {
     return {
       chartsReady: false,