[TEST] workflows, added 10s timeout to lncli subprocess and logging (#1910)

* [FIX] workflows

testing why workflwos unstable instable

* debug run_command

* add timeout to process run

* log lncli output

* try catch json exception in clnrest

* settle does not return a json

* add 10 minutes timeout to regtests if they ever get stuck

* better subprocess handling

* fix race condition

* test 3

* remove

* run nr 4

* increase waits for race conditions

* revert clnrest

* better fiat amount test

.dockerignore

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

.env.example

@@ -8,6 +8,12 @@ PORT=5000
 
 DEBUG=false
 
+# Server security, rate limiting ips, blocked ips, allowed ips
+LNBITS_RATE_LIMIT_NO="200"
+LNBITS_RATE_LIMIT_UNIT="minute"
+LNBITS_ALLOWED_IPS=""
+LNBITS_BLOCKED_IPS=""
+
 # Allow users and admins by user IDs (comma separated list)
 LNBITS_ALLOWED_USERS=""
 LNBITS_ADMIN_USERS=""
@@ -30,8 +36,6 @@ LNBITS_DEFAULT_WALLET_NAME="LNbits wallet"
 # Hides wallet api, extensions can choose to honor
 LNBITS_HIDE_API=false
 
-# Disable extensions for all users, use "all" to disable all extensions
-LNBITS_DISABLED_EXTENSIONS="amilk"
 # LNBITS_EXTENSIONS_MANIFESTS="https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions.json,https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions-trial.json"
 # GitHub has rate-limits for its APIs. The limit can be increased specifying a GITHUB_TOKEN
 # LNBITS_EXT_GITHUB_TOKEN=github_pat_xxxxxxxxxxxxxxxxxx
@@ -54,6 +58,9 @@ LNBITS_RESERVE_FEE_MIN=2000
 # value in percent
 LNBITS_RESERVE_FEE_PERCENT=1.0
 
+# Limit fiat currencies allowed to see in UI
+# LNBITS_ALLOWED_CURRENCIES="EUR, USD"
+
 # Change theme
 LNBITS_SITE_TITLE="LNbits"
 LNBITS_SITE_TAGLINE="free and open-source lightning wallet"
@@ -62,15 +69,15 @@ LNBITS_SITE_DESCRIPTION="Some description about your service, will display if ti
 LNBITS_THEME_OPTIONS="classic, bitcoin, flamingo, freedom, mint, autumn, monochrome, salvador, cyber"
 # LNBITS_CUSTOM_LOGO="https://lnbits.com/assets/images/logo/logo.svg"
 
-# Choose from LNPayWallet, OpenNodeWallet, LntxbotWallet, ClicheWallet,
-#              LndWallet, LndRestWallet, CoreLightningWallet, EclairWallet,
-#              LnTipsWallet, LNbitsWallet, SparkWallet, FakeWallet,
+# which fundingsources are allowed in the admin ui
+LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, OpenNodeWallet"
+
 LNBITS_BACKEND_WALLET_CLASS=VoidWallet
 # VoidWallet is just a fallback that works without any actual Lightning capabilities,
 # just so you can see the UI before dealing with this file.
 
 # Invoice expiry for LND, CLN, Eclair, LNbits funding sources
-LIGHTNING_INVOICE_EXPIRY=600
+LIGHTNING_INVOICE_EXPIRY=3600
 
 # Set one of these blocks depending on the wallet kind you chose above:
 
@@ -110,10 +117,6 @@ LNPAY_API_KEY=LNPAY_API_KEY
 # Wallet Admin in Wallet Access Keys
 LNPAY_WALLET_KEY=LNPAY_ADMIN_KEY
 
-# LntxbotWallet
-LNTXBOT_API_ENDPOINT=https://lntxbot.com/
-LNTXBOT_KEY=LNTXBOT_ADMIN_KEY
-
 # OpenNodeWallet
 OPENNODE_API_ENDPOINT=https://api.opennode.com/
 OPENNODE_KEY=OPENNODE_ADMIN_KEY

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,10 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[BUG]"
+title: '[BUG]'
 labels: bug
 assignees: ''
-
 ---
 
 **Describe the bug**
@@ -12,6 +11,7 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -24,8 +24,9 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - LNbits version: [e.g. 0.9.2 or commit hash]
- - Database [e.g. sqlite, postgres]
+
+- LNbits version: [e.g. 0.9.2 or commit hash]
+- Database [e.g. sqlite, postgres]
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,10 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: "[Feature request]"
+title: '[Feature request]'
 labels: feature request
 assignees: ''
-
 ---
 
 **Is your feature request related to a problem? Please describe.**

.github/ISSUE_TEMPLATE/something-else.md

@@ -4,7 +4,4 @@ about: Anything else that you need to say
 title: ''
 labels: ''
 assignees: ''
-
 ---
-
-

.github/actions/prepare/action.yml

@@ -0,0 +1,67 @@
+name: prepare
+
+inputs:
+  python-version:
+    description: "Python Version"
+    required: true
+    default: "3.9"
+  poetry-version:
+    description: "Poetry Version"
+    default: "1.5.1"
+  node-version:
+    description: "Node Version"
+    default: "18.x"
+  npm:
+    description: "use npm"
+    default: false
+    type: boolean
+
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up Python ${{ inputs.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ inputs.python-version }}
+        # cache poetry install via pip
+        cache: "pip"
+
+    - name: Set up Poetry ${{ inputs.poetry-version }}
+      uses: abatilo/actions-poetry@v2
+      with:
+        poetry-version: ${{ inputs.poetry-version }}
+
+    - name: Setup a local virtual environment (if no poetry.toml file)
+      shell: bash
+      run: |
+        poetry config virtualenvs.create true --local
+        poetry config virtualenvs.in-project true --local
+
+    - uses: actions/cache@v3
+      name: Define a cache for the virtual environment based on the dependencies lock file
+      with:
+        path: ./.venv
+        key: venv-${{ hashFiles('poetry.lock') }}
+
+    - name: Install the project dependencies
+      shell: bash
+      run: poetry install
+
+    - name: Use Node.js ${{ inputs.node-version }}
+      if: ${{ (inputs.npm == 'true') }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ inputs.node-version }}
+
+    - uses: actions/cache@v3
+      if: ${{ (inputs.npm == 'true') }}
+      name: Define a cache for the npm based on the dependencies lock file
+      with:
+        path: ./node_modules
+        key: npm-${{ hashFiles('package-lock.json') }}
+
+    - name: Install npm packages
+      if: ${{ (inputs.npm == 'true') }}
+      shell: bash
+      run: npm install

.github/workflows/ci.yml

@@ -0,0 +1,47 @@
+name: LNbits CI
+on: [push, pull_request]
+
+jobs:
+
+  lint:
+    uses: ./.github/workflows/lint.yml
+
+  tests:
+    needs: [ lint ]
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10"]
+        db-url: ["", "postgres://lnbits:lnbits@0.0.0.0:5432/lnbits"]
+    uses: ./.github/workflows/tests.yml
+    with:
+      python-version: ${{ matrix.python-version }}
+
+  migrations:
+    needs: [ lint ]
+    strategy:
+      matrix:
+        python-version: ["3.9"]
+    uses: ./.github/workflows/tests.yml
+    with:
+      make: test-migration
+      db-name: migration
+
+  openapi:
+    needs: [ lint ]
+    uses: ./.github/workflows/make.yml
+    with:
+      make: openapi
+
+  # docker:
+  #   uses: ./.github/workflows/docker.yml
+
+  regtest:
+    needs: [ lint ]
+    uses: ./.github/workflows/regtest.yml
+    strategy:
+      matrix:
+        python-version: ["3.9"]
+        backend-wallet-class: ["LndRestWallet", "LndWallet", "CoreLightningWallet", "CoreLightningRestWallet", "LNbitsWallet", "EclairWallet"]
+    with:
+      python-version: ${{ matrix.python-version }}
+      backend-wallet-class: ${{ matrix.backend-wallet-class }}

.github/workflows/docker.yml

@@ -0,0 +1,20 @@
+name: docker
+
+on:
+  workflow_call:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+            context: .
+            push: false
+            tags: lnbitsdocker/lnbits-legend:latest
+            cache-from: type=registry,ref=lnbitsdocker/lnbits-legend:latest
+            cache-to: type=inline

.github/workflows/flake8.yml

@@ -1,27 +0,0 @@
-name: flake8
-
-on: [push, pull_request]
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Install dependencies
-        run: |
-          poetry install
-      - name: Run tests
-        run: make flake8

.github/workflows/formatting.yml

@@ -1,37 +0,0 @@
-name: formatting
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  checks:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Install packages
-        run: |
-          poetry install
-          npm install prettier
-      - name: Check black
-        run: make checkblack
-      - name: Check isort
-        run: make checkisort
-      - uses: actions/setup-node@v3
-      - name: Check prettier
-        run: make checkprettier

.github/workflows/lint.yml

@@ -0,0 +1,27 @@
+name: lint
+on:
+  workflow_call:
+
+jobs:
+  black:
+    uses: ./.github/workflows/make.yml
+    with:
+      make: checkblack
+  ruff:
+    uses: ./.github/workflows/make.yml
+    with:
+      make: checkruff
+  mypy:
+    uses: ./.github/workflows/make.yml
+    with:
+      make: mypy
+  pyright:
+    uses: ./.github/workflows/make.yml
+    with:
+      make: pyright
+      npm: true
+  prettier:
+    uses: ./.github/workflows/make.yml
+    with:
+      make: prettier
+      npm: true

.github/workflows/make.yml

@@ -0,0 +1,31 @@
+name: make
+
+on:
+  workflow_call:
+    inputs:
+      make:
+        description: "make command that is run"
+        required: true
+        type: string
+      npm:
+        description: "use npm install"
+        default: false
+        type: boolean
+
+jobs:
+  make:
+    name: ${{ inputs.make }} (${{ matrix.python-version }})
+    strategy:
+      matrix:
+        os-version: ["ubuntu-latest"]
+        python-version: ["3.9", "3.10"]
+        node-version: ["18.x"]
+    runs-on: ${{ matrix.os-version }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/prepare
+        with:
+          python-version: ${{ matrix.python-version }}
+          node-version: ${{ matrix.node-version }}
+          npm: ${{ inputs.npm }}
+      - run: make ${{ inputs.make }}

.github/workflows/migrations.yml

@@ -1,43 +0,0 @@
-name: migrations
-
-on: [pull_request]
-
-jobs:
-  sqlite-to-postgres:
-    runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:latest
-        env:
-          POSTGRES_USER: lnbits
-          POSTGRES_PASSWORD: lnbits
-          POSTGRES_DB: migration
-        ports:
-          # maps tcp port 5432 on service container to the host
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Install dependencies
-        run: |
-          poetry install
-          sudo apt install unzip
-      - name: Run migrations
-        run: |
-          make test-migration

.github/workflows/mypy.yml

@@ -1,27 +0,0 @@
-name: mypy
-
-on: [push, pull_request]
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Install dependencies
-        run: |
-          poetry install
-      - name: Run tests
-        run: make mypy

.github/workflows/pylint.yml

@@ -1,27 +0,0 @@
-name: pylint
-
-on: [push, pull_request]
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Install dependencies
-        run: |
-          poetry install
-      - name: Run tests
-        run: make pylint

.github/workflows/pyright.yml

@@ -1,28 +0,0 @@
-name: pyright
-
-on: [push, pull_request]
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Install dependencies
-        run: |
-          poetry install
-          npm install
-      - name: Run tests
-        run: make pyright

.github/workflows/regtest.yml

@@ -1,223 +1,81 @@
 name: regtest
 
-on: [push, pull_request]
+on:
+  workflow_call:
+    inputs:
+      make:
+        default: test
+        type: string
+      python-version:
+        default: "3.9"
+        type: string
+      os-version:
+        default: "ubuntu-latest"
+        type: string
+      backend-wallet-class:
+        required: true
+        type: string
 
 jobs:
-  LndRestWallet:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
+  regtest:
+    runs-on: ${{ inputs.os-version }}
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
+
+      - name: Set up Docker Buildx
+        if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build and push
+        if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
+        uses: docker/build-push-action@v4
         with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
+            context: .
+            push: false
+            tags: lnbitsdocker/lnbits-legend:latest
+            cache-from: type=registry,ref=lnbitsdocker/lnbits-legend:latest
+            cache-to: type=inline
+
       - name: Setup Regtest
         run: |
-          docker build -t lnbitsdocker/lnbits-legend .
           git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
           cd docker
           chmod +x ./tests
           ./tests
           sudo chmod -R a+rwx .
-      - name: Install dependencies
-        run: |
-          poetry install
-      - name: Run tests
+
+      - uses: ./.github/actions/prepare
+        with:
+          python-version: ${{ inputs.python-version }}
+
+      - name: Create fake admin
+        if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
+        run: docker exec lnbits-legend-lnbits-1 poetry run python tools/create_fake_admin.py
+
+      - name: Run Tests
         env:
-          PYTHONUNBUFFERED: 1
-          PORT: 5123
-          LNBITS_DATA_FOLDER: ./data
-          LNBITS_BACKEND_WALLET_CLASS: LndRestWallet
+          LNBITS_DATABASE_URL: ${{ inputs.db-url }}
+          LNBITS_BACKEND_WALLET_CLASS: ${{ inputs.backend-wallet-class }}
           LND_REST_ENDPOINT: https://localhost:8081/
-          LND_REST_CERT: ./docker/data/lnd-1/tls.cert
-          LND_REST_MACAROON: ./docker/data/lnd-1/data/chain/bitcoin/regtest/admin.macaroon
-        run: |
-          sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data
-          make test-real-wallet
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          file: ./coverage.xml
-  LndWallet:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Setup Regtest
-        run: |
-          docker build -t lnbitsdocker/lnbits-legend .
-          git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
-          cd docker
-          chmod +x ./tests
-          ./tests
-          sudo chmod -R a+rwx .
-      - name: Install dependencies
-        run: |
-          poetry install
-      - name: Run tests
-        env:
-          PYTHONUNBUFFERED: 1
-          PORT: 5123
-          LNBITS_DATA_FOLDER: ./data
-          LNBITS_BACKEND_WALLET_CLASS: LndWallet
+          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/data/lnd-1/tls.cert
-          LND_GRPC_MACAROON: docker/data/lnd-1/data/chain/bitcoin/regtest/admin.macaroon
-        run: |
-          sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data
-          make test-real-wallet
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          file: ./coverage.xml
-  CoreLightningWallet:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Setup Regtest
-        run: |
-          docker build -t lnbitsdocker/lnbits-legend .
-          git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
-          cd docker
-          chmod +x ./tests
-          ./tests
-          sudo chmod -R a+rwx .
-      - name: Install dependencies
-        run: |
-          poetry install
-      - name: Run tests
-        env:
-          PYTHONUNBUFFERED: 1
-          PORT: 5123
-          LNBITS_DATA_FOLDER: ./data
-          LNBITS_BACKEND_WALLET_CLASS: CoreLightningWallet
+          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
-        run: |
-          sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data
-          make test-real-wallet
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          file: ./coverage.xml
-  LNbitsWallet:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Setup Regtest
-        run: |
-          docker build -t lnbitsdocker/lnbits-legend .
-          git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
-          cd docker
-          chmod +x ./tests
-          ./tests
-          sudo chmod -R a+rwx .
-          docker exec lnbits-legend-lnbits-1 /bin/bash -c "poetry run python tools/create_fake_admin.py"
-      - name: Install dependencies
-        run: |
-          poetry install
-      - name: Run tests
-        env:
-          PYTHONUNBUFFERED: 1
-          PORT: 5123
-          LNBITS_DATA_FOLDER: ./data
-          LNBITS_BACKEND_WALLET_CLASS: LNbitsWallet
+          CORELIGHTNING_REST_URL: https://localhost:3001
+          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"
-        run: |
-          sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data
-          make test-real-wallet
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          file: ./coverage.xml
-  EclairWallet:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Setup Regtest
-        run: |
-          docker build -t lnbitsdocker/lnbits-legend .
-          git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
-          cd docker
-          chmod +x ./tests
-          ./tests
-          sudo chmod -R a+rwx .
-      - name: Install dependencies
-        run: |
-          poetry install
-      - name: Run tests
-        env:
-          PYTHONUNBUFFERED: 1
-          PORT: 5123
-          LNBITS_DATA_FOLDER: ./data
-          LNBITS_BACKEND_WALLET_CLASS: EclairWallet
           ECLAIR_URL: http://127.0.0.1:8082
           ECLAIR_PASS: lnbits
-        run: |
-          sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data
-          make test-real-wallet
+        run: make test-real-wallet
+
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml

.github/workflows/tests.yml

@@ -1,93 +1,58 @@
 name: tests
 
-on: [push, pull_request]
+on:
+  workflow_call:
+    inputs:
+      make:
+        default: test
+        type: string
+      python-version:
+        default: "3.9"
+        type: string
+      os-version:
+        default: "ubuntu-latest"
+        type: string
+      db-url:
+        default: ""
+        type: string
+      db-name:
+        default: "lnbits"
+        type: string
 
 jobs:
-  venv-sqlite:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        env:
-          VIRTUAL_ENV: ./venv
-          PATH: ${{ env.VIRTUAL_ENV }}/bin:${{ env.PATH }}
-        run: |
-          python -m venv ${{ env.VIRTUAL_ENV }}
-          ./venv/bin/python -m pip install --upgrade pip
-          ./venv/bin/pip install -r requirements.txt
-          ./venv/bin/pip install pytest pytest-asyncio pytest-cov requests mock
-      - name: Run tests
-        run: make test-venv
-  sqlite:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Install dependencies
-        run: |
-          poetry install
-      - name: Run tests
-        run: make test
-  postgres:
-    runs-on: ubuntu-latest
+  tests:
+    runs-on: ${{ inputs.os-version }}
+
     services:
       postgres:
         image: postgres:latest
         env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: postgres
+          POSTGRES_USER: lnbits
+          POSTGRES_PASSWORD: lnbits
+          POSTGRES_DB: ${{ inputs.db-name }}
         ports:
-          # maps tcp port 5432 on service container to the host
           - 5432:5432
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.3.1"]
+
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Poetry ${{ matrix.poetry-version }}
-        uses: abatilo/actions-poetry@v2
+
+      - uses: ./.github/actions/prepare
         with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Install dependencies
-        run: |
-          poetry install
-      - name: Run tests
+          python-version: ${{ inputs.python-version }}
+
+      - name: Run Tests
         env:
-          LNBITS_DATABASE_URL: postgres://postgres:postgres@0.0.0.0:5432/postgres
-        run: make test
+          LNBITS_DATABASE_URL: ${{ inputs.db-url }}
+          LNBITS_BACKEND_WALLET_CLASS: FakeWallet
+        run: make ${{ inputs.make }}
+
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml

.gitignore

@@ -23,8 +23,8 @@ tests/data/*.sqlite3
 *.pyc
 *.env
 .env
-.venv
-venv
+.super_user
+.pre-commit-config.yaml
 
 data
 *.sqlite3
@@ -34,7 +34,8 @@ __bundle__
 
 coverage.xml
 node_modules
-lnbits/static/bundle.*
+lnbits/static/bundle.js
+lnbits/static/bundle.css
 docker
 
 # Nix
@@ -43,6 +44,8 @@ docker
 # fly.io
 fly.toml
 
+lnbits-backup.zip
+
 # Ignore extensions (post installable extension PR)
-extensions/
+extensions
 upgrades/

.pre-commit-config.yaml

@@ -0,0 +1,30 @@
+exclude: '^lnbits/static/bundle.*|^docs/.*|^lnbits/static/vendor/.*|^lnbits/extensions/.*|^lnbits/upgrades/.*|^lnbits/wallets/lnd_grpc_files/.*|^package-lock.json$'
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+      - id: check-docstring-first
+      - id: check-json
+      - id: debug-statements
+      - id: mixed-line-ending
+      - id: check-case-conflict
+  - repo: https://github.com/psf/black
+    rev: 23.7.0
+    hooks:
+      - id: black
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.0.283
+    hooks:
+      - id: ruff
+        args: [ --fix, --exit-non-zero-on-fix ]
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: '50c5478ed9e10bf360335449280cf2a67f4edb7a'
+    hooks:
+      - id: prettier
+        types_or: [css, javascript, html, json]
+        args: ['lnbits']

.prettierignore

@@ -5,6 +5,9 @@
 
 *.yml
 
+**/lnbits/extensions/*
+**/lnbits/upgrades/*
+
 **/lnbits/static/vendor
 **/lnbits/static/bundle.*
 **/lnbits/static/css/*

Dockerfile

@@ -1,20 +1,26 @@
-FROM python:3.10-slim
+FROM python:3.10-slim-bullseye
 
 RUN apt-get clean
 RUN apt-get update
 RUN apt-get install -y curl pkg-config build-essential
-RUN curl -sSL https://install.python-poetry.org | python3 -
 
+RUN curl -sSL https://install.python-poetry.org | python3 -
 ENV PATH="/root/.local/bin:$PATH"
 
+# needed for backups postgresql-client version 14 (pg_dump)
+RUN apt-get install -y apt-utils wget
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list
+RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+RUN apt-get update
+RUN apt-get install -y postgresql-client-14
+
 WORKDIR /app
-RUN mkdir -p lnbits/data
 
 COPY . .
 
-RUN poetry config virtualenvs.create false
+RUN mkdir data
+
 RUN poetry install --only main
-RUN poetry run python tools/build.py
 
 ENV LNBITS_PORT="5000"
 ENV LNBITS_HOST="0.0.0.0"

Makefile

@@ -1,10 +1,10 @@
 .PHONY: test
 
-all: format check requirements.txt
+all: format check
 
-format: prettier isort black
+format: prettier black ruff
 
-check: mypy pyright pylint flake8 checkisort checkblack checkprettier
+check: mypy pyright checkblack checkruff checkprettier
 
 prettier:
 	poetry run ./node_modules/.bin/prettier --write lnbits
@@ -12,20 +12,17 @@ prettier:
 pyright:
 	poetry run ./node_modules/.bin/pyright
 
-black:
-	poetry run black .
-
-flake8:
-	poetry run flake8
-
 mypy:
 	poetry run mypy
 
-isort:
-	poetry run isort .
+black:
+	poetry run black .
 
-pylint:
-	poetry run pylint *.py lnbits/ tools/ tests/
+ruff:
+	poetry run ruff check . --fix
+
+checkruff:
+	poetry run ruff check .
 
 checkprettier:
 	poetry run ./node_modules/.bin/prettier --check lnbits
@@ -33,8 +30,8 @@ checkprettier:
 checkblack:
 	poetry run black --check .
 
-checkisort:
-	poetry run isort --check-only .
+dev:
+	poetry run lnbits --reload
 
 test:
 	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
@@ -50,14 +47,6 @@ test-real-wallet:
 	DEBUG=true \
 	poetry run pytest
 
-test-venv:
-	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
-	FAKE_WALLET_SECRET="ToTheMoon1" \
-	LNBITS_DATA_FOLDER="./tests/data" \
-	PYTHONUNBUFFERED=1 \
-	DEBUG=true \
-	./venv/bin/pytest --durations=1 -s --cov=lnbits --cov-report=xml tests
-
 test-migration:
 	rm -rf ./migration-data
 	mkdir -p ./migration-data
@@ -77,5 +66,42 @@ test-migration:
 migration:
 	poetry run python tools/conv.py
 
+openapi:
+	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
+	LNBITS_DATA_FOLDER="./tests/data" \
+	PYTHONUNBUFFERED=1 \
+	HOST=0.0.0.0 \
+	PORT=5003 \
+	poetry run lnbits &
+	sleep 15
+	curl -s http://0.0.0.0:5003/openapi.json | poetry run openapi-spec-validator --errors=all -
+	# kill -9 %1
+
 bak:
 	# LNBITS_DATABASE_URL=postgres://postgres:postgres@0.0.0.0:5432/postgres
+	#
+
+sass:
+	npm run sass
+
+bundle:
+	npm install
+	npm run sass
+	npm run vendor_copy
+	npm run vendor_json
+	poetry run ./node_modules/.bin/prettier -w ./lnbits/static/vendor.json
+	npm run vendor_bundle_css
+	npm run vendor_minify_css
+	npm run vendor_bundle_js
+	npm run vendor_minify_js
+	# increment serviceworker version
+	sed -i -e "s/CACHE_VERSION =.*/CACHE_VERSION = $$(awk '/CACHE_VERSION =/ { print 1+$$4 }' lnbits/core/static/js/service-worker.js)/" \
+		lnbits/core/static/js/service-worker.js
+
+install-pre-commit-hook:
+	@echo "Installing pre-commit hook to git"
+	@echo "Uninstall the hook with poetry run pre-commit uninstall"
+	poetry run pre-commit install
+
+pre-commit:
+	poetry run pre-commit run --all-files

README.md

@@ -1,13 +1,11 @@
-LNbits
-======
+# LNbits
 
 [![license-badge]](LICENSE)
 [![docs-badge]][docs]
 
-
 ![Lightning network wallet](https://i.imgur.com/EHvK6Lq.png)
 
-# LNbits v0.9 BETA, free and open-source Lightning wallet accounts system
+# LNbits v0.10 BETA, free and open-source Lightning wallet accounts system
 
 (Join us on [https://t.me/lnbits](https://t.me/lnbits))
 
@@ -17,15 +15,15 @@ Use [legend.lnbits.com](https://legend.lnbits.com), or run your own LNbits serve
 
 LNbits is a Python server that sits on top of any funding source. It can be used as:
 
-* Accounts system to mitigate the risk of exposing applications to your full balance via unique API keys for each wallet
-* Extendable platform for exploring Lightning network functionality via the LNbits extension framework
-* Part of a development stack via LNbits API
-* Fallback wallet for the LNURL scheme
-* Instant wallet for LN demonstrations
+- Accounts system to mitigate the risk of exposing applications to your full balance via unique API keys for each wallet
+- Extendable platform for exploring Lightning network functionality via the LNbits extension framework
+- Part of a development stack via LNbits API
+- Fallback wallet for the LNURL scheme
+- Instant wallet for LN demonstrations
 
-LNbits can run on top of any Lightning funding source. It supports LND, CLN, Eclair, Spark, LNpay, OpenNode, lntxbot, LightningTipBot, and with more being added regularly.
+LNbits can run on top of any Lightning funding source. It supports LND, CLN, Eclair, Spark, LNpay, OpenNode, LightningTipBot, and with more being added regularly.
 
-See [docs.lnbits.org](https://docs.lnbits.org) for more detailed documentation.
+See [LNbits Wiki](https://github.com/lnbits/lnbits/wiki/) for more detailed documentation.
 
 Checkout the LNbits [YouTube](https://www.youtube.com/playlist?list=PLPj3KCksGbSYG0ciIQUWJru1dWstPHshe) video series.
 
@@ -33,7 +31,7 @@ LNbits is inspired by all the great work of [opennode.com](https://www.opennode.
 
 ## Running LNbits
 
-See the [install guide](docs/guide/installation.md) for details on installation and setup.
+See the [install guide](https://github.com/lnbits/lnbits/blob/main/docs/guide/installation.md) for details on installation and setup.
 
 ## LNbits as an account system
 
@@ -60,7 +58,7 @@ Example use would be an ATM, which utilises LNURL, if the user scans the QR with
 
 ## LNbits as an instant wallet
 
-Wallets can be easily generated and given out to people at events. "Go to this  website", has a lot less friction than "Download this app".
+Wallets can be easily generated and given out to people at events. "Go to this website", has a lot less friction than "Download this app".
 
 ![lnurl ATM](https://i.imgur.com/xFWDnwy.png)
 
@@ -68,8 +66,7 @@ Wallets can be easily generated and given out to people at events. "Go to this
 
 If you like this project [send some tip love](https://legend.lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK)!
 
-
-[docs]: https://docs.lnbits.org/
+[docs]: https://github.com/lnbits/lnbits/wiki
 [docs-badge]: https://img.shields.io/badge/docs-lnbits.org-673ab7.svg
 [github-mypy]: https://github.com/lnbits/lnbits/actions?query=workflow%3Amypy
 [github-mypy-badge]: https://github.com/lnbits/lnbits/workflows/mypy/badge.svg

docs/devs/development.md

@@ -12,6 +12,30 @@ For developers
 Thanks for contributing :)
 
 
+Run
+=====
+
+This starts the lnbits uvicorn server
+```bash
+poetry run lnbits
+```
+
+This starts the lnbits uvicorn with hot reloading.
+```bash
+make dev
+# or
+poetry run lnbits --reload
+```
+
+Precommit hooks
+=====
+
+This ensures that all commits adhere to the formatting and linting rules.
+
+```bash
+make install-pre-commit-hook
+```
+
 Tests
 =====
 

docs/devs/extensions.md

@@ -9,11 +9,14 @@ nav_order: 2
 Making extensions
 =================
 
-Start off by copying the example extension in `lnbits/extensions/example` into your own:
+Start off by cloning the [example extension](https://github.com/lnbits/example) into your `lnbits/extensions` folder and renaming it to `mysuperplugin`:
 ```sh
-cp lnbits/extensions/example lnbits/extensions/mysuperplugin -r # Let's not use dashes or anything; it doesn't like those.
-cd lnbits/extensions/mysuperplugin
+cd lnbits/extensions
+git clone https://github.com/lnbits/example.git --depth=1 mysuperplugin # Let's not use dashes or anything; it doesn't like those.
+cd mysuperplugin
+rm -rf .git/
 find . -type f -print0 | xargs -0 sed -i 's/example/mysuperplugin/g' # Change all occurrences of 'example' to your plugin name 'mysuperplugin'.
+mv templates/example templates/mysuperplugin # Rename templates folder.
 ```
 - if you are on macOS and having difficulty with 'sed', consider `brew install gnu-sed` and use 'gsed', without -0 option after xargs.
 
@@ -28,18 +31,16 @@ Going over the example extension's structure:
 Adding new dependencies
 -----------------------
 
-DO NOT ADD NEW DEPENDENCIES. Try to use the dependencies that are availabe in `pyproject.toml`. Getting the LNbits project to accept a new dependency is time consuming and uncertain, and may result in your extension NOT being made available to others. 
+DO NOT ADD NEW DEPENDENCIES. Try to use the dependencies that are availabe in `pyproject.toml`. Getting the LNbits project to accept a new dependency is time consuming and uncertain, and may result in your extension NOT being made available to others.
 
-If for some reason your extensions must have a new python package to work, and its nees are not met in `pyproject.toml`, you can add a new package using `venv`, or `poerty`:
+If for some reason your extensions must have a new python package to work, and its nees are not met in `pyproject.toml`, you can add a new package using `poerty`:
 
 ```sh
 $ poetry add <package>
-# or
-$ ./venv/bin/pip install <package>
 ```
 
 **But we need an extra step to make sure LNbits doesn't break in production.**
-Dependencies need to be added to `pyproject.toml` and `requirements.txt`, then tested by running on `venv` and `poetry` compatability can be tested with `nix build .#checks.x86_64-linux.vmTest`.
+Dependencies need to be added to `pyproject.toml`, then tested by running on `poetry` compatability can be tested with `nix build .#checks.x86_64-linux.vmTest`.
 
 
 SQLite to PostgreSQL migration

docs/guide/admin_ui.md

@@ -8,7 +8,7 @@ nav_order: 4
 Admin UI
 ========
 The LNbits Admin UI lets you change LNbits settings via the LNbits frontend.
-It is disabled by default and the first time you set the enviroment variable LNBITS_ADMIN_UI=true
+It is disabled by default and the first time you set the environment variable LNBITS_ADMIN_UI=true
 the settings are initialized and saved to the database and will be used from there as long the UI is enabled.
 From there on the settings from the database are used.
 
@@ -32,14 +32,14 @@ There is also the possibility of posting the super user via webhook to another s
 
 Admin Users
 ===========
-enviroment variable: LNBITS_ADMIN_USERS, comma-seperated list of user ids
-Admin Users can change settings in the admin ui aswell, with the exception of funding source settings, because they require e server restart and could potentially make the server inaccessable. Also they have access to all the extension defined in LNBITS_ADMIN_EXTENSIONS.
+environment variable: LNBITS_ADMIN_USERS, comma-separated list of user ids
+Admin Users can change settings in the admin ui as well, with the exception of funding source settings, because they require e server restart and could potentially make the server inaccessable. Also they have access to all the extension defined in LNBITS_ADMIN_EXTENSIONS.
 
 
 Allowed Users
 =============
-enviroment variable: LNBITS_ALLOWED_USERS, comma-seperated list of user ids
-By defining this users, LNbits will no longer be useable by the public, only defined users and admins can then access the LNbits frontend.
+environment variable: LNBITS_ALLOWED_USERS, comma-separated list of user ids
+By defining this users, LNbits will no longer be usable by the public, only defined users and admins can then access the LNbits frontend.
 
 
 How to activate
@@ -55,11 +55,12 @@ Now start LNbits once in the terminal window
 ``` 
 $ poetry run lnbits 
 ```
-It will now show you the Super User Account:
-
-`SUCCESS | ✔️ Access super user account at: https://127.0.0.1:5000/wallet?usr=5711d7..`
-
-The `/wallet?usr=..` is your super user account. You just have to append it to your normal LNbits web domain.
+You can now `cat` the Super User ID:
+```
+$ cat .super_user
+123de4bfdddddbbeb48c8bc8382fe123
+```
+You can access your super user account at `/wallet?usr=super_user_id`. You just have to append it to your normal LNbits web domain.
 
 After that you will find the __`Admin` / `Manage Server`__ between `Wallets` and `Extensions`
 

docs/guide/extension-install.md

@@ -1,6 +1,6 @@
 # Extension Install
 
-Anyone can create an extension by following the [example extension](https://github.com/lnbits/lnbits/tree/extension_install_02/lnbits/extensions/example).
+Anyone can create an extension by following the [example extension](https://github.com/lnbits/example) and [making extensions](https://github.com/lnbits/lnbits/blob/main/docs/devs/extensions.md) dev guide.
 
 Extensions can be installed by an admin user after the **LNbits** instance has been started.
 
@@ -12,7 +12,7 @@ Go to `Manage Server` > `Server` > `Extensions Manifests`
 
 
 An `Extension Manifest` is a link to a `JSON` file which contains information about various extensions that can be installed (repository of extensions).
-Multiple repositories can be configured. For more information check the [Manifest File](https://github.com/lnbits/lnbits/blob/extension_install_02/docs/guide/extension-install.md#manifest-file) section.
+Multiple repositories can be configured. For more information check the [Manifest File](https://github.com/lnbits/lnbits/blob/main/docs/guide/extension-install.md#manifest-file) section.
 
 
 **LNbits** administrators should configure their instances to use repositories that they trust (like the [lnbits-extensions](https://github.com/lnbits/lnbits-extensions/) one). 
@@ -100,7 +100,7 @@ It goes under the `extensions` object and it is of the form:
 |----------------------|---------------|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | id                   | string        | mandatory | The ID of the extension. Must be unique for each extension. It is also used as the path in the URL.                                                                          |
 | name                 | string        | mandatory | User friendly name for the extension. It will be displayed on the installation page.                                                                                 |
-| version              | string        | mandatory | Version of this release. [Semantic versoning](https://semver.org/) is recommended.                                                                                   |
+| version              | string        | mandatory | Version of this release. [Semantic versioning](https://semver.org/) is recommended.                                                                                   |
 | shortDescription     | string        | optional  | A few words about the extension. It will be displayed on the installation page.                                                                                      |
 | icon                 | string        | optional  | quasar valid icon name                                                                                                                                               |
 | details              | string (html) | optional  | Details about this particular release                                                                                                                                |

docs/guide/faq.md

@@ -20,7 +20,7 @@ allow-self-payment=1
 
 </details>
   
-<details><summary>Funding source only available via tor (e.g. Umbrel)</summary>
+<details><summary>Funding source only available via tor (e.g. Start9 or Umbrel)</summary>
   <p>If you want your setup to stay behind tor then only apps, pos and wallets that have tor activated can communicate with your wallets. Most likely you will have trouble when people try to redeem your voucher through onion or when importing your lnbits wallets into a wallet-app that doesnt support tor. If you plan to let LNbits wallets interact with plain internet shops and services you should consider <a href="https://github.com/TrezorHannes/Dual-LND-Hybrid-VPS">setting up hybrid mode for your node</a>.</p>
 </details>
     
@@ -33,7 +33,7 @@ allow-self-payment=1
 </details>
     
 <details><summary>Which funding sources can I use for LNbits?</summary>
-  <p>There are several ways to run a LNbits instance funded from different sources. It is importan to choose a source that has a good liquidity and good peers connected. If you use LNbits for public services your users´ payments can then flow happily in both directions. If you would like to fund your LNbits wallet via btc please see section Troubleshooting.</p>
+  <p>There are several ways to run a LNbits instance funded from different sources. It is important to choose a source that has a good liquidity and good peers connected. If you use LNbits for public services your users´ payments can then flow happily in both directions. If you would like to fund your LNbits wallet via btc please see section Troubleshooting.</p>
   <p>The <a href="http://docs.lnbits.org/guide/wallets.html">LNbits manual</a> shows you which sources can be used and how to configure each: CLN, LND, LNPay, Cliche, OpenNode as well as bots.</p>
 </details>
     
@@ -47,7 +47,7 @@ allow-self-payment=1
   <p>When you run your LNbits in clearnet basically everyone can generate a wallet on it. Since the funds of your node are bound to these wallets you might want to prevent that. There are two ways to do so:</p>
   <ul>
    <li>Configure allowed users & extensions <a href="https://github.com/lnbits/lnbits/blob/main/.env.example">in the .env file</a></li>
-   <li>Configure allowed users & extensions <a href="https://github.com/lnbits/lnbits/tree/main/lnbits/extensions/usermanager">via the Usermanager-Extension</a>. You can find <a href="http://docs.lnbits.org/guide/admin_ui.html">more info about the superuser and the admin extension here</a></li>
+   <li>Configure allowed users & extensions <a href="https://github.com/lnbits/usermanager">via the Usermanager-Extension</a>. You can find <a href="http://docs.lnbits.org/guide/admin_ui.html">more info about the superuser and the admin extension here</a></li>
   </ul>
   <p>Please note that all entries in the .env file will not be the taken into account once you activated the admin extension.</p>
 </details>
@@ -73,7 +73,7 @@ allow-self-payment=1
         You need to have a domain and to be able to configure a CNAME for your DNS record as well as generate a subdomain dedicated to your LNbits instance like eg. lnbits.yourdomain.com. 
         You also need access to your internet router to open the https port (usually 443) and forward it your LNbits IP within your LAN (usually 80). The ports might depend on your node implementation if those ports do not work please ask for them in a help group of your node supplier.</li>
        <li>You can also follow the Apache installation option, explained in the <a href="https://docs.lnbits.org/guide/installation.html#running-behind-an-apache2-reverse-proxy-over-https">LNbits installation manual</a>.</li>
-       <li>If you run LNbits from a bundle node (Umbrel, myNode, Embassy, Raspiblitz etc), you can follow <a href="https://github.com/TrezorHannes/vps-lnbits">this extensive guide</a> with many options to switch your Tor only LNbits into a clearnet LNbits. For Citadel there is a HTTPS Option in your manual to activate https for LNbits in the newest version.</li>
+       <li>If you run LNbits from a bundle node (myNode, Start9, Umbrel,Raspiblitz etc), you can follow <a href="https://github.com/TrezorHannes/vps-lnbits">this extensive guide</a> with many options to switch your Tor only LNbits into a clearnet LNbits. For Citadel there is a HTTPS Option in your manual to activate https for LNbits in the newest version.</li>
        </ul>
     </details>
    </li>
@@ -112,7 +112,7 @@ allow-self-payment=1
   <ul>
     <li>
       <details><summary>A - Via an external swap service</summary>
-        <p>If the user do not have full acceess of your LNbits, is just an external user, can use swap services like <a href="https://boltz.exchange/">Boltz</a>, <a href="https://fixedfloat.com/">FixedFloat</a>, <a href="https://swap.diamondhands.technology/">DiamondHands</a> or <a href="https://zigzag.io/">ZigZag</a>.</p>
+        <p>If the user do not have full access of your LNbits, is just an external user, can use swap services like <a href="https://boltz.exchange/">Boltz</a>, <a href="https://fixedfloat.com/">FixedFloat</a>, <a href="https://swap.diamondhands.technology/">DiamondHands</a> or <a href="https://zigzag.io/">ZigZag</a>.</p>
         <p>This is useful if you provide only LNURL/LN invoices from your LNbits instance, but a payer only has onchain sats so 
            they will have to the swap those sats first on their side.</p>
         <p>The procedure is simple: user sends onchain btc to the swap service and provides the LNURL / LN invoice from LNbits as destination of the swap.</p>
@@ -122,7 +122,7 @@ allow-self-payment=1
       <details><summary>B - Using the Onchain LNbits extension</summary>
         <p>Keep in mind that this is a separate wallet, not the LN btc one that is represented by LNbits as "your wallet" upon your LN funding source. 
            This onchain wallet can be used also to swap LN btc to (e.g. your hardwarewallet) by using the LNbits Boltz or Deezy extension. 
-           If you run a webshop that is linked to your LNbits for LN payments, it is very handy to regularily drain all the sats from LN into onchain. 
+           If you run a webshop that is linked to your LNbits for LN payments, it is very handy to regularly drain all the sats from LN into onchain. 
            This leads to more space in your LN channels to be able to receive new fresh sats.</p>
         <p>Procedure:</p>
           <ul>
@@ -157,10 +157,10 @@ allow-self-payment=1
 
 
 <details><summary>How can I use a LNbits lndhub account in other wallet apps?</summary>
-  <p>Open your LNbits with the account / wallet you want to use, go to "manage extensions" and activate the LNDHUB extension.</p>
+  <p>Open your LNbits with the account / wallet you want to use, go to "manage extensions" and activate the <a href="https://github.com/lnbits/lndhub">LNDHUB extension</a>.</p>
   <p>Then open the LNDHUB extension, choose the wallet you want to use and scan the QR code you want to use: "admin" or "invoice only", depending on the security level you want for that wallet.</p>
   <p>You can use <a href="https://zeusln.app">Zeus</a> or <a href="https://bluewallet.io">Bluewallet</a> as wallet apps for a lndhub account.</p>
-  <p>Keep in mind: if your LNbits instance is Tor only, you must use also theose apps behind Tor and open the LNbits page through your Tor .onion address.</p>
+  <p>Keep in mind: if your LNbits instance is Tor only, you must use also those apps behind Tor and open the LNbits page through your Tor .onion address.</p>
 </details>
 </ul>
   </ul>
@@ -169,11 +169,11 @@ allow-self-payment=1
 <ul>  <p>LNbits has all sorts of open APIs and tools to program and connect to a lot of different devices for a gazillion of use-cases. Let us know what you did with it ! Come to the <a href="https://t.me/makerbits">Makerbits Telegram Group</a> if you are interested in building or if you need help with a project - we got you!</p>
 
 <details><summary>ATM - deposit and withdraw in your shop or at your meetup</summary>
-  <p>This is a do-it-yourself project consisting of a mini-computer (Raspberry Pi Zero), a coin acceptor, a display, a 3D printed case, and a Bitcoin Lightning wallet as a funding source. It exchanges fiat coins for valuable Bitcoin Lightning ⚡ Satoshis. The user can pick up the Satoshis via QR code (LNURL-withdraw) on a mobile phone wallet. It works based on BTCPayer server, LNTXBOT is not longer an option. You can get the components as individual parts and build the case yourself e.g. from <a href="https://www.Fulmo.org">Fulmo</a> who also made a <a href="https://blog.fulmo.org/the-lightningatm-pocket-edition/">guide</a> on it. The shop offers payments in Bitcoin and Lightning ⚡. The code can be found on <a href="https://github.com/21isenough/LightningATM">the ATM github project page></a>.</p>
+  <p>This is a do-it-yourself project consisting of a mini-computer (Raspberry Pi Zero), a coin acceptor, a display, a 3D printed case, and a Bitcoin Lightning wallet as a funding source. It exchanges fiat coins for valuable Bitcoin Lightning ⚡ Satoshis. The user can pick up the Satoshis via QR code (LNURL-withdraw) on a mobile phone wallet. You can get the components as individual parts and build the case yourself e.g. from <a href="https://www.Fulmo.org">Fulmo</a> who also made a <a href="https://blog.fulmo.org/the-lightningatm-pocket-edition/">guide</a> on it. The shop offers payments in Bitcoin and Lightning ⚡. The code can be found on <a href="https://github.com/21isenough/LightningATM">the ATM github project page></a>.</p>
 </details>
   
 <details><summary>POS Terminal - an offline terminal for merchants</summary>
-  <p>The LNpos is a self-sufficient point of sale terminal which allows offline onchain payments and an offline Lightning ATM for withdrawals. Free and open source software, free from intermediaries, with integrated battery, WLAN, DIY. You can get the 3D print as well as the whole kit from the LNbits shop from 👇 Ressources. It allows
+  <p>The LNpos is a self-sufficient point of sale terminal which allows offline onchain payments and an offline Lightning ATM for withdrawals. Free and open source software, free from intermediaries, with integrated battery, WLAN, DIY. You can get the 3D print as well as the whole kit from the LNbits shop from 👇 Resources. It allows
     <li>LNPoS Online interactive Lightning payments</li>
     <li>LNURLPoS Offline Lightning Payments. Passive interaction, sharing a secret as evidence</li>
     <li>OnChain For onchain payments. Generates an address and displays a link for verification</li>
@@ -192,7 +192,7 @@ allow-self-payment=1
 </details>
     
 <details><summary>Bitcoin Switch - turn things on with bitcoin</summary>
-  <p>Candy dispenser, vending machines (online), grabbing machines, jukeboxes, bandits and <a href="https://github.com/cryptoteun/awesome-lnbits">all sorts of other things have already been build with LNbits´ tools</a>. Further info see 👇 Ressources.</p>
+  <p>Candy dispenser, vending machines (online), grabbing machines, jukeboxes, bandits and <a href="https://github.com/cryptoteun/awesome-lnbits">all sorts of other things have already been build with LNbits´ tools</a>. Further info see 👇 Resources.</p>
 <p>
   <img width="549" alt="Bildschirm­foto 2023-01-20 um 18 11 55" src="https://user-images.githubusercontent.com/63317640/213761646-d25d4745-e50d-4389-98e5-f83237a8cf6b.png">
   </p>
@@ -209,7 +209,7 @@ allow-self-payment=1
   <ul>
   <li><a href="https://t.me/makerbits'">MakerBits</a> - Telegram support group</li>
   <li><a href="https://ereignishorizont.xyz/">Instructions for LNpos, Switch, ATM, BTCticker</a> - guides in DE & EN</li>
-  <li><a href="https://shop.lnbits.com/">LNbits shop</a> - eadymade hardware gimmicks from the community</li>
+  <li><a href="https://shop.lnbits.com/">LNbits shop</a> - readymade hardware gimmicks from the community</li>
   <li><a href="https://github.com/cryptoteun/awesome-lnbits#hardware-projects-utilizing-lnbits">Collection of hardware projects using LNbits</a></li>
   </ul>
 </details>
@@ -222,7 +222,7 @@ allow-self-payment=1
 </details>
 
 <details><summary>Swapping ⚡️LN BTC to a BTC address</summary>
-  <p>LNbits has two swap extensions integrated: <a href="https://github.com/lnbits/lnbits/tree/main/lnbits/extensions/boltz">Boltz</a> and <a href="https://github.com/lnbits/lnbits/tree/main/lnbits/extensions/deezy">Deezy</a>.</p>
+  <p>LNbits has two swap extensions integrated: <a href="https://github.com/lnbits/boltz-extension/">Boltz</a> and <a href="hhttps://github.com/lnbits/deezy">Deezy</a>.</p>
   <p>For a merchant that uses LNbits to receive BTC payments through LN, this is very handy to move the received sats from LN channels into onchain wallets. It not only helps you HODLing but is also freeing up "space in your channels" so you are ready to receive more sats.</p>
   <p>Boltz has an option to setup an automated swap triggered by a certain amount received.</p>
 </details>

docs/guide/installation.md

@@ -6,13 +6,13 @@ nav_order: 2
 
 # Basic installation
 
-You can choose between four package managers, `poetry`, `nix` and `venv`.
+You can choose between four package managers, `poetry` and `nix`
 
 By default, LNbits will use SQLite as its database. You can also use PostgreSQL which is recommended for applications with a high load (see guide below).
 
 ## Option 1 (recommended): poetry
 
-If you have problems installing LNbits using these instructions, please have a look at the [Troubleshooting](#troubleshooting) section.
+Mininum poetry version has is ^1.2, but it is recommended to use latest poetry. (including OSX)
 
 ```sh
 git clone https://github.com/lnbits/lnbits.git
@@ -80,30 +80,8 @@ mkdir data
 LNBITS_DATA_FOLDER=data LNBITS_BACKEND_WALLET_CLASS=LNbitsWallet LNBITS_ENDPOINT=https://legend.lnbits.com LNBITS_KEY=7b1a78d6c78f48b09a202f2dcb2d22eb ./result/bin/lnbits --port 9000
 ```
 
-## Option 3: venv
 
-```sh
-git clone https://github.com/lnbits/lnbits.git
-cd lnbits
-# ensure you have virtualenv installed, on debian/ubuntu 'apt install python3.9-venv'
-python3.9 -m venv venv
-# If you have problems here, try `sudo apt install -y pkg-config libpq-dev`
-./venv/bin/pip install -r requirements.txt
-# create the data folder and the .env file
-mkdir data && cp .env.example .env
-# build the static files
-./venv/bin/python tools/build.py
-```
-
-#### Running the server
-
-```sh
-./venv/bin/uvicorn lnbits.__main__:app --port 5000
-```
-
-If you want to host LNbits on the internet, run with the option `--host 0.0.0.0`.
-
-## Option 4: Docker
+## Option 3: Docker
 
 use latest version from docker hub
 ```sh
@@ -122,7 +100,7 @@ mkdir data
 docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbitsdocker/lnbits-legend
 ```
 
-## Option 5: Fly.io
+## Option 4: Fly.io
 
 Fly.io is a docker container hosting platform that has a generous free tier. You can host LNbits for free on Fly.io for personal use.
 
@@ -210,15 +188,8 @@ sudo apt install python3.9-dev gcc build-essential
 # if the secp256k1 build fails:
 # if you used poetry
 poetry add setuptools wheel
-
-# if you used venv
-./venv/bin/pip install setuptools wheel
 ```
 
-#### Poetry
-
-If your Poetry version is older than 1.2, for `poetry install`, ignore the `--only main` flag.
-
 ### Optional: PostgreSQL database
 
 If you want to use LNbits at scale, we recommend using PostgreSQL as the backend database. Install Postgres and setup a database for LNbits:
@@ -303,7 +274,7 @@ Description=LNbits
 
 [Service]
 # replace with the absolute path of your lnbits installation
-WorkingDirectory=/home/lnbits/lnbits-legend
+WorkingDirectory=/home/lnbits/lnbits
 # same here. run `which poetry` if you can't find the poetry binary
 ExecStart=/home/lnbits/.local/bin/poetry run lnbits
 # replace with the user that you're running lnbits on
@@ -323,7 +294,8 @@ Save the file and run the following commands:
 sudo systemctl enable lnbits.service
 sudo systemctl start lnbits.service
 ```
-## Reverse proxy with automatic https using Caddy
+
+## Reverse proxy with automatic HTTPS using Caddy
 
 Use Caddy to make your LNbits install accessible over clearnet with a domain and https cert.
 
@@ -335,11 +307,15 @@ https://caddyserver.com/docs/install#debian-ubuntu-raspbian
 ```
 sudo caddy stop
 ```
+
 Create a Caddyfile
+
 ```
 sudo nano Caddyfile
 ```
+
 Assuming your LNbits is running on port `5000` add:
+
 ```
 yourdomain.com {
   handle /api/v1/payments/sse* {
@@ -356,22 +332,30 @@ yourdomain.com {
   }
 }
 ```
+
 Save and exit `CTRL + x`
+
 ```
 sudo caddy start
 ```
 
-## Running behind an apache2 reverse proxy over https
-Install apache2 and enable apache2 mods
+## Running behind an Apache2 reverse proxy over HTTPS
+
+Install Apache2 and enable Apache2 mods:
+
 ```sh
 apt-get install apache2 certbot
 a2enmod headers ssl proxy proxy-http
 ```
-create a ssl certificate with letsencrypt
+
+Create a SSL certificate with LetsEncrypt:
+
 ```sh
-certbot certonly --webroot --agree-tos --text --non-interactive --webroot-path /var/www/html -d lnbits.org
+certbot certonly --webroot --agree-tos --non-interactive --webroot-path /var/www/html -d lnbits.org
 ```
-create a apache2 vhost at: /etc/apache2/sites-enabled/lnbits.conf
+
+Create an Apache2 vhost at: `/etc/apache2/sites-enabled/lnbits.conf`:
+
 ```sh
 cat <<EOF > /etc/apache2/sites-enabled/lnbits.conf
 <VirtualHost *:443>
@@ -396,16 +380,62 @@ cat <<EOF > /etc/apache2/sites-enabled/lnbits.conf
 </VirtualHost>
 EOF
 ```
-restart apache2
+
+Restart Apache2:
+
 ```sh
 service restart apache2
 ```
 
+## Running behind an Nginx reverse proxy over HTTPS
+
+Install nginx:
+
+```sh
+apt-get install nginx certbot
+```
+
+Create a SSL certificate with LetsEncrypt:
+
+```sh
+certbot certonly --nginx --agree-tos -d lnbits.org
+```
+
+Create an nginx vhost at `/etc/nginx/sites-enabled/lnbits.org`:
+
+```sh
+cat <<EOF > /etc/nginx/sites-enabled/lnbits.org
+server {
+    server_name lnbits.org;
+
+    location / {
+        proxy_pass http://127.0.0.1:5000;
+    }
+
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-Host $host;
+    proxy_set_header X-Forwarded-Proto $scheme;
+
+    listen [::]:443 ssl;
+    listen 443 ssl;
+    ssl_certificate /etc/letsencrypt/live/lnbits.org/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/lnbits.org/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+}
+EOF
+```
+
+Restart nginx:
+
+```sh
+service restart nginx
+```
 
 ## Using https without reverse proxy
 The most common way of using LNbits via https is to use a reverse proxy such as Caddy, nginx, or ngriok. However, you can also run LNbits via https without additional software. This is useful for development purposes or if you want to use LNbits in your local network.
 
-We have to create a self-signed certificate using `mkcert`. Note that this certiciate is not "trusted" by most browsers but that's fine (since you know that you have created it) and encryption is always better than clear text.
+We have to create a self-signed certificate using `mkcert`. Note that this certificate is not "trusted" by most browsers but that's fine (since you know that you have created it) and encryption is always better than clear text.
 
 #### Install mkcert
 You can find the install instructions for `mkcert` [here](https://github.com/FiloSottile/mkcert).
@@ -433,7 +463,7 @@ mkcert localhost 127.0.0.1 ::1
 You can then pass the certificate files to uvicorn when you start LNbits:
 
 ```sh
-./venv/bin/uvicorn lnbits.__main__:app --host 0.0.0.0 --port 5000 --ssl-keyfile ./key.pem --ssl-certfile ./cert.pem
+poetry run uvicorn lnbits.__main__:app --host 0.0.0.0 --port 5000 --ssl-keyfile ./key.pem --ssl-certfile ./cert.pem
 ```
 
 

docs/guide/wallets.md

@@ -8,7 +8,7 @@ nav_order: 3
 Backend wallets
 ===============
 
-LNbits can run on top of many lightning-network funding sources. Currently there is support for CoreLightning, LND, LNbits, LNPay, lntxbot and OpenNode, with more being added regularly.
+LNbits can run on top of many lightning-network funding sources. Currently there is support for CoreLightning, LND, LNbits, LNPay and OpenNode, with more being added regularly.
 
 A backend wallet can be configured using the following LNbits environment variables:
 
@@ -18,7 +18,7 @@ A backend wallet can be configured using the following LNbits environment variab
 - `LNBITS_BACKEND_WALLET_CLASS`: **CoreLightningWallet**
 - `CORELIGHTNING_RPC`: /file/path/lightning-rpc
 
-### Spark (c-lightning)
+### Spark (Core Lightning)
 
 - `LNBITS_BACKEND_WALLET_CLASS`: **SparkWallet**
 - `SPARK_URL`: http://10.147.17.230:9737/rpc
@@ -47,7 +47,7 @@ You can also use an AES-encrypted macaroon (more info) instead by using
 
 - `LND_GRPC_MACAROON_ENCRYPTED`: eNcRyPtEdMaCaRoOn
 
-To encrypt your macaroon, run `./venv/bin/python lnbits/wallets/macaroon/macaroon.py`.
+To encrypt your macaroon, run `poetry run python lnbits/wallets/macaroon/macaroon.py`.
 
 ### LNbits
 
@@ -57,7 +57,7 @@ To encrypt your macaroon, run `./venv/bin/python lnbits/wallets/macaroon/macaroo
 
 ### LNPay
 
-For the invoice listener to work you have a publicly accessible URL in your LNbits and must set up [LNPay webhooks](https://dashboard.lnpay.co/webhook/) pointing to `<your LNbits host>/wallet/webhook` with the "Wallet Receive" event and no secret. For example, `https://mylnbits/wallet/webhook` will be the Endpoint Url that gets notified about the payment. 
+For the invoice listener to work you have a publicly accessible URL in your LNbits and must set up [LNPay webhooks](https://dashboard.lnpay.co/webhook/) pointing to `<your LNbits host>/wallet/webhook` with the "Wallet Receive" event and no secret. For example, `https://mylnbits/wallet/webhook` will be the Endpoint Url that gets notified about the payment.
 
 - `LNBITS_BACKEND_WALLET_CLASS`: **LNPayWallet**
 - `LNPAY_API_ENDPOINT`: https://api.lnpay.co/v1/
@@ -65,13 +65,6 @@ For the invoice listener to work you have a publicly accessible URL in your LNbi
 - `LNPAY_WALLET_KEY`: waka_apiKey
 
 
-### lntxbot
-
-- `LNBITS_BACKEND_WALLET_CLASS`: **LntxbotWallet**
-- `LNTXBOT_API_ENDPOINT`: https://lntxbot.com/
-- `LNTXBOT_KEY`: lntxbotAdminApiKey
-
-
 ### OpenNode
 
 For the invoice to work you must have a publicly accessible URL in your LNbits. No manual webhook setting is necessary.

docs/logos/lnbits-full-inverse.svg

@@ -0,0 +1,11 @@
+<svg width="3032" height="902" viewBox="0 0 3032 902" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M158.566 493.857L1 901L450.49 355.202H264.831L501.791 1H187.881L36.4218 493.857H158.566Z" fill="#FF1FE1" stroke="black"/>
+<path d="M616.041 764.863V134.611H741.647V645.115H1023.41V764.863H616.041Z" fill="#F8F8F8"/>
+<path d="M1079.99 764.863V134.611H1198.81L1478.31 543.014V134.611H1600.52V764.863H1478.31L1198.81 360.241V764.863H1079.99Z" fill="#F8F8F8"/>
+<path d="M616.041 764.863V134.611H741.647V645.115H1023.41V764.863H616.041Z" stroke="black"/>
+<path d="M1079.99 764.863V134.611H1198.81L1478.31 543.014V134.611H1600.52V764.863H1478.31L1198.81 360.241V764.863H1079.99Z" stroke="black"/>
+<path d="M1693.87 768.522V148.458H1764.1V377.349H1770.05C1775.21 369.275 1782.35 358.981 1791.47 346.467C1800.8 333.751 1814.09 322.448 1831.35 312.557C1848.81 302.465 1872.41 297.419 1902.17 297.419C1940.66 297.419 1974.58 307.208 2003.94 326.787C2033.3 346.366 2056.22 374.119 2072.68 410.048C2089.15 445.976 2097.38 488.363 2097.38 537.209C2097.38 586.459 2089.15 629.149 2072.68 665.279C2056.22 701.207 2033.4 729.061 2004.24 748.842C1975.08 768.421 1941.45 778.21 1903.36 778.21C1874 778.21 1850.49 773.265 1832.84 763.375C1815.18 753.283 1801.59 741.878 1792.07 729.162C1782.55 716.244 1775.21 705.547 1770.05 697.069H1761.72V768.522H1693.87ZM1762.91 535.998C1762.91 571.119 1767.96 602.102 1778.08 628.947C1788.2 655.59 1802.98 676.481 1822.42 691.619C1841.86 706.556 1865.67 714.024 1893.84 714.024C1923.2 714.024 1947.7 706.152 1967.34 690.408C1987.18 674.463 2002.06 653.067 2011.98 626.222C2022.1 599.175 2027.15 569.1 2027.15 535.998C2027.15 503.299 2022.19 473.83 2012.28 447.59C2002.55 421.149 1987.78 400.258 1967.94 384.918C1948.3 369.376 1923.6 361.605 1893.84 361.605C1865.27 361.605 1841.27 368.972 1821.83 383.707C1802.38 398.24 1787.7 418.626 1777.78 444.866C1767.87 470.903 1762.91 501.281 1762.91 535.998Z" fill="white"/>
+<path d="M2204.81 768.522V303.474H2275.04V768.522H2204.81ZM2240.52 225.966C2226.83 225.966 2215.03 221.223 2205.11 211.736C2195.39 202.25 2190.52 190.846 2190.52 177.524C2190.52 164.202 2195.39 152.798 2205.11 143.311C2215.03 133.825 2226.83 129.081 2240.52 129.081C2254.21 129.081 2265.91 133.825 2275.63 143.311C2285.55 152.798 2290.51 164.202 2290.51 177.524C2290.51 190.846 2285.55 202.25 2275.63 211.736C2265.91 221.223 2254.21 225.966 2240.52 225.966Z" fill="white"/>
+<path d="M2602.45 303.474V364.027H2365.57V303.474H2602.45ZM2434.61 192.057H2504.84V635.305C2504.84 655.489 2507.72 670.628 2513.47 680.72C2519.42 690.61 2526.96 697.271 2536.09 700.702C2545.41 703.932 2555.23 705.547 2565.55 705.547C2573.28 705.547 2579.63 705.143 2584.59 704.335C2589.55 703.326 2593.52 702.519 2596.49 701.913L2610.78 766.1C2606.02 767.916 2599.37 769.733 2590.84 771.549C2582.31 773.568 2571.5 774.577 2558.41 774.577C2538.57 774.577 2519.12 770.237 2500.08 761.558C2481.23 752.879 2465.56 739.658 2453.06 721.896C2440.76 704.134 2434.61 681.729 2434.61 654.682V192.057Z" fill="white"/>
+<path d="M3023.67 407.625L2960.58 425.791C2956.61 415.094 2950.76 404.699 2943.02 394.607C2935.49 384.313 2925.17 375.835 2912.08 369.174C2898.98 362.513 2882.22 359.183 2861.79 359.183C2833.81 359.183 2810.5 365.743 2791.85 378.863C2773.4 391.781 2764.18 408.231 2764.18 428.214C2764.18 445.976 2770.53 460.004 2783.22 470.298C2795.92 480.592 2815.76 489.17 2842.74 496.033L2910.59 512.988C2951.46 523.08 2981.91 538.521 3001.94 559.311C3021.98 579.899 3032 606.441 3032 638.938C3032 665.581 3024.46 689.399 3009.38 710.391C2994.51 731.383 2973.67 747.934 2946.89 760.044C2920.11 772.155 2888.96 778.21 2853.45 778.21C2806.83 778.21 2768.25 767.916 2737.7 747.328C2707.14 726.74 2687.8 696.665 2679.67 657.104L2746.33 640.149C2752.67 665.178 2764.68 683.949 2782.33 696.464C2800.19 708.978 2823.5 715.235 2852.26 715.235C2885 715.235 2910.99 708.17 2930.23 694.041C2949.67 679.711 2959.39 662.554 2959.39 642.571C2959.39 626.424 2953.84 612.9 2942.73 602.001C2931.62 590.899 2914.56 582.624 2891.54 577.174L2815.36 559.008C2773.5 548.916 2742.75 533.273 2723.11 512.08C2703.67 490.684 2693.95 463.94 2693.95 431.847C2693.95 405.607 2701.19 382.395 2715.67 362.211C2730.36 342.026 2750.29 326.182 2775.49 314.676C2800.88 303.171 2829.65 297.419 2861.79 297.419C2907.02 297.419 2942.53 307.511 2968.32 327.695C2994.31 347.88 3012.76 374.523 3023.67 407.625Z" fill="white"/>
+</svg>

docs/logos/lnbits-full.svg

@@ -1 +1,11 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 101.041 30.0001"><defs><path id="a" d="M33.2619 148.1667h154.2143v68.7917H33.2619z"/></defs><g fill="#1f2234" aria-label="LNbits" font-family="sans-serif" font-size=".3095" font-weight="400" letter-spacing=".0031" style="line-height:1.25;white-space:pre;shape-inside:url(#a)" transform="matrix(72.4607 0 0 72.4607 -2399.2814 -10741.3589)"><g transform="matrix(.00244 0 0 .00244 33.0708 148.1594)"><circle cx="101.2976" cy="116.4167" r="84.6667" fill="#673ab7" fill-rule="evenodd"/><path fill="#eee" d="M79.1105 71.9667v49.0613h13.3803v40.141l31.2208-53.5213h-17.8404l17.8404-35.681z"/></g><g font-family="roboto"><path d="M33.6755 148.518h.0962v.0364h-.1416v-.22h.0454zM33.9796 148.5544h-.0453l-.0883-.1448v.1448h-.0453v-.22h.0453l.0884.145v-.145h.0452z" font-weight="700" style="-inkscape-font-specification:'roboto Bold'"/><path d="M34.1625 148.4744q0 .0375-.0172.0603-.0172.0227-.0462.0227-.031 0-.048-.0219l-.0014.019h-.0256v-.2322h.028v.0866q.0168-.021.0466-.021.0298 0 .0467.0225.017.0225.017.0617zm-.028-.003q0-.0286-.011-.044-.011-.0157-.0317-.0157-.0277 0-.0398.0257v.0707q.0129.0257.04.0257.0202 0 .0314-.0156.0112-.0156.0112-.0469zM34.231 148.5544h-.028v-.1635h.028zm-.0302-.2069q0-.007.0041-.0115.0042-.005.0124-.005.0082 0 .0124.005.0042.005.0042.0115 0 .007-.0042.0113-.0042.005-.0124.005-.0082 0-.0124-.005-.004-.005-.004-.0113zM34.3167 148.3513v.0396h.0305v.0216h-.0305v.1014q0 .01.004.0148.0042.005.014.005.0048 0 .0133-.002v.0227q-.011.003-.0215.003-.0187 0-.0283-.0113-.0095-.0113-.0095-.0322v-.1014h-.0297v-.0216h.0297v-.0396zM34.478 148.511q0-.0113-.0086-.0175-.0085-.006-.0298-.0109-.0211-.005-.0337-.0109-.0124-.006-.0184-.015t-.006-.0209q0-.02.017-.034.017-.0139.0435-.0139.0278 0 .045.0144.0174.0144.0174.0367h-.028q0-.0115-.0099-.0198-.0097-.008-.0245-.008-.0152 0-.0238.007-.0086.007-.0086.0174 0 .0101.008.0153.008.005.0288.01.021.005.034.0112.013.007.0192.0157.0063.009.0063.0222 0 .022-.0175.0352-.0175.0131-.0455.0131-.0197 0-.0348-.007-.015-.007-.0237-.0193-.0085-.0125-.0085-.027h.028q.0007.014.0111.0223.0106.008.0279.008.0158 0 .0253-.006.0097-.006.0097-.0172z" style="-inkscape-font-specification:roboto"/></g></g></svg>
+<svg width="3032" height="902" viewBox="0 0 3032 902" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M158.566 493.857L1 901L450.49 355.202H264.831L501.791 1H187.881L36.4218 493.857H158.566Z" fill="#FF1FE1" stroke="black"/>
+<path d="M616.041 764.863V134.611H741.647V645.115H1023.41V764.863H616.041Z" fill="#1E1E1E"/>
+<path d="M1079.99 764.863V134.611H1198.81L1478.31 543.014V134.611H1600.52V764.863H1478.31L1198.81 360.241V764.863H1079.99Z" fill="#1E1E1E"/>
+<path d="M616.041 764.863V134.611H741.647V645.115H1023.41V764.863H616.041Z" stroke="black"/>
+<path d="M1079.99 764.863V134.611H1198.81L1478.31 543.014V134.611H1600.52V764.863H1478.31L1198.81 360.241V764.863H1079.99Z" stroke="black"/>
+<path d="M1693.87 768.522V148.458H1764.1V377.349H1770.05C1775.21 369.275 1782.35 358.981 1791.47 346.467C1800.8 333.751 1814.09 322.448 1831.35 312.557C1848.81 302.465 1872.41 297.419 1902.17 297.419C1940.66 297.419 1974.58 307.208 2003.94 326.787C2033.3 346.366 2056.22 374.119 2072.68 410.048C2089.15 445.976 2097.38 488.363 2097.38 537.209C2097.38 586.459 2089.15 629.149 2072.68 665.279C2056.22 701.207 2033.4 729.061 2004.24 748.842C1975.08 768.421 1941.45 778.21 1903.36 778.21C1874 778.21 1850.49 773.265 1832.84 763.375C1815.18 753.282 1801.59 741.878 1792.07 729.162C1782.55 716.244 1775.21 705.547 1770.05 697.069H1761.72V768.522H1693.87ZM1762.91 535.998C1762.91 571.119 1767.96 602.102 1778.08 628.947C1788.2 655.59 1802.98 676.481 1822.42 691.619C1841.86 706.556 1865.67 714.024 1893.84 714.024C1923.2 714.024 1947.7 706.152 1967.34 690.408C1987.18 674.463 2002.06 653.067 2011.98 626.222C2022.1 599.175 2027.15 569.1 2027.15 535.998C2027.15 503.299 2022.2 473.83 2012.28 447.59C2002.55 421.149 1987.78 400.258 1967.94 384.918C1948.3 369.376 1923.6 361.605 1893.84 361.605C1865.27 361.605 1841.27 368.972 1821.83 383.707C1802.38 398.24 1787.7 418.626 1777.78 444.866C1767.87 470.903 1762.91 501.281 1762.91 535.998Z" fill="black"/>
+<path d="M2204.81 768.522V303.474H2275.04V768.522H2204.81ZM2240.52 225.966C2226.83 225.966 2215.03 221.223 2205.11 211.736C2195.39 202.25 2190.52 190.846 2190.52 177.524C2190.52 164.202 2195.39 152.798 2205.11 143.311C2215.03 133.825 2226.83 129.081 2240.52 129.081C2254.21 129.081 2265.91 133.825 2275.63 143.311C2285.55 152.798 2290.51 164.202 2290.51 177.524C2290.51 190.846 2285.55 202.25 2275.63 211.736C2265.91 221.223 2254.21 225.966 2240.52 225.966Z" fill="black"/>
+<path d="M2602.45 303.474V364.027H2365.57V303.474H2602.45ZM2434.61 192.057H2504.84V635.305C2504.84 655.489 2507.72 670.628 2513.47 680.72C2519.42 690.61 2526.96 697.271 2536.09 700.702C2545.41 703.932 2555.23 705.546 2565.55 705.546C2573.28 705.546 2579.63 705.143 2584.59 704.335C2589.55 703.326 2593.52 702.519 2596.5 701.913L2610.78 766.1C2606.02 767.916 2599.37 769.733 2590.84 771.549C2582.31 773.568 2571.5 774.577 2558.41 774.577C2538.57 774.577 2519.12 770.237 2500.08 761.558C2481.23 752.879 2465.56 739.658 2453.06 721.896C2440.76 704.134 2434.61 681.729 2434.61 654.682V192.057Z" fill="black"/>
+<path d="M3023.67 407.625L2960.58 425.791C2956.61 415.094 2950.76 404.699 2943.02 394.607C2935.49 384.313 2925.17 375.835 2912.08 369.174C2898.98 362.513 2882.22 359.183 2861.79 359.183C2833.81 359.183 2810.5 365.743 2791.85 378.863C2773.41 391.781 2764.18 408.231 2764.18 428.213C2764.18 445.976 2770.53 460.004 2783.23 470.298C2795.92 480.592 2815.76 489.17 2842.74 496.033L2910.59 512.988C2951.46 523.08 2981.91 538.521 3001.94 559.311C3021.98 579.899 3032 606.441 3032 638.938C3032 665.581 3024.46 689.399 3009.38 710.391C2994.51 731.383 2973.67 747.934 2946.89 760.044C2920.11 772.155 2888.96 778.21 2853.45 778.21C2806.83 778.21 2768.25 767.916 2737.7 747.328C2707.14 726.74 2687.8 696.665 2679.67 657.104L2746.33 640.149C2752.67 665.178 2764.68 683.949 2782.33 696.464C2800.19 708.978 2823.5 715.235 2852.26 715.235C2885 715.235 2910.99 708.17 2930.23 694.041C2949.67 679.711 2959.39 662.554 2959.39 642.571C2959.39 626.424 2953.84 612.9 2942.73 602.001C2931.62 590.899 2914.56 582.624 2891.54 577.174L2815.36 559.008C2773.5 548.916 2742.75 533.273 2723.11 512.079C2703.67 490.684 2693.95 463.94 2693.95 431.847C2693.95 405.607 2701.19 382.395 2715.67 362.211C2730.36 342.026 2750.29 326.182 2775.49 314.676C2800.88 303.171 2829.65 297.419 2861.79 297.419C2907.02 297.419 2942.53 307.511 2968.32 327.695C2994.31 347.88 3012.76 374.523 3023.67 407.625Z" fill="black"/>
+</svg>

docs/logos/lnbits.svg

@@ -1 +1,19 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30"><g transform="translate(-2.9464 -5.625) scale(.17717)"><circle cx="101.2976" cy="116.4167" r="84.6667" fill="#673ab7" fill-rule="evenodd"/><path fill="#eee" d="M79.1105 71.9667v49.0613h13.3803v40.141l31.2208-53.5213h-17.8404l17.8404-35.681z"/></g></svg>
+<svg width="900" height="900" viewBox="0 0 900 900" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_i_10_29)">
+<circle cx="450" cy="450" r="450" fill="#1E1E1E"/>
+</g>
+<path d="M387.802 476.423L281.613 730.887L584.54 389.763H459.418L619.113 168.387H407.558L305.485 476.423H387.802Z" fill="#FF1FE1"/>
+<defs>
+<filter id="filter0_i_10_29" x="-0.1" y="-0.1" width="900.1" height="900.1" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feMorphology radius="0.6" operator="dilate" in="SourceAlpha" result="effect1_innerShadow_10_29"/>
+<feOffset dx="-1" dy="-0.4"/>
+<feGaussianBlur stdDeviation="0.35"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.121569 0 0 0 0 0.882353 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_10_29"/>
+</filter>
+</defs>
+</svg>

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1657114324,
-        "narHash": "sha256-fWuaUNXrHcz/ciHRHlcSO92dvV3EVS0GJQUSBO5JIB4=",
+        "lastModified": 1678470307,
+        "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a5c867d9fe9e4380452628e8f171c26b69fa9d3d",
+        "rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f",
         "type": "github"
       },
       "original": {
@@ -31,32 +31,19 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1657261001,
-        "narHash": "sha256-sUZeuRYfhG59uD6xafM07bc7bAIkpcGq84Vj4B+cyms=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0be91cefefde5701f8fa957904618a13e3bb51d8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "poetry2nix": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1657149754,
-        "narHash": "sha256-iSnZoqwNDDVoO175whSuvl4sS9lAb/2zZ3Sa4ywo970=",
+        "lastModified": 1678513806,
+        "narHash": "sha256-bEto1lp9bIQ+DlJsXQyRxN5l6B/oy3Skb7DueYRJJBo=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "fc1930e011dea149db81863aac22fe701f36f1b5",
+        "rev": "bf239d53fafb53cf439a72b3a50e86dd6a3984a5",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,7 +1,12 @@
 {
+  description = "LNbits, free and open-source Lightning wallet and accounts system";
+
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    poetry2nix.url = "github:nix-community/poetry2nix";
+    poetry2nix = {
+      url = "github:nix-community/poetry2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
   outputs = { self, nixpkgs, poetry2nix }@inputs:
     let
@@ -17,6 +22,7 @@
         default = pkgs.mkShell {
           buildInputs = with pkgs; [
             nodePackages.prettier
+            poetry
           ];
         };
       });
@@ -29,7 +35,6 @@
         default = self.packages.${system}.${projectName};
         ${projectName} = pkgs.poetry2nix.mkPoetryApplication {
           projectDir = ./.;
-          python = pkgs.python39;
         };
       });
       nixosModules = {

lnbits/app.py

@@ -7,21 +7,30 @@ import shutil
 import signal
 import sys
 import traceback
+from hashlib import sha256
 from http import HTTPStatus
 from typing import Callable, List
 
-from fastapi import FastAPI, Request
-from fastapi.exceptions import HTTPException, RequestValidationError
+from fastapi import FastAPI, HTTPException, Request
+from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.middleware.gzip import GZipMiddleware
-from fastapi.responses import JSONResponse
 from fastapi.staticfiles import StaticFiles
 from loguru import logger
+from slowapi import Limiter
+from slowapi.util import get_remote_address
+from starlette.responses import JSONResponse
 
 from lnbits.core.crud import get_installed_extensions
 from lnbits.core.helpers import migrate_extension_database
-from lnbits.core.tasks import register_task_listeners
-from lnbits.settings import get_wallet_class, set_wallet_class, settings
+from lnbits.core.services import websocketUpdater
+from lnbits.core.tasks import (  # register_watchdog,; unregister_watchdog,
+    register_killswitch,
+    register_task_listeners,
+)
+from lnbits.settings import settings
+from lnbits.tasks import cancel_all_tasks, create_permanent_task
+from lnbits.utils.cache import cache
+from lnbits.wallets import get_wallet_class, set_wallet_class
 
 from .commands import db_versions, load_disabled_extension_list, migrate_databases
 from .core import (
@@ -33,16 +42,16 @@ from .core import (
 from .core.services import check_admin_settings
 from .core.views.generic import core_html_routes
 from .extension_manager import Extension, InstallableExtension, get_valid_extensions
-from .helpers import (
-    get_css_vendored,
-    get_js_vendored,
-    template_renderer,
-    url_for_vendored,
+from .helpers import template_renderer
+from .middleware import (
+    CustomGZipMiddleware,
+    ExtensionsRedirectMiddleware,
+    InstalledExtensionMiddleware,
+    add_ip_block_middleware,
+    add_ratelimit_middleware,
 )
-from .middleware import ExtensionsRedirectMiddleware, InstalledExtensionMiddleware
 from .requestvars import g
 from .tasks import (
-    catch_everything_and_restart,
     check_pending_payments,
     internal_invoice_listener,
     invoice_listener,
@@ -51,12 +60,14 @@ from .tasks import (
 
 
 def create_app() -> FastAPI:
-
     configure_logger()
-
     app = FastAPI(
-        title="LNbits API",
-        description="API for LNbits, the free and open source bitcoin wallet and accounts system with plugins.",
+        title=settings.lnbits_title,
+        description=(
+            "API for LNbits, the free and open source bitcoin wallet and "
+            "accounts system with plugins."
+        ),
+        version=settings.version,
         license_info={
             "name": "MIT License",
             "url": "https://raw.githubusercontent.com/lnbits/lnbits/main/LICENSE",
@@ -76,60 +87,94 @@ def create_app() -> FastAPI:
         CORSMiddleware, allow_origins=["*"], allow_methods=["*"], allow_headers=["*"]
     )
 
-    app.add_middleware(GZipMiddleware, minimum_size=1000)
+    app.add_middleware(
+        CustomGZipMiddleware, minimum_size=1000, exclude_paths=["/api/v1/payments/sse"]
+    )
 
     # order of these two middlewares is important
     app.add_middleware(InstalledExtensionMiddleware)
     app.add_middleware(ExtensionsRedirectMiddleware)
 
     register_startup(app)
-    register_assets(app)
     register_routes(app)
     register_async_tasks(app)
     register_exception_handlers(app)
+    register_shutdown(app)
 
     # Allow registering new extensions routes without direct access to the `app` object
     setattr(core_app_extra, "register_new_ext_routes", register_new_ext_routes(app))
+    setattr(core_app_extra, "register_new_ratelimiter", register_new_ratelimiter(app))
 
     return app
 
 
 async def check_funding_source() -> None:
-
     original_sigint_handler = signal.getsignal(signal.SIGINT)
 
     def signal_handler(signal, frame):
-        logger.debug("SIGINT received, terminating LNbits.")
+        logger.debug(
+            f"SIGINT received, terminating LNbits. signal: {signal}, frame: {frame}"
+        )
         sys.exit(1)
 
     signal.signal(signal.SIGINT, signal_handler)
 
     WALLET = get_wallet_class()
+
+    # fallback to void after 30 seconds of failures
+    sleep_time = 5
+    timeout = int(30 / sleep_time)
+
+    balance = 0
+    retry_counter = 0
+
     while True:
         try:
             error_message, balance = await WALLET.status()
             if not error_message:
+                retry_counter = 0
                 break
+
             logger.error(
-                f"The backend for {WALLET.__class__.__name__} isn't working properly: '{error_message}'",
+                f"The backend for {WALLET.__class__.__name__} isn't "
+                f"working properly: '{error_message}'",
                 RuntimeWarning,
             )
-        except:
+        except Exception as e:
+            logger.error(f"Error connecting to {WALLET.__class__.__name__}: {e}")
             pass
-        logger.info("Retrying connection to backend in 5 seconds...")
-        await asyncio.sleep(5)
+
+        if settings.lnbits_admin_ui and retry_counter == timeout:
+            set_void_wallet_class()
+            WALLET = get_wallet_class()
+            break
+        else:
+            logger.warning(f"Retrying connection to backend in {sleep_time} seconds...")
+            retry_counter += 1
+            await asyncio.sleep(sleep_time)
+
     signal.signal(signal.SIGINT, original_sigint_handler)
+
     logger.info(
-        f"✔️ Backend {WALLET.__class__.__name__} connected and with a balance of {balance} msat."
+        f"✔️ Backend {WALLET.__class__.__name__} connected "
+        f"and with a balance of {balance} msat."
     )
 
 
+def set_void_wallet_class():
+    logger.warning(
+        "Fallback to VoidWallet, because the backend for "
+        f"{settings.lnbits_backend_wallet_class} isn't working properly"
+    )
+    set_wallet_class("VoidWallet")
+
+
 async def check_installed_extensions(app: FastAPI):
     """
-    Check extensions that have been installed, but for some reason no longer present in the 'lnbits/extensions' directory.
-    One reason might be a docker-container that was re-created.
-    The 'data' directory (where the '.zip' files live) is expected to persist state.
-    Zips that are missing will be re-downloaded.
+    Check extensions that have been installed, but for some reason no longer present in
+    the 'lnbits/extensions' directory. One reason might be a docker-container that was
+    re-created. The 'data' directory (where the '.zip' files live) is expected to
+    persist state. Zips that are missing will be re-downloaded.
     """
     shutil.rmtree(os.path.join("lnbits", "upgrades"), True)
     await load_disabled_extension_list()
@@ -137,13 +182,22 @@ async def check_installed_extensions(app: FastAPI):
 
     for ext in installed_extensions:
         try:
-            installed = check_installed_extension(ext)
+            installed = check_installed_extension_files(ext)
             if not installed:
                 await restore_installed_extension(app, ext)
-                logger.info(f"✔️ Successfully re-installed extension: {ext.id}")
+                logger.info(
+                    "✔️ Successfully re-installed extension: "
+                    f"{ext.id} ({ext.installed_version})"
+                )
         except Exception as e:
             logger.warning(e)
-            logger.warning(f"Failed to re-install extension: {ext.id}")
+            logger.warning(
+                f"Failed to re-install extension: {ext.id} ({ext.installed_version})"
+            )
+
+    logger.info(f"Installed Extensions ({len(installed_extensions)}):")
+    for ext in installed_extensions:
+        logger.info(f"{ext.id} ({ext.installed_version})")
 
 
 async def build_all_installed_extensions_list() -> List[InstallableExtension]:
@@ -166,13 +220,11 @@ async def build_all_installed_extensions_list() -> List[InstallableExtension]:
                 id=ext_id, name=ext_id, installed_release=release, icon=release.icon
             )
             installed_extensions.append(ext_info)
-            await add_installed_extension(ext_info)
-            await update_installed_extension_state(ext_id=ext_id, active=True)
 
     return installed_extensions
 
 
-def check_installed_extension(ext: InstallableExtension) -> bool:
+def check_installed_extension_files(ext: InstallableExtension) -> bool:
     if ext.has_installed_version:
         return True
 
@@ -180,7 +232,7 @@ def check_installed_extension(ext: InstallableExtension) -> bool:
         os.path.join(settings.lnbits_data_folder, "extensions", "*.zip")
     )
 
-    if ext.zip_path not in zip_files:
+    if f"./{str(ext.zip_path)}" not in zip_files:
         ext.download_archive()
     ext.extract_archive()
 
@@ -188,6 +240,9 @@ def check_installed_extension(ext: InstallableExtension) -> bool:
 
 
 async def restore_installed_extension(app: FastAPI, ext: InstallableExtension):
+    await add_installed_extension(ext)
+    await update_installed_extension_state(ext_id=ext.id, active=True)
+
     extension = Extension.from_installable_ext(ext)
     register_ext_routes(app, extension)
 
@@ -217,13 +272,27 @@ def register_routes(app: FastAPI) -> None:
 
 def register_new_ext_routes(app: FastAPI) -> Callable:
     # Returns a function that registers new routes for an extension.
-    # The returned function encapsulates (creates a closure around) the `app` object but does expose it.
+    # The returned function encapsulates (creates a closure around)
+    # the `app` object but does expose it.
     def register_new_ext_routes_fn(ext: Extension):
         register_ext_routes(app, ext)
 
     return register_new_ext_routes_fn
 
 
+def register_new_ratelimiter(app: FastAPI) -> Callable:
+    def register_new_ratelimiter_fn():
+        limiter = Limiter(
+            key_func=get_remote_address,
+            default_limits=[
+                f"{settings.lnbits_rate_limit_no}/{settings.lnbits_rate_limit_unit}"
+            ],
+        )
+        app.state.limiter = limiter
+
+    return register_new_ratelimiter_fn
+
+
 def register_ext_routes(app: FastAPI, ext: Extension) -> None:
     """Register FastAPI routes for extension."""
     ext_module = importlib.import_module(ext.module_name)
@@ -257,7 +326,6 @@ def register_ext_routes(app: FastAPI, ext: Extension) -> None:
 def register_startup(app: FastAPI):
     @app.on_event("startup")
     async def lnbits_startup():
-
         try:
             # wait till migration is done
             await migrate_databases()
@@ -267,8 +335,19 @@ def register_startup(app: FastAPI):
 
             log_server_info()
 
+            # adds security middleware
+            add_ratelimit_middleware(app)
+            add_ip_block_middleware(app)
+
             # initialize WALLET
-            set_wallet_class()
+            try:
+                set_wallet_class()
+            except Exception as e:
+                logger.error(
+                    f"Error initializing {settings.lnbits_backend_wallet_class}: "
+                    f"{str(e)}"
+                )
+                set_void_wallet_class()
 
             # initialize funding source
             await check_funding_source()
@@ -276,13 +355,45 @@ def register_startup(app: FastAPI):
             # check extensions after restart
             await check_installed_extensions(app)
 
+            if settings.lnbits_admin_ui:
+                initialize_server_logger()
+
         except Exception as e:
             logger.error(str(e))
             raise ImportError("Failed to run 'startup' event.")
 
 
+def register_shutdown(app: FastAPI):
+    @app.on_event("shutdown")
+    async def on_shutdown():
+        cancel_all_tasks()
+        # wait a bit to allow them to finish, so that cleanup can run without problems
+        await asyncio.sleep(0.1)
+        WALLET = get_wallet_class()
+        await WALLET.cleanup()
+
+
+def initialize_server_logger():
+    super_user_hash = sha256(settings.super_user.encode("utf-8")).hexdigest()
+
+    serverlog_queue = asyncio.Queue()
+
+    async def update_websocket_serverlog():
+        while True:
+            msg = await serverlog_queue.get()
+            await websocketUpdater(super_user_hash, msg)
+
+    create_permanent_task(update_websocket_serverlog)
+
+    logger.add(
+        lambda msg: serverlog_queue.put_nowait(msg),
+        format=Formatter().format,
+    )
+
+
 def log_server_info():
     logger.info("Starting LNbits")
+    logger.info(f"Version: {settings.version}")
     logger.info(f"Baseurl: {settings.lnbits_baseurl}")
     logger.info(f"Host: {settings.host}")
     logger.info(f"Port: {settings.port}")
@@ -300,25 +411,14 @@ def get_db_vendor_name():
     return (
         "PostgreSQL"
         if db_url and db_url.startswith("postgres://")
-        else "CockroachDB"
-        if db_url and db_url.startswith("cockroachdb://")
-        else "SQLite"
+        else (
+            "CockroachDB"
+            if db_url and db_url.startswith("cockroachdb://")
+            else "SQLite"
+        )
     )
 
 
-def register_assets(app: FastAPI):
-    """Serve each vendored asset separately or a bundle."""
-
-    @app.on_event("startup")
-    async def vendored_assets_variable():
-        if settings.debug:
-            g().VENDORED_JS = map(url_for_vendored, get_js_vendored())
-            g().VENDORED_CSS = map(url_for_vendored, get_css_vendored())
-        else:
-            g().VENDORED_JS = ["/static/bundle.js"]
-            g().VENDORED_CSS = ["/static/bundle.css"]
-
-
 def register_async_tasks(app):
     @app.route("/wallet/webhook")
     async def webhook_listener():
@@ -326,17 +426,14 @@ def register_async_tasks(app):
 
     @app.on_event("startup")
     async def listeners():
-        loop = asyncio.get_event_loop()
-        loop.create_task(catch_everything_and_restart(check_pending_payments))
-        loop.create_task(catch_everything_and_restart(invoice_listener))
-        loop.create_task(catch_everything_and_restart(internal_invoice_listener))
-        await register_task_listeners()
+        create_permanent_task(check_pending_payments)
+        create_permanent_task(invoice_listener)
+        create_permanent_task(internal_invoice_listener)
+        create_permanent_task(cache.invalidate_forever)
+        register_task_listeners()
+        register_killswitch()
         # await run_deferred_async() # calle: doesn't do anyting?
 
-    @app.on_event("shutdown")
-    async def stop_listeners():
-        pass
-
 
 def register_exception_handlers(app: FastAPI):
     @app.exception_handler(Exception)
@@ -412,23 +509,32 @@ def configure_logger() -> None:
     logger.remove()
     log_level: str = "DEBUG" if settings.debug else "INFO"
     formatter = Formatter()
-    logger.add(sys.stderr, level=log_level, format=formatter.format)
-
+    logger.add(sys.stdout, level=log_level, format=formatter.format)
     logging.getLogger("uvicorn").handlers = [InterceptHandler()]
     logging.getLogger("uvicorn.access").handlers = [InterceptHandler()]
+    logging.getLogger("uvicorn.error").handlers = [InterceptHandler()]
+    logging.getLogger("uvicorn.error").propagate = False
 
 
 class Formatter:
     def __init__(self):
         self.padding = 0
-        self.minimal_fmt: str = "<green>{time:YYYY-MM-DD HH:mm:ss.SS}</green> | <level>{level}</level> | <level>{message}</level>\n"
+        self.minimal_fmt = (
+            "<green>{time:YYYY-MM-DD HH:mm:ss.SS}</green> | <level>{level}</level> | "
+            "<level>{message}</level>\n"
+        )
         if settings.debug:
-            self.fmt: str = "<green>{time:YYYY-MM-DD HH:mm:ss.SS}</green> | <level>{level: <4}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> | <level>{message}</level>\n"
+            self.fmt = (
+                "<green>{time:YYYY-MM-DD HH:mm:ss.SS}</green> | "
+                "<level>{level: <4}</level> | "
+                "<cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> | "
+                "<level>{message}</level>\n"
+            )
         else:
-            self.fmt: str = self.minimal_fmt
+            self.fmt = self.minimal_fmt
 
     def format(self, record):
-        function = "{function}".format(**record)  # pylint: disable=C0209
+        function = "{function}".format(**record)
         if function == "emit":  # uvicorn logs
             return self.minimal_fmt
         return self.fmt

lnbits/bolt11.py

@@ -66,11 +66,12 @@ def decode(pr: str) -> Invoice:
             invoice.amount_msat = _unshorten_amount(amountstr)
 
     # pull out date
-    invoice.date = data.read(35).uint
+    date_bin = data.read(35)
+    invoice.date = date_bin.uint  # type: ignore
 
     while data.pos != data.len:
         tag, tagdata, data = _pull_tagged(data)
-        data_length = len(tagdata) / 5
+        data_length = len(tagdata or []) / 5
 
         if tag == "d":
             invoice.description = _trim_to_bytes(tagdata).decode()
@@ -79,7 +80,7 @@ def decode(pr: str) -> Invoice:
         elif tag == "p" and data_length == 52:
             invoice.payment_hash = _trim_to_bytes(tagdata).hex()
         elif tag == "x":
-            invoice.expiry = tagdata.uint
+            invoice.expiry = tagdata.uint  # type: ignore
         elif tag == "n":
             invoice.payee = _trim_to_bytes(tagdata).hex()
             # this won't work in most cases, we must extract the payee
@@ -90,11 +91,11 @@ def decode(pr: str) -> Invoice:
             s = bitstring.ConstBitStream(tagdata)
             while s.pos + 264 + 64 + 32 + 32 + 16 < s.len:
                 route = Route(
-                    pubkey=s.read(264).tobytes().hex(),
-                    short_channel_id=_readable_scid(s.read(64).intbe),
-                    base_fee_msat=s.read(32).intbe,
-                    ppm_fee=s.read(32).intbe,
-                    cltv=s.read(16).intbe,
+                    pubkey=s.read(264).tobytes().hex(),  # type: ignore
+                    short_channel_id=_readable_scid(s.read(64).intbe),  # type: ignore
+                    base_fee_msat=s.read(32).intbe,  # type: ignore
+                    ppm_fee=s.read(32).intbe,  # type: ignore
+                    cltv=s.read(16).intbe,  # type: ignore
                 )
                 invoice.route_hints.append(route)
 
@@ -171,7 +172,7 @@ def lnencode(addr, privkey):
     else:
         amount = addr.currency if addr.currency else ""
 
-    hrp = "ln" + amount + "0n"
+    hrp = f"ln{amount}0n"
 
     # Start with the timestamp
     data = bitstring.pack("uint:35", addr.date)
@@ -181,7 +182,6 @@ def lnencode(addr, privkey):
     tags_set = set()
 
     for k, v in addr.tags:
-
         # BOLT #11:
         #
         # A writer MUST NOT include more than one `d`, `h`, `n` or `x` fields,
@@ -202,7 +202,8 @@ def lnencode(addr, privkey):
                 )
             data += tagged("r", route)
         elif k == "f":
-            data += encode_fallback(v, addr.currency)
+            # NOTE: there was an error fallback here that's now removed
+            continue
         elif k == "d":
             data += tagged_bytes("d", v.encode())
         elif k == "x":
@@ -244,7 +245,13 @@ def lnencode(addr, privkey):
 
 class LnAddr:
     def __init__(
-        self, paymenthash=None, amount=None, currency="bc", tags=None, date=None
+        self,
+        paymenthash=None,
+        amount=None,
+        currency="bc",
+        tags=None,
+        date=None,
+        fallback=None,
     ):
         self.date = int(time.time()) if not date else int(date)
         self.tags = [] if not tags else tags
@@ -252,12 +259,14 @@ class LnAddr:
         self.paymenthash = paymenthash
         self.signature = None
         self.pubkey = None
+        self.fallback = fallback
         self.currency = currency
         self.amount = amount
 
     def __str__(self):
-        pubkey = bytes.hex(self.pubkey.serialize()).decode()
-        tags = ", ".join([k + "=" + str(v) for k, v in self.tags])
+        assert self.pubkey, "LnAddr, pubkey must be set"
+        pubkey = bytes.hex(self.pubkey.serialize())
+        tags = ", ".join([f"{k}={v}" for k, v in self.tags])
         return f"LnAddr[{pubkey}, amount={self.amount}{self.currency} tags=[{tags}]]"
 
 
@@ -266,6 +275,7 @@ def shorten_amount(amount):
     # Convert to pico initially
     amount = int(amount * 10**12)
     units = ["p", "n", "u", "m", ""]
+    unit = ""
     for unit in units:
         if amount % 1000 == 0:
             amount //= 1000
@@ -304,32 +314,24 @@ def _pull_tagged(stream):
     return (CHARSET[tag], stream.read(length * 5), stream)
 
 
-def is_p2pkh(currency, prefix):
-    return prefix == base58_prefix_map[currency][0]
-
-
-def is_p2sh(currency, prefix):
-    return prefix == base58_prefix_map[currency][1]
-
-
 # Tagged field containing BitArray
-def tagged(char, l):
+def tagged(char, bits):
     # Tagged fields need to be zero-padded to 5 bits.
-    while l.len % 5 != 0:
-        l.append("0b0")
+    while bits.len % 5 != 0:
+        bits.append("0b0")
     return (
         bitstring.pack(
             "uint:5, uint:5, uint:5",
             CHARSET.find(char),
-            (l.len / 5) / 32,
-            (l.len / 5) % 32,
+            (bits.len / 5) / 32,
+            (bits.len / 5) % 32,
         )
-        + l
+        + bits
     )
 
 
-def tagged_bytes(char, l):
-    return tagged(char, bitstring.BitArray(l))
+def tagged_bytes(char, bits):
+    return tagged(char, bitstring.BitArray(bits))
 
 
 def _trim_to_bytes(barr):
@@ -359,5 +361,5 @@ def bitarray_to_u5(barr):
     ret = []
     s = bitstring.ConstBitStream(barr)
     while s.pos != s.len:
-        ret.append(s.read(5).uint)
+        ret.append(s.read(5).uint)  # type: ignore
     return ret

lnbits/commands.py

@@ -1,6 +1,4 @@
 import asyncio
-import os
-import warnings
 
 import click
 from loguru import logger
@@ -13,56 +11,58 @@ from .core.crud import get_dbversions, get_inactive_extensions
 from .core.helpers import migrate_extension_database, run_migration
 from .db import COCKROACH, POSTGRES, SQLITE
 from .extension_manager import get_valid_extensions
-from .helpers import get_css_vendored, get_js_vendored, url_for_vendored
 
 
-@click.command("migrate")
-def db_migrate():
+@click.group()
+def command_group():
+    """
+    Python CLI for LNbits
+    """
+
+
+@click.command("superuser")
+def superuser():
+    """Prints the superuser"""
+    with open(".super_user", "r") as file:
+        print(f"http://{settings.host}:{settings.port}/wallet?usr={file.readline()}")
+
+
+@click.command("delete-settings")
+def delete_settings():
+    """Deletes the settings"""
+
+    async def wrap():
+        async with core_db.connect() as conn:
+            await conn.execute("DELETE from settings")
+
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(wrap())
+
+
+@click.command("database-migrate")
+def database_migrate():
+    """Migrate databases"""
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(migrate_databases())
+
+
+async def db_migrate():
     asyncio.create_task(migrate_databases())
 
 
-@click.command("assets")
-def handle_assets():
-    transpile_scss()
-    bundle_vendored()
-
-
-def transpile_scss():
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore")
-        from scss.compiler import compile_string  # type: ignore
-
-        with open(os.path.join(settings.lnbits_path, "static/scss/base.scss")) as scss:
-            with open(
-                os.path.join(settings.lnbits_path, "static/css/base.css"), "w"
-            ) as css:
-                css.write(compile_string(scss.read()))
-
-
-def bundle_vendored():
-    for getfiles, outputpath in [
-        (get_js_vendored, os.path.join(settings.lnbits_path, "static/bundle.js")),
-        (get_css_vendored, os.path.join(settings.lnbits_path, "static/bundle.css")),
-    ]:
-        output = ""
-        for path in getfiles():
-            with open(path) as f:
-                output += "/* " + url_for_vendored(path) + " */\n" + f.read() + ";\n"
-        with open(outputpath, "w") as f:
-            f.write(output)
-
-
 async def migrate_databases():
     """Creates the necessary databases if they don't exist already; or migrates them."""
 
     async with core_db.connect() as conn:
+        exists = False
         if conn.type == SQLITE:
             exists = await conn.fetchone(
                 "SELECT * FROM sqlite_master WHERE type='table' AND name='dbversions'"
             )
         elif conn.type in {POSTGRES, COCKROACH}:
             exists = await conn.fetchone(
-                "SELECT * FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'dbversions'"
+                "SELECT * FROM information_schema.tables WHERE table_schema = 'public'"
+                " AND table_name = 'dbversions'"
             )
 
         if not exists:
@@ -79,13 +79,33 @@ async def migrate_databases():
     logger.info("✔️ All migrations done.")
 
 
+@click.command("database-versions")
+def database_versions():
+    """Show current database versions"""
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(db_versions())
+
+
 async def db_versions():
+    """Show current database versions"""
     async with core_db.connect() as conn:
-        current_versions = await get_dbversions(conn)
-        return current_versions
+        return await get_dbversions(conn)
 
 
 async def load_disabled_extension_list() -> None:
     """Update list of extensions that have been explicitly disabled"""
     inactive_extensions = await get_inactive_extensions()
     settings.lnbits_deactivated_extensions += inactive_extensions
+
+
+def main():
+    """main function"""
+    command_group.add_command(superuser)
+    command_group.add_command(delete_settings)
+    command_group.add_command(database_migrate)
+    command_group.add_command(database_versions)
+    command_group()
+
+
+if __name__ == "__main__":
+    main()

lnbits/core/__init__.py

@@ -5,11 +5,11 @@ from lnbits.db import Database
 
 db = Database("database")
 
-core_app: APIRouter = APIRouter()
+core_app: APIRouter = APIRouter(tags=["Core"])
 
 core_app_extra: CoreAppExtra = CoreAppExtra()
 
-from .views.admin_api import *  # noqa: F401,F403
-from .views.api import *  # noqa: F401,F403
-from .views.generic import *  # noqa: F401,F403
-from .views.public_api import *  # noqa: F401,F403
+from .views.admin_api import *
+from .views.api import *
+from .views.generic import *
+from .views.public_api import *

lnbits/core/crud.py

@@ -2,24 +2,32 @@ import datetime
 import json
 from typing import Any, Dict, List, Optional
 from urllib.parse import urlparse
-from uuid import uuid4
+from uuid import UUID, uuid4
 
 import shortuuid
 
 from lnbits import bolt11
-from lnbits.db import COCKROACH, POSTGRES, Connection
+from lnbits.core.models import WalletType
+from lnbits.db import Connection, Database, Filters, Page
 from lnbits.extension_manager import InstallableExtension
 from lnbits.settings import AdminSettings, EditableSettings, SuperSettings, settings
 
 from . import db
-from .models import BalanceCheck, Payment, TinyURL, User, Wallet
+from .models import BalanceCheck, Payment, PaymentFilters, TinyURL, User, Wallet
 
 # accounts
 # --------
 
 
-async def create_account(conn: Optional[Connection] = None) -> User:
-    user_id = uuid4().hex
+async def create_account(
+    conn: Optional[Connection] = None, user_id: Optional[str] = None
+) -> User:
+    if user_id:
+        user_uuid4 = UUID(hex=user_id, version=4)
+        assert user_uuid4.hex == user_id, "User ID is not valid UUID4 hex string"
+    else:
+        user_id = uuid4().hex
+
     await (conn or db).execute("INSERT INTO accounts (id) VALUES (?)", (user_id,))
 
     new_account = await get_account(user_id=user_id, conn=conn)
@@ -50,7 +58,9 @@ async def get_user(user_id: str, conn: Optional[Connection] = None) -> Optional[
         )
         wallets = await (conn or db).fetchall(
             """
-            SELECT *, COALESCE((SELECT balance FROM balances WHERE wallet = wallets.id), 0) AS balance_msat
+            SELECT *, COALESCE((
+                SELECT balance FROM balances WHERE wallet = wallets.id
+            ), 0) AS balance_msat
             FROM wallets
             WHERE "user" = ?
             """,
@@ -62,10 +72,13 @@ async def get_user(user_id: str, conn: Optional[Connection] = None) -> Optional[
     return User(
         id=user["id"],
         email=user["email"],
-        extensions=[e[0] for e in extensions],
+        extensions=[
+            e[0] for e in extensions if User.is_extension_for_user(e[0], user["id"])
+        ],
         wallets=[Wallet(**w) for w in wallets],
         admin=user["id"] == settings.super_user
         or user["id"] in settings.lnbits_admin_users,
+        super_user=user["id"] == settings.super_user,
     )
 
 
@@ -78,9 +91,9 @@ async def add_installed_extension(
     conn: Optional[Connection] = None,
 ) -> None:
     meta = {
-        "installed_release": dict(ext.installed_release)
-        if ext.installed_release
-        else None,
+        "installed_release": (
+            dict(ext.installed_release) if ext.installed_release else None
+        ),
         "dependencies": ext.dependencies,
     }
 
@@ -88,9 +101,11 @@ async def add_installed_extension(
 
     await (conn or db).execute(
         """
-        INSERT INTO installed_extensions (id, version, name, short_description, icon, stars, meta) VALUES (?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (id) DO
-        UPDATE SET (version, name, active, short_description, icon, stars, meta) = (?, ?, ?, ?, ?, ?, ?)
+        INSERT INTO installed_extensions
+        (id, version, name, short_description, icon, stars, meta)
+        VALUES (?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET
+        (version, name, active, short_description, icon, stars, meta) =
+        (?, ?, ?, ?, ?, ?, ?)
         """,
         (
             ext.id,
@@ -133,6 +148,25 @@ async def delete_installed_extension(
     )
 
 
+async def drop_extension_db(*, ext_id: str, conn: Optional[Connection] = None) -> None:
+    db_version = await (conn or db).fetchone(
+        "SELECT * FROM dbversions WHERE db = ?", (ext_id,)
+    )
+    # Check that 'ext_id' is a valid extension id and not a malicious string
+    assert db_version, f"Extension '{ext_id}' db version cannot be found"
+
+    is_file_based_db = await Database.clean_ext_db_files(ext_id)
+    if is_file_based_db:
+        return
+
+    # String formatting is required, params are not accepted for 'DROP SCHEMA'.
+    # The `ext_id` value is verified above.
+    await (conn or db).execute(
+        f"DROP SCHEMA IF EXISTS {ext_id} CASCADE",
+        (),
+    )
+
+
 async def get_installed_extension(ext_id: str, conn: Optional[Connection] = None):
     row = await (conn or db).fetchone(
         "SELECT * FROM installed_extensions WHERE id = ?",
@@ -204,16 +238,29 @@ async def create_wallet(
 
 
 async def update_wallet(
-    wallet_id: str, new_name: str, conn: Optional[Connection] = None
+    wallet_id: str,
+    name: Optional[str] = None,
+    currency: Optional[str] = None,
+    conn: Optional[Connection] = None,
 ) -> Optional[Wallet]:
-    return await (conn or db).execute(
-        """
-        UPDATE wallets SET
-            name = ?
-        WHERE id = ?
+    set_clause = []
+    values = []
+    if name:
+        set_clause.append("name = ?")
+        values.append(name)
+    if currency is not None:
+        set_clause.append("currency = ?")
+        values.append(currency)
+    values.append(wallet_id)
+    await (conn or db).execute(
+        f"""
+        UPDATE wallets SET {', '.join(set_clause)} WHERE id = ?
         """,
-        (new_name, wallet_id),
+        tuple(values),
     )
+    wallet = await get_wallet(wallet_id=wallet_id, conn=conn)
+    assert wallet, "updated created wallet couldn't be retrieved"
+    return wallet
 
 
 async def delete_wallet(
@@ -237,9 +284,8 @@ async def get_wallet(
 ) -> Optional[Wallet]:
     row = await (conn or db).fetchone(
         """
-        SELECT *, COALESCE((SELECT balance FROM balances WHERE wallet = wallets.id), 0) AS balance_msat
-        FROM wallets
-        WHERE id = ?
+        SELECT *, COALESCE((SELECT balance FROM balances WHERE wallet = wallets.id), 0)
+        AS balance_msat FROM wallets WHERE id = ?
         """,
         (wallet_id,),
     )
@@ -248,13 +294,14 @@ async def get_wallet(
 
 
 async def get_wallet_for_key(
-    key: str, key_type: str = "invoice", conn: Optional[Connection] = None
+    key: str,
+    key_type: WalletType = WalletType.invoice,
+    conn: Optional[Connection] = None,
 ) -> Optional[Wallet]:
     row = await (conn or db).fetchone(
         """
-        SELECT *, COALESCE((SELECT balance FROM balances WHERE wallet = wallets.id), 0) AS balance_msat
-        FROM wallets
-        WHERE adminkey = ? OR inkey = ?
+        SELECT *, COALESCE((SELECT balance FROM balances WHERE wallet = wallets.id), 0)
+        AS balance_msat FROM wallets WHERE adminkey = ? OR inkey = ?
         """,
         (key, key),
     )
@@ -262,7 +309,7 @@ async def get_wallet_for_key(
     if not row:
         return None
 
-    if key_type == "admin" and row["adminkey"] != key:
+    if key_type == WalletType.admin and row["adminkey"] != key:
         return None
 
     return Wallet(**row)
@@ -273,6 +320,11 @@ async def get_total_balance(conn: Optional[Connection] = None):
     return 0 if row[0] is None else row[0]
 
 
+async def get_active_wallet_total_balance(conn: Optional[Connection] = None):
+    row = await (conn or db).fetchone("SELECT SUM(balance) FROM balances")
+    return 0 if row[0] is None else row[0]
+
+
 # wallet payments
 # ---------------
 
@@ -324,7 +376,7 @@ async def get_latest_payments_by_extension(ext_name: str, ext_id: str, limit: in
     rows = await db.fetchall(
         f"""
         SELECT * FROM apipayments
-        WHERE pending = 'false'
+        WHERE pending = false
         AND extra LIKE ?
         AND extra LIKE ?
         ORDER BY time DESC LIMIT {limit}
@@ -338,7 +390,7 @@ async def get_latest_payments_by_extension(ext_name: str, ext_id: str, limit: in
     return rows
 
 
-async def get_payments(
+async def get_payments_paginated(
     *,
     wallet_id: Optional[str] = None,
     complete: bool = False,
@@ -347,29 +399,23 @@ async def get_payments(
     incoming: bool = False,
     since: Optional[int] = None,
     exclude_uncheckable: bool = False,
-    limit: Optional[int] = None,
-    offset: Optional[int] = None,
+    filters: Optional[Filters[PaymentFilters]] = None,
     conn: Optional[Connection] = None,
-) -> List[Payment]:
+) -> Page[Payment]:
     """
     Filters payments to be returned by complete | pending | outgoing | incoming.
     """
 
-    args: List[Any] = []
+    values: List[Any] = []
     clause: List[str] = []
 
     if since is not None:
-        if db.type == POSTGRES:
-            clause.append("time > to_timestamp(?)")
-        elif db.type == COCKROACH:
-            clause.append("time > cast(? AS timestamp)")
-        else:
-            clause.append("time > ?")
-        args.append(since)
+        clause.append(f"time > {db.timestamp_placeholder}")
+        values.append(since)
 
     if wallet_id:
         clause.append("wallet = ?")
-        args.append(wallet_id)
+        values.append(wallet_id)
 
     if complete and pending:
         pass
@@ -393,30 +439,53 @@ async def get_payments(
         clause.append("checking_id NOT LIKE 'temp_%'")
         clause.append("checking_id NOT LIKE 'internal_%'")
 
-    limit_clause = f"LIMIT {limit}" if type(limit) == int and limit > 0 else ""
-    offset_clause = f"OFFSET {offset}" if type(offset) == int and offset > 0 else ""
-    # combine limit and offset clauses
-    limit_offset_clause = (
-        f"{limit_clause} {offset_clause}"
-        if limit_clause and offset_clause
-        else limit_clause or offset_clause
+    return await (conn or db).fetch_page(
+        "SELECT * FROM apipayments",
+        clause,
+        values,
+        filters=filters,
+        model=Payment,
     )
 
-    where = ""
-    if clause:
-        where = f"WHERE {' AND '.join(clause)}"
 
-    rows = await (conn or db).fetchall(
-        f"""
-        SELECT *
-        FROM apipayments
-        {where}
-        ORDER BY time DESC
-        {limit_offset_clause}
-        """,
-        tuple(args),
+async def get_payments(
+    *,
+    wallet_id: Optional[str] = None,
+    complete: bool = False,
+    pending: bool = False,
+    outgoing: bool = False,
+    incoming: bool = False,
+    since: Optional[int] = None,
+    exclude_uncheckable: bool = False,
+    filters: Optional[Filters[PaymentFilters]] = None,
+    conn: Optional[Connection] = None,
+    limit: Optional[int] = None,
+    offset: Optional[int] = None,
+) -> list[Payment]:
+    """
+    Filters payments to be returned by complete | pending | outgoing | incoming.
+    """
+
+    filters = filters or Filters()
+
+    filters.sortby = filters.sortby or "time"
+    filters.direction = filters.direction or "desc"
+    filters.limit = limit or filters.limit
+    filters.offset = offset or filters.offset
+
+    page = await get_payments_paginated(
+        wallet_id=wallet_id,
+        complete=complete,
+        pending=pending,
+        outgoing=outgoing,
+        incoming=incoming,
+        since=since,
+        exclude_uncheckable=exclude_uncheckable,
+        filters=filters,
+        conn=conn,
     )
-    return [Payment.from_row(row) for row in rows]
+
+    return page.data
 
 
 async def delete_expired_invoices(
@@ -459,15 +528,14 @@ async def create_payment(
     webhook: Optional[str] = None,
     conn: Optional[Connection] = None,
 ) -> Payment:
-
     # todo: add this when tests are fixed
-    # previous_payment = await get_wallet_payment(wallet_id, payment_hash, conn=conn)
-    # assert previous_payment is None, "Payment already exists"
+    previous_payment = await get_wallet_payment(wallet_id, payment_hash, conn=conn)
+    assert previous_payment is None, "Payment already exists"
 
     try:
         invoice = bolt11.decode(payment_request)
         expiration_date = datetime.datetime.fromtimestamp(invoice.date + invoice.expiry)
-    except:
+    except Exception:
         # assume maximum bolt11 expiry of 31 days to be on the safe side
         expiration_date = datetime.datetime.now() + datetime.timedelta(days=31)
 
@@ -488,9 +556,11 @@ async def create_payment(
             pending,
             memo,
             fee,
-            json.dumps(extra)
-            if extra and extra != {} and type(extra) is dict
-            else None,
+            (
+                json.dumps(extra)
+                if extra and extra != {} and type(extra) is dict
+                else None
+            ),
             webhook,
             db.datetime_to_timestamp(expiration_date),
         ),
@@ -519,7 +589,6 @@ async def update_payment_details(
     new_checking_id: Optional[str] = None,
     conn: Optional[Connection] = None,
 ) -> None:
-
     set_clause: List[str] = []
     set_variables: List[Any] = []
 
@@ -553,7 +622,8 @@ async def update_payment_extra(
 ) -> None:
     """
     Only update the `extra` field for the payment.
-    Old values in the `extra` JSON object will be kept unless the new `extra` overwrites them.
+    Old values in the `extra` JSON object will be kept
+    unless the new `extra` overwrites them.
     """
 
     amount_clause = "AND amount < 0" if outgoing else "AND amount > 0"
@@ -604,6 +674,26 @@ async def check_internal(
         return row["checking_id"]
 
 
+async def check_internal_pending(
+    payment_hash: str, conn: Optional[Connection] = None
+) -> bool:
+    """
+    Returns False if the internal payment is not pending anymore
+    (and thus paid), otherwise True
+    """
+    row = await (conn or db).fetchone(
+        """
+        SELECT pending FROM apipayments
+        WHERE hash = ? AND amount > 0
+        """,
+        (payment_hash,),
+    )
+    if not row:
+        return True
+    else:
+        return row["pending"]
+
+
 # balance_check
 # -------------
 
@@ -690,7 +780,7 @@ async def get_admin_settings(is_super_user: bool = False) -> Optional[AdminSetti
     row_dict = dict(sets)
     row_dict.pop("super_user")
     admin_settings = AdminSettings(
-        super_user=is_super_user,
+        is_super_user=is_super_user,
         lnbits_allowed_funding_sources=settings.lnbits_allowed_funding_sources,
         **row_dict,
     )
@@ -705,15 +795,19 @@ async def update_admin_settings(data: EditableSettings):
     await db.execute("UPDATE settings SET editable_settings = ?", (json.dumps(data),))
 
 
-async def update_super_user(super_user: str):
+async def update_super_user(super_user: str) -> SuperSettings:
     await db.execute("UPDATE settings SET super_user = ?", (super_user,))
-    return await get_super_settings()
+    settings = await get_super_settings()
+    assert settings, "updated super_user settings could not be retrieved"
+    return settings
 
 
 async def create_admin_settings(super_user: str, new_settings: dict):
     sql = "INSERT INTO settings (super_user, editable_settings) VALUES (?, ?)"
     await db.execute(sql, (super_user, json.dumps(new_settings)))
-    return await get_super_settings()
+    settings = await get_super_settings()
+    assert settings, "created admin settings could not be retrieved"
+    return settings
 
 
 # db versions
@@ -733,6 +827,15 @@ async def update_migration_version(conn, db_name, version):
     )
 
 
+async def delete_dbversion(*, ext_id: str, conn: Optional[Connection] = None) -> None:
+    await (conn or db).execute(
+        """
+        DELETE FROM dbversions WHERE db = ?
+        """,
+        (ext_id,),
+    )
+
+
 # tinyurl
 # -------
 

lnbits/core/helpers.py

@@ -1,6 +1,7 @@
 import importlib
 import re
 from typing import Any
+from uuid import UUID
 
 import httpx
 from loguru import logger
@@ -50,7 +51,8 @@ async def stop_extension_background_work(ext_id: str, user: str):
     """
     Stop background work for extension (like asyncio.Tasks, WebSockets, etc).
     Extensions SHOULD expose a DELETE enpoint at the root level of their API.
-    This function tries first to call the endpoint using `http` and if if fails it tries using `https`.
+    This function tries first to call the endpoint using `http`
+    and if it fails it tries using `https`.
     """
     async with httpx.AsyncClient() as client:
         try:
@@ -63,3 +65,14 @@ async def stop_extension_background_work(ext_id: str, user: str):
                 url = f"https://{settings.host}:{settings.port}/{ext_id}/api/v1?usr={user}"
             except Exception as ex:
                 logger.warning(ex)
+
+
+def to_valid_user_id(user_id: str) -> UUID:
+    if len(user_id) < 32:
+        raise ValueError("User ID must have at least 128 bits")
+    try:
+        int(user_id, 16)
+    except Exception:
+        raise ValueError("Invalid hex string for User ID.")
+
+    return UUID(hex=user_id[:32], version=4)

lnbits/core/migrations.py

@@ -107,7 +107,7 @@ async def m002_add_fields_to_apipayments(db):
                 continue
 
             for ext in ["withdraw", "events", "lnticket", "paywall", "tpos"]:
-                prefix = "#" + ext + " "
+                prefix = f"#{ext} "
                 if row["memo"].startswith(prefix):
                     new = row["memo"][len(prefix) :]
                     await db.execute(
@@ -168,7 +168,8 @@ async def m004_ensure_fees_are_always_negative(db):
 
 async def m005_balance_check_balance_notify(db):
     """
-    Keep track of balanceCheck-enabled lnurl-withdrawals to be consumed by an LNbits wallet and of balanceNotify URLs supplied by users to empty their wallets.
+    Keep track of balanceCheck-enabled lnurl-withdrawals to be consumed by an
+    LNbits wallet and of balanceNotify URLs supplied by users to empty their wallets.
     """
 
     await db.execute(
@@ -238,7 +239,8 @@ async def m007_set_invoice_expiries(db):
                     invoice.date + invoice.expiry
                 )
                 logger.info(
-                    f"Migration: {i+1}/{len(rows)} setting expiry of invoice {invoice.payment_hash} to {expiration_date}"
+                    f"Migration: {i+1}/{len(rows)} setting expiry of invoice"
+                    f" {invoice.payment_hash} to {expiration_date}"
                 )
                 await db.execute(
                     """
@@ -250,7 +252,7 @@ async def m007_set_invoice_expiries(db):
                         checking_id,
                     ),
                 )
-            except:
+            except Exception:
                 continue
     except OperationalError:
         # this is necessary now because it may be the case that this migration will
@@ -300,3 +302,28 @@ async def m010_create_installed_extensions_table(db):
         );
     """
     )
+
+
+async def m011_optimize_balances_view(db):
+    """
+    Make the calculation of the balance a single aggregation
+    over the payments table instead of 2.
+    """
+    await db.execute("DROP VIEW balances")
+    await db.execute(
+        """
+        CREATE VIEW balances AS
+        SELECT wallet, SUM(amount - abs(fee)) AS balance
+        FROM apipayments
+        WHERE (pending = false AND amount > 0) OR amount < 0
+        GROUP BY wallet
+    """
+    )
+
+
+async def m012_add_currency_to_wallet(db):
+    await db.execute(
+        """
+        ALTER TABLE wallets ADD COLUMN currency TEXT
+        """
+    )

lnbits/core/models.py

@@ -3,17 +3,21 @@ import hashlib
 import hmac
 import json
 import time
+from dataclasses import dataclass
+from enum import Enum
 from sqlite3 import Row
 from typing import Callable, Dict, List, Optional
 
 from ecdsa import SECP256k1, SigningKey
+from fastapi import Query
 from lnurl import encode as lnurl_encode
 from loguru import logger
 from pydantic import BaseModel
 
-from lnbits.db import Connection
+from lnbits.db import Connection, FilterModel, FromRowModel
 from lnbits.helpers import url_for
-from lnbits.settings import get_wallet_class
+from lnbits.settings import settings
+from lnbits.wallets import get_wallet_class
 from lnbits.wallets.base import PaymentStatus
 
 
@@ -23,6 +27,7 @@ class Wallet(BaseModel):
     user: str
     adminkey: str
     inkey: str
+    currency: Optional[str]
     balance_msat: int
 
     @property
@@ -37,11 +42,10 @@ class Wallet(BaseModel):
 
     @property
     def lnurlwithdraw_full(self) -> str:
-
         url = url_for("/withdraw", external=True, usr=self.user, wal=self.id)
         try:
             return lnurl_encode(url)
-        except:
+        except Exception:
             return ""
 
     def lnurlauth_key(self, domain: str) -> SigningKey:
@@ -58,6 +62,22 @@ class Wallet(BaseModel):
         return await get_standalone_payment(payment_hash)
 
 
+class WalletType(Enum):
+    admin = 0
+    invoice = 1
+    invalid = 2
+
+    # backwards compatibility
+    def __eq__(self, other):
+        return self.value == other
+
+
+@dataclass
+class WalletTypeInfo:
+    wallet_type: WalletType
+    wallet: Wallet
+
+
 class User(BaseModel):
     id: str
     email: Optional[str] = None
@@ -75,8 +95,18 @@ class User(BaseModel):
         w = [wallet for wallet in self.wallets if wallet.id == wallet_id]
         return w[0] if w else None
 
+    @classmethod
+    def is_extension_for_user(cls, ext: str, user: str) -> bool:
+        if ext not in settings.lnbits_admin_extensions:
+            return True
+        if user == settings.super_user:
+            return True
+        if user in settings.lnbits_admin_users:
+            return True
+        return False
 
-class Payment(BaseModel):
+
+class Payment(FromRowModel):
     checking_id: str
     pending: bool
     amount: int
@@ -159,6 +189,8 @@ class Payment(BaseModel):
     async def set_pending(self, pending: bool) -> None:
         from .crud import update_payment_status
 
+        self.pending = pending
+
         await update_payment_status(self.checking_id, pending)
 
     async def check_status(
@@ -169,7 +201,8 @@ class Payment(BaseModel):
             return PaymentStatus(None)
 
         logger.debug(
-            f"Checking {'outgoing' if self.is_out else 'incoming'} pending payment {self.checking_id}"
+            f"Checking {'outgoing' if self.is_out else 'incoming'} "
+            f"pending payment {self.checking_id}"
         )
 
         WALLET = get_wallet_class()
@@ -183,7 +216,8 @@ class Payment(BaseModel):
         if self.is_in and status.pending and self.is_expired and self.expiry:
             expiration_date = datetime.datetime.fromtimestamp(self.expiry)
             logger.debug(
-                f"Deleting expired incoming pending payment {self.checking_id}: expired {expiration_date}"
+                f"Deleting expired incoming pending payment {self.checking_id}: "
+                f"expired {expiration_date}"
             )
             await self.delete(conn)
         elif self.is_out and status.failed:
@@ -193,7 +227,8 @@ class Payment(BaseModel):
             await self.delete(conn)
         elif not status.pending:
             logger.info(
-                f"Marking '{'in' if self.is_in else 'out'}' {self.checking_id} as not pending anymore: {status}"
+                f"Marking '{'in' if self.is_in else 'out'}' "
+                f"{self.checking_id} as not pending anymore: {status}"
             )
             await self.update_status(status, conn=conn)
         return status
@@ -204,6 +239,24 @@ class Payment(BaseModel):
         await delete_payment(self.checking_id, conn=conn)
 
 
+class PaymentFilters(FilterModel):
+    __search_fields__ = ["memo", "amount"]
+
+    checking_id: str
+    amount: int
+    fee: int
+    memo: Optional[str]
+    time: datetime.datetime
+    bolt11: str
+    preimage: str
+    payment_hash: str
+    expiry: Optional[datetime.datetime]
+    extra: Dict = {}
+    wallet_id: str
+    webhook: Optional[str]
+    webhook_status: Optional[int]
+
+
 class BalanceCheck(BaseModel):
     wallet: str
     service: str
@@ -216,6 +269,7 @@ class BalanceCheck(BaseModel):
 
 class CoreAppExtra:
     register_new_ext_routes: Callable
+    register_new_ratelimiter: Callable
 
 
 class TinyURL(BaseModel):
@@ -228,3 +282,50 @@ class TinyURL(BaseModel):
     @classmethod
     def from_row(cls, row: Row):
         return cls(**dict(row))
+
+
+class ConversionData(BaseModel):
+    from_: str = "sat"
+    amount: float
+    to: str = "usd"
+
+
+class Callback(BaseModel):
+    callback: str
+
+
+class DecodePayment(BaseModel):
+    data: str
+
+
+class CreateLnurl(BaseModel):
+    description_hash: str
+    callback: str
+    amount: int
+    comment: Optional[str] = None
+    description: Optional[str] = None
+
+
+class CreateInvoice(BaseModel):
+    unit: str = "sat"
+    internal: bool = False
+    out: bool = True
+    amount: float = Query(None, ge=0)
+    memo: Optional[str] = None
+    description_hash: Optional[str] = None
+    unhashed_description: Optional[str] = None
+    expiry: Optional[int] = None
+    lnurl_callback: Optional[str] = None
+    lnurl_balance_check: Optional[str] = None
+    extra: Optional[dict] = None
+    webhook: Optional[str] = None
+    bolt11: Optional[str] = None
+
+
+class CreateTopup(BaseModel):
+    id: str
+    amount: int
+
+
+class CreateLnurlAuth(BaseModel):
+    callback: str

lnbits/core/services.py

@@ -1,7 +1,7 @@
 import asyncio
 import json
 from io import BytesIO
-from typing import Dict, List, Optional, Tuple
+from typing import Dict, List, Optional, Tuple, TypedDict
 from urllib.parse import parse_qs, urlparse
 
 import httpx
@@ -13,39 +13,39 @@ from loguru import logger
 from lnbits import bolt11
 from lnbits.db import Connection
 from lnbits.decorators import WalletTypeInfo, require_admin_key
-from lnbits.helpers import url_for, urlsafe_short_hash
+from lnbits.helpers import url_for
 from lnbits.settings import (
-    FAKE_WALLET,
     EditableSettings,
-    get_wallet_class,
+    SuperSettings,
     readonly_variables,
     send_admin_user_to_saas,
     settings,
 )
+from lnbits.utils.exchange_rates import fiat_amount_as_satoshis, satoshis_amount_as_fiat
+from lnbits.wallets import FAKE_WALLET, get_wallet_class, set_wallet_class
 from lnbits.wallets.base import PaymentResponse, PaymentStatus
 
 from . import db
 from .crud import (
     check_internal,
+    check_internal_pending,
     create_account,
     create_admin_settings,
     create_payment,
     create_wallet,
     delete_wallet_payment,
     get_account,
+    get_standalone_payment,
     get_super_settings,
+    get_total_balance,
     get_wallet,
     get_wallet_payment,
     update_payment_details,
     update_payment_status,
     update_super_user,
 )
-from .models import Payment
-
-try:
-    from typing import TypedDict
-except ImportError:  # pragma: nocover
-    from typing_extensions import TypedDict
+from .helpers import to_valid_user_id
+from .models import Payment, Wallet
 
 
 class PaymentFailure(Exception):
@@ -56,10 +56,47 @@ class InvoiceFailure(Exception):
     pass
 
 
+async def calculate_fiat_amounts(
+    amount: float,
+    wallet_id: str,
+    currency: Optional[str] = None,
+    extra: Optional[Dict] = None,
+    conn: Optional[Connection] = None,
+) -> Tuple[int, Optional[Dict]]:
+    wallet = await get_wallet(wallet_id, conn=conn)
+    assert wallet, "invalid wallet_id"
+    wallet_currency = wallet.currency or settings.lnbits_default_accounting_currency
+
+    if currency and currency != "sat":
+        amount_sat = await fiat_amount_as_satoshis(amount, currency)
+        extra = extra or {}
+        if currency != wallet_currency:
+            extra["fiat_currency"] = currency
+            extra["fiat_amount"] = round(amount, ndigits=3)
+            extra["fiat_rate"] = amount_sat / amount
+    else:
+        amount_sat = int(amount)
+
+    if wallet_currency:
+        if wallet_currency == currency:
+            fiat_amount = amount
+        else:
+            fiat_amount = await satoshis_amount_as_fiat(amount_sat, wallet_currency)
+        extra = extra or {}
+        extra["wallet_fiat_currency"] = wallet_currency
+        extra["wallet_fiat_amount"] = round(fiat_amount, ndigits=3)
+        extra["wallet_fiat_rate"] = amount_sat / fiat_amount
+
+    logger.debug(f"Calculated fiat amounts for {wallet}: {extra=}")
+
+    return amount_sat, extra
+
+
 async def create_invoice(
     *,
     wallet_id: str,
-    amount: int,  # in satoshis
+    amount: float,
+    currency: Optional[str] = "sat",
     memo: str,
     description_hash: Optional[bytes] = None,
     unhashed_description: Optional[bytes] = None,
@@ -69,7 +106,6 @@ async def create_invoice(
     internal: Optional[bool] = False,
     conn: Optional[Connection] = None,
 ) -> Tuple[str, str]:
-
     if not amount > 0:
         raise InvoiceFailure("Amountless invoices not supported.")
 
@@ -78,19 +114,23 @@ async def create_invoice(
     # use the fake wallet if the invoice is for internal use only
     wallet = FAKE_WALLET if internal else get_wallet_class()
 
+    amount_sat, extra = await calculate_fiat_amounts(
+        amount, wallet_id, currency=currency, extra=extra, conn=conn
+    )
+
     ok, checking_id, payment_request, error_message = await wallet.create_invoice(
-        amount=amount,
+        amount=amount_sat,
         memo=invoice_memo,
         description_hash=description_hash,
         unhashed_description=unhashed_description,
         expiry=expiry or settings.lightning_invoice_expiry,
     )
-    if not ok:
+    if not ok or not payment_request or not checking_id:
         raise InvoiceFailure(error_message or "unexpected backend error.")
 
     invoice = bolt11.decode(payment_request)
 
-    amount_msat = amount * 1000
+    amount_msat = 1000 * amount_sat
     await create_payment(
         wallet_id=wallet_id,
         checking_id=checking_id,
@@ -117,16 +157,17 @@ async def pay_invoice(
 ) -> str:
     """
     Pay a Lightning invoice.
-    First, we create a temporary payment in the database with fees set to the reserve fee.
-    We then check whether the balance of the payer would go negative.
-    We then attempt to pay the invoice through the backend.
-    If the payment is successful, we update the payment in the database with the payment details.
+    First, we create a temporary payment in the database with fees set to the reserve
+    fee. We then check whether the balance of the payer would go negative.
+    We then attempt to pay the invoice through the backend. If the payment is
+    successful, we update the payment in the database with the payment details.
     If the payment is unsuccessful, we delete the temporary payment.
-    If the payment is still in flight, we hope that some other process will regularly check for the payment.
+    If the payment is still in flight, we hope that some other process
+    will regularly check for the payment.
     """
     invoice = bolt11.decode(payment_request)
     fee_reserve_msat = fee_reserve(invoice.amount_msat)
-    async with (db.reuse_conn(conn) if conn else db.connect()) as conn:
+    async with db.reuse_conn(conn) if conn else db.connect() as conn:
         temp_id = invoice.payment_hash
         internal_id = f"internal_{invoice.payment_hash}"
 
@@ -135,6 +176,10 @@ async def pay_invoice(
         if max_sat and invoice.amount_msat > max_sat * 1000:
             raise ValueError("Amount in invoice is too high.")
 
+        _, extra = await calculate_fiat_amounts(
+            invoice.amount_msat, wallet_id, extra=extra, conn=conn
+        )
+
         # put all parameters that don't change here
         class PaymentKwargs(TypedDict):
             wallet_id: str
@@ -153,12 +198,30 @@ async def pay_invoice(
             extra=extra,
         )
 
+        # we check if an internal invoice exists that has already been paid
+        # (not pending anymore)
+        if not await check_internal_pending(invoice.payment_hash, conn=conn):
+            raise PaymentFailure("Internal invoice already paid.")
+
         # check_internal() returns the checking_id of the invoice we're waiting for
+        # (pending only)
         internal_checking_id = await check_internal(invoice.payment_hash, conn=conn)
         if internal_checking_id:
+            # perform additional checks on the internal payment
+            # the payment hash is not enough to make sure that this is the same invoice
+            internal_invoice = await get_standalone_payment(
+                internal_checking_id, incoming=True, conn=conn
+            )
+            assert internal_invoice is not None
+            if (
+                internal_invoice.amount != invoice.amount_msat
+                or internal_invoice.bolt11 != payment_request.lower()
+            ):
+                raise PaymentFailure("Invalid invoice.")
+
             logger.debug(f"creating temporary internal payment with id {internal_id}")
             # create a new payment from this wallet
-            await create_payment(
+            new_payment = await create_payment(
                 checking_id=internal_id,
                 fee=0,
                 pending=False,
@@ -169,21 +232,27 @@ async def pay_invoice(
             logger.debug(f"creating temporary payment with id {temp_id}")
             # create a temporary payment here so we can check if
             # the balance is enough in the next step
-            await create_payment(
-                checking_id=temp_id,
-                fee=-fee_reserve_msat,
-                conn=conn,
-                **payment_kwargs,
-            )
+            try:
+                new_payment = await create_payment(
+                    checking_id=temp_id,
+                    fee=-fee_reserve_msat,
+                    conn=conn,
+                    **payment_kwargs,
+                )
+            except Exception as e:
+                logger.error(f"could not create temporary payment: {e}")
+                # happens if the same wallet tries to pay an invoice twice
+                raise PaymentFailure("Could not make payment.")
 
         # do the balance check
         wallet = await get_wallet(wallet_id, conn=conn)
-        assert wallet
+        assert wallet, "Wallet for balancecheck could not be fetched"
         if wallet.balance_msat < 0:
             logger.debug("balance is too low, deleting temporary payment")
             if not internal_checking_id and wallet.balance_msat > -fee_reserve_msat:
                 raise PaymentFailure(
-                    f"You must reserve at least ({round(fee_reserve_msat/1000)} sat) to cover potential routing fees."
+                    f"You must reserve at least ({round(fee_reserve_msat/1000)} sat) to"
+                    " cover potential routing fees."
                 )
             raise PermissionError("Insufficient balance.")
 
@@ -196,6 +265,7 @@ async def pay_invoice(
             await update_payment_status(
                 checking_id=internal_checking_id, pending=False, conn=conn
             )
+        await send_payment_notification(wallet, new_payment)
 
         # notify receiver asynchronously
         from lnbits.tasks import internal_invoice_queue
@@ -212,7 +282,8 @@ async def pay_invoice(
 
         if payment.checking_id and payment.checking_id != temp_id:
             logger.warning(
-                f"backend sent unexpected checking_id (expected: {temp_id} got: {payment.checking_id})"
+                f"backend sent unexpected checking_id (expected: {temp_id} got:"
+                f" {payment.checking_id})"
             )
 
         logger.debug(f"backend: pay_invoice finished {temp_id}")
@@ -228,6 +299,12 @@ async def pay_invoice(
                     new_checking_id=payment.checking_id,
                     conn=conn,
                 )
+                wallet = await get_wallet(wallet_id, conn=conn)
+                updated = await get_wallet_payment(
+                    wallet_id, payment.checking_id, conn=conn
+                )
+                if wallet and updated:
+                    await send_payment_notification(wallet, updated)
                 logger.debug(f"payment successful {payment.checking_id}")
         elif payment.checking_id is None and payment.ok is False:
             # payment failed
@@ -241,7 +318,8 @@ async def pay_invoice(
             )
         else:
             logger.warning(
-                f"didn't receive checking_id from backend, payment may be stuck in database: {temp_id}"
+                "didn't receive checking_id from backend, payment may be stuck in"
+                f" database: {temp_id}"
             )
 
     return invoice.payment_hash
@@ -273,9 +351,10 @@ async def redeem_lnurl_withdraw(
             extra=extra,
             conn=conn,
         )
-    except:
+    except Exception:
         logger.warning(
-            f"failed to create invoice on redeem_lnurl_withdraw from {lnurl}. params: {res}"
+            f"failed to create invoice on redeem_lnurl_withdraw "
+            f"from {lnurl}. params: {res}"
         )
         return None
 
@@ -326,19 +405,20 @@ async def perform_lnurlauth(
 
         return b
 
-    def encode_strict_der(r_int, s_int, order):
+    def encode_strict_der(r: int, s: int, order: int):
         # if s > order/2 verification will fail sometimes
-        # so we must fix it here (see https://github.com/indutny/elliptic/blob/e71b2d9359c5fe9437fbf46f1f05096de447de57/lib/elliptic/ec/index.js#L146-L147)
-        if s_int > order // 2:
-            s_int = order - s_int
+        # so we must fix it here see:
+        # https://github.com/indutny/elliptic/blob/e71b2d9359c5fe9437fbf46f1f05096de447de57/lib/elliptic/ec/index.js#L146-L147
+        if s > order // 2:
+            s = order - s
 
         # now we do the strict DER encoding copied from
         # https://github.com/KiriKiri/bip66 (without any checks)
-        r = int_to_bytes_suitable_der(r_int)
-        s = int_to_bytes_suitable_der(s_int)
+        r_temp = int_to_bytes_suitable_der(r)
+        s_temp = int_to_bytes_suitable_der(s)
 
-        r_len = len(r)
-        s_len = len(s)
+        r_len = len(r_temp)
+        s_len = len(s_temp)
         sign_len = 6 + r_len + s_len
 
         signature = BytesIO()
@@ -346,16 +426,17 @@ async def perform_lnurlauth(
         signature.write((sign_len - 2).to_bytes(1, "big", signed=False))
         signature.write(0x02.to_bytes(1, "big", signed=False))
         signature.write(r_len.to_bytes(1, "big", signed=False))
-        signature.write(r)
+        signature.write(r_temp)
         signature.write(0x02.to_bytes(1, "big", signed=False))
         signature.write(s_len.to_bytes(1, "big", signed=False))
-        signature.write(s)
+        signature.write(s_temp)
 
         return signature.getvalue()
 
     sig = key.sign_digest_deterministic(k1, sigencode=encode_strict_der)
 
     async with httpx.AsyncClient() as client:
+        assert key.verifying_key, "LNURLauth verifying_key does not exist"
         r = await client.get(
             callback,
             params={
@@ -386,38 +467,53 @@ async def check_transaction_status(
         return PaymentStatus(None)
     if not payment.pending:
         # note: before, we still checked the status of the payment again
-        return PaymentStatus(True)
+        return PaymentStatus(True, fee_msat=payment.fee)
 
     status: PaymentStatus = await payment.check_status()
     return status
 
 
-# WARN: this same value must be used for balance check and passed to WALLET.pay_invoice(), it may cause a vulnerability if the values differ
+# WARN: this same value must be used for balance check and passed to
+# WALLET.pay_invoice(), it may cause a vulnerability if the values differ
 def fee_reserve(amount_msat: int) -> int:
     reserve_min = settings.lnbits_reserve_fee_min
     reserve_percent = settings.lnbits_reserve_fee_percent
     return max(int(reserve_min), int(amount_msat * reserve_percent / 100.0))
 
 
-async def update_wallet_balance(wallet_id: str, amount: int):
-    internal_id = f"internal_{urlsafe_short_hash()}"
-    payment = await create_payment(
-        wallet_id=wallet_id,
-        checking_id=internal_id,
-        payment_request="admin_internal",
-        payment_hash="admin_internal",
-        amount=amount * 1000,
-        memo="Admin top up",
-        pending=False,
+async def send_payment_notification(wallet: Wallet, payment: Payment):
+    await websocketUpdater(
+        wallet.id,
+        json.dumps(
+            {
+                "wallet_balance": wallet.balance,
+                "payment": payment.dict(),
+            }
+        ),
     )
-    # manually send this for now
-    from lnbits.tasks import internal_invoice_queue
 
-    await internal_invoice_queue.put(internal_id)
-    return payment
+
+async def update_wallet_balance(wallet_id: str, amount: int):
+    payment_hash, _ = await create_invoice(
+        wallet_id=wallet_id,
+        amount=amount,
+        memo="Admin top up",
+        internal=True,
+    )
+    async with db.connect() as conn:
+        checking_id = await check_internal(payment_hash, conn=conn)
+        assert checking_id, "newly created checking_id cannot be retrieved"
+        await update_payment_status(checking_id=checking_id, pending=False, conn=conn)
+        # notify receiver asynchronously
+        from lnbits.tasks import internal_invoice_queue
+
+        await internal_invoice_queue.put(checking_id)
 
 
 async def check_admin_settings():
+    if settings.super_user:
+        settings.super_user = to_valid_user_id(settings.super_user).hex
+
     if settings.lnbits_admin_ui:
         settings_db = await get_super_settings()
         if not settings_db:
@@ -432,14 +528,13 @@ async def check_admin_settings():
 
         update_cached_settings(settings_db.dict())
 
-        # printing settings for debugging
-        logger.debug("Admin settings:")
-        for key, value in settings.dict(exclude_none=True).items():
-            logger.debug(f"{key}: {value}")
-
-        admin_url = f"{settings.lnbits_baseurl}wallet?usr={settings.super_user}"
+        admin_url = f'{settings.lnbits_baseurl}wallet?usr=<ID from ".super_user" file>'
         logger.success(f"✔️ Access super user account at: {admin_url}")
 
+        # saving it to .super_user file
+        with open(".super_user", "w") as file:
+            file.write(settings.super_user)
+
         # callback for saas
         if (
             settings.lnbits_saas_callback
@@ -454,19 +549,18 @@ def update_cached_settings(sets_dict: dict):
         if key not in readonly_variables:
             try:
                 setattr(settings, key, value)
-            except:
-                logger.error(f"error overriding setting: {key}, value: {value}")
+            except Exception:
+                logger.warning(f"Failed overriding setting: {key}, value: {value}")
     if "super_user" in sets_dict:
         setattr(settings, "super_user", sets_dict["super_user"])
 
 
-async def init_admin_settings(super_user: str = None):
+async def init_admin_settings(super_user: Optional[str] = None) -> SuperSettings:
     account = None
     if super_user:
         account = await get_account(super_user)
     if not account:
-        account = await create_account()
-        super_user = account.id
+        account = await create_account(user_id=super_user)
     if not account.wallets or len(account.wallets) == 0:
         await create_wallet(user_id=account.id)
 
@@ -476,12 +570,12 @@ async def init_admin_settings(super_user: str = None):
 
 
 class WebsocketConnectionManager:
-    def __init__(self):
+    def __init__(self) -> None:
         self.active_connections: List[WebSocket] = []
 
-    async def connect(self, websocket: WebSocket):
+    async def connect(self, websocket: WebSocket, item_id: str):
+        logger.debug(f"Websocket connected to {item_id}")
         await websocket.accept()
-        logger.debug(websocket)
         self.active_connections.append(websocket)
 
     def disconnect(self, websocket: WebSocket):
@@ -498,3 +592,20 @@ websocketManager = WebsocketConnectionManager()
 
 async def websocketUpdater(item_id, data):
     return await websocketManager.send_data(f"{data}", item_id)
+
+
+async def switch_to_voidwallet() -> None:
+    WALLET = get_wallet_class()
+    if WALLET.__class__.__name__ == "VoidWallet":
+        return
+    set_wallet_class("VoidWallet")
+    settings.lnbits_backend_wallet_class = "VoidWallet"
+
+
+async def get_balance_delta() -> Tuple[int, int, int]:
+    WALLET = get_wallet_class()
+    total_balance = await get_total_balance()
+    error_message, node_balance = await WALLET.status()
+    if error_message:
+        raise Exception(error_message)
+    return node_balance - total_balance, node_balance, total_balance

lnbits/core/static/js/extensions.js

@@ -1,43 +0,0 @@
-new Vue({
-  el: '#vue',
-  data: function () {
-    return {
-      searchTerm: '',
-      filteredExtensions: [],
-      maxStars: 5,
-      user: null
-    }
-  },
-  mounted() {
-    this.filteredExtensions = this.g.extensions
-  },
-  watch: {
-    searchTerm(term) {
-      // Reset the filter
-      this.filteredExtensions = this.g.extensions
-      if (term !== '') {
-        // Filter the extensions list
-        function extensionNameContains(searchTerm) {
-          return function (extension) {
-            return (
-              extension.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
-              extension.shortDescription
-                .toLowerCase()
-                .includes(searchTerm.toLowerCase())
-            )
-          }
-        }
-
-        this.filteredExtensions = this.filteredExtensions.filter(
-          extensionNameContains(term)
-        )
-      }
-    }
-  },
-  created() {
-    if (window.user) {
-      this.user = LNbits.map.user(window.user)
-    }
-  },
-  mixins: [windowMixin]
-})

lnbits/core/static/js/service-worker.js

@@ -1,5 +1,6 @@
-// the cache version gets updated every time there is a new deployment
-const CACHE_VERSION = 1
+// update cache version every time there is a new deployment
+// so the service worker reinitializes the cache
+const CACHE_VERSION = 53
 const CURRENT_CACHE = `lnbits-${CACHE_VERSION}-`
 
 const getApiKey = request => {

lnbits/core/static/js/wallet.js

@@ -137,6 +137,9 @@ new Vue({
           comment: ''
         },
         paymentChecker: null,
+        copy: {
+          show: false
+        },
         camera: {
           show: false,
           camera: 'auto'
@@ -146,36 +149,103 @@ new Vue({
       paymentsTable: {
         columns: [
           {
-            name: 'memo',
+            name: 'time',
             align: 'left',
-            label: 'Memo',
-            field: 'memo'
-          },
-          {
-            name: 'date',
-            align: 'left',
-            label: 'Date',
+            label: this.$t('memo') + '/' + this.$t('date'),
             field: 'date',
             sortable: true
           },
           {
-            name: 'sat',
+            name: 'amount',
             align: 'right',
-            label: 'Amount (' + LNBITS_DENOMINATION + ')',
+            label: this.$t('amount') + ' (' + LNBITS_DENOMINATION + ')',
+            field: 'sat',
+            sortable: true
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10,
+          page: 1,
+          sortBy: 'time',
+          descending: true,
+          rowsNumber: 10
+        },
+        filter: null,
+        loading: false
+      },
+      paymentsCSV: {
+        columns: [
+          {
+            name: 'pending',
+            align: 'left',
+            label: 'Pending',
+            field: 'pending'
+          },
+          {
+            name: 'memo',
+            align: 'left',
+            label: this.$t('memo'),
+            field: 'memo'
+          },
+          {
+            name: 'time',
+            align: 'left',
+            label: this.$t('date'),
+            field: 'date',
+            sortable: true
+          },
+          {
+            name: 'amount',
+            align: 'right',
+            label: this.$t('amount') + ' (' + LNBITS_DENOMINATION + ')',
             field: 'sat',
             sortable: true
           },
           {
             name: 'fee',
             align: 'right',
-            label: 'Fee (m' + LNBITS_DENOMINATION + ')',
+            label: this.$t('fee') + ' (m' + LNBITS_DENOMINATION + ')',
             field: 'fee'
+          },
+          {
+            name: 'tag',
+            align: 'right',
+            label: this.$t('tag'),
+            field: 'tag'
+          },
+          {
+            name: 'payment_hash',
+            align: 'right',
+            label: this.$t('payment_hash'),
+            field: 'payment_hash'
+          },
+          {
+            name: 'payment_proof',
+            align: 'right',
+            label: this.$t('payment_proof'),
+            field: 'payment_proof'
+          },
+          {
+            name: 'webhook',
+            align: 'right',
+            label: this.$t('webhook'),
+            field: 'webhook'
+          },
+          {
+            name: 'fiat_currency',
+            align: 'right',
+            label: 'Fiat Currency',
+            field: row => row.extra.wallet_fiat_currency
+          },
+          {
+            name: 'fiat_amount',
+            align: 'right',
+            label: 'Fiat Amount',
+            field: row => row.extra.wallet_fiat_amount
           }
         ],
-        pagination: {
-          rowsPerPage: 10
-        },
-        filter: null
+        filter: null,
+        loading: false
       },
       paymentsChart: {
         show: false
@@ -186,7 +256,10 @@ new Vue({
       },
       balance: 0,
       credit: 0,
-      newName: ''
+      update: {
+        name: null,
+        currency: null
+      }
     }
   },
   computed: {
@@ -243,7 +316,6 @@ new Vue({
       this.receive.data.amount = null
       this.receive.data.memo = null
       this.receive.unit = 'sat'
-      this.receive.paymentChecker = null
       this.receive.minMax = [0, 2100000000000000]
       this.receive.lnurl = null
       this.focusInput('setAmount')
@@ -253,6 +325,8 @@ new Vue({
       this.parse.invoice = null
       this.parse.lnurlpay = null
       this.parse.lnurlauth = null
+      this.parse.copy.show =
+        window.isSecureContext && navigator.clipboard?.readText !== undefined
       this.parse.data.request = ''
       this.parse.data.comment = ''
       this.parse.data.paymentChecker = null
@@ -285,11 +359,6 @@ new Vue({
           LNbits.utils.notifyApiError(error)
         })
     },
-    closeReceiveDialog: function () {
-      setTimeout(() => {
-        clearInterval(this.receive.paymentChecker)
-      }, 10000)
-    },
     closeParseDialog: function () {
       setTimeout(() => {
         clearInterval(this.parse.paymentChecker)
@@ -302,7 +371,6 @@ new Vue({
       if (this.receive.paymentHash === paymentHash) {
         this.receive.show = false
         this.receive.paymentHash = null
-        clearInterval(this.receive.paymentChecker)
       }
     },
     createInvoice: function () {
@@ -347,19 +415,7 @@ new Vue({
             }
           }
 
-          clearInterval(this.receive.paymentChecker)
-          setTimeout(() => {
-            clearInterval(this.receive.paymentChecker)
-          }, 40000)
-          this.receive.paymentChecker = setInterval(() => {
-            let hash = response.data.payment_hash
-
-            LNbits.api.getPayment(this.g.wallet, hash).then(response => {
-              if (response.data.paid) {
-                this.onPaymentReceived(hash)
-              }
-            })
-          }, 5000)
+          this.fetchPayments()
         })
         .catch(err => {
           LNbits.utils.notifyApiError(err)
@@ -466,6 +522,16 @@ new Vue({
         return
       }
 
+      // BIP-21 support
+      if (this.parse.data.request.toLowerCase().includes('lightning')) {
+        this.parse.data.request = this.parse.data.request.split('lightning=')[1]
+
+        // fail safe to check there's nothing after the lightning= part
+        if (this.parse.data.request.includes('&')) {
+          this.parse.data.request = this.parse.data.request.split('&')[0]
+        }
+      }
+
       let invoice
       try {
         invoice = decode(this.parse.data.request)
@@ -510,7 +576,7 @@ new Vue({
     payInvoice: function () {
       let dismissPaymentMsg = this.$q.notify({
         timeout: 0,
-        message: 'Processing payment...'
+        message: this.$t('processing_payment')
       })
 
       LNbits.api
@@ -654,16 +720,12 @@ new Vue({
           }
         })
     },
-    updateWalletName: function () {
-      let newName = this.newName
-      let adminkey = this.g.wallet.adminkey
-      if (!newName || !newName.length) return
+    updateWallet: function (data) {
       LNbits.api
-        .request('PUT', '/api/v1/wallet/' + newName, adminkey, {})
+        .request('PATCH', '/api/v1/wallet', this.g.wallet.adminkey, data)
         .then(res => {
-          this.newName = ''
           this.$q.notify({
-            message: `Wallet named updated.`,
+            message: `Wallet updated.`,
             type: 'positive',
             timeout: 3500
           })
@@ -674,7 +736,6 @@ new Vue({
           )
         })
         .catch(err => {
-          this.newName = ''
           LNbits.utils.notifyApiError(err)
         })
     },
@@ -685,16 +746,35 @@ new Vue({
           LNbits.href.deleteWallet(walletId, user)
         })
     },
-    fetchPayments: function () {
-      return LNbits.api.getPayments(this.g.wallet).then(response => {
-        this.payments = response.data
-          .map(obj => {
+    fetchPayments: function (props) {
+      // Props are passed by qasar when pagination or sorting changes
+      if (props) {
+        this.paymentsTable.pagination = props.pagination
+      }
+      let pagination = this.paymentsTable.pagination
+      this.paymentsTable.loading = true
+      const query = {
+        limit: pagination.rowsPerPage,
+        offset: (pagination.page - 1) * pagination.rowsPerPage,
+        sortby: pagination.sortBy ?? 'time',
+        direction: pagination.descending ? 'desc' : 'asc'
+      }
+      if (this.paymentsTable.filter) {
+        query.search = this.paymentsTable.filter
+      }
+      return LNbits.api
+        .getPayments(this.g.wallet, query)
+        .then(response => {
+          this.paymentsTable.loading = false
+          this.paymentsTable.pagination.rowsNumber = response.data.total
+          this.payments = response.data.data.map(obj => {
             return LNbits.map.payment(obj)
           })
-          .sort((a, b) => {
-            return b.time - a.time
-          })
-      })
+        })
+        .catch(err => {
+          this.paymentsTable.loading = false
+          LNbits.utils.notifyApiError(err)
+        })
     },
     fetchBalance: function () {
       LNbits.api.getWallet(this.g.wallet).then(response => {
@@ -709,14 +789,15 @@ new Vue({
       // status is important for export but it is not in paymentsTable
       // because it is manually added with payment detail link and icons
       // and would cause duplication in the list
-      let columns = structuredClone(this.paymentsTable.columns)
-      columns.unshift({
-        name: 'pending',
-        align: 'left',
-        label: 'Pending',
-        field: 'pending'
+      LNbits.api.getPayments(this.g.wallet, {}).then(response => {
+        const payments = response.data.data.map(LNbits.map.payment)
+        LNbits.utils.exportCSV(this.paymentsCSV.columns, payments)
+      })
+    },
+    pasteToTextArea: function () {
+      navigator.clipboard.readText().then(text => {
+        this.$refs.textArea.value = text
       })
-      LNbits.utils.exportCSV(columns, this.payments)
     }
   },
   watch: {
@@ -728,6 +809,9 @@ new Vue({
     this.fetchBalance()
     this.fetchPayments()
 
+    this.update.name = this.g.wallet.name
+    this.update.currency = this.g.wallet.currency
+
     LNbits.api
       .request('GET', '/api/v1/currencies')
       .then(response => {

lnbits/core/tasks.py

@@ -4,40 +4,107 @@ from typing import Dict
 import httpx
 from loguru import logger
 
-from lnbits.tasks import SseListenersDict, register_invoice_listener
+from lnbits.settings import get_wallet_class, settings
+from lnbits.tasks import (
+    SseListenersDict,
+    create_permanent_task,
+    create_task,
+    register_invoice_listener,
+)
 
 from . import db
-from .crud import get_balance_notify
+from .crud import get_balance_notify, get_wallet
 from .models import Payment
+from .services import get_balance_delta, send_payment_notification, switch_to_voidwallet
 
 api_invoice_listeners: Dict[str, asyncio.Queue] = SseListenersDict(
     "api_invoice_listeners"
 )
 
 
-async def register_task_listeners():
+def register_killswitch():
     """
-    Registers an invoice listener queue for the core tasks.
-    Incoming payaments in this queue will eventually trigger the signals sent to all other extensions
+    Registers a killswitch which will check lnbits-status repository for a signal from
+    LNbits and will switch to VoidWallet if the killswitch is triggered.
+    """
+    logger.debug("Starting killswitch task")
+    create_permanent_task(killswitch_task)
+
+
+async def killswitch_task():
+    while True:
+        WALLET = get_wallet_class()
+        if settings.lnbits_killswitch and WALLET.__class__.__name__ != "VoidWallet":
+            with httpx.Client() as client:
+                try:
+                    r = client.get(settings.lnbits_status_manifest, timeout=4)
+                    r.raise_for_status()
+                    if r.status_code == 200:
+                        ks = r.json().get("killswitch")
+                        if ks and ks == 1:
+                            logger.error(
+                                "Switching to VoidWallet. Killswitch triggered."
+                            )
+                            await switch_to_voidwallet()
+                except (httpx.ConnectError, httpx.RequestError):
+                    logger.error(
+                        "Cannot fetch lnbits status manifest."
+                        f" {settings.lnbits_status_manifest}"
+                    )
+        await asyncio.sleep(settings.lnbits_killswitch_interval * 60)
+
+
+async def register_watchdog():
+    """
+    Registers a watchdog which will check lnbits balance and nodebalance
+    and will switch to VoidWallet if the watchdog delta is reached.
+    """
+    # TODO: implement watchdog properly
+    # logger.debug("Starting watchdog task")
+    # create_permanent_task(watchdog_task)
+
+
+async def watchdog_task():
+    while True:
+        WALLET = get_wallet_class()
+        if settings.lnbits_watchdog and WALLET.__class__.__name__ != "VoidWallet":
+            try:
+                delta, *_ = await get_balance_delta()
+                logger.debug(f"Running watchdog task. current delta: {delta}")
+                if delta + settings.lnbits_watchdog_delta <= 0:
+                    logger.error(f"Switching to VoidWallet. current delta: {delta}")
+                    await switch_to_voidwallet()
+            except Exception as e:
+                logger.error("Error in watchdog task", e)
+        await asyncio.sleep(settings.lnbits_watchdog_interval * 60)
+
+
+def register_task_listeners():
+    """
+    Registers an invoice listener queue for the core tasks. Incoming payments in this
+    queue will eventually trigger the signals sent to all other extensions
     and fulfill other core tasks such as dispatching webhooks.
     """
     invoice_paid_queue = asyncio.Queue(5)
     # we register invoice_paid_queue to receive all incoming invoices
     register_invoice_listener(invoice_paid_queue, "core/tasks.py")
     # register a worker that will react to invoices
-    asyncio.create_task(wait_for_paid_invoices(invoice_paid_queue))
+    create_task(wait_for_paid_invoices(invoice_paid_queue))
 
 
 async def wait_for_paid_invoices(invoice_paid_queue: asyncio.Queue):
     """
-    This worker dispatches events to all extensions, dispatches webhooks and balance notifys.
+    This worker dispatches events to all extensions,
+    dispatches webhooks and balance notifys.
     """
     while True:
         payment = await invoice_paid_queue.get()
         logger.trace("received invoice paid event")
         # send information to sse channel
         await dispatch_api_invoice_listeners(payment)
-
+        wallet = await get_wallet(payment.wallet_id)
+        if wallet:
+            await send_payment_notification(wallet, payment)
         # dispatch webhook
         if payment.webhook and not payment.webhook_status:
             await dispatch_webhook(payment)
@@ -70,11 +137,15 @@ async def dispatch_webhook(payment: Payment):
     """
     Dispatches the webhook to the webhook url.
     """
+    logger.debug("sending webhook", payment.webhook)
+
+    if not payment.webhook:
+        return await mark_webhook_sent(payment, -1)
+
     async with httpx.AsyncClient() as client:
         data = payment.dict()
         try:
-            logger.debug("sending webhook", payment.webhook)
-            r = await client.post(payment.webhook, json=data, timeout=40)  # type: ignore
+            r = await client.post(payment.webhook, json=data, timeout=40)
             await mark_webhook_sent(payment, r.status_code)
         except (httpx.ConnectError, httpx.RequestError):
             await mark_webhook_sent(payment, -1)

lnbits/core/templates/admin/_tab_funding.html

@@ -9,7 +9,18 @@
           <ul>
             {%raw%}
             <li>Funding Source: {{settings.lnbits_backend_wallet_class}}</li>
-            <li>Balance: {{balance / 1000}} sats</li>
+            <li>
+              Node Balance: {{(auditData.node_balance_msats /
+              1000).toLocaleString()}} sats
+            </li>
+            <li>
+              LNbits Balance: {{(auditData.lnbits_balance_msats /
+              1000).toLocaleString()}} sats
+            </li>
+            <li>
+              Reserve Percent: {{(auditData.node_balance_msats /
+              auditData.lnbits_balance_msats * 100).toFixed(2)}} %
+            </li>
             {%endraw%}
           </ul>
           <br />
@@ -36,7 +47,8 @@
               <p>Invoice Expiry</p>
               <q-input
                 filled
-                v-model="formData.lightning_invoice_expiry"
+                v-model.number="formData.lightning_invoice_expiry"
+                type="number"
                 label="Invoice expiry (seconds)"
                 mask="#######"
               >

lnbits/core/templates/admin/_tab_security.html

@@ -0,0 +1,264 @@
+<q-tab-panel name="security">
+  <q-card-section class="q-pa-none">
+    <h6 class="q-my-none" v-text="$t('security_tools')"></h6>
+    <br />
+    <div>
+      <div class="row">
+        <div v-if="serverlogEnabled" class="column" style="width: 100%">
+          <div
+            class="col bg-primary"
+            style="padding-left: 5px; max-height: 20px; color: #fafafa"
+            v-text="$t('server_logs')"
+          ></div>
+          <div class="col" style="background-color: #292929">
+            <q-scroll-area
+              ref="logScroll"
+              style="padding: 10px; color: #fafafa; height: 320px"
+            >
+              <small v-for="log in logs"
+                >{% raw %}{{ log }}{% endraw %}<br
+              /></small>
+            </q-scroll-area>
+          </div>
+        </div>
+        <q-btn
+          @click="toggleServerLog"
+          dense
+          flat
+          color="primary"
+          :label="(serverlogEnabled) ? $t('disable_server_log') : $t('enable_server_log')"
+        ></q-btn>
+      </div>
+      <br />
+      <div class="row q-col-gutter-md">
+        <div class="col-12 col-md-12">
+          <p v-text="$t('ip_blocker')"></p>
+          <div class="row q-col-gutter-md">
+            <div class="col-6">
+              <q-input
+                filled
+                v-model="formBlockedIPs"
+                @keydown.enter="addBlockedIPs"
+                type="text"
+                :label="$t('enter_ip')"
+                :hint="$t('block_access_hint')"
+              >
+                <q-btn
+                  @click="addExtensionsManifest"
+                  dense
+                  flat
+                  icon="add"
+                ></q-btn>
+              </q-input>
+              <div>
+                {%raw%}
+                <q-chip
+                  v-for="blocked_ip in formData.lnbits_blocked_ips"
+                  :key="blocked_ip"
+                  removable
+                  @remove="removeBlockedIPs(blocked_ip)"
+                  color="primary"
+                  text-color="white"
+                >
+                  {{ blocked_ip }}
+                </q-chip>
+                {%endraw%}
+              </div>
+              <br />
+            </div>
+            <div class="col-6">
+              <q-input
+                filled
+                v-model="formAllowedIPs"
+                @keydown.enter="addAllowedIPs"
+                type="text"
+                :label="$t('enter_ip')"
+                :hint="$t('allow_access_hint')"
+              >
+                <q-btn
+                  @click="addExtensionsManifest"
+                  dense
+                  flat
+                  icon="add"
+                ></q-btn>
+              </q-input>
+              <div>
+                {%raw%}
+                <q-chip
+                  v-for="allowed_ip in formData.lnbits_allowed_ips"
+                  :key="allowed_ip"
+                  removable
+                  @remove="removeAllowedIPs(allowed_ip)"
+                  color="primary"
+                  text-color="white"
+                >
+                  {{ allowed_ip }}
+                </q-chip>
+                {%endraw%}
+              </div>
+              <br />
+            </div>
+          </div>
+        </div>
+        <div class="col-12 col-md-12">
+          <p v-text="$t('rate_limiter')"></p>
+          <div class="row q-col-gutter-md">
+            <div class="col-6">
+              <q-input
+                filled
+                type="number"
+                v-model.number="formData.lnbits_rate_limit_no"
+                :label="$t('number_of_requests')"
+              ></q-input>
+            </div>
+            <div class="col-6">
+              <q-select
+                filled
+                :options="[$t('second'),$t('minute'),$t('hour')]"
+                v-model="formData.lnbits_rate_limit_unit"
+                :label="$t('time_unit')"
+              ></q-select>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <br />
+    <div>
+      <div class="row q-col-gutter-md">
+        <div class="col-12 col-md-6">
+          <q-item tag="label" v-ripple>
+            <q-item-section>
+              <q-item-label v-text="$t('enable_notifications')"></q-item-label>
+              <q-item-label
+                caption
+                v-text="$t('enable_notifications_desc')"
+              ></q-item-label>
+            </q-item-section>
+            <q-item-section avatar>
+              <q-toggle
+                size="md"
+                v-model="formData.lnbits_notifications"
+                checked-icon="check"
+                color="green"
+                unchecked-icon="clear"
+              />
+            </q-item-section>
+          </q-item>
+          <br />
+          <p
+            v-if="!formData.lnbits_notifications"
+            v-text="$t('notifications_disabled')"
+          ></p>
+          <div v-if="formData.lnbits_notifications">
+            {% include "admin/_tab_security_notifications.html" %}
+          </div>
+          <br />
+          <div>
+            <p v-text="$t('notification_source')"></p>
+            <q-input
+              filled
+              v-model="formData.lnbits_status_manifest"
+              type="text"
+              :label="$t('notification_source_label')"
+            />
+          </div>
+          <br />
+        </div>
+        <div class="col-12 col-md-6">
+          <p v-text="$t('killswitch')"></p>
+          <q-item tag="label" v-ripple>
+            <q-item-section>
+              <q-item-label v-text="$t('enable_killswitch')"></q-item-label>
+              <q-item-label
+                caption
+                v-text="$t('enable_killswitch_desc')"
+              ></q-item-label>
+            </q-item-section>
+            <q-item-section avatar>
+              <q-toggle
+                size="md"
+                v-model="formData.lnbits_killswitch"
+                checked-icon="check"
+                color="green"
+                unchecked-icon="clear"
+              />
+            </q-item-section>
+          </q-item>
+          <q-item tag="label" v-ripple>
+            <q-item-section>
+              <q-item-label v-text="$t('killswitch_interval')"></q-item-label>
+              <q-item-label
+                caption
+                v-text="$t('killswitch_interval_desc')"
+              ></q-item-label>
+            </q-item-section>
+            <q-item-section>
+              <q-input
+                filled
+                v-model="formData.lnbits_killswitch_interval"
+                type="number"
+              />
+            </q-item-section>
+          </q-item>
+          <br />
+          <p v-text="$t('watchdog')"></p>
+          <q-item disabled tag="label" v-ripple>
+            <q-tooltip><span v-text="$t('coming_soon')"></span></q-tooltip>
+            <q-item-section>
+              <q-item-label v-text="$t('enable_watchdog')"></q-item-label>
+              <q-item-label
+                caption
+                v-text="$t('enable_watchdog_desc')"
+              ></q-item-label>
+            </q-item-section>
+            <q-item-section avatar>
+              <q-toggle
+                size="md"
+                v-model="formData.lnbits_watchdog"
+                checked-icon="check"
+                color="green"
+                unchecked-icon="clear"
+              />
+            </q-item-section>
+          </q-item>
+          <q-item disabled tag="label" v-ripple>
+            <q-tooltip><span v-text="$t('coming_soon')"></span></q-tooltip>
+            <q-item-section>
+              <q-item-label v-text="$t('watchdog_interval')"></q-item-label>
+              <q-item-label
+                caption
+                v-text="$t('watchdog_interval_desc')"
+              ></q-item-label>
+            </q-item-section>
+            <q-item-section>
+              <q-input
+                filled
+                v-model="formData.lnbits_watchdog_interval"
+                type="number"
+              />
+            </q-item-section>
+          </q-item>
+          <q-item disabled tag="label" v-ripple>
+            <q-tooltip><span v-text="$t('coming_soon')"></span></q-tooltip>
+            <q-item-section>
+              <q-item-label v-text="$t('watchdog_delta')"></q-item-label>
+              <q-item-label
+                caption
+                v-text="$t('watchdog_delta_desc')"
+              ></q-item-label>
+            </q-item-section>
+            <q-item-section>
+              <q-input
+                filled
+                v-model="formData.lnbits_watchdog_delta"
+                type="number"
+              />
+            </q-item-section>
+          </q-item>
+          <br />
+        </div>
+      </div>
+    </div>
+  </q-card-section>
+</q-tab-panel>

lnbits/core/templates/admin/_tab_security_notifications.html

@@ -0,0 +1,70 @@
+{% raw %}
+<q-banner v-if="updateAvailable" class="bg-primary text-white">
+  <q-icon size="28px" name="update"></q-icon>
+
+  <span v-text="$t('update_available', {version: statusData.version})"></span>
+  <template v-slot:action>
+    <a
+      class="q-btn"
+      color="white"
+      target="_blank"
+      href="https://github.com/lnbits/lnbits/releases"
+      v-text="$t('releases')"
+    ></a>
+  </template>
+</q-banner>
+<q-banner v-if="!updateAvailable" class="bg-green text-white">
+  <q-icon size="28px" name="checknark"></q-icon>
+  <span v-text="$t('latest_update', {version: statusData.version})"></span>
+</q-banner>
+<q-card>
+  <q-card-section>
+    <q-table
+      dense
+      flat
+      :data="statusData.notifications"
+      :columns="statusDataTable.columns"
+      :no-data-label="$t('no_notifications')"
+    >
+      <template v-slot:header="props">
+        <q-tr :props="props">
+          <q-th auto-width> </q-th>
+          <q-th v-for="col in props.cols" :key="col.name" :props="props"
+            >{{ col.label }}</q-th
+          >
+        </q-tr>
+      </template>
+      <template v-slot:body="props">
+        <q-tr :props="props">
+          <q-td auto-width class="text-center">
+            <q-icon
+              v-if="props.row.type === 'update'"
+              size="18px"
+              name="update"
+              color="green"
+            ></q-icon>
+            <q-icon
+              v-if="props.row.type === 'warning'"
+              size="18px"
+              name="warning"
+              color="red"
+            ></q-icon>
+          </q-td>
+          <q-td auto-width key="date" :props="props">
+            {{ formatDate(props.row.date) }}
+          </q-td>
+          <q-td key="message" :props="props"
+            >{{ props.row.message }}
+            <a
+              v-if="props.row.link"
+              target="_blank"
+              :href="props.row.link"
+              v-text="$t('more')"
+            ></a
+          ></q-td>
+        </q-tr>
+      </template>
+    </q-table>
+  </q-card-section>
+</q-card>
+{% endraw %}

lnbits/core/templates/admin/_tab_server.html

@@ -54,6 +54,32 @@
           <br />
         </div>
       </div>
+      <div class="row q-col-gutter-md">
+        <div class="col-12 col-md-6">
+          <p>Allowed currencies</p>
+          <q-select
+            filled
+            v-model="formData.lnbits_allowed_currencies"
+            multiple
+            hint="Limit the number of available fiat currencies"
+            label="Allowed currencies"
+            :options="{{ currencies | safe }}"
+          ></q-select>
+          <br />
+        </div>
+        <div class="col-12 col-md-6">
+          <p>Default Accounting Currency</p>
+          <q-select
+            filled
+            v-model="formData.lnbits_default_accounting_currency"
+            clearable
+            hint="Default currency for accounting"
+            label="Currency"
+            :options="formData.lnbits_allowed_currencies.length ? formData.lnbits_allowed_currencies : {{ currencies }}"
+          ></q-select>
+          <br />
+        </div>
+      </div>
       <div class="row q-col-gutter-md">
         <div class="col-12 col-md-6">
           <p>Admin Extensions</p>
@@ -63,19 +89,7 @@
             multiple
             hint="Extensions only user with admin privileges can use"
             label="Admin extensions"
-            :options="g.extensions.map(e => e.name)"
-          ></q-select>
-          <br />
-        </div>
-        <div class="col-12 col-md-6">
-          <p>Disabled Extensions</p>
-          <q-select
-            filled
-            v-model="formData.lnbits_disabled_extensions"
-            :options="g.extensions.map(e => e.name)"
-            multiple
-            hint="Disable extensions *amilk disabled by default as resource heavy"
-            label="Disable extensions"
+            :options="g.extensions.map(e => e.code)"
           ></q-select>
           <br />
         </div>

lnbits/core/templates/admin/index.html

@@ -3,12 +3,14 @@
 <div class="row q-col-gutter-md justify-center">
   <div class="col q-my-md">
     <q-btn
-      label="Save"
+      :label="$t('save')"
       color="primary"
       @click="updateSettings"
       :disabled="!checkChanges"
     >
-      <q-tooltip v-if="checkChanges"> Save your changes </q-tooltip>
+      <q-tooltip v-if="checkChanges"
+        >{%raw%}{{ $t('save_tooltip') }}{%endraw%}</q-tooltip
+      >
 
       <q-badge
         v-if="checkChanges"
@@ -21,13 +23,13 @@
 
     <q-btn
       v-if="isSuperUser"
-      label="Restart server"
+      :label="$t('restart')"
       color="primary"
       @click="restartServer"
     >
-      <q-tooltip v-if="needsRestart">
-        Restart the server for changes to take effect
-      </q-tooltip>
+      <q-tooltip v-if="needsRestart"
+        >{%raw%}{{ $t('restart_tooltip') }}{%endraw%}</q-tooltip
+      >
 
       <q-badge
         v-if="needsRestart"
@@ -40,28 +42,24 @@
 
     <q-btn
       v-if="isSuperUser"
-      label="Topup"
+      :label="$t('topup')"
       color="primary"
       @click="topUpDialog.show = true"
     >
-      <q-tooltip> Add funds to a wallet. </q-tooltip>
+      <q-tooltip>{%raw%}{{ $t('add_funds_tooltip') }}{%endraw%}</q-tooltip>
     </q-btn>
 
-    <!-- <q-btn
-      label="Download Database Backup"
-      flat
-      @click="downloadBackup"
-      ></q-btn> -->
+    <q-btn :label="$t('download_backup')" flat @click="downloadBackup"></q-btn>
 
     <q-btn
       flat
       v-if="isSuperUser"
-      label="Reset to defaults"
+      :label="$t('reset_defaults')"
       color="primary"
       @click="deleteSettings"
       class="float-right"
     >
-      <q-tooltip> Delete all settings and reset to defaults. </q-tooltip>
+      <q-tooltip>{%raw%}{{ $t('reset_defaults_tooltip') }}{%endraw%}</q-tooltip>
     </q-btn>
   </div>
 </div>
@@ -74,25 +72,31 @@
           <q-tabs v-model="tab" active-color="primary" align="justify">
             <q-tab
               name="funding"
-              label="Funding"
+              :label="$t('funding')"
               @update="val => tab = val.name"
             ></q-tab>
 
             <q-tab
               name="users"
-              label="Users"
+              :label="$t('users')"
               @update="val => tab = val.name"
             ></q-tab>
 
             <q-tab
               name="server"
-              label="Server"
+              :label="$t('server')"
+              @update="val => tab = val.name"
+            ></q-tab>
+
+            <q-tab
+              name="security"
+              :label="$t('security')"
               @update="val => tab = val.name"
             ></q-tab>
 
             <q-tab
               name="theme"
-              label="Theme"
+              :label="$t('theme')"
               @update="val => tab = val.name"
             ></q-tab>
           </q-tabs>
@@ -103,7 +107,8 @@
         <q-tab-panels v-model="tab" animated>
           {% include "admin/_tab_funding.html" %} {% include
           "admin/_tab_users.html" %} {% include "admin/_tab_server.html" %} {%
-          include "admin/_tab_theme.html" %}
+          include "admin/_tab_security.html" %} {% include
+          "admin/_tab_theme.html" %}
         </q-tab-panels>
       </q-form>
     </q-card>
@@ -113,7 +118,7 @@
 <q-dialog v-if="isSuperUser" v-model="topUpDialog.show" position="top">
   <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
     <q-form class="q-gutter-md">
-      <p>TopUp a wallet</p>
+      <p v-text="$t('topup_wallet')"></p>
 
       <div class="row">
         <div class="col-12">
@@ -123,7 +128,7 @@
             filled
             v-model="wallet.id"
             label="Wallet ID"
-            hint="Use the wallet ID to topup any wallet"
+            :hint="$t('topup_hint')"
           ></q-input>
 
           <br />
@@ -135,15 +140,25 @@
             type="number"
             filled
             v-model="wallet.amount"
-            label="Topup amount"
+            :label="$t('amount')"
           ></q-input>
         </div>
       </div>
 
       <div class="row q-mt-lg">
-        <q-btn label="Topup" color="primary" @click="topupWallet"></q-btn>
+        <q-btn
+          :label="$t('topup')"
+          color="primary"
+          @click="topupWallet"
+        ></q-btn>
 
-        <q-btn v-close-popup flat color="grey" class="q-ml-auto">Cancel</q-btn>
+        <q-btn
+          v-close-popup
+          flat
+          color="grey"
+          class="q-ml-auto"
+          :label="$t('cancel')"
+        ></q-btn>
       </div>
     </q-form>
   </q-card>
@@ -156,6 +171,8 @@
     data: function () {
       return {
         settings: {},
+        logs: [],
+        serverlogEnabled: false,
         lnbits_theme_options: [
           'classic',
           'bitcoin',
@@ -167,10 +184,30 @@
           'monochrome',
           'salvador'
         ],
+        auditData: {},
+        statusData: {},
+        statusDataTable: {
+          columns: [
+            {
+              name: 'date',
+              align: 'left',
+              label: this.$t('date'),
+              field: 'date'
+            },
+            {
+              name: 'message',
+              align: 'left',
+              label: this.$t('memo'),
+              field: 'message'
+            }
+          ]
+        },
         formData: {},
         formAddAdmin: '',
         formAddUser: '',
         formAddExtensionsManifest: '',
+        formAllowedIPs: '',
+        formBlockedIPs: '',
         isSuperUser: false,
         wallet: {},
         cancel: {},
@@ -199,6 +236,23 @@
               }
             }
           ],
+          [
+            'CoreLightningRestWallet',
+            {
+              corelightning_rest_url: {
+                value: null,
+                label: 'Endpoint'
+              },
+              corelightning_rest_cert: {
+                value: null,
+                label: 'Certificate'
+              },
+              corelightning_rest_macaroon: {
+                value: null,
+                label: 'Macaroon'
+              }
+            }
+          ],
           [
             'LndRestWallet',
             {
@@ -217,18 +271,6 @@
               lnd_rest_macaroon_encrypted: {
                 value: null,
                 label: 'Encrypted Macaroon'
-              },
-              lnd_cert: {
-                value: null,
-                label: 'Certificate'
-              },
-              lnd_rest_admin_macaroon: {
-                value: null,
-                label: 'Admin Macaroon'
-              },
-              lnd_rest_invoice_macaroon: {
-                value: null,
-                label: 'Invoice Macaroon'
               }
             }
           ],
@@ -251,10 +293,6 @@
                 value: null,
                 label: 'Admin Macaroon'
               },
-              lnd_grpc_invoice_macaroon: {
-                value: null,
-                label: 'Invoice Macaroon'
-              },
               lnd_grpc_macaroon_encrypted: {
                 value: null,
                 label: 'Encrypted Macaroon'
@@ -355,13 +393,20 @@
         ])
       }
     },
-    created: function () {
+    created() {
       this.getSettings()
+      this.getAudit()
       this.balance = +'{{ balance|safe }}'
     },
     computed: {
+      lnbitsVersion() {
+        return LNBITS_VERSION
+      },
       checkChanges() {
         return !_.isEqual(this.settings, this.formData)
+      },
+      updateAvailable() {
+        return LNBITS_VERSION !== this.statusData.version
       }
     },
     methods: {
@@ -372,7 +417,6 @@
           //admin_users = [...admin_users, addUser]
           this.formData.lnbits_admin_users = [...admin_users, addUser]
           this.formAddAdmin = ''
-          //console.log(this.checkChanges)
         }
       },
       removeAdminUser(user) {
@@ -414,6 +458,68 @@
           m => m !== manifest
         )
       },
+      async toggleServerLog() {
+        this.serverlogEnabled = !this.serverlogEnabled
+        if (this.serverlogEnabled) {
+          const wsProto = location.protocol !== 'http:' ? 'wss://' : 'ws://'
+          const digestHex = await LNbits.utils.digestMessage(this.g.user.id)
+          const localUrl =
+            wsProto +
+            document.domain +
+            ':' +
+            location.port +
+            '/api/v1/ws/' +
+            digestHex
+          this.ws = new WebSocket(localUrl)
+          this.ws.addEventListener('message', async ({data}) => {
+            this.logs.push(data.toString())
+            const scrollArea = this.$refs.logScroll
+            if (scrollArea) {
+              const scrollTarget = scrollArea.getScrollTarget()
+              const duration = 0
+              scrollArea.setScrollPosition(scrollTarget.scrollHeight, duration)
+            }
+          })
+        } else {
+          this.ws.close()
+        }
+      },
+      addAllowedIPs() {
+        const allowedIPs = this.formAllowedIPs.trim()
+        const allowed_ips = this.formData.lnbits_allowed_ips
+        if (
+          allowedIPs &&
+          allowedIPs.length &&
+          !allowed_ips.includes(allowedIPs)
+        ) {
+          this.formData.lnbits_allowed_ips = [...allowed_ips, allowedIPs]
+          this.formAllowedIPs = ''
+        }
+      },
+      removeAllowedIPs(allowed_ip) {
+        const allowed_ips = this.formData.lnbits_allowed_ips
+        this.formData.lnbits_allowed_ips = allowed_ips.filter(
+          a => a !== allowed_ip
+        )
+      },
+      addBlockedIPs() {
+        const blockedIPs = this.formBlockedIPs.trim()
+        const blocked_ips = this.formData.lnbits_blocked_ips
+        if (
+          blockedIPs &&
+          blockedIPs.length &&
+          !blocked_ips.includes(blockedIPs)
+        ) {
+          this.formData.lnbits_blocked_ips = [...blocked_ips, blockedIPs]
+          this.formBlockedIPs = ''
+        }
+      },
+      removeBlockedIPs(blocked_ip) {
+        const blocked_ips = this.formData.lnbits_blocked_ips
+        this.formData.lnbits_blocked_ips = blocked_ips.filter(
+          b => b !== blocked_ip
+        )
+      },
       restartServer() {
         LNbits.api
           .request('GET', '/admin/api/v1/restart/?usr=' + this.g.user.id)
@@ -457,12 +563,43 @@
         this.settings.lnbits_allowed_funding_sources.map(f => {
           let opts = this.funding_sources.get(f)
           if (!opts) return
-
           Object.keys(opts).forEach(e => {
             opts[e].value = this.settings[e]
           })
         })
       },
+      formatDate(date) {
+        return moment(date * 1000).fromNow()
+      },
+      getNotifications() {
+        if (this.settings.lnbits_notifications) {
+          axios
+            .get(this.settings.lnbits_status_manifest)
+            .then(response => {
+              this.statusData = response.data
+            })
+            .catch(error => {
+              this.formData.lnbits_notifications = false
+              error.response.data = {}
+              error.response.data.message = 'Could not fetch status manifest.'
+              LNbits.utils.notifyApiError(error)
+            })
+        }
+      },
+      getAudit() {
+        LNbits.api
+          .request(
+            'GET',
+            '/admin/api/v1/audit/?usr=' + this.g.user.id,
+            this.g.user.wallets[0].adminkey
+          )
+          .then(response => {
+            this.auditData = response.data
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
       getSettings() {
         LNbits.api
           .request(
@@ -471,10 +608,11 @@
             this.g.user.wallets[0].adminkey
           )
           .then(response => {
-            this.isSuperUser = response.data.super_user || false
+            this.isSuperUser = response.data.is_super_user || false
             this.settings = response.data
-            this.formData = _.clone(this.settings)
+            this.formData = {...this.settings}
             this.updateFundingData()
+            this.getNotifications()
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)
@@ -482,7 +620,7 @@
       },
       updateSettings() {
         let data = _.omit(this.formData, [
-          'super_user',
+          'is_super_user',
           'lnbits_allowed_funding_sources'
         ])
         LNbits.api
@@ -495,13 +633,17 @@
           .then(response => {
             this.needsRestart =
               this.settings.lnbits_backend_wallet_class !==
-              this.formData.lnbits_backend_wallet_class
+                this.formData.lnbits_backend_wallet_class ||
+              this.settings.lnbits_killswitch !==
+                this.formData.lnbits_killswitch
             this.settings = this.formData
             this.formData = _.clone(this.settings)
             this.updateFundingData()
             this.$q.notify({
               type: 'positive',
-              message: 'Success! Settings changed!',
+              message: `Success! Settings changed! ${
+                this.needsRestart ? 'Restart required!' : ''
+              }`,
               icon: null
             })
           })
@@ -535,19 +677,7 @@
           })
       },
       downloadBackup() {
-        LNbits.api
-          .request('GET', '/admin/api/v1/backup/?usr=' + this.g.user.id)
-          .then(response => {
-            this.$q.notify({
-              type: 'positive',
-              message:
-                'Success! Database backup request, download starts soon!',
-              icon: null
-            })
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
+        window.open('/admin/api/v1/backup/?usr=' + this.g.user.id, '_blank')
       }
     }
   })

lnbits/core/templates/core/_api_docs.html

@@ -1,7 +1,7 @@
 <q-expansion-item
   group="extras"
   icon="swap_vertical_circle"
-  label="API info"
+  :label="$t('api_docs')"
   :content-inset-level="0.5"
 >
   <q-card-section>

lnbits/core/templates/core/extensions.html

@@ -1,48 +1,70 @@
 {% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block scripts %} {{ window_vars(user) }}
-<script src="/core/static/js/extensions.js"></script>
-{% endblock %} {% block page %}
+%} {{ window_vars(user, extensions) }}{% block page %}
 <div class="row q-col-gutter-md q-mb-md">
-  <div class="col-sm-9 gt-sm col-xs-12 mt-lg">
-    <p class="text-h4">
-      Extensions
-      <q-btn
-        flat
-        color="primary"
-        type="a"
-        :href="['/install?usr=', user.id].join('')"
-        >Manage Extensions</q-btn
-      >
-    </p>
+  <div class="col-sm-9 col-xs-12">
+    <p class="text-h4 gt-sm">{%raw%}{{ $t('extensions') }}{%endraw%}</p>
   </div>
 
   <div class="col-sm-3 col-xs-12 q-ml-auto">
-    <q-input v-model="searchTerm" label="Search extensions">
+    <q-input v-model="searchTerm" :label="$t('search_extensions')">
       <q-icon
         v-if="searchTerm !== ''"
         name="close"
         @click="searchTerm = ''"
-        class="cursor-pointer q-mt-lg"
+        class="cursor-pointer"
       />
     </q-input>
   </div>
 </div>
-<p v-if="!filteredExtensions.length">
-  You don't have any extensions installed :(
-</p>
+
+<div class="row q-col-gutter-md q-mb-md">
+  <div class="col-12">
+    <q-card>
+      <div class="q-pa-xs">
+        <div class="q-gutter-y-md">
+          <q-tabs
+            v-model="tab"
+            @input="handleTabChanged"
+            active-color="primary"
+            align="left"
+          >
+            <q-tab
+              name="installed"
+              :label="$t('installed')"
+              @update="val => tab = val.name"
+            ></q-tab>
+            <q-tab
+              name="all"
+              :label="$t('all')"
+              @update="val => tab = val.name"
+            ></q-tab>
+            <q-tab
+              name="featured"
+              :label="$t('featured')"
+              @update="val => tab = val.name"
+            ></q-tab>
+            <i v-if="!g.user.admin && tab != 'installed'"
+              >{%raw%}{{ $t('only_admins_can_install') }}{%endraw%}</i
+            >
+          </q-tabs>
+        </div>
+      </div>
+    </q-card>
+  </div>
+</div>
 <div class="row q-col-gutter-md">
   <div
     class="col-6 col-md-4 col-lg-3"
     v-for="extension in filteredExtensions"
-    :key="extension.code"
+    :key="extension.id + extension.hash"
   >
     <q-card>
-      <q-card-section style="min-height: 140px">
+      <q-card-section style="min-height: 140px" class="q-pb-none">
         <div class="row">
           <div class="col-3">
             <q-img
-              v-if="extension.tile"
-              :src="extension.tile"
+              v-if="extension.icon"
+              :src="extension.icon"
               spinner-color="white"
               style="max-width: 100%"
             ></q-img>
@@ -62,6 +84,16 @@
             </div>
           </div>
           <div class="col-9 q-pl-sm">
+            <q-badge
+              v-if="hasNewVersion(extension)"
+              color="green"
+              class="float-right"
+            >
+              <small>{%raw%}{{ $t('new_version') }}{%endraw%}</small>
+              <q-tooltip
+                ><span v-text="extension.latestRelease.version"></span
+              ></q-tooltip>
+            </q-badge>
             {% raw %}
             <div class="text-h5 gt-sm q-mt-sm q-mb-xs gt-sm">
               {{ extension.name }}
@@ -76,7 +108,8 @@
               class="text-subtitle2 gt-sm"
               style="font-size: 11px; height: 34px"
             >
-              {{ extension.shortDescription }}
+              {{ extension.shortDescription ||
+              extension.installedRelease?.description }}
             </div>
             <div class="text-subtitle1 lt-md q-mt-sm q-mb-xs">
               {{ extension.name }}
@@ -90,6 +123,21 @@
             {% endraw %}
           </div>
         </div>
+        <div class="row q-pt-sm">
+          <div class="col">
+            <small v-if="extension.dependencies?.length"
+              >{%raw%}{{ $t('extension_depends_on') }}{%endraw%}</small
+            >
+            <small v-else>&nbsp;</small>
+            <q-badge
+              v-for="dep in extension.dependencies"
+              :key="dep"
+              color="orange"
+            >
+              <small v-text="dep"></small>
+            </q-badge>
+          </div>
+        </div>
       </q-card-section>
       <q-card-section>
         <div>
@@ -100,47 +148,585 @@
             size="1.5em"
             :max="5"
             color="primary"
-          ></q-rating>
+            ><q-tooltip
+              >{%raw%}{{ $t('extension_rating_soon') }}{%endraw%}</q-tooltip
+            ></q-rating
+          >
           <q-rating
             v-model="maxStars"
             class="lt-md"
             size="1.5em"
             :max="5"
             color="primary"
-          ></q-rating
-          ><q-tooltip>Ratings coming soon</q-tooltip>
+            ><q-tooltip
+              >{%raw%}{{ $t('extension_rating_soon') }}{%endraw%}</q-tooltip
+            ></q-rating
+          >
+          <q-toggle
+            v-if="extension.isAvailable && extension.isInstalled && g.user.admin"
+            :label="extension.isActive ? $t('activated'):  $t('deactivated') "
+            color="secodary"
+            style="max-height: 21px"
+            v-model="extension.isActive"
+            @input="toggleExtension(extension)"
+            ><q-tooltip
+              >{%raw%}{{ $t('activate_extension_details')
+              }}{%endraw%}</q-tooltip
+            ></q-toggle
+          >
         </div>
       </q-card-section>
       <q-separator></q-separator>
-      <q-card-actions>
-        <div v-if="extension.isEnabled">
-          <q-btn
-            flat
-            color="primary"
-            type="a"
-            :href="[extension.url, '?usr=', g.user.id].join('')"
-            >Open</q-btn
+      <q-card-actions style="min-height: 52px">
+        <div class="col-10">
+          <div v-if="!extension.inProgress">
+            <q-btn
+              v-if="user.extensions.includes(extension.id) && extension.isActive && extension.isInstalled"
+              flat
+              color="primary"
+              type="a"
+              :href="[extension.id, '/?usr=', g.user.id].join('')"
+              >{%raw%}{{ $t('open') }}{%endraw%}</q-btn
+            >
+            <q-btn
+              v-if="user.extensions.includes(extension.id) && extension.isActive && extension.isInstalled"
+              flat
+              color="grey-5"
+              type="a"
+              :href="['{{
+                url_for('install.extensions')
+              }}', '?usr=', g.user.id, '&disable=', extension.id].join('')"
+            >
+              {%raw%}{{ $t('disable') }}{%endraw%}</q-btn
+            >
+            <q-badge v-if="extension.isAdminOnly && !user.admin">
+              {%raw%}{{ $t('admin_only') }}{%endraw%}
+            </q-badge>
+            <q-btn
+              v-else-if="extension.isInstalled && extension.isActive && !user.extensions.includes(extension.id)"
+              flat
+              color="primary"
+              type="a"
+              :href="['{{
+                url_for('install.extensions')
+              }}', '?usr=', g.user.id, '&enable=', extension.id].join('')"
+            >
+              {%raw%}{{ $t('enable') }}{%endraw%}
+              <q-tooltip>
+                <span v-text="$t('enable_extension_details')">
+                </span> </q-tooltip
+            ></q-btn>
+
+            <q-btn
+              @click="showUpgrade(extension)"
+              flat
+              color="primary"
+              v-if="g.user.admin"
+            >
+              {%raw%}{{ $t('manage') }}{%endraw%}<q-tooltip
+                >{%raw%}{{ $t('manage_extension_details')
+                }}{%endraw%}</q-tooltip
+              ></q-btn
+            >
+          </div>
+          <div v-else>
+            <q-spinner color="primary" size="2.55em"></q-spinner>
+          </div>
+        </div>
+
+        <div class="col-2">
+          <div
+            v-if="extension.isInstalled && extension.installedRelease"
+            class="float-right"
           >
-          <q-btn
-            flat
-            color="grey-5"
-            type="a"
-            :href="['{{ url_for('core.extensions') }}', '?usr=', g.user.id, '&disable=', extension.code].join('')"
-          >
-            Disable</q-btn
-          >
+            <q-badge>
+              {% raw %}{{ extension.installedRelease.version }}{% endraw
+              %}<q-tooltip
+                >{%raw%}{{ $t('extension_installed_version')
+                }}{%endraw%}</q-tooltip
+              >
+            </q-badge>
+          </div>
         </div>
-        <q-btn
-          v-else
-          flat
-          color="primary"
-          type="a"
-          :href="['{{ url_for('core.extensions') }}', '?usr=', g.user.id, '&enable=', extension.code].join('')"
-        >
-          Enable</q-btn
-        >
       </q-card-actions>
     </q-card>
   </div>
+  <q-dialog v-model="showUninstallDialog">
+    <q-card class="q-pa-lg">
+      <h6 class="q-my-md text-primary">{%raw%}{{ $t('warning') }}{%endraw%}</h6>
+      <p>
+        {%raw%}{{ $t('extension_uninstall_warning') }}{%endraw%} <br />
+        {%raw%}{{ $t('confirm_continue') }}{%endraw%}
+      </p>
+
+      <div class="row q-mt-lg">
+        <q-checkbox
+          v-model="uninstallAndDropDb"
+          value="false"
+          label="Cleanup database tables"
+        >
+          <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left">
+            {%raw%}{{ $t('extension_db_drop_info') }}{%endraw%}
+          </q-tooltip>
+        </q-checkbox>
+      </div>
+      <div class="row q-mt-lg">
+        <q-btn outline color="grey" @click="uninstallExtension()"
+          >{%raw%}{{ $t('uninstall_confirm') }}{%endraw%}</q-btn
+        >
+        <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          >{%raw%}{{ $t('cancel') }}{%endraw%}</q-btn
+        >
+      </div>
+    </q-card>
+  </q-dialog>
+
+  <q-dialog v-model="showDropDbDialog">
+    <q-card v-if="selectedExtension" class="q-pa-lg">
+      <h6 class="q-my-md text-primary">{%raw%}{{ $t('warning') }}{%endraw%}</h6>
+      <p>{%raw%}{{ $t('extension_db_drop_warning') }}{%endraw%} <br /></p>
+      <q-input
+        v-model="dropDbExtensionId"
+        :label="selectedExtension.id"
+      ></q-input>
+      <br />
+      <p>{%raw%}{{ $t('confirm_continue') }}{%endraw%}</p>
+
+      <div class="row q-mt-lg">
+        <q-btn
+          :disable="dropDbExtensionId !== selectedExtension.id"
+          outline
+          color="red"
+          @click="dropExtensionDb()"
+          >{%raw%}{{ $t('confirm') }}{%endraw%}</q-btn
+        >
+        <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          >{%raw%}{{ $t('cancel') }}{%endraw%}</q-btn
+        >
+      </div>
+    </q-card>
+  </q-dialog>
+
+  <q-dialog v-model="showUpgradeDialog">
+    <q-card class="q-pa-lg lnbits__dialog-card">
+      <q-card-section>
+        <div class="text-h6" v-text="selectedExtension?.name"></div>
+      </q-card-section>
+      <div class="col-12 col-md-5 q-gutter-y-md" v-if="selectedExtensionRepos">
+        <q-card
+          flat
+          bordered
+          class="my-card"
+          v-for="repoName of Object.keys(selectedExtensionRepos)"
+          :key="repoName"
+        >
+          <q-expansion-item
+            :key="repoName"
+            group="repos"
+            :caption="repoName"
+            :content-inset-level="0.5"
+            :default-opened="selectedExtensionRepos[repoName].isInstalled"
+          >
+            <template v-slot:header>
+              <q-item-section avatar>
+                <q-avatar
+                  :icon="selectedExtensionRepos[repoName].isInstalled ? 'download_done': 'download'"
+                  :text-color="selectedExtensionRepos[repoName].isInstalled ? 'green' : ''"
+                />
+              </q-item-section>
+
+              <q-item-section>
+                <div class="row">
+                  <div class="col-10">
+                    {%raw%}{{ $t('repository') }}{%endraw%}
+                    <br />
+                    <small v-text="repoName"></small>
+                    <q-tooltip
+                      ><span
+                        v-text="selectedExtensionRepos[repoName].repo"
+                      ></span
+                    ></q-tooltip>
+                  </div>
+                  <div class="col-2"></div>
+                </div>
+              </q-item-section>
+            </template>
+
+            <q-card-section class="q-pa-none">
+              <q-separator></q-separator>
+
+              <q-list>
+                <q-expansion-item
+                  v-for="release of selectedExtensionRepos[repoName].releases"
+                  :key="release.version"
+                  group="releases"
+                  @click="getGitHubReleaseDetails(release)"
+                  :icon="getReleaseIcon(release)"
+                  :label="release.description"
+                  :caption="release.version"
+                  :content-inset-level="0.5"
+                  :header-class="getReleaseIconColor(release)"
+                >
+                  <div v-if="release.inProgress">
+                    <q-spinner color="primary" size="2.55em"></q-spinner>
+                  </div>
+                  <div v-else-if="release.error">
+                    <q-icon
+                      class="gt-sm"
+                      name="error"
+                      color="pink"
+                      size="70px"
+                    ></q-icon>
+                    Cannot get the release details.
+                  </div>
+                  <q-card v-else>
+                    <q-card-section v-if="release.is_version_compatible">
+                      <q-btn
+                        v-if="!release.isInstalled"
+                        @click="installExtension(release)"
+                        color="primary unelevated mt-lg pt-lg"
+                        >{%raw%}{{ $t('install') }}{%endraw%}</q-btn
+                      >
+                      <q-btn v-else @click="showUninstall()" flat color="red">
+                        {%raw%}{{ $t('uninstall') }}{%endraw%}</q-btn
+                      >
+                      <a
+                        v-if="release.html_url"
+                        class="text-secondary float-right"
+                        :href="release.html_url"
+                        target="_blank"
+                        style="color: inherit"
+                        >{%raw%}{{ $t('release_notes') }}{%endraw%}</a
+                      >
+                    </q-card-section>
+                    <q-card-section v-else>
+                      {%raw%}{{ $t('extension_min_lnbits_version') }}{%endraw%}
+                      <strong>
+                        <span v-text="release.min_lnbits_version"></span>
+                      </strong>
+                    </q-card-section>
+                    <q-card v-if="release.warning">
+                      <q-card-section>
+                        <div class="text-h6">
+                          <q-badge color="yellow" text-color="black">
+                            {%raw%}{{ $t('warning') }}{%endraw%}
+                          </q-badge>
+                        </div>
+                        <div class="text-subtitle2">
+                          <span v-text="release.warning"></span>
+                        </div>
+                      </q-card-section>
+                    </q-card>
+
+                    <q-separator></q-separator> </q-card
+                ></q-expansion-item>
+              </q-list>
+            </q-card-section>
+          </q-expansion-item>
+        </q-card>
+      </div>
+      <q-spinner v-else color="primary" size="2.55em"></q-spinner>
+      <div class="row q-mt-lg">
+        <q-btn
+          v-if="selectedExtension?.isInstalled"
+          @click="showUninstall()"
+          flat
+          color="red"
+        >
+          {%raw%}{{ $t('uninstall') }}{%endraw%}</q-btn
+        >
+        <q-btn
+          v-else-if="selectedExtension?.hasDatabaseTables"
+          @click="showDropDb()"
+          flat
+          color="red"
+          :label="$t('drop_db')"
+        ></q-btn>
+        <q-btn v-close-popup flat color="grey" class="q-ml-auto">
+          {%raw%}{{ $t('close') }}{%endraw%}</q-btn
+        >
+      </div>
+    </q-card>
+  </q-dialog>
 </div>
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+<script>
+  new Vue({
+    el: '#vue',
+    data: function () {
+      return {
+        searchTerm: '',
+        tab: 'all',
+        filteredExtensions: null,
+        showUninstallDialog: false,
+        showUpgradeDialog: false,
+        showDropDbDialog: false,
+        dropDbExtensionId: '',
+        selectedExtension: null,
+        selectedExtensionRepos: null,
+        uninstallAndDropDb: false,
+        maxStars: 5,
+        user: null
+      }
+    },
+    watch: {
+      searchTerm(term) {
+        this.filterExtensions(term, this.tab)
+      }
+    },
+    methods: {
+      handleTabChanged: function (tab) {
+        this.filterExtensions(this.searchTerm, tab)
+      },
+      filterExtensions: function (term, tab) {
+        // Filter the extensions list
+        function extensionNameContains(searchTerm) {
+          return function (extension) {
+            return (
+              extension.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
+              extension.shortDescription
+                ?.toLowerCase()
+                .includes(searchTerm.toLowerCase())
+            )
+          }
+        }
+
+        this.filteredExtensions = this.extensions
+          .filter(e => (tab === 'installed' ? e.isInstalled : true))
+          .filter(e =>
+            tab === 'installed'
+              ? e.isActive
+                ? true
+                : !!this.g.user.admin
+              : true
+          )
+          .filter(e => (tab === 'featured' ? e.isFeatured : true))
+          .filter(extensionNameContains(term))
+        this.tab = tab
+      },
+      installExtension: async function (release) {
+        const extension = this.selectedExtension
+        extension.inProgress = true
+        this.showUpgradeDialog = false
+        LNbits.api
+          .request(
+            'POST',
+            `/api/v1/extension?usr=${this.g.user.id}`,
+            this.g.user.wallets[0].adminkey,
+            {
+              ext_id: extension.id,
+              archive: release.archive,
+              source_repo: release.source_repo
+            }
+          )
+          .then(response => {
+            extension.isAvailable = true
+            extension.isInstalled = true
+            extension.installedRelease = release
+            this.toggleExtension(extension)
+            extension.inProgress = false
+            this.filteredExtensions = this.extensions.concat([])
+            this.handleTabChanged('installed')
+            this.tab = 'installed'
+          })
+          .catch(err => {
+            LNbits.utils.notifyApiError(err)
+            extension.inProgress = false
+          })
+      },
+      uninstallExtension: async function () {
+        const extension = this.selectedExtension
+        this.showUpgradeDialog = false
+        this.showUninstallDialog = false
+        extension.inProgress = true
+        LNbits.api
+          .request(
+            'DELETE',
+            `/api/v1/extension/${extension.id}?usr=${this.g.user.id}`,
+            this.g.user.wallets[0].adminkey
+          )
+          .then(response => {
+            extension.isAvailable = false
+            extension.isInstalled = false
+            extension.inProgress = false
+            extension.installedRelease = null
+            this.filteredExtensions = this.extensions.concat([])
+            this.handleTabChanged('installed')
+            this.tab = 'installed'
+            this.$q.notify({
+              type: 'positive',
+              message: 'Extension uninstalled!'
+            })
+            if (this.uninstallAndDropDb) {
+              this.showDropDb()
+            }
+          })
+          .catch(err => {
+            LNbits.utils.notifyApiError(err)
+            extension.inProgress = false
+          })
+      },
+
+      dropExtensionDb: async function () {
+        const extension = this.selectedExtension
+        this.showUpgradeDialog = false
+        this.showDropDbDialog = false
+        this.dropDbExtensionId = ''
+        extension.inProgress = true
+        LNbits.api
+          .request(
+            'DELETE',
+            `/api/v1/extension/${extension.id}/db?usr=${this.g.user.id}`,
+            this.g.user.wallets[0].adminkey
+          )
+          .then(response => {
+            extension.installedRelease = null
+            extension.inProgress = false
+            extension.hasDatabaseTables = false
+            this.$q.notify({
+              type: 'positive',
+              message: 'Extension DB deleted!'
+            })
+          })
+          .catch(err => {
+            LNbits.utils.notifyApiError(err)
+            extension.inProgress = false
+          })
+      },
+      toggleExtension: function (extension) {
+        const action = extension.isActive ? 'activate' : 'deactivate'
+        LNbits.api
+          .request(
+            'GET',
+            "{{ url_for('install.extensions') }}?usr=" +
+              this.g.user.id +
+              '&' +
+              action +
+              '=' +
+              extension.id
+          )
+          .then(response => {})
+          .catch(err => {
+            LNbits.utils.notifyApiError(err)
+            extension.inProgress = false
+          })
+      },
+
+      showUninstall: function () {
+        this.showUpgradeDialog = false
+        this.showUninstallDialog = true
+        this.uninstallAndDropDb = false
+      },
+
+      showDropDb: function () {
+        this.showDropDbDialog = true
+      },
+
+      showUpgrade: async function (extension) {
+        this.selectedExtension = extension
+        this.showUpgradeDialog = true
+        this.selectedExtensionRepos = null
+        try {
+          const {data} = await LNbits.api.request(
+            'GET',
+            `/api/v1/extension/${extension.id}/releases?usr=${this.g.user.id}`,
+            this.g.user.wallets[0].adminkey
+          )
+
+          this.selectedExtensionRepos = data.reduce((repos, release) => {
+            repos[release.source_repo] = repos[release.source_repo] || {
+              releases: [],
+              isInstalled: false,
+              repo: release.repo
+            }
+            release.inProgress = false
+            release.error = null
+            release.loaded = false
+            release.isInstalled = this.isInstalledVersion(
+              this.selectedExtension,
+              release
+            )
+            if (release.isInstalled) {
+              repos[release.source_repo].isInstalled = true
+            }
+            repos[release.source_repo].releases.push(release)
+            return repos
+          }, {})
+        } catch (error) {
+          LNbits.utils.notifyApiError(error)
+          extension.inProgress = false
+        }
+      },
+      hasNewVersion: function (extension) {
+        if (extension.installedRelease && extension.latestRelease) {
+          return (
+            extension.installedRelease.version !==
+            extension.latestRelease.version
+          )
+        }
+      },
+      isInstalledVersion: function (extension, release) {
+        if (extension.installedRelease) {
+          return (
+            extension.installedRelease.source_repo === release.source_repo &&
+            extension.installedRelease.version === release.version
+          )
+        }
+      },
+      getReleaseIcon: function (release) {
+        if (!release.is_version_compatible) return 'block'
+        if (release.isInstalled) return 'download_done'
+
+        return 'download'
+      },
+      getReleaseIconColor: function (release) {
+        if (!release.is_version_compatible) return 'text-red'
+        if (release.isInstalled) return 'text-green'
+
+        return ''
+      },
+      getGitHubReleaseDetails: async function (release) {
+        if (!release.is_github_release || release.loaded) {
+          return
+        }
+        const [org, repo] = release.source_repo.split('/')
+        release.inProgress = true
+        try {
+          const {data} = await LNbits.api.request(
+            'GET',
+            `/api/v1/extension/release/${org}/${repo}/${release.version}?usr=${this.g.user.id}`,
+            this.g.user.wallets[0].adminkey
+          )
+          release.loaded = true
+          release.is_version_compatible = data.is_version_compatible
+          release.min_lnbits_version = data.min_lnbits_version
+          release.warning = data.warning
+        } catch (error) {
+          console.warn(error)
+          release.error = error
+          LNbits.utils.notifyApiError(error)
+        } finally {
+          release.inProgress = false
+        }
+      }
+    },
+    created: function () {
+      this.extensions = JSON.parse('{{extensions | tojson | safe}}').map(e => ({
+        ...e,
+        inProgress: false
+      }))
+      this.filteredExtensions = this.extensions.concat([])
+      for (let i = 0; i < this.filteredExtensions.length; i++) {
+        if (this.filteredExtensions[i].isInstalled != false) {
+          this.handleTabChanged('installed')
+          this.tab = 'installed'
+        }
+      }
+      if (window.user) {
+        this.user = LNbits.map.user(window.user)
+      }
+    },
+    mixins: [windowMixin]
+  })
+</script>
 {% endblock %}

lnbits/core/templates/core/index.html

@@ -12,24 +12,23 @@
           @click="processing"
           type="a"
           href="{{ url_for('core.lnurlwallet') }}?lightning={{ lnurl }}"
-        >
-          Press to claim bitcoin
-        </q-btn>
+          v-text="$t('press_to_claim')"
+        ></q-btn>
         {% else %}
         <q-form @submit="createWallet" class="q-gutter-md">
           <q-input
             filled
             dense
             v-model="walletName"
-            label="Name your {{SITE_TITLE}} wallet *"
+            :label='$t("name_your_wallet", { name: "{{ SITE_TITLE }} *" })'
           ></q-input>
           <q-btn
             unelevated
             color="primary"
             :disable="walletName == ''"
             type="submit"
-            >Add a new wallet</q-btn
-          >
+            :label="$t('add_wallet')"
+          ></q-btn>
         </q-form>
         {% endif %}
       </q-card-section>
@@ -40,27 +39,7 @@
         <h3 class="q-my-none">{{SITE_TITLE}}</h3>
         <h5 class="q-my-md">{{SITE_TAGLINE}}</h5>
         <div v-if="'{{SITE_TITLE}}' == 'LNbits'">
-          <p>
-            Easy to set up and lightweight, LNbits can run on any
-            lightning-network funding source, currently supporting LND,
-            c-lightning, OpenNode, lntxbot, LNPay and even LNbits itself!
-          </p>
-          <p>
-            You can run LNbits for yourself, or easily offer a custodian
-            solution for others.
-          </p>
-          <p>
-            Each wallet has its own API keys and there is no limit to the number
-            of wallets you can make. Being able to partition funds makes LNbits
-            a useful tool for money management and as a development tool.
-          </p>
-          <p>
-            Extensions add extra functionality to LNbits so you can experiment
-            with a range of cutting-edge technologies on the lightning network.
-            We have made developing extensions as easy as possible, and as a
-            free and open-source project, we encourage people to develop and
-            submit their own.
-          </p>
+          <p v-text="$t('lnbits_description')"></p>
           <div class="row q-mt-md q-gutter-sm">
             <q-btn
               outline
@@ -69,8 +48,8 @@
               href="https://github.com/lnbits/lnbits"
               target="_blank"
               rel="noopener"
-              >View project in GitHub</q-btn
-            >
+              :label="$t('view_github')"
+            ></q-btn>
             <q-btn
               outline
               color="grey"
@@ -78,8 +57,8 @@
               href="https://legend.lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK"
               target="_blank"
               rel="noopener"
-              >Donate</q-btn
-            >
+              :label="$t('donate')"
+            ></q-btn>
           </div>
         </div>
         <p v-else>{{SITE_DESCRIPTION | safe}}</p>
@@ -94,7 +73,7 @@
         <q-btn
           flat
           color="secondary"
-          label="Runs on"
+          :label="$t('runs_on')"
           class="full-width"
         ></q-btn>
         <div class="row">
@@ -135,24 +114,6 @@
           </div>
         </div>
 
-        <div class="row">
-          <div class="col">
-            <a href="https://github.com/shesek/spark-wallet">
-              <q-img
-                contain
-                :src="($q.dark.isActive) ? '/static/images/spark.png' : '/static/images/sparkl.png'"
-              ></q-img>
-            </a>
-          </div>
-          <div class="col q-pl-md">
-            <a href="https://t.me/lntxbot">
-              <q-img
-                contain
-                :src="($q.dark.isActive) ? '/static/images/lntxbot.png' : '/static/images/lntxbotl.png'"
-              ></q-img>
-            </a>
-          </div>
-        </div>
         <div class="row">
           <div class="col">
             <a href="https://github.com/rootzoll/raspiblitz">
@@ -163,6 +124,16 @@
             </a>
           </div>
           <div class="col q-pl-md">
+            <a href="https://start9.com/">
+              <q-img
+                contain
+                :src="($q.dark.isActive) ? '/static/images/start9.png' : '/static/images/start9l.png'"
+              ></q-img>
+            </a>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col">
             <a href="https://getumbrel.com/">
               <q-img
                 contain
@@ -170,9 +141,7 @@
               ></q-img>
             </a>
           </div>
-        </div>
-        <div class="row">
-          <div class="col">
+          <div class="col q-pl-md">
             <a href="https://mynodebtc.com">
               <q-img
                 contain
@@ -180,7 +149,24 @@
               ></q-img>
             </a>
           </div>
-          <div class="col q-pl-md">&nbsp;</div>
+        </div>
+        <div class="row">
+          <div class="col">
+            <a href="https://github.com/shesek/spark-wallet">
+              <q-img
+                contain
+                :src="($q.dark.isActive) ? '/static/images/spark.png' : '/static/images/sparkl.png'"
+              ></q-img>
+            </a>
+          </div>
+          <div class="col q-pl-md">
+            <a href="https://voltage.cloud">
+              <q-img
+                contain
+                :src="($q.dark.isActive) ? '/static/images/voltage.png' : '/static/images/voltagel.png'"
+              ></q-img>
+            </a>
+          </div>
         </div>
       </div>
 

lnbits/core/templates/core/install.html

@@ -1,505 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {{ window_vars(user, extensions) }}{% block page %}
-<div class="row q-col-gutter-md q-mb-md">
-  <div class="col-sm-9 col-xs-12">
-    <p class="text-h4 gt-sm">Manage Extensions</p>
-  </div>
-
-  <div class="col-sm-3 col-xs-12 q-ml-auto">
-    <q-input v-model="searchTerm" label="Search extensions">
-      <q-icon
-        v-if="searchTerm !== ''"
-        name="close"
-        @click="searchTerm = ''"
-        class="cursor-pointer"
-      />
-    </q-input>
-  </div>
-</div>
-
-<div class="row q-col-gutter-md q-mb-md">
-  <div class="col-12">
-    <q-card>
-      <div class="q-pa-xs">
-        <div class="q-gutter-y-md">
-          <q-tabs
-            v-model="tab"
-            @input="handleTabChanged"
-            active-color="primary"
-            align="left"
-          >
-            <q-tab
-              name="installed"
-              label="Installed"
-              @update="val => tab = val.name"
-            ></q-tab>
-            <q-tab
-              name="all"
-              label="All"
-              @update="val => tab = val.name"
-            ></q-tab>
-            <q-tab
-              name="featured"
-              label="Featured"
-              @update="val => tab = val.name"
-            ></q-tab>
-          </q-tabs>
-        </div>
-      </div>
-    </q-card>
-  </div>
-</div>
-<div class="row q-col-gutter-md">
-  <div
-    class="col-6 col-md-4 col-lg-3"
-    v-for="extension in filteredExtensions"
-    :key="extension.id + extension.hash"
-  >
-    <q-card>
-      <q-card-section style="min-height: 140px">
-        <div class="row">
-          <div class="col-3">
-            <q-img
-              v-if="extension.icon"
-              :src="extension.icon"
-              spinner-color="white"
-              style="max-width: 100%"
-            ></q-img>
-            <div v-else>
-              <q-icon
-                class="gt-sm"
-                name="extension"
-                color="primary"
-                size="70px"
-              ></q-icon>
-              <q-icon
-                class="lt-md"
-                name="extension"
-                color="primary"
-                size="35px"
-              ></q-icon>
-            </div>
-          </div>
-          <div class="col-9 q-pl-sm">
-            <q-badge
-              v-if="hasNewVersion(extension)"
-              color="green"
-              class="float-right"
-            >
-              <small>New Version</small>
-            </q-badge>
-            {% raw %}
-            <div class="text-h5 gt-sm q-mt-sm q-mb-xs gt-sm">
-              {{ extension.name }}
-            </div>
-            <div
-              class="text-h5 gt-sm q-mt-sm q-mb-xs lt-md"
-              style="min-height: 60px"
-            >
-              {{ extension.name }}
-            </div>
-            <div
-              class="text-subtitle2 gt-sm"
-              style="font-size: 11px; height: 34px"
-            >
-              {{ extension.shortDescription }}
-            </div>
-            <div class="text-subtitle1 lt-md q-mt-sm q-mb-xs">
-              {{ extension.name }}
-            </div>
-            <div
-              class="text-subtitle2 lt-md"
-              style="font-size: 9px; height: 34px"
-            >
-              {{ extension.shortDescription }}
-            </div>
-            {% endraw %}
-          </div>
-        </div>
-        <div class="row q-pt-sm">
-          <div class="col">
-            <small v-if="extension.dependencies?.length">Depends on:</small>
-            <small v-else>&nbsp;</small>
-            <q-badge
-              v-for="dep in extension.dependencies"
-              :key="dep"
-              color="orange"
-            >
-              <small v-text="dep"></small>
-            </q-badge>
-          </div>
-        </div>
-      </q-card-section>
-      <q-card-section>
-        <div>
-          <q-rating
-            class="gt-sm"
-            v-model="maxStars"
-            disable
-            size="1.5em"
-            :max="5"
-            color="primary"
-          ></q-rating>
-          <q-rating
-            v-model="maxStars"
-            class="lt-md"
-            size="1.5em"
-            :max="5"
-            color="primary"
-          ></q-rating
-          ><q-tooltip>Ratings coming soon</q-tooltip>
-        </div>
-      </q-card-section>
-      <q-separator v-if="g.user.admin"></q-separator>
-      <q-card-actions>
-        <div class="col-10">
-          <div v-if="g.user.admin">
-            <div v-if="!extension.inProgress">
-              <q-btn @click="showUpgrade(extension)" flat color="primary">
-                Manage</q-btn
-              >
-              <q-toggle
-                v-if="extension.isAvailable && extension.isInstalled"
-                :label="extension.isActive ? 'Activated':  'Deactivated' "
-                color="secodary"
-                v-model="extension.isActive"
-                @input="toggleExtension(extension)"
-              ></q-toggle>
-            </div>
-            <div v-else>
-              <q-spinner color="primary" size="2.55em"></q-spinner>
-            </div>
-          </div>
-        </div>
-
-        <div class="col-2">
-          <div class="float-right"></div>
-        </div>
-      </q-card-actions>
-    </q-card>
-  </div>
-  <q-dialog v-model="showUninstallDialog">
-    <q-card class="q-pa-lg">
-      <h6 class="q-my-md text-primary">Warning</h6>
-      <p>
-        You are about to remove the extension for all users. <br />
-        Are you sure you want to continue?
-      </p>
-
-      <div class="row q-mt-lg">
-        <q-btn outline color="grey" @click="uninstallExtension()"
-          >Yes, Uninstall</q-btn
-        >
-        <q-btn v-close-popup flat color="grey" class="q-ml-auto">Cancel</q-btn>
-      </div>
-    </q-card>
-  </q-dialog>
-
-  <q-dialog v-model="showUpgradeDialog">
-    <q-card class="q-pa-lg lnbits__dialog-card">
-      <q-card-section>
-        <div class="text-h6" v-text="selectedExtension?.name"></div>
-      </q-card-section>
-      <div class="col-12 col-md-5 q-gutter-y-md" v-if="selectedExtensionRepos">
-        <q-card
-          flat
-          bordered
-          class="my-card"
-          v-for="repoName of Object.keys(selectedExtensionRepos)"
-          :key="repoName"
-        >
-          <q-expansion-item
-            :key="repoName"
-            group="repos"
-            :caption="repoName"
-            :content-inset-level="0.5"
-            :default-opened="selectedExtensionRepos[repoName].isInstalled"
-          >
-            <template v-slot:header>
-              <q-item-section avatar>
-                <q-avatar
-                  :icon="selectedExtensionRepos[repoName].isInstalled ? 'download_done': 'download'"
-                  :text-color="selectedExtensionRepos[repoName].isInstalled ? 'green' : ''"
-                />
-              </q-item-section>
-
-              <q-item-section>
-                <div class="row">
-                  <div class="col-10">
-                    Repository
-                    <br />
-                    <small v-text="repoName"></small>
-                  </div>
-                  <div class="col-2">
-                    <!-- <div v-if="selectedExtension.stars" class="float-right">
-                      <small v-text="selectedExtension.stars"> </small>
-                      <q-rating
-                        max="1"
-                        v-model="maxStars"
-                        size="1.5em"
-                        color="yellow"
-                        icon="star"
-                        icon-selected="star"
-                        readonly
-                        no-dimming
-                      >
-                      </q-rating>
-                    </div> -->
-                  </div>
-                </div>
-              </q-item-section>
-            </template>
-
-            <q-card-section class="q-pa-none">
-              <q-separator></q-separator>
-
-              <q-list>
-                <q-expansion-item
-                  v-for="release of selectedExtensionRepos[repoName].releases"
-                  :key="release.version"
-                  group="releases"
-                  :icon="release.isInstalled ? 'download_done' : 'download'"
-                  :label="release.description"
-                  :caption="release.version"
-                  :content-inset-level="0.5"
-                  :header-class="release.isInstalled ? 'text-green' : ''"
-                >
-                  <q-card>
-                    <q-card-section>
-                      <q-btn
-                        v-if="!release.isInstalled"
-                        @click="installExtension(release)"
-                        color="primary unelevated mt-lg pt-lg"
-                        >Install</q-btn
-                      >
-                      <q-btn v-else @click="showUninstall()" flat color="red">
-                        Uninstall</q-btn
-                      >
-                      <a
-                        v-if="release.html_url"
-                        class="text-secondary float-right"
-                        :href="release.html_url"
-                        target="_blank"
-                        style="color: inherit"
-                        >Release Notes</a
-                      >
-                    </q-card-section>
-
-                    <div
-                      v-if="release.details_html"
-                      v-html="release.details_html"
-                    ></div>
-                    <q-separator></q-separator> </q-card
-                ></q-expansion-item>
-              </q-list>
-            </q-card-section>
-          </q-expansion-item>
-        </q-card>
-      </div>
-      <q-spinner v-else color="primary" size="2.55em"></q-spinner>
-      <div class="row q-mt-lg">
-        <q-btn
-          v-if="selectedExtension?.isInstalled"
-          @click="showUninstall()"
-          flat
-          color="red"
-        >
-          Uninstall</q-btn
-        >
-        <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
-      </div>
-    </q-card>
-  </q-dialog>
-</div>
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script>
-  new Vue({
-    el: '#vue',
-    data: function () {
-      return {
-        searchTerm: '',
-        tab: 'all',
-        filteredExtensions: null,
-        showUninstallDialog: false,
-        showUpgradeDialog: false,
-        selectedExtension: null,
-        selectedExtensionRepos: null,
-        maxStars: 5
-      }
-    },
-    watch: {
-      searchTerm(term) {
-        this.filterExtensions(term, this.tab)
-      }
-    },
-    methods: {
-      handleTabChanged: function (tab) {
-        this.filterExtensions(this.searchTerm, tab)
-      },
-      filterExtensions: function (term, tab) {
-        // Filter the extensions list
-        function extensionNameContains(searchTerm) {
-          return function (extension) {
-            return (
-              extension.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
-              extension.shortDescription
-                ?.toLowerCase()
-                .includes(searchTerm.toLowerCase())
-            )
-          }
-        }
-
-        this.filteredExtensions = this.extensions
-          .filter(e => (tab === 'installed' ? e.isInstalled : true))
-          .filter(e => (tab === 'featured' ? e.isFeatured : true))
-          .filter(extensionNameContains(term))
-      },
-      installExtension: async function (release) {
-        const extension = this.selectedExtension
-        extension.inProgress = true
-        this.showUpgradeDialog = false
-        LNbits.api
-          .request(
-            'POST',
-            `/api/v1/extension?usr=${this.g.user.id}`,
-            this.g.user.wallets[0].adminkey,
-            {
-              ext_id: extension.id,
-              archive: release.archive,
-              source_repo: release.source_repo
-            }
-          )
-          .then(response => {
-            extension.isAvailable = true
-            extension.isInstalled = true
-            this.toggleExtension(extension)
-            extension.inProgress = false
-            this.filteredExtensions = this.extensions.concat([])
-            this.handleTabChanged('installed')
-            this.tab = 'installed'
-          })
-          .catch(err => {
-            LNbits.utils.notifyApiError(err)
-            extension.inProgress = false
-          })
-      },
-      uninstallExtension: async function () {
-        const extension = this.selectedExtension
-        this.showUpgradeDialog = false
-        this.showUninstallDialog = false
-        extension.inProgress = true
-        LNbits.api
-          .request(
-            'DELETE',
-            `/api/v1/extension/${extension.id}?usr=${this.g.user.id}`,
-            this.g.user.wallets[0].adminkey
-          )
-          .then(response => {
-            extension.isAvailable = false
-            extension.isInstalled = false
-            extension.inProgress = false
-            this.filteredExtensions = this.extensions.concat([])
-            this.handleTabChanged('installed')
-            this.tab = 'installed'
-          })
-          .catch(err => {
-            LNbits.utils.notifyApiError(err)
-            extension.inProgress = false
-          })
-      },
-      toggleExtension: function (extension) {
-        const action = extension.isActive ? 'activate' : 'deactivate'
-        LNbits.api
-          .request(
-            'GET',
-            "{{ url_for('install.extensions') }}?usr=" +
-              this.g.user.id +
-              '&' +
-              action +
-              '=' +
-              extension.id
-          )
-          .then(response => {})
-          .catch(err => {
-            LNbits.utils.notifyApiError(err)
-            extension.inProgress = false
-          })
-      },
-
-      showUninstall: function () {
-        this.showUpgradeDialog = false
-        this.showUninstallDialog = true
-      },
-
-      showUpgrade: async function (extension) {
-        this.selectedExtension = extension
-        this.showUpgradeDialog = true
-        this.selectedExtensionRepos = null
-        try {
-          const {data} = await LNbits.api.request(
-            'GET',
-            `/api/v1/extension/${extension.id}/releases?usr=${this.g.user.id}`,
-            this.g.user.wallets[0].adminkey
-          )
-
-          this.selectedExtensionRepos = data.reduce((repos, release) => {
-            repos[release.source_repo] = repos[release.source_repo] || {
-              releases: [],
-              isInstalled: false
-            }
-            release.isInstalled = this.isInstalledVersion(
-              this.selectedExtension,
-              release
-            )
-            if (release.isInstalled) {
-              repos[release.source_repo].isInstalled = true
-            }
-            repos[release.source_repo].releases.push(release)
-            return repos
-          }, {})
-        } catch (error) {
-          LNbits.utils.notifyApiError(error)
-          extension.inProgress = false
-        }
-      },
-      hasNewVersion: function (extension) {
-        if (extension.installedRelease && extension.latestRelease) {
-          return (
-            extension.installedRelease.version !==
-            extension.latestRelease.version
-          )
-        }
-      },
-      isInstalledVersion: function (extension, release) {
-        if (extension.installedRelease) {
-          return (
-            extension.installedRelease.source_repo === release.source_repo &&
-            extension.installedRelease.version === release.version
-          )
-        }
-      }
-    },
-    created: function () {
-      if (!this.g.user.admin) {
-        this.$q.notify({
-          timeout: 3000,
-          message: 'Only admin accounts can install extensions',
-          icon: null
-        })
-      }
-      this.extensions = JSON.parse('{{extensions | tojson | safe}}').map(e => ({
-        ...e,
-        inProgress: false
-      }))
-      this.filteredExtensions = this.extensions.concat([])
-      for (let i = 0; i < this.filteredExtensions.length; i++) {
-        if (this.filteredExtensions[i].isInstalled != false) {
-          this.handleTabChanged('installed')
-          this.tab = 'installed'
-        }
-      }
-    },
-    mixins: [windowMixin]
-  })
-</script>
-{% endblock %}

lnbits/core/templates/core/wallet.html

@@ -37,8 +37,8 @@
                 >
                   <q-input
                     filled
-                    label="{{LNBITS_DENOMINATION}} to credit"
-                    hint="Press Enter to credit account"
+                    :label='$t("credit_label", { denomination: "{{LNBITS_DENOMINATION}}"})'
+                    :hint="$t('credit_hint')"
                     v-model="scope.value"
                     dense
                     autofocus
@@ -63,8 +63,8 @@
                 color="primary"
                 class="full-width"
                 @click="showParseDialog"
-                >Paste Request</q-btn
-              >
+                :label="$t('paste_request')"
+              ></q-btn>
             </div>
             <div class="col">
               <q-btn
@@ -72,8 +72,8 @@
                 color="primary"
                 class="full-width"
                 @click="showReceiveDialog"
-                >Create Invoice</q-btn
-              >
+                :label="$t('create_invoice')"
+              ></q-btn>
             </div>
             <div class="col">
               <q-btn
@@ -81,8 +81,11 @@
                 color="secondary"
                 icon="photo_camera"
                 @click="showCamera"
-                >scan
-                <q-tooltip>Use camera to scan an invoice/QR</q-tooltip>
+                :label="$t('scan')"
+              >
+                <q-tooltip
+                  >{% raw %}{{$t('camera_tooltip')}}{% endraw %}</q-tooltip
+                >
               </q-btn>
             </div>
           </div>
@@ -92,12 +95,18 @@
           <q-card-section>
             <div class="row items-center no-wrap q-mb-sm">
               <div class="col">
-                <h5 class="text-subtitle1 q-my-none">Transactions</h5>
+                <h5
+                  class="text-subtitle1 q-my-none"
+                  :v-text="$t('transactions')"
+                ></h5>
               </div>
               <div class="col-auto">
-                <q-btn flat color="grey" @click="exportCSV"
-                  >Export to CSV</q-btn
-                >
+                <q-btn
+                  flat
+                  color="grey"
+                  @click="exportCSV"
+                  :label="$t('export_csv')"
+                ></q-btn>
                 <!--<q-btn v-if="pendingPaymentsExist" dense flat round icon="update" color="grey" @click="checkPendingPayments">
                 <q-tooltip>Check pending</q-tooltip>
               </q-btn>-->
@@ -109,30 +118,33 @@
                   color="grey"
                   @click="showChart"
                 >
-                  <q-tooltip>Show chart</q-tooltip>
+                  <q-tooltip
+                    >{% raw %}{{$t('chart_tooltip')}}{% endraw %}</q-tooltip
+                  >
                 </q-btn>
               </div>
             </div>
             <q-input
-              v-if="payments.length > 10"
               filled
               dense
               clearable
               v-model="paymentsTable.filter"
               debounce="300"
-              placeholder="Search by tag, memo, amount"
+              :placeholder="$t('search_by_tag_memo_amount')"
               class="q-mb-md"
             >
             </q-input>
             <q-table
               dense
               flat
-              :data="filteredPayments"
+              :data="payments"
               :row-key="paymentTableRowKey"
               :columns="paymentsTable.columns"
               :pagination.sync="paymentsTable.pagination"
-              no-data-label="No transactions made yet"
+              :no-data-label="$t('no_transactions')"
               :filter="paymentsTable.filter"
+              :loading="paymentsTable.loading"
+              @request="fetchPayments"
             >
               {% raw %}
               <template v-slot:header="props">
@@ -159,11 +171,11 @@
                       color="grey"
                       @click="props.expand = !props.expand"
                     >
-                      <q-tooltip>Pending</q-tooltip>
+                      <q-tooltip>{{$t('pending')}}</q-tooltip>
                     </q-icon>
                   </q-td>
                   <q-td
-                    key="memo"
+                    key="time"
                     :props="props"
                     style="white-space: normal; word-break: break-all"
                   >
@@ -180,27 +192,36 @@
                       </a>
                     </q-badge>
                     {{ props.row.memo }}
+                    <br />
+
+                    <i>
+                      {{ props.row.dateFrom }}<q-tooltip
+                        >{{ props.row.date }}</q-tooltip
+                      ></i
+                    >
                   </q-td>
-                  <q-td auto-width key="date" :props="props">
-                    <q-tooltip>{{ props.row.date }}</q-tooltip>
-                    {{ props.row.dateFrom }}
-                  </q-td>
+
                   {% endraw %}
                   <q-td
                     auto-width
-                    key="sat"
+                    key="amount"
                     v-if="'{{LNBITS_DENOMINATION}}' != 'sats'"
                     :props="props"
                     >{% raw %} {{
                     parseFloat(String(props.row.fsat).replaceAll(",", "")) / 100
                     }}
                   </q-td>
-
-                  <q-td auto-width key="sat" v-else :props="props">
-                    {{ props.row.fsat }}
-                  </q-td>
-                  <q-td auto-width key="fee" :props="props">
-                    {{ props.row.fee }}
+                  <q-td auto-width key="amount" v-else :props="props">
+                    {{ props.row.fsat }}<br />
+                    <i v-if="props.row.extra.wallet_fiat_currency">
+                      {{ props.row.extra.wallet_fiat_currency }} {{
+                      props.row.extra.wallet_fiat_amount }}
+                      <br />
+                    </i>
+                    <i v-if="props.row.extra.fiat_currency">
+                      {{ props.row.extra.fiat_currency }} {{
+                      props.row.extra.fiat_amount }}
+                    </i>
                   </q-td>
                 </q-tr>
 
@@ -209,7 +230,7 @@
                     <div class="text-center q-mb-lg">
                       <div v-if="props.row.isIn && props.row.pending">
                         <q-icon name="settings_ethernet" color="grey"></q-icon>
-                        Invoice waiting to be paid
+                        <span v-text="$t('invoice_waiting')"></span>
                         <lnbits-payment-details
                           :payment="props.row"
                         ></lnbits-payment-details>
@@ -232,15 +253,15 @@
                             outline
                             color="grey"
                             @click="copyText(props.row.bolt11)"
-                            >Copy invoice</q-btn
-                          >
+                            :label="$t('copy_invoice')"
+                          ></q-btn>
                           <q-btn
                             v-close-popup
                             flat
                             color="grey"
                             class="q-ml-auto"
-                            >Close</q-btn
-                          >
+                            :label="$t('close')"
+                          ></q-btn>
                         </div>
                       </div>
                       <div v-else-if="props.row.isPaid && props.row.isIn">
@@ -249,7 +270,7 @@
                           :name="'call_received'"
                           :color="'green'"
                         ></q-icon>
-                        Payment Received
+                        <span v-text="$t('payment_received')"></span>
                         <lnbits-payment-details
                           :payment="props.row"
                         ></lnbits-payment-details>
@@ -260,14 +281,14 @@
                           :name="'call_made'"
                           :color="'pink'"
                         ></q-icon>
-                        Payment Sent
+                        <span v-text="$t('payment_sent')"></span>
                         <lnbits-payment-details
                           :payment="props.row"
                         ></lnbits-payment-details>
                       </div>
                       <div v-else-if="props.row.isOut && props.row.pending">
                         <q-icon name="settings_ethernet" color="grey"></q-icon>
-                        Outgoing payment pending
+                        <span v-text="$t('outgoing_payment_pending')"></span>
                         <lnbits-payment-details
                           :payment="props.row"
                         ></lnbits-payment-details>
@@ -304,26 +325,17 @@
                 <q-expansion-item
                   group="extras"
                   icon="crop_free"
-                  label="Drain Funds"
+                  :label="$t('drain_funds')"
                 >
                   <q-card>
                     <q-card-section class="text-center">
-                      <p>
-                        This is an LNURL-withdraw QR code for slurping
-                        everything from this wallet. Do not share with anyone.
-                      </p>
                       <a href="lightning:{{wallet.lnurlwithdraw_full}}">
                         <qrcode
                           value="lightning:{{wallet.lnurlwithdraw_full}}"
                           :options="{width:240}"
                         ></qrcode>
                       </a>
-                      <p>
-                        It is compatible with <code>balanceCheck</code> and
-                        <code>balanceNotify</code> so your wallet may keep
-                        pulling the funds continuously from here after the first
-                        withdraw.
-                      </p>
+                      <p v-text="$('drain_funds_desc')"></p>
                     </q-card-section>
                   </q-card>
                 </q-expansion-item>
@@ -333,15 +345,11 @@
                 <q-expansion-item
                   group="extras"
                   icon="settings_cell"
-                  label="Export to Phone with QR Code"
+                  :label="$t('export_to_phone')"
                 >
                   <q-card>
                     <q-card-section class="text-center">
-                      <p>
-                        This QR code contains your wallet URL with full access.
-                        You can scan it from your phone to open your wallet from
-                        there.
-                      </p>
+                      <p v-text="$t('export_to_phone_desc')"></p>
                       <qrcode
                         :value="'{{request.base_url}}' +'wallet?usr={{user.id}}&wal={{wallet.id}}'"
                         :options="{width:240}"
@@ -353,48 +361,76 @@
                 <q-expansion-item
                   group="extras"
                   icon="edit"
-                  label="Rename wallet"
+                  :label="$t('rename_wallet')"
                 >
                   <q-card>
                     <q-card-section>
                       <div class="" style="max-width: 320px">
                         <q-input
                           filled
-                          v-model.trim="newName"
-                          label="Label"
-                          dense="dense"
+                          v-model.trim="update.name"
+                          label="Name"
+                          dense
                           @update:model-value="(e) => console.log(e)"
                         />
                       </div>
                       <q-btn
-                        :disable="!newName.length"
+                        :disable="!update.name.length"
                         unelevated
                         class="q-mt-sm"
                         color="primary"
-                        @click="updateWalletName()"
-                        >Update name</q-btn
-                      >
+                        :label="$t('update_name')"
+                        @click="updateWallet({ name: update.name })"
+                      ></q-btn>
                     </q-card-section>
                   </q-card>
                 </q-expansion-item>
                 <q-separator></q-separator>
                 <q-expansion-item
                   group="extras"
-                  icon="remove_circle"
-                  label="Delete wallet"
+                  icon="attach_money"
+                  :label="$t('fiat_tracking')"
                 >
                   <q-card>
                     <q-card-section>
-                      <p>
-                        This whole wallet will be deleted, the funds will be
-                        <strong>UNRECOVERABLE</strong>.
-                      </p>
+                      <div style="max-width: 360px">
+                        <q-select
+                          filled
+                          dense
+                          clearable
+                          v-model="update.currency"
+                          type="text"
+                          :label="$t('currency')"
+                          :options="receive.units.filter((u) => u !== 'sat')"
+                        ></q-select>
+                      </div>
+                      <q-btn
+                        :disable="!update.name.length"
+                        unelevated
+                        class="q-mt-sm"
+                        color="primary"
+                        :label="$t('update_currency')"
+                        @click="updateWallet({ currency: update.currency || '' })"
+                      ></q-btn>
+                    </q-card-section>
+                  </q-card>
+                </q-expansion-item>
+
+                <q-separator></q-separator>
+                <q-expansion-item
+                  group="extras"
+                  icon="remove_circle"
+                  :label="$t('delete_wallet')"
+                >
+                  <q-card>
+                    <q-card-section>
+                      <p v-text="$t('delete_wallet_desc')"></p>
                       <q-btn
                         unelevated
                         color="red-10"
                         @click="deleteWallet('{{ wallet.id }}', '{{ user.id }}')"
-                        >Delete wallet</q-btn
-                      >
+                        :label="$t('delete_wallet')"
+                      ></q-btn>
                     </q-card-section>
                   </q-card>
                 </q-expansion-item>
@@ -430,7 +466,7 @@
         </div>
       </div>
 
-      <q-dialog v-model="receive.show" @hide="closeReceiveDialog">
+      <q-dialog v-model="receive.show">
         {% raw %}
         <q-card
           v-if="!receive.paymentReq"
@@ -445,7 +481,7 @@
               filled
               dense
               v-model.number="receive.data.amount"
-              label="Amount ({{LNBITS_DENOMINATION}}) *"
+              :label="$('amount')+' ({{LNBITS_DENOMINATION}}) *'"
               mask="#.##"
               fill-mask="0"
               reverse-fill-mask
@@ -459,7 +495,7 @@
               dense
               v-model="receive.unit"
               type="text"
-              label="Unit"
+              :label="$t('unit')"
               :options="receive.units"
             ></q-select>
             <q-input
@@ -467,7 +503,7 @@
               filled
               dense
               v-model.number="receive.data.amount"
-              :label="'Amount (' + receive.unit + ') *'"
+              :label="$t('amount') + ' (' + receive.unit + ') *'"
               :mask="receive.unit != 'sat' ? '#.##' : '#'"
               fill-mask="0"
               reverse-fill-mask
@@ -482,7 +518,7 @@
               filled
               dense
               v-model.trim="receive.data.memo"
-              label="Memo"
+              :label="$t('memo')"
             ></q-input>
             {% raw %}
             <div v-if="receive.status == 'pending'" class="row q-mt-lg">
@@ -493,13 +529,17 @@
                 type="submit"
               >
                 <span v-if="receive.lnurl">
-                  Withdraw from {{receive.lnurl.domain}}
+                  {{$t('withdraw_from')}} {{receive.lnurl.domain}}
                 </span>
-                <span v-else> Create invoice </span>
+                <span v-else v-text="$t('create_invoice')"></span>
               </q-btn>
-              <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-                >Cancel</q-btn
-              >
+              <q-btn
+                v-close-popup
+                flat
+                color="grey"
+                class="q-ml-auto"
+                :label="$t('cancel')"
+              ></q-btn>
             </div>
             <q-spinner
               v-if="receive.status == 'loading'"
@@ -521,12 +561,19 @@
             </a>
           </div>
           <div class="row q-mt-lg">
-            <q-btn outline color="grey" @click="copyText(receive.paymentReq)"
-              >Copy invoice</q-btn
-            >
-            <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-              >Close</q-btn
-            >
+            <q-btn
+              outline
+              color="grey"
+              @click="copyText(receive.paymentReq)"
+              :label="$t('copy_invoice')"
+            ></q-btn>
+            <q-btn
+              v-close-popup
+              flat
+              color="grey"
+              class="q-ml-auto"
+              :label="$t('close')"
+            ></q-btn>
           </div>
         </q-card>
         {% endraw %}
@@ -545,24 +592,42 @@
             </h6>
             <q-separator class="q-my-sm"></q-separator>
             <p class="text-wrap">
-              <strong>Description:</strong> {{ parse.invoice.description }}<br />
+              <strong v-text="$t('memo')">:</strong> {{
+              parse.invoice.description }}<br />
               <strong>Expire date:</strong> {{ parse.invoice.expireDate }}<br />
               <strong>Hash:</strong> {{ parse.invoice.hash }}
             </p>
             {% endraw %}
             <div v-if="canPay" class="row q-mt-lg">
-              <q-btn unelevated color="primary" @click="payInvoice">Pay</q-btn>
-              <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-                >Cancel</q-btn
-              >
+              <q-btn
+                unelevated
+                color="primary"
+                @click="payInvoice"
+                :label="$t('pay')"
+              ></q-btn>
+              <q-btn
+                v-close-popup
+                flat
+                color="grey"
+                class="q-ml-auto"
+                :label="$t('cancel')"
+              ></q-btn>
             </div>
             <div v-else class="row q-mt-lg">
-              <q-btn unelevated disabled color="yellow" text-color="black"
-                >Not enough funds!</q-btn
-              >
-              <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-                >Cancel</q-btn
-              >
+              <q-btn
+                :label="$t('not_enough_funds')"
+                unelevated
+                disabled
+                color="yellow"
+                text-color="black"
+              ></q-btn>
+              <q-btn
+                v-close-popup
+                flat
+                color="grey"
+                class="q-ml-auto"
+                :label="$t('cancel')"
+              ></q-btn>
             </div>
           </div>
           <div v-else-if="parse.lnurlauth">
@@ -584,9 +649,13 @@
               </p>
               <div class="row q-mt-lg">
                 <q-btn unelevated color="primary" type="submit">Login</q-btn>
-                <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-                  >Cancel</q-btn
-                >
+                <q-btn
+                  :label="$t('cancel')"
+                  v-close-popup
+                  flat
+                  color="grey"
+                  class="q-ml-auto"
+                ></q-btn>
               </div>
             </q-form>
             {% endraw %}
@@ -657,9 +726,13 @@
                 <q-btn unelevated color="primary" type="submit"
                   >Send {{LNBITS_DENOMINATION}}</q-btn
                 >
-                <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-                  >Cancel</q-btn
-                >
+                <q-btn
+                  :label="$t('cancel')"
+                  v-close-popup
+                  flat
+                  color="grey"
+                  class="q-ml-auto"
+                ></q-btn>
               </div>
             </q-form>
             {% endraw %}
@@ -675,7 +748,8 @@
                 dense
                 v-model.trim="parse.data.request"
                 type="textarea"
-                label="Paste an invoice, payment request or lnurl code *"
+                :label="$t('paste_invoice_label')"
+                ref="textArea"
               >
               </q-input>
               <div class="row q-mt-lg">
@@ -684,11 +758,26 @@
                   color="primary"
                   :disable="parse.data.request == ''"
                   type="submit"
-                  >Read</q-btn
-                >
-                <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-                  >Cancel</q-btn
+                  :label="$t('read')"
+                ></q-btn>
+                <q-icon
+                  name="content_paste"
+                  color="grey"
+                  class="q-mt-xs q-ml-sm q-mr-auto"
+                  v-if="parse.copy.show"
+                  @click="pasteToTextArea"
+                  ><q-tooltip
+                    >{% raw %}{{$t('paste_from_clipboard')}}{% endraw
+                    %}</q-tooltip
+                  ></q-icon
                 >
+                <q-btn
+                  v-close-popup
+                  flat
+                  color="grey"
+                  class="q-ml-auto"
+                  :label="$t('cancel')"
+                ></q-btn>
               </div>
             </q-form>
             <div v-else>
@@ -700,8 +789,13 @@
                 ></qrcode-stream>
               </q-responsive>
               <div class="row q-mt-lg">
-                <q-btn @click="closeCamera" flat color="grey" class="q-ml-auto">
-                  Cancel
+                <q-btn
+                  :label="$t('cancel')"
+                  @click="closeCamera"
+                  flat
+                  color="grey"
+                  class="q-ml-auto"
+                >
                 </q-btn>
               </div>
             </div>
@@ -719,9 +813,13 @@
             ></qrcode-stream>
           </div>
           <div class="row q-mt-lg">
-            <q-btn @click="closeCamera" flat color="grey" class="q-ml-auto"
-              >Cancel</q-btn
-            >
+            <q-btn
+              @click="closeCamera"
+              flat
+              color="grey"
+              class="q-ml-auto"
+              :label="$t('cancel')"
+            ></q-btn>
           </div>
         </q-card>
       </q-dialog>
@@ -733,53 +831,51 @@
           </q-card-section>
         </q-card>
       </q-dialog>
+
       <q-tabs
         class="lt-md fixed-bottom left-0 right-0 bg-primary text-white shadow-2 z-top"
         active-class="px-0"
         indicator-color="transparent"
+        align="justify"
       >
         <q-tab
-          icon="account_balance_wallet"
-          label="Wallets"
-          @click="g.visibleDrawer = !g.visibleDrawer"
+          icon="file_download"
+          @click="showReceiveDialog"
+          :label="$t('receive')"
         >
         </q-tab>
-        <q-tab icon="content_paste" label="Paste" @click="showParseDialog">
-        </q-tab>
-        <q-tab icon="file_download" label="Receive" @click="showReceiveDialog">
-        </q-tab>
 
-        <q-tab icon="photo_camera" label="Scan" @click="showCamera"> </q-tab>
+        <q-tab @click="showParseDialog" icon="file_upload" :label="$t('send')">
+        </q-tab>
+        <q-btn
+          round
+          size="35px"
+          unelevated
+          icon="qr_code_scanner"
+          @click="showCamera"
+          class="text-white bg-primary z-top vertical-bottom absolute-center absolute"
+        >
+        </q-btn>
       </q-tabs>
 
       <q-dialog v-model="disclaimerDialog.show">
         <q-card class="q-pa-lg">
           <h6 class="q-my-md text-primary">Warning</h6>
-          <p>
-            Login functionality to be released in a future update, for now,
-            <strong
-              >make sure you bookmark this page for future access to your
-              wallet</strong
-            >!
-          </p>
-          <p>
-            This service is in BETA, and we hold no responsibility for people
-            losing access to funds. {% if service_fee > 0 %} To encourage you to
-            run your own LNbits installation, any balance on {% raw %}{{
-            disclaimerDialog.location.host }}{% endraw %} will incur a charge of
-            <strong>{{ service_fee }}% service fee</strong> per week. {% endif
-            %}
-          </p>
+          <p v-text="$t('disclaimer_dialog')"></p>
           <div class="row q-mt-lg">
             <q-btn
               outline
               color="grey"
               @click="copyText(disclaimerDialog.location.href)"
-              >Copy wallet URL</q-btn
-            >
-            <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-              >I understand</q-btn
-            >
+              :label="$t('copy_wallet_url')"
+            ></q-btn>
+            <q-btn
+              v-close-popup
+              flat
+              color="grey"
+              class="q-ml-auto"
+              :label="$t('i_understand')"
+            ></q-btn>
           </div>
         </q-card>
       </q-dialog>

lnbits/core/views/admin_api.py

@@ -1,20 +1,51 @@
+import os
+import time
 from http import HTTPStatus
+from shutil import make_archive
+from subprocess import Popen
 from typing import Optional
+from urllib.parse import urlparse
 
-from fastapi import Body, Depends
+from fastapi import Depends
+from fastapi.responses import FileResponse
 from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_wallet
-from lnbits.core.models import User
-from lnbits.core.services import update_cached_settings, update_wallet_balance
+from lnbits.core.models import CreateTopup, User
+from lnbits.core.services import (
+    get_balance_delta,
+    update_cached_settings,
+    update_wallet_balance,
+)
 from lnbits.decorators import check_admin, check_super_user
 from lnbits.server import server_restart
-from lnbits.settings import AdminSettings, EditableSettings
+from lnbits.settings import AdminSettings, EditableSettings, settings
 
-from .. import core_app
+from .. import core_app, core_app_extra
 from ..crud import delete_admin_settings, get_admin_settings, update_admin_settings
 
 
+@core_app.get(
+    "/admin/api/v1/audit",
+    name="Audit",
+    description="show the current balance of the node and the LNbits database",
+    dependencies=[Depends(check_admin)],
+)
+async def api_auditor():
+    try:
+        delta, node_balance, total_balance = await get_balance_delta()
+        return {
+            "delta_msats": int(delta),
+            "node_balance_msats": int(node_balance),
+            "lnbits_balance_msats": int(total_balance),
+        }
+    except Exception:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail="Could not audit balance.",
+        )
+
+
 @core_app.get("/admin/api/v1/settings/")
 async def api_get_settings(
     user: User = Depends(check_admin),
@@ -26,11 +57,15 @@ async def api_get_settings(
 @core_app.put(
     "/admin/api/v1/settings/",
     status_code=HTTPStatus.OK,
-    dependencies=[Depends(check_admin)],
 )
-async def api_update_settings(data: EditableSettings):
+async def api_update_settings(
+    data: EditableSettings, user: User = Depends(check_admin)
+):
     await update_admin_settings(data)
-    update_cached_settings(dict(data))
+    admin_settings = await get_admin_settings(user.super_user)
+    assert admin_settings, "Updated admin settings not found."
+    update_cached_settings(admin_settings.dict())
+    core_app_extra.register_new_ratelimiter()
     return {"status": "Success"}
 
 
@@ -56,19 +91,63 @@ async def api_restart_server() -> dict[str, str]:
 
 @core_app.put(
     "/admin/api/v1/topup/",
+    name="Topup",
     status_code=HTTPStatus.OK,
     dependencies=[Depends(check_super_user)],
 )
-async def api_topup_balance(
-    id: str = Body(...), amount: int = Body(...)
-) -> dict[str, str]:
+async def api_topup_balance(data: CreateTopup) -> dict[str, str]:
     try:
-        await get_wallet(id)
-    except:
+        await get_wallet(data.id)
+    except Exception:
         raise HTTPException(
             status_code=HTTPStatus.FORBIDDEN, detail="wallet does not exist."
         )
 
-    await update_wallet_balance(wallet_id=id, amount=int(amount))
+    if settings.lnbits_backend_wallet_class == "VoidWallet":
+        raise HTTPException(
+            status_code=HTTPStatus.FORBIDDEN, detail="VoidWallet active"
+        )
+
+    await update_wallet_balance(wallet_id=data.id, amount=int(data.amount))
 
     return {"status": "Success"}
+
+
+@core_app.get(
+    "/admin/api/v1/backup/",
+    status_code=HTTPStatus.OK,
+    dependencies=[Depends(check_super_user)],
+    response_class=FileResponse,
+)
+async def api_download_backup() -> FileResponse:
+    last_filename = "lnbits-backup"
+    filename = f"lnbits-backup-{int(time.time())}.zip"
+    db_url = settings.lnbits_database_url
+    pg_backup_filename = f"{settings.lnbits_data_folder}/lnbits-database.dmp"
+    is_pg = db_url and db_url.startswith("postgres://")
+
+    if is_pg:
+        p = urlparse(db_url)
+        command = (
+            f"pg_dump --host={p.hostname} "
+            f"--dbname={p.path.replace('/', '')} "
+            f"--username={p.username} "
+            "--no-password "
+            "--format=c "
+            f"--file={pg_backup_filename}"
+        )
+        proc = Popen(
+            command, shell=True, env={**os.environ, "PGPASSWORD": p.password or ""}
+        )
+        proc.wait()
+
+    make_archive(last_filename, "zip", settings.lnbits_data_folder)
+
+    # cleanup pg_dump file
+    if is_pg:
+        proc = Popen(f"rm {pg_backup_filename}", shell=True)
+        proc.wait()
+
+    return FileResponse(
+        path=f"{last_filename}.zip", filename=filename, media_type="application/zip"
+    )

lnbits/core/views/api.py

@@ -1,21 +1,18 @@
 import asyncio
 import hashlib
 import json
-import time
 import uuid
 from http import HTTPStatus
 from io import BytesIO
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Dict, List, Optional, Union
 from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
 
-import async_timeout
 import httpx
 import pyqrcode
 from fastapi import (
     Body,
     Depends,
     Header,
-    Query,
     Request,
     Response,
     WebSocket,
@@ -23,8 +20,6 @@ from fastapi import (
 )
 from fastapi.exceptions import HTTPException
 from loguru import logger
-from pydantic import BaseModel
-from pydantic.fields import Field
 from sse_starlette.sse import EventSourceResponse
 from starlette.responses import RedirectResponse, StreamingResponse
 
@@ -33,11 +28,24 @@ from lnbits.core.helpers import (
     migrate_extension_database,
     stop_extension_background_work,
 )
-from lnbits.core.models import Payment, User, Wallet
+from lnbits.core.models import (
+    ConversionData,
+    CreateInvoice,
+    CreateLnurl,
+    CreateLnurlAuth,
+    DecodePayment,
+    Payment,
+    PaymentFilters,
+    User,
+    Wallet,
+    WalletType,
+)
+from lnbits.db import Filters, Page
 from lnbits.decorators import (
     WalletTypeInfo,
     check_admin,
     get_key_type,
+    parse_filters,
     require_admin_key,
     require_invoice_key,
 )
@@ -46,10 +54,11 @@ from lnbits.extension_manager import (
     Extension,
     ExtensionRelease,
     InstallableExtension,
+    fetch_github_release_config,
     get_valid_extensions,
 )
-from lnbits.helpers import url_for
-from lnbits.settings import get_wallet_class, settings
+from lnbits.helpers import generate_filter_params_openapi, url_for
+from lnbits.settings import settings
 from lnbits.utils.exchange_rates import (
     currencies,
     fiat_amount_as_satoshis,
@@ -60,14 +69,16 @@ from .. import core_app, core_app_extra, db
 from ..crud import (
     add_installed_extension,
     create_tinyurl,
+    delete_dbversion,
     delete_installed_extension,
     delete_tinyurl,
+    drop_extension_db,
     get_dbversions,
     get_payments,
+    get_payments_paginated,
     get_standalone_payment,
     get_tinyurl,
     get_tinyurl_by_url,
-    get_total_balance,
     get_wallet_for_key,
     save_balance_check,
     update_wallet,
@@ -92,7 +103,7 @@ async def health():
 
 @core_app.get("/api/v1/wallet")
 async def api_wallet(wallet: WalletTypeInfo = Depends(get_key_type)):
-    if wallet.wallet_type == 0:
+    if wallet.wallet_type == WalletType.admin:
         return {
             "id": wallet.wallet.id,
             "name": wallet.wallet.name,
@@ -103,7 +114,7 @@ async def api_wallet(wallet: WalletTypeInfo = Depends(get_key_type)):
 
 
 @core_app.put("/api/v1/wallet/{new_name}")
-async def api_update_wallet(
+async def api_update_wallet_name(
     new_name: str, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
     await update_wallet(wallet.wallet.id, new_name)
@@ -114,20 +125,34 @@ async def api_update_wallet(
     }
 
 
-@core_app.get("/api/v1/payments")
-async def api_payments(
-    limit: Optional[int] = None,
-    offset: Optional[int] = None,
-    wallet: WalletTypeInfo = Depends(get_key_type),
+@core_app.patch("/api/v1/wallet", response_model=Wallet)
+async def api_update_wallet(
+    name: Optional[str] = Body(None),
+    currency: Optional[str] = Body(None),
+    wallet: WalletTypeInfo = Depends(require_admin_key),
 ):
-    pendingPayments = await get_payments(
+    return await update_wallet(wallet.wallet.id, name, currency)
+
+
+@core_app.get(
+    "/api/v1/payments",
+    name="Payment List",
+    summary="get list of payments",
+    response_description="list of payments",
+    response_model=List[Payment],
+    openapi_extra=generate_filter_params_openapi(PaymentFilters),
+)
+async def api_payments(
+    wallet: WalletTypeInfo = Depends(get_key_type),
+    filters: Filters = Depends(parse_filters(PaymentFilters)),
+):
+    pending_payments = await get_payments(
         wallet_id=wallet.wallet.id,
         pending=True,
         exclude_uncheckable=True,
-        limit=limit,
-        offset=offset,
+        filters=filters,
     )
-    for payment in pendingPayments:
+    for payment in pending_payments:
         await check_transaction_status(
             wallet_id=payment.wallet_id, payment_hash=payment.payment_hash
         )
@@ -135,62 +160,72 @@ async def api_payments(
         wallet_id=wallet.wallet.id,
         pending=True,
         complete=True,
-        limit=limit,
-        offset=offset,
+        filters=filters,
     )
 
 
-class CreateInvoiceData(BaseModel):
-    out: Optional[bool] = True
-    amount: float = Query(None, ge=0)
-    memo: Optional[str] = None
-    unit: Optional[str] = "sat"
-    description_hash: Optional[str] = None
-    unhashed_description: Optional[str] = None
-    expiry: Optional[int] = None
-    lnurl_callback: Optional[str] = None
-    lnurl_balance_check: Optional[str] = None
-    extra: Optional[dict] = None
-    webhook: Optional[str] = None
-    internal: Optional[bool] = False
-    bolt11: Optional[str] = None
+@core_app.get(
+    "/api/v1/payments/paginated",
+    name="Payment List",
+    summary="get paginated list of payments",
+    response_description="list of payments",
+    response_model=Page[Payment],
+    openapi_extra=generate_filter_params_openapi(PaymentFilters),
+)
+async def api_payments_paginated(
+    wallet: WalletTypeInfo = Depends(get_key_type),
+    filters: Filters = Depends(parse_filters(PaymentFilters)),
+):
+    pending = await get_payments_paginated(
+        wallet_id=wallet.wallet.id,
+        pending=True,
+        exclude_uncheckable=True,
+        filters=filters,
+    )
+    for payment in pending.data:
+        await check_transaction_status(
+            wallet_id=payment.wallet_id, payment_hash=payment.payment_hash
+        )
+    page = await get_payments_paginated(
+        wallet_id=wallet.wallet.id,
+        pending=True,
+        complete=True,
+        filters=filters,
+    )
+    return page
 
 
-async def api_payments_create_invoice(data: CreateInvoiceData, wallet: Wallet):
+async def api_payments_create_invoice(data: CreateInvoice, wallet: Wallet):
+    description_hash = b""
+    unhashed_description = b""
+    memo = data.memo or settings.lnbits_site_title
     if data.description_hash or data.unhashed_description:
-        try:
-            description_hash = (
-                bytes.fromhex(data.description_hash) if data.description_hash else b""
-            )
-            unhashed_description = (
-                bytes.fromhex(data.unhashed_description)
-                if data.unhashed_description
-                else b""
-            )
-        except ValueError:
-            raise HTTPException(
-                status_code=HTTPStatus.BAD_REQUEST,
-                detail="'description_hash' and 'unhashed_description' must be a valid hex strings",
-            )
+        if data.description_hash:
+            try:
+                description_hash = bytes.fromhex(data.description_hash)
+            except ValueError:
+                raise HTTPException(
+                    status_code=HTTPStatus.BAD_REQUEST,
+                    detail="'description_hash' must be a valid hex string",
+                )
+        if data.unhashed_description:
+            try:
+                unhashed_description = bytes.fromhex(data.unhashed_description)
+            except ValueError:
+                raise HTTPException(
+                    status_code=HTTPStatus.BAD_REQUEST,
+                    detail="'unhashed_description' must be a valid hex string",
+                )
+        # do not save memo if description_hash or unhashed_description is set
         memo = ""
-    else:
-        description_hash = b""
-        unhashed_description = b""
-        memo = data.memo or settings.lnbits_site_title
-
-    if data.unit == "sat":
-        amount = int(data.amount)
-    else:
-        assert data.unit is not None, "unit not set"
-        price_in_sats = await fiat_amount_as_satoshis(data.amount, data.unit)
-        amount = price_in_sats
 
     async with db.connect() as conn:
         try:
-            _, payment_request = await create_invoice(
+            payment_hash, payment_request = await create_invoice(
                 wallet_id=wallet.id,
-                amount=amount,
+                amount=data.amount,
                 memo=memo,
+                currency=data.unit,
                 description_hash=description_hash,
                 unhashed_description=unhashed_description,
                 expiry=data.expiry,
@@ -199,6 +234,12 @@ async def api_payments_create_invoice(data: CreateInvoiceData, wallet: Wallet):
                 internal=data.internal,
                 conn=conn,
             )
+            # NOTE: we get the checking_id with a seperate query because create_invoice
+            # does not return it and it would be a big hustle to change its return type
+            # (used across extensions)
+            payment_db = await get_standalone_payment(payment_hash, conn=conn)
+            assert payment_db is not None, "payment not found"
+            checking_id = payment_db.checking_id
         except InvoiceFailure as e:
             raise HTTPException(status_code=520, detail=str(e))
         except Exception as exc:
@@ -241,7 +282,7 @@ async def api_payments_create_invoice(data: CreateInvoiceData, wallet: Wallet):
         "payment_hash": invoice.payment_hash,
         "payment_request": payment_request,
         # maintain backwards compatibility with API clients:
-        "checking_id": invoice.payment_hash,
+        "checking_id": checking_id,
         "lnurl_response": lnurl_response,
     }
 
@@ -267,13 +308,22 @@ async def api_payments_pay_invoice(bolt11: str, wallet: Wallet):
 
 @core_app.post(
     "/api/v1/payments",
+    summary="Create or pay an invoice",
+    description="""
+        This endpoint can be used both to generate and pay a BOLT11 invoice.
+        To generate a new invoice for receiving funds into the authorized account,
+        specify at least the first four fields in the POST body: `out: false`,
+        `amount`, `unit`, and `memo`. To pay an arbitrary invoice from the funds
+        already in the authorized account, specify `out: true` and use the `bolt11`
+        field to supply the BOLT11 invoice to be paid.
+    """,
     status_code=HTTPStatus.CREATED,
 )
 async def api_payments_create(
     wallet: WalletTypeInfo = Depends(require_invoice_key),
-    invoiceData: CreateInvoiceData = Body(...),
+    invoiceData: CreateInvoice = Body(...),
 ):
-    if invoiceData.out is True and wallet.wallet_type == 0:
+    if invoiceData.out is True and wallet.wallet_type == WalletType.admin:
         if not invoiceData.bolt11:
             raise HTTPException(
                 status_code=HTTPStatus.BAD_REQUEST,
@@ -292,17 +342,9 @@ async def api_payments_create(
         )
 
 
-class CreateLNURLData(BaseModel):
-    description_hash: str
-    callback: str
-    amount: int
-    comment: Optional[str] = None
-    description: Optional[str] = None
-
-
 @core_app.post("/api/v1/payments/lnurl")
 async def api_payments_pay_lnurl(
-    data: CreateLNURLData, wallet: WalletTypeInfo = Depends(require_admin_key)
+    data: CreateLnurl, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
     domain = urlparse(data.callback).netloc
 
@@ -338,13 +380,23 @@ async def api_payments_pay_lnurl(
     if invoice.amount_msat != data.amount:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST,
-            detail=f"{domain} returned an invalid invoice. Expected {data.amount} msat, got {invoice.amount_msat}.",
+            detail=(
+                (
+                    f"{domain} returned an invalid invoice. Expected"
+                    f" {data.amount} msat, got {invoice.amount_msat}."
+                ),
+            ),
         )
 
     if invoice.description_hash != data.description_hash:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST,
-            detail=f"{domain} returned an invalid invoice. Expected description_hash == {data.description_hash}, got {invoice.description_hash}.",
+            detail=(
+                (
+                    f"{domain} returned an invalid invoice. Expected description_hash"
+                    f" == {data.description_hash}, got {invoice.description_hash}."
+                ),
+            ),
         )
 
     extra = {}
@@ -382,35 +434,18 @@ async def subscribe_wallet_invoices(request: Request, wallet: Wallet):
     logger.debug(f"adding sse listener for wallet: {uid}")
     api_invoice_listeners[uid] = payment_queue
 
-    send_queue: asyncio.Queue[Tuple[str, Payment]] = asyncio.Queue(0)
-
-    async def payment_received() -> None:
-        while True:
-            try:
-                async with async_timeout.timeout(1):
-                    payment: Payment = await payment_queue.get()
-                    if payment.wallet_id == this_wallet_id:
-                        logger.debug("sse listener: payment received", payment)
-                        await send_queue.put(("payment-received", payment))
-            except asyncio.TimeoutError:
-                pass
-
-    task = asyncio.create_task(payment_received())
-
     try:
         while True:
             if await request.is_disconnected():
                 await request.close()
                 break
-            typ, data = await send_queue.get()
-            if data:
-                jdata = json.dumps(dict(data.dict(), pending=False))
-
-            yield dict(data=jdata, event=typ)
+            payment: Payment = await payment_queue.get()
+            if payment.wallet_id == this_wallet_id:
+                logger.debug("sse listener: payment received", payment)
+                yield dict(data=payment.json(), event="payment-received")
     except asyncio.CancelledError:
         logger.debug(f"removing listener for wallet {uid}")
         api_invoice_listeners.pop(uid)
-        task.cancel()
         return
 
 
@@ -425,14 +460,16 @@ async def api_payments_sse(
     )
 
 
+# TODO: refactor this route into a public and admin one
 @core_app.get("/api/v1/payments/{payment_hash}")
 async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):
     # We use X_Api_Key here because we want this call to work with and without keys
     # If a valid key is given, we also return the field "details", otherwise not
-    wallet = await get_wallet_for_key(X_Api_Key) if type(X_Api_Key) == str else None
+    wallet = await get_wallet_for_key(X_Api_Key) if isinstance(X_Api_Key, str) else None
 
-    # we have to specify the wallet id here, because postgres and sqlite return internal payments in different order
-    # and get_standalone_payment otherwise just fetches the first one, causing unpredictable results
+    # we have to specify the wallet id here, because postgres and sqlite return
+    # internal payments in different order and get_standalone_payment otherwise
+    # just fetches the first one, causing unpredictable results
     payment = await get_standalone_payment(
         payment_hash, wallet_id=wallet.id if wallet else None
     )
@@ -474,7 +511,7 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type
     try:
         url = lnurl.decode(code)
         domain = urlparse(url).netloc
-    except:
+    except Exception:
         # parse internet identifier (user@domain.com)
         name_domain = code.split("@")
         if len(name_domain) == 2 and len(name_domain[1].split(".")) >= 2:
@@ -499,10 +536,12 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type
         params.update(callback=url)  # with k1 already in it
 
         lnurlauth_key = wallet.wallet.lnurlauth_key(domain)
+        assert lnurlauth_key.verifying_key
         params.update(pubkey=lnurlauth_key.verifying_key.to_string("compressed").hex())
     else:
-        async with httpx.AsyncClient() as client:
+        async with httpx.AsyncClient(follow_redirects=True) as client:
             r = await client.get(url, timeout=5)
+            r.raise_for_status()
             if r.is_error:
                 raise HTTPException(
                     status_code=HTTPStatus.SERVICE_UNAVAILABLE,
@@ -564,7 +603,7 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type
                     if k == "text/plain":
                         params.update(description=v)
                     if k in ("image/jpeg;base64", "image/png;base64"):
-                        data_uri = "data:" + k + "," + v
+                        data_uri = f"data:{k},{v}"
                         params.update(image=data_uri)
                     if k in ("text/email", "text/identifier"):
                         params.update(targetUser=v)
@@ -582,10 +621,6 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type
     return params
 
 
-class DecodePayment(BaseModel):
-    data: str
-
-
 @core_app.post("/api/v1/payments/decode", status_code=HTTPStatus.OK)
 async def api_payments_decode(data: DecodePayment, response: Response):
     payment_str = data.data
@@ -607,20 +642,16 @@ async def api_payments_decode(data: DecodePayment, response: Response):
                 "route_hints": invoice.route_hints,
                 "min_final_cltv_expiry": invoice.min_final_cltv_expiry,
             }
-    except:
+    except Exception:
         response.status_code = HTTPStatus.BAD_REQUEST
         return {"message": "Failed to decode"}
 
 
-class Callback(BaseModel):
-    callback: str = Query(...)
-
-
 @core_app.post("/api/v1/lnurlauth")
 async def api_perform_lnurlauth(
-    callback: Callback, wallet: WalletTypeInfo = Depends(require_admin_key)
+    data: CreateLnurlAuth, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
-    err = await perform_lnurlauth(callback.callback, wallet=wallet)
+    err = await perform_lnurlauth(data.callback, wallet=wallet)
     if err:
         raise HTTPException(
             status_code=HTTPStatus.SERVICE_UNAVAILABLE, detail=err.reason
@@ -630,15 +661,15 @@ async def api_perform_lnurlauth(
 
 @core_app.get("/api/v1/currencies")
 async def api_list_currencies_available():
+    if len(settings.lnbits_allowed_currencies) > 0:
+        return [
+            item
+            for item in currencies.keys()
+            if item.upper() in settings.lnbits_allowed_currencies
+        ]
     return list(currencies.keys())
 
 
-class ConversionData(BaseModel):
-    from_: str = Field("sat", alias="from")
-    amount: float
-    to: str = Query("usd")
-
-
 @core_app.post("/api/v1/conversion")
 async def api_fiat_as_sats(data: ConversionData):
     output = {}
@@ -658,7 +689,7 @@ async def api_fiat_as_sats(data: ConversionData):
 
 
 @core_app.get("/api/v1/qrcode/{data}", response_class=StreamingResponse)
-async def img(request: Request, data):
+async def img(data):
     qr = pyqrcode.create(data)
     stream = BytesIO()
     qr.svg(stream, scale=3)
@@ -678,31 +709,9 @@ async def img(request: Request, data):
     )
 
 
-@core_app.get("/api/v1/audit", dependencies=[Depends(check_admin)])
-async def api_auditor():
-    WALLET = get_wallet_class()
-    total_balance = await get_total_balance()
-    error_message, node_balance = await WALLET.status()
-
-    if not error_message:
-        delta = node_balance - total_balance
-    else:
-        node_balance, delta = None, None
-
-    return {
-        "node_balance_msats": int(node_balance),
-        "lnbits_balance_msats": int(total_balance),
-        "delta_msats": int(delta),
-        "timestamp": int(time.time()),
-    }
-
-
-##################UNIVERSAL WEBSOCKET MANAGER########################
-
-
 @core_app.websocket("/api/v1/ws/{item_id}")
 async def websocket_connect(websocket: WebSocket, item_id: str):
-    await websocketManager.connect(websocket)
+    await websocketManager.connect(websocket, item_id)
     try:
         while True:
             await websocket.receive_text()
@@ -715,7 +724,7 @@ async def websocket_update_post(item_id: str, data: str):
     try:
         await websocketUpdater(item_id, data)
         return {"sent": True, "data": data}
-    except:
+    except Exception:
         return {"sent": False, "data": data}
 
 
@@ -724,7 +733,7 @@ async def websocket_update_get(item_id: str, data: str):
     try:
         await websocketUpdater(item_id, data)
         return {"sent": True, "data": data}
-    except:
+    except Exception:
         return {"sent": False, "data": data}
 
 
@@ -739,6 +748,12 @@ async def api_install_extension(
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Release not found"
         )
+
+    if not release.is_version_compatible:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST, detail="Incompatible extension version"
+        )
+
     ext_info = InstallableExtension(
         id=data.ext_id, name=data.ext_id, installed_release=release, icon=release.icon
     )
@@ -774,13 +789,15 @@ async def api_install_extension(
         ext_info.clean_extension_files()
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail="Failed to install extension.",
+            detail=(
+                f"Failed to install extension {ext_info.id} "
+                f"({ext_info.installed_version})."
+            ),
         )
 
 
 @core_app.delete("/api/v1/extension/{ext_id}")
 async def api_uninstall_extension(ext_id: str, user: User = Depends(check_admin)):
-
     installable_extensions = await InstallableExtension.get_installable_extensions()
 
     extensions = [e for e in installable_extensions if e.id == ext_id]
@@ -798,7 +815,10 @@ async def api_uninstall_extension(ext_id: str, user: User = Depends(check_admin)
         if installed_ext and ext_id in installed_ext.dependencies:
             raise HTTPException(
                 status_code=HTTPStatus.BAD_REQUEST,
-                detail=f"Cannot uninstall. Extension '{installed_ext.name}' depends on this one.",
+                detail=(
+                    f"Cannot uninstall. Extension '{installed_ext.name}' "
+                    "depends on this one."
+                ),
             )
 
     try:
@@ -812,14 +832,17 @@ async def api_uninstall_extension(ext_id: str, user: User = Depends(check_admin)
             ext_info.clean_extension_files()
             await delete_installed_extension(ext_id=ext_info.id)
 
+        logger.success(f"Extension '{ext_id}' uninstalled.")
     except Exception as ex:
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
         )
 
 
-@core_app.get("/api/v1/extension/{ext_id}/releases")
-async def get_extension_releases(ext_id: str, user: User = Depends(check_admin)):
+@core_app.get(
+    "/api/v1/extension/{ext_id}/releases", dependencies=[Depends(check_admin)]
+)
+async def get_extension_releases(ext_id: str):
     try:
         extension_releases: List[
             ExtensionRelease
@@ -833,10 +856,61 @@ async def get_extension_releases(ext_id: str, user: User = Depends(check_admin))
         )
 
 
-############################TINYURL##################################
+@core_app.get(
+    "/api/v1/extension/release/{org}/{repo}/{tag_name}",
+    dependencies=[Depends(check_admin)],
+)
+async def get_extension_release(org: str, repo: str, tag_name: str):
+    try:
+        config = await fetch_github_release_config(org, repo, tag_name)
+        if not config:
+            return {}
+
+        return {
+            "min_lnbits_version": config.min_lnbits_version,
+            "is_version_compatible": config.is_version_compatible(),
+            "warning": config.warning,
+        }
+    except Exception as ex:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
+        )
 
 
-@core_app.post("/api/v1/tinyurl")
+@core_app.delete(
+    "/api/v1/extension/{ext_id}/db",
+    dependencies=[Depends(check_admin)],
+)
+async def delete_extension_db(ext_id: str):
+    try:
+        db_version = (await get_dbversions()).get(ext_id, None)
+        if not db_version:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail=f"Unknown extension id: {ext_id}",
+            )
+        await drop_extension_db(ext_id=ext_id)
+        await delete_dbversion(ext_id=ext_id)
+        logger.success(f"Database removed for extension '{ext_id}'")
+    except HTTPException as ex:
+        logger.error(ex)
+        raise ex
+    except Exception as ex:
+        logger.error(ex)
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=f"Cannot delete data for extension '{ext_id}'",
+        )
+
+
+# TINYURL
+
+
+@core_app.post(
+    "/api/v1/tinyurl",
+    name="Tinyurl",
+    description="creates a tinyurl",
+)
 async def api_create_tinyurl(
     url: str, endless: bool = False, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
@@ -847,13 +921,17 @@ async def api_create_tinyurl(
                 if tinyurl.wallet == wallet.wallet.inkey:
                     return tinyurl
         return await create_tinyurl(url, endless, wallet.wallet.inkey)
-    except:
+    except Exception:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST, detail="Unable to create tinyurl"
         )
 
 
-@core_app.get("/api/v1/tinyurl/{tinyurl_id}")
+@core_app.get(
+    "/api/v1/tinyurl/{tinyurl_id}",
+    name="Tinyurl",
+    description="get a tinyurl by id",
+)
 async def api_get_tinyurl(
     tinyurl_id: str, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
@@ -865,13 +943,17 @@ async def api_get_tinyurl(
         raise HTTPException(
             status_code=HTTPStatus.FORBIDDEN, detail="Wrong key provided."
         )
-    except:
+    except Exception:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Unable to fetch tinyurl"
         )
 
 
-@core_app.delete("/api/v1/tinyurl/{tinyurl_id}")
+@core_app.delete(
+    "/api/v1/tinyurl/{tinyurl_id}",
+    name="Tinyurl",
+    description="delete a tinyurl by id",
+)
 async def api_delete_tinyurl(
     tinyurl_id: str, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
@@ -884,22 +966,23 @@ async def api_delete_tinyurl(
         raise HTTPException(
             status_code=HTTPStatus.FORBIDDEN, detail="Wrong key provided."
         )
-    except:
+    except Exception:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST, detail="Unable to delete"
         )
 
 
-@core_app.get("/t/{tinyurl_id}")
+@core_app.get(
+    "/t/{tinyurl_id}",
+    name="Tinyurl",
+    description="redirects a tinyurl by id",
+)
 async def api_tinyurl(tinyurl_id: str):
-    try:
-        tinyurl = await get_tinyurl(tinyurl_id)
-        if tinyurl:
-            response = RedirectResponse(url=tinyurl.url)
-            return response
-        else:
-            return
-    except:
+    tinyurl = await get_tinyurl(tinyurl_id)
+    if tinyurl:
+        response = RedirectResponse(url=tinyurl.url)
+        return response
+    else:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="unable to find tinyurl"
         )

lnbits/core/views/generic.py

@@ -11,17 +11,21 @@ from pydantic.types import UUID4
 from starlette.responses import HTMLResponse, JSONResponse
 
 from lnbits.core import db
+from lnbits.core.helpers import to_valid_user_id
 from lnbits.core.models import User
 from lnbits.decorators import check_admin, check_user_exists
 from lnbits.helpers import template_renderer, url_for
-from lnbits.settings import get_wallet_class, settings
+from lnbits.settings import settings
+from lnbits.wallets import get_wallet_class
 
 from ...extension_manager import InstallableExtension, get_valid_extensions
+from ...utils.exchange_rates import currencies
 from ..crud import (
     create_account,
     create_wallet,
     delete_wallet,
     get_balance_check,
+    get_dbversions,
     get_inactive_extensions,
     get_installed_extensions,
     get_user,
@@ -31,7 +35,9 @@ from ..crud import (
 )
 from ..services import pay_invoice, redeem_lnurl_withdraw
 
-core_html_routes: APIRouter = APIRouter(tags=["Core NON-API Website Routes"])
+core_html_routes: APIRouter = APIRouter(
+    tags=["Core NON-API Website Routes"], include_in_schema=False
+)
 
 
 @core_html_routes.get("/favicon.ico", response_class=FileResponse)
@@ -56,11 +62,13 @@ async def robots():
 
 
 @core_html_routes.get(
-    "/extensions", name="core.extensions", response_class=HTMLResponse
+    "/extensions", name="install.extensions", response_class=HTMLResponse
 )
-async def extensions(
+async def extensions_install(
     request: Request,
     user: User = Depends(check_user_exists),
+    activate: str = Query(None),
+    deactivate: str = Query(None),
     enable: str = Query(None),
     disable: str = Query(None),
 ):
@@ -69,21 +77,6 @@ async def extensions(
     # Update user as his extensions have been updated
     if enable or disable:
         user = await get_user(user.id)  # type: ignore
-
-    return template_renderer().TemplateResponse(
-        "core/extensions.html", {"request": request, "user": user.dict()}
-    )
-
-
-@core_html_routes.get(
-    "/install", name="install.extensions", response_class=HTMLResponse
-)
-async def extensions_install(
-    request: Request,
-    user: User = Depends(check_user_exists),
-    activate: str = Query(None),
-    deactivate: str = Query(None),
-):
     try:
         installed_exts: List["InstallableExtension"] = await get_installed_extensions()
         installed_exts_ids = [e.id for e in installed_exts]
@@ -125,6 +118,7 @@ async def extensions_install(
 
         all_extensions = list(map(lambda e: e.code, get_valid_extensions()))
         inactive_extensions = await get_inactive_extensions()
+        db_version = await get_dbversions()
         extensions = list(
             map(
                 lambda ext: {
@@ -136,21 +130,23 @@ async def extensions_install(
                     "isFeatured": ext.featured,
                     "dependencies": ext.dependencies,
                     "isInstalled": ext.id in installed_exts_ids,
+                    "hasDatabaseTables": ext.id in db_version,
                     "isAvailable": ext.id in all_extensions,
+                    "isAdminOnly": ext.id in settings.lnbits_admin_extensions,
                     "isActive": ext.id not in inactive_extensions,
-                    "latestRelease": dict(ext.latest_release)
-                    if ext.latest_release
-                    else None,
-                    "installedRelease": dict(ext.installed_release)
-                    if ext.installed_release
-                    else None,
+                    "latestRelease": (
+                        dict(ext.latest_release) if ext.latest_release else None
+                    ),
+                    "installedRelease": (
+                        dict(ext.installed_release) if ext.installed_release else None
+                    ),
                 },
                 installable_exts,
             )
         )
 
         return template_renderer().TemplateResponse(
-            "core/install.html",
+            "core/extensions.html",
             {
                 "request": request,
                 "user": user.dict(),
@@ -166,13 +162,13 @@ async def extensions_install(
     "/wallet",
     response_class=HTMLResponse,
     description="""
-Args:
-
-just **wallet_name**: create a new user, then create a new wallet for user with wallet_name<br>
-just **user_id**: return the first user wallet or create one if none found (with default wallet_name)<br>
-**user_id** and **wallet_name**: create a new wallet for user with wallet_name<br>
-**user_id** and **wallet_id**: return that wallet if user is the owner<br>
-nothing: create everything<br>
+just **wallet_name**: create a new user, then create a new wallet
+                      for user with wallet_name
+just **user_id**: return the first user wallet or create one if none found
+                  (with default wallet_name)
+**user_id** and **wallet_name**: create a new wallet for user with wallet_name
+**user_id** and **wallet_id**: return that wallet if user is the owner
+nothing: create everything
 """,
 )
 async def wallet(
@@ -186,8 +182,10 @@ async def wallet(
     wallet_name = nme
 
     if not user_id:
-        user = await get_user((await create_account()).id)
-        logger.info(f"Create user {user.id}")  # type: ignore
+        new_user = await create_account()
+        user = await get_user(new_user.id)
+        assert user, "Newly created user has to exist."
+        logger.info(f"Create user {user.id}")
     else:
         user = await get_user(user_id)
         if not user:
@@ -209,23 +207,26 @@ async def wallet(
             user.super_user = True
 
     if not wallet_id:
-        if user.wallets and not wallet_name:  # type: ignore
-            wallet = user.wallets[0]  # type: ignore
+        if user.wallets and not wallet_name:
+            wallet = user.wallets[0]
         else:
-            wallet = await create_wallet(user_id=user.id, wallet_name=wallet_name)  # type: ignore
+            wallet = await create_wallet(user_id=user.id, wallet_name=wallet_name)
             logger.info(
-                f"Created new wallet {wallet_name if wallet_name else '(no name)'} for user {user.id}"  # type: ignore
+                f"Created new wallet {wallet_name if wallet_name else '(no name)'} for"
+                f" user {user.id}"
             )
 
         return RedirectResponse(
-            f"/wallet?usr={user.id}&wal={wallet.id}",  # type: ignore
+            f"/wallet?usr={user.id}&wal={wallet.id}",
             status_code=status.HTTP_307_TEMPORARY_REDIRECT,
         )
 
     logger.debug(
-        f"Access {'user '+ user.id + ' ' if user else ''} {'wallet ' + wallet_name if wallet_name else ''}"
+        "Access "
+        f"{'user '+ user.id + ' ' if user else ''} "
+        f"{'wallet ' + wallet_name if wallet_name else ''}"
     )
-    userwallet = user.get_wallet(wallet_id)  # type: ignore
+    userwallet = user.get_wallet(wallet_id)
     if not userwallet:
         return template_renderer().TemplateResponse(
             "error.html", {"request": request, "err": "Wallet not found"}
@@ -235,10 +236,10 @@ async def wallet(
         "core/wallet.html",
         {
             "request": request,
-            "user": user.dict(),  # type: ignore
+            "user": user.dict(),
             "wallet": userwallet.dict(),
             "service_fee": settings.lnbits_service_fee,
-            "web_manifest": f"/manifest/{user.id}.webmanifest",  # type: ignore
+            "web_manifest": f"/manifest/{user.id}.webmanifest",
         },
     )
 
@@ -259,7 +260,9 @@ async def lnurl_full_withdraw(request: Request):
         "k1": "0",
         "minWithdrawable": 1000 if wallet.withdrawable_balance else 0,
         "maxWithdrawable": wallet.withdrawable_balance,
-        "defaultDescription": f"{settings.lnbits_site_title} balance withdraw from {wallet.id[0:5]}",
+        "defaultDescription": (
+            f"{settings.lnbits_site_title} balance withdraw from {wallet.id[0:5]}"
+        ),
         "balanceCheck": url_for("/withdraw", external=True, usr=user.id, wal=wallet.id),
     }
 
@@ -279,7 +282,7 @@ async def lnurl_full_withdraw_callback(request: Request):
     async def pay():
         try:
             await pay_invoice(wallet_id=wallet.id, payment_request=pr)
-        except:
+        except Exception:
             pass
 
     asyncio.create_task(pay())
@@ -294,18 +297,21 @@ async def lnurl_full_withdraw_callback(request: Request):
 @core_html_routes.get("/deletewallet", response_class=RedirectResponse)
 async def deletewallet(wal: str = Query(...), usr: str = Query(...)):
     user = await get_user(usr)
-    user_wallet_ids = [u.id for u in user.wallets]  # type: ignore
+    if not user:
+        raise HTTPException(HTTPStatus.FORBIDDEN, "User not found.")
+
+    user_wallet_ids = [u.id for u in user.wallets]
 
     if wal not in user_wallet_ids:
         raise HTTPException(HTTPStatus.FORBIDDEN, "Not your wallet.")
     else:
-        await delete_wallet(user_id=user.id, wallet_id=wal)  # type: ignore
+        await delete_wallet(user_id=user.id, wallet_id=wal)
         user_wallet_ids.remove(wal)
         logger.debug("Deleted wallet {wal} of user {user.id}")
 
     if user_wallet_ids:
         return RedirectResponse(
-            url_for("/wallet", usr=user.id, wal=user_wallet_ids[0]),  # type: ignore
+            url_for("/wallet", usr=user.id, wal=user_wallet_ids[0]),
             status_code=status.HTTP_307_TEMPORARY_REDIRECT,
         )
 
@@ -328,7 +334,8 @@ async def lnurlwallet(request: Request):
     async with db.connect() as conn:
         account = await create_account(conn=conn)
         user = await get_user(account.id, conn=conn)
-        wallet = await create_wallet(user_id=user.id, conn=conn)  # type: ignore
+        assert user, "Newly created user not found."
+        wallet = await create_wallet(user_id=user.id, conn=conn)
 
     asyncio.create_task(
         redeem_lnurl_withdraw(
@@ -341,7 +348,7 @@ async def lnurlwallet(request: Request):
     )
 
     return RedirectResponse(
-        f"/wallet?usr={user.id}&wal={wallet.id}",  # type: ignore
+        f"/wallet?usr={user.id}&wal={wallet.id}",
         status_code=status.HTTP_307_TEMPORARY_REDIRECT,
     )
 
@@ -362,14 +369,16 @@ async def manifest(usr: str):
         "name": settings.lnbits_site_title + " Wallet",
         "icons": [
             {
-                "src": settings.lnbits_custom_logo
-                if settings.lnbits_custom_logo
-                else "https://cdn.jsdelivr.net/gh/lnbits/lnbits@0.3.0/docs/logos/lnbits.png",
+                "src": (
+                    settings.lnbits_custom_logo
+                    if settings.lnbits_custom_logo
+                    else "https://cdn.jsdelivr.net/gh/lnbits/lnbits@0.3.0/docs/logos/lnbits.png"
+                ),
                 "type": "image/png",
                 "sizes": "900x900",
             }
         ],
-        "start_url": "/wallet?usr=" + usr + "&wal=" + user.wallets[0].id,
+        "start_url": f"/wallet?usr={usr}&wal={user.wallets[0].id}",
         "background_color": "#1F2234",
         "description": "Bitcoin Lightning Wallet",
         "display": "standalone",
@@ -380,7 +389,7 @@ async def manifest(usr: str):
                 "name": wallet.name,
                 "short_name": wallet.name,
                 "description": wallet.name,
-                "url": "/wallet?usr=" + usr + "&wal=" + wallet.id,
+                "url": f"/wallet?usr={usr}&wal={wallet.id}",
             }
             for wallet in user.wallets
         ],
@@ -402,10 +411,20 @@ async def index(request: Request, user: User = Depends(check_admin)):
             "user": user.dict(),
             "settings": settings.dict(),
             "balance": balance,
+            "currencies": list(currencies.keys()),
         },
     )
 
 
+@core_html_routes.get("/uuidv4/{hex_value}")
+async def hex_to_uuid4(hex_value: str):
+    try:
+        user_id = to_valid_user_id(hex_value).hex
+        return RedirectResponse(url=f"/wallet?usr={user_id}")
+    except Exception as e:
+        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST, detail=str(e))
+
+
 async def toggle_extension(extension_to_enable, extension_to_disable, user_id):
     if extension_to_enable and extension_to_disable:
         raise HTTPException(

lnbits/core/views/public_api.py

@@ -28,7 +28,7 @@ async def api_public_payment_longpolling(payment_hash):
         expiration = datetime.datetime.fromtimestamp(invoice.date + invoice.expiry)
         if expiration < datetime.datetime.now():
             return {"status": "expired"}
-    except:
+    except Exception:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST, detail="Invalid bolt11 invoice."
         )
@@ -40,19 +40,18 @@ async def api_public_payment_longpolling(payment_hash):
 
     response = None
 
-    async def payment_info_receiver(cancel_scope):
-        async for payment in payment_queue.get():
+    async def payment_info_receiver():
+        for payment in await payment_queue.get():
             if payment.payment_hash == payment_hash:
                 nonlocal response
                 response = {"status": "paid"}
-                cancel_scope.cancel()
 
     async def timeouter(cancel_scope):
         await asyncio.sleep(45)
         cancel_scope.cancel()
 
-    asyncio.create_task(payment_info_receiver())
-    asyncio.create_task(timeouter())
+    cancel_scope = asyncio.create_task(payment_info_receiver())
+    asyncio.create_task(timeouter(cancel_scope))
 
     if response:
         return response

lnbits/db.py

@@ -1,12 +1,17 @@
+from __future__ import annotations
+
 import asyncio
 import datetime
 import os
 import re
 import time
 from contextlib import asynccontextmanager
-from typing import Optional
+from enum import Enum
+from sqlite3 import Row
+from typing import Any, Generic, List, Literal, Optional, Type, TypeVar
 
 from loguru import logger
+from pydantic import BaseModel, ValidationError, root_validator
 from sqlalchemy import create_engine
 from sqlalchemy_aio.base import AsyncConnection
 from sqlalchemy_aio.strategy import ASYNCIO_STRATEGY
@@ -17,6 +22,51 @@ POSTGRES = "POSTGRES"
 COCKROACH = "COCKROACH"
 SQLITE = "SQLITE"
 
+if settings.lnbits_database_url:
+    database_uri = settings.lnbits_database_url
+
+    if database_uri.startswith("cockroachdb://"):
+        DB_TYPE = COCKROACH
+    else:
+        DB_TYPE = POSTGRES
+
+    from psycopg2.extensions import DECIMAL, new_type, register_type
+
+    def _parse_timestamp(value, _):
+        if value is None:
+            return None
+        f = "%Y-%m-%d %H:%M:%S.%f"
+        if "." not in value:
+            f = "%Y-%m-%d %H:%M:%S"
+        return time.mktime(datetime.datetime.strptime(value, f).timetuple())
+
+    register_type(
+        new_type(
+            DECIMAL.values,
+            "DEC2FLOAT",
+            lambda value, curs: float(value) if value is not None else None,
+        )
+    )
+
+    register_type(new_type((1184, 1114), "TIMESTAMP2INT", _parse_timestamp))
+else:
+    if os.path.isdir(settings.lnbits_data_folder):
+        DB_TYPE = SQLITE
+    else:
+        raise NotADirectoryError(
+            f"LNBITS_DATA_FOLDER named {settings.lnbits_data_folder} was not created"
+            f" - please 'mkdir {settings.lnbits_data_folder}' and try again"
+        )
+
+
+def compat_timestamp_placeholder():
+    if DB_TYPE == POSTGRES:
+        return "to_timestamp(?)"
+    elif DB_TYPE == COCKROACH:
+        return "cast(? AS timestamp)"
+    else:
+        return "?"
+
 
 class Compat:
     type: Optional[str] = "<inherited>"
@@ -66,6 +116,10 @@ class Compat:
             return "BIGINT"
         return "INT"
 
+    @property
+    def timestamp_placeholder(self) -> str:
+        return compat_timestamp_placeholder()
+
 
 class Connection(Compat):
     def __init__(self, conn: AsyncConnection, txn, typ, name, schema):
@@ -85,17 +139,21 @@ class Connection(Compat):
         # strip html
         CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
 
-        def cleanhtml(raw_html):
-            if isinstance(raw_html, str):
-                cleantext = re.sub(CLEANR, "", raw_html)
-                return cleantext
-            else:
-                return raw_html
-
         # tuple to list and back to tuple
-        value_list = [values] if isinstance(values, str) else list(values)
-        values = tuple([cleanhtml(l) for l in value_list])
-        return values
+        raw_values = [values] if isinstance(values, str) else list(values)
+        values = []
+        for raw_value in raw_values:
+            if isinstance(raw_value, str):
+                values.append(re.sub(CLEANR, "", raw_value))
+            elif isinstance(raw_value, datetime.datetime):
+                ts = raw_value.timestamp()
+                if self.type == SQLITE:
+                    values.append(int(ts))
+                else:
+                    values.append(ts)
+            else:
+                values.append(raw_value)
+        return tuple(values)
 
     async def fetchall(self, query: str, values: tuple = ()) -> list:
         result = await self.conn.execute(
@@ -111,6 +169,51 @@ class Connection(Compat):
         await result.close()
         return row
 
+    async def fetch_page(
+        self,
+        query: str,
+        where: Optional[List[str]] = None,
+        values: Optional[List[str]] = None,
+        filters: Optional[Filters] = None,
+        model: Optional[Type[TRowModel]] = None,
+    ) -> Page[TRowModel]:
+        if not filters:
+            filters = Filters()
+        clause = filters.where(where)
+        parsed_values = filters.values(values)
+
+        rows = await self.fetchall(
+            f"""
+            {query}
+            {clause}
+            {filters.order_by()}
+            {filters.pagination()}
+            """,
+            parsed_values,
+        )
+        if rows:
+            # no need for extra query if no pagination is specified
+            if filters.offset or filters.limit:
+                count = await self.fetchone(
+                    f"""
+                    SELECT COUNT(*) FROM (
+                        {query}
+                        {clause}
+                    ) as count
+                    """,
+                    parsed_values,
+                )
+                count = int(count[0])
+            else:
+                count = len(rows)
+        else:
+            count = 0
+
+        return Page(
+            data=[model.from_row(row) for row in rows] if model else rows,
+            total=count,
+        )
+
     async def execute(self, query: str, values: tuple = ()):
         return await self.conn.execute(
             self.rewrite_query(query), self.rewrite_values(values)
@@ -120,61 +223,17 @@ class Connection(Compat):
 class Database(Compat):
     def __init__(self, db_name: str):
         self.name = db_name
+        self.schema = self.name
+        self.type = DB_TYPE
 
-        if settings.lnbits_database_url:
+        if DB_TYPE == SQLITE:
+            self.path = os.path.join(
+                settings.lnbits_data_folder, f"{self.name}.sqlite3"
+            )
+            database_uri = f"sqlite:///{self.path}"
+        else:
             database_uri = settings.lnbits_database_url
 
-            if database_uri.startswith("cockroachdb://"):
-                self.type = COCKROACH
-            else:
-                self.type = POSTGRES
-
-            import psycopg2
-
-            def _parse_timestamp(value, _):
-                if value is None:
-                    return None
-                f = "%Y-%m-%d %H:%M:%S.%f"
-                if "." not in value:
-                    f = "%Y-%m-%d %H:%M:%S"
-                return time.mktime(datetime.datetime.strptime(value, f).timetuple())
-
-            psycopg2.extensions.register_type(
-                psycopg2.extensions.new_type(
-                    psycopg2.extensions.DECIMAL.values,
-                    "DEC2FLOAT",
-                    lambda value, curs: float(value) if value is not None else None,
-                )
-            )
-            psycopg2.extensions.register_type(
-                psycopg2.extensions.new_type(
-                    (1082, 1083, 1266),
-                    "DATE2INT",
-                    lambda value, curs: time.mktime(value.timetuple())
-                    if value is not None
-                    else None,
-                )
-            )
-
-            psycopg2.extensions.register_type(
-                psycopg2.extensions.new_type(
-                    (1184, 1114), "TIMESTAMP2INT", _parse_timestamp
-                )
-            )
-        else:
-            if os.path.isdir(settings.lnbits_data_folder):
-                self.path = os.path.join(
-                    settings.lnbits_data_folder, f"{self.name}.sqlite3"
-                )
-                database_uri = f"sqlite:///{self.path}"
-                self.type = SQLITE
-            else:
-                raise NotADirectoryError(
-                    f"LNBITS_DATA_FOLDER named {settings.lnbits_data_folder} was not created"
-                    f" - please 'mkdir {settings.lnbits_data_folder}' and try again"
-                )
-        logger.trace(f"database {self.type} added for {self.name}")
-        self.schema = self.name
         if self.name.startswith("ext_"):
             self.schema = self.name[4:]
         else:
@@ -183,11 +242,13 @@ class Database(Compat):
         self.engine = create_engine(database_uri, strategy=ASYNCIO_STRATEGY)
         self.lock = asyncio.Lock()
 
+        logger.trace(f"database {self.type} added for {self.name}")
+
     @asynccontextmanager
     async def connect(self):
         await self.lock.acquire()
         try:
-            async with self.engine.connect() as conn:
+            async with self.engine.connect() as conn:  # type: ignore
                 async with conn.begin() as txn:
                     wconn = Connection(conn, txn, self.type, self.name, self.schema)
 
@@ -217,6 +278,17 @@ class Database(Compat):
             await result.close()
             return row
 
+    async def fetch_page(
+        self,
+        query: str,
+        where: Optional[List[str]] = None,
+        values: Optional[List[str]] = None,
+        filters: Optional[Filters] = None,
+        model: Optional[Type[TRowModel]] = None,
+    ) -> Page[TRowModel]:
+        async with self.connect() as conn:
+            return await conn.fetch_page(query, where, values, filters, model)
+
     async def execute(self, query: str, values: tuple = ()):
         async with self.connect() as conn:
             return await conn.execute(query, values)
@@ -224,3 +296,196 @@ class Database(Compat):
     @asynccontextmanager
     async def reuse_conn(self, conn: Connection):
         yield conn
+
+    @classmethod
+    async def clean_ext_db_files(cls, ext_id: str) -> bool:
+        """
+        If the extension DB is stored directly on the filesystem (like SQLite) then
+        delete the files and return True. Otherwise do nothing and return False.
+        """
+
+        if DB_TYPE == SQLITE:
+            db_file = os.path.join(settings.lnbits_data_folder, f"ext_{ext_id}.sqlite3")
+            if os.path.isfile(db_file):
+                os.remove(db_file)
+            return True
+
+        return False
+
+
+class Operator(Enum):
+    GT = "gt"
+    LT = "lt"
+    EQ = "eq"
+    NE = "ne"
+    GE = "ge"
+    LE = "le"
+    INCLUDE = "in"
+    EXCLUDE = "ex"
+
+    @property
+    def as_sql(self):
+        if self == Operator.EQ:
+            return "="
+        elif self == Operator.NE:
+            return "!="
+        elif self == Operator.INCLUDE:
+            return "IN"
+        elif self == Operator.EXCLUDE:
+            return "NOT IN"
+        elif self == Operator.GT:
+            return ">"
+        elif self == Operator.LT:
+            return "<"
+        elif self == Operator.GE:
+            return ">="
+        elif self == Operator.LE:
+            return "<="
+        else:
+            raise ValueError("Unknown SQL Operator")
+
+
+class FromRowModel(BaseModel):
+    @classmethod
+    def from_row(cls, row: Row):
+        return cls(**dict(row))
+
+
+class FilterModel(BaseModel):
+    __search_fields__: List[str] = []
+    __sort_fields__: Optional[List[str]] = None
+
+
+T = TypeVar("T")
+TModel = TypeVar("TModel", bound=BaseModel)
+TRowModel = TypeVar("TRowModel", bound=FromRowModel)
+TFilterModel = TypeVar("TFilterModel", bound=FilterModel)
+
+
+class Page(BaseModel, Generic[T]):
+    data: list[T]
+    total: int
+
+
+class Filter(BaseModel, Generic[TFilterModel]):
+    field: str
+    op: Operator = Operator.EQ
+    values: list[Any]
+
+    model: Optional[Type[TFilterModel]]
+
+    @classmethod
+    def parse_query(cls, key: str, raw_values: list[Any], model: Type[TFilterModel]):
+        # Key format:
+        # key[operator]
+        # e.g. name[eq]
+        if key.endswith("]"):
+            split = key[:-1].split("[")
+            if len(split) != 2:
+                raise ValueError("Invalid key")
+            field = split[0]
+            op = Operator(split[1])
+        else:
+            field = key
+            op = Operator("eq")
+
+        if field in model.__fields__:
+            compare_field = model.__fields__[field]
+            values = []
+            for raw_value in raw_values:
+                validated, errors = compare_field.validate(raw_value, {}, loc="none")
+                if errors:
+                    raise ValidationError(errors=[errors], model=model)
+                values.append(validated)
+        else:
+            raise ValueError("Unknown filter field")
+
+        return cls(field=field, op=op, values=values, model=model)
+
+    @property
+    def statement(self):
+        if self.model and self.model.__fields__[self.field].type_ == datetime.datetime:
+            placeholder = compat_timestamp_placeholder()
+        else:
+            placeholder = "?"
+        if self.op in (Operator.INCLUDE, Operator.EXCLUDE):
+            placeholders = ", ".join([placeholder] * len(self.values))
+            stmt = [f"{self.field} {self.op.as_sql} ({placeholders})"]
+        else:
+            stmt = [f"{self.field} {self.op.as_sql} {placeholder}"] * len(self.values)
+        return " OR ".join(stmt)
+
+
+class Filters(BaseModel, Generic[TFilterModel]):
+    """
+    Generic helper class for filtering and sorting data.
+    For usage in an api endpoint, use the `parse_filters` dependency.
+
+    When constructing this class manually always make sure to pass a model so that
+    the values can be validated. Otherwise, make sure to validate the inputs manually.
+    """
+
+    filters: List[Filter[TFilterModel]] = []
+    search: Optional[str] = None
+
+    offset: Optional[int] = None
+    limit: Optional[int] = None
+
+    sortby: Optional[str] = None
+    direction: Optional[Literal["asc", "desc"]] = None
+
+    model: Optional[Type[TFilterModel]] = None
+
+    @root_validator(pre=True)
+    def validate_sortby(cls, values):
+        sortby = values.get("sortby")
+        model = values.get("model")
+        if sortby and model:
+            model = values["model"]
+            # if no sort fields are specified explicitly all fields are allowed
+            allowed = model.__sort_fields__ or model.__fields__
+            if sortby not in allowed:
+                raise ValueError("Invalid sort field")
+        return values
+
+    def pagination(self) -> str:
+        stmt = ""
+        if self.limit:
+            stmt += f"LIMIT {self.limit} "
+        if self.offset:
+            stmt += f"OFFSET {self.offset}"
+        return stmt
+
+    def where(self, where_stmts: Optional[List[str]] = None) -> str:
+        if not where_stmts:
+            where_stmts = []
+        if self.filters:
+            for filter in self.filters:
+                where_stmts.append(filter.statement)
+        if self.search and self.model:
+            if DB_TYPE == POSTGRES:
+                where_stmts.append(
+                    f"lower(concat({', '.join(self.model.__search_fields__)})) LIKE ?"
+                )
+            elif DB_TYPE == SQLITE:
+                where_stmts.append(
+                    f"lower({'||'.join(self.model.__search_fields__)}) LIKE ?"
+                )
+        if where_stmts:
+            return "WHERE " + " AND ".join(where_stmts)
+        return ""
+
+    def order_by(self) -> str:
+        if self.sortby:
+            return f"ORDER BY {self.sortby} {self.direction or 'asc'}"
+        return ""
+
+    def values(self, values: Optional[List[str]] = None) -> tuple:
+        if not values:
+            values = []
+        if self.filters:
+            for filter in self.filters:
+                values.extend(filter.values)
+        if self.search and self.model:
+            values.append(f"%{self.search}%")
+        return tuple(values)

lnbits/decorators.py

@@ -1,40 +1,45 @@
 from http import HTTPStatus
+from typing import Literal, Optional, Type
 
-from fastapi import Security, status
+from fastapi import Query, Request, Security
 from fastapi.exceptions import HTTPException
 from fastapi.openapi.models import APIKey, APIKeyIn
-from fastapi.security.api_key import APIKeyHeader, APIKeyQuery
+from fastapi.security import APIKeyHeader, APIKeyQuery
 from fastapi.security.base import SecurityBase
 from pydantic.types import UUID4
-from starlette.requests import Request
 
 from lnbits.core.crud import get_user, get_wallet_for_key
-from lnbits.core.models import User, Wallet
+from lnbits.core.models import User, WalletType, WalletTypeInfo
+from lnbits.db import Filter, Filters, TFilterModel
 from lnbits.requestvars import g
 from lnbits.settings import settings
 
 
+# TODO: fix type ignores
 class KeyChecker(SecurityBase):
     def __init__(
-        self, scheme_name: str = None, auto_error: bool = True, api_key: str = None
+        self,
+        scheme_name: Optional[str] = None,
+        auto_error: bool = True,
+        api_key: Optional[str] = None,
     ):
         self.scheme_name = scheme_name or self.__class__.__name__
         self.auto_error = auto_error
-        self._key_type = "invoice"
+        self._key_type = WalletType.invoice
         self._api_key = api_key
         if api_key:
             key = APIKey(
-                **{"in": APIKeyIn.query},
+                **{"in": APIKeyIn.query},  # type: ignore
                 name="X-API-KEY",
                 description="Wallet API Key - QUERY",
             )
         else:
             key = APIKey(
-                **{"in": APIKeyIn.header},
+                **{"in": APIKeyIn.header},  # type: ignore
                 name="X-API-KEY",
                 description="Wallet API Key - HEADER",
             )
-        self.wallet = None  # type: ignore
+        self.wallet = None
         self.model: APIKey = key
 
     async def __call__(self, request: Request):
@@ -44,16 +49,16 @@ class KeyChecker(SecurityBase):
                 if self._api_key
                 else request.headers.get("X-API-KEY") or request.query_params["api-key"]
             )
-            # FIXME: Find another way to validate the key. A fetch from DB should be avoided here.
-            #        Also, we should not return the wallet here - thats silly.
-            #        Possibly store it in a Redis DB
-            self.wallet = await get_wallet_for_key(key_value, self._key_type)  # type: ignore
-            if not self.wallet:
+            # FIXME: Find another way to validate the key. A fetch from DB should be
+            #        avoided here. Also, we should not return the wallet here - thats
+            #        silly. Possibly store it in a Redis DB
+            wallet = await get_wallet_for_key(key_value, self._key_type)
+            self.wallet = wallet  # type: ignore
+            if not wallet:
                 raise HTTPException(
                     status_code=HTTPStatus.UNAUTHORIZED,
                     detail="Invalid key or expired key.",
                 )
-
         except KeyError:
             raise HTTPException(
                 status_code=HTTPStatus.BAD_REQUEST, detail="`X-API-KEY` header missing."
@@ -70,10 +75,13 @@ class WalletInvoiceKeyChecker(KeyChecker):
     """
 
     def __init__(
-        self, scheme_name: str = None, auto_error: bool = True, api_key: str = None
+        self,
+        scheme_name: Optional[str] = None,
+        auto_error: bool = True,
+        api_key: Optional[str] = None,
     ):
         super().__init__(scheme_name, auto_error, api_key)
-        self._key_type = "invoice"
+        self._key_type = WalletType.invoice
 
 
 class WalletAdminKeyChecker(KeyChecker):
@@ -86,19 +94,13 @@ class WalletAdminKeyChecker(KeyChecker):
     """
 
     def __init__(
-        self, scheme_name: str = None, auto_error: bool = True, api_key: str = None
+        self,
+        scheme_name: Optional[str] = None,
+        auto_error: bool = True,
+        api_key: Optional[str] = None,
     ):
         super().__init__(scheme_name, auto_error, api_key)
-        self._key_type = "admin"
-
-
-class WalletTypeInfo:
-    wallet_type: int
-    wallet: Wallet
-
-    def __init__(self, wallet_type: int, wallet: Wallet) -> None:
-        self.wallet_type = wallet_type
-        self.wallet = wallet
+        self._key_type = WalletType.admin
 
 
 api_key_header = APIKeyHeader(
@@ -118,11 +120,6 @@ async def get_key_type(
     api_key_header: str = Security(api_key_header),
     api_key_query: str = Security(api_key_query),
 ) -> WalletTypeInfo:
-    # 0: admin
-    # 1: invoice
-    # 2: invalid
-    pathname = r["path"].split("/")[1]
-
     token = api_key_header or api_key_query
 
     if not token:
@@ -131,38 +128,40 @@ async def get_key_type(
             detail="Invoice (or Admin) key required.",
         )
 
-    for typenr, WalletChecker in zip(
-        [0, 1], [WalletAdminKeyChecker, WalletInvoiceKeyChecker]
+    for wallet_type, WalletChecker in zip(
+        [WalletType.admin, WalletType.invoice],
+        [WalletAdminKeyChecker, WalletInvoiceKeyChecker],
     ):
         try:
             checker = WalletChecker(api_key=token)
             await checker.__call__(r)
-            wallet = WalletTypeInfo(typenr, checker.wallet)  # type: ignore
-            if wallet is None or wallet.wallet is None:
+            if checker.wallet is None:
                 raise HTTPException(
                     status_code=HTTPStatus.NOT_FOUND, detail="Wallet does not exist."
                 )
+            wallet = WalletTypeInfo(wallet_type, checker.wallet)
             if (
                 wallet.wallet.user != settings.super_user
                 and wallet.wallet.user not in settings.lnbits_admin_users
             ) and (
                 settings.lnbits_admin_extensions
-                and pathname in settings.lnbits_admin_extensions
+                and r["path"].split("/")[1] in settings.lnbits_admin_extensions
             ):
                 raise HTTPException(
                     status_code=HTTPStatus.FORBIDDEN,
                     detail="User not authorized for this extension.",
                 )
             return wallet
-        except HTTPException as e:
-            if e.status_code == HTTPStatus.BAD_REQUEST:
+        except HTTPException as exc:
+            if exc.status_code == HTTPStatus.BAD_REQUEST:
                 raise
-            elif e.status_code == HTTPStatus.UNAUTHORIZED:
-                # we pass this in case it is not an invoice key, nor an admin key, and then return NOT_FOUND at the end of this block
+            elif exc.status_code == HTTPStatus.UNAUTHORIZED:
+                # we pass this in case it is not an invoice key, nor an admin key,
+                # and then return NOT_FOUND at the end of this block
                 pass
             else:
                 raise
-        except:
+        except Exception:
             raise
     raise HTTPException(
         status_code=HTTPStatus.NOT_FOUND, detail="Wallet does not exist."
@@ -174,7 +173,6 @@ async def require_admin_key(
     api_key_header: str = Security(api_key_header),
     api_key_query: str = Security(api_key_query),
 ):
-
     token = api_key_header or api_key_query
 
     if not token:
@@ -189,7 +187,7 @@ async def require_admin_key(
         # If wallet type is not admin then return the unauthorized status
         # This also covers when the user passes an invalid key type
         raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED, detail="Admin key required."
+            status_code=HTTPStatus.UNAUTHORIZED, detail="Admin key required."
         )
     else:
         return wallet
@@ -200,7 +198,6 @@ async def require_invoice_key(
     api_key_header: str = Security(api_key_header),
     api_key_query: str = Security(api_key_query),
 ):
-
     token = api_key_header or api_key_query
 
     if not token:
@@ -211,11 +208,12 @@ async def require_invoice_key(
 
     wallet = await get_key_type(r, token)
 
-    if wallet.wallet_type > 1:
-        # If wallet type is not invoice then return the unauthorized status
-        # This also covers when the user passes an invalid key type
+    if (
+        wallet.wallet_type != WalletType.admin
+        and wallet.wallet_type != WalletType.invoice
+    ):
         raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
+            status_code=HTTPStatus.UNAUTHORIZED,
             detail="Invoice (or Admin) key required.",
         )
     else:
@@ -250,10 +248,6 @@ async def check_admin(usr: UUID4) -> User:
             status_code=HTTPStatus.UNAUTHORIZED,
             detail="User not authorized. No admin privileges.",
         )
-    user.admin = True
-    user.super_user = False
-    if user.id == settings.super_user:
-        user.super_user = True
 
     return user
 
@@ -266,3 +260,38 @@ async def check_super_user(usr: UUID4) -> User:
             detail="User not authorized. No super user privileges.",
         )
     return user
+
+
+def parse_filters(model: Type[TFilterModel]):
+    """
+    Parses the query params as filters.
+    :param model: model used for validation of filter values
+    """
+
+    def dependency(
+        request: Request,
+        limit: Optional[int] = None,
+        offset: Optional[int] = None,
+        sortby: Optional[str] = None,
+        direction: Optional[Literal["asc", "desc"]] = None,
+        search: Optional[str] = Query(None, description="Text based search"),
+    ):
+        params = request.query_params
+        filters = []
+        for key in params.keys():
+            try:
+                filters.append(Filter.parse_query(key, params.getlist(key), model))
+            except ValueError:
+                continue
+
+        return Filters(
+            filters=filters,
+            limit=limit,
+            offset=offset,
+            sortby=sortby,
+            direction=direction,
+            search=search,
+            model=model,
+        )
+
+    return dependency

lnbits/extension_manager.py

@@ -3,20 +3,171 @@ import json
 import os
 import shutil
 import sys
-import urllib.request
 import zipfile
 from http import HTTPStatus
 from pathlib import Path
 from typing import Any, List, NamedTuple, Optional, Tuple
+from urllib import request
 
 import httpx
-from fastapi.exceptions import HTTPException
+from fastapi import HTTPException
 from loguru import logger
+from packaging import version
 from pydantic import BaseModel
 
 from lnbits.settings import settings
 
 
+class ExplicitRelease(BaseModel):
+    id: str
+    name: str
+    version: str
+    archive: str
+    hash: str
+    dependencies: List[str] = []
+    repo: Optional[str]
+    icon: Optional[str]
+    short_description: Optional[str]
+    min_lnbits_version: Optional[str]
+    html_url: Optional[str]  # todo: release_url
+    warning: Optional[str]
+    info_notification: Optional[str]
+    critical_notification: Optional[str]
+
+    def is_version_compatible(self):
+        if not self.min_lnbits_version:
+            return True
+        return version.parse(self.min_lnbits_version) <= version.parse(settings.version)
+
+
+class GitHubRelease(BaseModel):
+    id: str
+    organisation: str
+    repository: str
+
+
+class Manifest(BaseModel):
+    featured: List[str] = []
+    extensions: List["ExplicitRelease"] = []
+    repos: List["GitHubRelease"] = []
+
+
+class GitHubRepoRelease(BaseModel):
+    name: str
+    tag_name: str
+    zipball_url: str
+    html_url: str
+
+
+class GitHubRepo(BaseModel):
+    stargazers_count: str
+    html_url: str
+    default_branch: str
+
+
+class ExtensionConfig(BaseModel):
+    name: str
+    short_description: str
+    tile: str = ""
+    warning: Optional[str] = ""
+    min_lnbits_version: Optional[str]
+
+    def is_version_compatible(self):
+        if not self.min_lnbits_version:
+            return True
+        return version.parse(self.min_lnbits_version) <= version.parse(settings.version)
+
+
+def download_url(url, save_path):
+    with request.urlopen(url) as dl_file:
+        with open(save_path, "wb") as out_file:
+            out_file.write(dl_file.read())
+
+
+def file_hash(filename):
+    h = hashlib.sha256()
+    b = bytearray(128 * 1024)
+    mv = memoryview(b)
+    with open(filename, "rb", buffering=0) as f:
+        while n := f.readinto(mv):
+            h.update(mv[:n])
+    return h.hexdigest()
+
+
+async def fetch_github_repo_info(
+    org: str, repository: str
+) -> Tuple[GitHubRepo, GitHubRepoRelease, ExtensionConfig]:
+    repo_url = f"https://api.github.com/repos/{org}/{repository}"
+    error_msg = "Cannot fetch extension repo"
+    repo = await github_api_get(repo_url, error_msg)
+    github_repo = GitHubRepo.parse_obj(repo)
+
+    lates_release_url = (
+        f"https://api.github.com/repos/{org}/{repository}/releases/latest"
+    )
+    error_msg = "Cannot fetch extension releases"
+    latest_release: Any = await github_api_get(lates_release_url, error_msg)
+
+    config_url = f"https://raw.githubusercontent.com/{org}/{repository}/{github_repo.default_branch}/config.json"
+    error_msg = "Cannot fetch config for extension"
+    config = await github_api_get(config_url, error_msg)
+
+    return (
+        github_repo,
+        GitHubRepoRelease.parse_obj(latest_release),
+        ExtensionConfig.parse_obj(config),
+    )
+
+
+async def fetch_manifest(url) -> Manifest:
+    error_msg = "Cannot fetch extensions manifest"
+    manifest = await github_api_get(url, error_msg)
+    return Manifest.parse_obj(manifest)
+
+
+async def fetch_github_releases(org: str, repo: str) -> List[GitHubRepoRelease]:
+    releases_url = f"https://api.github.com/repos/{org}/{repo}/releases"
+    error_msg = "Cannot fetch extension releases"
+    releases = await github_api_get(releases_url, error_msg)
+    return [GitHubRepoRelease.parse_obj(r) for r in releases]
+
+
+async def fetch_github_release_config(
+    org: str, repo: str, tag_name: str
+) -> Optional[ExtensionConfig]:
+    config_url = (
+        f"https://raw.githubusercontent.com/{org}/{repo}/{tag_name}/config.json"
+    )
+    error_msg = "Cannot fetch GitHub extension config"
+    config = await github_api_get(config_url, error_msg)
+    return ExtensionConfig.parse_obj(config)
+
+
+async def github_api_get(url: str, error_msg: Optional[str]) -> Any:
+    async with httpx.AsyncClient() as client:
+        headers = (
+            {"Authorization": "Bearer " + settings.lnbits_ext_github_token}
+            if settings.lnbits_ext_github_token
+            else None
+        )
+        resp = await client.get(
+            url,
+            headers=headers,
+        )
+        if resp.status_code != 200:
+            logger.warning(f"{error_msg} ({url}): {resp.text}")
+        resp.raise_for_status()
+        return resp.json()
+
+
+def icon_to_github_url(source_repo: str, path: Optional[str]) -> str:
+    if not path:
+        return ""
+    _, _, *rest = path.split("/")
+    tail = "/".join(rest)
+    return f"https://github.com/{source_repo}/raw/main/{tail}"
+
+
 class Extension(NamedTuple):
     code: str
     is_valid: bool
@@ -53,34 +204,27 @@ class Extension(NamedTuple):
 
 
 class ExtensionManager:
-    def __init__(self):
-        self._disabled: List[str] = settings.lnbits_disabled_extensions
-        self._admin_only: List[str] = settings.lnbits_admin_extensions
+    def __init__(self) -> None:
         p = Path(settings.lnbits_path, "extensions")
-        os.makedirs(p, exist_ok=True)
+        Path(p).mkdir(parents=True, exist_ok=True)
         self._extension_folders: List[Path] = [f for f in p.iterdir() if f.is_dir()]
 
     @property
     def extensions(self) -> List[Extension]:
         output: List[Extension] = []
 
-        if "all" in self._disabled:
-            return output
-
-        for extension in [
-            ext for ext in self._extension_folders if ext not in self._disabled
-        ]:
+        for extension_folder in self._extension_folders:
+            extension_code = extension_folder.parts[-1]
             try:
-                with open(extension / "config.json") as json_file:
+                with open(extension_folder / "config.json") as json_file:
                     config = json.load(json_file)
                 is_valid = True
-                is_admin_only = True if extension in self._admin_only else False
+                is_admin_only = extension_code in settings.lnbits_admin_extensions
             except Exception:
                 config = {}
                 is_valid = False
                 is_admin_only = False
 
-            *_, extension_code = extension.parts
             output.append(
                 Extension(
                     extension_code,
@@ -104,12 +248,15 @@ class ExtensionRelease(BaseModel):
     version: str
     archive: str
     source_repo: str
-    is_github_release = False
-    hash: Optional[str]
-    html_url: Optional[str]
-    description: Optional[str]
-    details_html: Optional[str] = None
-    icon: Optional[str]
+    is_github_release: bool = False
+    hash: Optional[str] = None
+    min_lnbits_version: Optional[str] = None
+    is_version_compatible: Optional[bool] = True
+    html_url: Optional[str] = None
+    description: Optional[str] = None
+    warning: Optional[str] = None
+    repo: Optional[str] = None
+    icon: Optional[str] = None
 
     @classmethod
     def from_github_release(
@@ -122,10 +269,29 @@ class ExtensionRelease(BaseModel):
             archive=r.zipball_url,
             source_repo=source_repo,
             is_github_release=True,
-            # description=r.body, # bad for JSON
+            repo=f"https://github.com/{source_repo}",
             html_url=r.html_url,
         )
 
+    @classmethod
+    def from_explicit_release(
+        cls, source_repo: str, e: "ExplicitRelease"
+    ) -> "ExtensionRelease":
+        return ExtensionRelease(
+            name=e.name,
+            version=e.version,
+            archive=e.archive,
+            hash=e.hash,
+            source_repo=source_repo,
+            description=e.short_description,
+            min_lnbits_version=e.min_lnbits_version,
+            is_version_compatible=e.is_version_compatible(),
+            warning=e.warning,
+            html_url=e.html_url,
+            repo=e.repo,
+            icon=e.icon,
+        )
+
     @classmethod
     async def all_releases(cls, org: str, repo: str) -> List["ExtensionRelease"]:
         try:
@@ -139,52 +305,6 @@ class ExtensionRelease(BaseModel):
             return []
 
 
-class ExplicitRelease(BaseModel):
-    id: str
-    name: str
-    version: str
-    archive: str
-    hash: str
-    dependencies: List[str] = []
-    icon: Optional[str]
-    short_description: Optional[str]
-    html_url: Optional[str]
-    details: Optional[str]
-    info_notification: Optional[str]
-    critical_notification: Optional[str]
-
-
-class GitHubRelease(BaseModel):
-    id: str
-    organisation: str
-    repository: str
-
-
-class Manifest(BaseModel):
-    featured: List[str] = []
-    extensions: List["ExplicitRelease"] = []
-    repos: List["GitHubRelease"] = []
-
-
-class GitHubRepoRelease(BaseModel):
-    name: str
-    tag_name: str
-    zipball_url: str
-    html_url: str
-
-
-class GitHubRepo(BaseModel):
-    stargazers_count: str
-    html_url: str
-    default_branch: str
-
-
-class ExtensionConfig(BaseModel):
-    name: str
-    short_description: str
-    tile: str = ""
-
-
 class InstallableExtension(BaseModel):
     id: str
     name: str
@@ -194,8 +314,9 @@ class InstallableExtension(BaseModel):
     is_admin_only: bool = False
     stars: int = 0
     featured = False
-    latest_release: Optional[ExtensionRelease]
-    installed_release: Optional[ExtensionRelease]
+    latest_release: Optional[ExtensionRelease] = None
+    installed_release: Optional[ExtensionRelease] = None
+    archive: Optional[str] = None
 
     @property
     def hash(self) -> str:
@@ -208,18 +329,18 @@ class InstallableExtension(BaseModel):
         return "not-installed"
 
     @property
-    def zip_path(self) -> str:
-        extensions_data_dir = os.path.join(settings.lnbits_data_folder, "extensions")
-        os.makedirs(extensions_data_dir, exist_ok=True)
-        return os.path.join(extensions_data_dir, f"{self.id}.zip")
+    def zip_path(self) -> Path:
+        extensions_data_dir = Path(settings.lnbits_data_folder, "extensions")
+        Path(extensions_data_dir).mkdir(parents=True, exist_ok=True)
+        return Path(extensions_data_dir, f"{self.id}.zip")
 
     @property
-    def ext_dir(self) -> str:
-        return os.path.join("lnbits", "extensions", self.id)
+    def ext_dir(self) -> Path:
+        return Path(settings.lnbits_path, "extensions", self.id)
 
     @property
-    def ext_upgrade_dir(self) -> str:
-        return os.path.join("lnbits", "upgrades", f"{self.id}-{self.hash}")
+    def ext_upgrade_dir(self) -> Path:
+        return Path("lnbits", "upgrades", f"{self.id}-{self.hash}")
 
     @property
     def module_name(self) -> str:
@@ -231,21 +352,23 @@ class InstallableExtension(BaseModel):
 
     @property
     def has_installed_version(self) -> bool:
-        if not Path(self.ext_dir).is_dir():
+        if not self.ext_dir.is_dir():
             return False
-        config_file = os.path.join(self.ext_dir, "config.json")
-        if not Path(config_file).is_file():
-            return False
-        with open(config_file, "r") as json_file:
-            config_json = json.load(json_file)
-            return config_json.get("is_installed") is True
+        return Path(self.ext_dir, "config.json").is_file()
+
+    @property
+    def installed_version(self) -> str:
+        if self.installed_release:
+            return self.installed_release.version
+        return ""
 
     def download_archive(self):
-        logger.info(f"Downloading extension {self.name}.")
+        logger.info(f"Downloading extension {self.name} ({self.installed_version}).")
         ext_zip_file = self.zip_path
-        if os.path.isfile(ext_zip_file):
+        if ext_zip_file.is_file():
             os.remove(ext_zip_file)
         try:
+            assert self.installed_release, "installed_release is none."
             download_url(self.installed_release.archive, ext_zip_file)
         except Exception as ex:
             logger.warning(ex)
@@ -257,7 +380,7 @@ class InstallableExtension(BaseModel):
         archive_hash = file_hash(ext_zip_file)
         if self.installed_release.hash and self.installed_release.hash != archive_hash:
             # remove downloaded archive
-            if os.path.isfile(ext_zip_file):
+            if ext_zip_file.is_file():
                 os.remove(ext_zip_file)
             raise HTTPException(
                 status_code=HTTPStatus.NOT_FOUND,
@@ -265,27 +388,23 @@ class InstallableExtension(BaseModel):
             )
 
     def extract_archive(self):
-        logger.info(f"Extracting extension {self.name}.")
-        os.makedirs(os.path.join("lnbits", "upgrades"), exist_ok=True)
+        logger.info(f"Extracting extension {self.name} ({self.installed_version}).")
+        Path("lnbits", "upgrades").mkdir(parents=True, exist_ok=True)
         shutil.rmtree(self.ext_upgrade_dir, True)
         with zipfile.ZipFile(self.zip_path, "r") as zip_ref:
             zip_ref.extractall(self.ext_upgrade_dir)
         generated_dir_name = os.listdir(self.ext_upgrade_dir)[0]
         os.rename(
-            os.path.join(self.ext_upgrade_dir, generated_dir_name),
-            os.path.join(self.ext_upgrade_dir, self.id),
+            Path(self.ext_upgrade_dir, generated_dir_name),
+            Path(self.ext_upgrade_dir, self.id),
         )
 
         # Pre-packed extensions can be upgraded
         # Mark the extension as installed so we know it is not the pre-packed version
         with open(
-            os.path.join(self.ext_upgrade_dir, self.id, "config.json"), "r+"
+            Path(self.ext_upgrade_dir, self.id, "config.json"), "r+"
         ) as json_file:
             config_json = json.load(json_file)
-            config_json["is_installed"] = True
-            json_file.seek(0)
-            json.dump(config_json, json_file)
-            json_file.truncate()
 
             self.name = config_json.get("name")
             self.short_description = config_json.get("short_description")
@@ -301,13 +420,16 @@ class InstallableExtension(BaseModel):
 
         shutil.rmtree(self.ext_dir, True)
         shutil.copytree(
-            os.path.join(self.ext_upgrade_dir, self.id),
-            os.path.join("lnbits", "extensions", self.id),
+            Path(self.ext_upgrade_dir, self.id),
+            Path(settings.lnbits_path, "extensions", self.id),
         )
-        logger.success(f"Extension {self.name} installed.")
+        logger.success(f"Extension {self.name} ({self.installed_version}) installed.")
 
     def nofiy_upgrade(self) -> None:
-        """Update the list of upgraded extensions. The middleware will perform redirects based on this"""
+        """
+        Update the list of upgraded extensions. The middleware will perform
+        redirects based on this
+        """
 
         clean_upgraded_exts = list(
             filter(
@@ -321,7 +443,7 @@ class InstallableExtension(BaseModel):
 
     def clean_extension_files(self):
         # remove downloaded archive
-        if os.path.isfile(self.zip_path):
+        if self.zip_path.is_file():
             os.remove(self.zip_path)
 
         # remove module from extensions
@@ -329,6 +451,15 @@ class InstallableExtension(BaseModel):
 
         shutil.rmtree(self.ext_upgrade_dir, True)
 
+    def check_latest_version(self, release: Optional[ExtensionRelease]):
+        if not release:
+            return
+        if not self.latest_release:
+            self.latest_release = release
+            return
+        if version.parse(self.latest_release.version) < version.parse(release.version):
+            self.latest_release = release
+
     @classmethod
     def from_row(cls, data: dict) -> "InstallableExtension":
         meta = json.loads(data["meta"])
@@ -350,8 +481,7 @@ class InstallableExtension(BaseModel):
                 id=github_release.id,
                 name=config.name,
                 short_description=config.short_description,
-                version="0",
-                stars=repo.stargazers_count,
+                stars=int(repo.stargazers_count),
                 icon=icon_to_github_url(
                     f"{github_release.organisation}/{github_release.repository}",
                     config.tile,
@@ -370,7 +500,6 @@ class InstallableExtension(BaseModel):
             id=e.id,
             name=e.name,
             archive=e.archive,
-            hash=e.hash,
             short_description=e.short_description,
             icon=e.icon,
             dependencies=e.dependencies,
@@ -388,18 +517,30 @@ class InstallableExtension(BaseModel):
                 manifest = await fetch_manifest(url)
 
                 for r in manifest.repos:
-                    if r.id in extension_id_list:
-                        continue
                     ext = await InstallableExtension.from_github_release(r)
-                    if ext:
-                        ext.featured = ext.id in manifest.featured
-                        extension_list += [ext]
-                        extension_id_list += [ext.id]
+                    if not ext:
+                        continue
+                    existing_ext = next(
+                        (ee for ee in extension_list if ee.id == r.id), None
+                    )
+                    if existing_ext:
+                        existing_ext.check_latest_version(ext.latest_release)
+                        continue
+
+                    ext.featured = ext.id in manifest.featured
+                    extension_list += [ext]
+                    extension_id_list += [ext.id]
 
                 for e in manifest.extensions:
-                    if e.id in extension_id_list:
+                    release = ExtensionRelease.from_explicit_release(url, e)
+                    existing_ext = next(
+                        (ee for ee in extension_list if ee.id == e.id), None
+                    )
+                    if existing_ext:
+                        existing_ext.check_latest_version(release)
                         continue
                     ext = InstallableExtension.from_explicit_release(e)
+                    ext.check_latest_version(release)
                     ext.featured = ext.id in manifest.featured
                     extension_list += [ext]
                     extension_id_list += [e.id]
@@ -425,17 +566,7 @@ class InstallableExtension(BaseModel):
                 for e in manifest.extensions:
                     if e.id == ext_id:
                         extension_releases += [
-                            ExtensionRelease(
-                                name=e.name,
-                                version=e.version,
-                                archive=e.archive,
-                                hash=e.hash,
-                                source_repo=url,
-                                description=e.short_description,
-                                details_html=e.details,
-                                html_url=e.html_url,
-                                icon=e.icon,
-                            )
+                            ExtensionRelease.from_explicit_release(url, e)
                         ]
 
             except Exception as e:
@@ -469,82 +600,3 @@ def get_valid_extensions() -> List[Extension]:
     return [
         extension for extension in ExtensionManager().extensions if extension.is_valid
     ]
-
-
-def download_url(url, save_path):
-    with urllib.request.urlopen(url) as dl_file:
-        with open(save_path, "wb") as out_file:
-            out_file.write(dl_file.read())
-
-
-def file_hash(filename):
-    h = hashlib.sha256()
-    b = bytearray(128 * 1024)
-    mv = memoryview(b)
-    with open(filename, "rb", buffering=0) as f:
-        while n := f.readinto(mv):
-            h.update(mv[:n])
-    return h.hexdigest()
-
-
-def icon_to_github_url(source_repo: str, path: Optional[str]) -> str:
-    if not path:
-        return ""
-    _, _, *rest = path.split("/")
-    tail = "/".join(rest)
-    return f"https://github.com/{source_repo}/raw/main/{tail}"
-
-
-async def fetch_github_repo_info(
-    org: str, repository: str
-) -> Tuple[GitHubRepo, GitHubRepoRelease, ExtensionConfig]:
-    repo_url = f"https://api.github.com/repos/{org}/{repository}"
-    error_msg = "Cannot fetch extension repo"
-    repo = await gihub_api_get(repo_url, error_msg)
-    github_repo = GitHubRepo.parse_obj(repo)
-
-    lates_release_url = (
-        f"https://api.github.com/repos/{org}/{repository}/releases/latest"
-    )
-    error_msg = "Cannot fetch extension releases"
-    latest_release: Any = await gihub_api_get(lates_release_url, error_msg)
-
-    config_url = f"https://raw.githubusercontent.com/{org}/{repository}/{github_repo.default_branch}/config.json"
-    error_msg = "Cannot fetch config for extension"
-    config = await gihub_api_get(config_url, error_msg)
-
-    return (
-        github_repo,
-        GitHubRepoRelease.parse_obj(latest_release),
-        ExtensionConfig.parse_obj(config),
-    )
-
-
-async def fetch_manifest(url) -> Manifest:
-    error_msg = "Cannot fetch extensions manifest"
-    manifest = await gihub_api_get(url, error_msg)
-    return Manifest.parse_obj(manifest)
-
-
-async def fetch_github_releases(org: str, repo: str) -> List[GitHubRepoRelease]:
-    releases_url = f"https://api.github.com/repos/{org}/{repo}/releases"
-    error_msg = "Cannot fetch extension releases"
-    releases = await gihub_api_get(releases_url, error_msg)
-    return [GitHubRepoRelease.parse_obj(r) for r in releases]
-
-
-async def gihub_api_get(url: str, error_msg: Optional[str]) -> Any:
-    async with httpx.AsyncClient() as client:
-        headers = (
-            {"Authorization": "Bearer " + settings.lnbits_ext_github_token}
-            if settings.lnbits_ext_github_token
-            else None
-        )
-        resp = await client.get(
-            url,
-            headers=headers,
-        )
-        if resp.status_code != 200:
-            logger.warning(f"{error_msg} ({url}): {resp.text}")
-        resp.raise_for_status()
-        return resp.json()

lnbits/helpers.py

@@ -1,14 +1,16 @@
-import glob
-import os
-from typing import Any, List, Optional
+import json
+from pathlib import Path
+from typing import Any, List, Optional, Type
 
 import jinja2
-import shortuuid  # type: ignore
+import shortuuid
+from pydantic.schema import field_schema
 
 from lnbits.jinja2_templating import Jinja2Templates
 from lnbits.requestvars import g
 from lnbits.settings import settings
 
+from .db import FilterModel
 from .extension_manager import get_valid_extensions
 
 
@@ -16,70 +18,6 @@ def urlsafe_short_hash() -> str:
     return shortuuid.uuid()
 
 
-def get_js_vendored(prefer_minified: bool = False) -> List[str]:
-    paths = get_vendored(".js", prefer_minified)
-
-    def sorter(key: str):
-        if "moment@" in key:
-            return 1
-        if "vue@" in key:
-            return 2
-        if "vue-router@" in key:
-            return 3
-        if "polyfills" in key:
-            return 4
-        return 9
-
-    return sorted(paths, key=sorter)
-
-
-def get_css_vendored(prefer_minified: bool = False) -> List[str]:
-    paths = get_vendored(".css", prefer_minified)
-
-    def sorter(key: str):
-        if "quasar@" in key:
-            return 1
-        if "vue@" in key:
-            return 2
-        if "chart.js@" in key:
-            return 100
-        return 9
-
-    return sorted(paths, key=sorter)
-
-
-def get_vendored(ext: str, prefer_minified: bool = False) -> List[str]:
-    paths: List[str] = []
-    for path in glob.glob(
-        os.path.join(settings.lnbits_path, "static/vendor/**"), recursive=True
-    ):
-        if path.endswith(".min" + ext):
-            # path is minified
-            unminified = path.replace(".min" + ext, ext)
-            if prefer_minified:
-                paths.append(path)
-                if unminified in paths:
-                    paths.remove(unminified)
-            elif unminified not in paths:
-                paths.append(path)
-
-        elif path.endswith(ext):
-            # path is not minified
-            minified = path.replace(ext, ".min" + ext)
-            if not prefer_minified:
-                paths.append(path)
-                if minified in paths:
-                    paths.remove(minified)
-            elif minified not in paths:
-                paths.append(path)
-
-    return sorted(paths)
-
-
-def url_for_vendored(abspath: str) -> str:
-    return "/" + os.path.relpath(abspath, settings.lnbits_path)
-
-
 def url_for(endpoint: str, external: Optional[bool] = False, **params: Any) -> str:
     base = g().base_url if external else ""
     url_params = "?"
@@ -89,8 +27,7 @@ def url_for(endpoint: str, external: Optional[bool] = False, **params: Any) -> s
     return url
 
 
-def template_renderer(additional_folders: List = None) -> Jinja2Templates:
-
+def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templates:
     folders = ["lnbits/templates", "lnbits/core/templates"]
     if additional_folders:
         folders.extend(additional_folders)
@@ -100,13 +37,15 @@ def template_renderer(additional_folders: List = None) -> Jinja2Templates:
         t.env.globals["AD_SPACE"] = settings.lnbits_ad_space.split(",")
         t.env.globals["AD_SPACE_TITLE"] = settings.lnbits_ad_space_title
 
+    t.env.globals["VOIDWALLET"] = settings.lnbits_backend_wallet_class == "VoidWallet"
     t.env.globals["HIDE_API"] = settings.lnbits_hide_api
     t.env.globals["SITE_TITLE"] = settings.lnbits_site_title
     t.env.globals["LNBITS_DENOMINATION"] = settings.lnbits_denomination
     t.env.globals["SITE_TAGLINE"] = settings.lnbits_site_tagline
     t.env.globals["SITE_DESCRIPTION"] = settings.lnbits_site_description
     t.env.globals["LNBITS_THEME_OPTIONS"] = settings.lnbits_theme_options
-    t.env.globals["LNBITS_VERSION"] = settings.lnbits_commit
+    t.env.globals["COMMIT_VERSION"] = settings.lnbits_commit
+    t.env.globals["LNBITS_VERSION"] = settings.version
     t.env.globals["LNBITS_ADMIN_UI"] = settings.lnbits_admin_ui
     t.env.globals["EXTENSIONS"] = [
         e
@@ -116,12 +55,15 @@ def template_renderer(additional_folders: List = None) -> Jinja2Templates:
     if settings.lnbits_custom_logo:
         t.env.globals["USE_CUSTOM_LOGO"] = settings.lnbits_custom_logo
 
-    if settings.debug:
-        t.env.globals["VENDORED_JS"] = map(url_for_vendored, get_js_vendored())
-        t.env.globals["VENDORED_CSS"] = map(url_for_vendored, get_css_vendored())
+    if settings.bundle_assets:
+        t.env.globals["INCLUDED_JS"] = ["/static/bundle.min.js"]
+        t.env.globals["INCLUDED_CSS"] = ["/static/bundle.min.css"]
     else:
-        t.env.globals["VENDORED_JS"] = ["/static/bundle.js"]
-        t.env.globals["VENDORED_CSS"] = ["/static/bundle.css"]
+        vendor_filepath = Path(settings.lnbits_path, "static", "vendor.json")
+        with open(vendor_filepath) as vendor_file:
+            vendor_files = json.loads(vendor_file.read())
+            t.env.globals["INCLUDED_JS"] = vendor_files["js"]
+            t.env.globals["INCLUDED_CSS"] = vendor_files["css"]
 
     return t
 
@@ -144,6 +86,40 @@ def get_current_extension_name() -> str:
         with open(config_path) as json_file:
             config = json.load(json_file)
         ext_name = config["name"]
-    except:
+    except Exception:
         ext_name = extension_director_name
     return ext_name
+
+
+def generate_filter_params_openapi(model: Type[FilterModel], keep_optional=False):
+    """
+    Generate openapi documentation for Filters. This is intended to be used along
+    parse_filters (see example)
+    :param model: Filter model
+    :param keep_optional: If false, all parameters will be optional,
+    otherwise inferred from model
+    """
+    fields = list(model.__fields__.values())
+    params = []
+    for field in fields:
+        schema, _, _ = field_schema(field, model_name_map={})
+
+        description = "Supports Filtering"
+        if (
+            hasattr(model, "__search_fields__")
+            and field.name in model.__search_fields__
+        ):
+            description += ". Supports Search"
+
+        parameter = {
+            "name": field.alias,
+            "in": "query",
+            "required": field.required if keep_optional else False,
+            "schema": schema,
+            "description": description,
+        }
+        params.append(parameter)
+
+    return {
+        "parameters": params,
+    }

lnbits/jinja2_templating.py

@@ -1,25 +1,18 @@
-# Borrowed from the excellent accent-starlette
-# https://github.com/accent-starlette/starlette-core/blob/master/starlette_core/templating.py
-
 import typing
 
-from starlette import templating
+from jinja2 import BaseLoader, Environment, pass_context
 from starlette.datastructures import QueryParams
 from starlette.requests import Request
-
-try:
-    import jinja2
-except ImportError:  # pragma: nocover
-    jinja2 = None  # type: ignore
+from starlette.templating import Jinja2Templates as SuperJinja2Templates
 
 
-class Jinja2Templates(templating.Jinja2Templates):
-    def __init__(self, loader: jinja2.BaseLoader) -> None:  # pylint: disable=W0231
-        assert jinja2 is not None, "jinja2 must be installed to use Jinja2Templates"
+class Jinja2Templates(SuperJinja2Templates):
+    def __init__(self, loader: BaseLoader) -> None:
+        super().__init__("")
         self.env = self.get_environment(loader)
 
-    def get_environment(self, loader: "jinja2.BaseLoader") -> "jinja2.Environment":
-        @jinja2.pass_context
+    def get_environment(self, loader: BaseLoader) -> Environment:
+        @pass_context
         def url_for(context: dict, name: str, **path_params: typing.Any) -> str:
             request: Request = context["request"]
             return request.app.url_path_for(name, **path_params)
@@ -29,7 +22,7 @@ class Jinja2Templates(templating.Jinja2Templates):
             values.update(new)
             return QueryParams(**values)
 
-        env = jinja2.Environment(loader=loader, autoescape=True)
+        env = Environment(loader=loader, autoescape=True)
         env.globals["url_for"] = url_for
         env.globals["url_params_update"] = url_params_update
         return env

lnbits/middleware.py

@@ -1,16 +1,25 @@
 from http import HTTPStatus
-from typing import List, Tuple
+from typing import Any, List, Tuple, Union
+from urllib.parse import parse_qs
 
-from fastapi.responses import JSONResponse
+from fastapi import FastAPI, Request, Response
+from fastapi.responses import HTMLResponse, JSONResponse
+from slowapi import _rate_limit_exceeded_handler
+from slowapi.errors import RateLimitExceeded
+from slowapi.middleware import SlowAPIMiddleware
+from starlette.middleware.gzip import GZipMiddleware
 from starlette.types import ASGIApp, Receive, Scope, Send
 
+from lnbits.core import core_app_extra
+from lnbits.helpers import template_renderer
 from lnbits.settings import settings
 
 
 class InstalledExtensionMiddleware:
     # This middleware class intercepts calls made to the extensions API and:
     #  - it blocks the calls if the extension has been disabled or uninstalled.
-    #  - it redirects the calls to the latest version of the extension if the extension has been upgraded.
+    #  - it redirects the calls to the latest version of the extension
+    #    if the extension has been upgraded.
     #  - otherwise it has no effect
     def __init__(self, app: ASGIApp) -> None:
         self.app = app
@@ -26,12 +35,21 @@ class InstalledExtensionMiddleware:
         else:
             _, path_name = path_elements
             path_type = None
+            rest = []
+
+        headers = scope.get("headers", [])
 
         # block path for all users if the extension is disabled
         if path_name in settings.lnbits_deactivated_extensions:
-            response = JSONResponse(
-                status_code=HTTPStatus.NOT_FOUND,
-                content={"detail": f"Extension '{path_name}' disabled"},
+            response = self._response_by_accepted_type(
+                headers, f"Extension '{path_name}' disabled", HTTPStatus.NOT_FOUND
+            )
+            await response(scope, receive, send)
+            return
+
+        if not self._user_allowed_to_extension(path_name, scope):
+            response = self._response_by_accepted_type(
+                headers, "User not authorized.", HTTPStatus.FORBIDDEN
             )
             await response(scope, receive, send)
             return
@@ -51,10 +69,70 @@ class InstalledExtensionMiddleware:
 
         await self.app(scope, receive, send)
 
+    def _user_allowed_to_extension(self, ext_name: str, scope) -> bool:
+        if ext_name not in settings.lnbits_admin_extensions:
+            return True
+        if "query_string" not in scope:
+            return True
+
+        # parse the URL query string into a `dict`
+        q = parse_qs(scope["query_string"].decode("UTF-8"))
+        user = q.get("usr", [""])[0]
+        if not user:
+            return True
+
+        if user == settings.super_user or user in settings.lnbits_admin_users:
+            return True
+
+        return False
+
+    def _response_by_accepted_type(
+        self, headers: List[Any], msg: str, status_code: HTTPStatus
+    ) -> Union[HTMLResponse, JSONResponse]:
+        """
+        Build an HTTP response containing the `msg` as HTTP body and the `status_code`
+        as HTTP code. If the `accept` HTTP header is present int the request and
+        contains the value of `text/html` then return an `HTMLResponse`,
+        otherwise return an `JSONResponse`.
+        """
+        accept_header: str = next(
+            (
+                h[1].decode("UTF-8")
+                for h in headers
+                if len(h) >= 2 and h[0].decode("UTF-8") == "accept"
+            ),
+            "",
+        )
+
+        if "text/html" in [a for a in accept_header.split(",")]:
+            return HTMLResponse(
+                status_code=status_code,
+                content=template_renderer()
+                .TemplateResponse("error.html", {"request": {}, "err": msg})
+                .body,
+            )
+
+        return JSONResponse(
+            status_code=status_code,
+            content={"detail": msg},
+        )
+
+
+class CustomGZipMiddleware(GZipMiddleware):
+    def __init__(self, *args, exclude_paths=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.exclude_paths = exclude_paths or []
+
+    async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
+        if "path" in scope and scope["path"] in self.exclude_paths:
+            await self.app(scope, receive, send)
+            return
+        await super().__call__(scope, receive, send)
+
 
 class ExtensionsRedirectMiddleware:
-    # Extensions are allowed to specify redirect paths.
-    # A call to a path outside the scope of the extension can be redirected to one of the extension's endpoints.
+    # Extensions are allowed to specify redirect paths. A call to a path outside the
+    # scope of the extension can be redirected to one of the extension's endpoints.
     # Eg: redirect `GET /.well-known` to `GET /lnurlp/api/v1/well-known`
 
     def __init__(self, app: ASGIApp) -> None:
@@ -88,7 +166,7 @@ class ExtensionsRedirectMiddleware:
         if "from_path" not in redirect:
             return False
         header_filters = (
-            redirect["header_filters"] if "header_filters" in redirect else []
+            redirect["header_filters"] if "header_filters" in redirect else {}
         )
         return self._has_common_path(redirect["from_path"], path) and self._has_headers(
             header_filters, req_headers
@@ -131,3 +209,39 @@ class ExtensionsRedirectMiddleware:
         ]
 
         return "/" + "/".join(elements)
+
+
+def add_ratelimit_middleware(app: FastAPI):
+    core_app_extra.register_new_ratelimiter()
+    app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
+    app.add_middleware(SlowAPIMiddleware)
+
+
+def add_ip_block_middleware(app: FastAPI):
+    @app.middleware("http")
+    async def block_allow_ip_middleware(request: Request, call_next):
+        if not request.client:
+            return JSONResponse(
+                status_code=403,  # Forbidden
+                content={"detail": "No request client"},
+            )
+        if (
+            request.client.host in settings.lnbits_blocked_ips
+            and request.client.host not in settings.lnbits_allowed_ips
+        ):
+            return JSONResponse(
+                status_code=403,  # Forbidden
+                content={"detail": "IP is blocked"},
+            )
+        # this try: except: block is not needed on latest FastAPI
+        # (await call_next(request) is enough)
+        # https://stackoverflow.com/questions/71222144/runtimeerror-no-response-returned-in-fastapi-when-refresh-request
+        # TODO: remove after https://github.com/lnbits/lnbits/pull/1609 is merged
+        try:
+            return await call_next(request)
+        except RuntimeError as exc:
+            if str(exc) == "No response returned." and await request.is_disconnected():
+                return Response(status_code=HTTPStatus.NO_CONTENT)
+            raise  # bubble up different exceptions
+
+    app.middleware("http")(block_allow_ip_middleware)

lnbits/server.py

@@ -1,12 +1,10 @@
-import uvloop
-
-uvloop.install()
-
 import multiprocessing as mp
 import time
+from pathlib import Path
 
 import click
 import uvicorn
+from uvicorn.supervisors import ChangeReload
 
 from lnbits.settings import set_cli_settings, settings
 
@@ -37,9 +35,16 @@ def main(
 ):
     """Launched with `poetry run lnbits` at root level"""
 
+    # create data dir if it does not exist
+    Path(settings.lnbits_data_folder).mkdir(parents=True, exist_ok=True)
+
+    # create extension dir if it does not exist
+    Path(settings.lnbits_path, "extensions").mkdir(parents=True, exist_ok=True)
+
     set_cli_settings(host=host, port=port, forwarded_allow_ips=forwarded_allow_ips)
 
-    # this beautiful beast parses all command line arguments and passes them to the uvicorn server
+    # this beautiful beast parses all command line arguments and
+    # passes them to the uvicorn server
     d = dict()
     for a in ctx.args:
         item = a.split("=")
@@ -66,7 +71,14 @@ def main(
         )
 
         server = uvicorn.Server(config=config)
-        process = mp.Process(target=server.run)
+
+        if config.should_reload:
+            sock = config.bind_socket()
+            run = ChangeReload(config, target=server.run, sockets=[sock]).run
+        else:
+            run = server.run
+
+        process = mp.Process(target=run)
         process.start()
         server_restart.wait()
         server_restart.clear()

lnbits/settings.py

@@ -1,4 +1,5 @@
 import importlib
+import importlib.metadata
 import inspect
 import json
 import subprocess
@@ -11,20 +12,21 @@ from loguru import logger
 from pydantic import BaseSettings, Extra, Field, validator
 
 
-def list_parse_fallback(v):
-    try:
-        return json.loads(v)
-    except Exception:
-        replaced = v.replace(" ", "")
-        if replaced:
-            return replaced.split(",")
+def list_parse_fallback(v: str):
+    v = v.replace(" ", "")
+    if len(v) > 0:
+        if v.startswith("[") or v.startswith("{"):
+            return json.loads(v)
         else:
-            return []
+            return v.split(",")
+    else:
+        return []
 
 
 class LNbitsSettings(BaseSettings):
+    @classmethod
     def validate(cls, val):
-        if type(val) == str:
+        if isinstance(val, str):
             val = val.split(",") if val else []
         return val
 
@@ -43,12 +45,14 @@ class UsersSettings(LNbitsSettings):
 
 class ExtensionsSettings(LNbitsSettings):
     lnbits_admin_extensions: List[str] = Field(default=[])
-    lnbits_disabled_extensions: List[str] = Field(default=[])
     lnbits_extensions_manifests: List[str] = Field(
         default=[
             "https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions.json"
         ]
     )
+
+
+class ExtensionsInstallSettings(LNbitsSettings):
     lnbits_extensions_default_install: List[str] = Field(default=[])
     # required due to GitHUb rate-limit
     lnbits_ext_github_token: str = Field(default="")
@@ -85,10 +89,12 @@ class ThemesSettings(LNbitsSettings):
         default="https://shop.lnbits.com/;/static/images/lnbits-shop-light.png;/static/images/lnbits-shop-dark.png"
     )  # sneaky sneaky
     lnbits_ad_space_enabled: bool = Field(default=False)
+    lnbits_allowed_currencies: List[str] = Field(default=[])
+    lnbits_default_accounting_currency: Optional[str] = Field(default=None)
 
 
 class OpsSettings(LNbitsSettings):
-    lnbits_baseurl: str = Field(default="http://127.0.0.1/")
+    lnbits_baseurl: str = Field(default="http://127.0.0.1:5000/")
     lnbits_reserve_fee_min: int = Field(default=2000)
     lnbits_reserve_fee_percent: float = Field(default=1.0)
     lnbits_service_fee: float = Field(default=0)
@@ -96,6 +102,24 @@ class OpsSettings(LNbitsSettings):
     lnbits_denomination: str = Field(default="sats")
 
 
+class SecuritySettings(LNbitsSettings):
+    lnbits_rate_limit_no: str = Field(default="200")
+    lnbits_rate_limit_unit: str = Field(default="minute")
+    lnbits_allowed_ips: List[str] = Field(default=[])
+    lnbits_blocked_ips: List[str] = Field(default=[])
+    lnbits_notifications: bool = Field(default=False)
+    lnbits_killswitch: bool = Field(default=False)
+    lnbits_killswitch_interval: int = Field(default=60)
+    lnbits_watchdog: bool = Field(default=False)
+    lnbits_watchdog_interval: int = Field(default=60)
+    lnbits_watchdog_delta: int = Field(default=1_000_000)
+    lnbits_status_manifest: str = Field(
+        default=(
+            "https://raw.githubusercontent.com/lnbits/lnbits-status/main/manifest.json"
+        )
+    )
+
+
 class FakeWalletFundingSource(LNbitsSettings):
     fake_wallet_secret: str = Field(default="ToTheMoon1")
 
@@ -103,6 +127,8 @@ class FakeWalletFundingSource(LNbitsSettings):
 class LNbitsFundingSource(LNbitsSettings):
     lnbits_endpoint: str = Field(default="https://legend.lnbits.com")
     lnbits_key: Optional[str] = Field(default=None)
+    lnbits_admin_key: Optional[str] = Field(default=None)
+    lnbits_invoice_key: Optional[str] = Field(default=None)
 
 
 class ClicheFundingSource(LNbitsSettings):
@@ -114,6 +140,12 @@ class CoreLightningFundingSource(LNbitsSettings):
     clightning_rpc: Optional[str] = Field(default=None)
 
 
+class CoreLightningRestFundingSource(LNbitsSettings):
+    corelightning_rest_url: Optional[str] = Field(default=None)
+    corelightning_rest_macaroon: Optional[str] = Field(default=None)
+    corelightning_rest_cert: Optional[str] = Field(default=None)
+
+
 class EclairFundingSource(LNbitsSettings):
     eclair_url: Optional[str] = Field(default=None)
     eclair_pass: Optional[str] = Field(default=None)
@@ -145,16 +177,14 @@ class LnPayFundingSource(LNbitsSettings):
     lnpay_api_endpoint: Optional[str] = Field(default=None)
     lnpay_api_key: Optional[str] = Field(default=None)
     lnpay_wallet_key: Optional[str] = Field(default=None)
-
-
-class LnTxtBotFundingSource(LNbitsSettings):
-    lntxbot_api_endpoint: Optional[str] = Field(default=None)
-    lntxbot_key: Optional[str] = Field(default=None)
+    lnpay_admin_key: Optional[str] = Field(default=None)
 
 
 class OpenNodeFundingSource(LNbitsSettings):
     opennode_api_endpoint: Optional[str] = Field(default=None)
     opennode_key: Optional[str] = Field(default=None)
+    opennode_admin_key: Optional[str] = Field(default=None)
+    opennode_invoice_key: Optional[str] = Field(default=None)
 
 
 class SparkFundingSource(LNbitsSettings):
@@ -178,7 +208,7 @@ class BoltzExtensionSettings(LNbitsSettings):
 
 
 class LightningSettings(LNbitsSettings):
-    lightning_invoice_expiry: int = Field(default=600)
+    lightning_invoice_expiry: int = Field(default=3600)
 
 
 class FundingSourcesSettings(
@@ -186,11 +216,11 @@ class FundingSourcesSettings(
     LNbitsFundingSource,
     ClicheFundingSource,
     CoreLightningFundingSource,
+    CoreLightningRestFundingSource,
     EclairFundingSource,
     LndRestFundingSource,
     LndGrpcFundingSource,
     LnPayFundingSource,
-    LnTxtBotFundingSource,
     OpenNodeFundingSource,
     SparkFundingSource,
     LnTipsFundingSource,
@@ -203,6 +233,7 @@ class EditableSettings(
     ExtensionsSettings,
     ThemesSettings,
     OpsSettings,
+    SecuritySettings,
     FundingSourcesSettings,
     BoltzExtensionSettings,
     LightningSettings,
@@ -212,11 +243,11 @@ class EditableSettings(
         "lnbits_allowed_users",
         "lnbits_theme_options",
         "lnbits_admin_extensions",
-        "lnbits_disabled_extensions",
         pre=True,
     )
+    @classmethod
     def validate_editable_settings(cls, val):
-        return super().validate(cls, val)
+        return super().validate(val)
 
     @classmethod
     def from_dict(cls, d: dict):
@@ -224,15 +255,25 @@ class EditableSettings(
             **{k: v for k, v in d.items() if k in inspect.signature(cls).parameters}
         )
 
+    # fixes openapi.json validation, remove field env_names
+    class Config:
+        @staticmethod
+        def schema_extra(schema: dict[str, Any]) -> None:
+            for prop in schema.get("properties", {}).values():
+                prop.pop("env_names", None)
+
 
 class EnvSettings(LNbitsSettings):
     debug: bool = Field(default=False)
+    bundle_assets: bool = Field(default=True)
     host: str = Field(default="127.0.0.1")
     port: int = Field(default=5000)
     forwarded_allow_ips: str = Field(default="*")
+    lnbits_title: str = Field(default="LNbits API")
     lnbits_path: str = Field(default=".")
     lnbits_commit: str = Field(default="unknown")
     super_user: str = Field(default="")
+    version: str = Field(default="0.0.0")
 
 
 class SaaSSettings(LNbitsSettings):
@@ -252,6 +293,7 @@ class SuperUserSettings(LNbitsSettings):
             "VoidWallet",
             "FakeWallet",
             "CoreLightningWallet",
+            "CoreLightningRestWallet",
             "LndRestWallet",
             "EclairWallet",
             "LndWallet",
@@ -277,6 +319,7 @@ class TransientSettings(InstalledExtensionsSettings):
 
 class ReadOnlySettings(
     EnvSettings,
+    ExtensionsInstallSettings,
     SaaSSettings,
     PersistenceSettings,
     SuperUserSettings,
@@ -287,8 +330,9 @@ class ReadOnlySettings(
         "lnbits_allowed_funding_sources",
         pre=True,
     )
+    @classmethod
     def validate_readonly_settings(cls, val):
-        return super().validate(cls, val)
+        return super().validate(val)
 
     @classmethod
     def readonly_fields(cls):
@@ -307,7 +351,7 @@ class SuperSettings(EditableSettings):
 
 
 class AdminSettings(EditableSettings):
-    super_user: bool
+    is_super_user: bool
     lnbits_allowed_funding_sources: Optional[List[str]]
 
 
@@ -316,18 +360,6 @@ def set_cli_settings(**kwargs):
         setattr(settings, key, value)
 
 
-# set wallet class after settings are loaded
-def set_wallet_class():
-    wallet_class = getattr(wallets_module, settings.lnbits_backend_wallet_class)
-    global WALLET
-    WALLET = wallet_class()
-
-
-def get_wallet_class():
-    # wallet_class = getattr(wallets_module, settings.lnbits_backend_wallet_class)
-    return WALLET
-
-
 def send_admin_user_to_saas():
     if settings.lnbits_saas_callback:
         with httpx.Client() as client:
@@ -348,12 +380,11 @@ def send_admin_user_to_saas():
                 logger.success("sent super_user to saas application")
             except Exception as e:
                 logger.error(
-                    f"error sending super_user to saas: {settings.lnbits_saas_callback}. Error: {str(e)}"
+                    "error sending super_user to saas:"
+                    f" {settings.lnbits_saas_callback}. Error: {str(e)}"
                 )
 
 
-############### INIT #################
-
 readonly_variables = ReadOnlySettings.readonly_fields()
 transient_variables = TransientSettings.readonly_fields()
 
@@ -370,19 +401,16 @@ try:
         .strip()
         .decode("ascii")
     )
-except:
+except Exception:
     settings.lnbits_commit = "docker"
 
-
-# printing enviroment variable for debugging
-if not settings.lnbits_admin_ui:
-    logger.debug("Enviroment Settings:")
-    for key, value in settings.dict(exclude_none=True).items():
-        logger.debug(f"{key}: {value}")
+settings.version = importlib.metadata.version("lnbits")
 
 
-wallets_module = importlib.import_module("lnbits.wallets")
-FAKE_WALLET = getattr(wallets_module, "FakeWallet")()
+def get_wallet_class():
+    """
+    Backwards compatibility
+    """
+    from lnbits.wallets import get_wallet_class
 
-# initialize as fake wallet
-WALLET = FAKE_WALLET
+    return get_wallet_class()

lnbits/static/css/.gitignore

@@ -1 +0,0 @@
-base.css

lnbits/static/css/base.css

@@ -0,0 +1,537 @@
+[data-theme=classic] .q-drawer--dark,
+body[data-theme=classic].body--dark,
+[data-theme=classic] .q-menu--dark {
+  background: #1f2234 !important;
+}
+
+/* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
+// set a darker body bg for all themes, when in "dark mode"
+body[data-theme='classic'].body--dark {
+  background: scale-color($color, $lightness: -60%);
+}
+*/
+[data-theme=classic] .q-card--dark,
+[data-theme=classic] .q-stepper--dark {
+  background: #333646 !important;
+}
+
+[data-theme=classic] .bg-primary {
+  background: #673ab7 !important;
+}
+[data-theme=classic] .text-primary {
+  color: #673ab7 !important;
+}
+[data-theme=classic] .bg-secondary {
+  background: #9c27b0 !important;
+}
+[data-theme=classic] .text-secondary {
+  color: #9c27b0 !important;
+}
+[data-theme=classic] .bg-dark {
+  background: #1f2234 !important;
+}
+[data-theme=classic] .text-dark {
+  color: #1f2234 !important;
+}
+[data-theme=classic] .bg-info {
+  background: #333646 !important;
+}
+[data-theme=classic] .text-info {
+  color: #333646 !important;
+}
+[data-theme=classic] .bg-marginal-bg {
+  background: #1f2234 !important;
+}
+[data-theme=classic] .text-marginal-bg {
+  color: #1f2234 !important;
+}
+[data-theme=classic] .bg-marginal-text {
+  background: #fff !important;
+}
+[data-theme=classic] .text-marginal-text {
+  color: #fff !important;
+}
+
+[data-theme=bitcoin] .q-drawer--dark,
+body[data-theme=bitcoin].body--dark,
+[data-theme=bitcoin] .q-menu--dark {
+  background: #2d293b !important;
+}
+
+/* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
+// set a darker body bg for all themes, when in "dark mode"
+body[data-theme='bitcoin'].body--dark {
+  background: scale-color($color, $lightness: -60%);
+}
+*/
+[data-theme=bitcoin] .q-card--dark,
+[data-theme=bitcoin] .q-stepper--dark {
+  background: #333646 !important;
+}
+
+[data-theme=bitcoin] .bg-primary {
+  background: #ff9853 !important;
+}
+[data-theme=bitcoin] .text-primary {
+  color: #ff9853 !important;
+}
+[data-theme=bitcoin] .bg-secondary {
+  background: #ff7353 !important;
+}
+[data-theme=bitcoin] .text-secondary {
+  color: #ff7353 !important;
+}
+[data-theme=bitcoin] .bg-dark {
+  background: #2d293b !important;
+}
+[data-theme=bitcoin] .text-dark {
+  color: #2d293b !important;
+}
+[data-theme=bitcoin] .bg-info {
+  background: #333646 !important;
+}
+[data-theme=bitcoin] .text-info {
+  color: #333646 !important;
+}
+[data-theme=bitcoin] .bg-marginal-bg {
+  background: #2d293b !important;
+}
+[data-theme=bitcoin] .text-marginal-bg {
+  color: #2d293b !important;
+}
+[data-theme=bitcoin] .bg-marginal-text {
+  background: #fff !important;
+}
+[data-theme=bitcoin] .text-marginal-text {
+  color: #fff !important;
+}
+
+[data-theme=freedom] .q-drawer--dark,
+body[data-theme=freedom].body--dark,
+[data-theme=freedom] .q-menu--dark {
+  background: #0a0a0a !important;
+}
+
+/* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
+// set a darker body bg for all themes, when in "dark mode"
+body[data-theme='freedom'].body--dark {
+  background: scale-color($color, $lightness: -60%);
+}
+*/
+[data-theme=freedom] .q-card--dark,
+[data-theme=freedom] .q-stepper--dark {
+  background: #1b1b1b !important;
+}
+
+[data-theme=freedom] .bg-primary {
+  background: #e22156 !important;
+}
+[data-theme=freedom] .text-primary {
+  color: #e22156 !important;
+}
+[data-theme=freedom] .bg-secondary {
+  background: #b91a45 !important;
+}
+[data-theme=freedom] .text-secondary {
+  color: #b91a45 !important;
+}
+[data-theme=freedom] .bg-dark {
+  background: #0a0a0a !important;
+}
+[data-theme=freedom] .text-dark {
+  color: #0a0a0a !important;
+}
+[data-theme=freedom] .bg-info {
+  background: #1b1b1b !important;
+}
+[data-theme=freedom] .text-info {
+  color: #1b1b1b !important;
+}
+[data-theme=freedom] .bg-marginal-bg {
+  background: #2d293b !important;
+}
+[data-theme=freedom] .text-marginal-bg {
+  color: #2d293b !important;
+}
+[data-theme=freedom] .bg-marginal-text {
+  background: #fff !important;
+}
+[data-theme=freedom] .text-marginal-text {
+  color: #fff !important;
+}
+
+[data-theme=cyber] .q-drawer--dark,
+body[data-theme=cyber].body--dark,
+[data-theme=cyber] .q-menu--dark {
+  background: #0a0a0a !important;
+}
+
+/* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
+// set a darker body bg for all themes, when in "dark mode"
+body[data-theme='cyber'].body--dark {
+  background: scale-color($color, $lightness: -60%);
+}
+*/
+[data-theme=cyber] .q-card--dark,
+[data-theme=cyber] .q-stepper--dark {
+  background: #1b1b1b !important;
+}
+
+[data-theme=cyber] .bg-primary {
+  background: #7cb342 !important;
+}
+[data-theme=cyber] .text-primary {
+  color: #7cb342 !important;
+}
+[data-theme=cyber] .bg-secondary {
+  background: #558b2f !important;
+}
+[data-theme=cyber] .text-secondary {
+  color: #558b2f !important;
+}
+[data-theme=cyber] .bg-dark {
+  background: #0a0a0a !important;
+}
+[data-theme=cyber] .text-dark {
+  color: #0a0a0a !important;
+}
+[data-theme=cyber] .bg-info {
+  background: #1b1b1b !important;
+}
+[data-theme=cyber] .text-info {
+  color: #1b1b1b !important;
+}
+[data-theme=cyber] .bg-marginal-bg {
+  background: #2d293b !important;
+}
+[data-theme=cyber] .text-marginal-bg {
+  color: #2d293b !important;
+}
+[data-theme=cyber] .bg-marginal-text {
+  background: #fff !important;
+}
+[data-theme=cyber] .text-marginal-text {
+  color: #fff !important;
+}
+
+[data-theme=mint] .q-drawer--dark,
+body[data-theme=mint].body--dark,
+[data-theme=mint] .q-menu--dark {
+  background: #1f342b !important;
+}
+
+/* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
+// set a darker body bg for all themes, when in "dark mode"
+body[data-theme='mint'].body--dark {
+  background: scale-color($color, $lightness: -60%);
+}
+*/
+[data-theme=mint] .q-card--dark,
+[data-theme=mint] .q-stepper--dark {
+  background: #334642 !important;
+}
+
+[data-theme=mint] .bg-primary {
+  background: #3ab77d !important;
+}
+[data-theme=mint] .text-primary {
+  color: #3ab77d !important;
+}
+[data-theme=mint] .bg-secondary {
+  background: #27b065 !important;
+}
+[data-theme=mint] .text-secondary {
+  color: #27b065 !important;
+}
+[data-theme=mint] .bg-dark {
+  background: #1f342b !important;
+}
+[data-theme=mint] .text-dark {
+  color: #1f342b !important;
+}
+[data-theme=mint] .bg-info {
+  background: #334642 !important;
+}
+[data-theme=mint] .text-info {
+  color: #334642 !important;
+}
+[data-theme=mint] .bg-marginal-bg {
+  background: #1f342b !important;
+}
+[data-theme=mint] .text-marginal-bg {
+  color: #1f342b !important;
+}
+[data-theme=mint] .bg-marginal-text {
+  background: #fff !important;
+}
+[data-theme=mint] .text-marginal-text {
+  color: #fff !important;
+}
+
+[data-theme=autumn] .q-drawer--dark,
+body[data-theme=autumn].body--dark,
+[data-theme=autumn] .q-menu--dark {
+  background: #34291f !important;
+}
+
+/* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
+// set a darker body bg for all themes, when in "dark mode"
+body[data-theme='autumn'].body--dark {
+  background: scale-color($color, $lightness: -60%);
+}
+*/
+[data-theme=autumn] .q-card--dark,
+[data-theme=autumn] .q-stepper--dark {
+  background: #463f33 !important;
+}
+
+[data-theme=autumn] .bg-primary {
+  background: #b7763a !important;
+}
+[data-theme=autumn] .text-primary {
+  color: #b7763a !important;
+}
+[data-theme=autumn] .bg-secondary {
+  background: #b07927 !important;
+}
+[data-theme=autumn] .text-secondary {
+  color: #b07927 !important;
+}
+[data-theme=autumn] .bg-dark {
+  background: #34291f !important;
+}
+[data-theme=autumn] .text-dark {
+  color: #34291f !important;
+}
+[data-theme=autumn] .bg-info {
+  background: #463f33 !important;
+}
+[data-theme=autumn] .text-info {
+  color: #463f33 !important;
+}
+[data-theme=autumn] .bg-marginal-bg {
+  background: #342a1f !important;
+}
+[data-theme=autumn] .text-marginal-bg {
+  color: #342a1f !important;
+}
+[data-theme=autumn] .bg-marginal-text {
+  background: rgb(255, 255, 255) !important;
+}
+[data-theme=autumn] .text-marginal-text {
+  color: rgb(255, 255, 255) !important;
+}
+
+[data-theme=flamingo] .q-drawer--dark,
+body[data-theme=flamingo].body--dark,
+[data-theme=flamingo] .q-menu--dark {
+  background: #2f032f !important;
+}
+
+/* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
+// set a darker body bg for all themes, when in "dark mode"
+body[data-theme='flamingo'].body--dark {
+  background: scale-color($color, $lightness: -60%);
+}
+*/
+[data-theme=flamingo] .q-card--dark,
+[data-theme=flamingo] .q-stepper--dark {
+  background: #bc23bc !important;
+}
+
+[data-theme=flamingo] .bg-primary {
+  background: #ff00ff !important;
+}
+[data-theme=flamingo] .text-primary {
+  color: #ff00ff !important;
+}
+[data-theme=flamingo] .bg-secondary {
+  background: #fda3fd !important;
+}
+[data-theme=flamingo] .text-secondary {
+  color: #fda3fd !important;
+}
+[data-theme=flamingo] .bg-dark {
+  background: #2f032f !important;
+}
+[data-theme=flamingo] .text-dark {
+  color: #2f032f !important;
+}
+[data-theme=flamingo] .bg-info {
+  background: #bc23bc !important;
+}
+[data-theme=flamingo] .text-info {
+  color: #bc23bc !important;
+}
+[data-theme=flamingo] .bg-marginal-bg {
+  background: #311231 !important;
+}
+[data-theme=flamingo] .text-marginal-bg {
+  color: #311231 !important;
+}
+[data-theme=flamingo] .bg-marginal-text {
+  background: rgb(255, 255, 255) !important;
+}
+[data-theme=flamingo] .text-marginal-text {
+  color: rgb(255, 255, 255) !important;
+}
+
+[data-theme=monochrome] .q-drawer--dark,
+body[data-theme=monochrome].body--dark,
+[data-theme=monochrome] .q-menu--dark {
+  background: #000 !important;
+}
+
+/* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
+// set a darker body bg for all themes, when in "dark mode"
+body[data-theme='monochrome'].body--dark {
+  background: scale-color($color, $lightness: -60%);
+}
+*/
+[data-theme=monochrome] .q-card--dark,
+[data-theme=monochrome] .q-stepper--dark {
+  background: rgb(39, 39, 39) !important;
+}
+
+[data-theme=monochrome] .bg-primary {
+  background: #494949 !important;
+}
+[data-theme=monochrome] .text-primary {
+  color: #494949 !important;
+}
+[data-theme=monochrome] .bg-secondary {
+  background: #6b6b6b !important;
+}
+[data-theme=monochrome] .text-secondary {
+  color: #6b6b6b !important;
+}
+[data-theme=monochrome] .bg-dark {
+  background: #000 !important;
+}
+[data-theme=monochrome] .text-dark {
+  color: #000 !important;
+}
+[data-theme=monochrome] .bg-info {
+  background: rgb(39, 39, 39) !important;
+}
+[data-theme=monochrome] .text-info {
+  color: rgb(39, 39, 39) !important;
+}
+[data-theme=monochrome] .bg-marginal-bg {
+  background: #000 !important;
+}
+[data-theme=monochrome] .text-marginal-bg {
+  color: #000 !important;
+}
+[data-theme=monochrome] .bg-marginal-text {
+  background: rgb(255, 255, 255) !important;
+}
+[data-theme=monochrome] .text-marginal-text {
+  color: rgb(255, 255, 255) !important;
+}
+
+[data-theme=freedom] .q-drawer--dark {
+  background: #0a0a0a !important;
+}
+
+[data-theme=freedom] .q-header {
+  background: #0a0a0a !important;
+}
+
+[data-theme=cyber] .q-drawer--dark {
+  background: #0a0a0a !important;
+}
+
+[data-theme=cyber] .q-header {
+  background: #0a0a0a !important;
+}
+
+[data-theme=salvador] .q-drawer--dark {
+  background: #242424 !important;
+}
+
+[data-theme=salvador] .q-header {
+  background: #0f47af !important;
+}
+
+[v-cloak] {
+  display: none;
+}
+
+body.body--dark .q-table--dark {
+  background: transparent;
+}
+
+body.body--dark .q-field--error .text-negative,
+body.body--dark .q-field--error .q-field__messages {
+  color: yellow !important;
+}
+
+.lnbits-drawer__q-list .q-item {
+  padding-top: 5px !important;
+  padding-bottom: 5px !important;
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+.lnbits-drawer__q-list .q-item.q-item--active {
+  color: inherit;
+  font-weight: bold;
+}
+
+.lnbits__dialog-card {
+  width: 500px;
+}
+
+.q-table--dense th:first-child,
+.q-table--dense td:first-child,
+.q-table--dense .q-table__bottom {
+  padding-left: 6px !important;
+}
+.q-table--dense th:last-child,
+.q-table--dense td:last-child,
+.q-table--dense .q-table__bottom {
+  padding-right: 6px !important;
+}
+
+a.inherit {
+  color: inherit;
+  text-decoration: none;
+}
+
+video {
+  border-radius: 3px;
+}
+
+@font-face {
+  font-family: "Material Icons";
+  font-style: normal;
+  font-weight: 400;
+  src: url(/static/fonts/material-icons-v50.woff2) format("woff2");
+}
+.material-icons {
+  font-family: "Material Icons";
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -moz-font-feature-settings: "liga";
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.q-rating__icon {
+  font-size: 1em;
+}
+
+.text-wrap {
+  word-break: break-word;
+}
+
+.q-card code {
+  overflow-wrap: break-word;
+}

lnbits/static/i18n/br.js

@@ -0,0 +1,90 @@
+window.localisation.br = {
+  server: 'Servidor',
+  theme: 'Tema',
+  funding: 'Financiamento',
+  users: 'Usuários',
+  restart: 'Reiniciar servidor',
+  save: 'Salvar',
+  save_tooltip: 'Salvar suas alterações',
+  topup: 'Recarregar',
+  topup_wallet: 'Recarregar uma carteira',
+  topup_hint: 'Use o ID da carteira para recarregar qualquer carteira',
+  restart_tooltip: 'Reinicie o servidor para que as alterações tenham efeito',
+  add_funds_tooltip: 'Adicionar fundos a uma carteira.',
+  reset_defaults: 'Redefinir para padrões',
+  reset_defaults_tooltip:
+    'Apagar todas as configurações e redefinir para os padrões.',
+  download_backup: 'Fazer backup do banco de dados',
+  name_your_wallet: 'Nomeie sua carteira %{name}',
+  paste_invoice_label: 'Cole uma fatura, pedido de pagamento ou código lnurl *',
+  lnbits_description:
+    'Fácil de configurar e leve, o LNbits pode ser executado em qualquer fonte de financiamento da lightning-network, atualmente suportando LND, c-lightning, OpenNode, LNPay e até mesmo o LNbits em si! Você pode executar o LNbits para si mesmo ou oferecer facilmente uma solução de custódia para outros. Cada carteira tem suas próprias chaves de API e não há limite para o número de carteiras que você pode criar. Ser capaz de particionar fundos torna o LNbits uma ferramenta útil para gerenciamento de dinheiro e como uma ferramenta de desenvolvimento. As extensões adicionam funcionalidades extras ao LNbits para que você possa experimentar uma série de tecnologias de ponta na rede lightning. Nós tornamos o desenvolvimento de extensões o mais fácil possível e, como um projeto gratuito e de código aberto, incentivamos as pessoas a desenvolver e enviar as suas próprias.',
+  export_to_phone: 'Exportar para o telefone com código QR',
+  export_to_phone_desc:
+    'Este código QR contém a URL da sua carteira com acesso total. Você pode escaneá-lo do seu telefone para abrir sua carteira a partir dele.',
+  wallets: 'Carteiras',
+  add_wallet: 'Adicionar nova carteira',
+  delete_wallet: 'Excluir carteira',
+  delete_wallet_desc:
+    'Toda a carteira será excluída, os fundos serão IRRECUPERÁVEIS.',
+  rename_wallet: 'Renomear carteira',
+  update_name: 'Atualizar nome',
+  press_to_claim: 'Pressione para solicitar bitcoin',
+  donate: 'Doar',
+  view_github: 'Ver no GitHub',
+  voidwallet_active: 'VoidWallet está ativo! Pagamentos desabilitados',
+  use_with_caution: 'USE COM CAUTELA - a carteira %{name} ainda está em BETA',
+  toggle_darkmode: 'Alternar modo escuro',
+  view_swagger_docs: 'Ver a documentação da API do LNbits Swagger',
+  api_docs: 'Documentação da API',
+  commit_version: 'Versão de commit',
+  lnbits_version: 'Versão do LNbits',
+  runs_on: 'Executa em',
+  credit_hint: 'Pressione Enter para creditar a conta',
+  credit_label: '%{denomination} para creditar',
+  paste_request: 'Colar Pedido',
+  create_invoice: 'Criar Fatura',
+  camera_tooltip: 'Usar a câmara para escanear uma fatura / QR',
+  export_csv: 'Exportar para CSV',
+  transactions: 'Transações',
+  chart_tooltip: 'Mostrar gráfico',
+  pending: 'Pendente',
+  copy_invoice: 'Copiar fatura',
+  close: 'Fechar',
+  cancel: 'Cancelar',
+  scan: 'Escanear',
+  read: 'Ler',
+  pay: 'Pagar',
+  memo: 'Memo',
+  date: 'Data',
+  processing_payment: 'Processando pagamento...',
+  not_enough_funds: 'Fundos insuficientes!',
+  search_by_tag_memo_amount: 'Pesquisar por tag, memo, quantidade',
+  invoice_waiting: 'Fatura aguardando pagamento',
+  payment_received: 'Pagamento Recebido',
+  payment_sent: 'Pagamento Enviado',
+  receive: 'receber',
+  send: 'enviar',
+  outgoing_payment_pending: 'Pagamento pendente de saída',
+  drain_funds: 'Drenar Fundos',
+  drain_funds_desc:
+    'Este é um código QR de retirada do LNURL para sugar tudo desta carteira. Não compartilhe com ninguém. É compatível com balanceCheck e balanceNotify para que sua carteira possa continuar retirando os fundos continuamente daqui após a primeira retirada.',
+  i_understand: 'Eu entendo',
+  copy_wallet_url: 'Copiar URL da carteira',
+  disclaimer_dialog:
+    'Funcionalidade de login a ser lançada em uma atualização futura, por enquanto, certifique-se de marcar esta página para acesso futuro à sua carteira! Este serviço está em BETA, e não nos responsabilizamos por pessoas que perderem o acesso aos fundos.',
+  no_transactions: 'Ainda não foram feitas transações',
+  manage_extensions: 'Gerenciar extensões',
+  manage_server: 'Gerenciar servidor',
+  extensions: 'Extensões',
+  no_extensions: 'Você não possui nenhuma extensão instalada :(',
+  created: 'Criado',
+  payment_hash: 'Hash de pagamento',
+  fee: 'Taxa',
+  amount: 'Quantidade',
+  unit: 'Unidade',
+  description: 'Descrição',
+  expiry: 'Validade',
+  webhook: 'Webhook',
+  payment_proof: 'Comprovante de pagamento'
+}

lnbits/static/i18n/cn.js

@@ -0,0 +1,123 @@
+window.localisation.cn = {
+  confirm: '确定',
+  server: '服务器',
+  theme: '主题',
+  funding: '资金',
+  users: '用户',
+  restart: '重新启动服务器',
+  save: '保存',
+  save_tooltip: '保存更改',
+  topup: '充值',
+  topup_wallet: '给钱包充值',
+  topup_hint: '使用钱包ID为任何钱包充值',
+  restart_tooltip: '重新启动服务器以使更改生效',
+  add_funds_tooltip: '为钱包添加资金',
+  reset_defaults: '重置为默认设置',
+  reset_defaults_tooltip: '删除所有设置并重置为默认设置',
+  download_backup: '下载数据库备份',
+  name_your_wallet: '给你的 %{name}钱包起个名字',
+  paste_invoice_label: '粘贴发票，付款请求或lnurl*',
+  lnbits_description:
+    'LNbits 设置简单、轻量级，可以运行在任何闪电网络的版本上，目前支持 LND、Core Lightning、OpenNode、LNPay，甚至 LNbits 本身！您可以为自己运行 LNbits，或者为他人轻松提供资金托管。每个钱包都有自己的 API 密钥，你可以创建的钱包数量没有限制。能够把资金分开管理使 LNbits 成为一款有用的资金管理和开发工具。扩展程序增加了 LNbits 的额外功能，所以你可以在闪电网络上尝试各种尖端技术。我们已经尽可能简化了开发扩展程序的过程，作为一个免费和开源的项目，我们鼓励人们开发并提交自己的扩展程序。',
+  export_to_phone: '通过二维码导出到手机',
+  export_to_phone_desc:
+    '这个二维码包含您钱包的URL。您可以使用手机扫描的方式打开您的钱包。',
+  wallets: '钱包',
+  add_wallet: '添加新钱包',
+  delete_wallet: '删除钱包',
+  delete_wallet_desc: '整个钱包将被删除，资金将无法恢复',
+  rename_wallet: '重命名钱包',
+  update_name: '更新名称',
+  press_to_claim: '点击领取比特币',
+  donate: '捐献',
+  view_github: '在GitHub上查看',
+  voidwallet_active: 'VoidWallet 已激活！付款功能已禁用。',
+  use_with_caution: '请谨慎使用 - %{name}钱包还处于测试版阶段',
+  toggle_darkmode: '切换暗黑模式',
+  view_swagger_docs: '查看 LNbits Swagger API 文档',
+  api_docs: 'API文档',
+  commit_version: '提交版本',
+  lnbits_version: 'LNbits版本',
+  runs_on: '可运行在',
+  credit_hint: '按 Enter 键充值账户',
+  credit_label: '%{denomination} 充值',
+  paste_request: '粘贴请求',
+  create_invoice: '创建发票',
+  camera_tooltip: '用相机扫描发票/二维码',
+  export_csv: '导出为CSV',
+  transactions: '交易记录',
+  chart_tooltip: '显示图表',
+  pending: '待处理',
+  copy_invoice: '复制发票',
+  close: '关闭',
+  cancel: '取消',
+  scan: '扫描',
+  read: '读取',
+  pay: '付款',
+  memo: '备注',
+  date: '日期',
+  processing_payment: '正在处理支付...',
+  not_enough_funds: '资金不足！',
+  search_by_tag_memo_amount: '按标签、备注、金额搜索',
+  invoice_waiting: '待支付的发票',
+  payment_received: '收到付款',
+  payment_sent: '付款已发送',
+  receive: '收款',
+  send: '付款',
+  outgoing_payment_pending: '付款正在等待处理',
+  drain_funds: '清空资金',
+  drain_funds_desc:
+    '这是一个 LNURL-取款的二维码，用于从该钱包中提取全部资金。请不要与他人分享。它与 balanceCheck 和 balanceNotify 兼容，因此在第一次取款后，您的钱包还可能会持续从这里提取资金',
+  i_understand: '我明白',
+  copy_wallet_url: '复制钱包URL',
+  disclaimer_dialog:
+    '登录功能将在以后的更新中发布，请将此页面加为书签，以便将来访问您的钱包！此服务处于测试阶段，我们不对资金的丢失承担任何责任。',
+  no_transactions: '尚未进行任何交易',
+  manage_server: '管理服务器',
+  extensions: '扩展程序',
+  no_extensions: '你没有安装任何扩展程序 :(',
+  created: '已创建',
+
+  search_extensions: '搜索扩展程序',
+  warning: '警告',
+  manage: '管理',
+  repository: '代码库',
+  confirm_continue: '你确定要继续吗?',
+  manage_extension_details: '安装/卸载扩展程序',
+  install: '安装',
+  uninstall: '卸载',
+  drop_db: '删除数据',
+  open: '打开',
+  enable: '启用',
+  enable_extension_details: '为当前用户启用扩展程序',
+  disable: '禁用',
+  installed: '已安装',
+  activated: '已激活',
+  deactivated: '已停用',
+  release_notes: '发布说明',
+  activate_extension_details: '对用户开放或禁用扩展程序',
+  featured: '精选',
+  all: '全部',
+  only_admins_can_install: '（只有管理员账户可以安装扩展）',
+  admin_only: '仅限管理员',
+  new_version: '新版本',
+  extension_depends_on: '依赖于:',
+  extension_rating_soon: '即将推出评分',
+  extension_installed_version: '已安装的版本',
+  extension_uninstall_warning: '您即将对所有用户删除该扩展程序。',
+  uninstall_confirm: '是的，卸载',
+  extension_db_drop_info: '该扩展程序的所有数据将被永久删除。此操作无法撤销！',
+  extension_db_drop_warning:
+    '您即将删除该扩展的所有数据。请继续输入扩展程序名称以确认操作：',
+
+  extension_min_lnbits_version: '此版本要求最低的 LNbits 版本为',
+
+  payment_hash: '付款哈希',
+  fee: '费',
+  amount: '金额',
+  unit: '单位',
+  description: '详情',
+  expiry: '过期时间',
+  webhook: 'Webhook',
+  payment_proof: '付款证明'
+}

lnbits/static/i18n/de.js

@@ -0,0 +1,125 @@
+window.localisation.de = {
+  server: 'Server',
+  theme: 'Theme',
+  funding: 'Funding',
+  users: 'Benutzer',
+  unit: 'Einheit',
+  restart: 'Server neu starten',
+  save: 'Speichern',
+  save_tooltip: 'Änderungen speichern',
+  topup: 'Aufladen',
+  topup_wallet: 'Wallet aufladen',
+  topup_hint: 'Nutze die Wallet-ID, um eine beliebige Wallet aufzuladen',
+  restart_tooltip: 'Starte den Server neu, um die Änderungen zu übernehmen',
+  add_funds_tooltip: 'Füge Geld zu einer Wallet hinzu.',
+  reset_defaults: 'Zurücksetzen',
+  reset_defaults_tooltip:
+    'Alle Einstellungen auf die Standardeinstellungen zurücksetzen.',
+  download_backup: 'Datenbank-Backup herunterladen',
+  name_your_wallet: 'Vergib deiner %{name} Wallet einen Namen',
+  paste_invoice_label:
+    'Füge eine Rechnung, Zahlungsanforderung oder LNURL ein *',
+  lnbits_description:
+    'Einfach zu installieren und kompakt, LNbits kann auf jeder Funding-Quelle im Lightning Netzwerk aufsetzen. Derzeit unterstützt: LND, Core Lightning, OpenNode, LNPay und sogar LNbits selbst! Du kannst LNbits für dich selbst betreiben oder anderen die Verwaltung durch dich anbieten. Jede Wallet hat ihre eigenen API-Schlüssel und die Anzahl der Wallets ist unbegrenzt. Die Möglichkeit, Gelder auf verschiedene Accounts mit unterschiedlicher Logik aufteilen zu können macht LNbits zu einem nützlichen Werkzeug für deine Buchhaltung - aber auch als Entwicklungswerkzeug. Erweiterungen bereichern LNbits Accounts um zusätzliche Funktionalität, so dass du mit einer Reihe von neuartigen Technologien auf dem Lightning-Netzwerk experimentieren kannst. Wir haben es so einfach wie möglich gemacht, Erweiterungen zu entwickeln, und als freies und Open-Source-Projekt möchten wir Menschen ermutigen, sich selbst hieran zu versuchen und gemeinsam mit uns neue Funktionalitäten zu entwickeln.',
+  export_to_phone: 'Auf dem Telefon öffnen',
+  export_to_phone_desc:
+    'Dieser QR-Code beinhaltet vollständige Rechte auf deine Wallet. Du kannst den QR-Code mit Deinem Telefon scannen, um deine Wallet dort zu öffnen.',
+  wallets: 'Wallets',
+  add_wallet: 'Wallet hinzufügen',
+  delete_wallet: 'Wallet löschen',
+  delete_wallet_desc:
+    'Die Wallet wird gelöscht, die hierin beinhalteten Daten hierin oder innerhalb einer Erweiterung sind UNWIEDERBRINGLICH.',
+  rename_wallet: 'Wallet umbenennen',
+  update_name: 'Namen aktualisieren',
+  press_to_claim: 'Klicken, um Bitcoin einzufordern.',
+  donate: 'Spenden',
+  view_github: 'Auf GitHub anzeigen',
+  voidwallet_active: 'VoidWallet ist aktiv! Zahlungen deaktiviert',
+  use_with_caution:
+    'BITTE MIT VORSICHT BENUTZEN - %{name} Wallet ist noch BETA',
+  toggle_darkmode: 'Auf Dark Mode umschalten',
+  view_swagger_docs: 'LNbits Swagger API-Dokumente',
+  api_docs: 'API docs',
+  commit_version: 'Commit Version',
+  runs_on: 'Läuft auf',
+  credit_hint: 'Klicke Enter, um das Konto zu belasten',
+  credit_label: '%{denomination} zu belasten',
+  paste_request: 'Anfrage einfügen',
+  create_invoice: 'Rechnung erstellen',
+  camera_tooltip:
+    'Verwende die Kamera, um eine Rechnung oder einen QR-Code zu scannen',
+  export_csv: 'Exportieren als CSV',
+  transactions: 'Transaktionen',
+  chart_tooltip: 'Diagramm anzeigen',
+  pending: 'Ausstehend',
+  copy_invoice: 'Rechnung kopieren',
+  close: 'Schließen',
+  cancel: 'Stornieren',
+  scan: 'Scannen',
+  read: 'Lesen',
+  pay: 'Zahlen',
+  memo: 'Memo',
+  date: 'Datum',
+  processing_payment: 'Zahlung wird verarbeitet ...',
+  not_enough_funds: 'Geldmittel sind erschöpft!',
+  search_by_tag_memo_amount: 'Suche nach Tag, Memo, Betrag',
+  invoice_waiting: 'Rechnung wartend auf Zahlung',
+  payment_received: 'Zahlung erhalten',
+  payment_sent: 'Zahlung gesendet',
+  receive: 'erhalten',
+  send: 'schicken',
+  outgoing_payment_pending: 'Ausgehende Zahlung wartend',
+  drain_funds: 'Sats abziehen',
+  drain_funds_desc:
+    'LNURL-withdraw QR-Code, der das Abziehen aller Geldmittel aus dieser Wallet erlaubt. Teile ihn mit niemandem! Kompatibel mit balanceCheck und balanceNotify, so dass dein Wallet die Sats nach dem ersten Abzug kontinuierlich von hier abziehen kann.',
+  i_understand: 'Ich verstehe',
+  copy_wallet_url: 'Wallet-URL kopieren',
+  disclaimer_dialog:
+    'Login-Funktionalität wird in einem zukünftigen Update veröffentlicht. Bis dahin ist die Speicherung der Wallet-URL als Lesezeichen absolut notwendig, um Zugriff auf die Wallet zu erhalten! Dieser Service ist in BETA und wir übernehmen keine Verantwortung für Verluste durch verlorene Zugriffe.',
+  no_transactions: 'Keine Transaktionen',
+  manage_extensions: 'Erweiterungen verwalten',
+  manage_server: 'Server verwalten',
+  extensions: 'Erweiterungen',
+  no_extensions: 'Du hast noch keine Erweiterungen installiert :(',
+  created: 'Erstellt',
+
+  search_extensions: 'Sucherweiterungen',
+  warning: 'Warnung',
+  manage: 'Verwalten',
+  repository: 'Repository',
+  confirm_continue: 'Bist du sicher, dass du fortfahren möchtest?',
+  manage_extension_details: 'Erweiterung installieren/deinstallieren',
+  install: 'Installieren',
+  uninstall: 'Deinstallieren',
+  open: 'Öffnen',
+  enable: 'Aktivieren',
+  enable_extension_details: 'Erweiterung für aktuellen Benutzer aktivieren',
+  disable: 'Deaktivieren',
+  installed: 'Installiert',
+  activated: 'Aktiviert',
+  deactivated: 'Deaktiviert',
+  release_notes: 'Versionshinweise',
+  activate_extension_details:
+    'Erweiterung für Benutzer verfügbar/nicht verfügbar machen',
+  featured: 'Vorgestellt',
+  all: 'Alle',
+  only_admins_can_install:
+    '(Nur Administratorkonten können Erweiterungen installieren)',
+  new_version: 'Neue Version',
+  extension_depends_on: 'Hängt ab von:',
+  extension_rating_soon: 'Bewertungen sind bald verfügbar',
+  extension_installed_version: 'Installierte Version',
+  extension_uninstall_warning:
+    'Sie sind dabei, die Erweiterung für alle Benutzer zu entfernen.',
+  uninstall_confirm: 'Ja, deinstallieren',
+  extension_min_lnbits_version:
+    'Diese Version erfordert mindestens die LNbits-Version',
+
+  payment_hash: 'Zahlungs-Hash',
+  fee: 'Gebühr',
+  amount: 'Menge',
+  description: 'Beschreibung',
+  expiry: 'Ablauf',
+  webhook: 'Webhook',
+  payment_proof: 'Beleg'
+}

lnbits/static/i18n/en.js

@@ -0,0 +1,178 @@
+window.localisation.en = {
+  confirm: 'Yes',
+  server: 'Server',
+  theme: 'Theme',
+  funding: 'Funding',
+  users: 'Users',
+  restart: 'Restart server',
+  save: 'Save',
+  save_tooltip: 'Save your changes',
+  topup: 'Topup',
+  topup_wallet: 'Topup a wallet',
+  topup_hint: 'Use the wallet ID to topup any wallet',
+  restart_tooltip: 'Restart the server for changes to take effect',
+  add_funds_tooltip: 'Add funds to a wallet.',
+  reset_defaults: 'Reset to defaults',
+  reset_defaults_tooltip: 'Delete all settings and reset to defaults.',
+  download_backup: 'Download database backup',
+  name_your_wallet: 'Name your %{name} wallet',
+  paste_invoice_label: 'Paste an invoice, payment request or lnurl code *',
+  lnbits_description:
+    'Easy to set up and lightweight, LNbits can run on any lightning-network funding source, currently supporting LND, Core Lightning, OpenNode, LNPay and even LNbits itself! You can run LNbits for yourself, or easily offer a custodian solution for others. Each wallet has its own API keys and there is no limit to the number of wallets you can make. Being able to partition funds makes LNbits a useful tool for money management and as a development tool. Extensions add extra functionality to LNbits so you can experiment with a range of cutting-edge technologies on the lightning network. We have made developing extensions as easy as possible, and as a free and open-source project, we encourage people to develop and submit their own.',
+  export_to_phone: 'Export to Phone with QR Code',
+  export_to_phone_desc:
+    'This QR code contains your wallet URL with full access. You can scan it from your phone to open your wallet from there.',
+  wallets: 'Wallets',
+  add_wallet: 'Add a new wallet',
+  delete_wallet: 'Delete wallet',
+  delete_wallet_desc:
+    'This whole wallet will be deleted, the funds will be UNRECOVERABLE.',
+  rename_wallet: 'Rename wallet',
+  update_name: 'Update name',
+  fiat_tracking: 'Fiat tracking',
+  currency: 'Currency',
+  update_currency: 'Update currency',
+  press_to_claim: 'Press to claim bitcoin',
+  donate: 'Donate',
+  view_github: 'View on GitHub',
+  voidwallet_active: 'VoidWallet is active! Payments disabled',
+  use_with_caution: 'USE WITH CAUTION - %{name} wallet is still in BETA',
+  toggle_darkmode: 'Toggle Dark Mode',
+  view_swagger_docs: 'View LNbits Swagger API docs',
+  api_docs: 'Api docs',
+  commit_version: 'Commit version',
+  lnbits_version: 'LNbits version',
+  runs_on: 'Runs on',
+  credit_hint: 'Press Enter to credit account',
+  credit_label: '%{denomination} to credit',
+  paste: 'Paste',
+  paste_from_clipboard: 'Paste from clipboard',
+  paste_request: 'Paste Request',
+  create_invoice: 'Create Invoice',
+  camera_tooltip: 'Use camera to scan an invoice/QR',
+  export_csv: 'Export to CSV',
+  transactions: 'Transactions',
+  chart_tooltip: 'Show chart',
+  pending: 'Pending',
+  copy_invoice: 'Copy invoice',
+  close: 'Close',
+  cancel: 'Cancel',
+  scan: 'Scan',
+  read: 'Read',
+  pay: 'Pay',
+  memo: 'Memo',
+  date: 'Date',
+  processing_payment: 'Processing payment...',
+  not_enough_funds: 'Not enough funds!',
+  search_by_tag_memo_amount: 'Search by tag, memo, amount',
+  invoice_waiting: 'Invoice waiting to be paid',
+  payment_received: 'Payment Received',
+  payment_sent: 'Payment Sent',
+  receive: 'receive',
+  send: 'send',
+  outgoing_payment_pending: 'Outgoing payment pending',
+  drain_funds: 'Drain Funds',
+  drain_funds_desc:
+    'This is an LNURL-withdraw QR code for slurping everything from this wallet. Do not share with anyone. It is compatible with balanceCheck and balanceNotify so your wallet may keep pulling the funds continuously from here after the first withdraw.',
+  i_understand: 'I understand',
+  copy_wallet_url: 'Copy wallet URL',
+  disclaimer_dialog:
+    'Login functionality to be released in a future update, for now, make sure you bookmark this page for future access to your wallet! This service is in BETA, and we hold no responsibility for people losing access to funds.',
+  no_transactions: 'No transactions made yet',
+  manage_server: 'Manage Server',
+  extensions: 'Extensions',
+  no_extensions: "You don't have any extensions installed :(",
+  created: 'Created',
+
+  search_extensions: 'Search extensions',
+  warning: 'Warning',
+  manage: 'Manage',
+  repository: 'Repository',
+  confirm_continue: 'Are you sure you want to continue?',
+  manage_extension_details: 'Install/uninstall extension',
+  install: 'Install',
+  uninstall: 'Uninstall',
+  drop_db: 'Remove Data',
+  open: 'Open',
+  enable: 'Enable',
+  enable_extension_details: 'Enable extension for current user',
+  disable: 'Disable',
+  installed: 'Installed',
+  activated: 'Activated',
+  deactivated: 'Deactivated',
+  release_notes: 'Release Notes',
+  activate_extension_details: 'Make extension available/unavailable for users',
+  featured: 'Featured',
+  all: 'All',
+  only_admins_can_install: '(Only admin accounts can install extensions)',
+  admin_only: 'Admin Only',
+  new_version: 'New Version',
+  extension_depends_on: 'Depends on:',
+  extension_rating_soon: 'Ratings coming soon',
+  extension_installed_version: 'Installed version',
+  extension_uninstall_warning:
+    'You are about to remove the extension for all users.',
+  uninstall_confirm: 'Yes, Uninstall',
+  extension_db_drop_info:
+    'All data for the extension will be permanently deleted. There is no way to undo this operation!',
+  extension_db_drop_warning:
+    'You are about to remove all data for the extension. Please type the extension name to continue:',
+
+  extension_min_lnbits_version: 'This release requires at least LNbits version',
+
+  payment_hash: 'Payment Hash',
+  fee: 'Fee',
+  amount: 'Amount',
+  unit: 'Unit',
+  description: 'Description',
+  expiry: 'Expiry',
+  webhook: 'Webhook',
+  payment_proof: 'Payment Proof',
+  update_available: 'Update %{version} available!',
+  latest_update: 'You are on the latest version %{version}.',
+  notifications: 'Notifications',
+  no_notifications: 'No notifications',
+  notifications_disabled: 'LNbits status notifications are disabled.',
+  enable_notifications: 'Enable Notifications',
+  enable_notifications_desc:
+    'If enabled it will fetch the latest LNbits Status updates, like security incidents and updates.',
+  enable_killswitch: 'Enable Killswitch',
+  enable_killswitch_desc:
+    'If enabled it will change your funding source to VoidWallet automatically if LNbits sends out a killswitch signal. You will need to enable manually after an update.',
+  killswitch_interval: 'Killswitch Interval',
+  killswitch_interval_desc:
+    'How often the background task should check for the LNBits killswitch signal from the status source (in minutes).',
+  enable_watchdog: 'Enable Watchdog',
+  enable_watchdog_desc:
+    'If enabled it will change your funding source to VoidWallet automatically if your balance is lower than the LNbits balance. You will need to enable manually after an update.',
+  watchdog_interval: 'Watchdog Interval',
+  watchdog_interval_desc:
+    '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:
+    'Limit before killswitch changes funding source to VoidWallet [lnbits_balance - node_balance > delta]',
+  status: 'Status',
+  notification_source: 'Notification Source',
+  notification_source_label:
+    'Source URL (only use the official LNbits status source, and sources you can trust)',
+  more: 'more',
+  releases: 'Releases',
+  killswitch: 'Killswitch',
+  watchdog: 'Watchdog',
+  server_logs: 'Server Logs',
+  ip_blocker: 'IP Blocker',
+  security: 'Security',
+  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 IP and hit enter',
+  rate_limiter: 'Rate Limiter',
+  number_of_requests: 'Number of requests',
+  time_unit: 'Time unit',
+  minute: 'minute',
+  second: 'second',
+  hour: 'hour',
+  disable_server_log: 'Disable Server Log',
+  enable_server_log: 'Enable Server Log',
+  coming_soon: 'Feature coming soon'
+}

lnbits/static/i18n/es.js

@@ -0,0 +1,121 @@
+window.localisation.es = {
+  server: 'Servidor',
+  theme: 'Tema',
+  funding: 'Financiación',
+  unit: 'Unidad',
+  users: 'Usuarios',
+  restart: 'Reiniciar el servidor',
+  save: 'Guardar',
+  save_tooltip: 'Guardar cambios',
+  topup: 'Recargar',
+  topup_wallet: 'Recargar billetera',
+  topup_hint: 'Utilice el ID de billetera para recargar cualquier billetera',
+  restart_tooltip: 'Reinicie el servidor para aplicar los cambios',
+  add_funds_tooltip: 'Agregue fondos a una billetera.',
+  reset_defaults: 'Restablecer',
+  reset_defaults_tooltip:
+    'Borrar todas las configuraciones y restablecer a los valores predeterminados.',
+  download_backup: 'Descargar copia de seguridad de la base de datos',
+  name_your_wallet: 'Nombre de su billetera %{name}',
+  paste_invoice_label: 'Pegue la factura aquí',
+  lnbits_description:
+    'Fácil de instalar y liviano, LNbits puede ejecutarse en cualquier fuente de financiación de la red Lightning, actualmente compatible con LND, Core Lightning, OpenNode, LNPay y hasta LNbits mismo! Puede ejecutar LNbits para usted mismo o ofrecer una solución competente a otros. Cada billetera tiene su propia clave API y no hay límite para la cantidad de billeteras que puede crear. La capacidad de particionar fondos hace de LNbits una herramienta útil para la administración de fondos y como herramienta de desarrollo. Las extensiones agregan funcionalidad adicional a LNbits, por lo que puede experimentar con una variedad de tecnologías de vanguardia en la red Lightning. Lo hemos hecho lo más simple posible para desarrollar extensiones y, como un proyecto gratuito y de código abierto, animamos a las personas a que se desarrollen a sí mismas y envíen sus propios contribuciones.',
+  export_to_phone: 'Exportar a teléfono con código QR',
+  export_to_phone_desc:
+    'Este código QR contiene su URL de billetera con acceso completo. Puede escanearlo desde su teléfono para abrir su billetera allí.',
+  wallets: 'Billeteras',
+  add_wallet: 'Agregar nueva billetera',
+  delete_wallet: 'Eliminar billetera',
+  delete_wallet_desc:
+    'Esta billetera completa se eliminará, los fondos son IRREVERSIBLES.',
+  rename_wallet: 'Cambiar el nombre de la billetera',
+  update_name: 'Actualizar nombre',
+  press_to_claim: 'Presione para reclamar Bitcoin',
+  donate: 'Donar',
+  view_github: 'Ver en GitHub',
+  voidwallet_active: '¡VoidWallet está activo! Pagos desactivados',
+  use_with_caution: 'USAR CON CUIDADO - %{name} Wallet aún está en BETA',
+  toggle_darkmode: 'Cambiar modo oscuro',
+  view_swagger_docs: 'Ver documentos de API de LNbits Swagger',
+  api_docs: 'Documentos de API',
+  commit_version: 'Versión de compromiso',
+  runs_on: 'Corre en',
+  credit_hint: 'Presione Enter para cargar la cuenta',
+  credit_label: 'Cargar %{denomination}',
+  paste_request: 'Pegar solicitud',
+  create_invoice: 'Crear factura',
+  camera_tooltip: 'Utilice la cámara para escanear una factura / código QR',
+  export_csv: 'Exportar a CSV',
+  transactions: 'Transacciones',
+  chart_tooltip: 'Mostrar gráfico',
+  pending: 'Pendiente',
+  copy_invoice: 'Copiar factura',
+  close: 'Cerrar',
+  cancel: 'Cancelar',
+  scan: 'Escanear',
+  read: 'Leer',
+  pay: 'Pagar',
+  memo: 'Memo',
+  date: 'Fecha',
+  processing_payment: 'Procesando pago ...',
+  not_enough_funds: '¡No hay suficientes fondos!',
+  search_by_tag_memo_amount: 'Buscar por etiqueta, memo, cantidad',
+  invoice_waiting: 'Factura esperando pago',
+  payment_received: 'Pago recibido',
+  payment_sent: 'Pago enviado',
+  receive: 'recibir',
+  send: 'enviar',
+  outgoing_payment_pending: 'Pago saliente pendiente',
+  drain_funds: 'Drenar fondos',
+  drain_funds_desc:
+    'Este es un código QR LNURL-withdraw para drenar todos los fondos de esta billetera. No lo comparta con nadie. Es compatible con balanceCheck y balanceNotify, por lo que su billetera puede continuar drenando los fondos de aquí después del primer drenaje.',
+  i_understand: 'Lo entiendo',
+  copy_wallet_url: 'Copiar URL de billetera',
+  disclaimer_dialog:
+    'La funcionalidad de inicio de sesión se lanzará en una actualización futura, por ahora, asegúrese de guardar esta página como marcador para acceder a su billetera en el futuro. Este servicio está en BETA y no asumimos ninguna responsabilidad por personas que pierdan el acceso a sus fondos.',
+  no_transactions: 'No hay transacciones todavía',
+  manage_server: 'Administrar servidor',
+  extensions: 'Extensiones',
+  no_extensions: 'No tienes extensiones instaladas :(',
+  created: 'Creado',
+
+  search_extensions: 'Extensiones de búsqueda',
+  warning: 'Advertencia',
+  manage: 'Administrar',
+  repository: 'Repositorio',
+  confirm_continue: '¿Está seguro de que desea continuar?',
+  manage_extension_details: 'Instalar/desinstalar extensión',
+  install: 'Instalar',
+  uninstall: 'Desinstalar',
+  open: 'Abrir',
+  enable: 'Habilitar',
+  enable_extension_details: 'Habilitar extensión para el usuario actual',
+  disable: 'Deshabilitar',
+  installed: 'Instalado',
+  activated: 'Activado',
+  deactivated: 'Desactivado',
+  release_notes: 'Notas de la versión',
+  activate_extension_details:
+    'Hacer que la extensión esté disponible/no disponible para los usuarios',
+  featured: 'Destacado',
+  all: 'Todos',
+  only_admins_can_install:
+    '(Solo las cuentas de administrador pueden instalar extensiones)',
+  new_version: 'Nueva Versión',
+  extension_depends_on: 'Depende de:',
+  extension_rating_soon: 'Calificaciones próximamente',
+  extension_installed_version: 'Versión instalada',
+  extension_uninstall_warning:
+    'Está a punto de eliminar la extensión para todos los usuarios.',
+  uninstall_confirm: 'Sí, desinstalar',
+  extension_min_lnbits_version:
+    'Esta versión requiere al menos una versión de LNbits',
+
+  payment_hash: 'Hash de pago',
+  fee: 'Cuota',
+  amount: 'Cantidad',
+  description: 'Descripción',
+  expiry: 'Expiración',
+  webhook: 'Webhook',
+  payment_proof: 'Prueba de pago'
+}

lnbits/static/i18n/fr.js

@@ -0,0 +1,94 @@
+window.localisation.fr = {
+  server: 'Serveur',
+  theme: 'Thème',
+  funding: 'Financement',
+  users: 'Utilisateurs',
+  restart: 'Redémarrer le serveur',
+  save: 'Enregistrer',
+  save_tooltip: 'Enregistrer vos modifications',
+  topup: 'Renflouer',
+  topup_wallet: 'Reflouer un portefeuille',
+  topup_hint:
+    "Utilisez l'ID du portefeuille pour recharger n'importe quel portefeuille",
+  restart_tooltip:
+    'Redémarrez le serveur pour que les changements prennent effet',
+  add_funds_tooltip: 'Ajouter des fonds à un portefeuille.',
+  reset_defaults: 'Réinitialiser aux valeurs par défaut',
+  reset_defaults_tooltip:
+    'Supprimer tous les paramètres et les réinitialiser aux valeurs par défaut.',
+  download_backup: 'Télécharger la sauvegarde de la base de données',
+  name_your_wallet: 'Nommez votre portefeuille %{name}',
+  paste_invoice_label:
+    'Coller une facture, une demande de paiement ou un code lnurl *',
+  lnbits_description:
+    "Facile à installer et léger, LNbits peut fonctionner sur n'importe quelle source de financement du réseau Lightning, prenant actuellement en charge LND, Core Lightning, OpenNode, LNPay et même LNbits lui-même! Vous pouvez exécuter LNbits pour vous-même ou offrir facilement une solution de gardien pour les autres. Chaque portefeuille a ses propres clés API et il n'y a pas de limite au nombre de portefeuilles que vous pouvez créer. La capacité de partitionner les fonds rend LNbits un outil utile pour la gestion de l'argent et comme outil de développement. Les extensions ajoutent une fonctionnalité supplémentaire à LNbits afin que vous puissiez expérimenter une gamme de technologies de pointe sur le réseau Lightning. Nous avons rendu le développement d'extensions aussi simple que possible et, en tant que projet gratuit et open source, nous encourageons les gens à développer et à soumettre les leurs.",
+  export_to_phone: 'Exporter vers le téléphone avec un code QR',
+  export_to_phone_desc:
+    "Ce code QR contient l'URL de votre portefeuille avec un accès complet. Vous pouvez le scanner depuis votre téléphone pour ouvrir votre portefeuille depuis là-bas.",
+  wallets: 'Portefeuilles',
+  add_wallet: 'Ajouter un nouveau portefeuille',
+  delete_wallet: 'Supprimer le portefeuille',
+  delete_wallet_desc:
+    'Ce portefeuille entier sera supprimé et les fonds seront IRRECUPERABLES.',
+  rename_wallet: 'Renommer le portefeuille',
+  update_name: 'Mettre à jour le nom',
+  press_to_claim: 'Appuyez pour demander du Bitcoin',
+  donate: 'Donner',
+  view_github: 'Voir sur GitHub',
+  voidwallet_active: 'VoidWallet est actif! Paiements désactivés',
+  use_with_caution:
+    'UTILISER AVEC PRUDENCE - Le portefeuille %{name} est toujours en version BETA',
+  toggle_darkmode: 'Basculer le mode sombre',
+  view_swagger_docs: "Voir les documents de l'API Swagger de LNbits",
+  api_docs: "Documents de l'API",
+  commit_version: 'Version de commit',
+  lnbits_version: 'Version de LNbits',
+  runs_on: 'Fonctionne sur',
+  credit_hint: 'Appuyez sur Entrée pour créditer le compte',
+  credit_label: '%{denomination} à créditer',
+  paste_request: 'Coller la requête',
+  create_invoice: 'Créer une facture',
+  camera_tooltip: 'Utiliser la caméra pour scanner une facture / un code QR',
+  export_csv: 'Exporter vers CSV',
+  transactions: 'Transactions',
+  chart_tooltip: 'Afficher le graphique',
+  pending: 'En attente',
+  copy_invoice: 'Copier la facture',
+  close: 'Fermer',
+  cancel: 'Annuler',
+  scan: 'Scanner',
+  read: 'Lire',
+  pay: 'Payer',
+  memo: 'Mémo',
+  date: 'Date',
+  processing_payment: 'Traitement du paiement...',
+  not_enough_funds: 'Fonds insuffisants !',
+  search_by_tag_memo_amount: 'Rechercher par tag, mémo, montant',
+  invoice_waiting: 'Facture en attente de paiement',
+  payment_received: 'Paiement reçu',
+  payment_sent: 'Paiement envoyé',
+  receive: 'recevoir',
+  send: 'envoyer',
+  outgoing_payment_pending: 'Paiement sortant en attente',
+  drain_funds: 'Vider les fonds',
+  drain_funds_desc:
+    "Il s'agit d'un code QR LNURL-withdraw pour tout aspirer de ce portefeuille. Ne le partagez avec personne. Il est compatible avec balanceCheck et balanceNotify, de sorte que votre portefeuille peut continuer à retirer les fonds continuellement à partir d'ici après le premier retrait.",
+  i_understand: "J'ai compris",
+  copy_wallet_url: "Copier l'URL du portefeuille",
+  disclaimer_dialog:
+    "La fonctionnalité de connexion sera publiée dans une future mise à jour, pour l'instant, assurez-vous de mettre cette page en favori pour accéder à votre portefeuille ultérieurement ! Ce service est en BETA, et nous ne sommes pas responsables des personnes qui perdent l'accès à leurs fonds.",
+  no_transactions: 'Aucune transaction effectuée pour le moment',
+  manage_extensions: 'Gérer les extensions',
+  manage_server: 'Gérer le serveur',
+  extensions: 'Extensions',
+  no_extensions: "Vous n'avez installé aucune extension :(",
+  created: 'Créé',
+  payment_hash: 'Hash de paiement',
+  fee: 'Frais',
+  amount: 'Montant',
+  unit: 'Unité',
+  description: 'Description',
+  expiry: 'Expiration',
+  webhook: 'Webhook',
+  payment_proof: 'Preuve de paiement'
+}

lnbits/static/i18n/i18n.js

@@ -0,0 +1 @@
+window.localisation = {}

lnbits/static/i18n/it.js

@@ -0,0 +1,91 @@
+window.localisation.it = {
+  server: 'Server',
+  theme: 'Tema',
+  funding: 'Funding',
+  users: 'Utenti',
+  restart: 'Riavvia il server',
+  save: 'Salva',
+  save_tooltip: 'Salva le modifiche',
+  topup: 'Ricarica',
+  topup_wallet: 'Ricarica un portafoglio',
+  topup_hint: "Usa l'ID del portafoglio per ricaricare qualsiasi portafoglio",
+  restart_tooltip: 'Riavvia il server affinché le modifiche abbiano effetto',
+  add_funds_tooltip: 'Aggiungere fondi a un portafoglio',
+  reset_defaults: 'Ripristina le impostazioni predefinite',
+  reset_defaults_tooltip:
+    'Cancella tutte le impostazioni e ripristina i valori predefiniti',
+  download_backup: 'Scarica il backup del database',
+  name_your_wallet: 'Dai un nome al tuo portafoglio %{name}',
+  paste_invoice_label:
+    'Incolla una fattura, una richiesta di pagamento o un codice lnurl *',
+  lnbits_description:
+    "Leggero e facile da configurare, LNbits può funzionare su qualsiasi fonte di finanziamento lightning-network, attualmente supporta LND, Core Lightning, OpenNode, LNPay e persino LNbits stesso! Potete gestire LNbits per conto vostro o offrire facilmente una soluzione di custodia per altri. Ogni portafoglio ha le proprie chiavi API e non c'è limite al numero di portafogli che si possono creare. La possibilità di suddividere i fondi rende LNbits uno strumento utile per la gestione del denaro e come strumento di sviluppo. Le estensioni aggiungono ulteriori funzionalità a LNbits, consentendo di sperimentare una serie di tecnologie all'avanguardia sulla rete Lightning. Abbiamo reso lo sviluppo delle estensioni il più semplice possibile e, in quanto progetto libero e open-source, incoraggiamo le persone a sviluppare e inviare le proprie",
+  export_to_phone: 'Esportazione su telefono con codice QR',
+  export_to_phone_desc:
+    "Questo codice QR contiene l'URL del portafoglio con accesso da amministratore. È possibile scansionarlo dal telefono per aprire il portafoglio da lì.",
+  wallets: 'Portafogli',
+  add_wallet: 'Aggiungi un nuovo portafoglio',
+  delete_wallet: 'Elimina il portafoglio',
+  delete_wallet_desc:
+    "L'intero portafoglio sarà cancellato, i fondi saranno irrecuperabili",
+  rename_wallet: 'Rinomina il portafoglio',
+  update_name: 'Aggiorna il nome',
+  press_to_claim: 'Premi per richiedere bitcoin',
+  donate: 'Donazioni',
+  view_github: 'Visualizza su GitHub',
+  voidwallet_active: 'VoidWallet è attivo! Pagamenti disabilitati',
+  use_with_caution: 'USARE CON CAUTELA - %{nome} portafoglio è ancora in BETA',
+  toggle_darkmode: 'Attiva la modalità notturna',
+  view_swagger_docs: "Visualizza i documenti dell'API Swagger di LNbits",
+  api_docs: 'Documenti API',
+  commit_version: 'Commit version',
+  lnbits_version: 'Versione di LNbits',
+  runs_on: 'Esegue su',
+  credit_hint: 'Premere Invio per accreditare i fondi',
+  credit_label: '%{denomination} da accreditare',
+  paste_request: 'Richiesta di pagamento',
+  create_invoice: 'Crea fattura',
+  camera_tooltip: 'Usa la fotocamera per scansionare la fattura/QR',
+  export_csv: 'Esporta CSV',
+  transactions: 'Transazioni',
+  chart_tooltip: 'Mostra grafico',
+  pending: 'In attesa',
+  copy_invoice: 'Copia fattura',
+  close: 'Chiudi',
+  cancel: 'Annulla',
+  scan: 'Scansiona',
+  read: 'Leggi',
+  pay: 'Paga',
+  memo: 'Memo',
+  data: 'Dati',
+  processing_payment: 'Elaborazione pagamento...',
+  not_enough_funds: 'Non ci sono abbastanza fondi!',
+  search_by_tag_memo_amount: 'Cerca per tag, memo, importo...',
+  invoice_waiting: 'Fattura in attesa di pagamento',
+  payment_received: 'Pagamento ricevuto',
+  payment_sent: 'Pagamento inviato',
+  receive: 'ricevere',
+  send: 'inviare',
+  outgoing_payment_pending: 'Pagamento in uscita in attesa',
+  drain_funds: 'Fondi di drenaggio',
+  drain_funds_desc:
+    'Questo è un codice QR <code>LNURL-withdraw</code> per prelevare tutti i fondi da questo portafoglio. Non condividerlo con nessuno. È compatibile con <code>balanceCheck</code> e <code>balanceNotify</code>, di conseguenza il vostro portafoglio può continuare a prelevare continuamente i fondi da qui dopo il primo prelievo',
+  i_understand: 'Ho capito',
+  copy_wallet_url: 'Copia URL portafoglio',
+  disclaimer_dialog:
+    "La funzionalità di login sarà rilasciata in un futuro aggiornamento; per ora, assicuratevi di salvare tra i preferiti questa pagina per accedere nuovamente in futuro a questo portafoglio! Questo servizio è in fase BETA e non ci assumiamo alcuna responsabilità per la perdita all'accesso dei fondi",
+  no_transactions: 'Nessuna transazione effettuata',
+  manage_extensions: 'Gestisci le estensioni',
+  manage_server: 'Gestisci server',
+  estensioni: 'Estensioni',
+  no_extensions: 'Non ci sono estensioni installate :(',
+  created: 'Creato',
+  payment_hash: 'Hash del pagamento',
+  fee: 'Tariffa',
+  amount: 'Importo',
+  unit: 'Unità',
+  description: 'Descrizione',
+  expiry: 'Scadenza',
+  webhook: 'Webhook',
+  prova_di_pagamento: 'Prova di pagamento'
+}

lnbits/static/i18n/jp.js

@@ -0,0 +1,117 @@
+window.localisation.jp = {
+  server: 'サーバー',
+  theme: 'テーマ',
+  funding: '資金調達',
+  users: 'ユーザー',
+  restart: 'サーバーを再起動する',
+  save: '保存',
+  unit: '単位',
+  save_tooltip: '変更を保存する',
+  topup: 'トップアップ',
+  topup_wallet: 'ウォレットをトップアップする',
+  topup_hint: 'ウォレットIDを使用して、任意のウォレットをトップアップできます',
+  restart_tooltip: 'サーバーを再起動して変更を適用します',
+  add_funds_tooltip: 'ウォレットに資金を追加します。',
+  reset_defaults: 'リセット',
+  reset_defaults_tooltip: 'すべての設定を削除してデフォルトに戻します。',
+  download_backup: 'データベースのバックアップをダウンロードする',
+  name_your_wallet: 'あなたのウォレットの名前 %{name}',
+  paste_invoice_label: '請求書を貼り付けてください',
+  lnbits_description:
+    '簡単にインストールでき、軽量で、LNbitsは現在LND、Core Lightning、OpenNode、LNPay、さらにLNbits自身で動作する任意のLightningネットワークの資金源で実行できます！ LNbitsを自分で実行することも、他の人に優れたソリューションを提供することもできます。各ウォレットには独自のAPIキーがあり、作成できるウォレットの数に制限はありません。資金を分割する機能は、LNbitsを資金管理ツールとして使用したり、開発ツールとして使用したりするための便利なツールです。拡張機能は、LNbitsに追加の機能を追加します。そのため、LNbitsは最先端の技術をネットワークLightningで試すことができます。拡張機能を開発するのは簡単で、無料でオープンソースのプロジェクトであるため、人々が自分で開発し、自分の貢献を送信することを奨励しています。',
+  export_to_phone: '電話にエクスポート',
+  export_to_phone_desc:
+    'ウォレットを電話にエクスポートすると、ウォレットを削除する前にウォレットを復元できます。ウォレットを削除すると、ウォレットの秘密鍵が削除され、ウォレットを復元することはできません。',
+  wallets: 'ウォレット',
+  add_wallet: 'ウォレットを追加',
+  delete_wallet: 'ウォレットを削除',
+  delete_wallet_desc:
+    'ウォレットを削除すると、ウォレットの秘密鍵が削除され、ウォレットを復元することはできません。',
+  rename_wallet: 'ウォレットの名前を変更',
+  update_name: '名前を更新',
+  press_to_claim: 'クレームするには押してください',
+  donate: '寄付',
+  voidwallet_active: 'Voidwalletアクティブ',
+  use_with_caution: '注意して使用してください',
+  toggle_dark_mode: 'ダークモードを切り替える',
+  view_swagger_docs: 'Swaggerドキュメントを表示',
+  api_docs: 'APIドキュメント',
+  commit_version: 'コミットバージョン',
+  runs_on: 'で実行',
+  credit_hint:
+    'クレジットカードを使用して資金を追加するには、LNbitsを使用してください。',
+  credit_label: 'クレジットカード',
+  paste_request: 'リクエストを貼り付ける',
+  create_invoice: '請求書を作成する',
+  camera_tooltip: 'QRコードを読み取る',
+  export_csv: 'CSVでエクスポート',
+  transactions: 'トランザクション',
+  chart_tooltip: 'チャートを表示するには、グラフの上にカーソルを合わせます',
+  pending: '保留中',
+  copy_invoice: '請求書をコピー',
+  close: '閉じる',
+  cancel: 'キャンセル',
+  scan: 'スキャン',
+  read: '読む',
+  pay: '支払う',
+  memo: 'メモ',
+  date: '日付',
+  processing_payment: '支払い処理中',
+  not_enough_funds: '資金が不足しています',
+  search_by_tag_memo_amount: 'タグ、メモ、金額で検索',
+  invoice_waiting: '請求書を待っています',
+  payment_received: 'お支払いありがとうございます',
+  payment_sent: '支払いが完了しました',
+  receive: '受け取る',
+  send: '送信',
+  outgoing_payment_pending: '支払い保留中',
+  drain_funds: '資金を排出する',
+  drain_funds_desc: 'ウォレットの残高をすべて他のウォレットに送金します',
+  i_understand: '理解した',
+  copy_wallet_url: 'ウォレットURLをコピー',
+  disclaimer_dialog:
+    'ウォレットを削除すると、ウォレットの秘密鍵が削除され、ウォレットを復元することはできません。ウォレットを削除する前に、ウォレットをエクスポートしてください。',
+  no_transactions: 'トランザクションはありません',
+  manage_server: 'サーバーを管理する',
+  extensions: '拡張機能',
+  no_extensions: '拡張機能はありません',
+  created: '作成済み',
+  search_extensions: '検索拡張機能',
+  warning: '警告',
+  manage: '管理',
+  repository: 'リポジトリ',
+  confirm_continue: '続行してもよろしいですか?',
+  manage_extension_details: '拡張機能のインストール/アンインストール',
+  install: 'インストール',
+  uninstall: 'アンインストール',
+  open: '開く',
+  enable: '有効',
+  enable_extension_details: '現在のユーザーの拡張機能を有効にする',
+  disable: '無効',
+  installed: 'インストール済み',
+  activated: '有効化',
+  deactivated: '無効化',
+  release_notes: 'リリースノート',
+  activate_extension_details:
+    '拡張機能をユーザーが利用できるようにする/利用できないようにする',
+  featured: '特集',
+  all: 'すべて',
+  only_admins_can_install:
+    '(管理者アカウントのみが拡張機能をインストールできます)',
+  new_version: '新しいバージョン',
+  extension_depends_on: '依存先:',
+  extension_rating_soon: '評価は近日公開',
+  extension_installed_version: 'インストール済みバージョン',
+  extension_uninstall_warning:
+    'すべてのユーザーの拡張機能を削除しようとしています.',
+  uninstall_confirm: 'はい、アンインストールします',
+  extension_min_lnbits_version:
+    'このリリースには少なくとも LNbits バージョンが必要です',
+  payment_hash: '支払いハッシュ',
+  fee: '料金',
+  amount: '量',
+  description: '説明',
+  expiry: '有効期限',
+  webhook: 'ウェブフック',
+  payment_proof: '支払い証明'
+}

lnbits/static/i18n/nl.js

@@ -0,0 +1,92 @@
+window.localisation.nl = {
+  server: 'Server',
+  theme: 'Thema',
+  funding: 'Financiering',
+  users: 'Gebruikers',
+  restart: 'Server opnieuw opstarten',
+  save: 'Opslaan',
+  save_tooltip: 'Sla uw wijzigingen op',
+  topup: 'Bijvullen',
+  topup_wallet: 'Een portemonnee bijvullen',
+  topup_hint: 'Gebruik de portemonnee-ID om elke portemonnee bij te vullen',
+  restart_tooltip:
+    'Start de server opnieuw op zodat wijzigingen van kracht worden',
+  add_funds_tooltip: 'Voeg geld toe aan een portemonnee.',
+  reset_defaults: 'Standaardinstellingen herstellen',
+  reset_defaults_tooltip:
+    'Wis alle instellingen en herstel de standaardinstellingen.',
+  download_backup: 'Databaseback-up downloaden',
+  name_your_wallet: 'Geef je %{name} portemonnee een naam',
+  paste_invoice_label: 'Plak een factuur, betalingsverzoek of lnurl-code*',
+  lnbits_description:
+    'Gemakkelijk in te stellen en lichtgewicht, LNbits kan op elke lightning-netwerkfinancieringsbron draaien, ondersteunt op dit moment LND, Core Lightning, OpenNode, LNPay en zelfs LNbits zelf! U kunt LNbits voor uzelf laten draaien of gemakkelijk een bewaardersoplossing voor anderen bieden. Elke portemonnee heeft zijn eigen API-sleutels en er is geen limiet aan het aantal portemonnees dat u kunt maken. Het kunnen partitioneren van fondsen maakt LNbits een nuttige tool voor geldbeheer en als ontwikkelingstool. Extensies voegen extra functionaliteit toe aan LNbits, zodat u kunt experimenteren met een reeks toonaangevende technologieën op het bliksemschichtnetwerk. We hebben het ontwikkelen van extensies zo eenvoudig mogelijk gemaakt en als een gratis en opensource-project moedigen we mensen aan om hun eigen ontwikkelingen in te dienen.',
+  export_to_phone: 'Exporteren naar telefoon met QR-code',
+  export_to_phone_desc:
+    'Deze QR-code bevat uw portemonnee-URL met volledige toegang. U kunt het vanaf uw telefoon scannen om uw portemonnee van daaruit te openen.',
+  wallets: 'Portemonnees',
+  add_wallet: 'Een nieuwe portemonnee toevoegen',
+  delete_wallet: 'Portemonnee verwijderen',
+  delete_wallet_desc:
+    'Deze hele portemonnee wordt verwijderd, de fondsen worden NIET TERUGGEVONDEN.',
+  rename_wallet: 'Portemonnee hernoemen',
+  update_name: 'Naam bijwerken',
+  press_to_claim: 'Druk om bitcoin te claimen',
+  donate: 'Doneren',
+  view_github: 'Bekijken op GitHub',
+  voidwallet_active: 'VoidWallet is actief! Betalingen uitgeschakeld',
+  use_with_caution:
+    'GEBRUIK MET VOORZICHTIGHEID - %{name} portemonnee is nog in BETA',
+  toggle_darkmode: 'Donkere modus aan/uit',
+  view_swagger_docs: 'Bekijk LNbits Swagger API-documentatie',
+  api_docs: 'API-documentatie',
+  commit_version: 'Commit-versie',
+  lnbits_version: 'LNbits-versie',
+  runs_on: 'Draait op',
+  credit_hint: 'Druk op Enter om de rekening te crediteren',
+  credit_label: '%{denomination} te crediteren',
+  paste_request: 'Verzoek plakken',
+  create_invoice: 'Factuur aanmaken',
+  camera_tooltip: 'Gebruik de camera om een factuur/QR-code te scannen',
+  export_csv: 'Exporteer naar CSV',
+  transactions: 'Transacties',
+  chart_tooltip: 'Toon grafiek',
+  pending: 'In behandeling',
+  copy_invoice: 'Kopieer factuur',
+  close: 'Sluiten',
+  cancel: 'Annuleren',
+  scan: 'Scannen',
+  read: 'Lezen',
+  pay: 'Betalen',
+  memo: 'Memo',
+  date: 'Datum',
+  processing_payment: 'Verwerking betaling...',
+  not_enough_funds: 'Onvoldoende saldo!',
+  search_by_tag_memo_amount: 'Zoeken op tag, memo, bedrag',
+  invoice_waiting: 'Factuur wachtend op betaling',
+  payment_received: 'Betaling ontvangen',
+  payment_sent: 'Betaling verzonden',
+  receive: 'ontvangen',
+  send: 'versturen',
+  voutgoing_payment_pending: 'Uitgaande betaling in behandeling',
+  drain_funds: 'Geld opnemen',
+  drain_funds_desc:
+    'Dit is een LNURL-withdraw QR-code om alles uit deze portemonnee te halen. Deel deze code niet met anderen. Het is compatibel met balanceCheck en balanceNotify zodat jouw portemonnee continu geld kan blijven opnemen vanaf hier na de eerste opname.',
+  i_understand: 'Ik begrijp het',
+  copy_wallet_url: 'Kopieer portemonnee-URL',
+  disclaimer_dialog:
+    'Inlogfunctionaliteit wordt uitgebracht in een toekomstige update. Zorg er nu voor dat je deze pagina als favoriet markeert om in de toekomst toegang te krijgen tot je portemonnee! Deze service is in BETA en we zijn niet verantwoordelijk voor mensen die de toegang tot hun fondsen verliezen.',
+  no_transactions: 'Er zijn nog geen transacties gedaan',
+  manage_extensions: 'Beheer extensies',
+  manage_server: 'Beheer server',
+  extensions: 'Extensies',
+  no_extensions: 'Je hebt geen extensies geïnstalleerd :(',
+  created: 'Aangemaakt',
+  payment_hash: 'Betalings-hash',
+  fee: 'Kosten',
+  amount: 'Bedrag',
+  unit: 'Eenheid',
+  description: 'Beschrijving',
+  expiry: 'Vervaldatum',
+  webhook: 'Webhook',
+  payment_proof: 'Betalingsbewijs'
+}

lnbits/static/i18n/pi.js

@@ -0,0 +1,93 @@
+window.localisation.pi = {
+  server: 'Cap`n',
+  theme: 'Theme',
+  funding: 'Funding',
+  users: 'Buccaneers',
+  restart: 'Arr, restart Cap`n',
+  save: 'Bury Treasure',
+  save_tooltip: 'Bury yer changes, matey',
+  topup: 'Top up the Chest',
+  topup_wallet: 'Add more doubloons to the chest',
+  topup_hint: 'Use the chest ID to top up any chest',
+  restart_tooltip: 'Restart the Cap`n for changes to take effect, arr!',
+  add_funds_tooltip: 'Add doubloons to a chest and make it heavier',
+  reset_defaults: 'Reset to Davy Jones Locker',
+  reset_defaults_tooltip:
+    'Scuttle all settings and reset to Davy Jones Locker. Aye, start anew!',
+  download_backup: 'Download database booty',
+  name_your_wallet: 'Name yer %{name} treasure chest',
+  paste_invoice_label: 'Paste a booty, payment request or lnurl code, matey!',
+  lnbits_description:
+    'Arr, easy to set up and lightweight, LNbits can run on any lightning-network funding source, currently supporting LND, Core Lightning, OpenNode, LNPay and even LNbits itself! Ye can run LNbits for yourself, or easily offer a custodian solution for others. Each chest has its own API keys and there be no limit to the number of chests ye can make. Being able to partition booty makes LNbits a useful tool for money management and as a development tool. Arr, extensions add extra functionality to LNbits so ye can experiment with a range of cutting-edge technologies on the lightning network. We have made developing extensions as easy as possible, and as a free and open-source project, we encourage scallywags to develop and submit their own.',
+  export_to_phone: 'Export to Phone with QR Code, me hearties',
+  export_to_phone_desc:
+    'This QR code contains yer chest URL with full access. Ye can scan it from yer phone to open yer chest from there, arr!',
+  wallets: 'Treasure Chests',
+  add_wallet: 'Add a new chest and fill it with doubloons!',
+  delete_wallet: 'Scuttle the Chest',
+  delete_wallet_desc:
+    'This whole chest will be scuttled, the booty will be UNRECOVERABLE. Aye, be warned!',
+  rename_wallet: 'Rename the Chest, me hearty',
+  update_name: 'Update name like a captain',
+  press_to_claim: 'Press to claim gold doubloons, matey!',
+  donate: 'Donate like a true pirate!',
+  view_github: 'View on GitHub and find treasures',
+  voidwallet_active: 'VoidWallet be active! Payments disabled',
+  use_with_caution:
+    'USE WITH CAUTION - %{name} chest be still in BETA. Aye, be careful!',
+  toggle_darkmode: 'Toggle Dark Mode, arr!',
+  view_swagger_docs: 'View LNbits Swagger API docs and learn the secrets',
+  api_docs: 'API docs for the scallywags',
+  commit_version: 'Commit version like a true pirate',
+  lnbits_version: 'LNbits version, arr!',
+  runs_on: 'Runs on, matey',
+  credit_hint: 'Press Enter to credit account and make it richer',
+  credit_label: '%{denomination} to credit, arr!',
+  paste_request: 'Paste Request and find treasures',
+  create_invoice: 'Create Booty Request and get rich, me hearties!',
+  camera_tooltip: 'Use spyglass to scan a booty/QR, arr!',
+  export_csv: 'Export to CSV and keep track of the booty',
+  transactions: 'Pirate Transactions and loot',
+  chart_tooltip: 'Show ye chart, me hearty',
+  pending: 'Pendin like a ship at anchor',
+  copy_invoice: 'Copy booty request, arrr',
+  close: 'Batten down the hatches, we be closin',
+  cancel: 'Abandon ship! We be retreatin',
+  scan: 'Avast! Scan me beauty, arrr',
+  read: 'Read it, if ye dare',
+  pay: 'Pay up or walk the plank, ye scallywag',
+  memo: 'Message in a bottle, argh',
+  date: 'Date of the map, me matey',
+  processing_payment: 'Processing yer payment... don´t make me say it again',
+  not_enough_funds: 'Arrr, ye don´t have enough doubloons! Walk the plank!',
+  search_by_tag_memo_amount: 'Search by tag, message, or booty amount, savvy',
+  invoice_waiting: 'Invoice waiting to be plundered, arrr',
+  payment_received: 'Payment Received like a treasure, argh',
+  payment_sent: 'Payment Sent, hoist the colors! We´ve got some doubloons!',
+  receive: 'booty',
+  send: 'hoist',
+  outgoing_payment_pending:
+    'Outgoing payment pending in the port, ye scurvy dog',
+  drain_funds: 'Plunder all the doubloons, ye buccaneer',
+  drain_funds_desc:
+    'This be an LNURL-withdraw QR code for slurpin everything from this wallet. Don`t share with anyone. It be compatible with balanceCheck and balanceNotify so yer wallet may keep pullin` the funds continuously from here after the first withdraw.',
+  i_understand: 'I understand, yo ho ho and a bottle of rum!',
+  copy_wallet_url: 'Copy wallet URL like a map, savvy',
+  disclaimer_dialog:
+    'Login functionality to be released in a future update, for now, make sure ye bookmark this page for future access to your booty! This service be in BETA, and we hold no responsibility for people losing access to doubloons.',
+  no_transactions: 'No transactions made yet, me hearties. Belay that!',
+  manage_extensions: 'Manage Yer Extensions, ye landlubber',
+  manage_server: 'Manage Yer Server, me hearty',
+  extensions: 'Yer Extensions, ye scurvy dog',
+  no_extensions:
+    "Ye don't have any extensions installed, ye scallywag :(. Where be yer loot?",
+  created: 'Created like a legend, savvy',
+  payment_hash: 'Payment Hash like a treasure map, arrr',
+  fee: 'Fee like a toll to cross a strait, matey',
+  amount: 'Amount of doubloons, arrr',
+  unit: 'Unit of measurement like a fathom, ye buccaneer',
+  description: 'Description like a tale of adventure, arrr',
+  expiry: 'Expiry like the food on a ship, ye landlubber',
+  webhook: 'Webhook like a fishing line, arrr',
+  payment_proof: 'Payment Proof like a seal of authenticity, argh'
+}

lnbits/static/i18n/pl.js

@@ -0,0 +1,89 @@
+window.localisation.pl = {
+  server: 'Serwer',
+  theme: 'Motyw',
+  funding: 'Finansowanie',
+  users: 'Użytkownicy',
+  restart: 'Restart serwera',
+  save: 'Zapisz',
+  save_tooltip: 'Zapisz zmiany',
+  topup: 'Doładowanie',
+  topup_wallet: 'Doładuj portfel',
+  topup_hint: 'Użyj ID portfela aby go doładować',
+  restart_tooltip: 'Zrestartuj serwer aby aktywować zmiany',
+  add_funds_tooltip: 'Dodaj środki do portfela.',
+  reset_defaults: 'Powrót do ustawień domyślnych',
+  reset_defaults_tooltip: 'Wymaż wszystkie ustawienia i ustaw domyślne.',
+  download_backup: 'Pobierz kopię zapasową bazy danych',
+  name_your_wallet: 'Nazwij swój portfel %{name}',
+  paste_invoice_label: 'Wklej fakturę, żądanie zapłaty lub kod lnurl *',
+  lnbits_description:
+    'Łatwy i lekki w konfiguracji, LNbits może działać w oparciu o dowolne źródło finansowania w sieci lightning, obecnie wspiera LND, Core Lightning, OpenNode, LNPay czy nawet inną instancję LNbits! Możesz uruchomić instancję LNbits dla siebie lub dla innych. Każdy portfel ma swoje klucze API i nie ma ograniczeń jeśli chodzi o ilość portfeli. LNbits umożliwia dzielenie środków w celu zarządzania nimi, jest również dobrym narzędziem deweloperskim. Rozszerzenia zwiększają funkcjonalność LNbits co umożliwia eksperymentowanie z nowym technologiami w sieci lightning. Tworzenie rozszerzeń jest proste dlatego zachęcamy innych deweloperów do tworzenia dodatkowych funkcjonalności i wysyłanie do nas PR',
+  export_to_phone: 'Eksport kodu QR na telefon',
+  export_to_phone_desc:
+    'Ten kod QR zawiera adres URL Twojego portfela z pełnym dostępem do niego. Możesz go zeskanować na swoim telefonie aby otworzyć na nim ten portfel.',
+  wallets: 'Portfele',
+  add_wallet: 'Dodaj portfel',
+  delete_wallet: 'Usuń portfel',
+  delete_wallet_desc:
+    'Ten portfel zostanie usunięty, środków na nim zgromadzonych NIE BĘDZIE MOŻNA ODZYSKAĆ.',
+  rename_wallet: 'Zmień nazwę portfela',
+  update_name: 'Zaktualizuj nazwę',
+  press_to_claim: 'Naciśnij aby odebrać Bitcoiny',
+  donate: 'Podaruj',
+  view_github: 'Otwórz GitHub',
+  voidwallet_active: 'VoidWallet jest aktywny! Płatności są niemożliwe',
+  use_with_caution: 'KORZYSTAJ Z ROZWAGĄ - portfel %{name} jest w wersji BETA',
+  toggle_darkmode: 'Tryb nocny',
+  view_swagger_docs: 'Dokumentacja Swagger API',
+  api_docs: 'Dokumentacja API',
+  commit_version: 'Commit',
+  lnbits_version: 'Wersja LNbits',
+  runs_on: 'Działa na',
+  credit_hint: 'Naciśnij Enter aby doładować konto',
+  credit_label: '%{denomination} doładowanie',
+  paste_request: 'Wklej żądanie',
+  create_invoice: 'Utwórz fakturę',
+  camera_tooltip: 'Użyj kamery aby zeskanować fakturę lub kod QR',
+  export_csv: 'Eksport do CSV',
+  transactions: 'Transakcje',
+  chart_tooltip: 'Wykres',
+  pending: 'W toku',
+  copy_invoice: 'Skopiuj fakturę',
+  close: 'Zamknij',
+  cancel: 'Anuluj',
+  scan: 'Skanuj',
+  read: 'Odczytaj',
+  pay: 'Zapłać',
+  memo: 'Memo',
+  date: 'Data',
+  processing_payment: 'Przetwarzam płatność...',
+  not_enough_funds: 'Brak wystarczających środków!',
+  search_by_tag_memo_amount: 'Szukaj po tagu, memo czy wartości',
+  invoice_waiting: 'Faktura oczekuje na zapłatę',
+  payment_received: 'Otrzymano płatność',
+  payment_sent: 'Wysłano płatność',
+  receive: 'odbierać',
+  send: 'wysłać',
+  outgoing_payment_pending: 'Płatność wychodząca w toku',
+  drain_funds: 'Opróżnij środki',
+  drain_funds_desc:
+    'To jest kod QR służący do opróżnienia portfela (LNURL-withdraw). Nie udostępniaj go nikomu. Ten kod jest kompatybilny z funkcjami, które umożliwiają wielokrotne żądania aż do zupełnego opróżnienia portfela.',
+  i_understand: 'Rozumiem',
+  copy_wallet_url: 'Skopiuj URL portfela',
+  disclaimer_dialog:
+    'Funkcja logowania zostanie uruchomiona w przyszłości. Póki co upewnij się, że zapisałeś adres URL tej strony aby mieć dostęp do tego portfela. Nie udostępniaj adresu tej strony nikomu, kto nie ma mieć do tego portfela dostępu! Ta usługa działa w wersji BETA, nie odpowiadamy za utratę dostępu do środków przez osoby używające LNbits.',
+  no_transactions: 'Brak transakcji',
+  manage_extensions: 'Zarządzaj rozszerzeniami',
+  manage_server: 'Zarządzaj serwerem',
+  extensions: 'Rozszerzenia',
+  no_extensions: 'Nie masz zainstalowanych żadnych rozszerzeń :(',
+  created: 'Utworzono',
+  payment_hash: 'Hash Płatności',
+  fee: 'Opłata',
+  amount: 'Wartość',
+  unit: 'Jednostka',
+  description: 'Opis',
+  expiry: 'Wygasa',
+  webhook: 'Webhook',
+  payment_proof: 'Potwierdzenie płatności'
+}

lnbits/static/i18n/pt.js

@@ -0,0 +1,90 @@
+window.localisation.pt = {
+  server: 'Servidor',
+  theme: 'Tema',
+  funding: 'Financiamento',
+  users: 'Usuários',
+  restart: 'Reiniciar servidor',
+  save: 'Gravar',
+  save_tooltip: 'Gravar as alterações',
+  topup: 'Reforçar conta',
+  topup_wallet: 'Recarregar uma carteira',
+  topup_hint: 'Use o ID da carteira para recarregar qualquer carteira',
+  restart_tooltip: 'Reinicie o servidor para que as alterações tenham efeito',
+  add_funds_tooltip: 'Adicionar fundos a uma carteira.',
+  reset_defaults: 'Redefinir para padrões',
+  reset_defaults_tooltip:
+    'Apagar todas as configurações e redefinir para os padrões.',
+  download_backup: 'Fazer backup da base de dados',
+  name_your_wallet: 'Nomeie sua carteira %{name}',
+  paste_invoice_label: 'Cole uma fatura, pedido de pagamento ou código lnurl *',
+  lnbits_description:
+    'Fácil de configurar e leve, o LNbits pode ser executado em qualquer fonte de financiamento da lightning-network, atualmente suportando LND, c-lightning, OpenNode, LNPay e até mesmo o LNbits em si! Você pode executar o LNbits para si mesmo ou oferecer facilmente uma solução de custódia para outros. Cada carteira tem suas próprias chaves de API e não há limite para o número de carteiras que você pode criar. Ser capaz de particionar fundos torna o LNbits uma ferramenta útil para gerenciamento de dinheiro e como uma ferramenta de desenvolvimento. As extensões adicionam funcionalidades extras ao LNbits para que você possa experimentar uma série de tecnologias de ponta na rede lightning. Nós tornamos o desenvolvimento de extensões o mais fácil possível e, como um projeto gratuito e de código aberto, incentivamos as pessoas a desenvolver e enviar as suas próprias.',
+  export_to_phone: 'Exportar para o telefone com código QR',
+  export_to_phone_desc:
+    'Este código QR contém a URL da sua carteira com acesso total. Você pode escaneá-lo do seu telefone para abrir sua carteira a partir dele.',
+  wallets: 'Carteiras',
+  add_wallet: 'Adicionar nova carteira',
+  delete_wallet: 'Excluir carteira',
+  delete_wallet_desc:
+    'Toda a carteira será excluída, os fundos serão IRRECUPERÁVEIS.',
+  rename_wallet: 'Renomear carteira',
+  update_name: 'Atualizar nome',
+  press_to_claim: 'Pressione para solicitar bitcoin',
+  donate: 'Doar',
+  view_github: 'Ver no GitHub',
+  voidwallet_active: 'VoidWallet está ativo! Pagamentos desabilitados',
+  use_with_caution: 'USE COM CAUTELA - a carteira %{name} ainda está em BETA',
+  toggle_darkmode: 'Alternar modo escuro',
+  view_swagger_docs: 'Ver a documentação da API do LNbits Swagger',
+  api_docs: 'Documentação da API',
+  commit_version: 'Versão de commit',
+  lnbits_version: 'Versão do LNbits',
+  runs_on: 'Executa em',
+  credit_hint: 'Pressione Enter para creditar a conta',
+  credit_label: '%{denomination} para creditar',
+  paste_request: 'Colar Pedido',
+  create_invoice: 'Criar Fatura',
+  camera_tooltip: 'Usar a câmara para escanear uma fatura / QR',
+  export_csv: 'Exportar para CSV',
+  transactions: 'Transações',
+  chart_tooltip: 'Mostrar gráfico',
+  pending: 'Pendente',
+  copy_invoice: 'Copiar fatura',
+  close: 'Fechar',
+  cancel: 'Cancelar',
+  scan: 'Escanear',
+  read: 'Ler',
+  pay: 'Pagar',
+  memo: 'Memo',
+  date: 'Data',
+  processing_payment: 'Processando pagamento...',
+  not_enough_funds: 'Fundos insuficientes!',
+  search_by_tag_memo_amount: 'Pesquisar por tag, memo, quantidade',
+  invoice_waiting: 'Fatura aguardando pagamento',
+  payment_received: 'Pagamento Recebido',
+  payment_sent: 'Pagamento Enviado',
+  receive: 'receber',
+  send: 'enviar',
+  outgoing_payment_pending: 'Pagamento de saída pendente',
+  drain_funds: 'Esvasiar carteira',
+  drain_funds_desc:
+    'Este é um código QR de saque LNURL para sacar tudo desta carteira. Não o partilhe com ninguém. É compatível com balanceCheck e balanceNotify para que a sua carteira possa continuar levantando os fundos continuamente daqui após o primeiro saque.',
+  i_understand: 'Eu entendo',
+  copy_wallet_url: 'Copiar URL da carteira',
+  disclaimer_dialog:
+    'Funcionalidade de login a ser lançada numa atualização futura, por enquanto, certifique-se que marca esta página para acesso futuro à sua carteira! Este serviço está em BETA, e não nos responsabilizamos por pessoas que perderem o acesso aos fundos.',
+  no_transactions: 'Ainda não foram feitas transações',
+  manage_extensions: 'Gerir extensões',
+  manage_server: 'Gerir servidor',
+  extensions: 'Extensões',
+  no_extensions: 'Não há nenhuma extensão instalada :(',
+  created: 'Criado',
+  payment_hash: 'Hash de pagamento',
+  fee: 'Taxa',
+  amount: 'Quantidade',
+  unit: 'Unidade',
+  description: 'Descrição',
+  expiry: 'Validade',
+  webhook: 'Webhook',
+  payment_proof: 'Comprovativo de pagamento'
+}

lnbits/static/i18n/we.js

@@ -0,0 +1,90 @@
+window.localisation.we = {
+  server: 'Gweinydd',
+  theme: 'Thema',
+  funding: 'Arian fyndio',
+  users: 'Defnyddwyr',
+  restart: 'Ailgychwyn gweinydd',
+  save: 'Save',
+  save_tooltip: 'cadw eich newidiadau',
+  topup: 'Topup',
+  topup_wallet: 'Atodi waled',
+  topup_hint: 'Defnyddiwch ID y waled i ychwanegu at unrhyw waled',
+  restart_tooltip: 'Ailgychwyn y gweinydd er mwyn i newidiadau ddod i rym',
+  add_funds_tooltip: 'Ychwanegu arian at waled.',
+  reset_defaults: 'Ailosod i`r rhagosodiadau',
+  reset_defaults_tooltip: 'Dileu pob gosodiad ac ailosod i`r rhagosodiadau.',
+  download_backup: 'Lawrlwytho copi wrth gefn cronfa ddata',
+  name_your_wallet: 'Enwch eich waled %{name}',
+  paste_invoice_label: 'Gludwch anfoneb, cais am daliad neu god lnurl *',
+  lnbits_description:
+    'Yn hawdd iw sefydlu ac yn ysgafn, gall LNbits redeg ar unrhyw ffynhonnell ariannu rhwydwaith mellt, ar hyn o bryd yn cefnogi LND, Core Lightning, OpenNode, LNPay a hyd yn oed LNbits ei hun! Gallwch redeg LNbits i chi`ch hun, neu gynnig datrysiad ceidwad i eraill yn hawdd. Mae gan bob waled ei allweddi API ei hun ac nid oes cyfyngiad ar nifer y waledi y gallwch eu gwneud. Mae gallu rhannu cronfeydd yn gwneud LNbits yn arf defnyddiol ar gyfer rheoli arian ac fel offeryn datblygu. Mae estyniadau yn ychwanegu ymarferoldeb ychwanegol at LNbits fel y gallwch arbrofi gydag ystod o dechnolegau blaengar ar y rhwydwaith mellt. Rydym wedi gwneud datblygu estyniadau mor hawdd â phosibl, ac fel prosiect ffynhonnell agored am ddim, rydym yn annog pobl i ddatblygu a chyflwyno eu rhai eu hunain.',
+  export_to_phone: 'Allforio i Ffôn gyda chod QR',
+  export_to_phone_desc:
+    'Mae`r cod QR hwn yn cynnwys URL eich waled gyda mynediad llawn. Gallwch ei sganio o`ch ffôn i agor eich waled oddi yno.',
+  waledi: 'Waledi',
+  add_wallet: 'Ychwanegu waled newydd',
+  delete_wallet: 'Dileu waled',
+  delete_wallet_desc:
+    'Bydd y waled gyfan hon yn cael ei dileu, ni fydd modd adennill yr arian.',
+  rename_wallet: 'Ailenwi waled',
+  update_name: 'Diweddaru enw',
+  press_to_claim: 'Pwyswch i hawlio bitcoin',
+  Donate: 'Rhoi',
+  view_github: 'Gweld ar GitHub',
+  voidwallet_active:
+    ' Mae VoidWallet yn weithredol! Taliadau wedi`u hanalluogi',
+  use_with_caution: 'DEFNYDDIO GYDA GOFAL - mae waled %{name} yn dal yn BETA',
+  toggle_darkmode: 'Toglo Modd Tywyll',
+  view_swagger_docs: 'Gweld dogfennau API LNbits Swagger',
+  api_docs: 'Api docs',
+  commit_version: 'fersiwn ymrwymo',
+  lnbits_version: 'Fersiwn LNbits',
+  Runs_on: 'Yn rhedeg ymlaen',
+  credit_hint: 'Pwyswch Enter i gyfrif credyd',
+  credit_label: '%{enomination} i gredyd',
+  paste_request: 'Gludo Cais',
+  create_invoice: 'Creu Anfoneb',
+  camera_tooltip: 'Defnyddio camera i sganio anfoneb/QR',
+  export_csv: 'Allforio i CSV',
+  trafodion: 'Trafodion',
+  chart_tooltip: 'Dangos siart',
+  pending: 'yn yr arfaeth',
+  copy_invoice: 'Copi anfoneb',
+  Close: 'cau',
+  cancel: 'Canslo',
+  scan: 'Sgan',
+  read: 'Darllen',
+  talu: 'Pay',
+  memo: 'Memo',
+  date: 'Dyddiad',
+  processing_payment: 'Prosesu taliad...',
+  not_enough_funds: 'Dim digon o arian!',
+  search_by_tag_memo_amount: 'Chwilio yn ôl tag, memo, swm',
+  invoice_waiting: 'Anfoneb yn aros i gael ei thalu',
+  payment_received: 'Taliad a Dderbyniwyd',
+  payment_sent: 'Taliad a Anfonwyd',
+  receive: 'derbyn',
+  send: 'anfon',
+  outgoing_payment_pending: 'Taliad sy`n aros yn yr arfaeth',
+  drain_funds: 'Cronfeydd Draenio',
+  drain_funds_desc:
+    'Cod QR Tynnu`n ôl LNURL yw hwn ar gyfer slurpio popeth o`r waled hon. Peidiwch â rhannu gyda neb. Mae`n gydnaws â balanceCheck a balanceNotify felly efallai y bydd eich waled yn tynnu`r arian yn barhaus o`r fan hon ar ôl y codiad cyntaf.',
+  i_understand: 'Rwy`n deall',
+  copy_wallet_url: 'Copi URL waled',
+  disclaimer_dialog:
+    'Swyddogaeth mewngofnodi i`w ryddhau mewn diweddariad yn y dyfodol, am y tro, gwnewch yn siŵr eich bod yn rhoi nod tudalen ar y dudalen hon ar gyfer mynediad i`ch waled yn y dyfodol! Mae`r gwasanaeth hwn yn BETA, ac nid ydym yn gyfrifol am bobl sy`n colli mynediad at arian.',
+  no_transactions: 'Dim trafodion wedi`u gwneud eto',
+  manage_extensions: 'Rheoli Estyniadau',
+  manage_server: 'Rheoli Gweinydd',
+  Extensions: 'Estyniadau',
+  no_extensions: "Nid oes gennych unrhyw estyniadau wedi'u gosod :(",
+  create: 'Crëwyd',
+  payment_hash: 'Hais Taliad',
+  fee: 'Fee',
+  amount: 'swm',
+  unit: 'Uned',
+  description: 'Disgrifiad',
+  expiry: 'dod i ben',
+  webhook: 'bachyn we',
+  payment_proof: 'prawf taliad'
+}

lnbits/static/js/base.js

@@ -1,6 +1,14 @@
 /* globals crypto, moment, Vue, axios, Quasar, _ */
 
+Vue.use(VueI18n)
+
 window.LOCALE = 'en'
+window.i18n = new VueI18n({
+  locale: window.LOCALE,
+  fallbackLocale: window.LOCALE,
+  messages: window.localisation
+})
+
 window.EventHub = new Vue()
 window.LNbits = {
   api: {
@@ -59,8 +67,13 @@ window.LNbits = {
     getWallet: function (wallet) {
       return this.request('get', '/api/v1/wallet', wallet.inkey)
     },
-    getPayments: function (wallet) {
-      return this.request('get', '/api/v1/payments', wallet.inkey)
+    getPayments: function (wallet, query) {
+      const params = new URLSearchParams(query)
+      return this.request(
+        'get',
+        '/api/v1/payments/paginated?' + params,
+        wallet.inkey
+      )
     },
     getPayment: function (wallet, paymentHash) {
       return this.request(
@@ -165,7 +178,8 @@ window.LNbits = {
         id: data.id,
         name: data.name,
         adminkey: data.adminkey,
-        inkey: data.inkey
+        inkey: data.inkey,
+        currency: data.currency
       }
       newWallet.msat = data.balance_msat
       newWallet.sat = Math.round(data.balance_msat / 1000)
@@ -177,7 +191,7 @@ window.LNbits = {
     },
     payment: function (data) {
       obj = {
-        checking_id: data.id,
+        checking_id: data.checking_id,
         pending: data.pending,
         amount: data.amount,
         fee: data.fee,
@@ -190,7 +204,9 @@ window.LNbits = {
         extra: data.extra,
         wallet_id: data.wallet_id,
         webhook: data.webhook,
-        webhook_status: data.webhook_status
+        webhook_status: data.webhook_status,
+        fiat_amount: data.fiat_amount,
+        fiat_currency: data.fiat_currency
       }
 
       obj.date = Quasar.utils.date.formatDate(
@@ -228,6 +244,15 @@ window.LNbits = {
         }
       })
     },
+    digestMessage: async function (message) {
+      const msgUint8 = new TextEncoder().encode(message)
+      const hashBuffer = await crypto.subtle.digest('SHA-256', msgUint8)
+      const hashArray = Array.from(new Uint8Array(hashBuffer))
+      const hashHex = hashArray
+        .map(b => b.toString(16).padStart(2, '0'))
+        .join('')
+      return hashHex
+    },
     formatCurrency: function (value, currency) {
       return new Intl.NumberFormat(window.LOCALE, {
         style: 'currency',
@@ -320,6 +345,7 @@ window.LNbits = {
 }
 
 window.windowMixin = {
+  i18n: window.i18n,
   data: function () {
     return {
       g: {
@@ -329,12 +355,20 @@ window.windowMixin = {
         user: null,
         wallet: null,
         payments: [],
-        allowedThemes: null
+        allowedThemes: null,
+        langs: []
       }
     }
   },
 
   methods: {
+    activeLanguage: function (lang) {
+      return window.i18n.locale === lang
+    },
+    changeLanguage: function (newValue) {
+      window.i18n.locale = newValue
+      this.$q.localStorage.set('lnbits.lang', newValue)
+    },
     changeColor: function (newValue) {
       document.body.setAttribute('data-theme', newValue)
       this.$q.localStorage.set('lnbits.theme', newValue)
@@ -364,6 +398,14 @@ window.windowMixin = {
     }
     this.g.allowedThemes = window.allowedThemes ?? ['bitcoin']
 
+    let locale = this.$q.localStorage.getItem('lnbits.lang')
+    if (locale) {
+      window.LOCALE = locale
+      window.i18n.locale = locale
+    }
+
+    this.g.langs = window.langs ?? []
+
     addEventListener('offline', event => {
       this.g.offline = true
     })

lnbits/static/js/bolt11-decoder.js

@@ -22,7 +22,7 @@ function decode(paymentRequest) {
 }
 
 function decodeHumanReadablePart(humanReadablePart) {
-  let prefixes = ['lnbc', 'lntb', 'lnbcrt', 'lnsb']
+  let prefixes = ['lnbc', 'lntb', 'lnbcrt', 'lnsb', 'lntbs']
   let prefix
   prefixes.forEach(value => {
     if (humanReadablePart.substring(0, value.length) === value) {