Merge branch 'dev'

.env.example

@@ -1,34 +1,11 @@
 #For more information on .env files, their content and format: https://pypi.org/project/python-dotenv/
 
-######################################
-########### Admin Settings ###########
-######################################
-
-# Enable Admin GUI, available for the first user in LNBITS_ADMIN_USERS if available.
-# Warning: Enabling this will make LNbits ignore most configurations in file. Only the
-# configurations defined in `ReadOnlySettings` will still be read from the environment variables.
-# The rest of the settings will be stored in your database and you will be able to change them
-# only  through the Admin UI.
-# Disable this to make LNbits use this config file again.
-LNBITS_ADMIN_UI=false
-
-# Change theme
-LNBITS_SITE_TITLE="LNbits"
-LNBITS_SITE_TAGLINE="free and open-source lightning wallet"
-LNBITS_SITE_DESCRIPTION="Some description about your service, will display if title is not 'LNbits'"
-# Choose from bitcoin, mint, flamingo, freedom, salvador, autumn, monochrome, classic, cyber
-LNBITS_THEME_OPTIONS="classic, bitcoin, flamingo, freedom, mint, autumn, monochrome, salvador, cyber"
-# LNBITS_CUSTOM_LOGO="https://lnbits.com/assets/images/logo/logo.svg"
-
-HOST=127.0.0.1
-PORT=5000
-
 ######################################
 ########## Funding Source ############
 ######################################
 
 # which fundingsources are allowed in the admin ui
-LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, AlbyWallet, ZBDWallet, OpenNodeWallet"
+LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, AlbyWallet, OpenNodeWallet"
 
 LNBITS_BACKEND_WALLET_CLASS=VoidWallet
 # VoidWallet is just a fallback that works without any actual Lightning capabilities,
@@ -84,10 +61,6 @@ LNPAY_WALLET_KEY=LNPAY_ADMIN_KEY
 ALBY_API_ENDPOINT=https://api.getalby.com/
 ALBY_ACCESS_TOKEN=ALBY_ACCESS_TOKEN
 
-# ZBDWallet
-ZBD_API_ENDPOINT=https://api.zebedee.io/v0/
-ZBD_API_KEY=ZBD_ACCESS_TOKEN
-
 # OpenNodeWallet
 OPENNODE_API_ENDPOINT=https://api.opennode.com/
 OPENNODE_KEY=OPENNODE_ADMIN_KEY
@@ -105,34 +78,48 @@ ECLAIR_PASS=eclairpw
 LNTIPS_API_KEY=LNTIPS_ADMIN_KEY
 LNTIPS_API_ENDPOINT=https://ln.tips
 
+######################################
+########### Admin Settings ###########
+######################################
+
+# Enable Admin GUI, available for the first user in LNBITS_ADMIN_USERS if available
+# Warning: Enabling this will make LNbits ignore this configuration file. Your settings will
+# be stored in your database and you will be able to change them only through the Admin UI.
+# Disable this to make LNbits use this config file again.
+LNBITS_ADMIN_UI=false
+
+# Change theme
+LNBITS_SITE_TITLE="LNbits"
+LNBITS_SITE_TAGLINE="free and open-source lightning wallet"
+LNBITS_SITE_DESCRIPTION="Some description about your service, will display if title is not 'LNbits'"
+# Choose from bitcoin, mint, flamingo, freedom, salvador, autumn, monochrome, classic, cyber
+LNBITS_THEME_OPTIONS="classic, bitcoin, flamingo, freedom, mint, autumn, monochrome, salvador, cyber"
+# LNBITS_CUSTOM_LOGO="https://lnbits.com/assets/images/logo/logo.svg"
+
+HOST=127.0.0.1
+PORT=5000
+
 ######################################
 ####### Auth Configurations ##########
 ######################################
 # Secret Key: will default to the hash of the super user. It is strongly recommended that you set your own value.
 AUTH_SECRET_KEY=""
 AUTH_TOKEN_EXPIRE_MINUTES=525600
-# Possible authorization methods: user-id-only, username-password, google-auth, github-auth, keycloak-auth
+# Possible authorization methods: user-id-only, username-password, google-auth, github-auth
 AUTH_ALLOWED_METHODS="user-id-only, username-password"
 # Set this flag if HTTP is used for OAuth
 # OAUTHLIB_INSECURE_TRANSPORT="1"
 
 # Google OAuth Config
-# Make sure that the authorized redirect URIs contain https://{domain}/api/v1/auth/google/token
+# Make sure thant the authorized redirect URIs contain https://{domain}/api/v1/auth/google/token
 GOOGLE_CLIENT_ID=""
 GOOGLE_CLIENT_SECRET=""
 
 # GitHub OAuth Config
-# Make sure that the authorization callback URL is set to https://{domain}/api/v1/auth/github/token
+# Make sure thant the authorization callback URL is set to https://{domain}/api/v1/auth/github/token
 GITHUB_CLIENT_ID=""
 GITHUB_CLIENT_SECRET=""
 
-# Keycloak OAuth Config
-# Make sure that the valid redirect URIs contain https://{domain}/api/v1/auth/keycloak/token
-KEYCLOAK_CLIENT_ID=""
-KEYCLOAK_CLIENT_SECRET=""
-KEYCLOAK_DISCOVERY_URL=""
-
-
 ######################################
 
 # uvicorn variable, uncomment to allow https behind a proxy
@@ -211,13 +198,6 @@ LNBITS_RESERVE_FEE_MIN=2000
 # value in percent
 LNBITS_RESERVE_FEE_PERCENT=1.0
 
-# limit the maximum balance for each wallet
-# throw an error if the wallet attempts to create a new invoice
-
-# LNBITS_WALLET_LIMIT_MAX_BALANCE=1000000
-# LNBITS_WALLET_LIMIT_DAILY_MAX_WITHDRAW=1000000
-# LNBITS_WALLET_LIMIT_SECS_BETWEEN_TRANS=60
-
 # Limit fiat currencies allowed to see in UI
 # LNBITS_ALLOWED_CURRENCIES="EUR, USD"
 
@@ -226,7 +206,6 @@ LNBITS_RESERVE_FEE_PERCENT=1.0
 ######################################
 
 DEBUG=false
-DEBUG_DATABASE=false
 BUNDLE_ASSETS=true
 
 # logging into LNBITS_DATA_FOLDER/logs/

.github/workflows/ci.yml

@@ -48,13 +48,3 @@ jobs:
     with:
       python-version: ${{ matrix.python-version }}
       backend-wallet-class: ${{ matrix.backend-wallet-class }}
-
-  jmeter:
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.5.1"]
-    uses: ./.github/workflows/jmeter.yml
-    with:
-      python-version: ${{ matrix.python-version }}
-      poetry-version: ${{ matrix.poetry-version }}

.github/workflows/docker.yml

@@ -1,11 +1,6 @@
 name: docker
 
 on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        default: latest
-        type: string
   workflow_call:
     inputs:
       tag:
@@ -43,7 +38,7 @@ jobs:
             context: .
             push: true
             tags: ${{ secrets.DOCKER_USERNAME }}/lnbits:${{ inputs.tag }}
-            platforms: linux/amd64,linux/arm64
+            platforms: [ linux/amd64, linux/arm64 ]
             cache-from: type=local,src=/tmp/.buildx-cache
             cache-to: type=local,dest=/tmp/.buildx-cache
 
@@ -53,6 +48,6 @@ jobs:
             context: .
             push: true
             tags: ${{ secrets.DOCKER_USERNAME }}/lnbits:latest
-            platforms: linux/amd64,linux/arm64
+            platforms: [ linux/amd64, linux/arm64 ]
             cache-from: type=local,src=/tmp/.buildx-cache
             cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/jmeter.yml

@@ -1,98 +0,0 @@
-name: JMeter Tests
-
-on:
-  workflow_call:
-    inputs:
-      python-version:
-        description: "Python Version"
-        required: true
-        default: "3.9"
-        type: string
-      poetry-version:
-        description: "Poetry Version"
-        required: true
-        default: "1.5.1"
-        type: string
-
-jobs:
-  action_build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python ${{ inputs.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ inputs.python-version }}
-          cache: "pip"
-
-      - name: Set up Poetry ${{ inputs.poetry-version }}
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ inputs.poetry-version }}
-
-      - name: create logs and reports dir
-        run: |
-          mkdir logs
-          mkdir reports
-
-      - name: install packages
-        run: poetry install
-
-      - name: run LNbits
-        env:
-          LNBITS_ADMIN_UI: true
-          LNBITS_EXTENSIONS_DEFAULT_INSTALL: "watchonly, satspay, tipjar, tpos, lnurlp, withdraw"
-          LNBITS_BACKEND_WALLET_CLASS: FakeWallet
-        run: |
-          poetry run lnbits > logs/lnbits.log &
-          sleep 5
-
-
-      - name: install jmeter
-        run: |
-          java -version
-          wget https://downloads.apache.org//jmeter/binaries/apache-jmeter-5.6.2.zip
-          unzip apache-jmeter-5.6.2.zip
-          $GITHUB_WORKSPACE/apache-jmeter-5.6.2/bin/jmeter -v
-
-      - name: start mirror server
-        run: |
-          libs_dir=$GITHUB_WORKSPACE/apache-jmeter-5.6.2/lib/
-          echo "Fix bad Jmeter lib names. Lib dir: $libs_dir"
-
-          mv $libs_dir/slf4j-api-1.7.36.jar $libs_dir/slf4j-api-1.7.25.jar
-          mv $libs_dir/log4j-slf4j-impl-2.20.0.jar $libs_dir/log4j-slf4j-impl-2.11.0.jar
-          mv $libs_dir/log4j-api-2.20.0.jar $libs_dir/log4j-api-2.11.1.jar
-          mv $libs_dir/log4j-core-2.20.0.jar $libs_dir/log4j-core-2.11.1.jar
-          mv $libs_dir/log4j-1.2-api-2.20.0.jar $libs_dir/og4j-1.2-api-2.11.1.jar
-
-          echo "Starting the mirror server on dfault port 8081."
-          $GITHUB_WORKSPACE/apache-jmeter-5.6.2/bin/mirror-server &
-
-      - name: run jmx scripts
-        run: |
-          for file in $( ls $GITHUB_WORKSPACE/integration/*.jmx); do
-            echo "Running test with $file"
-            filename=$(basename "$file" ".jmx")
-            $GITHUB_WORKSPACE/apache-jmeter-5.6.2/bin/jmeter -n -t $file -l logs/$filename.log -e -o reports ;
-            error_count=$(cat jmeter.log | grep "summary =" | awk '{print $19}')
-            echo "Error count: $error_count"
-            if [[ "$error_count" == "0" ]]; then
-              echo "Test $filename OK."
-              rm -r reports/*
-            else
-              echo "Test $filename failed. Error count: $error_count."
-              exit 1
-            fi
-          done
-
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: jmeter-test-results
-          path: |
-            reports/
-            logs/
-

.github/workflows/regtest.yml

@@ -33,8 +33,8 @@ jobs:
         with:
             context: .
             push: false
-            tags: lnbits/lnbits:latest
-            cache-from: type=registry,ref=lnbits/lnbits:latest
+            tags: lnbitsdocker/lnbits-legend:latest
+            cache-from: type=registry,ref=lnbitsdocker/lnbits-legend:latest
             cache-to: type=inline
 
       - name: Setup Regtest
@@ -51,7 +51,7 @@ jobs:
 
       - name: Create fake admin
         if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
-        run: docker exec lnbits-lnbits-1 poetry run python tools/create_fake_admin.py
+        run: docker exec lnbits-legend-lnbits-1 poetry run python tools/create_fake_admin.py
 
       - name: Run Tests
         env:

.github/workflows/release.yml

@@ -13,7 +13,6 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - name: Create github release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.pre-commit-config.yaml

@@ -14,11 +14,11 @@ repos:
       - id: mixed-line-ending
       - id: check-case-conflict
   - repo: https://github.com/psf/black
-    rev: 24.2.0
+    rev: 23.7.0
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.2
+    rev: v0.0.283
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix ]

Dockerfile

@@ -2,7 +2,7 @@ FROM python:3.10-slim-bullseye
 
 RUN apt-get clean
 RUN apt-get update
-RUN apt-get install -y curl pkg-config build-essential libnss-myhostname
+RUN apt-get install -y curl pkg-config build-essential
 
 RUN curl -sSL https://install.python-poetry.org | python3 -
 ENV PATH="/root/.local/bin:$PATH"

Makefile

@@ -86,7 +86,7 @@ bak:
 sass:
 	npm run sass
 
-bundle:
+bundle_no_bump:
 	npm install
 	npm run sass
 	npm run vendor_copy
@@ -97,10 +97,16 @@ bundle:
 	npm run vendor_bundle_js
 	npm run vendor_minify_js
 
+bundle:
+	make bundle_no_bump
+	# increment serviceworker version
+	awk '/CACHE_VERSION =/ {sub(/[0-9]+$$/, $$NF+1)} 1' lnbits/static/js/service-worker.js > lnbits/static/js/service-worker.js.new
+	mv lnbits/static/js/service-worker.js.new lnbits/static/js/service-worker.js
+
 checkbundle:
 	cp lnbits/static/bundle.min.js lnbits/static/bundle.min.js.old
 	cp lnbits/static/bundle.min.css lnbits/static/bundle.min.css.old
-	make bundle
+	make bundle_no_bump
 	diff -q lnbits/static/bundle.min.js lnbits/static/bundle.min.js.old || exit 1
 	diff -q lnbits/static/bundle.min.css lnbits/static/bundle.min.css.old || exit 1
 	@echo "Bundle is OK"

README.md

@@ -29,7 +29,6 @@ LNbits can run on top of any Lightning funding source. It currently supports the
 - LNbits
 - OpenNode
 - Alby
-- ZBD
 - LightningTipBot
 
 See [LNbits manual](https://docs.lnbits.org/guide/wallets.html) for more detailed documentation about each funding source.

docs/guide/installation.md

@@ -101,19 +101,19 @@ SUPER_USER=be54db7f245346c8833eaa430e1e0405 LNBITS_ADMIN_UI=true ./result/bin/ln
 
 use latest version from docker hub
 ```sh
-docker pull lnbits/lnbits
+docker pull lnbitsdocker/lnbits-legend
 wget https://raw.githubusercontent.com/lnbits/lnbits/main/.env.example -O .env
 mkdir data
-docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits/lnbits
+docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbitsdocker/lnbits-legend
 ```
 build the image yourself
 ```sh
 git clone https://github.com/lnbits/lnbits.git
 cd lnbits
-docker build -t lnbits/lnbits .
+docker build -t lnbitsdocker/lnbits-legend .
 cp .env.example .env
 mkdir data
-docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits/lnbits
+docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbitsdocker/lnbits-legend
 ```
 
 ## Option 4: Fly.io

docs/guide/wallets.md

@@ -87,14 +87,6 @@ For the invoice to work you must have a publicly accessible URL in your LNbits.
 - `ALBY_API_ENDPOINT`: https://api.getalby.com/
 - `ALBY_ACCESS_TOKEN`: AlbyAccessToken
 
-### ZBD
-
-For the invoice to work you must have a publicly accessible URL in your LNbits. No manual webhook setting is necessary. You can generate an ZBD API Key here: https://zbd.dev/docs/dashboard/projects/api
-
-- `LNBITS_BACKEND_WALLET_CLASS`: **ZBDWallet**
-- `ZBD_API_ENDPOINT`: https://api.zebedee.io/v0/
-- `ZBD_API_KEY`: ZBDApiKey
-
 ### Cliche Wallet
 
 - `CLICHE_ENDPOINT`: ws://127.0.0.1:12000

integration/fragments/init-account.jmx

@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.5">
-  <hashTree>
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Test Fragment" enabled="false"/>
-    <hashTree>
-      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Init Account" enabled="true"/>
-      <hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[wallet] Get main page" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${host}</stringProp>
-          <stringProp name="HTTPSampler.port">${port}</stringProp>
-          <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-            <collectionProp name="HeaderManager.headers">
-              <elementProp name="Accept-Language" elementType="Header">
-                <stringProp name="Header.name">Accept-Language</stringProp>
-                <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-              </elementProp>
-              <elementProp name="Upgrade-Insecure-Requests" elementType="Header">
-                <stringProp name="Header.name">Upgrade-Insecure-Requests</stringProp>
-                <stringProp name="Header.value">1</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Encoding" elementType="Header">
-                <stringProp name="Header.name">Accept-Encoding</stringProp>
-                <stringProp name="Header.value">gzip, deflate</stringProp>
-              </elementProp>
-              <elementProp name="User-Agent" elementType="Header">
-                <stringProp name="Header.name">User-Agent</stringProp>
-                <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:105.0) Gecko/20100101 Firefox/105.0</stringProp>
-              </elementProp>
-              <elementProp name="Accept" elementType="Header">
-                <stringProp name="Header.name">Accept</stringProp>
-                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8</stringProp>
-              </elementProp>
-            </collectionProp>
-          </HeaderManager>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">8</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[wallet] Create new account" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{&quot;name&quot;:&quot;a1&quot;}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${host}</stringProp>
-          <stringProp name="HTTPSampler.port">${port}</stringProp>
-          <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/api/v1/account</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-            <collectionProp name="HeaderManager.headers">
-              <elementProp name="Referer" elementType="Header">
-                <stringProp name="Header.name">Referer</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}/</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Language" elementType="Header">
-                <stringProp name="Header.name">Accept-Language</stringProp>
-                <stringProp name="Header.value">en-US,en;q=0.${paidChargeCount}</stringProp>
-              </elementProp>
-              <elementProp name="Origin" elementType="Header">
-                <stringProp name="Header.name">Origin</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}</stringProp>
-              </elementProp>
-              <elementProp name="Content-Type" elementType="Header">
-                <stringProp name="Header.name">Content-Type</stringProp>
-                <stringProp name="Header.value">application/json</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Encoding" elementType="Header">
-                <stringProp name="Header.name">Accept-Encoding</stringProp>
-                <stringProp name="Header.value">gzip, deflate</stringProp>
-              </elementProp>
-              <elementProp name="User-Agent" elementType="Header">
-                <stringProp name="Header.name">User-Agent</stringProp>
-                <stringProp name="Header.value">Mozilla/${paidChargeCount}.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/117.0</stringProp>
-              </elementProp>
-              <elementProp name="Accept" elementType="Header">
-                <stringProp name="Header.name">Accept</stringProp>
-                <stringProp name="Header.value">application/json, text/plain, */*</stringProp>
-              </elementProp>
-            </collectionProp>
-          </HeaderManager>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">8</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Extract user and wallet" enabled="true">
-            <stringProp name="cacheKey">true</stringProp>
-            <stringProp name="filename"></stringProp>
-            <stringProp name="parameters"></stringProp>
-            <stringProp name="script">var resp = JSON.parse(prev.getResponseDataAsString())
-
-vars.put(&quot;userId&quot;, resp.user || &quot;no-user-id&quot;);
-vars.put(&quot;walletId&quot;, resp.id || &quot;no-wallet-id&quot;);
-vars.put(&quot;inkey&quot;, resp.inkey || &apos;no-inkey&apos;);
-vars.put(&quot;adminkey&quot;, resp.adminkey || &apos;no-adminkey&apos;);
-</stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-          </JSR223PostProcessor>
-          <hashTree/>
-        </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[wallet] Login with user id" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{&quot;usr&quot;:&quot;${userId}&quot;}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${host}</stringProp>
-          <stringProp name="HTTPSampler.port">${port}</stringProp>
-          <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/api/v1/auth/usr</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-            <collectionProp name="HeaderManager.headers">
-              <elementProp name="Referer" elementType="Header">
-                <stringProp name="Header.name">Referer</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}/</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Language" elementType="Header">
-                <stringProp name="Header.name">Accept-Language</stringProp>
-                <stringProp name="Header.value">en-US,en;q=0.${paidChargeCount}</stringProp>
-              </elementProp>
-              <elementProp name="Origin" elementType="Header">
-                <stringProp name="Header.name">Origin</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}</stringProp>
-              </elementProp>
-              <elementProp name="Content-Type" elementType="Header">
-                <stringProp name="Header.name">Content-Type</stringProp>
-                <stringProp name="Header.value">application/json</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Encoding" elementType="Header">
-                <stringProp name="Header.name">Accept-Encoding</stringProp>
-                <stringProp name="Header.value">gzip, deflate</stringProp>
-              </elementProp>
-              <elementProp name="User-Agent" elementType="Header">
-                <stringProp name="Header.name">User-Agent</stringProp>
-                <stringProp name="Header.value">Mozilla/${paidChargeCount}.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/117.0</stringProp>
-              </elementProp>
-              <elementProp name="Accept" elementType="Header">
-                <stringProp name="Header.name">Accept</stringProp>
-                <stringProp name="Header.value">application/json, text/plain, */*</stringProp>
-              </elementProp>
-            </collectionProp>
-          </HeaderManager>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">8</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[wallet] Go to wallet page" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="wal" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.name">wal</stringProp>
-                <stringProp name="Argument.value">${walletId}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${host}</stringProp>
-          <stringProp name="HTTPSampler.port">${port}</stringProp>
-          <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/wallet</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-            <collectionProp name="HeaderManager.headers">
-              <elementProp name="Referer" elementType="Header">
-                <stringProp name="Header.name">Referer</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}/</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Language" elementType="Header">
-                <stringProp name="Header.name">Accept-Language</stringProp>
-                <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-              </elementProp>
-              <elementProp name="Upgrade-Insecure-Requests" elementType="Header">
-                <stringProp name="Header.name">Upgrade-Insecure-Requests</stringProp>
-                <stringProp name="Header.value">1</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Encoding" elementType="Header">
-                <stringProp name="Header.name">Accept-Encoding</stringProp>
-                <stringProp name="Header.value">gzip, deflate</stringProp>
-              </elementProp>
-              <elementProp name="User-Agent" elementType="Header">
-                <stringProp name="Header.name">User-Agent</stringProp>
-                <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:105.0) Gecko/20100101 Firefox/105.0</stringProp>
-              </elementProp>
-              <elementProp name="Accept" elementType="Header">
-                <stringProp name="Header.name">Accept</stringProp>
-                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8</stringProp>
-              </elementProp>
-            </collectionProp>
-          </HeaderManager>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">8</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[wallet] Get currencies" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${host}</stringProp>
-          <stringProp name="HTTPSampler.port">${port}</stringProp>
-          <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/api/v1/currencies</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-            <collectionProp name="HeaderManager.headers">
-              <elementProp name="Referer" elementType="Header">
-                <stringProp name="Header.name">Referer</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}/wallet?wal=${walletId}</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Language" elementType="Header">
-                <stringProp name="Header.name">Accept-Language</stringProp>
-                <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-              </elementProp>
-              <elementProp name="X-Api-Key" elementType="Header">
-                <stringProp name="Header.name">X-Api-Key</stringProp>
-                <stringProp name="Header.value">undefined</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Encoding" elementType="Header">
-                <stringProp name="Header.name">Accept-Encoding</stringProp>
-                <stringProp name="Header.value">gzip, deflate</stringProp>
-              </elementProp>
-              <elementProp name="User-Agent" elementType="Header">
-                <stringProp name="Header.name">User-Agent</stringProp>
-                <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:105.0) Gecko/20100101 Firefox/105.0</stringProp>
-              </elementProp>
-              <elementProp name="Accept" elementType="Header">
-                <stringProp name="Header.name">Accept</stringProp>
-                <stringProp name="Header.value">application/json, text/plain, */*</stringProp>
-              </elementProp>
-            </collectionProp>
-          </HeaderManager>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">8</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Currency List" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="1438956759">[&quot;AED&quot;,&quot;AFN&quot;,&quot;ALL&quot;,&quot;AMD&quot;,&quot;ANG&quot;,&quot;AOA&quot;,&quot;ARS&quot;,&quot;AUD&quot;,&quot;AWG&quot;,&quot;AZN&quot;,&quot;BAM&quot;,&quot;BBD&quot;,&quot;BDT&quot;,&quot;BGN&quot;,&quot;BHD&quot;,&quot;BIF&quot;,&quot;BMD&quot;,&quot;BND&quot;,&quot;BOB&quot;,&quot;BRL&quot;,&quot;BSD&quot;,&quot;BTN&quot;,&quot;BWP&quot;,&quot;BYN&quot;,&quot;BYR&quot;,&quot;BZD&quot;,&quot;CAD&quot;,&quot;CDF&quot;,&quot;CHF&quot;,&quot;CLF&quot;,&quot;CLP&quot;,&quot;CNH&quot;,&quot;CNY&quot;,&quot;COP&quot;,&quot;CRC&quot;,&quot;CUC&quot;,&quot;CVE&quot;,&quot;CZK&quot;,&quot;DJF&quot;,&quot;DKK&quot;,&quot;DOP&quot;,&quot;DZD&quot;,&quot;EGP&quot;,&quot;ERN&quot;,&quot;ETB&quot;,&quot;EUR&quot;,&quot;FJD&quot;,&quot;FKP&quot;,&quot;GBP&quot;,&quot;GEL&quot;,&quot;GGP&quot;,&quot;GHS&quot;,&quot;GIP&quot;,&quot;GMD&quot;,&quot;GNF&quot;,&quot;GTQ&quot;,&quot;GYD&quot;,&quot;HKD&quot;,&quot;HNL&quot;,&quot;HRK&quot;,&quot;HTG&quot;,&quot;HUF&quot;,&quot;IDR&quot;,&quot;ILS&quot;,&quot;IMP&quot;,&quot;INR&quot;,&quot;IQD&quot;,&quot;IRT&quot;,&quot;ISK&quot;,&quot;JEP&quot;,&quot;JMD&quot;,&quot;JOD&quot;,&quot;JPY&quot;,&quot;KES&quot;,&quot;KGS&quot;,&quot;KHR&quot;,&quot;KMF&quot;,&quot;KRW&quot;,&quot;KWD&quot;,&quot;KYD&quot;,&quot;KZT&quot;,&quot;LAK&quot;,&quot;LBP&quot;,&quot;LKR&quot;,&quot;LRD&quot;,&quot;LSL&quot;,&quot;LYD&quot;,&quot;MAD&quot;,&quot;MDL&quot;,&quot;MGA&quot;,&quot;MKD&quot;,&quot;MMK&quot;,&quot;MNT&quot;,&quot;MOP&quot;,&quot;MRO&quot;,&quot;MUR&quot;,&quot;MVR&quot;,&quot;MWK&quot;,&quot;MXN&quot;,&quot;MYR&quot;,&quot;MZN&quot;,&quot;NAD&quot;,&quot;NGN&quot;,&quot;NIO&quot;,&quot;NOK&quot;,&quot;NPR&quot;,&quot;NZD&quot;,&quot;OMR&quot;,&quot;PAB&quot;,&quot;PEN&quot;,&quot;PGK&quot;,&quot;PHP&quot;,&quot;PKR&quot;,&quot;PLN&quot;,&quot;PYG&quot;,&quot;QAR&quot;,&quot;RON&quot;,&quot;RSD&quot;,&quot;RUB&quot;,&quot;RWF&quot;,&quot;SAR&quot;,&quot;SBD&quot;,&quot;SCR&quot;,&quot;SEK&quot;,&quot;SGD&quot;,&quot;SHP&quot;,&quot;SLL&quot;,&quot;SOS&quot;,&quot;SRD&quot;,&quot;SSP&quot;,&quot;STD&quot;,&quot;SVC&quot;,&quot;SZL&quot;,&quot;THB&quot;,&quot;TJS&quot;,&quot;TMT&quot;,&quot;TND&quot;,&quot;TOP&quot;,&quot;TRY&quot;,&quot;TTD&quot;,&quot;TWD&quot;,&quot;TZS&quot;,&quot;UAH&quot;,&quot;UGX&quot;,&quot;USD&quot;,&quot;UYU&quot;,&quot;UZS&quot;,&quot;VEF&quot;,&quot;VES&quot;,&quot;VND&quot;,&quot;VUV&quot;,&quot;WST&quot;,&quot;XAF&quot;,&quot;XAG&quot;,&quot;XAU&quot;,&quot;XCD&quot;,&quot;XDR&quot;,&quot;XOF&quot;,&quot;XPD&quot;,&quot;XPF&quot;,&quot;XPT&quot;,&quot;YER&quot;,&quot;ZAR&quot;,&quot;ZMW&quot;,&quot;ZWL&quot;]</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">8</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[wallet] Get wallet balance" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${host}</stringProp>
-          <stringProp name="HTTPSampler.port">${port}</stringProp>
-          <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/api/v1/wallet</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-            <collectionProp name="HeaderManager.headers">
-              <elementProp name="Referer" elementType="Header">
-                <stringProp name="Header.name">Referer</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}/wallet?wal=${walletId}</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Language" elementType="Header">
-                <stringProp name="Header.name">Accept-Language</stringProp>
-                <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-              </elementProp>
-              <elementProp name="X-Api-Key" elementType="Header">
-                <stringProp name="Header.name">X-Api-Key</stringProp>
-                <stringProp name="Header.value">${inkey}</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Encoding" elementType="Header">
-                <stringProp name="Header.name">Accept-Encoding</stringProp>
-                <stringProp name="Header.value">gzip, deflate</stringProp>
-              </elementProp>
-              <elementProp name="User-Agent" elementType="Header">
-                <stringProp name="Header.name">User-Agent</stringProp>
-                <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:105.0) Gecko/20100101 Firefox/105.0</stringProp>
-              </elementProp>
-              <elementProp name="Accept" elementType="Header">
-                <stringProp name="Header.name">Accept</stringProp>
-                <stringProp name="Header.value">application/json, text/plain, */*</stringProp>
-              </elementProp>
-            </collectionProp>
-          </HeaderManager>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">8</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-          <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="Check Balance is Zero" enabled="true">
-            <stringProp name="cacheKey">true</stringProp>
-            <stringProp name="filename"></stringProp>
-            <stringProp name="parameters"></stringProp>
-            <stringProp name="script">var resp = JSON.parse(prev.getResponseDataAsString())
-
-if (resp.balance !== 0) {
-	AssertionResult.setFailureMessage(&quot;Balance is not zero, but: &quot;+ resp.balance);
-	AssertionResult.setFailure(true)
-}
-</stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-          </JSR223Assertion>
-          <hashTree/>
-        </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[wallet] Get payments" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${host}</stringProp>
-          <stringProp name="HTTPSampler.port">${port}</stringProp>
-          <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/api/v1/payments</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-            <collectionProp name="HeaderManager.headers">
-              <elementProp name="Referer" elementType="Header">
-                <stringProp name="Header.name">Referer</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}/wallet?wal=${walletId}</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Language" elementType="Header">
-                <stringProp name="Header.name">Accept-Language</stringProp>
-                <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-              </elementProp>
-              <elementProp name="X-Api-Key" elementType="Header">
-                <stringProp name="Header.name">X-Api-Key</stringProp>
-                <stringProp name="Header.value">${inkey}</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Encoding" elementType="Header">
-                <stringProp name="Header.name">Accept-Encoding</stringProp>
-                <stringProp name="Header.value">gzip, deflate</stringProp>
-              </elementProp>
-              <elementProp name="User-Agent" elementType="Header">
-                <stringProp name="Header.name">User-Agent</stringProp>
-                <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:105.0) Gecko/20100101 Firefox/105.0</stringProp>
-              </elementProp>
-              <elementProp name="Accept" elementType="Header">
-                <stringProp name="Header.name">Accept</stringProp>
-                <stringProp name="Header.value">application/json, text/plain, */*</stringProp>
-              </elementProp>
-            </collectionProp>
-          </HeaderManager>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check empty payment list" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="2914">[]</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">8</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-      </hashTree>
-    </hashTree>
-  </hashTree>
-</jmeterTestPlan>

integration/fragments/init-server.jmx

@@ -1,487 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.5">
-  <hashTree>
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Test Fragment" enabled="false"/>
-    <hashTree>
-      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Init Server" enabled="true"/>
-      <hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[server] Go to home page" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${host}</stringProp>
-          <stringProp name="HTTPSampler.port">${port}</stringProp>
-          <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
-          <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-            <collectionProp name="HeaderManager.headers">
-              <elementProp name="Accept-Language" elementType="Header">
-                <stringProp name="Header.name">Accept-Language</stringProp>
-                <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-              </elementProp>
-              <elementProp name="Upgrade-Insecure-Requests" elementType="Header">
-                <stringProp name="Header.name">Upgrade-Insecure-Requests</stringProp>
-                <stringProp name="Header.value">1</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Encoding" elementType="Header">
-                <stringProp name="Header.name">Accept-Encoding</stringProp>
-                <stringProp name="Header.value">gzip, deflate</stringProp>
-              </elementProp>
-              <elementProp name="User-Agent" elementType="Header">
-                <stringProp name="Header.name">User-Agent</stringProp>
-                <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:121.0) Gecko/20100101 Firefox/121.0</stringProp>
-              </elementProp>
-              <elementProp name="Accept" elementType="Header">
-                <stringProp name="Header.name">Accept</stringProp>
-                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8</stringProp>
-              </elementProp>
-            </collectionProp>
-          </HeaderManager>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
-              <stringProp name="50554">307</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">40</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract `is_first_install` var" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">true</stringProp>
-            <stringProp name="RegexExtractor.refname">is_first_install</stringProp>
-            <stringProp name="RegexExtractor.regex">location: (.*)</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default">not-first-install</stringProp>
-            <stringProp name="RegexExtractor.match_number">0</stringProp>
-            <stringProp name="Sample.scope">all</stringProp>
-          </RegexExtractor>
-          <hashTree/>
-        </hashTree>
-        <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If First Install" enabled="true">
-          <stringProp name="IfController.condition">${__groovy(vars.get(&apos;is_first_install&apos;).contains(&quot;first_install&quot;),)}</stringProp>
-          <boolProp name="IfController.evaluateAll">false</boolProp>
-          <boolProp name="IfController.useExpression">true</boolProp>
-        </IfController>
-        <hashTree>
-          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[server] Go to first_install" enabled="true">
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-              <collectionProp name="Arguments.arguments"/>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain">${host}</stringProp>
-            <stringProp name="HTTPSampler.port">${port}</stringProp>
-            <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-            <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-            <stringProp name="HTTPSampler.path">/first_install</stringProp>
-            <stringProp name="HTTPSampler.method">GET</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-            <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-            <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-            <stringProp name="HTTPSampler.response_timeout"></stringProp>
-          </HTTPSamplerProxy>
-          <hashTree>
-            <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-              <collectionProp name="HeaderManager.headers">
-                <elementProp name="Accept-Language" elementType="Header">
-                  <stringProp name="Header.name">Accept-Language</stringProp>
-                  <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-                </elementProp>
-                <elementProp name="Upgrade-Insecure-Requests" elementType="Header">
-                  <stringProp name="Header.name">Upgrade-Insecure-Requests</stringProp>
-                  <stringProp name="Header.value">1</stringProp>
-                </elementProp>
-                <elementProp name="Accept-Encoding" elementType="Header">
-                  <stringProp name="Header.name">Accept-Encoding</stringProp>
-                  <stringProp name="Header.value">gzip, deflate</stringProp>
-                </elementProp>
-                <elementProp name="User-Agent" elementType="Header">
-                  <stringProp name="Header.name">User-Agent</stringProp>
-                  <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:121.0) Gecko/20100101 Firefox/121.0</stringProp>
-                </elementProp>
-                <elementProp name="Accept" elementType="Header">
-                  <stringProp name="Header.name">Accept</stringProp>
-                  <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8</stringProp>
-                </elementProp>
-              </collectionProp>
-            </HeaderManager>
-            <hashTree/>
-            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-              <collectionProp name="Asserion.test_strings">
-                <stringProp name="49586">200</stringProp>
-              </collectionProp>
-              <stringProp name="Assertion.custom_message"></stringProp>
-              <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-              <boolProp name="Assertion.assume_success">false</boolProp>
-              <intProp name="Assertion.test_type">8</intProp>
-            </ResponseAssertion>
-            <hashTree/>
-          </hashTree>
-          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[server] Init super user" enabled="true">
-            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-              <collectionProp name="Arguments.arguments">
-                <elementProp name="" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                  <stringProp name="Argument.value">{&quot;username&quot;:&quot;admin&quot;,&quot;password&quot;:&quot;admin_password&quot;,&quot;password_repeat&quot;:&quot;admin_password&quot;}</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                </elementProp>
-              </collectionProp>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain">${host}</stringProp>
-            <stringProp name="HTTPSampler.port">${port}</stringProp>
-            <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-            <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-            <stringProp name="HTTPSampler.path">/api/v1/auth/first_install</stringProp>
-            <stringProp name="HTTPSampler.method">PUT</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-            <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-            <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-            <stringProp name="HTTPSampler.response_timeout"></stringProp>
-          </HTTPSamplerProxy>
-          <hashTree>
-            <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-              <collectionProp name="HeaderManager.headers">
-                <elementProp name="Referer" elementType="Header">
-                  <stringProp name="Header.name">Referer</stringProp>
-                  <stringProp name="Header.value">${scheme}://${host}:${port}/first_install</stringProp>
-                </elementProp>
-                <elementProp name="Accept-Language" elementType="Header">
-                  <stringProp name="Header.name">Accept-Language</stringProp>
-                  <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-                </elementProp>
-                <elementProp name="Origin" elementType="Header">
-                  <stringProp name="Header.name">Origin</stringProp>
-                  <stringProp name="Header.value">${scheme}://${host}:${port}</stringProp>
-                </elementProp>
-                <elementProp name="Content-Type" elementType="Header">
-                  <stringProp name="Header.name">Content-Type</stringProp>
-                  <stringProp name="Header.value">application/json</stringProp>
-                </elementProp>
-                <elementProp name="Accept-Encoding" elementType="Header">
-                  <stringProp name="Header.name">Accept-Encoding</stringProp>
-                  <stringProp name="Header.value">gzip, deflate</stringProp>
-                </elementProp>
-                <elementProp name="User-Agent" elementType="Header">
-                  <stringProp name="Header.name">User-Agent</stringProp>
-                  <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:121.0) Gecko/20100101 Firefox/121.0</stringProp>
-                </elementProp>
-                <elementProp name="Accept" elementType="Header">
-                  <stringProp name="Header.name">Accept</stringProp>
-                  <stringProp name="Header.value">application/json, text/plain, */*</stringProp>
-                </elementProp>
-              </collectionProp>
-            </HeaderManager>
-            <hashTree/>
-            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-              <collectionProp name="Asserion.test_strings">
-                <stringProp name="49586">200</stringProp>
-              </collectionProp>
-              <stringProp name="Assertion.custom_message"></stringProp>
-              <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-              <boolProp name="Assertion.assume_success">false</boolProp>
-              <intProp name="Assertion.test_type">8</intProp>
-            </ResponseAssertion>
-            <hashTree/>
-          </hashTree>
-        </hashTree>
-        <IfController guiclass="IfControllerPanel" testclass="IfController" testname="Else (not first install)" enabled="true">
-          <stringProp name="IfController.condition">${__groovy(!vars.get(&apos;is_first_install&apos;).contains(&quot;first_install&quot;),)}</stringProp>
-          <boolProp name="IfController.evaluateAll">false</boolProp>
-          <boolProp name="IfController.useExpression">true</boolProp>
-        </IfController>
-        <hashTree>
-          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[server] Login super user" enabled="true">
-            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-              <collectionProp name="Arguments.arguments">
-                <elementProp name="" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                  <stringProp name="Argument.value">{&quot;username&quot;:&quot;admin&quot;,&quot;password&quot;:&quot;admin_password&quot;}</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                </elementProp>
-              </collectionProp>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain">${host}</stringProp>
-            <stringProp name="HTTPSampler.port">${port}</stringProp>
-            <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-            <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-            <stringProp name="HTTPSampler.path">/api/v1/auth</stringProp>
-            <stringProp name="HTTPSampler.method">POST</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-            <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-            <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-            <stringProp name="HTTPSampler.response_timeout"></stringProp>
-          </HTTPSamplerProxy>
-          <hashTree>
-            <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-              <collectionProp name="HeaderManager.headers">
-                <elementProp name="Referer" elementType="Header">
-                  <stringProp name="Header.name">Referer</stringProp>
-                  <stringProp name="Header.value">${scheme}://${host}:${port}/</stringProp>
-                </elementProp>
-                <elementProp name="Accept-Language" elementType="Header">
-                  <stringProp name="Header.name">Accept-Language</stringProp>
-                  <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-                </elementProp>
-                <elementProp name="Origin" elementType="Header">
-                  <stringProp name="Header.name">Origin</stringProp>
-                  <stringProp name="Header.value">${scheme}://${host}:${port}</stringProp>
-                </elementProp>
-                <elementProp name="Content-Type" elementType="Header">
-                  <stringProp name="Header.name">Content-Type</stringProp>
-                  <stringProp name="Header.value">application/json</stringProp>
-                </elementProp>
-                <elementProp name="Accept-Encoding" elementType="Header">
-                  <stringProp name="Header.name">Accept-Encoding</stringProp>
-                  <stringProp name="Header.value">gzip, deflate</stringProp>
-                </elementProp>
-                <elementProp name="User-Agent" elementType="Header">
-                  <stringProp name="Header.name">User-Agent</stringProp>
-                  <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:123.0) Gecko/20100101 Firefox/123.0</stringProp>
-                </elementProp>
-                <elementProp name="Accept" elementType="Header">
-                  <stringProp name="Header.name">Accept</stringProp>
-                  <stringProp name="Header.value">application/json, text/plain, */*</stringProp>
-                </elementProp>
-              </collectionProp>
-            </HeaderManager>
-            <hashTree/>
-            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-              <collectionProp name="Asserion.test_strings">
-                <stringProp name="49586">200</stringProp>
-              </collectionProp>
-              <stringProp name="Assertion.custom_message"></stringProp>
-              <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-              <boolProp name="Assertion.assume_success">false</boolProp>
-              <intProp name="Assertion.test_type">8</intProp>
-            </ResponseAssertion>
-            <hashTree/>
-          </hashTree>
-        </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[server] Get all admin wallets" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${host}</stringProp>
-          <stringProp name="HTTPSampler.port">${port}</stringProp>
-          <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/api/v1/wallets</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-            <collectionProp name="HeaderManager.headers">
-              <elementProp name="Accept-Language" elementType="Header">
-                <stringProp name="Header.name">Accept-Language</stringProp>
-                <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-              </elementProp>
-              <elementProp name="Upgrade-Insecure-Requests" elementType="Header">
-                <stringProp name="Header.name">Upgrade-Insecure-Requests</stringProp>
-                <stringProp name="Header.value">1</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Encoding" elementType="Header">
-                <stringProp name="Header.name">Accept-Encoding</stringProp>
-                <stringProp name="Header.value">gzip, deflate</stringProp>
-              </elementProp>
-              <elementProp name="User-Agent" elementType="Header">
-                <stringProp name="Header.name">User-Agent</stringProp>
-                <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:121.0) Gecko/20100101 Firefox/121.0</stringProp>
-              </elementProp>
-              <elementProp name="Accept" elementType="Header">
-                <stringProp name="Header.name">Accept</stringProp>
-                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8</stringProp>
-              </elementProp>
-            </collectionProp>
-          </HeaderManager>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">8</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Extract admin wallet and keys" enabled="true">
-            <stringProp name="cacheKey">true</stringProp>
-            <stringProp name="filename"></stringProp>
-            <stringProp name="parameters"></stringProp>
-            <stringProp name="script">var resp = JSON.parse(prev.getResponseDataAsString())[0]
-
-vars.put(&quot;adminWalletId&quot;, resp.id || &quot;no-admin-wallet-id&quot;);
-vars.put(&quot;adminWalletKey&quot;, resp.adminkey || &apos;no-adminkey&apos;);
-</stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-          </JSR223PostProcessor>
-          <hashTree/>
-        </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[server] Top up wallet" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{&quot;amount&quot;:&quot;1000000&quot;,&quot;id&quot;:&quot;${adminWalletId}&quot;}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${host}</stringProp>
-          <stringProp name="HTTPSampler.port">${port}</stringProp>
-          <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/admin/api/v1/topup/</stringProp>
-          <stringProp name="HTTPSampler.method">PUT</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-            <collectionProp name="HeaderManager.headers">
-              <elementProp name="Referer" elementType="Header">
-                <stringProp name="Header.name">Referer</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}/wallet?&amp;wal=c1daa33fc4014ef69cd1505f14f322c2</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Language" elementType="Header">
-                <stringProp name="Header.name">Accept-Language</stringProp>
-                <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-              </elementProp>
-              <elementProp name="Origin" elementType="Header">
-                <stringProp name="Header.name">Origin</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}</stringProp>
-              </elementProp>
-              <elementProp name="Content-Type" elementType="Header">
-                <stringProp name="Header.name">Content-Type</stringProp>
-                <stringProp name="Header.value">application/json</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Encoding" elementType="Header">
-                <stringProp name="Header.name">Accept-Encoding</stringProp>
-                <stringProp name="Header.value">gzip, deflate</stringProp>
-              </elementProp>
-              <elementProp name="User-Agent" elementType="Header">
-                <stringProp name="Header.name">User-Agent</stringProp>
-                <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:121.0) Gecko/20100101 Firefox/121.0</stringProp>
-              </elementProp>
-              <elementProp name="Accept" elementType="Header">
-                <stringProp name="Header.name">Accept</stringProp>
-                <stringProp name="Header.value">application/json, text/plain, */*</stringProp>
-              </elementProp>
-            </collectionProp>
-          </HeaderManager>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">8</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="[server] Logout super user" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${host}</stringProp>
-          <stringProp name="HTTPSampler.port">${port}</stringProp>
-          <stringProp name="HTTPSampler.protocol">${scheme}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/api/v1/auth/logout</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-            <collectionProp name="HeaderManager.headers">
-              <elementProp name="Referer" elementType="Header">
-                <stringProp name="Header.name">Referer</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}/</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Language" elementType="Header">
-                <stringProp name="Header.name">Accept-Language</stringProp>
-                <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
-              </elementProp>
-              <elementProp name="Origin" elementType="Header">
-                <stringProp name="Header.name">Origin</stringProp>
-                <stringProp name="Header.value">${scheme}://${host}:${port}</stringProp>
-              </elementProp>
-              <elementProp name="Content-Type" elementType="Header">
-                <stringProp name="Header.name">Content-Type</stringProp>
-                <stringProp name="Header.value">application/json</stringProp>
-              </elementProp>
-              <elementProp name="Accept-Encoding" elementType="Header">
-                <stringProp name="Header.name">Accept-Encoding</stringProp>
-                <stringProp name="Header.value">gzip, deflate</stringProp>
-              </elementProp>
-              <elementProp name="User-Agent" elementType="Header">
-                <stringProp name="Header.name">User-Agent</stringProp>
-                <stringProp name="Header.value">Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:123.0) Gecko/20100101 Firefox/123.0</stringProp>
-              </elementProp>
-              <elementProp name="Accept" elementType="Header">
-                <stringProp name="Header.name">Accept</stringProp>
-                <stringProp name="Header.value">application/json, text/plain, */*</stringProp>
-              </elementProp>
-            </collectionProp>
-          </HeaderManager>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Check Status Code 200" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.custom_message"></stringProp>
-            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">8</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-      </hashTree>
-    </hashTree>
-  </hashTree>
-</jmeterTestPlan>

lnbits/app.py

@@ -23,23 +23,19 @@ from slowapi.util import get_remote_address
 from starlette.middleware.sessions import SessionMiddleware
 from starlette.responses import JSONResponse
 
-from lnbits.core.crud import get_dbversions, get_installed_extensions
+from lnbits.core.crud import get_installed_extensions
 from lnbits.core.helpers import migrate_extension_database
 from lnbits.core.services import websocketUpdater
-from lnbits.core.tasks import (  # watchdog_task
-    killswitch_task,
-    wait_for_paid_invoices,
+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,
-    register_invoice_listener,
-)
+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 migrate_databases
+from .commands import db_versions, migrate_databases
 from .core import init_core_routers
 from .core.db import core_app_extra
 from .core.services import check_admin_settings, check_webpush_settings
@@ -65,6 +61,7 @@ from .tasks import (
     check_pending_payments,
     internal_invoice_listener,
     invoice_listener,
+    webhook_handler,
 )
 
 
@@ -198,7 +195,7 @@ async def check_installed_extensions(app: FastAPI):
 
     for ext in installed_extensions:
         try:
-            installed = await check_installed_extension_files(ext)
+            installed = check_installed_extension_files(ext)
             if not installed:
                 await restore_installed_extension(app, ext)
                 logger.info(
@@ -256,14 +253,14 @@ async def build_all_installed_extensions_list(
     ]
 
 
-async def check_installed_extension_files(ext: InstallableExtension) -> bool:
+def check_installed_extension_files(ext: InstallableExtension) -> bool:
     if ext.has_installed_version:
         return True
 
     zip_files = glob.glob(os.path.join(settings.lnbits_data_folder, "zips", "*.zip"))
 
     if f"./{str(ext.zip_path)}" not in zip_files:
-        await ext.download_archive()
+        ext.download_archive()
     ext.extract_archive()
 
     return False
@@ -276,7 +273,7 @@ async def restore_installed_extension(app: FastAPI, ext: InstallableExtension):
     extension = Extension.from_installable_ext(ext)
     register_ext_routes(app, extension)
 
-    current_version = (await get_dbversions()).get(ext.id, 0)
+    current_version = (await db_versions()).get(ext.id, 0)
     await migrate_extension_database(extension, current_version)
 
     # mount routes for the new version
@@ -468,21 +465,19 @@ def get_db_vendor_name():
 
 
 def register_async_tasks(app):
+    @app.route("/wallet/webhook")
+    async def webhook_listener():
+        return await webhook_handler()
+
     @app.on_event("startup")
     async def listeners():
         create_permanent_task(check_pending_payments)
         create_permanent_task(invoice_listener)
         create_permanent_task(internal_invoice_listener)
         create_permanent_task(cache.invalidate_forever)
-
-        # core invoice listener
-        invoice_queue = asyncio.Queue(5)
-        register_invoice_listener(invoice_queue, "core")
-        create_permanent_task(lambda: wait_for_paid_invoices(invoice_queue))
-
-        # TODO: implement watchdog properly
-        # create_permanent_task(watchdog_task)
-        create_permanent_task(killswitch_task)
+        register_task_listeners()
+        register_killswitch()
+        # await run_deferred_async() # calle: doesn't do anyting?
 
 
 def register_exception_handlers(app: FastAPI):
@@ -545,7 +540,9 @@ def register_exception_handlers(app: FastAPI):
                 response = RedirectResponse("/")
                 response.delete_cookie("cookie_access_token")
                 response.delete_cookie("is_lnbits_user_authorized")
-                response.set_cookie("is_access_token_expired", "true")
+                response.set_cookie(
+                    "is_access_token_expired", "true", samesite="none", secure=True
+                )
                 return response
 
             return template_renderer().TemplateResponse(
@@ -589,12 +586,6 @@ def configure_logger() -> None:
     logging.getLogger("uvicorn.error").handlers = [InterceptHandler()]
     logging.getLogger("uvicorn.error").propagate = False
 
-    logging.getLogger("sqlalchemy").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base").propagate = False
-    logging.getLogger("sqlalchemy.engine.base.Engine").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base.Engine").propagate = False
-
 
 class Formatter:
     def __init__(self):

lnbits/commands.py

@@ -397,10 +397,7 @@ async def install_extension(
             return False, "No release selected"
 
         data = CreateExtension(
-            ext_id=extension,
-            archive=release.archive,
-            source_repo=release.source_repo,
-            version=release.version,
+            ext_id=extension, archive=release.archive, source_repo=release.source_repo
         )
         await _call_install_extension(data, url, admin_user)
         click.echo(f"Extension '{extension}' ({release.version}) installed.")
@@ -448,10 +445,7 @@ async def update_extension(
         click.echo(f"Updating '{extension}' extension to version: {release.version }")
 
         data = CreateExtension(
-            ext_id=extension,
-            archive=release.archive,
-            source_repo=release.source_repo,
-            version=release.version,
+            ext_id=extension, archive=release.archive, source_repo=release.source_repo
         )
 
         await _call_install_extension(data, url, admin_user)

lnbits/core/crud.py

@@ -322,7 +322,6 @@ async def add_installed_extension(
             dict(ext.installed_release) if ext.installed_release else None
         ),
         "dependencies": ext.dependencies,
-        "payments": [dict(p) for p in ext.payments] if ext.payments else None,
     }
 
     version = ext.installed_release.version if ext.installed_release else ""
@@ -554,8 +553,7 @@ async def get_wallet_for_key(
     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 = ?) AND deleted = false
+        AS balance_msat FROM wallets WHERE adminkey = ? OR inkey = ?
         """,
         (key, key),
     )
@@ -603,7 +601,6 @@ async def get_standalone_payment(
         SELECT *
         FROM apipayments
         WHERE {clause}
-        ORDER BY amount
         LIMIT 1
         """,
         tuple(values),
@@ -1015,16 +1012,6 @@ async def check_internal_pending(
         return row["pending"]
 
 
-async def mark_webhook_sent(payment_hash: str, status: int) -> None:
-    await db.execute(
-        """
-        UPDATE apipayments SET webhook_status = ?
-        WHERE hash = ?
-        """,
-        (status, payment_hash),
-    )
-
-
 # balance_check
 # -------------
 
@@ -1110,8 +1097,6 @@ async def get_admin_settings(is_super_user: bool = False) -> Optional[AdminSetti
         return None
     row_dict = dict(sets)
     row_dict.pop("super_user")
-    row_dict.pop("auth_all_methods")
-
     admin_settings = AdminSettings(
         is_super_user=is_super_user,
         lnbits_allowed_funding_sources=settings.lnbits_allowed_funding_sources,

lnbits/core/helpers.py

@@ -53,45 +53,8 @@ async def stop_extension_background_work(
 ):
     """
     Stop background work for extension (like asyncio.Tasks, WebSockets, etc).
-    Extensions SHOULD expose a `api_stop()` function and/or a DELETE enpoint
-    at the root level of their API.
+    Extensions SHOULD expose a DELETE enpoint at the root level of their API.
     """
-    stopped = await _stop_extension_background_work(ext_id)
-
-    if not stopped:
-        # fallback to REST API call
-        await _stop_extension_background_work_via_api(ext_id, user, access_token)
-
-
-async def _stop_extension_background_work(ext_id) -> bool:
-    upgrade_hash = settings.extension_upgrade_hash(ext_id) or ""
-    ext = Extension(ext_id, True, False, upgrade_hash=upgrade_hash)
-
-    try:
-        logger.info(f"Stopping background work for extension '{ext.module_name}'.")
-        old_module = importlib.import_module(ext.module_name)
-
-        # Extensions must expose an `{ext_id}_stop()` function at the module level
-        # The `api_stop()` function is for backwards compatibility (will be deprecated)
-        stop_fns = [f"{ext_id}_stop", "api_stop"]
-        stop_fn_name = next((fn for fn in stop_fns if hasattr(old_module, fn)), None)
-        assert stop_fn_name, "No stop function found for '{ext.module_name}'"
-
-        await getattr(old_module, stop_fn_name)()
-
-        logger.info(f"Stopped background work for extension '{ext.module_name}'.")
-    except Exception as ex:
-        logger.warning(f"Failed to stop background work for '{ext.module_name}'.")
-        logger.warning(ex)
-        return False
-
-    return True
-
-
-async def _stop_extension_background_work_via_api(ext_id, user, access_token):
-    logger.info(
-        f"Stopping background work for extension '{ext_id}' using the REST API."
-    )
     async with httpx.AsyncClient() as client:
         try:
             url = f"http://{settings.host}:{settings.port}/{ext_id}/api/v1?usr={user}"
@@ -100,11 +63,7 @@ async def _stop_extension_background_work_via_api(ext_id, user, access_token):
             )
             resp = await client.delete(url=url, headers=headers)
             resp.raise_for_status()
-            logger.info(f"Stopped background work for extension '{ext_id}'.")
         except Exception as ex:
-            logger.warning(
-                f"Failed to stop background work for '{ext_id}' using the REST API."
-            )
             logger.warning(ex)
 
 

lnbits/core/models.py

@@ -18,20 +18,17 @@ from lnbits.helpers import url_for
 from lnbits.lnurl import encode as lnurl_encode
 from lnbits.settings import settings
 from lnbits.wallets import get_wallet_class
-from lnbits.wallets.base import PaymentPendingStatus, PaymentStatus
+from lnbits.wallets.base import PaymentStatus
 
 
-class BaseWallet(BaseModel):
+class Wallet(BaseModel):
     id: str
     name: str
+    user: str
     adminkey: str
     inkey: str
-    balance_msat: int
-
-
-class Wallet(BaseWallet):
-    user: str
     currency: Optional[str]
+    balance_msat: int
     deleted: bool
     created_at: Optional[int] = None
     updated_at: Optional[int] = None
@@ -258,7 +255,7 @@ class Payment(FromRowModel):
         conn: Optional[Connection] = None,
     ) -> PaymentStatus:
         if self.is_uncheckable:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
         logger.debug(
             f"Checking {'outgoing' if self.is_out else 'incoming'} "

lnbits/core/services.py

@@ -1,7 +1,6 @@
 import asyncio
 import datetime
 import json
-import time
 from io import BytesIO
 from pathlib import Path
 from typing import Dict, List, Optional, Tuple, TypedDict
@@ -31,12 +30,7 @@ from lnbits.settings import (
 )
 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 (
-    PaymentPendingStatus,
-    PaymentResponse,
-    PaymentStatus,
-    PaymentSuccessStatus,
-)
+from lnbits.wallets.base import PaymentResponse, PaymentStatus
 
 from .crud import (
     check_internal,
@@ -47,7 +41,6 @@ from .crud import (
     create_wallet,
     delete_wallet_payment,
     get_account,
-    get_payments,
     get_standalone_payment,
     get_super_settings,
     get_total_balance,
@@ -125,9 +118,8 @@ async def create_invoice(
     if not amount > 0:
         raise InvoiceFailure("Amountless invoices not supported.")
 
-    user_wallet = await get_wallet(wallet_id, conn=conn)
-    if not user_wallet:
-        raise InvoiceFailure(f"Could not fetch wallet '{wallet_id}'.")
+    if await get_wallet(wallet_id, conn=conn) is None:
+        raise InvoiceFailure("Wallet does not exist.")
 
     invoice_memo = None if description_hash else memo
 
@@ -138,14 +130,6 @@ async def create_invoice(
         amount, wallet_id, currency=currency, extra=extra, conn=conn
     )
 
-    if settings.is_wallet_max_balance_exceeded(
-        user_wallet.balance_msat / 1000 + amount_sat
-    ):
-        raise InvoiceFailure(
-            f"Wallet balance  cannot exceed "
-            f"{settings.lnbits_wallet_limit_max_balance} sats."
-        )
-
     ok, checking_id, payment_request, error_message = await wallet.create_invoice(
         amount=amount_sat,
         memo=invoice_memo,
@@ -194,22 +178,22 @@ async def pay_invoice(
     If the payment is still in flight, we hope that some other process
     will regularly check for the payment.
     """
-    try:
-        invoice = bolt11_decode(payment_request)
-    except Exception:
-        raise InvoiceFailure("Bolt11 decoding failed.")
+    invoice = bolt11_decode(payment_request)
 
     if not invoice.amount_msat or not invoice.amount_msat > 0:
-        raise InvoiceFailure("Amountless invoices not supported.")
+        raise ValueError("Amountless invoices not supported.")
     if max_sat and invoice.amount_msat > max_sat * 1000:
-        raise InvoiceFailure("Amount in invoice is too high.")
-
-    await check_wallet_limits(wallet_id, conn, invoice.amount_msat)
+        raise ValueError("Amount in invoice is too high.")
 
     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}"
 
+        if invoice.amount_msat == 0:
+            raise ValueError("Amountless invoices not supported.")
+        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 / 1000, wallet_id, extra=extra, conn=conn
         )
@@ -388,58 +372,6 @@ async def pay_invoice(
     return invoice.payment_hash
 
 
-async def check_wallet_limits(wallet_id, conn, amount_msat):
-    await check_time_limit_between_transactions(conn, wallet_id)
-    await check_wallet_daily_withdraw_limit(conn, wallet_id, amount_msat)
-
-
-async def check_time_limit_between_transactions(conn, wallet_id):
-    limit = settings.lnbits_wallet_limit_secs_between_trans
-    if not limit or limit <= 0:
-        return
-
-    payments = await get_payments(
-        since=int(time.time()) - limit,
-        wallet_id=wallet_id,
-        limit=1,
-        conn=conn,
-    )
-
-    if len(payments) == 0:
-        return
-
-    raise ValueError(
-        f"The time limit of {limit} seconds between payments has been reached."
-    )
-
-
-async def check_wallet_daily_withdraw_limit(conn, wallet_id, amount_msat):
-    limit = settings.lnbits_wallet_limit_daily_max_withdraw
-    if not limit or limit <= 0:
-        return
-
-    payments = await get_payments(
-        since=int(time.time()) - 60 * 60 * 24,
-        outgoing=True,
-        wallet_id=wallet_id,
-        limit=1,
-        conn=conn,
-    )
-    if len(payments) == 0:
-        return
-
-    total = 0
-    for pay in payments:
-        total += pay.amount
-    total = total - amount_msat
-    if limit * 1000 + total < 0:
-        raise ValueError(
-            "Daily withdrawal limit of "
-            + str(settings.lnbits_wallet_limit_daily_max_withdraw)
-            + " sats reached."
-        )
-
-
 async def redeem_lnurl_withdraw(
     wallet_id: str,
     lnurl_request: str,
@@ -582,10 +514,10 @@ async def check_transaction_status(
         wallet_id, payment_hash, conn=conn
     )
     if not payment:
-        return PaymentPendingStatus()
+        return PaymentStatus(None)
     if not payment.pending:
         # note: before, we still checked the status of the payment again
-        return PaymentSuccessStatus(fee_msat=payment.fee)
+        return PaymentStatus(True, fee_msat=payment.fee)
 
     status: PaymentStatus = await payment.check_status()
     return status
@@ -714,14 +646,11 @@ async def check_webpush_settings():
 
 def update_cached_settings(sets_dict: dict):
     for key, value in sets_dict.items():
-        if key in readonly_variables:
-            continue
-        if key not in settings.dict().keys():
-            continue
-        try:
-            setattr(settings, key, value)
-        except Exception:
-            logger.warning(f"Failed overriding setting: {key}, value: {value}")
+        if key not in readonly_variables:
+            try:
+                setattr(settings, key, 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"])
 

lnbits/core/sso/keycloak.py

@@ -1,37 +0,0 @@
-"""Keycloak SSO Login Helper
-"""
-
-from typing import Optional
-
-import httpx
-from fastapi_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
-
-
-class KeycloakSSO(SSOBase):
-    """Class providing login via Keycloak OAuth"""
-
-    provider = "keycloak"
-    scope = ["openid", "email", "profile"]
-    discovery_url = ""
-
-    async def openid_from_response(
-        self, response: dict, session: Optional["httpx.AsyncClient"] = None
-    ) -> OpenID:
-        """Return OpenID from user information provided by Keycloak"""
-        return OpenID(
-            email=response.get("email", ""),
-            provider=self.provider,
-            id=response.get("sub"),
-            first_name=response.get("given_name"),
-            last_name=response.get("family_name"),
-            display_name=response.get("name"),
-            picture=response.get("picture"),
-        )
-
-    async def get_discovery_document(self) -> DiscoveryDocument:
-        """Get document containing handy urls"""
-        async with httpx.AsyncClient() as session:
-            response = await session.get(self.discovery_url)
-            content = response.json()
-
-            return content

lnbits/core/tasks.py

@@ -8,8 +8,8 @@ from lnbits.core.crud import (
     get_balance_notify,
     get_wallet,
     get_webpush_subscriptions_for_user,
-    mark_webhook_sent,
 )
+from lnbits.core.db import db
 from lnbits.core.models import Payment
 from lnbits.core.services import (
     get_balance_delta,
@@ -17,16 +17,29 @@ from lnbits.core.services import (
     switch_to_voidwallet,
 )
 from lnbits.settings import get_wallet_class, settings
-from lnbits.tasks import send_push_notification
+from lnbits.tasks import (
+    SseListenersDict,
+    create_permanent_task,
+    create_task,
+    register_invoice_listener,
+    send_push_notification,
+)
 
-api_invoice_listeners: Dict[str, asyncio.Queue] = {}
+api_invoice_listeners: Dict[str, asyncio.Queue] = SseListenersDict(
+    "api_invoice_listeners"
+)
+
+
+def register_killswitch():
+    """
+    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():
-    """
-    killswitch will check lnbits-status repository for a signal from
-    LNbits and will switch to VoidWallet if the killswitch is triggered.
-    """
     while True:
         WALLET = get_wallet_class()
         if settings.lnbits_killswitch and WALLET.__class__.__name__ != "VoidWallet":
@@ -41,7 +54,7 @@ async def killswitch_task():
                                 "Switching to VoidWallet. Killswitch triggered."
                             )
                             await switch_to_voidwallet()
-                except (httpx.RequestError, httpx.HTTPStatusError):
+                except (httpx.ConnectError, httpx.RequestError):
                     logger.error(
                         "Cannot fetch lnbits status manifest."
                         f" {settings.lnbits_status_manifest}"
@@ -49,11 +62,17 @@ async def killswitch_task():
         await asyncio.sleep(settings.lnbits_killswitch_interval * 60)
 
 
-async def watchdog_task():
+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":
@@ -68,23 +87,36 @@ async def watchdog_task():
         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
+    create_task(wait_for_paid_invoices(invoice_paid_queue))
+
+
 async def wait_for_paid_invoices(invoice_paid_queue: asyncio.Queue):
     """
-    This task dispatches events to all api_invoice_listeners,
-    webhooks, push notifications and balance notifications.
+    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")
-        # dispatch api_invoice_listeners
+        # send information to sse channel
         await dispatch_api_invoice_listeners(payment)
-        # payment notification
         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)
+
         # dispatch balance_notify
         url = await get_balance_notify(payment.wallet_id)
         if url:
@@ -92,22 +124,10 @@ async def wait_for_paid_invoices(invoice_paid_queue: asyncio.Queue):
             async with httpx.AsyncClient(headers=headers) as client:
                 try:
                     r = await client.post(url, timeout=4)
-                    r.raise_for_status()
-                    await mark_webhook_sent(payment.payment_hash, r.status_code)
-                except httpx.HTTPStatusError as exc:
-                    status_code = exc.response.status_code
-                    await mark_webhook_sent(payment.payment_hash, status_code)
-                    logger.warning(
-                        f"balance_notify returned a bad status_code: {status_code} "
-                        f"while requesting {exc.request.url!r}."
-                    )
-                    logger.warning(exc)
-                except httpx.RequestError as exc:
-                    await mark_webhook_sent(payment.payment_hash, -1)
-                    logger.warning(f"Could not send balance_notify to {url}")
-                    logger.warning(exc)
+                    await mark_webhook_sent(payment, r.status_code)
+                except (httpx.ConnectError, httpx.RequestError):
+                    pass
 
-        # dispatch push notification
         await send_payment_push_notification(payment)
 
 
@@ -117,12 +137,10 @@ async def dispatch_api_invoice_listeners(payment: Payment):
     """
     for chan_name, send_channel in api_invoice_listeners.items():
         try:
-            logger.debug(f"api invoice listener: sending paid event to {chan_name}")
+            logger.debug(f"sending invoice paid event to {chan_name}")
             send_channel.put_nowait(payment)
         except asyncio.QueueFull:
-            logger.error(
-                f"api invoice listener: QueueFull, removing {send_channel}:{chan_name}"
-            )
+            logger.error(f"removing sse listener {send_channel}:{chan_name}")
             api_invoice_listeners.pop(chan_name)
 
 
@@ -133,24 +151,26 @@ async def dispatch_webhook(payment: Payment):
     logger.debug("sending webhook", payment.webhook)
 
     if not payment.webhook:
-        return await mark_webhook_sent(payment.payment_hash, -1)
+        return await mark_webhook_sent(payment, -1)
 
     headers = {"User-Agent": settings.user_agent}
     async with httpx.AsyncClient(headers=headers) as client:
         data = payment.dict()
         try:
             r = await client.post(payment.webhook, json=data, timeout=40)
-            r.raise_for_status()
-            await mark_webhook_sent(payment.payment_hash, r.status_code)
-        except httpx.HTTPStatusError as exc:
-            await mark_webhook_sent(payment.payment_hash, exc.response.status_code)
-            logger.warning(
-                f"webhook returned a bad status_code: {exc.response.status_code} "
-                f"while requesting {exc.request.url!r}."
-            )
-        except httpx.RequestError:
-            await mark_webhook_sent(payment.payment_hash, -1)
-            logger.warning(f"Could not send webhook to {payment.webhook}")
+            await mark_webhook_sent(payment, r.status_code)
+        except (httpx.ConnectError, httpx.RequestError):
+            await mark_webhook_sent(payment, -1)
+
+
+async def mark_webhook_sent(payment: Payment, status: int) -> None:
+    await db.execute(
+        """
+        UPDATE apipayments SET webhook_status = ?
+        WHERE hash = ?
+        """,
+        (status, payment.payment_hash),
+    )
 
 
 async def send_payment_push_notification(payment: Payment):

lnbits/core/templates/admin/_tab_funding.html

@@ -7,21 +7,21 @@
         <div class="col">
           <p>Funding Source Info</p>
           <ul>
-            <li
-              v-text="'Funding Source: '+ settings.lnbits_backend_wallet_class"
-            ></li>
-            <li
-              v-text="'Node Balance: ' + (auditData.node_balance_msats /
-              1000).toLocaleString() + ' sats'"
-            ></li>
-            <li
-              v-text="'LNbits Balance: ' + (auditData.lnbits_balance_msats /
-              1000).toLocaleString() + ' sats'"
-            ></li>
-            <li
-              v-text="'Reserve Percent: ' + (auditData.node_balance_msats /
-              auditData.lnbits_balance_msats * 100).toFixed(2) + ' %'"
-            ></li>
+            {%raw%}
+            <li>Funding Source: {{settings.lnbits_backend_wallet_class}}</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 />
         </div>

lnbits/core/templates/admin/_tab_security.html

@@ -78,41 +78,6 @@
       </div>
     </div>
   </q-card-section>
-  <q-card-section
-    v-if="formData.auth_allowed_methods?.includes('keycloak-auth')"
-    class="q-pl-xl"
-  >
-    <strong class="q-my-none q-mb-sm">Keycloak Auth</strong>
-
-    <div class="row">
-      <div class="col-md-4 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.keycloak_discovery_url"
-          label="Keycloak Discovey URL"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-4 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.keycloak_client_id"
-          label="Keycloak Client ID"
-          hint="Make sure thant the authorization callback URL is set to https://{domain}/api/v1/auth/keycloak/token"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-4 col-sm-12">
-        <q-input
-          filled
-          v-model="formData.keycloak_client_secret"
-          type="password"
-          label="Keycloak Client Secret"
-        >
-        </q-input>
-      </div>
-    </div>
-  </q-card-section>
   <q-separator></q-separator>
   <q-card-section class="q-pa-none">
     <br />
@@ -131,7 +96,7 @@
               style="padding: 10px; color: #fafafa; height: 320px"
             >
               <small v-for="log in logs"
-                ><span v-text="log"></span><br
+                >{% raw %}{{ log }}{% endraw %}<br
               /></small>
             </q-scroll-area>
           </div>
@@ -166,6 +131,7 @@
                 ></q-btn>
               </q-input>
               <div>
+                {%raw%}
                 <q-chip
                   v-for="blocked_ip in formData.lnbits_blocked_ips"
                   :key="blocked_ip"
@@ -173,8 +139,10 @@
                   @remove="removeBlockedIPs(blocked_ip)"
                   color="primary"
                   text-color="white"
-                  v-text="blocked_ip"
-                ></q-chip>
+                >
+                  {{ blocked_ip }}
+                </q-chip>
+                {%endraw%}
               </div>
               <br />
             </div>
@@ -195,6 +163,7 @@
                 ></q-btn>
               </q-input>
               <div>
+                {%raw%}
                 <q-chip
                   v-for="allowed_ip in formData.lnbits_allowed_ips"
                   :key="allowed_ip"
@@ -202,14 +171,15 @@
                   @remove="removeAllowedIPs(allowed_ip)"
                   color="primary"
                   text-color="white"
-                  v-text="allowed_ip"
-                ></q-chip>
+                >
+                  {{ 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">
@@ -231,36 +201,6 @@
             </div>
           </div>
         </div>
-
-        <div class="col-12 col-md-12">
-          <p v-text="$t('wallet_limiter')"></p>
-          <div class="row q-col-gutter-md">
-            <div class="col-4">
-              <q-input
-                filled
-                type="number"
-                v-model.number="formData.lnbits_wallet_limit_max_balance"
-                :label="$t('wallet_max_ballance')"
-              ></q-input>
-            </div>
-            <div class="col-4">
-              <q-input
-                filled
-                type="number"
-                v-model.number="formData.lnbits_wallet_limit_daily_max_withdraw"
-                :label="$t('wallet_limit_max_withdraw_per_day')"
-              ></q-input>
-            </div>
-            <div class="col-4">
-              <q-input
-                filled
-                type="number"
-                v-model.number="formData.lnbits_wallet_limit_secs_between_trans"
-                :label="$t('wallet_limit_secs_between_trans')"
-              ></q-input>
-            </div>
-          </div>
-        </div>
       </div>
     </div>
     <br />

lnbits/core/templates/admin/_tab_security_notifications.html

@@ -1,3 +1,4 @@
+{% raw %}
 <q-banner v-if="updateAvailable" class="bg-primary text-white">
   <q-icon size="28px" name="update"></q-icon>
 
@@ -29,12 +30,9 @@
       <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"
-            v-text="col.label"
-          ></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">
@@ -53,16 +51,12 @@
               color="red"
             ></q-icon>
           </q-td>
-          <q-td
-            auto-width
-            key="date"
-            :props="props"
-            v-text="formatDate(props.row.date)"
-          >
+          <q-td auto-width key="date" :props="props">
+            {{ formatDate(props.row.date) }}
           </q-td>
           <q-td key="message" :props="props"
-            ><span v-text="props.row.message"></span
-            ><a
+            >{{ props.row.message }}
+            <a
               v-if="props.row.link"
               target="_blank"
               rel="noopener noreferrer"
@@ -75,3 +69,4 @@
     </q-table>
   </q-card-section>
 </q-card>
+{% endraw %}

lnbits/core/templates/admin/_tab_server.html

@@ -7,14 +7,14 @@
         <div class="col">
           <p>Server Info</p>
           <ul>
-            <li
-              v-if="settings.lnbits_data_folder"
-              v-text="'SQlite: ' + settings.lnbits_data_folder"
-            ></li>
-            <li
-              v-if="settings.lnbits_database_url"
-              v-text="'Postgres: ' + settings.lnbits_database_url"
-            ></li>
+            {%raw%}
+            <li v-if="settings.lnbits_data_folder">
+              SQlite: {{settings.lnbits_data_folder}}
+            </li>
+            <li v-if="settings.lnbits_database_url">
+              Postgres: {{settings.lnbits_database_url}}
+            </li>
+            {%endraw%}
           </ul>
           <br />
         </div>
@@ -154,6 +154,7 @@
           <q-btn @click="addExtensionsManifest" dense flat icon="add"></q-btn>
         </q-input>
         <div>
+          {%raw%}
           <q-chip
             v-for="manifestUrl in formData.lnbits_extensions_manifests"
             :key="manifestUrl"
@@ -161,8 +162,10 @@
             @remove="removeExtensionsManifest(manifestUrl)"
             color="primary"
             text-color="white"
-            v-text="manifestUrl"
-          ></q-chip>
+          >
+            {{ manifestUrl }}
+          </q-chip>
+          {%endraw%}
         </div>
         <br />
       </div>

lnbits/core/templates/admin/_tab_users.html

@@ -16,6 +16,7 @@
           <q-btn @click="addAdminUser" dense flat icon="add"></q-btn>
         </q-input>
         <div>
+          {%raw%}
           <q-chip
             v-for="user in formData.lnbits_admin_users"
             :key="user"
@@ -24,8 +25,9 @@
             color="primary"
             text-color="white"
           >
-            <span v-text="user" />
+            {{ user }}
           </q-chip>
+          {%endraw%}
         </div>
         <br />
       </div>
@@ -42,6 +44,7 @@
           <q-btn @click="addAllowedUser" dense flat icon="add"></q-btn>
         </q-input>
         <div>
+          {% raw %}
           <q-chip
             v-for="user in formData.lnbits_allowed_users"
             :key="user"
@@ -50,28 +53,11 @@
             color="primary"
             text-color="white"
           >
-            <span v-text="user" />
+            {{ user }}
           </q-chip>
+          {% endraw %}
         </div>
         <br />
-        <q-item tag="label" v-ripple>
-          <q-item-section>
-            <q-item-label>Allow creation of new users</q-item-label>
-            <q-item-label caption
-              >Allow creation of new users on the index page</q-item-label
-            >
-          </q-item-section>
-          <q-item-section avatar>
-            <q-toggle
-              size="md"
-              v-model="formData.lnbits_allow_new_accounts"
-              checked-icon="check"
-              color="green"
-              unchecked-icon="clear"
-            />
-          </q-item-section>
-        </q-item>
-        <br />
       </div>
     </div>
   </q-card-section>

lnbits/core/templates/admin/index.html

@@ -8,9 +8,9 @@
       @click="updateSettings"
       :disabled="!checkChanges"
     >
-      <q-tooltip v-if="checkChanges">
-        <span v-text="$t('save_tooltip')"></span>
-      </q-tooltip>
+      <q-tooltip v-if="checkChanges"
+        >{%raw%}{{ $t('save_tooltip') }}{%endraw%}</q-tooltip
+      >
 
       <q-badge
         v-if="checkChanges"
@@ -27,9 +27,9 @@
       color="primary"
       @click="restartServer"
     >
-      <q-tooltip v-if="needsRestart">
-        <span v-text="$t('restart_tooltip')"></span>
-      </q-tooltip>
+      <q-tooltip v-if="needsRestart"
+        >{%raw%}{{ $t('restart_tooltip') }}{%endraw%}</q-tooltip
+      >
 
       <q-badge
         v-if="needsRestart"
@@ -46,9 +46,7 @@
       color="primary"
       @click="topUpDialog.show = true"
     >
-      <q-tooltip>
-        <span v-text="$t('add_funds_tooltip')"></span>
-      </q-tooltip>
+      <q-tooltip>{%raw%}{{ $t('add_funds_tooltip') }}{%endraw%}</q-tooltip>
     </q-btn>
 
     <q-btn :label="$t('download_backup')" flat @click="downloadBackup"></q-btn>
@@ -61,9 +59,7 @@
       @click="deleteSettings"
       class="float-right"
     >
-      <q-tooltip>
-        <span v-text="$t('reset_defaults_tooltip')"></span>
-      </q-tooltip>
+      <q-tooltip>{%raw%}{{ $t('reset_defaults_tooltip') }}{%endraw%}</q-tooltip>
     </q-btn>
   </div>
 </div>

lnbits/core/templates/core/_api_docs.html

@@ -5,7 +5,6 @@
   :content-inset-level="0.5"
 >
   <q-card-section>
-    <strong>Node URL: </strong><em v-text="origin"></em><br />
     <strong>Wallet ID: </strong><em>{{ wallet.id }}</em><br />
     <strong>Admin key: </strong><em>{{ wallet.adminkey }}</em><br />
     <strong>Invoice/read key: </strong><em>{{ wallet.inkey }}</em>

lnbits/core/templates/core/account.html

@@ -401,23 +401,6 @@
                     ></lnbits-notifications-btn>
                   </div>
                 </div>
-                <div class="row q-mb-md">
-                  <div class="col-4">
-                    <span v-text="$t('payment_reactions')"></span>
-                  </div>
-                  <div class="col-8">
-                    <q-select
-                      v-model="reactionChoice"
-                      :options="reactionOptions"
-                      label="Reactions"
-                      @input="reactionChoiceFunc"
-                    >
-                      <q-tooltip
-                        ><span v-text="$t('payment_reactions')"></span
-                      ></q-tooltip>
-                    </q-select>
-                  </div>
-                </div>
               </q-tab-panel>
             </q-tab-panels>
           </div>

lnbits/core/templates/core/extensions.html

@@ -2,7 +2,7 @@
 %} {{ 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" v-text="$t('extensions')"></p>
+    <p class="text-h4 gt-sm">{%raw%}{{ $t('extensions') }}{%endraw%}</p>
   </div>
 
   <div class="col-sm-3 col-xs-12 q-ml-auto">
@@ -43,10 +43,9 @@
               :label="$t('featured')"
               @update="val => tab = val.name"
             ></q-tab>
-            <i
-              v-if="!g.user.admin && tab != 'installed'"
-              v-text="$t('only_admins_can_install')"
-            ></i>
+            <i v-if="!g.user.admin && tab != 'installed'"
+              >{%raw%}{{ $t('only_admins_can_install') }}{%endraw%}</i
+            >
           </q-tabs>
         </div>
       </div>
@@ -90,42 +89,45 @@
               color="green"
               class="float-right"
             >
-              <small v-text="$t('new_version')"></small>
+              <small>{%raw%}{{ $t('new_version') }}{%endraw%}</small>
               <q-tooltip
                 ><span v-text="extension.latestRelease.version"></span
               ></q-tooltip>
             </q-badge>
-            <div
-              class="text-h5 gt-sm q-mt-sm q-mb-xs gt-sm"
-              v-text="extension.name"
-            ></div>
+            {% 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"
-              v-text="extension.name"
-            ></div>
+            >
+              {{ extension.name }}
+            </div>
             <div
               class="text-subtitle2 gt-sm"
               style="font-size: 11px; height: 34px"
-              v-text="extension.shortDescription || extension.installedRelease?.description"
-            ></div>
-            <div
-              class="text-subtitle1 lt-md q-mt-sm q-mb-xs"
-              v-text="extension.name"
-            ></div>
+            >
+              {{ extension.shortDescription ||
+              extension.installedRelease?.description }}
+            </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"
-              v-text="extension.shortDescription"
-            ></div>
+            >
+              {{ extension.shortDescription }}
+            </div>
+            {% endraw %}
           </div>
         </div>
         <div class="row q-pt-sm">
           <div class="col">
-            <small
-              v-if="extension.dependencies?.length"
-              v-text="$t('extension_depends_on')"
-            ></small>
+            <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"
@@ -146,18 +148,20 @@
             size="1.5em"
             :max="5"
             color="primary"
-            ><q-tooltip>
-              <span v-text="$t('extension_rating_soon')"></span> </q-tooltip
-          ></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-tooltip>
-              <span v-text="$t('extension_rating_soon')"></span> </q-tooltip
-          ></q-rating>
+            ><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') "
@@ -165,11 +169,11 @@
             style="max-height: 21px"
             v-model="extension.isActive"
             @input="toggleExtension(extension)"
-            ><q-tooltip>
-              <span
-                v-text="$t('activate_extension_details')"
-              ></span> </q-tooltip
-          ></q-toggle>
+            ><q-tooltip
+              >{%raw%}{{ $t('activate_extension_details')
+              }}{%endraw%}</q-tooltip
+            ></q-toggle
+          >
         </div>
       </q-card-section>
       <q-separator></q-separator>
@@ -182,8 +186,8 @@
               color="primary"
               type="a"
               :href="extension.id + '/'"
-              :label="$t('open')"
-            ></q-btn>
+              >{%raw%}{{ $t('open') }}{%endraw%}</q-btn
+            >
             <q-btn
               v-if="user.extensions.includes(extension.id) && extension.isActive && extension.isInstalled"
               flat
@@ -192,12 +196,11 @@
               :href="['{{
                 url_for('install.extensions')
               }}', '?disable=', extension.id].join('')"
-              :label="$t('disable')"
-            ></q-btn>
-            <q-badge
-              v-if="extension.isAdminOnly && !user.admin"
-              v-text="$t('admin_only')"
             >
+              {%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)"
@@ -207,8 +210,8 @@
               :href="['{{
                 url_for('install.extensions')
               }}', '?enable=', extension.id].join('')"
-              :label="$t('enable')"
             >
+              {%raw%}{{ $t('enable') }}{%endraw%}
               <q-tooltip>
                 <span v-text="$t('enable_extension_details')">
                 </span> </q-tooltip
@@ -219,11 +222,12 @@
               flat
               color="primary"
               v-if="g.user.admin"
-              :label="$t('manage')"
-              ><q-tooltip
-                ><span v-text="$t('manage_extension_details')"></span
-              ></q-tooltip>
-            </q-btn>
+            >
+              {%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>
@@ -236,7 +240,7 @@
             class="float-right"
           >
             <q-badge>
-              <span v-text="extension.installedRelease.version"></span>
+              {% raw %}{{ extension.installedRelease.version }}{% endraw %}
               <q-tooltip>
                 <span v-text="$t('extension_installed_version')"></span>
               </q-tooltip>
@@ -248,10 +252,10 @@
   </div>
   <q-dialog v-model="showUninstallDialog">
     <q-card class="q-pa-lg">
-      <h6 class="q-my-md text-primary" v-text="$t('warning')"></h6>
+      <h6 class="q-my-md text-primary">{%raw%}{{ $t('warning') }}{%endraw%}</h6>
       <p>
-        <span v-text="$t('extension_uninstall_warning')"></span><br />
-        <span v-text="$t('confirm_continue')"></span>
+        {%raw%}{{ $t('extension_uninstall_warning') }}{%endraw%} <br />
+        {%raw%}{{ $t('confirm_continue') }}{%endraw%}
       </p>
 
       <div class="row q-mt-lg">
@@ -260,39 +264,32 @@
           value="false"
           label="Cleanup database tables"
         >
-          <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-            ><span v-text="$t('extension_db_drop_info')"></span>
+          <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()"
-          v-text="$t('uninstall_confirm')"
-        ></q-btn>
-        <q-btn
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          v-text="$t('cancel')"
-        ></q-btn>
+        <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" v-text="$t('warning')"></h6>
-      <p><span v-text="$t('extension_db_drop_warning')"></span><br /></p>
+      <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 v-text="$t('confirm_continue')"></p>
+      <p>{%raw%}{{ $t('confirm_continue') }}{%endraw%}</p>
 
       <div class="row q-mt-lg">
         <q-btn
@@ -300,58 +297,17 @@
           outline
           color="red"
           @click="dropExtensionDb()"
-          v-text="$t('confirm')"
-        ></q-btn>
-        <q-btn
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          v-text="$t('cancel')"
-        ></q-btn>
+          >{%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 v-if="selectedRelease" class="q-pa-lg lnbits__dialog-card">
-      <q-card-section>
-        <div v-if="selectedRelease.paymentRequest">
-          <a :href="'lightning:' + selectedRelease.paymentRequest">
-            <q-responsive :ratio="1" class="q-mx-xl">
-              <lnbits-qrcode
-                :value="'lightning:' + selectedRelease.paymentRequest.toUpperCase()"
-              ></lnbits-qrcode>
-            </q-responsive>
-          </a>
-        </div>
-        <div v-else>
-          <q-spinner color="primary" size="2.55em"></q-spinner>
-        </div>
-      </q-card-section>
-
-      <div class="row q-mt-lg">
-        <div class="col">
-          <q-btn
-            v-if="selectedRelease.paymentRequest"
-            outline
-            color="grey"
-            @click="copyText(selectedRelease.paymentRequest)"
-            :label="$t('copy_invoice')"
-          ></q-btn>
-        </div>
-        <div class="col">
-          <q-btn
-            v-close-popup
-            flat
-            color="grey"
-            class="float-right q-ml-lg"
-            v-text="$t('close')"
-          ></q-btn>
-        </div>
-      </div>
-    </q-card>
-    <q-card v-else class="q-pa-lg lnbits__dialog-card">
+    <q-card class="q-pa-lg lnbits__dialog-card">
       <q-card-section>
         <div class="text-h6" v-text="selectedExtension?.name"></div>
       </q-card-section>
@@ -381,7 +337,7 @@
               <q-item-section>
                 <div class="row">
                   <div class="col-10">
-                    <span v-text="$t('repository')"></span>
+                    {%raw%}{{ $t('repository') }}{%endraw%}
                     <br />
                     <small v-text="repoName"></small>
                     <q-tooltip
@@ -420,104 +376,19 @@
                       color="pink"
                       size="70px"
                     ></q-icon>
-                    <span v-text="$t('release_details_error')"></span>
+                    Cannot get the release details.
                   </div>
                   <q-card v-else>
                     <q-card-section v-if="release.is_version_compatible">
-                      <span
-                        v-if="release.requiresPayment && !release.paid_sats"
-                        v-text="$t('extension_cost', {cost: release.cost_sats})"
-                        class="q-mb-lg"
-                      ></span>
-                      <span
-                        v-if="release.requiresPayment && release.paid_sats"
-                        class="q-mb-lg"
-                        v-text="$t('extension_paid_sats', {paid_sats: release.paid_sats})"
-                      ></span>
-                      <div
-                        v-if="!release.requiresPayment || (release.requiresPayment && release.paid_sats)"
+                      <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
                       >
-                        <q-btn
-                          v-if="!release.isInstalled"
-                          @click="installExtension(release)"
-                          color="primary unelevated mt-lg pt-lg"
-                          :label="$t('install')"
-                        ></q-btn>
-                      </div>
-
-                      <div v-if="release.requiresPayment && !release.paid_sats">
-                        <div v-if="!release.payment_hash">
-                          <q-input
-                            filled
-                            dense
-                            v-model.number="release.paidAmount"
-                            type="number"
-                            :min="release.cost_sats"
-                            suffix="sat"
-                            class="q-mt-sm"
-                          >
-                          </q-input>
-                          <q-select
-                            filled
-                            dense
-                            emit-value
-                            v-model="release.wallet"
-                            :options="g.user.walletOptions"
-                            label="Wallet *"
-                            class="q-mt-sm"
-                          >
-                          </q-select>
-                          <q-btn
-                            unelevated
-                            color="primary"
-                            @click="payAndInstall(release)"
-                            :disabled="!release.wallet"
-                            class="q-mt-sm"
-                            :label="$t('pay_from_wallet')"
-                          ></q-btn>
-
-                          <q-btn
-                            unelevated
-                            color="primary"
-                            @click="showQRCode(release)"
-                            class="q-mt-sm float-right"
-                            :label="$t('show_qr')"
-                          ></q-btn>
-                        </div>
-                        <div v-else>
-                          <br />
-                          <span
-                            class="q-mb-lg q-mt-lg"
-                            v-text="'There is a previous pending invoice for this release.'"
-                          ></span>
-                          <br />
-                          <q-btn
-                            unelevated
-                            @click="installExtension(release)"
-                            color="primary"
-                            class="q-mt-sm"
-                            :label="$t('retry_install')"
-                          ></q-btn>
-                          <q-btn
-                            unelevated
-                            @click="clearHangingInvoice(release)"
-                            color="primary"
-                            class="q-mt-sm float-right"
-                            :label="$t('new_payment')"
-                          ></q-btn>
-                        </div>
-                      </div>
-
-                      <div>
-                        <q-btn
-                          v-if="release.isInstalled"
-                          @click="showUninstall()"
-                          :label="$t('uninstall')"
-                          flat
-                          color="red"
-                        ></q-btn>
-                      </div>
-
                       <a
                         v-if="release.html_url"
                         class="text-secondary float-right"
@@ -525,11 +396,11 @@
                         target="_blank"
                         rel="noopener noreferrer"
                         style="color: inherit"
-                        v-text="$t('release_notes')"
-                      ></a>
+                        >{%raw%}{{ $t('release_notes') }}{%endraw%}</a
+                      >
                     </q-card-section>
                     <q-card-section v-else>
-                      <span v-text="$t('extension_min_lnbits_version')"></span>
+                      {%raw%}{{ $t('extension_min_lnbits_version') }}{%endraw%}
                       <strong>
                         <span v-text="release.min_lnbits_version"></span>
                       </strong>
@@ -537,11 +408,8 @@
                     <q-card v-if="release.warning">
                       <q-card-section>
                         <div class="text-h6">
-                          <q-badge
-                            color="yellow"
-                            text-color="black"
-                            v-text="$t('warning')"
-                          >
+                          <q-badge color="yellow" text-color="black">
+                            {%raw%}{{ $t('warning') }}{%endraw%}
                           </q-badge>
                         </div>
                         <div class="text-subtitle2">
@@ -564,8 +432,9 @@
           @click="showUninstall()"
           flat
           color="red"
-          v-text="$t('uninstall')"
-        ></q-btn>
+        >
+          {%raw%}{{ $t('uninstall') }}{%endraw%}</q-btn
+        >
         <q-btn
           v-else-if="selectedExtension?.hasDatabaseTables"
           @click="showDropDb()"
@@ -573,13 +442,9 @@
           color="red"
           :label="$t('drop_db')"
         ></q-btn>
-        <q-btn
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          v-text="$t('close')"
-        ></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>
@@ -599,10 +464,8 @@
         dropDbExtensionId: '',
         selectedExtension: null,
         selectedExtensionRepos: null,
-        selectedRelease: null,
         uninstallAndDropDb: false,
         maxStars: 5,
-        paylinkWebsocket: null,
         user: null
       }
     },
@@ -641,18 +504,10 @@
           .filter(extensionNameContains(term))
         this.tab = tab
       },
-
       installExtension: async function (release) {
-        // no longer required to check if the invoice was paid
-        // the install logic has been triggered one way or another
-        this.unsubscribeFromPaylinkWs()
-
         const extension = this.selectedExtension
         extension.inProgress = true
         this.showUpgradeDialog = false
-        release.payment_hash =
-          release.payment_hash || this.getPaylinkHash(release.pay_link)
-
         LNbits.api
           .request(
             'POST',
@@ -661,9 +516,7 @@
             {
               ext_id: extension.id,
               archive: release.archive,
-              source_repo: release.source_repo,
-              payment_hash: release.payment_hash,
-              version: release.version
+              source_repo: release.source_repo
             }
           )
           .then(response => {
@@ -677,9 +530,8 @@
             this.tab = 'installed'
           })
           .catch(err => {
-            console.warn(err)
-            extension.inProgress = false
             LNbits.utils.notifyApiError(err)
+            extension.inProgress = false
           })
       },
       uninstallExtension: async function () {
@@ -771,10 +623,8 @@
 
       showUpgrade: async function (extension) {
         this.selectedExtension = extension
-        this.selectedRelease = null
-        this.selectedExtensionRepos = null
         this.showUpgradeDialog = true
-
+        this.selectedExtensionRepos = null
         try {
           const {data} = await LNbits.api.request(
             'GET',
@@ -798,12 +648,6 @@
             if (release.isInstalled) {
               repos[release.source_repo].isInstalled = true
             }
-            if (release.pay_link) {
-              release.requiresPayment = true
-              release.paidAmount = release.cost_sats
-              release.payment_hash = this.getPaylinkHash(release.pay_link)
-            }
-
             repos[release.source_repo].releases.push(release)
             return repos
           }, {})
@@ -812,122 +656,6 @@
           extension.inProgress = false
         }
       },
-
-      async payAndInstall(release) {
-        try {
-          this.selectedExtension.inProgress = true
-          this.showUpgradeDialog = false
-          const paymentInfo = await this.requestPayment(
-            this.selectedExtension.id,
-            release
-          )
-          this.rememberPaylinkHash(release.pay_link, paymentInfo.payment_hash)
-          const wallet = this.g.user.wallets.find(w => w.id === release.wallet)
-          const {data} = await LNbits.api.payInvoice(
-            wallet,
-            paymentInfo.payment_request
-          )
-
-          release.payment_hash = data.payment_hash
-
-          await this.installExtension(release)
-        } catch (err) {
-          console.warn(err)
-          LNbits.utils.notifyApiError(err)
-        } finally {
-          this.selectedExtension.inProgress = false
-        }
-      },
-      async showQRCode(release) {
-        this.selectedRelease = release
-
-        try {
-          const data = await this.requestPayment(
-            this.selectedExtension.id,
-            release
-          )
-
-          this.selectedRelease.paymentRequest = data.payment_request
-          this.selectedRelease.payment_hash = data.payment_hash
-          this.selectedRelease = _.clone(this.selectedRelease)
-          this.rememberPaylinkHash(
-            this.selectedRelease.pay_link,
-            this.selectedRelease.payment_hash
-          )
-
-          this.subscribeToPaylinkWs(
-            this.selectedRelease.pay_link,
-            data.payment_hash
-          )
-        } catch (err) {
-          console.warn(err)
-          LNbits.utils.notifyApiError(err)
-        }
-      },
-
-      async requestPayment(extId, release) {
-        const {data} = await LNbits.api.request(
-          'PUT',
-          `/api/v1/extension/invoice`,
-          this.g.user.wallets[0].adminkey,
-          {
-            ext_id: extId,
-            archive: release.archive,
-            source_repo: release.source_repo,
-            cost_sats: release.paidAmount,
-            version: release.version
-          }
-        )
-        return data
-      },
-
-      clearHangingInvoice(release) {
-        this.forgetPaylinkHash(release.pay_link)
-        release.payment_hash = null
-      },
-
-      rememberPaylinkHash(pay_link, payment_hash) {
-        this.$q.localStorage.set(
-          `lnbits.extensions.paylink.${pay_link}`,
-          payment_hash
-        )
-      },
-      getPaylinkHash(pay_link) {
-        return this.$q.localStorage.getItem(
-          `lnbits.extensions.paylink.${pay_link}`
-        )
-      },
-      forgetPaylinkHash(pay_link) {
-        this.$q.localStorage.remove(`lnbits.extensions.paylink.${pay_link}`)
-      },
-      subscribeToPaylinkWs(pay_link, payment_hash) {
-        const url = new URL(`${pay_link}/${payment_hash}`)
-        url.protocol = url.protocol === 'https:' ? 'wss' : 'ws'
-        this.paylinkWebsocket = new WebSocket(url)
-        this.paylinkWebsocket.addEventListener('message', async ({data}) => {
-          const resp = JSON.parse(data)
-          if (resp.paid) {
-            this.$q.notify({
-              type: 'positive',
-              message: 'Invoice Paid!'
-            })
-            this.installExtension(this.selectedRelease)
-          } else {
-            this.$q.notify({
-              type: 'warning',
-              message: 'Invoice tracking lost!'
-            })
-          }
-        })
-      },
-      unsubscribeFromPaylinkWs() {
-        try {
-          this.paylinkWebsocket && this.paylinkWebsocket.close()
-        } catch (error) {
-          console.warn(error)
-        }
-      },
-
       hasNewVersion: function (extension) {
         if (extension.installedRelease && extension.latestRelease) {
           return (

lnbits/core/templates/core/index.html

@@ -4,16 +4,12 @@
 <div class="row q-col-gutter-md justify-center">
   <div
     v-if="isUserAuthorized"
-    class="col-12 col-md-6 col-lg-6 q-gutter-y-md"
+    class="col-12 col-md-7 col-lg-6 q-gutter-y-md"
   ></div>
-  <div v-else class="col-12 col-md-4 col-lg-4 q-gutter-y-md">
+  <div v-else class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
     <div class="gt-sm">
-      <h3 class="q-my-none" v-if="'{{SITE_TITLE}}' == 'LNbits'">
-        {{SITE_TITLE}}
-      </h3>
-      <h5 class="q-my-md" v-if="'{{SITE_TITLE}}' == 'LNbits'">
-        {{SITE_TAGLINE}}
-      </h5>
+      <h3 class="q-my-none">{{SITE_TITLE}}</h3>
+      <h5 class="q-my-md">{{SITE_TAGLINE}}</h5>
     </div>
     {% if lnurl and LNBITS_NEW_ACCOUNTS_ALLOWED and ("user-id-only" in
     LNBITS_AUTH_METHODS)%}
@@ -37,7 +33,7 @@
     {%else%} {% endif %}
 
     <div class="row q-mt-md">
-      <div class="col-12 col-md-10 col-lg-10 q-gutter-y-md">
+      <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
         <q-badge v-if="isAccessTokenExpired" color="primary" rounded>
           <div class="text-h5">
             <span v-text="$t('session_has_expired')"></span>
@@ -263,25 +259,6 @@
                   <div><span v-text="$t('signin_with_github')"></span></div>
                 </q-btn>
               </div>
-              {%endif%} {% if "keycloak-auth" in LNBITS_AUTH_METHODS %}
-              <div class="col-12 full-width q-pa-sm">
-                <q-btn
-                  href="/api/v1/auth/keycloak"
-                  type="a"
-                  outline
-                  no-caps
-                  color="grey"
-                  rounded
-                  class="full-width"
-                >
-                  <q-avatar size="32px" class="q-mr-md">
-                    <q-img
-                      :src="'{{ static_url_for('static', 'images/keycloak-logo.png') }}'"
-                    ></q-img>
-                  </q-avatar>
-                  <div><span v-text="$t('signin_with_keycloak')"></span></div>
-                </q-btn>
-              </div>
               {%endif%}
             </div>
           </q-card-section>
@@ -305,16 +282,11 @@
     </div>
   </div>
 
+  <!-- Ads -->
   <div
-    v-if="'{{SITE_TITLE}}' != 'LNbits'"
-    class="col-12 col-md-5 col-lg-5 q-pt-xl"
+    class="col-12 col-md-3 col-lg-3 gt-sm"
+    v-if="'{{SITE_TITLE}}' == 'LNbits'"
   >
-    <h3 class="q-my-none">{{SITE_TITLE}}</h3>
-    <h5 class="q-my-md">{{SITE_TAGLINE}}</h5>
-    <div v-html="formatDescription"></div>
-  </div>
-
-  <div class="col-12 col-md-3 col-lg-3 gt-sm" v-else>
     <div class="row q-col-gutter-lg justify-center">
       <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
         <q-btn
@@ -490,32 +462,30 @@
               ></q-img>
             </a>
           </div>
-          <div class="col q-pl-md">
-            <a href="https://zbd.gg" target="_blank" rel="noopener noreferrer">
-              <q-img
-                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/zbd.png') }}' : '{{ static_url_for('static', 'images/zbdl.png') }}'"
-              ></q-img>
-            </a>
-          </div>
+          <div class="col q-pl-md"></div>
         </div>
       </div>
+
+      {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %}
+      <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
+        <q-btn flat color="secondary" class="full-width q-mb-md"
+          >{{ AD_SPACE_TITLE }}</q-btn
+        >
+
+        <a href="{{ AD[0] }}" class="q-ma-md">
+          <img
+            v-if="($q.dark.isActive)"
+            src="{{ AD[1] }}"
+            style="max-width: 90%"
+          />
+          <img v-else src="{{ AD[2] }}" style="max-width: 90%" />
+        </a>
+      </div>
+      {% endfor %} {% endif %}
     </div>
   </div>
-  {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %}
-  <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
-    <q-btn flat color="secondary" class="full-width q-mb-md"
-      >{{ AD_SPACE_TITLE }}</q-btn
-    >
-
-    <a href="{{ AD[0] }}" class="q-ma-md">
-      <img v-if="($q.dark.isActive)" src="{{ AD[1] }}" style="max-width: 90%" />
-      <img v-else src="{{ AD[2] }}" style="max-width: 90%" />
-    </a>
-  </div>
-  {% endfor %} {% endif %}
 </div>
-<div v-if="'{{SITE_TITLE}}' == 'LNbits'" class="row gt-sm q-mt-xl">
+<div class="row gt-sm q-mt-xl">
   <div class="col-1"></div>
   <div class="col-10 q-pl-xl">
     <span v-text="$t('lnbits_description')"></span>

lnbits/core/templates/core/wallet.html

@@ -370,7 +370,7 @@
                     <q-card-section class="text-center">
                       <p v-text="$t('export_to_phone_desc')"></p>
                       <qrcode
-                        :value="'{{request.base_url}}wallet?usr={{user.id}}&wal={{wallet.id}}'"
+                        :value="'{{request.base_url}}' +'wallet?wal={{wallet.id}}'"
                         :options="{width:240}"
                       ></qrcode>
                     </q-card-section>
@@ -922,11 +922,8 @@
 
       <q-dialog v-model="disclaimerDialog.show" position="top">
         <q-card class="q-pa-lg">
-          <h6
-            class="q-my-md text-primary"
-            v-text="$t('disclaimer_dialog_title')"
-          ></h6>
-          <p class="whitespace-pre-line" v-text="$t('disclaimer_dialog')"></p>
+          <h6 class="q-my-md text-primary">Warning</h6>
+          <p v-text="$t('disclaimer_dialog')"></p>
           <div class="row q-mt-lg">
             <q-btn
               outline

lnbits/core/templates/node/_tab_channels.html

@@ -150,6 +150,7 @@
                 Open channel
               </q-btn>
             </div>
+            {% raw %}
             <div>
               <div class="text-subtitle1 col-grow">Total</div>
               <lnbits-channel-balance
@@ -171,12 +172,11 @@
                 <q-tr :props="props">
                   <div class="q-pb-sm">
                     <div class="row items-center q-gutter-sm">
-                      <div
-                        class="text-subtitle1 col-grow"
-                        v-text="props.row.name"
-                      ></div>
+                      <div class="text-subtitle1 col-grow">
+                        {{props.row.name}}
+                      </div>
                       <div class="text-caption" v-if="props.row.short_id">
-                        <span v-text="props.row.short_id"></span>
+                        {{ props.row.short_id }}
                         <q-btn
                           size="xs"
                           flat
@@ -188,8 +188,9 @@
                       <q-badge
                         rounded
                         :color="states.find(s => s.value == props.row.state)?.color"
-                        v-text="states.find(s => s.value == props.row.state)?.label"
                       >
+                        {{ states.find(s => s.value == props.row.state)?.label
+                        }}
                       </q-badge>
                       <q-btn
                         :disable='props.row.state !== "active"'
@@ -209,12 +210,15 @@
                 </q-tr>
               </template>
             </q-table>
+
+            {% endraw %}
           </q-card-section>
         </q-card>
       </div>
       <div class="col-12 col-xl-6">
         <q-card class="full-height">
           <q-card-section class="column q-gutter-y-sm">
+            {% raw %}
             <div
               class="row items-center q-mt-none justify-between q-gutter-x-md no-wrap"
             >
@@ -250,21 +254,19 @@
                 <q-tr :props="props">
                   <div class="row no-wrap items-center q-gutter-sm">
                     <div class="q-my-sm col-grow">
-                      <div
-                        class="text-subtitle1 text-bold"
-                        v-text="props.row.alias"
-                      ></div>
+                      <div class="text-subtitle1 text-bold">
+                        {{ props.row.alias }}
+                      </div>
                       <div class="row items-center q-gutter-sm">
                         <q-badge
                           :style="`background-color: #${props.row.color}`"
                           class="text-bold"
-                          v-text="'#'+props.row.color"
                         >
+                          #{{ props.row.color }}
                         </q-badge>
-                        <div
-                          class="text-bold"
-                          v-text="shortenNodeId(props.row.id)"
-                        ></div>
+                        <div class="text-bold">
+                          {{ shortenNodeId(props.row.id) }}
+                        </div>
                         <q-btn
                           size="xs"
                           flat
@@ -300,6 +302,8 @@
                 </q-tr>
               </template>
             </q-table>
+
+            {% endraw %}
           </q-card-section>
         </q-card>
       </div>

lnbits/core/templates/node/_tab_dashboard.html

@@ -1,5 +1,6 @@
 <q-tab-panel name="dashboard">
   <q-card-section class="q-pa-none">
+    {% raw %}
     <lnbits-node-info :info="this.info"></lnbits-node-info>
     <div class="row q-col-gutter-lg q-mt-sm">
       <div class="col-12 col-md-8 q-gutter-y-md">
@@ -64,5 +65,6 @@
         ></lnbits-channel-stats>
       </div>
     </div>
+    {% endraw %}
   </q-card-section>
 </q-tab-panel>

lnbits/core/templates/node/_tab_transactions.html

@@ -3,6 +3,7 @@
     <q-dialog v-model="transactionDetailsDialog.show">
       <q-card class="my-card">
         <q-card-section>
+          {% raw %}
           <div class="text-center q-mb-lg">
             <div
               v-if="transactionDetailsDialog.data.isIn && transactionDetailsDialog.data.pending"
@@ -17,9 +18,7 @@
             <div class="row q-my-md">
               <div class="col-3"><b v-text="$t('payment_hash')"></b>:</div>
               <div class="col-9 text-wrap mono">
-                <span
-                  v-text="transactionDetailsDialog.data.payment_hash"
-                ></span>
+                {{ transactionDetailsDialog.data.payment_hash }}
                 <q-icon
                   name="content_copy"
                   @click="copyText(transactionDetailsDialog.data.payment_hash)"
@@ -34,7 +33,7 @@
               >
                 <div class="col-3"><b v-text="$t('payment_proof')"></b>:</div>
                 <div class="col-9 text-wrap mono">
-                  <span v-text="transactionDetailsDialog.data.preimage"></span>
+                  {{ transactionDetailsDialog.data.preimage }}
                   <q-icon
                     name="content_copy"
                     @click="copyText(transactionDetailsDialog.data.preimage)"
@@ -67,6 +66,7 @@
               ></q-btn>
             </div>
           </div>
+          {% endraw %}
         </q-card-section>
       </q-card>
     </q-dialog>
@@ -102,6 +102,7 @@
               :filter="paymentsTable.filter"
               @request="getPayments"
             >
+              {% raw %}
               <template v-slot:body-cell-pending="props">
                 <q-td auto-width class="text-center">
                   <q-icon
@@ -210,8 +211,9 @@
                     <q-badge
                       :style="`background-color: #${props.row.destination?.color}`"
                       class="text-bold"
-                      v-text="props.row.destination?.alias"
-                    ></q-badge>
+                    >
+                      {{ props.row.destination?.alias }}
+                    </q-badge>
                     <div>
                       <q-btn
                         size="xs"
@@ -231,6 +233,7 @@
                   </div>
                 </q-td>
               </template>
+              {% endraw %}
             </q-table>
           </q-card-section>
         </q-card>
@@ -263,6 +266,7 @@
               :filter="invoiceTable.filter"
               @request="getInvoices"
             >
+              {% raw %}
               <template v-slot:body-cell-pending="props">
                 <q-td auto-width class="text-center">
                   <q-icon
@@ -301,6 +305,8 @@
                   ></lnbits-date>
                 </q-td>
               </template>
+
+              {% endraw %}
             </q-table>
           </q-card-section>
         </q-card>

lnbits/core/views/admin_api.py

@@ -17,11 +17,9 @@ from lnbits.core.services import (
     update_cached_settings,
     update_wallet_balance,
 )
-from lnbits.core.tasks import api_invoice_listeners
 from lnbits.decorators import check_admin, check_super_user
 from lnbits.server import server_restart
 from lnbits.settings import AdminSettings, UpdateSettings, settings
-from lnbits.tasks import invoice_listeners
 
 from .. import core_app_extra
 from ..crud import delete_admin_settings, get_admin_settings, update_admin_settings
@@ -50,19 +48,6 @@ async def api_auditor():
         )
 
 
-@admin_router.get(
-    "/admin/api/v1/monitor",
-    name="Monitor",
-    description="show the current listeners and other monitoring data",
-    dependencies=[Depends(check_admin)],
-)
-async def api_monitor():
-    return {
-        "invoice_listeners": list(invoice_listeners.keys()),
-        "api_invoice_listeners": list(api_invoice_listeners.keys()),
-    }
-
-
 @admin_router.get("/admin/api/v1/settings/", response_model=Optional[AdminSettings])
 async def api_get_settings(
     user: User = Depends(check_admin),

lnbits/core/views/api.py

@@ -32,7 +32,6 @@ from lnbits.core.helpers import (
     stop_extension_background_work,
 )
 from lnbits.core.models import (
-    BaseWallet,
     ConversionData,
     CreateInvoice,
     CreateLnurl,
@@ -52,7 +51,6 @@ from lnbits.decorators import (
     WalletTypeInfo,
     check_access_token,
     check_admin,
-    check_user_exists,
     get_key_type,
     parse_filters,
     require_admin_key,
@@ -64,14 +62,13 @@ from lnbits.extension_manager import (
     ExtensionRelease,
     InstallableExtension,
     fetch_github_release_config,
-    fetch_release_payment_info,
     get_valid_extensions,
 )
 from lnbits.helpers import generate_filter_params_openapi, url_for
 from lnbits.lnurl import decode as lnurl_decode
 from lnbits.settings import settings
 from lnbits.utils.exchange_rates import (
-    allowed_currencies,
+    currencies,
     fiat_amount_as_satoshis,
     satoshis_amount_as_fiat,
 )
@@ -86,7 +83,6 @@ from ..crud import (
     delete_wallet,
     drop_extension_db,
     get_dbversions,
-    get_installed_extension,
     get_payments,
     get_payments_history,
     get_payments_paginated,
@@ -129,15 +125,6 @@ async def api_wallet(wallet: WalletTypeInfo = Depends(get_key_type)):
         return {"name": wallet.wallet.name, "balance": wallet.wallet.balance_msat}
 
 
-@api_router.get(
-    "/api/v1/wallets",
-    name="Wallets",
-    description="Get basic info for all of user's wallets.",
-)
-async def api_wallets(user: User = Depends(check_user_exists)) -> List[BaseWallet]:
-    return [BaseWallet(**w.dict()) for w in user.wallets]
-
-
 @api_router.put("/api/v1/wallet/{new_name}")
 async def api_update_wallet_name(
     new_name: str, wallet: WalletTypeInfo = Depends(require_admin_key)
@@ -539,7 +526,10 @@ 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 isinstance(X_Api_Key, str) else None
-
+    wallet = wallet if wallet and not wallet.deleted 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
     payment = await get_standalone_payment(
         payment_hash, wallet_id=wallet.id if wallet else None
     )
@@ -722,8 +712,14 @@ async def api_perform_lnurlauth(
 
 
 @api_router.get("/api/v1/currencies")
-async def api_list_currencies_available() -> List[str]:
-    return allowed_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())
 
 
 @api_router.post("/api/v1/conversion")
@@ -800,7 +796,7 @@ async def api_install_extension(
     access_token: Optional[str] = Depends(check_access_token),
 ):
     release = await InstallableExtension.get_extension_release(
-        data.ext_id, data.source_repo, data.archive, data.version
+        data.ext_id, data.source_repo, data.archive
     )
     if not release:
         raise HTTPException(
@@ -812,17 +808,13 @@ async def api_install_extension(
             status_code=HTTPStatus.BAD_REQUEST, detail="Incompatible extension version"
         )
 
-    release.payment_hash = data.payment_hash
     ext_info = InstallableExtension(
         id=data.ext_id, name=data.ext_id, installed_release=release, icon=release.icon
     )
 
+    ext_info.download_archive()
+
     try:
-        installed_ext = await get_installed_extension(data.ext_id)
-        ext_info.payments = installed_ext.payments if installed_ext else []
-
-        await ext_info.download_archive()
-
         ext_info.extract_archive()
 
         extension = Extension.from_installable_ext(ext_info)
@@ -832,9 +824,8 @@ async def api_install_extension(
 
         await add_installed_extension(ext_info)
 
-        if extension.is_upgrade_extension:
-            # call stop while the old routes are still active
-            await stop_extension_background_work(data.ext_id, user.id, access_token)
+        # call stop while the old routes are still active
+        await stop_extension_background_work(data.ext_id, user.id, access_token)
 
         if data.ext_id not in settings.lnbits_deactivated_extensions:
             settings.lnbits_deactivated_extensions += [data.ext_id]
@@ -846,8 +837,7 @@ async def api_install_extension(
             ext_info.nofiy_upgrade()
 
         return extension
-    except AssertionError as e:
-        raise HTTPException(HTTPStatus.BAD_REQUEST, str(e))
+
     except Exception as ex:
         logger.warning(ex)
         ext_info.clean_extension_files()
@@ -912,18 +902,9 @@ async def api_uninstall_extension(
 )
 async def get_extension_releases(ext_id: str):
     try:
-        extension_releases: List[ExtensionRelease] = (
-            await InstallableExtension.get_extension_releases(ext_id)
-        )
-
-        installed_ext = await get_installed_extension(ext_id)
-        if not installed_ext:
-            return extension_releases
-
-        for release in extension_releases:
-            payment_info = installed_ext.find_existing_payment(release.pay_link)
-            if payment_info:
-                release.paid_sats = payment_info.amount
+        extension_releases: List[
+            ExtensionRelease
+        ] = await InstallableExtension.get_extension_releases(ext_id)
 
         return extension_releases
 
@@ -933,40 +914,6 @@ async def get_extension_releases(ext_id: str):
         )
 
 
-@api_router.put("/api/v1/extension/invoice", dependencies=[Depends(check_admin)])
-async def get_extension_invoice(data: CreateExtension):
-    try:
-        assert data.cost_sats, "A non-zero amount must be specified"
-        release = await InstallableExtension.get_extension_release(
-            data.ext_id, data.source_repo, data.archive, data.version
-        )
-        assert release, "Release not found"
-        assert release.pay_link, "Pay link not found for release"
-
-        payment_info = await fetch_release_payment_info(
-            release.pay_link, data.cost_sats
-        )
-        assert payment_info and payment_info.payment_request, "Cannot request invoice"
-        invoice = bolt11.decode(payment_info.payment_request)
-
-        assert invoice.amount_msat is not None, "Invoic amount is missing"
-        invoice_amount = int(invoice.amount_msat / 1000)
-        assert (
-            invoice_amount == data.cost_sats
-        ), f"Wrong invoice amount: {invoice_amount}."
-        assert (
-            payment_info.payment_hash == invoice.payment_hash
-        ), "Wroong invoice payment hash"
-
-        return payment_info
-
-    except AssertionError as e:
-        raise HTTPException(HTTPStatus.BAD_REQUEST, str(e))
-    except Exception as ex:
-        logger.warning(ex)
-        raise HTTPException(HTTPStatus.INTERNAL_SERVER_ERROR, "Cannot request invoice")
-
-
 @api_router.get(
     "/api/v1/extension/release/{org}/{repo}/{tag_name}",
     dependencies=[Depends(check_admin)],

lnbits/core/views/auth_api.py

@@ -1,9 +1,10 @@
-import importlib
-from typing import Callable, Optional
+from typing import Optional
 
 from fastapi import APIRouter, Depends, HTTPException, Request, status
 from fastapi.responses import JSONResponse, RedirectResponse
-from fastapi_sso.sso.base import OpenID, SSOBase
+from fastapi_sso.sso.base import OpenID
+from fastapi_sso.sso.github import GithubSSO
+from fastapi_sso.sso.google import GoogleSSO
 from loguru import logger
 from starlette.status import (
     HTTP_400_BAD_REQUEST,
@@ -93,35 +94,43 @@ async def login_usr(data: LoginUsr) -> JSONResponse:
         raise HTTPException(HTTP_500_INTERNAL_SERVER_ERROR, "Cannot login.")
 
 
-@auth_router.get("/api/v1/auth/{provider}", description="SSO Provider")
-async def login_with_sso_provider(
-    request: Request, provider: str, user_id: Optional[str] = None
-):
-    provider_sso = _new_sso(provider)
-    if not provider_sso:
-        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, f"Login by '{provider}' not allowed."
-        )
+@auth_router.get("/api/v1/auth/google", description="Google SSO")
+async def login_with_google(request: Request, user_id: Optional[str] = None):
+    google_sso = _new_google_sso()
+    if not google_sso:
+        raise HTTPException(HTTP_401_UNAUTHORIZED, "Login by 'Google' not allowed.")
 
-    provider_sso.redirect_uri = str(request.base_url) + f"api/v1/auth/{provider}/token"
-    with provider_sso:
+    google_sso.redirect_uri = str(request.base_url) + "api/v1/auth/google/token"
+    with google_sso:
         state = encrypt_internal_message(user_id)
-        return await provider_sso.get_login_redirect(state=state)
+        return await google_sso.get_login_redirect(state=state)
 
 
-@auth_router.get("/api/v1/auth/{provider}/token", description="Handle OAuth callback")
-async def handle_oauth_token(request: Request, provider: str) -> RedirectResponse:
-    provider_sso = _new_sso(provider)
-    if not provider_sso:
-        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, f"Login by '{provider}' not allowed."
-        )
+@auth_router.get("/api/v1/auth/github", description="Github SSO")
+async def login_with_github(request: Request, user_id: Optional[str] = None):
+    github_sso = _new_github_sso()
+    if not github_sso:
+        raise HTTPException(HTTP_401_UNAUTHORIZED, "Login by 'GitHub' not allowed.")
+
+    github_sso.redirect_uri = str(request.base_url) + "api/v1/auth/github/token"
+    with github_sso:
+        state = decrypt_internal_message(user_id)
+        return await github_sso.get_login_redirect(state=state)
+
+
+@auth_router.get(
+    "/api/v1/auth/google/token", description="Handle Google OAuth callback"
+)
+async def handle_google_token(request: Request) -> RedirectResponse:
+    google_sso = _new_google_sso()
+    if not google_sso:
+        raise HTTPException(HTTP_401_UNAUTHORIZED, "Login by 'Google' not allowed.")
 
     try:
-        with provider_sso:
-            userinfo = await provider_sso.verify_and_process(request)
+        with google_sso:
+            userinfo = await google_sso.verify_and_process(request)
             assert userinfo is not None
-            user_id = decrypt_internal_message(provider_sso.state)
+            user_id = decrypt_internal_message(google_sso.state)
         request.session.pop("user", None)
         return await _handle_sso_login(userinfo, user_id)
     except HTTPException as e:
@@ -131,8 +140,34 @@ async def handle_oauth_token(request: Request, provider: str) -> RedirectRespons
     except Exception as e:
         logger.debug(e)
         raise HTTPException(
-            HTTP_500_INTERNAL_SERVER_ERROR,
-            f"Cannot authenticate user with {provider} Auth.",
+            HTTP_500_INTERNAL_SERVER_ERROR, "Cannot authenticate user with Google Auth."
+        )
+
+
+@auth_router.get(
+    "/api/v1/auth/github/token", description="Handle Github OAuth callback"
+)
+async def handle_github_token(request: Request) -> RedirectResponse:
+    github_sso = _new_github_sso()
+    if not github_sso:
+        raise HTTPException(HTTP_401_UNAUTHORIZED, "Login by 'GitHub' not allowed.")
+
+    try:
+        with github_sso:
+            userinfo = await github_sso.verify_and_process(request)
+            assert userinfo is not None
+            user_id = decrypt_internal_message(github_sso.state)
+        request.session.pop("user", None)
+        return await _handle_sso_login(userinfo, user_id)
+
+    except HTTPException as e:
+        raise e
+    except ValueError as e:
+        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
+    except Exception as e:
+        logger.debug(e)
+        raise HTTPException(
+            HTTP_500_INTERNAL_SERVER_ERROR, "Cannot authenticate user with GitHub Auth."
         )
 
 
@@ -142,8 +177,6 @@ async def logout() -> JSONResponse:
     response.delete_cookie("cookie_access_token")
     response.delete_cookie("is_lnbits_user_authorized")
     response.delete_cookie("is_access_token_expired")
-    response.delete_cookie("lnbits_last_active_wallet")
-
     return response
 
 
@@ -288,7 +321,9 @@ def _auth_success_response(
     )
     response = JSONResponse({"access_token": access_token, "token_type": "bearer"})
     response.set_cookie("cookie_access_token", access_token, httponly=True)
-    response.set_cookie("is_lnbits_user_authorized", "true")
+    response.set_cookie(
+        "is_lnbits_user_authorized", "true", samesite="none", secure=True
+    )
     response.delete_cookie("is_access_token_expired")
 
     return response
@@ -298,49 +333,36 @@ def _auth_redirect_response(path: str, email: str) -> RedirectResponse:
     access_token = create_access_token(data={"sub": "" or "", "email": email})
     response = RedirectResponse(path)
     response.set_cookie("cookie_access_token", access_token, httponly=True)
-    response.set_cookie("is_lnbits_user_authorized", "true")
+    response.set_cookie(
+        "is_lnbits_user_authorized", "true", samesite="none", secure=True
+    )
     response.delete_cookie("is_access_token_expired")
     return response
 
 
-def _new_sso(provider: str) -> Optional[SSOBase]:
-    try:
-        if not settings.is_auth_method_allowed(AuthMethods(f"{provider}-auth")):
-            return None
-
-        client_id = getattr(settings, f"{provider}_client_id", None)
-        client_secret = getattr(settings, f"{provider}_client_secret", None)
-        discovery_url = getattr(settings, f"{provider}_discovery_url", None)
-
-        if not client_id or not client_secret:
-            logger.warning(f"{provider} auth allowed but not configured.")
-            return None
-
-        SSOProviderClass = _find_auth_provider_class(provider)
-        ssoProvider = SSOProviderClass(
-            client_id, client_secret, None, allow_insecure_http=True
-        )
-        if (
-            discovery_url
-            and getattr(ssoProvider, "discovery_url", discovery_url) != discovery_url
-        ):
-            ssoProvider.discovery_url = discovery_url
-        return ssoProvider
-    except Exception as e:
-        logger.warning(e)
-
-    return None
+def _new_google_sso() -> Optional[GoogleSSO]:
+    if not settings.is_auth_method_allowed(AuthMethods.google_auth):
+        return None
+    if not settings.is_google_auth_configured:
+        logger.warning("Google Auth allowed but not configured.")
+        return None
+    return GoogleSSO(
+        settings.google_client_id,
+        settings.google_client_secret,
+        None,
+        allow_insecure_http=True,
+    )
 
 
-def _find_auth_provider_class(provider: str) -> Callable:
-    sso_modules = ["lnbits.core.sso", "fastapi_sso.sso"]
-    for module in sso_modules:
-        try:
-            provider_module = importlib.import_module(f"{module}.{provider}")
-            ProviderClass = getattr(provider_module, f"{provider.title()}SSO")
-            if ProviderClass:
-                return ProviderClass
-        except Exception:
-            pass
-
-    raise ValueError(f"No SSO provider found for '{provider}'.")
+def _new_github_sso() -> Optional[GithubSSO]:
+    if not settings.is_auth_method_allowed(AuthMethods.github_auth):
+        return None
+    if not settings.is_github_auth_configured:
+        logger.warning("Github Auth allowed but not configured.")
+        return None
+    return GithubSSO(
+        settings.github_client_id,
+        settings.github_client_secret,
+        None,
+        allow_insecure_http=True,
+    )

lnbits/core/views/generic.py

@@ -21,7 +21,7 @@ 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 allowed_currencies, currencies
+from ...utils.exchange_rates import currencies
 from ..crud import (
     create_account,
     create_wallet,
@@ -95,10 +95,11 @@ async def extensions_install(
         installed_exts: List["InstallableExtension"] = await get_installed_extensions()
         installed_exts_ids = [e.id for e in installed_exts]
 
-        installable_exts = await InstallableExtension.get_installable_extensions()
-        installable_exts_ids = [e.id for e in installable_exts]
+        installable_exts: List[
+            InstallableExtension
+        ] = await InstallableExtension.get_installable_extensions()
         installable_exts += [
-            e for e in installed_exts if e.id not in installable_exts_ids
+            e for e in installed_exts if e.id not in installed_exts_ids
         ]
 
         for e in installable_exts:
@@ -216,13 +217,14 @@ async def wallet(
             "request": request,
             "user": user.dict(),
             "wallet": user_wallet.dict(),
-            "currencies": allowed_currencies(),
             "service_fee": settings.lnbits_service_fee,
             "service_fee_max": settings.lnbits_service_fee_max,
             "web_manifest": f"/manifest/{user.id}.webmanifest",
         },
     )
-    resp.set_cookie("lnbits_last_active_wallet", wallet_id)
+    resp.set_cookie(
+        "lnbits_last_active_wallet", wallet_id, samesite="none", secure=True
+    )
     return resp
 
 
@@ -353,16 +355,9 @@ async def lnurlwallet(request: Request):
     )
 
 
-@generic_router.get("/service-worker.js")
-async def service_worker(request: Request):
-    return template_renderer().TemplateResponse(
-        "service-worker.js",
-        {
-            "request": request,
-            "cache_version": settings.server_startup_time,
-        },
-        media_type="text/javascript",
-    )
+@generic_router.get("/service-worker.js", response_class=FileResponse)
+async def service_worker():
+    return FileResponse(Path("lnbits", "static", "js", "service-worker.js"))
 
 
 @generic_router.get("/manifest/{usr}.webmanifest")

lnbits/core/views/node_api.py

@@ -108,11 +108,9 @@ async def api_delete_channel(
 ) -> Optional[List[NodeChannel]]:
     return await node.close_channel(
         short_id,
-        (
-            ChannelPoint(funding_txid=funding_txid, output_index=output_index)
-            if funding_txid is not None and output_index is not None
-            else None
-        ),
+        ChannelPoint(funding_txid=funding_txid, output_index=output_index)
+        if funding_txid is not None and output_index is not None
+        else None,
         force,
     )
 

lnbits/core/views/tinyurl_api.py

@@ -9,8 +9,7 @@ from starlette.responses import RedirectResponse
 
 from lnbits.decorators import (
     WalletTypeInfo,
-    require_admin_key,
-    require_invoice_key,
+    get_key_type,
 )
 
 from ..crud import (
@@ -29,15 +28,15 @@ tinyurl_router = APIRouter()
     description="creates a tinyurl",
 )
 async def api_create_tinyurl(
-    url: str, endless: bool = False, wallet: WalletTypeInfo = Depends(require_admin_key)
+    url: str, endless: bool = False, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
     tinyurls = await get_tinyurl_by_url(url)
     try:
         for tinyurl in tinyurls:
             if tinyurl:
-                if tinyurl.wallet == wallet.wallet.id:
+                if tinyurl.wallet == wallet.wallet.inkey:
                     return tinyurl
-        return await create_tinyurl(url, endless, wallet.wallet.id)
+        return await create_tinyurl(url, endless, wallet.wallet.inkey)
     except Exception:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST, detail="Unable to create tinyurl"
@@ -50,12 +49,12 @@ async def api_create_tinyurl(
     description="get a tinyurl by id",
 )
 async def api_get_tinyurl(
-    tinyurl_id: str, wallet: WalletTypeInfo = Depends(require_invoice_key)
+    tinyurl_id: str, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
     try:
         tinyurl = await get_tinyurl(tinyurl_id)
         if tinyurl:
-            if tinyurl.wallet == wallet.wallet.id:
+            if tinyurl.wallet == wallet.wallet.inkey:
                 return tinyurl
         raise HTTPException(
             status_code=HTTPStatus.FORBIDDEN, detail="Wrong key provided."
@@ -72,12 +71,12 @@ async def api_get_tinyurl(
     description="delete a tinyurl by id",
 )
 async def api_delete_tinyurl(
-    tinyurl_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
+    tinyurl_id: str, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
     try:
         tinyurl = await get_tinyurl(tinyurl_id)
         if tinyurl:
-            if tinyurl.wallet == wallet.wallet.id:
+            if tinyurl.wallet == wallet.wallet.inkey:
                 await delete_tinyurl(tinyurl_id)
                 return {"deleted": True}
         raise HTTPException(

lnbits/db.py

@@ -179,27 +179,16 @@ class Connection(Compat):
         values: Optional[List[str]] = None,
         filters: Optional[Filters] = None,
         model: Optional[Type[TRowModel]] = None,
-        group_by: Optional[List[str]] = None,
     ) -> Page[TRowModel]:
         if not filters:
             filters = Filters()
         clause = filters.where(where)
         parsed_values = filters.values(values)
 
-        group_by_string = ""
-        if group_by:
-            for field in group_by:
-                if not re.fullmatch(
-                    r"[a-zA-Z_][a-zA-Z0-9_]*(\.[a-zA-Z_][a-zA-Z0-9_]*)?", field
-                ):
-                    raise ValueError("Value for GROUP BY is invalid")
-            group_by_string = f"GROUP BY {', '.join(group_by)}"
-
         rows = await self.fetchall(
             f"""
             {query}
             {clause}
-            {group_by_string}
             {filters.order_by()}
             {filters.pagination()}
             """,
@@ -213,7 +202,6 @@ class Connection(Compat):
                     SELECT COUNT(*) FROM (
                         {query}
                         {clause}
-                        {group_by_string}
                     ) as count
                     """,
                     parsed_values,
@@ -254,9 +242,7 @@ class Database(Compat):
         else:
             self.schema = None
 
-        self.engine = create_engine(
-            database_uri, strategy=ASYNCIO_STRATEGY, echo=settings.debug_database
-        )
+        self.engine = create_engine(database_uri, strategy=ASYNCIO_STRATEGY)
         self.lock = asyncio.Lock()
 
         logger.trace(f"database {self.type} added for {self.name}")
@@ -302,10 +288,9 @@ class Database(Compat):
         values: Optional[List[str]] = None,
         filters: Optional[Filters] = None,
         model: Optional[Type[TRowModel]] = None,
-        group_by: Optional[List[str]] = None,
     ) -> Page[TRowModel]:
         async with self.connect() as conn:
-            return await conn.fetch_page(query, where, values, filters, model, group_by)
+            return await conn.fetch_page(query, where, values, filters, model)
 
     async def execute(self, query: str, values: tuple = ()):
         async with self.connect() as conn:

lnbits/decorators.py

@@ -3,7 +3,7 @@ from typing import Annotated, Literal, Optional, Type, Union
 
 from fastapi import Cookie, Depends, Query, Request, Security
 from fastapi.exceptions import HTTPException
-from fastapi.openapi.models import APIKey, APIKeyIn, SecuritySchemeType
+from fastapi.openapi.models import APIKey, APIKeyIn
 from fastapi.security import APIKeyHeader, APIKeyQuery, OAuth2PasswordBearer
 from fastapi.security.base import SecurityBase
 from jose import ExpiredSignatureError, JWTError, jwt
@@ -17,13 +17,14 @@ from lnbits.core.crud import (
     get_user,
     get_wallet_for_key,
 )
-from lnbits.core.models import User, Wallet, WalletType, WalletTypeInfo
+from lnbits.core.models import User, WalletType, WalletTypeInfo
 from lnbits.db import Filter, Filters, TFilterModel
 from lnbits.settings import AuthMethods, settings
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="api/v1/auth", auto_error=False)
 
 
+# TODO: fix type ignores
 class KeyChecker(SecurityBase):
     def __init__(
         self,
@@ -32,25 +33,23 @@ class KeyChecker(SecurityBase):
         api_key: Optional[str] = None,
     ):
         self.scheme_name = scheme_name or self.__class__.__name__
-        self.auto_error: bool = auto_error
-        self._key_type: WalletType = WalletType.invoice
+        self.auto_error = auto_error
+        self._key_type = WalletType.invoice
         self._api_key = api_key
         if api_key:
-            openapi_model = APIKey(
-                **{"in": APIKeyIn.query},
-                type=SecuritySchemeType.apiKey,
+            key = APIKey(
+                **{"in": APIKeyIn.query},  # type: ignore
                 name="X-API-KEY",
                 description="Wallet API Key - QUERY",
             )
         else:
-            openapi_model = APIKey(
-                **{"in": APIKeyIn.header},
-                type=SecuritySchemeType.apiKey,
+            key = APIKey(
+                **{"in": APIKeyIn.header},  # type: ignore
                 name="X-API-KEY",
                 description="Wallet API Key - HEADER",
             )
-        self.wallet: Optional[Wallet] = None
-        self.model: APIKey = openapi_model
+        self.wallet = None
+        self.model: APIKey = key
 
     async def __call__(self, request: Request):
         try:
@@ -63,12 +62,12 @@ class KeyChecker(SecurityBase):
             #        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)
-            if not wallet:
+            if not wallet or wallet.deleted:
                 raise HTTPException(
                     status_code=HTTPStatus.UNAUTHORIZED,
                     detail="Invalid key or wallet.",
                 )
-            self.wallet = wallet
+            self.wallet = wallet  # type: ignore
         except KeyError:
             raise HTTPException(
                 status_code=HTTPStatus.BAD_REQUEST, detail="`X-API-KEY` header missing."

lnbits/extension_manager.py

@@ -1,15 +1,16 @@
-import asyncio
 import hashlib
 import json
 import os
 import shutil
 import sys
 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 import HTTPException
 from loguru import logger
 from packaging import version
 from pydantic import BaseModel
@@ -32,7 +33,6 @@ class ExplicitRelease(BaseModel):
     warning: Optional[str]
     info_notification: Optional[str]
     critical_notification: Optional[str]
-    pay_link: Optional[str]
 
     def is_version_compatible(self):
         if not self.min_lnbits_version:
@@ -78,15 +78,8 @@ class ExtensionConfig(BaseModel):
         return version_parse(self.min_lnbits_version) <= version_parse(settings.version)
 
 
-class ReleasePaymentInfo(BaseModel):
-    amount: Optional[int] = None
-    pay_link: Optional[str] = None
-    payment_hash: Optional[str] = None
-    payment_request: Optional[str] = None
-
-
 def download_url(url, save_path):
-    with request.urlopen(url, timeout=60) as dl_file:
+    with request.urlopen(url) as dl_file:
         with open(save_path, "wb") as out_file:
             out_file.write(dl_file.read())
 
@@ -162,21 +155,6 @@ async def github_api_get(url: str, error_msg: Optional[str]) -> Any:
         return resp.json()
 
 
-async def fetch_release_payment_info(
-    url: str, amount: Optional[int] = None
-) -> Optional[ReleasePaymentInfo]:
-    if amount:
-        url = f"{url}?amount={amount}"
-    try:
-        async with httpx.AsyncClient() as client:
-            resp = await client.get(url)
-            resp.raise_for_status()
-            return ReleasePaymentInfo(**resp.json())
-    except Exception as e:
-        logger.warning(e)
-        return None
-
-
 def icon_to_github_url(source_repo: str, path: Optional[str]) -> str:
     if not path:
         return ""
@@ -282,26 +260,6 @@ class ExtensionRelease(BaseModel):
     repo: Optional[str] = None
     icon: Optional[str] = None
 
-    pay_link: Optional[str] = None
-    cost_sats: Optional[int] = None
-    paid_sats: Optional[int] = 0
-    payment_hash: Optional[str] = None
-
-    @property
-    def archive_url(self) -> str:
-        if not self.pay_link:
-            return self.archive
-        return (
-            f"{self.archive}?version=v{self.version}&payment_hash={self.payment_hash}"
-        )
-
-    async def check_payment_requirements(self):
-        if not self.pay_link:
-            return
-
-        payment_info = await fetch_release_payment_info(self.pay_link)
-        self.cost_sats = payment_info.amount if payment_info else None
-
     @classmethod
     def from_github_release(
         cls, source_repo: str, r: "GitHubRepoRelease"
@@ -332,13 +290,12 @@ class ExtensionRelease(BaseModel):
             is_version_compatible=e.is_version_compatible(),
             warning=e.warning,
             html_url=e.html_url,
-            pay_link=e.pay_link,
             repo=e.repo,
             icon=e.icon,
         )
 
     @classmethod
-    async def get_github_releases(cls, org: str, repo: str) -> List["ExtensionRelease"]:
+    async def all_releases(cls, org: str, repo: str) -> List["ExtensionRelease"]:
         try:
             github_releases = await fetch_github_releases(org, repo)
             return [
@@ -361,7 +318,6 @@ class InstallableExtension(BaseModel):
     featured = False
     latest_release: Optional[ExtensionRelease] = None
     installed_release: Optional[ExtensionRelease] = None
-    payments: List[ReleasePaymentInfo] = []
     archive: Optional[str] = None
 
     @property
@@ -412,32 +368,30 @@ class InstallableExtension(BaseModel):
             return self.installed_release.version
         return ""
 
-    async def download_archive(self):
+    def download_archive(self):
         logger.info(f"Downloading extension {self.name} ({self.installed_version}).")
         ext_zip_file = self.zip_path
         if ext_zip_file.is_file():
             os.remove(ext_zip_file)
         try:
             assert self.installed_release, "installed_release is none."
-
-            self._restore_payment_info()
-
-            await asyncio.to_thread(
-                download_url, self.installed_release.archive_url, ext_zip_file
-            )
-
-            self._remember_payment_info()
-
+            download_url(self.installed_release.archive, ext_zip_file)
         except Exception as ex:
             logger.warning(ex)
-            raise AssertionError("Cannot fetch extension archive file")
+            raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="Cannot fetch extension archive file",
+            )
 
         archive_hash = file_hash(ext_zip_file)
         if self.installed_release.hash and self.installed_release.hash != archive_hash:
             # remove downloaded archive
             if ext_zip_file.is_file():
                 os.remove(ext_zip_file)
-            raise AssertionError("File hash missmatch. Will not install.")
+            raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="File hash missmatch. Will not install.",
+            )
 
     def extract_archive(self):
         logger.info(f"Extracting extension {self.name} ({self.installed_version}).")
@@ -514,54 +468,14 @@ class InstallableExtension(BaseModel):
         if version_parse(self.latest_release.version) < version_parse(release.version):
             self.latest_release = release
 
-    def find_existing_payment(
-        self, pay_link: Optional[str]
-    ) -> Optional[ReleasePaymentInfo]:
-        if not pay_link:
-            return None
-        return next(
-            (p for p in self.payments if p.pay_link == pay_link),
-            None,
-        )
-
-    def _restore_payment_info(self):
-        if not self.installed_release:
-            return
-        if not self.installed_release.pay_link:
-            return
-        if self.installed_release.payment_hash:
-            return
-        payment_info = self.find_existing_payment(self.installed_release.pay_link)
-        if payment_info:
-            self.installed_release.payment_hash = payment_info.payment_hash
-
-    def _remember_payment_info(self):
-        if not self.installed_release or not self.installed_release.pay_link:
-            return
-        payment_info = ReleasePaymentInfo(
-            amount=self.installed_release.cost_sats,
-            pay_link=self.installed_release.pay_link,
-            payment_hash=self.installed_release.payment_hash,
-        )
-        self.payments = [
-            p for p in self.payments if p.pay_link != payment_info.pay_link
-        ]
-        self.payments.append(payment_info)
-
     @classmethod
     def from_row(cls, data: dict) -> "InstallableExtension":
         meta = json.loads(data["meta"])
         ext = InstallableExtension(**data)
         if "installed_release" in meta:
             ext.installed_release = ExtensionRelease(**meta["installed_release"])
-        if meta.get("payments"):
-            ext.payments = [ReleasePaymentInfo(**p) for p in meta["payments"]]
         return ext
 
-    @classmethod
-    def from_rows(cls, rows: List[Any] = []) -> List["InstallableExtension"]:
-        return [InstallableExtension.from_row(row) for row in rows]
-
     @classmethod
     async def from_github_release(
         cls, github_release: GitHubRelease
@@ -651,19 +565,17 @@ class InstallableExtension(BaseModel):
             try:
                 manifest = await fetch_manifest(url)
                 for r in manifest.repos:
-                    if r.id != ext_id:
-                        continue
-                    repo_releases = await ExtensionRelease.get_github_releases(
-                        r.organisation, r.repository
-                    )
-                    extension_releases += repo_releases
+                    if r.id == ext_id:
+                        repo_releases = await ExtensionRelease.all_releases(
+                            r.organisation, r.repository
+                        )
+                        extension_releases += repo_releases
 
                 for e in manifest.extensions:
-                    if e.id != ext_id:
-                        continue
-                    explicit_release = ExtensionRelease.from_explicit_release(url, e)
-                    await explicit_release.check_payment_requirements()
-                    extension_releases.append(explicit_release)
+                    if e.id == ext_id:
+                        extension_releases += [
+                            ExtensionRelease.from_explicit_release(url, e)
+                        ]
 
             except Exception as e:
                 logger.warning(f"Manifest {url} failed with '{str(e)}'")
@@ -672,17 +584,15 @@ class InstallableExtension(BaseModel):
 
     @classmethod
     async def get_extension_release(
-        cls, ext_id: str, source_repo: str, archive: str, version: str
+        cls, ext_id: str, source_repo: str, archive: str
     ) -> Optional["ExtensionRelease"]:
-        all_releases: List[ExtensionRelease] = (
-            await InstallableExtension.get_extension_releases(ext_id)
-        )
+        all_releases: List[
+            ExtensionRelease
+        ] = await InstallableExtension.get_extension_releases(ext_id)
         selected_release = [
             r
             for r in all_releases
-            if r.archive == archive
-            and r.source_repo == source_repo
-            and r.version == version
+            if r.archive == archive and r.source_repo == source_repo
         ]
 
         return selected_release[0] if len(selected_release) != 0 else None
@@ -692,9 +602,6 @@ class CreateExtension(BaseModel):
     ext_id: str
     archive: str
     source_repo: str
-    version: str
-    cost_sats: Optional[int] = 0
-    payment_hash: Optional[str] = None
 
 
 def get_valid_extensions(include_deactivated: Optional[bool] = True) -> List[Extension]:

lnbits/helpers.py

@@ -92,10 +92,6 @@ def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templa
 
 def get_current_extension_name() -> str:
     """
-    DEPRECATED: Use the repo name instead, will be removed in the future
-    before: `register_invoice_listener(invoice_queue, get_current_extension_name())`
-    after: `register_invoice_listener(invoice_queue, "my-extension")`
-
     Returns the name of the extension that calls this method.
     """
     import inspect

lnbits/nodes/cln.py

@@ -217,21 +217,17 @@ class CoreLightningNode(Node):
                 state=(
                     ChannelState.ACTIVE
                     if ch["state"] == "CHANNELD_NORMAL"
-                    else (
-                        ChannelState.PENDING
-                        if ch["state"] in ("CHANNELD_AWAITING_LOCKIN", "OPENINGD")
-                        else (
-                            ChannelState.CLOSED
-                            if ch["state"]
-                            in (
-                                "CHANNELD_CLOSING",
-                                "CLOSINGD_COMPLETE",
-                                "CLOSINGD_SIGEXCHANGE",
-                                "ONCHAIN",
-                            )
-                            else ChannelState.INACTIVE
-                        )
+                    else ChannelState.PENDING
+                    if ch["state"] in ("CHANNELD_AWAITING_LOCKIN", "OPENINGD")
+                    else ChannelState.CLOSED
+                    if ch["state"]
+                    in (
+                        "CHANNELD_CLOSING",
+                        "CLOSINGD_COMPLETE",
+                        "CLOSINGD_SIGEXCHANGE",
+                        "ONCHAIN",
                     )
+                    else ChannelState.INACTIVE
                 ),
             )
             for ch in funds["channels"]

lnbits/nodes/lndrest.py

@@ -237,11 +237,9 @@ class LndRestNode(Node):
                         remote_msat=msat(channel["remote_balance"]),
                         total_msat=msat(channel["capacity"]),
                     ),
-                    state=(
-                        ChannelState.ACTIVE
-                        if channel["active"]
-                        else ChannelState.INACTIVE
-                    ),
+                    state=ChannelState.ACTIVE
+                    if channel["active"]
+                    else ChannelState.INACTIVE,
                     # name=channel['peer_alias'],
                     name=info.alias,
                     color=info.color,
@@ -320,13 +318,11 @@ class LndRestNode(Node):
                 amount=payment["value_msat"],
                 fee=payment["fee_msat"],
                 time=payment["creation_date"],
-                destination=(
-                    await self.get_peer_info(
-                        payment["htlcs"][0]["route"]["hops"][-1]["pub_key"]
-                    )
-                    if payment["htlcs"]
-                    else None
-                ),
+                destination=await self.get_peer_info(
+                    payment["htlcs"][0]["route"]["hops"][-1]["pub_key"]
+                )
+                if payment["htlcs"]
+                else None,
                 bolt11=payment["payment_request"],
                 preimage=payment["payment_preimage"],
             )
@@ -373,7 +369,7 @@ class LndRestNode(Node):
                 memo=invoice["memo"],
                 pending=invoice["state"] == "OPEN",
                 paid_at=invoice["settle_date"],
-                expiry=int(invoice["creation_date"]) + int(invoice["expiry"]),
+                expiry=invoice["creation_date"] + invoice["expiry"],
                 preimage=_decode_bytes(invoice["r_preimage"]),
                 bolt11=invoice["payment_request"],
             )

lnbits/settings.py

@@ -68,16 +68,6 @@ class InstalledExtensionsSettings(LNbitsSettings):
     # list of redirects that extensions want to perform
     lnbits_extensions_redirects: List[Any] = Field(default=[])
 
-    def extension_upgrade_path(self, ext_id: str) -> Optional[str]:
-        return next(
-            (e for e in self.lnbits_upgraded_extensions if e.endswith(f"/{ext_id}")),
-            None,
-        )
-
-    def extension_upgrade_hash(self, ext_id: str) -> Optional[str]:
-        path = settings.extension_upgrade_path(ext_id)
-        return path.split("/")[0] if path else None
-
 
 class ThemesSettings(LNbitsSettings):
     lnbits_site_title: str = Field(default="LNbits")
@@ -126,9 +116,6 @@ class SecuritySettings(LNbitsSettings):
     lnbits_notifications: bool = Field(default=False)
     lnbits_killswitch: bool = Field(default=False)
     lnbits_killswitch_interval: int = Field(default=60)
-    lnbits_wallet_limit_max_balance: int = Field(default=0)
-    lnbits_wallet_limit_daily_max_withdraw: int = Field(default=0)
-    lnbits_wallet_limit_secs_between_trans: int = Field(default=0)
     lnbits_watchdog: bool = Field(default=False)
     lnbits_watchdog_interval: int = Field(default=60)
     lnbits_watchdog_delta: int = Field(default=1_000_000)
@@ -138,13 +125,6 @@ class SecuritySettings(LNbitsSettings):
         )
     )
 
-    def is_wallet_max_balance_exceeded(self, amount):
-        return (
-            self.lnbits_wallet_limit_max_balance
-            and self.lnbits_wallet_limit_max_balance > 0
-            and amount > self.lnbits_wallet_limit_max_balance
-        )
-
 
 class FakeWalletFundingSource(LNbitsSettings):
     fake_wallet_secret: str = Field(default="ToTheMoon1")
@@ -182,7 +162,6 @@ class LndRestFundingSource(LNbitsSettings):
     lnd_rest_cert: Optional[str] = Field(default=None)
     lnd_rest_macaroon: Optional[str] = Field(default=None)
     lnd_rest_macaroon_encrypted: Optional[str] = Field(default=None)
-    lnd_rest_route_hints: bool = Field(default=True)
     lnd_cert: Optional[str] = Field(default=None)
     lnd_admin_macaroon: Optional[str] = Field(default=None)
     lnd_invoice_macaroon: Optional[str] = Field(default=None)
@@ -207,11 +186,6 @@ class LnPayFundingSource(LNbitsSettings):
     lnpay_admin_key: Optional[str] = Field(default=None)
 
 
-class ZBDFundingSource(LNbitsSettings):
-    zbd_api_endpoint: Optional[str] = Field(default="https://api.zebedee.io/v0/")
-    zbd_api_key: Optional[str] = Field(default=None)
-
-
 class AlbyFundingSource(LNbitsSettings):
     alby_api_endpoint: Optional[str] = Field(default="https://api.getalby.com/")
     alby_access_token: Optional[str] = Field(default=None)
@@ -251,7 +225,6 @@ class FundingSourcesSettings(
     LndGrpcFundingSource,
     LnPayFundingSource,
     AlbyFundingSource,
-    ZBDFundingSource,
     OpenNodeFundingSource,
     SparkFundingSource,
     LnTipsFundingSource,
@@ -279,7 +252,6 @@ class AuthMethods(Enum):
     username_and_password = "username-password"
     google_auth = "google-auth"
     github_auth = "github-auth"
-    keycloak_auth = "keycloak-auth"
 
 
 class AuthSettings(LNbitsSettings):
@@ -300,16 +272,18 @@ class GoogleAuthSettings(LNbitsSettings):
     google_client_id: str = Field(default="")
     google_client_secret: str = Field(default="")
 
+    @property
+    def is_google_auth_configured(self):
+        return self.google_client_id != "" and self.google_client_secret != ""
+
 
 class GitHubAuthSettings(LNbitsSettings):
     github_client_id: str = Field(default="")
     github_client_secret: str = Field(default="")
 
-
-class KeycloakAuthSettings(LNbitsSettings):
-    keycloak_discovery_url: str = Field(default="")
-    keycloak_client_id: str = Field(default="")
-    keycloak_client_secret: str = Field(default="")
+    @property
+    def is_github_auth_configured(self):
+        return self.github_client_id != "" and self.github_client_secret != ""
 
 
 class EditableSettings(
@@ -325,7 +299,6 @@ class EditableSettings(
     AuthSettings,
     GoogleAuthSettings,
     GitHubAuthSettings,
-    KeycloakAuthSettings,
 ):
     @validator(
         "lnbits_admin_users",
@@ -359,7 +332,6 @@ class UpdateSettings(EditableSettings):
 
 class EnvSettings(LNbitsSettings):
     debug: bool = Field(default=False)
-    debug_database: bool = Field(default=False)
     bundle_assets: bool = Field(default=True)
     host: str = Field(default="127.0.0.1")
     port: int = Field(default=5000)
@@ -407,7 +379,6 @@ class SuperUserSettings(LNbitsSettings):
             "LnTipsWallet",
             "LNPayWallet",
             "AlbyWallet",
-            "ZBDWallet",
             "LNbitsWallet",
             "OpenNodeWallet",
         ]

lnbits/static/css/base.css

@@ -550,7 +550,3 @@ video {
   padding: 0.2rem;
   border-radius: 0.2rem;
 }
-
-.whitespace-pre-line {
-  white-space: pre-line;
-}

lnbits/static/i18n/br.js

@@ -36,7 +36,7 @@ window.localisation.br = {
   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, Alby, ZBD, 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.',
+    '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, Alby, 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.',
@@ -61,10 +61,9 @@ window.localisation.br = {
   service_fee_tooltip:
     'Taxa de serviço cobrada pelo administrador do servidor LNbits por transação de saída',
   toggle_darkmode: 'Alternar modo escuro',
-  payment_reactions: 'Reações de Pagamento',
   view_swagger_docs: 'Ver a documentação da API do LNbits Swagger',
   api_docs: 'Documentação da API',
-  api_keys_api_docs: 'URL do Node, chaves da API e documentação da API',
+  api_keys_api_docs: 'Chaves de API e documentação da API',
   lnbits_version: 'Versão do LNbits',
   runs_on: 'Executa em',
   credit_hint: 'Pressione Enter para creditar a conta',
@@ -191,12 +190,6 @@ window.localisation.br = {
   allow_access_hint: 'Permitir acesso por IP (substituirá os IPs bloqueados)',
   enter_ip: 'Digite o IP e pressione enter',
   rate_limiter: 'Limitador de Taxa',
-  wallet_limiter: 'Limitador de Carteira',
-  wallet_limit_max_withdraw_per_day:
-    'Retirada máxima diária da carteira em sats (0 para desativar)',
-  wallet_max_ballance: 'Saldo máximo da carteira em sats (0 para desativar)',
-  wallet_limit_secs_between_trans:
-    'Minutos e segundos entre transações por carteira (0 para desativar)',
   number_of_requests: 'Número de solicitações',
   time_unit: 'Unidade de tempo',
   minute: 'minuto',
@@ -215,7 +208,6 @@ window.localisation.br = {
   account_settings: 'Configurações da Conta',
   signin_with_google: 'Entrar com o Google',
   signin_with_github: 'Entrar com GitHub',
-  signin_with_keycloak: 'Entrar com Keycloak',
   username_or_email: 'Nome de usuário ou E-mail',
   password: 'Senha',
   password_config: 'Configuração de Senha',
@@ -238,8 +230,5 @@ window.localisation.br = {
   auth_provider: 'Provedor de Autenticação',
   my_account: 'Minha Conta',
   back: 'Voltar',
-  logout: 'Sair',
-  look_and_feel: 'Aparência',
-  language: 'Idioma',
-  color_scheme: 'Esquema de Cores'
+  logout: 'Sair'
 }

lnbits/static/i18n/cn.js

@@ -35,7 +35,7 @@ window.localisation.cn = {
   name_your_wallet: '给你的 %{name}钱包起个名字',
   paste_invoice_label: '粘贴发票，付款请求或lnurl*',
   lnbits_description:
-    'LNbits 设置简单、轻量级，可以运行在任何闪电网络的版本上，目前支持 LND、Core Lightning、OpenNode、Alby, ZBD, LNPay，甚至 LNbits 本身！您可以为自己运行 LNbits，或者为他人轻松提供资金托管。每个钱包都有自己的 API 密钥，你可以创建的钱包数量没有限制。能够把资金分开管理使 LNbits 成为一款有用的资金管理和开发工具。扩展程序增加了 LNbits 的额外功能，所以你可以在闪电网络上尝试各种尖端技术。我们已经尽可能简化了开发扩展程序的过程，作为一个免费和开源的项目，我们鼓励人们开发并提交自己的扩展程序。',
+    'LNbits 设置简单、轻量级，可以运行在任何闪电网络的版本上，目前支持 LND、Core Lightning、OpenNode、Alby, LNPay，甚至 LNbits 本身！您可以为自己运行 LNbits，或者为他人轻松提供资金托管。每个钱包都有自己的 API 密钥，你可以创建的钱包数量没有限制。能够把资金分开管理使 LNbits 成为一款有用的资金管理和开发工具。扩展程序增加了 LNbits 的额外功能，所以你可以在闪电网络上尝试各种尖端技术。我们已经尽可能简化了开发扩展程序的过程，作为一个免费和开源的项目，我们鼓励人们开发并提交自己的扩展程序。',
   export_to_phone: '通过二维码导出到手机',
   export_to_phone_desc:
     '这个二维码包含您钱包的URL。您可以使用手机扫描的方式打开您的钱包。',
@@ -57,10 +57,9 @@ window.localisation.cn = {
   service_fee_max: '服务费：%{amount}% 每笔交易（最高 %{max} sats）',
   service_fee_tooltip: 'LNbits服务器管理员每笔外发交易收取的服务费',
   toggle_darkmode: '切换暗黑模式',
-  payment_reactions: '支付反应',
   view_swagger_docs: '查看 LNbits Swagger API 文档',
   api_docs: 'API文档',
-  api_keys_api_docs: '节点URL、API密钥和API文档',
+  api_keys_api_docs: 'API密钥和API文档',
   lnbits_version: 'LNbits版本',
   runs_on: '可运行在',
   credit_hint: '按 Enter 键充值账户',
@@ -180,11 +179,6 @@ window.localisation.cn = {
   allow_access_hint: '允许通过IP访问（将覆盖被屏蔽的IP）',
   enter_ip: '输入IP地址并按回车键',
   rate_limiter: '速率限制器',
-  wallet_limiter: '钱包限制器',
-  wallet_limit_max_withdraw_per_day:
-    '每日钱包最大提现额度（单位：sats）（设为0则禁用）',
-  wallet_max_ballance: '钱包最大余额（以sats计）（设为0则禁用）',
-  wallet_limit_secs_between_trans: '每个钱包交易间最少秒数（设为0则禁用）',
   number_of_requests: '请求次数',
   time_unit: '时间单位',
   minute: '分钟',
@@ -202,8 +196,7 @@ window.localisation.cn = {
   create_account: '创建账户',
   account_settings: '账户设置',
   signin_with_google: '使用谷歌账号登录',
-  signin_with_github: '使用GitHub登录',
-  signin_with_keycloak: '使用Keycloak登录',
+  signin_with_github: '使用 GitHub 登录',
   username_or_email: '用户名或电子邮箱',
   password: '密码',
   password_config: '密码配置',
@@ -226,8 +219,5 @@ window.localisation.cn = {
   auth_provider: '认证提供者',
   my_account: '我的账户',
   back: '返回',
-  logout: '注销',
-  look_and_feel: '外观和感觉',
-  language: '语言',
-  color_scheme: '配色方案'
+  logout: '注销'
 }

lnbits/static/i18n/cs.js

@@ -35,7 +35,7 @@ window.localisation.cs = {
   name_your_wallet: 'Pojmenujte svou %{name} peněženku',
   paste_invoice_label: 'Vložte fakturu, platební požadavek nebo lnurl kód *',
   lnbits_description:
-    'Snadno nastavitelný a lehkotonážní, LNbits může běžet na jakémkoliv zdroji financování lightning-network, v současné době podporuje LND, Core Lightning, OpenNode, Alby, ZBD, LNPay a dokonce LNbits samotné! LNbits můžete provozovat pro sebe, nebo snadno nabízet správu peněženek pro ostatní. Každá peněženka má své vlastní API klíče a není omezen počet peněženek, které můžete vytvořit. Možnost rozdělení prostředků dělá z LNbits užitečný nástroj pro správu peněz a jako vývojový nástroj. Rozšíření přidávají extra funkčnost k LNbits, takže můžete experimentovat s řadou špičkových technologií na lightning network. Vývoj rozšíření jsme učinili co nejjednodušší a jako svobodný a open-source projekt podporujeme lidi ve vývoji a zasílání vlastních rozšíření.',
+    'Snadno nastavitelný a lehkotonážní, LNbits může běžet na jakémkoliv zdroji financování lightning-network, v současné době podporuje LND, Core Lightning, OpenNode, Alby, LNPay a dokonce LNbits samotné! LNbits můžete provozovat pro sebe, nebo snadno nabízet správu peněženek pro ostatní. Každá peněženka má své vlastní API klíče a není omezen počet peněženek, které můžete vytvořit. Možnost rozdělení prostředků dělá z LNbits užitečný nástroj pro správu peněz a jako vývojový nástroj. Rozšíření přidávají extra funkčnost k LNbits, takže můžete experimentovat s řadou špičkových technologií na lightning network. Vývoj rozšíření jsme učinili co nejjednodušší a jako svobodný a open-source projekt podporujeme lidi ve vývoji a zasílání vlastních rozšíření.',
   export_to_phone: 'Exportovat do telefonu pomocí QR kódu',
   export_to_phone_desc:
     'Tento QR kód obsahuje URL vaší peněženky s plným přístupem. Můžete jej naskenovat z telefonu a otevřít peněženku odtamtud.',
@@ -61,10 +61,9 @@ window.localisation.cs = {
   service_fee_tooltip:
     'Servisní poplatek účtovaný správcem LNbits serveru za odchozí transakci',
   toggle_darkmode: 'Přepnout tmavý režim',
-  payment_reactions: 'Reakce na platby',
   view_swagger_docs: 'Zobrazit LNbits Swagger API dokumentaci',
   api_docs: 'API dokumentace',
-  api_keys_api_docs: 'Adresa uzlu, API klíče a API dokumentace',
+  api_keys_api_docs: 'API klíče a API dokumentace',
   lnbits_version: 'Verze LNbits',
   runs_on: 'Běží na',
   credit_hint: 'Stiskněte Enter pro připsání na účet',
@@ -188,12 +187,6 @@ window.localisation.cs = {
   allow_access_hint: 'Povolit přístup podle IP (přepíše blokované IP)',
   enter_ip: 'Zadejte IP a stiskněte enter',
   rate_limiter: 'Omezovač počtu požadavků',
-  wallet_limiter: 'Omezení peněženky',
-  wallet_limit_max_withdraw_per_day:
-    'Maximální denní limit pro výběr z peněženky v sats (0 pro deaktivaci)',
-  wallet_max_ballance: 'Maximální zůstatek v peněžence v sats (0 pro zakázání)',
-  wallet_limit_secs_between_trans:
-    'Minimální počet sekund mezi transakcemi na peněženku (0 pro vypnutí)',
   number_of_requests: 'Počet požadavků',
   time_unit: 'Časová jednotka',
   minute: 'minuta',
@@ -212,7 +205,6 @@ window.localisation.cs = {
   account_settings: 'Nastavení účtu',
   signin_with_google: 'Přihlásit se přes Google',
   signin_with_github: 'Přihlásit se přes GitHub',
-  signin_with_keycloak: 'Přihlásit se přes Keycloak',
   username_or_email: 'Uživatelské jméno nebo Email',
   password: 'Heslo',
   password_config: 'Konfigurace hesla',
@@ -235,8 +227,5 @@ window.localisation.cs = {
   auth_provider: 'Poskytovatel ověření',
   my_account: 'Můj účet',
   back: 'Zpět',
-  logout: 'Odhlásit se',
-  look_and_feel: 'Vzhled a chování',
-  language: 'Jazyk',
-  color_scheme: 'Barevné schéma'
+  logout: 'Odhlásit se'
 }

lnbits/static/i18n/de.js

@@ -37,7 +37,7 @@ window.localisation.de = {
   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, Alby, ZBD, 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.',
+    'Einfach zu installieren und kompakt, LNbits kann auf jeder Funding-Quelle im Lightning Netzwerk aufsetzen. Derzeit unterstützt: LND, Core Lightning, OpenNode, Alby, 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.',
@@ -63,10 +63,9 @@ window.localisation.de = {
   service_fee_tooltip:
     'Bearbeitungsgebühr, die vom LNbits Server-Administrator pro ausgehender Transaktion berechnet wird',
   toggle_darkmode: 'Auf Dark Mode umschalten',
-  payment_reactions: 'Zahlungsreaktionen',
   view_swagger_docs: 'LNbits Swagger API-Dokumentation',
   api_docs: 'API-Dokumentation',
-  api_keys_api_docs: 'Knoten-URL, API-Schlüssel und API-Dokumentation',
+  api_keys_api_docs: 'API-Schlüssel und API-Dokumentation',
   lnbits_version: 'LNbits-Version',
   runs_on: 'Läuft auf',
   credit_hint: 'Klicke Enter, um das Konto zu belasten',
@@ -193,13 +192,6 @@ window.localisation.de = {
   allow_access_hint: 'Zugriff durch IP erlauben (überschreibt blockierte IPs)',
   enter_ip: 'Geben Sie die IP ein und drücken Sie die Eingabetaste',
   rate_limiter: 'Ratenbegrenzer',
-  wallet_limiter: 'Geldbeutel-Limiter',
-  wallet_limit_max_withdraw_per_day:
-    'Maximales tägliches Wallet-Auszahlungslimit in Sats (0 zum Deaktivieren)',
-  wallet_max_ballance:
-    'Maximales Guthaben der Wallet in Sats (0 zum Deaktivieren)',
-  wallet_limit_secs_between_trans:
-    'Mindestsekunden zwischen Transaktionen pro Wallet (0 zum Deaktivieren)',
   number_of_requests: 'Anzahl der Anfragen',
   time_unit: 'Zeiteinheit',
   minute: 'Minute',
@@ -219,7 +211,6 @@ window.localisation.de = {
   account_settings: 'Kontoeinstellungen',
   signin_with_google: 'Mit Google anmelden',
   signin_with_github: 'Anmelden mit GitHub',
-  signin_with_keycloak: 'Mit Keycloak anmelden',
   username_or_email: 'Benutzername oder E-Mail',
   password: 'Passwort',
   password_config: 'Passwortkonfiguration',
@@ -242,8 +233,5 @@ window.localisation.de = {
   auth_provider: 'Anbieter für Authentifizierung',
   my_account: 'Mein Konto',
   back: 'Zurück',
-  logout: 'Abmelden',
-  look_and_feel: 'Aussehen und Verhalten',
-  language: 'Sprache',
-  color_scheme: 'Farbschema'
+  logout: 'Abmelden'
 }

lnbits/static/i18n/en.js

@@ -35,7 +35,7 @@ window.localisation.en = {
   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, Alby, ZBD, 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.',
+    'Easy to set up and lightweight, LNbits can run on any lightning-network funding source, currently supporting LND, Core Lightning, OpenNode, Alby, 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.',
@@ -59,10 +59,9 @@ window.localisation.en = {
   service_fee_tooltip:
     'Service fee charged by the LNbits server admin per outgoing transaction',
   toggle_darkmode: 'Toggle Dark Mode',
-  payment_reactions: 'Payment Reactions',
   view_swagger_docs: 'View LNbits Swagger API docs',
   api_docs: 'API docs',
-  api_keys_api_docs: 'Node URL, API keys and API docs',
+  api_keys_api_docs: 'API keys and API docs',
   lnbits_version: 'LNbits version',
   runs_on: 'Runs on',
   credit_hint: 'Press Enter to credit account',
@@ -97,12 +96,8 @@ window.localisation.en = {
     '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_title: 'Important!',
-  disclaimer_dialog: `You *must* save your  login credentials to be able to access your wallet again.If you lose them, you will lose access to your wallet and funds.
-
-Find your  login credentials on your account settings page.
-
-This service is in BETA. LNbits holds no responsibility for loss of access to funds.`,
+  disclaimer_dialog:
+    'To ensure continuous access to your wallets, please remember to securely store your login credentials! Please visit the "My Account" page. This service is in BETA, and we hold no responsibility for people losing access to funds.',
   no_transactions: 'No transactions made yet',
   manage: 'Manage',
   extensions: 'Extensions',
@@ -189,12 +184,6 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
   allow_access_hint: 'Allow access by IP (will override blocked IPs)',
   enter_ip: 'Enter IP and hit enter',
   rate_limiter: 'Rate Limiter',
-  wallet_limiter: 'Wallet Limiter',
-  wallet_limit_max_withdraw_per_day:
-    'Max daily wallet withdrawal in sats (0 to disable)',
-  wallet_max_ballance: 'Wallet max balance in sats (0 to disable)',
-  wallet_limit_secs_between_trans:
-    'Min secs between transactions per wallet (0 to disable)',
   number_of_requests: 'Number of requests',
   time_unit: 'Time unit',
   minute: 'minute',
@@ -213,7 +202,6 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
   account_settings: 'Account Settings',
   signin_with_google: 'Sign in with Google',
   signin_with_github: 'Sign in with GitHub',
-  signin_with_keycloak: 'Sign in with Keycloak',
   username_or_email: 'Username or Email',
   password: 'Password',
   password_config: 'Password Config',
@@ -239,12 +227,5 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
   logout: 'Logout',
   look_and_feel: 'Look and Feel',
   language: 'Language',
-  color_scheme: 'Color Scheme',
-  extension_cost: 'This release requires a payment of minimum %{cost} sats.',
-  extension_paid_sats: 'You have already paid %{paid_sats} sats.',
-  release_details_error: 'Cannot get the release details.',
-  pay_from_wallet: 'Pay from Wallet',
-  show_qr: 'Show QR',
-  retry_install: 'Retry Install',
-  new_payment: 'Make New Payment'
+  color_scheme: 'Color Scheme'
 }

lnbits/static/i18n/es.js

@@ -36,7 +36,7 @@ window.localisation.es = {
   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, Alby, ZBD, 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.',
+    '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, Alby, 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í.',
@@ -61,10 +61,9 @@ window.localisation.es = {
   service_fee_tooltip:
     'Comisión de servicio cobrada por el administrador del servidor LNbits por cada transacción saliente',
   toggle_darkmode: 'Cambiar modo oscuro',
-  payment_reactions: 'Reacciones de Pago',
   view_swagger_docs: 'Ver documentación de API de LNbits Swagger',
   api_docs: 'Documentación de API',
-  api_keys_api_docs: 'URL del nodo, claves de API y documentación de API',
+  api_keys_api_docs: 'Claves de API y documentación de API',
   lnbits_version: 'Versión de LNbits',
   runs_on: 'Corre en',
   credit_hint: 'Presione Enter para cargar la cuenta',
@@ -191,13 +190,6 @@ window.localisation.es = {
   allow_access_hint: 'Permitir acceso por IP (anulará las IPs bloqueadas)',
   enter_ip: 'Ingrese la IP y presione enter',
   rate_limiter: 'Limitador de tasa',
-  wallet_limiter: 'Limitador de Cartera',
-  wallet_limit_max_withdraw_per_day:
-    'Límite diario de retiro de la cartera en sats (0 para deshabilitar)',
-  wallet_max_ballance:
-    'Saldo máximo de la billetera en sats (0 para desactivar)',
-  wallet_limit_secs_between_trans:
-    'Mín. segs entre transacciones por cartera (0 para desactivar)',
   number_of_requests: 'Número de solicitudes',
   time_unit: 'Unidad de tiempo',
   minute: 'minuto',
@@ -217,7 +209,6 @@ window.localisation.es = {
   account_settings: 'Configuración de la cuenta',
   signin_with_google: 'Inicia sesión con Google',
   signin_with_github: 'Inicia sesión con GitHub',
-  signin_with_keycloak: 'Iniciar sesión con Keycloak',
   username_or_email: 'Nombre de usuario o correo electrónico',
   password: 'Contraseña',
   password_config: 'Configuración de Contraseña',
@@ -240,8 +231,5 @@ window.localisation.es = {
   auth_provider: 'Proveedor de Autenticación',
   my_account: 'Mi cuenta',
   back: 'Atrás',
-  logout: 'Cerrar sesión',
-  look_and_feel: 'Apariencia',
-  language: 'Idioma',
-  color_scheme: 'Esquema de colores'
+  logout: 'Cerrar sesión'
 }

lnbits/static/i18n/fi.js

@@ -37,7 +37,7 @@ window.localisation.fi = {
   paste_invoice_label:
     'Liitä lasku, maksupyyntö, lnurl-koodi tai Lightning Address *',
   lnbits_description:
-    'Kevyt ja helppokäyttöinen LNbits voi käyttää rahoituslähteinään erilaisia palveluita, kuten LND, Core Lightning, OpenNode, Alby, LNPay ja jopa itseään! Voit käyttää sitä itsenäisesti  ja helposti tarjota erilaisia Lightning-palveluita. Pystyt luomaan sillä salamaverkkolompakoita eikä niiden määrää ole rajoitettu. Jokaiselle lompakolle saat yksilölliset API-avaimet. Varojen osittaminen tekee siitä erittäin kätevän varojen hallinnassa sekä myös ohjelmistokehityksen työkalun. Laajennukset lisäävät LNbits:in toiminnallisuuksia. Näinpä voit helposti testailla useita erilaisia ja viimeisimpiä salamaverkon teknologioita. Laajennuksien kehittämisen olemme pyrkineet tekemään mahdollisimman helpoksi pitämällä LNbits:in ilmaisena OpenSource-projektina. Kannustamme kaikkia kehittämään ja jakelemaan omia laajennuksia!',
+    'Kevyt ja helppokäyttöinen LNbits soveltuu minkä tahansa salamaverkon rahoituslähteeksi. Se tukee rahoituslähteinä LND, Core Lightning, OpenNode, Alby, LNPay ja jopa itseään! Voi käyttää itsenäisesti sitä ja helposti tarjota säilytyspalveluita. Pystyt luomaan sillä salamaverkko lompakoita ja niiden määrää ei ole rajoitettu. Jokaiselle lompakolle saat iksilölliset AP avaimet. Varojen osittaminen tekee siitä erittäin kätevän varojen hallinnassa sekä myös ohjelmistokehityksen työkaluja. Laajennukset lisäävät LNbits:in toiminnallisuuksia. Näinpä voit helposti testailla useita erilaisia ja viimeisimpiä salamaverkon-teknologioita. Laajennuksien kehittämisen olemme pyrkineet tekemään hmahdollisimman helpoksi, ilmaisena OpenSource-projektina. Kannustamme kaikkia kehittämään ja jakelemaan omia laajennuksia!',
   export_to_phone: 'Käytä puhelimessa lukemalla QR-koodi',
   export_to_phone_desc:
     'Tämä QR-koodi sisältää URL-osoitteen, jolla saa lompakkoosi täydet valtuudet. Voi lukea sen puhelimellasi ja avata sillä lompakkosi. Voit myös lisätä lompakkosi selaimella käytettäväksi PWA-sovellukseksi puhelimen aloitusruudulle. ',
@@ -64,10 +64,9 @@ window.localisation.fi = {
   service_fee_tooltip:
     'LNBits palvelimen ylläpitäjä veloittaa lähtevästä maksusta palvelumaksun.',
   toggle_darkmode: 'Tumma näkymä',
-  toggle_reactions: 'Käytä tapahtuma efektejä',
   view_swagger_docs: 'Näytä LNbits Swagger API-dokumentit',
   api_docs: 'API-dokumentaatio',
-  api_keys_api_docs: 'Solmun URL, API-avaimet ja -dokumentaatio',
+  api_keys_api_docs: 'API-avaimet ja -dokumentaatio',
   lnbits_version: 'LNbits versio',
   runs_on: 'Mukana menossa',
   credit_hint: 'Hyväksy painamalla Enter',
@@ -105,9 +104,9 @@ window.localisation.fi = {
   disclaimer_dialog:
     'Muistathan tallettaa kirjautumistietosi turvallisesta ja helposti saataville, jotta pääset jatkossakin kirjautumaan lompakkoosi! Tutustu myös Tilin asetukset -sivuun. Tämä palvelu on kokeiluvaiheessa (eli BETA), ja niinpä kukaan ei ota mitään vastuuta varojen säilymisestä tai niiden käytettävyyden takaamisesta.',
   no_transactions: 'Lompakossa ei ole yhtään tapahtumaa',
-  manage: 'Hallinnointi',
+  manage: 'Hallinnoi',
   extensions: 'Laajennukset',
-  no_extensions: 'Laajennuksia ei ole asennettu :(',
+  no_extensions: 'Yhtään laajennusta ei ole asennettuna :(',
   created: 'Luotu',
   search_extensions: 'Etsi laajennuksia',
   warning: 'Varoitus',
@@ -191,12 +190,6 @@ window.localisation.fi = {
   allow_access_hint: 'Salli pääsy IP-osoitteen perusteella (ohittaa estot)',
   enter_ip: 'Anna IP ja paina +',
   rate_limiter: 'Toiston rajoitin',
-  wallet_limiter: 'Lompakon Rajoitin',
-  wallet_limit_max_withdraw_per_day:
-    'Maksimi päivittäinen lompakon nosto sateissa (0 poistaa käytöstä)',
-  wallet_max_ballance: 'Lompakon maksimisaldo satosheina (0 poistaa käytöstä)',
-  wallet_limit_secs_between_trans:
-    'Min sekuntia transaktioiden välillä lompakkoa kohden (0 poistaa käytöstä)',
   number_of_requests: 'Pyyntöjen lukumäärä',
   time_unit: 'aikayksikkö',
   minute: 'minuutti',
@@ -215,7 +208,6 @@ window.localisation.fi = {
   account_settings: 'Tilin asetukset',
   signin_with_google: 'Kirjaudu Google-tunnuksella',
   signin_with_github: 'Kirjaudu GitHub-tunnuksella',
-  signin_with_keycloak: 'Kirjaudu Keycloak-tunnuksella',
   username_or_email: 'Käyttäjänimi tai sähköposti',
   password: 'Anna uusi salasana',
   password_config: 'Salasanan määritys',

lnbits/static/i18n/fr.js

@@ -39,7 +39,7 @@ window.localisation.fr = {
   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, Alby, ZBD, 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.",
+    "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, Alby, 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.",
@@ -65,10 +65,9 @@ window.localisation.fr = {
   service_fee_tooltip:
     "Frais de service facturés par l'administrateur du serveur LNbits pour chaque transaction sortante",
   toggle_darkmode: 'Basculer le mode sombre',
-  payment_reactions: 'Réactions de paiement',
   view_swagger_docs: "Voir les documentation de l'API Swagger de LNbits",
   api_docs: "Documentation de l'API",
-  api_keys_api_docs: 'URL du nœud, clés API et documentation API',
+  api_keys_api_docs: "Clés API et documentation de l'API",
   lnbits_version: 'Version de LNbits',
   runs_on: 'Fonctionne sur',
   credit_hint: 'Appuyez sur Entrée pour créditer le compte',
@@ -196,13 +195,6 @@ window.localisation.fr = {
     "Autoriser l'accès par IP (cela passera outre les IP bloquées)",
   enter_ip: "Entrez l'adresse IP et appuyez sur Entrée",
   rate_limiter: 'Limiteur de débit',
-  wallet_limiter: 'Limiteur de portefeuille',
-  wallet_limit_max_withdraw_per_day:
-    'Retrait quotidien maximum du portefeuille en sats (0 pour désactiver)',
-  wallet_max_ballance:
-    'Solde maximum du portefeuille en sats (0 pour désactiver)',
-  wallet_limit_secs_between_trans:
-    'Minutes et secondes entre les transactions par portefeuille (0 pour désactiver)',
   number_of_requests: 'Nombre de requêtes',
   time_unit: 'Unité de temps',
   minute: 'minute',
@@ -221,7 +213,6 @@ window.localisation.fr = {
   account_settings: 'Paramètres du compte',
   signin_with_google: 'Connectez-vous avec Google',
   signin_with_github: 'Connectez-vous avec GitHub',
-  signin_with_keycloak: 'Connectez-vous avec Keycloak',
   username_or_email: "Nom d'utilisateur ou e-mail",
   password: 'Mot de passe',
   password_config: 'Configuration du mot de passe',
@@ -244,8 +235,5 @@ window.localisation.fr = {
   auth_provider: "Fournisseur d'authentification",
   my_account: 'Mon compte',
   back: 'Retour',
-  logout: 'Déconnexion',
-  look_and_feel: 'Apparence',
-  language: 'Langue',
-  color_scheme: 'Schéma de couleurs'
+  logout: 'Déconnexion'
 }

lnbits/static/i18n/it.js

@@ -37,7 +37,7 @@ window.localisation.it = {
   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, Alby, ZBD, 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",
+    "Leggero e facile da configurare, LNbits può funzionare su qualsiasi fonte di finanziamento lightning-network, attualmente supporta LND, Core Lightning, OpenNode, Alby, 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ì.",
@@ -62,10 +62,9 @@ window.localisation.it = {
   service_fee_tooltip:
     "Commissione di servizio addebitata dall'amministratore del server LNbits per ogni transazione in uscita",
   toggle_darkmode: 'Attiva la modalità notturna',
-  payment_reactions: 'Reazioni al Pagamento',
   view_swagger_docs: "Visualizza i documentazione dell'API Swagger di LNbits",
   api_docs: "Documentazione dell'API",
-  api_keys_api_docs: 'URL del nodo, chiavi API e documentazione API',
+  api_keys_api_docs: "Chiavi API e documentazione dell'API",
   lnbits_version: 'Versione di LNbits',
   runs_on: 'Esegue su',
   credit_hint: 'Premere Invio per accreditare i fondi',
@@ -192,13 +191,6 @@ window.localisation.it = {
     "Consenti l'accesso per IP (sovrascriverà gli IP bloccati)",
   enter_ip: "Inserisci l'IP e premi invio",
   rate_limiter: 'Limitatore di frequenza',
-  wallet_limiter: 'Limitatore del Portafoglio',
-  wallet_limit_max_withdraw_per_day:
-    'Prelievo massimo giornaliero dal portafoglio in sats (0 per disabilitare)',
-  wallet_max_ballance:
-    'Saldo massimo del portafoglio in sats (0 per disabilitare)',
-  wallet_limit_secs_between_trans:
-    'Minuti e secondi tra transazioni per portafoglio (0 per disabilitare)',
   number_of_requests: 'Numero di richieste',
   time_unit: 'Unità di tempo',
   minute: 'minuto',
@@ -218,7 +210,6 @@ window.localisation.it = {
   account_settings: "Impostazioni dell'account",
   signin_with_google: 'Accedi con Google',
   signin_with_github: 'Accedi con GitHub',
-  signin_with_keycloak: 'Accedi con Keycloak',
   username_or_email: 'Nome utente o Email',
   password: 'Password',
   password_config: 'Configurazione della password',
@@ -241,8 +232,5 @@ window.localisation.it = {
   auth_provider: 'Provider di Autenticazione',
   my_account: 'Il mio account',
   back: 'Indietro',
-  logout: 'Esci',
-  look_and_feel: 'Aspetto e Comportamento',
-  language: 'Lingua',
-  color_scheme: 'Schema dei colori'
+  logout: 'Esci'
 }

lnbits/static/i18n/jp.js

@@ -35,7 +35,7 @@ window.localisation.jp = {
   name_your_wallet: 'あなたのウォレットの名前 %{name}',
   paste_invoice_label: '請求書を貼り付けてください',
   lnbits_description:
-    '簡単にインストールでき、軽量で、LNbitsは現在LND、Core Lightning、OpenNode、Alby, ZBD, LNPay、さらにLNbits自身で動作する任意のLightningネットワークの資金源で実行できます！ LNbitsを自分で実行することも、他の人に優れたソリューションを提供することもできます。各ウォレットには独自のAPIキーがあり、作成できるウォレットの数に制限はありません。資金を分割する機能は、LNbitsを資金管理ツールとして使用したり、開発ツールとして使用したりするための便利なツールです。拡張機能は、LNbitsに追加の機能を追加します。そのため、LNbitsは最先端の技術をネットワークLightningで試すことができます。拡張機能を開発するのは簡単で、無料でオープンソースのプロジェクトであるため、人々が自分で開発し、自分の貢献を送信することを奨励しています。',
+    '簡単にインストールでき、軽量で、LNbitsは現在LND、Core Lightning、OpenNode、Alby, LNPay、さらにLNbits自身で動作する任意のLightningネットワークの資金源で実行できます！ LNbitsを自分で実行することも、他の人に優れたソリューションを提供することもできます。各ウォレットには独自のAPIキーがあり、作成できるウォレットの数に制限はありません。資金を分割する機能は、LNbitsを資金管理ツールとして使用したり、開発ツールとして使用したりするための便利なツールです。拡張機能は、LNbitsに追加の機能を追加します。そのため、LNbitsは最先端の技術をネットワークLightningで試すことができます。拡張機能を開発するのは簡単で、無料でオープンソースのプロジェクトであるため、人々が自分で開発し、自分の貢献を送信することを奨励しています。',
   export_to_phone: '電話にエクスポート',
   export_to_phone_desc:
     'ウォレットを電話にエクスポートすると、ウォレットを削除する前にウォレットを復元できます。ウォレットを削除すると、ウォレットの秘密鍵が削除され、ウォレットを復元することはできません。',
@@ -59,10 +59,9 @@ window.localisation.jp = {
   service_fee_max: '取引手数料：%{amount}%（最大%{max}サトシ）',
   service_fee_tooltip: 'LNbitsサーバー管理者が発生する送金ごとの手数料',
   toggle_darkmode: 'ダークモードを切り替える',
-  payment_reactions: '支払いの反応',
   view_swagger_docs: 'Swaggerドキュメントを表示',
   api_docs: 'APIドキュメント',
-  api_keys_api_docs: 'ノードURL、APIキー、APIドキュメント',
+  api_keys_api_docs: 'APIキーとAPIドキュメント',
   lnbits_version: 'LNbits バージョン',
   runs_on: 'で実行',
   credit_hint:
@@ -189,12 +188,6 @@ window.localisation.jp = {
     'IPによるアクセスを許可する（ブロックされたIPを上書きします）',
   enter_ip: 'IPを入力してエンターキーを押してください',
   rate_limiter: 'レートリミッター',
-  wallet_limiter: 'ウォレットリミッター',
-  wallet_limit_max_withdraw_per_day:
-    '1日あたりの最大ウォレット出金額をsatsで入力してください（0 で無効）。',
-  wallet_max_ballance: 'ウォレットの最大残高（sats）（0は無効）',
-  wallet_limit_secs_between_trans:
-    'トランザクション間の最小秒数（ウォレットごと）（0は無効）',
   number_of_requests: 'リクエストの数',
   time_unit: '時間単位',
   minute: '分',
@@ -214,7 +207,6 @@ window.localisation.jp = {
   account_settings: 'アカウント設定',
   signin_with_google: 'Googleでサインイン',
   signin_with_github: 'GitHubでサインイン',
-  signin_with_keycloak: 'Keycloakでサインイン',
   username_or_email: 'ユーザー名またはメールアドレス',
   password: 'パスワード',
   password_config: 'パスワード設定',
@@ -237,8 +229,5 @@ window.localisation.jp = {
   auth_provider: '認証プロバイダ',
   my_account: 'マイアカウント',
   back: '戻る',
-  logout: 'ログアウト',
-  look_and_feel: 'ルック・アンド・フィール',
-  language: '言語',
-  color_scheme: 'カラースキーム'
+  logout: 'ログアウト'
 }

lnbits/static/i18n/kr.js

@@ -36,7 +36,7 @@ window.localisation.kr = {
   name_your_wallet: '사용할 %{name}지갑의 이름을 정하세요',
   paste_invoice_label: '인보이스, 결제 요청, 혹은 lnurl 코드를 붙여넣으세요 *',
   lnbits_description:
-    '설정이 쉽고 가벼운 LNBits는 어떤 라이트닝 네트워크의 예산 자원 위에서든 돌아갈 수 있습니다. 현재 지원하는 예산 자원의 형태는 LND, Core Lightning, OpenNode, Alby, ZBD, LNPay, 그리고 다른 LNBits 지갑들입니다. 스스로 사용하기 위해, 또는 다른 사람들에게 수탁형 솔루션을 제공하기 위해 LNBits를 운영할 수 있습니다. 각 지갑들은 자신만의 API key를 가지며, 생성 가능한 지갑의 수에는 제한이 없습니다. 자금을 분할할 수 있는 기능으로 인해, LNBits는 자금 운영 도구로써뿐만 아니라 개발 도구로써도 유용합니다. 확장 기능들은 LNBits에 여러분들이 라이트닝 네트워크의 다양한 최신 기술들을 수행해볼 수 있게 하는 추가 기능을 제공합니다. LNBits 개발진들은 확장 기능들의 개발 또한 가능한 쉽게 만들었으며, 무료 오픈 소스 프로젝트답게 사람들이 자신만의 확장 기능들을 개발하고 제출하기를 응원합니다.',
+    '설정이 쉽고 가벼운 LNBits는 어떤 라이트닝 네트워크의 예산 자원 위에서든 돌아갈 수 있습니다. 현재 지원하는 예산 자원의 형태는 LND, Core Lightning, OpenNode, Alby, LNPay, 그리고 다른 LNBits 지갑들입니다. 스스로 사용하기 위해, 또는 다른 사람들에게 수탁형 솔루션을 제공하기 위해 LNBits를 운영할 수 있습니다. 각 지갑들은 자신만의 API key를 가지며, 생성 가능한 지갑의 수에는 제한이 없습니다. 자금을 분할할 수 있는 기능으로 인해, LNBits는 자금 운영 도구로써뿐만 아니라 개발 도구로써도 유용합니다. 확장 기능들은 LNBits에 여러분들이 라이트닝 네트워크의 다양한 최신 기술들을 수행해볼 수 있게 하는 추가 기능을 제공합니다. LNBits 개발진들은 확장 기능들의 개발 또한 가능한 쉽게 만들었으며, 무료 오픈 소스 프로젝트답게 사람들이 자신만의 확장 기능들을 개발하고 제출하기를 응원합니다.',
   export_to_phone: 'QR 코드를 이용해 모바일 기기로 내보내기',
   export_to_phone_desc:
     '이 QR 코드는 선택된 지갑의 최대 접근 권한을 가진 전체 URL을 담고 있습니다. 스캔 후, 모바일 기기에서 지갑을 열 수 있습니다.',
@@ -60,10 +60,9 @@ window.localisation.kr = {
   service_fee_tooltip:
     '지불 결제 시마다 LNBits 서버 관리자에게 납부되는 서비스 수수료',
   toggle_darkmode: '다크 모드 전환',
-  payment_reactions: '결제 반응',
   view_swagger_docs: 'LNbits Swagger API 문서를 봅니다',
   api_docs: 'API 문서',
-  api_keys_api_docs: '노드 URL, API 키와 API 문서',
+  api_keys_api_docs: 'API 키와 API 문서',
   lnbits_version: 'LNbits 버전',
   runs_on: 'Runs on',
   credit_hint: '계정에 자금을 넣으려면 Enter를 눌러주세요',
@@ -188,11 +187,6 @@ window.localisation.kr = {
   allow_access_hint: 'IP 기준으로 접속 허용하기 (차단한 IP들을 무시합니다)',
   enter_ip: 'IP 주소를 입력하고 Enter를 눌러주세요',
   rate_limiter: '횟수로 제한하기',
-  wallet_limiter: '지갑 제한기',
-  wallet_limit_max_withdraw_per_day:
-    '일일 최대 지갑 출금액(sats) (0은 비활성화)',
-  wallet_max_ballance: '지갑 최대 잔액(sats) (0은 비활성화)',
-  wallet_limit_secs_between_trans: '지갑 당 거래 사이 최소 초 (0은 비활성화)',
   number_of_requests: '요청 횟수',
   time_unit: '시간 단위',
   minute: '분',
@@ -211,7 +205,6 @@ window.localisation.kr = {
   account_settings: '계정 설정',
   signin_with_google: 'Google으로 로그인',
   signin_with_github: 'GitHub으로 로그인',
-  signin_with_keycloak: 'Keycloak으로 로그인',
   username_or_email: '사용자 이름 또는 이메일',
   password: '비밀번호',
   password_config: '비밀번호 설정',
@@ -234,8 +227,5 @@ window.localisation.kr = {
   auth_provider: '인증 제공자',
   my_account: '내 계정',
   back: '뒤로',
-  logout: '로그아웃',
-  look_and_feel: '외관과 느낌',
-  language: '언어',
-  color_scheme: '색상 구성'
+  logout: '로그아웃'
 }

lnbits/static/i18n/nl.js

@@ -37,7 +37,7 @@ window.localisation.nl = {
   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, Alby, ZBD, 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.',
+    'Gemakkelijk in te stellen en lichtgewicht, LNbits kan op elke lightning-netwerkfinancieringsbron draaien, ondersteunt op dit moment LND, Core Lightning, OpenNode, Alby, 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.',
@@ -63,10 +63,9 @@ window.localisation.nl = {
   service_fee_tooltip:
     'Transactiekosten in rekening gebracht door de LNbits serverbeheerder per uitgaande transactie',
   toggle_darkmode: 'Donkere modus aan/uit',
-  payment_reactions: 'Betalingsreacties',
   view_swagger_docs: 'Bekijk LNbits Swagger API-documentatie',
   api_docs: 'API-documentatie',
-  api_keys_api_docs: 'Node URL, API-sleutels en API-documentatie',
+  api_keys_api_docs: 'API-sleutels en API-documentatie',
   lnbits_version: 'LNbits-versie',
   runs_on: 'Draait op',
   credit_hint: 'Druk op Enter om de rekening te crediteren',
@@ -192,13 +191,6 @@ window.localisation.nl = {
     "Toegang verlenen op basis van IP (zal geblokkeerde IP's overschrijven)",
   enter_ip: 'Voer IP in en druk op enter',
   rate_limiter: 'Snelheidsbegrenzer',
-  wallet_limiter: 'Portemonnee Limietsteller',
-  wallet_limit_max_withdraw_per_day:
-    'Maximale dagelijkse opname van wallet in sats (0 om uit te schakelen)',
-  wallet_max_ballance:
-    'Maximale portefeuillesaldo in sats (0 om uit te schakelen)',
-  wallet_limit_secs_between_trans:
-    'Min seconden tussen transacties per portemonnee (0 om uit te schakelen)',
   number_of_requests: 'Aantal verzoeken',
   time_unit: 'Tijdeenheid',
   minute: 'minuut',
@@ -217,7 +209,6 @@ window.localisation.nl = {
   account_settings: 'Accountinstellingen',
   signin_with_google: 'Inloggen met Google',
   signin_with_github: 'Inloggen met GitHub',
-  signin_with_keycloak: 'Inloggen met Keycloak',
   username_or_email: 'Gebruikersnaam of e-mail',
   password: 'Wachtwoord',
   password_config: 'Wachtwoordconfiguratie',
@@ -240,8 +231,5 @@ window.localisation.nl = {
   auth_provider: 'Auth Provider',
   my_account: 'Mijn Account',
   back: 'Terug',
-  logout: 'Afmelden',
-  look_and_feel: 'Uiterlijk en gedrag',
-  language: 'Taal',
-  color_scheme: 'Kleurenschema'
+  logout: 'Afmelden'
 }

lnbits/static/i18n/pi.js

@@ -36,7 +36,7 @@ window.localisation.pi = {
   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, Alby, ZBD, 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.',
+    'Arr, easy to set up and lightweight, LNbits can run on any lightning-network funding source, currently supporting LND, Core Lightning, OpenNode, Alby, 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!',
@@ -61,10 +61,9 @@ window.localisation.pi = {
   service_fee_tooltip:
     "Service fee charged by the LNbits server admin per goin' transaction",
   toggle_darkmode: 'Toggle Dark Mode, arr!',
-  payment_reactions: 'Payment Reactions',
   view_swagger_docs: 'View LNbits Swagger API docs and learn the secrets',
   api_docs: 'API docs for the scallywags',
-  api_keys_api_docs: 'Node URL, API keys and API docs',
+  api_keys_api_docs: 'API keys and API docs',
   lnbits_version: 'LNbits version, arr!',
   runs_on: 'Runs on, matey',
   credit_hint: 'Press Enter to credit account and make it richer',
@@ -190,12 +189,6 @@ window.localisation.pi = {
   allow_access_hint: 'Grant permission by IP (will override barred IPs)',
   enter_ip: 'Enter IP and hit enter',
   rate_limiter: 'Rate Limiter',
-  wallet_limiter: 'Pouch Limitar',
-  wallet_limit_max_withdraw_per_day:
-    'Max daily wallet withdrawal in sats (0 ter disable)',
-  wallet_max_ballance: 'Purse max heaviness in sats (0 fer scuttle)',
-  wallet_limit_secs_between_trans:
-    "Min secs 'tween transactions per wallet (0 to disable)",
   number_of_requests: "Number o' requests",
   time_unit: "time bein'",
   minute: 'minnit',
@@ -214,7 +207,6 @@ window.localisation.pi = {
   account_settings: "Account Settin's",
   signin_with_google: "Sign in wit' Google",
   signin_with_github: "Sign in wit' GitHub",
-  signin_with_keycloak: "Sign in wit' Keycloak",
   username_or_email: 'Usarrrname or Email',
   password: 'Passwarrd',
   password_config: 'Passwarrd Config',
@@ -237,8 +229,5 @@ window.localisation.pi = {
   auth_provider: 'Auth Provider becometh Auth Provider, ye see?',
   my_account: 'Me Arrrccount',
   back: 'Return',
-  logout: 'Log out yer session',
-  look_and_feel: 'Look and Feel',
-  language: 'Langwidge',
-  color_scheme: 'Colour Scheme'
+  logout: 'Log out yer session'
 }

lnbits/static/i18n/pl.js

@@ -35,7 +35,7 @@ window.localisation.pl = {
   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, Alby, ZBD, 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',
+    'Ł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, Alby, 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.',
@@ -60,10 +60,9 @@ window.localisation.pl = {
   service_fee_tooltip:
     'Opłata serwisowa pobierana przez administratora serwera LNbits za każdą wychodzącą transakcję',
   toggle_darkmode: 'Tryb nocny',
-  payment_reactions: 'Reakcje na płatność',
   view_swagger_docs: 'Dokumentacja Swagger API',
   api_docs: 'Dokumentacja API',
-  api_keys_api_docs: 'Adres URL węzła, klucze API i dokumentacja API',
+  api_keys_api_docs: 'Klucze API i dokumentacja API',
   lnbits_version: 'Wersja LNbits',
   runs_on: 'Działa na',
   credit_hint: 'Naciśnij Enter aby doładować konto',
@@ -189,12 +188,6 @@ window.localisation.pl = {
     'Zezwól na dostęp przez IP (zignoruje zablokowane adresy IP)',
   enter_ip: 'Wpisz adres IP i naciśnij enter',
   rate_limiter: 'Ogranicznik Częstotliwości',
-  wallet_limiter: 'Ogranicznik Portfela',
-  wallet_limit_max_withdraw_per_day:
-    'Maksymalna dzienna wypłata z portfela w satoshi (0 aby wyłączyć)',
-  wallet_max_ballance: 'Maksymalny stan portfela w satoshi (0 aby wyłączyć)',
-  wallet_limit_secs_between_trans:
-    'Min sekund pomiędzy transakcjami na portfel (0 aby wyłączyć)',
   number_of_requests: 'Liczba żądań',
   time_unit: 'Jednostka czasu',
   minute: 'minuta',
@@ -213,7 +206,6 @@ window.localisation.pl = {
   account_settings: 'Ustawienia konta',
   signin_with_google: 'Zaloguj się przez Google',
   signin_with_github: 'Zaloguj się przez GitHub',
-  signin_with_keycloak: 'Zaloguj się przez Keycloak',
   username_or_email: 'Nazwa użytkownika lub Email',
   password: 'Hasło',
   password_config: 'Konfiguracja Hasła',
@@ -236,8 +228,5 @@ window.localisation.pl = {
   auth_provider: 'Dostawca uwierzytelniania',
   my_account: 'Moje Konto',
   back: 'Wstecz',
-  logout: 'Wyloguj',
-  look_and_feel: 'Wygląd i zachowanie',
-  language: 'Język',
-  color_scheme: 'Schemat kolorów'
+  logout: 'Wyloguj'
 }

lnbits/static/i18n/pt.js

@@ -36,7 +36,7 @@ window.localisation.pt = {
   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, Alby, ZBD, 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.',
+    '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, Alby, 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.',
@@ -61,10 +61,9 @@ window.localisation.pt = {
   service_fee_tooltip:
     'Taxa de serviço cobrada pelo administrador do servidor LNbits por transação de saída',
   toggle_darkmode: 'Alternar modo escuro',
-  payment_reactions: 'Reações de Pagamento',
   view_swagger_docs: 'Ver a documentação da API do LNbits Swagger',
   api_docs: 'Documentação da API',
-  api_keys_api_docs: 'URL do Nó, chaves de API e documentação de API',
+  api_keys_api_docs: 'Chaves de API e documentação de API',
   lnbits_version: 'Versão do LNbits',
   runs_on: 'Executa em',
   credit_hint: 'Pressione Enter para creditar a conta',
@@ -190,12 +189,6 @@ window.localisation.pt = {
   allow_access_hint: 'Permitir acesso por IP (substituirá IPs bloqueados)',
   enter_ip: 'Digite o IP e pressione enter.',
   rate_limiter: 'Limitador de Taxa',
-  wallet_limiter: 'Limitador de Carteira',
-  wallet_limit_max_withdraw_per_day:
-    'Limite diário máximo de saque da carteira em sats (0 para desativar)',
-  wallet_max_ballance: 'Saldo máximo da carteira em sats (0 para desativar)',
-  wallet_limit_secs_between_trans:
-    'Minutos seg. entre transações por carteira (0 para desativar)',
   number_of_requests: 'Número de solicitações',
   time_unit: 'Unidade de tempo',
   minute: 'minuto',
@@ -214,7 +207,6 @@ window.localisation.pt = {
   account_settings: 'Configurações da Conta',
   signin_with_google: 'Entrar com o Google',
   signin_with_github: 'Entrar com o GitHub',
-  signin_with_keycloak: 'Entrar com o Keycloak',
   username_or_email: 'Nome de usuário ou Email',
   password: 'Senha',
   password_config: 'Configuração de Senha',
@@ -237,8 +229,5 @@ window.localisation.pt = {
   auth_provider: 'Provedor de Autenticação',
   my_account: 'Minha Conta',
   back: 'Voltar',
-  logout: 'Sair',
-  look_and_feel: 'Aparência e Sensação',
-  language: 'Idioma',
-  color_scheme: 'Esquema de Cores'
+  logout: 'Sair'
 }

lnbits/static/i18n/sk.js

@@ -35,7 +35,7 @@ window.localisation.sk = {
   name_your_wallet: 'Pomenujte vašu %{name} peňaženku',
   paste_invoice_label: 'Vložte faktúru, platobnú požiadavku alebo lnurl kód *',
   lnbits_description:
-    'Ľahko nastaviteľný a ľahkotonážny, LNbits môže bežať na akomkoľvek zdroji financovania lightning-network, momentálne podporuje LND, Core Lightning, OpenNode, Alby, ZBD, LNPay a dokonca LNbits samotný! LNbits môžete používať pre seba, alebo ľahko ponúknuť správcovské riešenie pre iných. Každá peňaženka má svoje vlastné API kľúče a nie je limit na počet peňaženiek, ktoré môžete vytvoriť. Schopnosť rozdeľovať finančné prostriedky robí z LNbits užitočný nástroj pre správu peňazí a ako vývojový nástroj. Rozšírenia pridávajú extra funkčnosť do LNbits, takže môžete experimentovať s radou najnovších technológií na lightning sieti. Vývoj rozšírení sme urobili čo najjednoduchší a ako voľný a open-source projekt, podporujeme ľudí vývoj a odovzdávanie vlastných rozšírení.',
+    'Ľahko nastaviteľný a ľahkotonážny, LNbits môže bežať na akomkoľvek zdroji financovania lightning-network, momentálne podporuje LND, Core Lightning, OpenNode, Alby, LNPay a dokonca LNbits samotný! LNbits môžete používať pre seba, alebo ľahko ponúknuť správcovské riešenie pre iných. Každá peňaženka má svoje vlastné API kľúče a nie je limit na počet peňaženiek, ktoré môžete vytvoriť. Schopnosť rozdeľovať finančné prostriedky robí z LNbits užitočný nástroj pre správu peňazí a ako vývojový nástroj. Rozšírenia pridávajú extra funkčnosť do LNbits, takže môžete experimentovať s radou najnovších technológií na lightning sieti. Vývoj rozšírení sme urobili čo najjednoduchší a ako voľný a open-source projekt, podporujeme ľudí vývoj a odovzdávanie vlastných rozšírení.',
   export_to_phone: 'Exportovať do telefónu s QR kódom',
   export_to_phone_desc:
     'Tento QR kód obsahuje URL vašej peňaženky s plným prístupom. Môžete ho naskenovať z vášho telefónu a otvoriť vašu peňaženku odtiaľ.',
@@ -60,10 +60,9 @@ window.localisation.sk = {
   service_fee_tooltip:
     'Servisný poplatok účtovaný správcom LNbits servera za odchádzajúcu transakciu',
   toggle_darkmode: 'Prepnúť Tmavý režim',
-  payment_reactions: 'Reakcie na platbu',
   view_swagger_docs: 'Zobraziť LNbits Swagger API dokumentáciu',
   api_docs: 'API dokumentácia',
-  api_keys_api_docs: 'Adresa uzla, API kľúče a API dokumentácia',
+  api_keys_api_docs: 'API kľúče a API dokumentácia',
   lnbits_version: 'Verzia LNbits',
   runs_on: 'Beží na',
   credit_hint: 'Stlačte Enter pre pripísanie na účet',
@@ -188,13 +187,6 @@ window.localisation.sk = {
   allow_access_hint: 'Povoliť prístup podľa IP (prebije blokované IP)',
   enter_ip: 'Zadajte IP a stlačte enter',
   rate_limiter: 'Obmedzovač počtu požiadaviek',
-  wallet_limiter: 'Obmedzovač peňaženky',
-  wallet_limit_max_withdraw_per_day:
-    'Maximálny denný výber z peňaženky v satošiach (0 pre zrušenie)',
-  wallet_max_ballance:
-    'Maximálny zostatok v peňaženke v satošiach (0 pre deaktiváciu)',
-  wallet_limit_secs_between_trans:
-    'Minimálny počet sekúnd medzi transakciami na peňaženku (0 na deaktiváciu)',
   number_of_requests: 'Počet požiadaviek',
   time_unit: 'Časová jednotka',
   minute: 'minúta',
@@ -211,9 +203,8 @@ window.localisation.sk = {
   login_to_account: 'Prihláste sa do vášho účtu',
   create_account: 'Vytvoriť účet',
   account_settings: 'Nastavenia účtu',
-  signin_with_google: 'Prihlásiť sa pomocou Google',
-  signin_with_github: 'Prihlásiť sa pomocou GitHub',
-  signin_with_keycloak: 'Prihlásiť sa pomocou Keycloak',
+  signin_with_google: 'Prihlásiť sa cez Google',
+  signin_with_github: 'Prihláste sa pomocou GitHub',
   username_or_email: 'Používateľské meno alebo email',
   password: 'Heslo',
   password_config: 'Konfigurácia hesla',
@@ -236,8 +227,5 @@ window.localisation.sk = {
   auth_provider: 'Poskytovateľ autentifikácie',
   my_account: 'Môj účet',
   back: 'Späť',
-  logout: 'Odhlásiť sa',
-  look_and_feel: 'Vzhľad a dojem',
-  language: 'Jazyk',
-  color_scheme: 'Farebná schéma'
+  logout: 'Odhlásiť sa'
 }

lnbits/static/i18n/we.js

@@ -35,7 +35,7 @@ window.localisation.we = {
   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, Alby, ZBD, 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.',
+    '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, Alby, 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.',
@@ -61,10 +61,9 @@ window.localisation.we = {
   service_fee_tooltip:
     "Ffi gwasanaeth a godir gan weinyddwr gweinydd LNbits ym mhob trafodiad sy'n mynd allan",
   toggle_darkmode: 'Toglo Modd Tywyll',
-  payment_reactions: 'Adweithiau Talu',
   view_swagger_docs: 'Gweld dogfennau API LNbits Swagger',
   api_docs: 'Dogfennau API',
-  api_keys_api_docs: 'URL y nod, allweddi API a dogfennau API',
+  api_keys_api_docs: 'Allweddi API a dogfennau API',
   lnbits_version: 'Fersiwn LNbits',
   runs_on: 'Yn rhedeg ymlaen',
   credit_hint: 'Pwyswch Enter i gyfrif credyd',
@@ -189,12 +188,6 @@ window.localisation.we = {
     "Caniatáu mynediad gan IP (bydd yn diystyru IPs sydd wedi'u blocio)",
   enter_ip: 'Rhowch IP a gwasgwch enter',
   rate_limiter: 'Cyfyngydd Cyfradd',
-  wallet_limiter: 'Cyfyngwr Waled',
-  wallet_limit_max_withdraw_per_day:
-    'Uchafswm tynnu’n ôl waled dyddiol mewn sats (0 i analluogi)',
-  wallet_max_ballance: 'Uchafswm balans y waled mewn sats (0 i analluogi)',
-  wallet_limit_secs_between_trans:
-    'Eiliadau lleiaf rhwng trafodion fesul waled (0 i analluogi)',
   number_of_requests: 'Nifer y ceisiadau',
   time_unit: 'Uned amser',
   minute: 'munud',
@@ -213,7 +206,6 @@ window.localisation.we = {
   account_settings: 'Gosodiadau Cyfrif',
   signin_with_google: 'Mewngofnodi gyda Google',
   signin_with_github: 'Mewngofnodi gyda GitHub',
-  signin_with_keycloak: 'Mewngofnodi gyda Keycloak',
   username_or_email: 'Defnyddiwr neu E-bost',
   password: 'Cyfrinair',
   password_config: 'Ffurfweddiad Cyfrinair',
@@ -236,8 +228,5 @@ window.localisation.we = {
   auth_provider: 'Darparwr Dilysiad',
   my_account: 'Fy Nghyfrif',
   back: 'Yn ôl',
-  logout: 'Allgofnodi',
-  look_and_feel: 'Edrych a Theimlo',
-  language: 'Iaith',
-  color_scheme: 'Cynllun Lliw'
+  logout: 'Allgofnodi'
 }

lnbits/static/js/account.js

@@ -6,12 +6,6 @@ new Vue({
       user: null,
       hasUsername: false,
       showUserId: false,
-      reactionOptions: [
-        'None',
-        'confettiBothSides',
-        'confettiFireworks',
-        'confettiStars'
-      ],
       tab: 'user',
       passwordData: {
         show: false,
@@ -33,9 +27,6 @@ new Vue({
       this.$q.dark.toggle()
       this.$q.localStorage.set('lnbits.darkMode', this.$q.dark.isActive)
     },
-    reactionChoiceFunc: function () {
-      this.$q.localStorage.set('lnbits.reactions', this.reactionChoice)
-    },
     changeColor: function (newValue) {
       document.body.setAttribute('data-theme', newValue)
       this.$q.localStorage.set('lnbits.theme', newValue)

lnbits/static/js/base.js

@@ -168,6 +168,7 @@ window.LNbits = {
       let listener = ev => {
         cb(JSON.parse(ev.data))
       }
+
       this.listenersCount = this.listenersCount || {[wallet.inkey]: 0}
       this.listenersCount[wallet.inkey]++
 
@@ -443,7 +444,6 @@ window.windowMixin = {
   data: function () {
     return {
       toggleSubs: true,
-      reactionChoice: 'confettiBothSides',
       isUserAuthorized: false,
       g: {
         offline: !navigator.onLine,
@@ -523,9 +523,6 @@ window.windowMixin = {
     } else {
       this.$q.dark.set(true)
     }
-    this.reactionChoice =
-      this.$q.localStorage.getItem('lnbits.reactions') || 'confettiBothSides'
-
     this.g.allowedThemes = window.allowedThemes ?? ['bitcoin']
 
     let locale = this.$q.localStorage.getItem('lnbits.lang')

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

@@ -50,8 +50,7 @@ Vue.component('lnbits-funding-sources', {
             lnd_rest_endpoint: 'Endpoint',
             lnd_rest_cert: 'Certificate',
             lnd_rest_macaroon: 'Macaroon',
-            lnd_rest_macaroon_encrypted: 'Encrypted Macaroon',
-            lnd_rest_route_hints: 'Enable Route Hints'
+            lnd_rest_macaroon_encrypted: 'Encrypted Macaroon'
           }
         ],
         [
@@ -106,14 +105,6 @@ Vue.component('lnbits-funding-sources', {
             alby_access_token: 'Key'
           }
         ],
-        [
-          'ZBDWallet',
-          'ZBD',
-          {
-            zbd_api_endpoint: 'Endpoint',
-            zbd_api_key: 'Key'
-          }
-        ],
         [
           'OpenNodeWallet',
           'OpenNode',

lnbits/static/js/event-reactions.js

@@ -1,560 +0,0 @@
-function eventReactionWebocket(event_id) {
-  localUrl = ''
-  reaction = localStorage.getItem('lnbits.reactions')
-  if (!reaction || reaction === 'None') {
-    return
-  }
-  if (location.protocol !== 'http:') {
-    localUrl = 'wss://' + location.host + '/api/v1/ws/' + event_id
-  } else {
-    localUrl = 'ws://' + location.host + '/api/v1/ws/' + event_id
-  }
-  connection = new WebSocket(localUrl)
-  connection.onmessage = function (e) {
-    try {
-      const parsedData = JSON.parse(e.data)
-      if (parsedData.payment.amount < 0) {
-        return
-      }
-      reaction = localStorage.getItem('lnbits.reactions')
-      if (reaction) {
-        window[reaction.split('|')[1]]()
-      }
-    } catch (e) {
-      console.log(e)
-    }
-  }
-}
-function confettiBothSides() {
-  document.getElementById('vue').disabled = true
-  var end = Date.now() + 2 * 1000
-  var colors = ['#FFD700', '#ffffff']
-  function frame() {
-    confetti({
-      particleCount: 2,
-      angle: 60,
-      spread: 55,
-      origin: {x: 0},
-      colors: colors,
-      zIndex: 999999
-    })
-    confetti({
-      particleCount: 2,
-      angle: 120,
-      spread: 55,
-      origin: {x: 1},
-      colors: colors,
-      zIndex: 999999
-    })
-    if (Date.now() < end) {
-      requestAnimationFrame(frame)
-    } else {
-      document.getElementById('vue').disabled = false
-    }
-  }
-  frame()
-}
-function confettiFireworks() {
-  var duration = 3 * 1000
-  var animationEnd = Date.now() + duration
-  var defaults = {startVelocity: 30, spread: 360, ticks: 60, zIndex: 0}
-
-  function randomInRange(min, max) {
-    return Math.random() * (max - min) + min
-  }
-
-  var interval = setInterval(function () {
-    var timeLeft = animationEnd - Date.now()
-
-    if (timeLeft <= 0) {
-      return clearInterval(interval)
-    }
-
-    var particleCount = 5 * (timeLeft / duration)
-    // since particles fall down, start a bit higher than random
-    confetti({
-      ...defaults,
-      particleCount,
-      origin: {x: randomInRange(0.1, 0.3), y: Math.random() - 0.2}
-    })
-    confetti({
-      ...defaults,
-      particleCount,
-      origin: {x: randomInRange(0.7, 0.9), y: Math.random() - 0.2}
-    })
-  }, 250)
-}
-
-function confettiStars() {
-  var defaults = {
-    spread: 360,
-    ticks: 50,
-    gravity: 0,
-    decay: 0.94,
-    startVelocity: 30,
-    colors: ['FFE400', 'FFBD00', 'E89400', 'FFCA6C', 'FDFFB8']
-  }
-
-  function shoot() {
-    confetti({
-      ...defaults,
-      particleCount: 40,
-      scalar: 1.2,
-      shapes: ['star']
-    })
-
-    confetti({
-      ...defaults,
-      particleCount: 10,
-      scalar: 0.75,
-      shapes: ['circle']
-    })
-  }
-
-  setTimeout(shoot, 0)
-  setTimeout(shoot, 100)
-  setTimeout(shoot, 200)
-  setTimeout(shoot, 0)
-  setTimeout(shoot, 100)
-  setTimeout(shoot, 200)
-}
-!(function (t, e) {
-  !(function t(e, n, a, i) {
-    var o = !!(
-      e.Worker &&
-      e.Blob &&
-      e.Promise &&
-      e.OffscreenCanvas &&
-      e.OffscreenCanvasRenderingContext2D &&
-      e.HTMLCanvasElement &&
-      e.HTMLCanvasElement.prototype.transferControlToOffscreen &&
-      e.URL &&
-      e.URL.createObjectURL
-    )
-    function r() {}
-    function l(t) {
-      var a = n.exports.Promise,
-        i = void 0 !== a ? a : e.Promise
-      return 'function' == typeof i ? new i(t) : (t(r, r), null)
-    }
-    var c,
-      s,
-      u,
-      d,
-      f,
-      h,
-      g,
-      m,
-      b =
-        ((u = Math.floor(1e3 / 60)),
-        (d = {}),
-        (f = 0),
-        'function' == typeof requestAnimationFrame &&
-        'function' == typeof cancelAnimationFrame
-          ? ((c = function (t) {
-              var e = Math.random()
-              return (
-                (d[e] = requestAnimationFrame(function n(a) {
-                  f === a || f + u - 1 < a
-                    ? ((f = a), delete d[e], t())
-                    : (d[e] = requestAnimationFrame(n))
-                })),
-                e
-              )
-            }),
-            (s = function (t) {
-              d[t] && cancelAnimationFrame(d[t])
-            }))
-          : ((c = function (t) {
-              return setTimeout(t, u)
-            }),
-            (s = function (t) {
-              return clearTimeout(t)
-            })),
-        {frame: c, cancel: s}),
-      v =
-        ((m = {}),
-        function () {
-          if (h) return h
-          if (!a && o) {
-            var e = [
-              'var CONFETTI, SIZE = {}, module = {};',
-              '(' + t.toString() + ')(this, module, true, SIZE);',
-              'onmessage = function(msg) {',
-              '  if (msg.data.options) {',
-              '    CONFETTI(msg.data.options).then(function () {',
-              '      if (msg.data.callback) {',
-              '        postMessage({ callback: msg.data.callback });',
-              '      }',
-              '    });',
-              '  } else if (msg.data.reset) {',
-              '    CONFETTI.reset();',
-              '  } else if (msg.data.resize) {',
-              '    SIZE.width = msg.data.resize.width;',
-              '    SIZE.height = msg.data.resize.height;',
-              '  } else if (msg.data.canvas) {',
-              '    SIZE.width = msg.data.canvas.width;',
-              '    SIZE.height = msg.data.canvas.height;',
-              '    CONFETTI = module.exports.create(msg.data.canvas);',
-              '  }',
-              '}'
-            ].join('\n')
-            try {
-              h = new Worker(URL.createObjectURL(new Blob([e])))
-            } catch (t) {
-              return (
-                void 0 !== typeof console &&
-                  'function' == typeof console.warn &&
-                  console.warn('🎊 Could not load worker', t),
-                null
-              )
-            }
-            !(function (t) {
-              function e(e, n) {
-                t.postMessage({options: e || {}, callback: n})
-              }
-              ;(t.init = function (e) {
-                var n = e.transferControlToOffscreen()
-                t.postMessage({canvas: n}, [n])
-              }),
-                (t.fire = function (n, a, i) {
-                  if (g) return e(n, null), g
-                  var o = Math.random().toString(36).slice(2)
-                  return (g = l(function (a) {
-                    function r(e) {
-                      e.data.callback === o &&
-                        (delete m[o],
-                        t.removeEventListener('message', r),
-                        (g = null),
-                        i(),
-                        a())
-                    }
-                    t.addEventListener('message', r),
-                      e(n, o),
-                      (m[o] = r.bind(null, {data: {callback: o}}))
-                  }))
-                }),
-                (t.reset = function () {
-                  for (var e in (t.postMessage({reset: !0}), m))
-                    m[e](), delete m[e]
-                })
-            })(h)
-          }
-          return h
-        }),
-      y = {
-        particleCount: 50,
-        angle: 90,
-        spread: 45,
-        startVelocity: 45,
-        decay: 0.9,
-        gravity: 1,
-        drift: 0,
-        ticks: 200,
-        x: 0.5,
-        y: 0.5,
-        shapes: ['square', 'circle'],
-        zIndex: 100,
-        colors: [
-          '#26ccff',
-          '#a25afd',
-          '#ff5e7e',
-          '#88ff5a',
-          '#fcff42',
-          '#ffa62d',
-          '#ff36ff'
-        ],
-        disableForReducedMotion: !1,
-        scalar: 1
-      }
-    function p(t, e, n) {
-      return (function (t, e) {
-        return e ? e(t) : t
-      })(t && null != t[e] ? t[e] : y[e], n)
-    }
-    function M(t) {
-      return t < 0 ? 0 : Math.floor(t)
-    }
-    function w(t) {
-      return parseInt(t, 16)
-    }
-    function x(t) {
-      return t.map(C)
-    }
-    function C(t) {
-      var e = String(t).replace(/[^0-9a-f]/gi, '')
-      return (
-        e.length < 6 && (e = e[0] + e[0] + e[1] + e[1] + e[2] + e[2]),
-        {
-          r: w(e.substring(0, 2)),
-          g: w(e.substring(2, 4)),
-          b: w(e.substring(4, 6))
-        }
-      )
-    }
-    function k(t) {
-      ;(t.width = document.documentElement.clientWidth),
-        (t.height = document.documentElement.clientHeight)
-    }
-    function I(t) {
-      var e = t.getBoundingClientRect()
-      ;(t.width = e.width), (t.height = e.height)
-    }
-    function T(t, e, n, o, r) {
-      var c,
-        s,
-        u = e.slice(),
-        d = t.getContext('2d'),
-        f = l(function (e) {
-          function l() {
-            ;(c = s = null), d.clearRect(0, 0, o.width, o.height), r(), e()
-          }
-          ;(c = b.frame(function e() {
-            !a ||
-              (o.width === i.width && o.height === i.height) ||
-              ((o.width = t.width = i.width), (o.height = t.height = i.height)),
-              o.width ||
-                o.height ||
-                (n(t), (o.width = t.width), (o.height = t.height)),
-              d.clearRect(0, 0, o.width, o.height),
-              (u = u.filter(function (t) {
-                return (function (t, e) {
-                  ;(e.x += Math.cos(e.angle2D) * e.velocity + e.drift),
-                    (e.y += Math.sin(e.angle2D) * e.velocity + e.gravity),
-                    (e.wobble += 0.1),
-                    (e.velocity *= e.decay),
-                    (e.tiltAngle += 0.1),
-                    (e.tiltSin = Math.sin(e.tiltAngle)),
-                    (e.tiltCos = Math.cos(e.tiltAngle)),
-                    (e.random = Math.random() + 5),
-                    (e.wobbleX = e.x + 10 * e.scalar * Math.cos(e.wobble)),
-                    (e.wobbleY = e.y + 10 * e.scalar * Math.sin(e.wobble))
-                  var n = e.tick++ / e.totalTicks,
-                    a = e.x + e.random * e.tiltCos,
-                    i = e.y + e.random * e.tiltSin,
-                    o = e.wobbleX + e.random * e.tiltCos,
-                    r = e.wobbleY + e.random * e.tiltSin
-                  return (
-                    (t.fillStyle =
-                      'rgba(' +
-                      e.color.r +
-                      ', ' +
-                      e.color.g +
-                      ', ' +
-                      e.color.b +
-                      ', ' +
-                      (1 - n) +
-                      ')'),
-                    t.beginPath(),
-                    'circle' === e.shape
-                      ? t.ellipse
-                        ? t.ellipse(
-                            e.x,
-                            e.y,
-                            Math.abs(o - a) * e.ovalScalar,
-                            Math.abs(r - i) * e.ovalScalar,
-                            (Math.PI / 10) * e.wobble,
-                            0,
-                            2 * Math.PI
-                          )
-                        : (function (t, e, n, a, i, o, r, l, c) {
-                            t.save(),
-                              t.translate(e, n),
-                              t.rotate(o),
-                              t.scale(a, i),
-                              t.arc(0, 0, 1, r, l, c),
-                              t.restore()
-                          })(
-                            t,
-                            e.x,
-                            e.y,
-                            Math.abs(o - a) * e.ovalScalar,
-                            Math.abs(r - i) * e.ovalScalar,
-                            (Math.PI / 10) * e.wobble,
-                            0,
-                            2 * Math.PI
-                          )
-                      : (t.moveTo(Math.floor(e.x), Math.floor(e.y)),
-                        t.lineTo(Math.floor(e.wobbleX), Math.floor(i)),
-                        t.lineTo(Math.floor(o), Math.floor(r)),
-                        t.lineTo(Math.floor(a), Math.floor(e.wobbleY))),
-                    t.closePath(),
-                    t.fill(),
-                    e.tick < e.totalTicks
-                  )
-                })(d, t)
-              })).length
-                ? (c = b.frame(e))
-                : l()
-          })),
-            (s = l)
-        })
-      return {
-        addFettis: function (t) {
-          return (u = u.concat(t)), f
-        },
-        canvas: t,
-        promise: f,
-        reset: function () {
-          c && b.cancel(c), s && s()
-        }
-      }
-    }
-    function E(t, n) {
-      var a,
-        i = !t,
-        r = !!p(n || {}, 'resize'),
-        c = p(n, 'disableForReducedMotion', Boolean),
-        s = o && !!p(n || {}, 'useWorker') ? v() : null,
-        u = i ? k : I,
-        d = !(!t || !s) && !!t.__confetti_initialized,
-        f =
-          'function' == typeof matchMedia &&
-          matchMedia('(prefers-reduced-motion)').matches
-      function h(e, n, i) {
-        for (
-          var o,
-            r,
-            l,
-            c,
-            s,
-            d = p(e, 'particleCount', M),
-            f = p(e, 'angle', Number),
-            h = p(e, 'spread', Number),
-            g = p(e, 'startVelocity', Number),
-            m = p(e, 'decay', Number),
-            b = p(e, 'gravity', Number),
-            v = p(e, 'drift', Number),
-            y = p(e, 'colors', x),
-            w = p(e, 'ticks', Number),
-            C = p(e, 'shapes'),
-            k = p(e, 'scalar'),
-            I = (function (t) {
-              var e = p(t, 'origin', Object)
-              return (e.x = p(e, 'x', Number)), (e.y = p(e, 'y', Number)), e
-            })(e),
-            E = d,
-            S = [],
-            F = t.width * I.x,
-            N = t.height * I.y;
-          E--;
-
-        )
-          S.push(
-            ((o = {
-              x: F,
-              y: N,
-              angle: f,
-              spread: h,
-              startVelocity: g,
-              color: y[E % y.length],
-              shape:
-                C[
-                  ((c = 0),
-                  (s = C.length),
-                  Math.floor(Math.random() * (s - c)) + c)
-                ],
-              ticks: w,
-              decay: m,
-              gravity: b,
-              drift: v,
-              scalar: k
-            }),
-            (r = void 0),
-            (l = void 0),
-            (r = o.angle * (Math.PI / 180)),
-            (l = o.spread * (Math.PI / 180)),
-            {
-              x: o.x,
-              y: o.y,
-              wobble: 10 * Math.random(),
-              velocity: 0.5 * o.startVelocity + Math.random() * o.startVelocity,
-              angle2D: -r + (0.5 * l - Math.random() * l),
-              tiltAngle: Math.random() * Math.PI,
-              color: o.color,
-              shape: o.shape,
-              tick: 0,
-              totalTicks: o.ticks,
-              decay: o.decay,
-              drift: o.drift,
-              random: Math.random() + 5,
-              tiltSin: 0,
-              tiltCos: 0,
-              wobbleX: 0,
-              wobbleY: 0,
-              gravity: 3 * o.gravity,
-              ovalScalar: 0.6,
-              scalar: o.scalar
-            })
-          )
-        return a ? a.addFettis(S) : (a = T(t, S, u, n, i)).promise
-      }
-      function g(n) {
-        var o = c || p(n, 'disableForReducedMotion', Boolean),
-          g = p(n, 'zIndex', Number)
-        if (o && f)
-          return l(function (t) {
-            t()
-          })
-        i && a
-          ? (t = a.canvas)
-          : i &&
-            !t &&
-            ((t = (function (t) {
-              var e = document.createElement('canvas')
-              return (
-                (e.style.position = 'fixed'),
-                (e.style.top = '0px'),
-                (e.style.left = '0px'),
-                (e.style.pointerEvents = 'none'),
-                (e.style.zIndex = t),
-                e
-              )
-            })(g)),
-            document.body.appendChild(t)),
-          r && !d && u(t)
-        var m = {width: t.width, height: t.height}
-        function b() {
-          if (s) {
-            var e = {
-              getBoundingClientRect: function () {
-                if (!i) return t.getBoundingClientRect()
-              }
-            }
-            return (
-              u(e),
-              void s.postMessage({resize: {width: e.width, height: e.height}})
-            )
-          }
-          m.width = m.height = null
-        }
-        function v() {
-          ;(a = null),
-            r && e.removeEventListener('resize', b),
-            i && t && (document.body.removeChild(t), (t = null), (d = !1))
-        }
-        return (
-          s && !d && s.init(t),
-          (d = !0),
-          s && (t.__confetti_initialized = !0),
-          r && e.addEventListener('resize', b, !1),
-          s ? s.fire(n, m, v) : h(n, m, v)
-        )
-      }
-      return (
-        (g.reset = function () {
-          s && s.reset(), a && a.reset()
-        }),
-        g
-      )
-    }
-    ;(n.exports = E(null, {useWorker: !0, resize: !0})), (n.exports.create = E)
-  })(
-    (function () {
-      return void 0 !== t ? t : 'undefined' != typeof self ? self : this || {}
-    })(),
-    e,
-    !1
-  ),
-    (t.confetti = e.exports)
-})(window, {})

lnbits/static/js/service-worker.js

@@ -1,6 +1,7 @@
 // update cache version every time there is a new deployment
 // so the service worker reinitializes the cache
-const CURRENT_CACHE = 'lnbits-{{ cache_version }}-'
+const CACHE_VERSION = 107
+const CURRENT_CACHE = `lnbits-${CACHE_VERSION}-`
 
 const getApiKey = request => {
   let api_key = request.headers.get('X-Api-Key')
@@ -16,7 +17,8 @@ self.addEventListener('activate', evt =>
     caches.keys().then(cacheNames => {
       return Promise.all(
         cacheNames.map(cacheName => {
-          if (!cacheName.startsWith(CURRENT_CACHE)) {
+          const currentCacheVersion = cacheName.split('-').slice(-2, 2)
+          if (currentCacheVersion !== CACHE_VERSION) {
             return caches.delete(cacheName)
           }
         })

lnbits/static/js/wallet.js

@@ -90,7 +90,6 @@ new Vue({
   mixins: [windowMixin],
   data: function () {
     return {
-      origin: window.location.origin,
       user: LNbits.map.user(window.user),
       receive: {
         show: false,
@@ -360,6 +359,7 @@ new Vue({
     },
     onPaymentReceived: function (paymentHash) {
       this.fetchPayments()
+      this.fetchBalance()
 
       if (this.receive.paymentHash === paymentHash) {
         this.receive.show = false
@@ -588,6 +588,7 @@ new Vue({
                   clearInterval(this.parse.paymentChecker)
                   dismissPaymentMsg()
                   this.fetchPayments()
+                  this.fetchBalance()
                 }
               })
           }, 2000)
@@ -628,6 +629,8 @@ new Vue({
                   dismissPaymentMsg()
                   clearInterval(this.parse.paymentChecker)
                   this.fetchPayments()
+                  this.fetchBalance()
+
                   // show lnurlpay success action
                   if (response.data.success_action) {
                     switch (response.data.success_action.tag) {
@@ -818,10 +821,8 @@ new Vue({
     }
   },
   watch: {
-    payments: function (_, oldVal) {
-      if (oldVal && oldVal.length !== 0) {
-        this.fetchBalance()
-      }
+    payments: function () {
+      this.fetchBalance()
     },
     'paymentsChart.group': function () {
       this.showChart()
@@ -838,12 +839,20 @@ new Vue({
     if (this.$q.screen.lt.md) {
       this.mobileSimple = true
     }
+    this.fetchBalance()
     this.fetchPayments()
-    this.balance = Math.floor(window.wallet.balance_msat / 1000)
 
     this.update.name = this.g.wallet.name
     this.update.currency = this.g.wallet.currency
-    this.receive.units = ['sat', ...window.currencies]
+
+    LNbits.api
+      .request('GET', '/api/v1/currencies')
+      .then(response => {
+        this.receive.units = ['sat', ...response.data]
+      })
+      .catch(err => {
+        LNbits.utils.notifyApiError(err)
+      })
   },
   mounted: function () {
     // show disclaimer
@@ -851,11 +860,11 @@ new Vue({
       this.disclaimerDialog.show = true
       this.$q.localStorage.set('lnbits.disclaimerShown', true)
     }
+
     // listen to incoming payments
     LNbits.events.onInvoicePaid(this.g.wallet, payment =>
       this.onPaymentReceived(payment.payment_hash)
     )
-    eventReactionWebocket(wallet.id)
   }
 })
 

lnbits/static/scss/base.scss

@@ -227,7 +227,3 @@ video {
   padding: 0.2rem;
   border-radius: 0.2rem;
 }
-
-.whitespace-pre-line {
-  white-space: pre-line;
-}

lnbits/static/vendor.json

@@ -37,7 +37,6 @@
     "js/components.js",
     "js/components/lnbits-funding-sources.js",
     "js/components/extension-settings.js",
-    "js/event-reactions.js",
     "js/bolt11-decoder.js"
   ],
   "css": ["vendor/quasar.css", "vendor/Chart.css", "css/base.css"]

lnbits/tasks.py

@@ -4,8 +4,9 @@ import time
 import traceback
 import uuid
 from http import HTTPStatus
-from typing import Coroutine, Dict, List, Optional
+from typing import Dict, List, Optional
 
+from fastapi.exceptions import HTTPException
 from loguru import logger
 from py_vapid import Vapid
 from pywebpush import WebPushException, webpush
@@ -13,14 +14,15 @@ from pywebpush import WebPushException, webpush
 from lnbits.core.crud import (
     delete_expired_invoices,
     delete_webpush_subscriptions,
+    get_balance_checks,
     get_payments,
     get_standalone_payment,
 )
+from lnbits.core.services import redeem_lnurl_withdraw
 from lnbits.settings import settings
 from lnbits.wallets import get_wallet_class
 
 tasks: List[asyncio.Task] = []
-unique_tasks: Dict[str, asyncio.Task] = {}
 
 
 def create_task(coro):
@@ -33,33 +35,12 @@ def create_permanent_task(func):
     return create_task(catch_everything_and_restart(func))
 
 
-def create_unique_task(name: str, coro: Coroutine):
-    if unique_tasks.get(name):
-        logger.warning(f"task `{name}` already exists, cancelling it")
-        try:
-            unique_tasks[name].cancel()
-        except Exception as exc:
-            logger.warning(f"error while cancelling task `{name}`: {str(exc)}")
-    task = asyncio.create_task(coro)
-    unique_tasks[name] = task
-    return task
-
-
-def create_permanent_unique_task(name: str, coro: Coroutine):
-    return create_unique_task(name, catch_everything_and_restart(coro))
-
-
 def cancel_all_tasks():
     for task in tasks:
         try:
             task.cancel()
         except Exception as exc:
             logger.warning(f"error while cancelling task: {str(exc)}")
-    for name, task in unique_tasks.items():
-        try:
-            task.cancel()
-        except Exception as exc:
-            logger.warning(f"error while cancelling task `{name}`: {str(exc)}")
 
 
 async def catch_everything_and_restart(func):
@@ -75,25 +56,57 @@ async def catch_everything_and_restart(func):
         await catch_everything_and_restart(func)
 
 
-invoice_listeners: Dict[str, asyncio.Queue] = {}
+async def send_push_promise(a, b) -> None:
+    pass
+
+
+class SseListenersDict(dict):
+    """
+    A dict of sse listeners.
+    """
+
+    def __init__(self, name: Optional[str] = None):
+        self.name = name or f"sse_listener_{str(uuid.uuid4())[:8]}"
+
+    def __setitem__(self, key, value):
+        assert isinstance(key, str), f"{key} is not a string"
+        assert isinstance(value, asyncio.Queue), f"{value} is not an asyncio.Queue"
+        logger.trace(f"sse: adding listener {key} to {self.name}. len = {len(self)+1}")
+        return super().__setitem__(key, value)
+
+    def __delitem__(self, key):
+        logger.trace(f"sse: removing listener from {self.name}. len = {len(self)-1}")
+        return super().__delitem__(key)
+
+    _RaiseKeyError = object()  # singleton for no-default behavior
+
+    def pop(self, key, v=_RaiseKeyError) -> None:
+        logger.trace(f"sse: removing listener from {self.name}. len = {len(self)-1}")
+        return super().pop(key)
+
+
+invoice_listeners: Dict[str, asyncio.Queue] = SseListenersDict("invoice_listeners")
 
 
-# TODO: name should not be optional
-# some extensions still dont use a name, but they should
 def register_invoice_listener(send_chan: asyncio.Queue, name: Optional[str] = None):
     """
     A method intended for extensions (and core/tasks.py) to call when they want to be
     notified about new invoice payments incoming. Will emit all incoming payments.
     """
-    if not name:
-        # fallback to a random name if extension didn't provide one
-        name = f"no_name_{str(uuid.uuid4())[:8]}"
+    name_unique = f"{name or 'no_name'}_{str(uuid.uuid4())[:8]}"
+    logger.trace(f"sse: registering invoice listener {name_unique}")
+    invoice_listeners[name_unique] = send_chan
 
-    if invoice_listeners.get(name):
-        logger.warning(f"invoice listener `{name}` already exists, replacing it")
 
-    logger.trace(f"registering invoice listener `{name}`")
-    invoice_listeners[name] = send_chan
+async def webhook_handler():
+    """
+    Returns the webhook_handler for the selected wallet if present. Used by API.
+    """
+    WALLET = get_wallet_class()
+    handler = getattr(WALLET, "webhook_listener", None)
+    if handler:
+        return await handler()
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
 internal_invoice_queue: asyncio.Queue = asyncio.Queue(0)
@@ -109,7 +122,7 @@ async def internal_invoice_listener():
     while True:
         checking_id = await internal_invoice_queue.get()
         logger.info("> got internal payment notification", checking_id)
-        create_task(invoice_callback_dispatcher(checking_id))
+        asyncio.create_task(invoice_callback_dispatcher(checking_id))
 
 
 async def invoice_listener():
@@ -122,7 +135,7 @@ async def invoice_listener():
     WALLET = get_wallet_class()
     async for checking_id in WALLET.paid_invoices_stream():
         logger.info("> got a payment notification", checking_id)
-        create_task(invoice_callback_dispatcher(checking_id))
+        asyncio.create_task(invoice_callback_dispatcher(checking_id))
 
 
 async def check_pending_payments():
@@ -173,6 +186,14 @@ async def check_pending_payments():
         await asyncio.sleep(60 * 30)  # every 30 minutes
 
 
+async def perform_balance_checks():
+    while True:
+        for bc in await get_balance_checks():
+            await redeem_lnurl_withdraw(bc.wallet, bc.url)
+
+        await asyncio.sleep(60 * 60 * 6)  # every 6 hours
+
+
 async def invoice_callback_dispatcher(checking_id: str):
     """
     Takes incoming payments, sets pending=False, and dispatches them to
@@ -180,12 +201,10 @@ async def invoice_callback_dispatcher(checking_id: str):
     """
     payment = await get_standalone_payment(checking_id, incoming=True)
     if payment and payment.is_in:
-        logger.trace(
-            f"invoice listeners: sending invoice callback for payment {checking_id}"
-        )
+        logger.trace(f"sse sending invoice callback for payment {checking_id}")
         await payment.set_pending(False)
-        for name, send_chan in invoice_listeners.items():
-            logger.trace(f"invoice listeners: sending to `{name}`")
+        for chan_name, send_chan in invoice_listeners.items():
+            logger.trace(f"sse sending to chan: {chan_name}")
             await send_chan.put(payment)
 
 

lnbits/templates/error.html

@@ -13,28 +13,18 @@
           ></q-icon>
 
           <h5 class="q-my-none">{{ err }}</h5>
-
+          <h4>
+            If you believe this shouldn't be an error please bring it up on
+            https://t.me/lnbits
+          </h4>
           <br />
-          <div class="row">
-            <div class="col">
-              <q-btn
-                @click="goBack"
-                color="grey"
-                outline
-                label="Back"
-                style="width: 100%"
-              ></q-btn>
-            </div>
-            <div class="col">
-              <q-btn
-                @click="goHome"
-                color="grey"
-                outline
-                label="Home"
-                style="width: 100%"
-              ></q-btn>
-            </div>
-          </div>
+          <q-btn
+            @click="goBack"
+            color="grey"
+            outline
+            label="Back"
+            class="full-width"
+          ></q-btn>
         </center>
       </q-card-section>
     </q-card>
@@ -52,9 +42,6 @@
       methods: {
         goBack: function () {
           window.history.back()
-        },
-        goHome: function () {
-          window.location.href = '/'
         }
       }
     })

lnbits/templates/macros.jinja

@@ -1,9 +1,6 @@
 {% macro window_vars(user, wallet) -%}
   <script>
     window.extensions = {{ EXTENSIONS | tojson | safe }};
-    {% if currencies %}
-      window.currencies = {{ currencies | tojson | safe }};
-    {% endif %}
     {% if user %}
       window.user = {{ user | tojson | safe }};
     {% endif %}

lnbits/utils/exchange_rates.py

@@ -176,16 +176,6 @@ currencies = {
 }
 
 
-def allowed_currencies():
-    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 Provider(NamedTuple):
     name: str
     domain: str

lnbits/wallets/__init__.py

@@ -25,7 +25,6 @@ from .lntips import LnTipsWallet
 from .opennode import OpenNodeWallet
 from .spark import SparkWallet
 from .void import VoidWallet
-from .zbd import ZBDWallet
 
 
 def set_wallet_class(class_name: Optional[str] = None):

lnbits/wallets/alby.py

@@ -9,7 +9,6 @@ from lnbits.settings import settings
 
 from .base import (
     InvoiceResponse,
-    PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
     StatusResponse,
@@ -112,7 +111,7 @@ class AlbyWallet(Wallet):
         r = await self.client.get(f"/invoices/{checking_id}")
 
         if r.is_error:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
         data = r.json()
 
@@ -127,3 +126,7 @@ class AlbyWallet(Wallet):
         while True:
             value = await self.queue.get()
             yield value
+
+    async def webhook_listener(self):
+        logger.error("Alby webhook listener disabled")
+        return

lnbits/wallets/base.py

@@ -52,18 +52,6 @@ class PaymentStatus(NamedTuple):
             return "unknown (should never happen)"
 
 
-class PaymentSuccessStatus(PaymentStatus):
-    paid = True
-
-
-class PaymentFailedStatus(PaymentStatus):
-    paid = False
-
-
-class PaymentPendingStatus(PaymentStatus):
-    paid = None
-
-
 class Wallet(ABC):
     async def cleanup(self):
         pass

lnbits/wallets/cliche.py

@@ -10,7 +10,6 @@ from lnbits.settings import settings
 
 from .base import (
     InvoiceResponse,
-    PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
     StatusResponse,
@@ -140,7 +139,7 @@ class ClicheWallet(Wallet):
 
         if data.get("error") is not None and data["error"].get("message"):
             logger.error(data["error"]["message"])
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
         statuses = {"pending": None, "complete": True, "failed": False}
         return PaymentStatus(statuses[data["result"]["status"]])
@@ -153,7 +152,7 @@ class ClicheWallet(Wallet):
 
         if data.get("error") is not None and data["error"].get("message"):
             logger.error(data["error"]["message"])
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
         payment = data["result"]
         statuses = {"pending": None, "complete": True, "failed": False}
         return PaymentStatus(

lnbits/wallets/corelightning.py

@@ -12,11 +12,8 @@ from lnbits.settings import settings
 
 from .base import (
     InvoiceResponse,
-    PaymentFailedStatus,
-    PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
-    PaymentSuccessStatus,
     StatusResponse,
     Unsupported,
     Wallet,
@@ -142,6 +139,8 @@ class CoreLightningWallet(Wallet):
                     f" '{exc.error.get('message') or exc.error}'."  # type: ignore
                 )
             return PaymentResponse(False, None, None, None, error_message)
+        except Exception as exc:
+            return PaymentResponse(False, None, None, None, str(exc))
 
         fee_msat = -int(r["amount_sent_msat"] - r["amount_msat"])
         return PaymentResponse(
@@ -152,33 +151,33 @@ class CoreLightningWallet(Wallet):
         try:
             r: dict = self.ln.listinvoices(payment_hash=checking_id)  # type: ignore
         except RpcError:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
         if not r["invoices"]:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
         invoice_resp = r["invoices"][-1]
 
         if invoice_resp["payment_hash"] == checking_id:
             if invoice_resp["status"] == "paid":
-                return PaymentSuccessStatus()
+                return PaymentStatus(True)
             elif invoice_resp["status"] == "unpaid":
-                return PaymentPendingStatus()
+                return PaymentStatus(None)
             elif invoice_resp["status"] == "expired":
-                return PaymentFailedStatus()
+                return PaymentStatus(False)
         else:
             logger.warning(f"supplied an invalid checking_id: {checking_id}")
-        return PaymentPendingStatus()
+        return PaymentStatus(None)
 
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         try:
             r: dict = self.ln.listpays(payment_hash=checking_id)  # type: ignore
         except Exception:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
         if "pays" not in r:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
         if not r["pays"]:
             # no payment with this payment_hash is found
-            return PaymentFailedStatus()
+            return PaymentStatus(False)
 
         payment_resp = r["pays"][-1]
 
@@ -189,16 +188,14 @@ class CoreLightningWallet(Wallet):
                     payment_resp["amount_sent_msat"] - payment_resp["amount_msat"]
                 )
 
-                return PaymentSuccessStatus(
-                    fee_msat=fee_msat, preimage=payment_resp["preimage"]
-                )
+                return PaymentStatus(True, fee_msat, payment_resp["preimage"])
             elif status == "failed":
-                return PaymentFailedStatus()
+                return PaymentStatus(False)
             else:
-                return PaymentPendingStatus()
+                return PaymentStatus(None)
         else:
             logger.warning(f"supplied an invalid checking_id: {checking_id}")
-        return PaymentPendingStatus()
+        return PaymentStatus(None)
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
         while True:

lnbits/wallets/corelightningrest.py

@@ -12,7 +12,6 @@ from lnbits.settings import settings
 
 from .base import (
     InvoiceResponse,
-    PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
     StatusResponse,
@@ -163,6 +162,9 @@ class CoreLightningRestWallet(Wallet):
 
         data = r.json()
 
+        if data["status"] != "complete":
+            return PaymentResponse(False, None, None, None, "payment failed")
+
         checking_id = data["payment_hash"]
         preimage = data["payment_preimage"]
         fee_msat = data["msatoshi_sent"] - data["msatoshi"]
@@ -185,7 +187,7 @@ class CoreLightningRestWallet(Wallet):
             return PaymentStatus(self.statuses.get(data["invoices"][0]["status"]))
         except Exception as e:
             logger.error(f"Error getting invoice status: {e}")
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         r = await self.client.get(
@@ -212,7 +214,7 @@ class CoreLightningRestWallet(Wallet):
             return PaymentStatus(self.statuses.get(pay["status"]), fee_msat, preimage)
         except Exception as e:
             logger.error(f"Error getting payment status: {e}")
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
         while True:

lnbits/wallets/eclair.py

@@ -13,7 +13,6 @@ from lnbits.settings import settings
 
 from .base import (
     InvoiceResponse,
-    PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
     StatusResponse,
@@ -181,7 +180,7 @@ class EclairWallet(Wallet):
             }
             return PaymentStatus(statuses.get(data["status"]["type"]))
         except Exception:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         try:
@@ -212,7 +211,7 @@ class EclairWallet(Wallet):
                 statuses.get(data["status"]["type"]), fee_msat, preimage
             )
         except Exception:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
         while True:

lnbits/wallets/fake.py

@@ -19,11 +19,8 @@ from lnbits.settings import settings
 
 from .base import (
     InvoiceResponse,
-    PaymentFailedStatus,
-    PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
-    PaymentSuccessStatus,
     StatusResponse,
     Wallet,
 )
@@ -120,14 +117,11 @@ class FakeWallet(Wallet):
             )
 
     async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
-        if checking_id in self.paid_invoices:
-            return PaymentSuccessStatus()
-        if checking_id in list(self.payment_secrets.keys()):
-            return PaymentPendingStatus()
-        return PaymentFailedStatus()
+        paid = checking_id in self.paid_invoices
+        return PaymentStatus(paid)
 
     async def get_payment_status(self, _: str) -> PaymentStatus:
-        return PaymentPendingStatus()
+        return PaymentStatus(None)
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
         while True:

lnbits/wallets/lnbits.py

@@ -9,11 +9,8 @@ from lnbits.settings import settings
 
 from .base import (
     InvoiceResponse,
-    PaymentFailedStatus,
-    PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
-    PaymentSuccessStatus,
     StatusResponse,
     Wallet,
 )
@@ -122,35 +119,22 @@ class LNbitsWallet(Wallet):
             r = await self.client.get(
                 url=f"/api/v1/payments/{checking_id}",
             )
-            r.raise_for_status()
-
-            data = r.json()
-            details = data.get("details", None)
-
-            if details and details.get("pending", False) is True:
-                return PaymentPendingStatus()
-            if data.get("paid", False) is True:
-                return PaymentSuccessStatus()
-            return PaymentFailedStatus()
+            if r.is_error:
+                return PaymentStatus(None)
+            return PaymentStatus(r.json()["paid"])
         except Exception:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         r = await self.client.get(url=f"/api/v1/payments/{checking_id}")
 
         if r.is_error:
-            return PaymentPendingStatus()
+            return PaymentStatus(False)
         data = r.json()
+        if "paid" not in data and "details" not in data:
+            return PaymentStatus(None)
 
-        if "paid" not in data or not data["paid"]:
-            return PaymentPendingStatus()
-
-        if "details" not in data:
-            return PaymentPendingStatus()
-
-        return PaymentSuccessStatus(
-            fee_msat=data["details"]["fee"], preimage=data["preimage"]
-        )
+        return PaymentStatus(data["paid"], data["details"]["fee"], data["preimage"])
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
         url = f"{self.endpoint}/api/v1/payments/sse"

lnbits/wallets/lndgrpc.py

@@ -16,10 +16,8 @@ from lnbits.utils.crypto import AESCipher
 
 from .base import (
     InvoiceResponse,
-    PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
-    PaymentSuccessStatus,
     StatusResponse,
     Wallet,
 )
@@ -205,15 +203,15 @@ class LndWallet(Wallet):
         except ValueError:
             # this may happen if we switch between backend wallets
             # that use different checking_id formats
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
         try:
             resp = await self.rpc.LookupInvoice(ln.PaymentHash(r_hash=r_hash))
         except grpc.RpcError:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
         if resp.settled:
-            return PaymentSuccessStatus()
+            return PaymentStatus(True)
 
-        return PaymentPendingStatus()
+        return PaymentStatus(None)
 
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         """
@@ -226,7 +224,7 @@ class LndWallet(Wallet):
         except ValueError:
             # this may happen if we switch between backend wallets
             # that use different checking_id formats
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
         resp = self.routerpc.TrackPaymentV2(
             router.TrackPaymentRequest(payment_hash=r_hash)
@@ -249,15 +247,16 @@ class LndWallet(Wallet):
         try:
             async for payment in resp:
                 if len(payment.htlcs) and statuses[payment.status]:
-                    return PaymentSuccessStatus(
-                        fee_msat=-payment.htlcs[-1].route.total_fees_msat,
-                        preimage=bytes_to_hex(payment.htlcs[-1].preimage),
+                    return PaymentStatus(
+                        True,
+                        -payment.htlcs[-1].route.total_fees_msat,
+                        bytes_to_hex(payment.htlcs[-1].preimage),
                     )
                 return PaymentStatus(statuses[payment.status])
         except Exception:  # most likely the payment wasn't found
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
-        return PaymentPendingStatus()
+        return PaymentStatus(None)
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
         while True:

lnbits/wallets/lndrest.py

@@ -13,11 +13,8 @@ from lnbits.utils.crypto import AESCipher
 
 from .base import (
     InvoiceResponse,
-    PaymentFailedStatus,
-    PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
-    PaymentSuccessStatus,
     StatusResponse,
     Wallet,
 )
@@ -107,11 +104,7 @@ class LndRestWallet(Wallet):
         unhashed_description: Optional[bytes] = None,
         **kwargs,
     ) -> InvoiceResponse:
-        data: Dict = {
-            "value": amount,
-            "private": settings.lnd_rest_route_hints,
-            "memo": memo or "",
-        }
+        data: Dict = {"value": amount, "private": True, "memo": memo or ""}
         if kwargs.get("expiry"):
             data["expiry"] = kwargs["expiry"]
         if description_hash:
@@ -175,9 +168,9 @@ class LndRestWallet(Wallet):
         if r.is_error or not r.json().get("settled"):
             # this must also work when checking_id is not a hex recognizable by lnd
             # it will return an error and no "settled" attribute on the object
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
-        return PaymentSuccessStatus()
+        return PaymentStatus(True)
 
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         """
@@ -189,7 +182,7 @@ class LndRestWallet(Wallet):
                 "ascii"
             )
         except ValueError:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
         url = f"/v2/router/track/{checking_id}"
 
@@ -217,8 +210,8 @@ class LndRestWallet(Wallet):
                             and line["error"].get("message")
                             == "payment isn't initiated"
                         ):
-                            return PaymentFailedStatus()
-                        return PaymentPendingStatus()
+                            return PaymentStatus(False)
+                        return PaymentStatus(None)
                     payment = line.get("result")
                     if payment is not None and payment.get("status"):
                         return PaymentStatus(
@@ -227,11 +220,11 @@ class LndRestWallet(Wallet):
                             preimage=payment.get("payment_preimage"),
                         )
                     else:
-                        return PaymentPendingStatus()
+                        return PaymentStatus(None)
                 except Exception:
                     continue
 
-        return PaymentPendingStatus()
+        return PaymentStatus(None)
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
         while True:

lnbits/wallets/lnpay.py

@@ -9,7 +9,6 @@ from lnbits.settings import settings
 
 from .base import (
     InvoiceResponse,
-    PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
     StatusResponse,
@@ -135,7 +134,7 @@ class LNPayWallet(Wallet):
         )
 
         if r.is_error:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
         data = r.json()
         preimage = data["payment_preimage"]
@@ -148,3 +147,28 @@ class LNPayWallet(Wallet):
         while True:
             value = await self.queue.get()
             yield value
+
+    async def webhook_listener(self):
+        logger.error("LNPay webhook listener disabled.")
+        return
+        # TODO: request.get_data is undefined, was it something with Flask or quart?
+        # probably issue introduced when refactoring?
+        # text: str = await request.get_data()
+        # try:
+        #     data = json.loads(text)
+        # except json.decoder.JSONDecodeError:
+        #     logger.error(f"error on lnpay webhook endpoint: {text[:200]}")
+        #     data = None
+        # if (
+        #     type(data) is not dict
+        #     or "event" not in data
+        #     or data["event"].get("name") != "wallet_receive"
+        # ):
+        #     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+
+        # lntx_id = data["data"]["wtx"]["lnTx"]["id"]
+        # r = await self.client.get(f"/lntx/{lntx_id}?fields=settled")
+        # data = r.json()
+        # if data["settled"]:
+        #     await self.queue.put(lntx_id)
+        # raise HTTPException(status_code=HTTPStatus.NO_CONTENT)

lnbits/wallets/lntips.py

@@ -11,7 +11,6 @@ from lnbits.settings import settings
 
 from .base import (
     InvoiceResponse,
-    PaymentPendingStatus,
     PaymentResponse,
     PaymentStatus,
     StatusResponse,
@@ -133,7 +132,7 @@ class LnTipsWallet(Wallet):
             data = r.json()
             return PaymentStatus(data["paid"])
         except Exception:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
     async def get_payment_status(self, checking_id: str) -> PaymentStatus:
         try:
@@ -148,7 +147,7 @@ class LnTipsWallet(Wallet):
             paid_to_status = {False: None, True: True}
             return PaymentStatus(paid_to_status[data.get("paid")])
         except Exception:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
         last_connected = None