introduce baseurl and remove force_https (#1549)

* introduce baseurl and remove force_https

* calle's suggestions

.dockerignore

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

.env.example

@@ -32,6 +32,13 @@ LNBITS_HIDE_API=false
 
 # Disable extensions for all users, use "all" to disable all extensions
 LNBITS_DISABLED_EXTENSIONS="amilk"
+# LNBITS_EXTENSIONS_MANIFESTS="https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions.json,https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions-trial.json"
+# GitHub has rate-limits for its APIs. The limit can be increased specifying a GITHUB_TOKEN
+# LNBITS_EXT_GITHUB_TOKEN=github_pat_xxxxxxxxxxxxxxxxxx
+
+# Extensions to be installed by default. If an extension from this list is uninstalled then it will be re-installed on the next restart.
+# The extension must be removed from this list in order to not be re-installed.
+LNBITS_EXTENSIONS_DEFAULT_INSTALL="tpos"
 
 # Database: to use SQLite, specify LNBITS_DATA_FOLDER
 #           to use PostgreSQL, specify LNBITS_DATABASE_URL=postgres://...
@@ -41,7 +48,6 @@ LNBITS_DISABLED_EXTENSIONS="amilk"
 LNBITS_DATA_FOLDER="./data"
 # LNBITS_DATABASE_URL="postgres://user:password@host:port/databasename"
 
-LNBITS_FORCE_HTTPS=true
 LNBITS_SERVICE_FEE="0.0"
 # value in millisats
 LNBITS_RESERVE_FEE_MIN=2000
@@ -52,8 +58,8 @@ LNBITS_RESERVE_FEE_PERCENT=1.0
 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
-LNBITS_THEME_OPTIONS="classic, bitcoin, flamingo, freedom, mint, autumn, monochrome, salvador"
+# 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"
 
 # Choose from LNPayWallet, OpenNodeWallet, LntxbotWallet, ClicheWallet,
@@ -63,6 +69,9 @@ LNBITS_BACKEND_WALLET_CLASS=VoidWallet
 # VoidWallet is just a fallback that works without any actual Lightning capabilities,
 # just so you can see the UI before dealing with this file.
 
+# Invoice expiry for LND, CLN, Eclair, LNbits funding sources
+LIGHTNING_INVOICE_EXPIRY=600
+
 # Set one of these blocks depending on the wallet kind you chose above:
 
 # ClicheWallet

.github/workflows/codeql.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 2
       - run: git checkout HEAD^2

.github/workflows/flake8.yml

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

.github/workflows/formatting.yml

@@ -14,25 +14,24 @@ jobs:
         python-version: ["3.9"]
         poetry-version: ["1.3.1"]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
+      - uses: actions/checkout@v3
       - name: Set up Poetry ${{ matrix.poetry-version }}
         uses: abatilo/actions-poetry@v2
         with:
           poetry-version: ${{ matrix.poetry-version }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "poetry"
       - name: Install packages
         run: |
-          poetry config virtualenvs.create false
           poetry install
+          npm install prettier
       - name: Check black
         run: make checkblack
       - name: Check isort
         run: make checkisort
       - uses: actions/setup-node@v3
       - name: Check prettier
-        run: |
-          npm install prettier
-          make checkprettier
+        run: make checkprettier

.github/workflows/migrations.yml

@@ -25,9 +25,9 @@ jobs:
         python-version: ["3.9"]
         poetry-version: ["1.3.1"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up Poetry ${{ matrix.poetry-version }}
@@ -36,7 +36,6 @@ jobs:
           poetry-version: ${{ matrix.poetry-version }}
       - name: Install dependencies
         run: |
-          poetry config virtualenvs.create false
           poetry install
           sudo apt install unzip
       - name: Run migrations

.github/workflows/mypy.yml

@@ -10,18 +10,18 @@ jobs:
         python-version: ["3.9"]
         poetry-version: ["1.3.1"]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
+      - uses: actions/checkout@v3
       - name: Set up Poetry ${{ matrix.poetry-version }}
         uses: abatilo/actions-poetry@v2
         with:
           poetry-version: ${{ matrix.poetry-version }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "poetry"
       - name: Install dependencies
         run: |
-          poetry config virtualenvs.create false
           poetry install
       - name: Run tests
-        run: poetry run mypy
+        run: make mypy

.github/workflows/on-tag.yml

@@ -19,7 +19,7 @@ jobs:
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
       - name: Checkout project
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Import environment variables
         id: import-env
@@ -66,4 +66,4 @@ jobs:
             --cache-to "type=local,dest=/tmp/.buildx-cache" \
             --platform linux/amd64,linux/arm64 \
             --tag ${{ secrets.DOCKER_USERNAME }}/lnbits-legend:latest \
-            --output "type=registry" ./
+            --output "type=registry" ./

.github/workflows/pylint.yml

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

.github/workflows/pyright.yml

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

.github/workflows/regtest.yml

@@ -10,15 +10,16 @@ jobs:
         python-version: ["3.9"]
         poetry-version: ["1.3.1"]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
+      - uses: actions/checkout@v3
       - name: Set up Poetry ${{ matrix.poetry-version }}
         uses: abatilo/actions-poetry@v2
         with:
           poetry-version: ${{ matrix.poetry-version }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "poetry"
       - name: Setup Regtest
         run: |
           docker build -t lnbitsdocker/lnbits-legend .
@@ -29,7 +30,6 @@ jobs:
           sudo chmod -R a+rwx .
       - name: Install dependencies
         run: |
-          poetry config virtualenvs.create false
           poetry install
       - name: Run tests
         env:
@@ -54,15 +54,16 @@ jobs:
         python-version: ["3.9"]
         poetry-version: ["1.3.1"]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
+      - uses: actions/checkout@v3
       - name: Set up Poetry ${{ matrix.poetry-version }}
         uses: abatilo/actions-poetry@v2
         with:
           poetry-version: ${{ matrix.poetry-version }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "poetry"
       - name: Setup Regtest
         run: |
           docker build -t lnbitsdocker/lnbits-legend .
@@ -73,7 +74,6 @@ jobs:
           sudo chmod -R a+rwx .
       - name: Install dependencies
         run: |
-          poetry config virtualenvs.create false
           poetry install
       - name: Run tests
         env:
@@ -99,15 +99,16 @@ jobs:
         python-version: ["3.9"]
         poetry-version: ["1.3.1"]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
+      - uses: actions/checkout@v3
       - name: Set up Poetry ${{ matrix.poetry-version }}
         uses: abatilo/actions-poetry@v2
         with:
           poetry-version: ${{ matrix.poetry-version }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "poetry"
       - name: Setup Regtest
         run: |
           docker build -t lnbitsdocker/lnbits-legend .
@@ -118,7 +119,6 @@ jobs:
           sudo chmod -R a+rwx .
       - name: Install dependencies
         run: |
-          poetry config virtualenvs.create false
           poetry install
       - name: Run tests
         env:
@@ -134,3 +134,90 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           file: ./coverage.xml
+  LNbitsWallet:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.9"]
+        poetry-version: ["1.3.1"]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Poetry ${{ matrix.poetry-version }}
+        uses: abatilo/actions-poetry@v2
+        with:
+          poetry-version: ${{ matrix.poetry-version }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "poetry"
+      - name: Setup Regtest
+        run: |
+          docker build -t lnbitsdocker/lnbits-legend .
+          git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
+          cd docker
+          chmod +x ./tests
+          ./tests
+          sudo chmod -R a+rwx .
+          docker exec lnbits-legend-lnbits-1 /bin/bash -c "poetry run python tools/create_fake_admin.py"
+      - name: Install dependencies
+        run: |
+          poetry install
+      - name: Run tests
+        env:
+          PYTHONUNBUFFERED: 1
+          PORT: 5123
+          LNBITS_DATA_FOLDER: ./data
+          LNBITS_BACKEND_WALLET_CLASS: LNbitsWallet
+          LNBITS_ENDPOINT: http://localhost:5001
+          LNBITS_KEY: "d08a3313322a4514af75d488bcc27eee"
+        run: |
+          sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data
+          make test-real-wallet
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          file: ./coverage.xml
+  EclairWallet:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.9"]
+        poetry-version: ["1.3.1"]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Poetry ${{ matrix.poetry-version }}
+        uses: abatilo/actions-poetry@v2
+        with:
+          poetry-version: ${{ matrix.poetry-version }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "poetry"
+      - name: Setup Regtest
+        run: |
+          docker build -t lnbitsdocker/lnbits-legend .
+          git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
+          cd docker
+          chmod +x ./tests
+          ./tests
+          sudo chmod -R a+rwx .
+      - name: Install dependencies
+        run: |
+          poetry install
+      - name: Run tests
+        env:
+          PYTHONUNBUFFERED: 1
+          PORT: 5123
+          LNBITS_DATA_FOLDER: ./data
+          LNBITS_BACKEND_WALLET_CLASS: EclairWallet
+          ECLAIR_URL: http://127.0.0.1:8082
+          ECLAIR_PASS: lnbits
+        run: |
+          sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data
+          make test-real-wallet
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          file: ./coverage.xml

.github/workflows/tests.yml

@@ -10,9 +10,9 @@ jobs:
         python-version: ["3.9"]
         poetry-version: ["1.3.1"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -33,18 +33,18 @@ jobs:
         python-version: ["3.9"]
         poetry-version: ["1.3.1"]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
+      - uses: actions/checkout@v3
       - name: Set up Poetry ${{ matrix.poetry-version }}
         uses: abatilo/actions-poetry@v2
         with:
           poetry-version: ${{ matrix.poetry-version }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "poetry"
       - name: Install dependencies
         run: |
-          poetry config virtualenvs.create false
           poetry install
       - name: Run tests
         run: make test
@@ -70,18 +70,18 @@ jobs:
         python-version: ["3.9"]
         poetry-version: ["1.3.1"]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
+      - uses: actions/checkout@v3
       - name: Set up Poetry ${{ matrix.poetry-version }}
         uses: abatilo/actions-poetry@v2
         with:
           poetry-version: ${{ matrix.poetry-version }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "poetry"
       - name: Install dependencies
         run: |
-          poetry config virtualenvs.create false
           poetry install
       - name: Run tests
         env:

.gitignore

@@ -26,6 +26,7 @@ tests/data/*.sqlite3
 .venv
 venv
 
+data
 *.sqlite3
 .pyre*
 
@@ -38,3 +39,10 @@ docker
 
 # Nix
 *result*
+
+# fly.io
+fly.toml
+
+# Ignore extensions (post installable extension PR)
+extensions/
+upgrades/

.prettierignore

@@ -0,0 +1,10 @@
+**/.git
+**/.svn
+**/.hg
+**/node_modules
+
+*.yml
+
+**/lnbits/static/vendor
+**/lnbits/static/bundle.*
+**/lnbits/static/css/*

Dockerfile

@@ -13,8 +13,8 @@ RUN mkdir -p lnbits/data
 COPY . .
 
 RUN poetry config virtualenvs.create false
-RUN poetry install --only main --no-root
-RUN poetry run python build.py
+RUN poetry install --only main
+RUN poetry run python tools/build.py
 
 ENV LNBITS_PORT="5000"
 ENV LNBITS_HOST="0.0.0.0"

Makefile

@@ -4,25 +4,31 @@ all: format check requirements.txt
 
 format: prettier isort black
 
-check: mypy checkprettier checkisort checkblack
+check: mypy pyright pylint flake8 checkisort checkblack checkprettier
 
-prettier: $(shell find lnbits -name "*.js" -o -name ".html")
-	./node_modules/.bin/prettier --write lnbits/static/js/*.js lnbits/core/static/js/*.js lnbits/extensions/*/templates/*/*.html ./lnbits/core/templates/core/*.html lnbits/templates/*.html lnbits/extensions/*/static/js/*.js lnbits/extensions/*/static/components/*/*.js  lnbits/extensions/*/static/components/*/*.html
+prettier:
+	poetry run ./node_modules/.bin/prettier --write lnbits
 
 pyright:
-	./node_modules/.bin/pyright
+	poetry run ./node_modules/.bin/pyright
 
 black:
 	poetry run black .
 
+flake8:
+	poetry run flake8
+
 mypy:
 	poetry run mypy
 
 isort:
 	poetry run isort .
 
-checkprettier: $(shell find lnbits -name "*.js" -o -name ".html")
-	./node_modules/.bin/prettier --check lnbits/static/js/*.js lnbits/core/static/js/*.js lnbits/extensions/*/templates/*/*.html ./lnbits/core/templates/core/*.html lnbits/templates/*.html lnbits/extensions/*/static/js/*.js lnbits/extensions/*/static/components/*/*.js lnbits/extensions/*/static/components/*/*.html
+pylint:
+	poetry run pylint *.py lnbits/ tools/ tests/
+
+checkprettier:
+	poetry run ./node_modules/.bin/prettier --check lnbits
 
 checkblack:
 	poetry run black --check .
@@ -31,10 +37,6 @@ checkisort:
 	poetry run isort --check-only .
 
 test:
-	BOLTZ_NETWORK="regtest" \
-	BOLTZ_URL="http://127.0.0.1:9001" \
-	BOLTZ_MEMPOOL_SPACE_URL="http://127.0.0.1:8080" \
-	BOLTZ_MEMPOOL_SPACE_URL_WS="ws://127.0.0.1:8080" \
 	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
 	FAKE_WALLET_SECRET="ToTheMoon1" \
 	LNBITS_DATA_FOLDER="./tests/data" \
@@ -43,20 +45,12 @@ test:
 	poetry run pytest
 
 test-real-wallet:
-	BOLTZ_NETWORK="regtest" \
-	BOLTZ_URL="http://127.0.0.1:9001" \
-	BOLTZ_MEMPOOL_SPACE_URL="http://127.0.0.1:8080" \
-	BOLTZ_MEMPOOL_SPACE_URL_WS="ws://127.0.0.1:8080" \
 	LNBITS_DATA_FOLDER="./tests/data" \
 	PYTHONUNBUFFERED=1 \
 	DEBUG=true \
 	poetry run pytest
 
 test-venv:
-	BOLTZ_NETWORK="regtest" \
-	BOLTZ_URL="http://127.0.0.1:9001" \
-	BOLTZ_MEMPOOL_SPACE_URL="http://127.0.0.1:8080" \
-	BOLTZ_MEMPOOL_SPACE_URL_WS="ws://127.0.0.1:8080" \
 	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
 	FAKE_WALLET_SECRET="ToTheMoon1" \
 	LNBITS_DATA_FOLDER="./tests/data" \

docs/guide/extension-install.md

@@ -0,0 +1,139 @@
+# Extension Install
+
+Anyone can create an extension by following the [example extension](https://github.com/lnbits/lnbits/tree/extension_install_02/lnbits/extensions/example).
+
+Extensions can be installed by an admin user after the **LNbits** instance has been started.
+
+## Configure Repositories
+
+Go to `Manage Server` > `Server` > `Extensions Manifests`
+
+![image](https://user-images.githubusercontent.com/2951406/213494038-e8152d8e-61f2-4cb7-8b5f-361fc3f9a31f.png)
+
+
+An `Extension Manifest` is a link to a `JSON` file which contains information about various extensions that can be installed (repository of extensions).
+Multiple repositories can be configured. For more information check the [Manifest File](https://github.com/lnbits/lnbits/blob/extension_install_02/docs/guide/extension-install.md#manifest-file) section.
+
+
+**LNbits** administrators should configure their instances to use repositories that they trust (like the [lnbits-extensions](https://github.com/lnbits/lnbits-extensions/) one). 
+> **Warning**
+> Extensions can have bugs or malicious code, be careful what you install!!
+
+## Install New Extension
+Only administrator users can install or upgrade extensions.
+
+Go to `Manage Extensions` > `Add Remove Extensions`
+![image](https://user-images.githubusercontent.com/2951406/213647560-67da4f8a-3315-436f-b690-3b3de536d2e6.png)
+
+A list of extensions that can be installed is displayed:
+![image](https://user-images.githubusercontent.com/2951406/213647904-d463775e-86b6-4354-a199-d50e08565092.png)
+
+> **Note**
+> If the extension is installed from a GitHub repo, then the GitHub star count will be shown.
+
+Click the `Manage` button in order to install a particular release of the extension.
+![image](https://user-images.githubusercontent.com/2951406/213648543-6c5c8cae-3bf4-447f-8499-344cac61c566.png)
+
+> **Note**
+> An extension can be listed in more than one repository. The admin user must select which repository it wants to install from.
+
+Select the version to be installed (usually the last one) and click `Install`. One can also check the `Release Notes` first.
+
+> **Note**:
+> 
+> For Github repository: the order of the releases is the one in the GitHub releases page
+> 
+> For Explicit Release: the order of the releases is the one in the "extensions" object
+
+
+The extension has been installed but it cannot be accessed yet. In order to activate the extension toggle it in the `Activated` state.
+
+Go to `Manage Extensions` (as admin user or regular user). Search for the extension and enable it.
+
+
+## Uninstall Extension
+On the `Install` page click `Manage` for the extension you want to uninstall:
+![image](https://user-images.githubusercontent.com/2951406/213653194-32cbb1da-dcc8-43cf-8a82-1ec5d2d3dc16.png)
+
+The installed release is highlighted in green.
+
+Click the `Uninstall` button for the release or the one in the bottom.
+
+Users will no longer be able to access the extension.
+
+> **Note**
+> The database for the extension is not removed. If the extension is re-installed later, the data will be accessible.
+
+## Manifest File
+The manifest file is just a `JSON` file that lists a collection of extensions that can be installed. This file is of the form:
+
+```json
+{
+    "extensions": [...]
+    "repos": [...]
+}
+```
+
+There are two ways to specify installable extensions:
+
+### Explicit Release
+It goes under the `extensions` object and it is of the form:
+```json
+        {
+            "id": "lnurlp",
+            "name": "LNURL Pay Links",
+            "version": 1,
+            "shortDescription": "Upgrade to version 111111111",
+            "icon": "receipt",
+            "details": "All charge names should be <code>111111111</code>. API panel must show: <br>",
+            "archive": "https://github.com/lnbits/lnbits-extensions/raw/main/new/lnurlp/1/lnurlp.zip",
+            "hash": "a22d02de6bf306a7a504cd344e032cc6d48837a1d4aeb569a55a57507bf9a43a",
+            "htmlUrl": "https://github.com/lnbits/lnbits-extensions/tree/main/new/lnurlp/1",
+            "infoNotification": "This is a very old version",
+            "dependencies": ["other-ext-id"]
+        }
+```
+
+<details><summary>Fields Detailed Description</summary>
+
+| Field                | Type          |           | Description                                                                                                                                                          |
+|----------------------|---------------|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| id                   | string        | mandatory | The ID of the extension. Must be unique for each extension. It is also used as the path in the URL.                                                                          |
+| name                 | string        | mandatory | User friendly name for the extension. It will be displayed on the installation page.                                                                                 |
+| version              | string        | mandatory | Version of this release. [Semantic versoning](https://semver.org/) is recommended.                                                                                   |
+| shortDescription     | string        | optional  | A few words about the extension. It will be displayed on the installation page.                                                                                      |
+| icon                 | string        | optional  | quasar valid icon name                                                                                                                                               |
+| details              | string (html) | optional  | Details about this particular release                                                                                                                                |
+| archive              | string        | mandatory | URL to the `zip` file that contains the extension source-code                                                                                                        |
+| hash                 | string        | mandatory | The hash (`sha256`) of the `zip` file. The extension will not be installed if the hash is incorrect.                                                                 |
+| htmlUrl              | string        | optional  | Link to the extension home page.                                                                                                                                     |
+| infoNotification     | string        | optional  | Users that have this release installed will see a info message for their extension. For example if the extension support will be terminated soon.                    |
+| criticalNotification | string        | optional  | Reserved for urgent notifications. The admin user will receive a message each time it visits the `Install` page. One example is if the extension has a critical bug. |
+| dependencies         | list          | optional  | A list of extension IDs. It signals that those extensions must be installed BEFORE the this one can be installed.   
+
+</details>
+
+This mode has the advantage of strictly specifying what releases of an extension can be installed.
+    
+### GitHub Repository
+It goes under the `repos` object and it is of the form:
+
+```json
+{
+    "id": "withdraw",
+    "organisation": "lnbits",
+    "repository": "withdraw-extension"
+}
+```
+
+| Field        | Type   | Description                                           |
+|--------------|--------|-------------------------------------------------------|
+| id           | string | The ID of the extension. Must be unique for each extension. It is also used as the path in the URL.                               |
+| organisation | string | The GitHub organisation (eg: `lnbits`)                |
+| repository   | string | The GitHub repository name (eg: `withdraw-extension`) |
+
+The admin user will see all releases from the Github repository:
+
+![image](https://user-images.githubusercontent.com/2951406/213508934-11de5ae5-2045-471c-854b-94b6acbf4434.png)
+
+

docs/guide/installation.md

@@ -26,8 +26,8 @@ sudo apt install python3.9 python3.9-distutils
 
 curl -sSL https://install.python-poetry.org | python3 -
 # Once the above poetry install is completed, use the installation path printed to terminal and replace in the following command
-export PATH="/home/user/.local/bin:$PATH" 
-# Next command, you can exchange with python3.10 or newer versions. 
+export PATH="/home/user/.local/bin:$PATH"
+# Next command, you can exchange with python3.10 or newer versions.
 # Identify your version with python3 --version and specify in the next line
 # command is only needed when your default python is not ^3.9 or ^3.10
 poetry env use python3.9
@@ -36,7 +36,7 @@ poetry install --only main
 mkdir data
 cp .env.example .env
 # set funding source amongst other options
-nano .env 
+nano .env
 ```
 
 #### Running the server
@@ -45,7 +45,7 @@ nano .env
 poetry run lnbits
 # To change port/host pass 'poetry run lnbits --port 9000 --host 0.0.0.0'
 # adding --debug in the start-up command above to help your troubleshooting and generate a more verbose output
-# Note that you have to add the line DEBUG=true in your .env file, too. 
+# Note that you have to add the line DEBUG=true in your .env file, too.
 ```
 #### Updating the server
 
@@ -58,7 +58,7 @@ poetry install --only main
 # Start LNbits with `poetry run lnbits`
 ```
 
-## Option 2: Nix 
+## Option 2: Nix
 
 > note: currently not supported while we make some architectural changes on the path to leave beta
 
@@ -92,7 +92,7 @@ python3.9 -m venv venv
 # create the data folder and the .env file
 mkdir data && cp .env.example .env
 # build the static files
-./venv/bin/python build.py
+./venv/bin/python tools/build.py
 ```
 
 #### Running the server
@@ -105,22 +105,30 @@ If you want to host LNbits on the internet, run with the option `--host 0.0.0.0`
 
 ## Option 4: Docker
 
+use latest version from docker hub
+```sh
+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 lnbitsdocker/lnbits-legend
+```
+build the image yourself
 ```sh
 git clone https://github.com/lnbits/lnbits.git
 cd lnbits
-docker build -t lnbits .
+docker build -t lnbitsdocker/lnbits-legend .
 cp .env.example .env
 mkdir data
-docker run --detach --publish 5000:5000 --name lnbits-legend --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits-legend
+docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbitsdocker/lnbits-legend
 ```
 
 ## Option 5: Fly.io
 
 Fly.io is a docker container hosting platform that has a generous free tier. You can host LNbits for free on Fly.io for personal use.
 
-First, sign up for an account at [Fly.io](https://fly.io) (no credit card required). 
+First, sign up for an account at [Fly.io](https://fly.io) (no credit card required).
 
-Then, install the Fly.io CLI onto your device [here](https://fly.io/docs/getting-started/installing-flyctl/). 
+Then, install the Fly.io CLI onto your device [here](https://fly.io/docs/getting-started/installing-flyctl/).
 
 After install is complete, the command will output a command you should copy/paste/run to get `fly` into your `$PATH`. Something like:
 
@@ -145,7 +153,7 @@ fly launch
 
 You'll be prompted to enter an app name, region, postgres (choose no), deploy now (choose no).
 
-You'll now find a file in the directory called `fly.toml`. Open that file and modify/add the following settings. 
+You'll now find a file in the directory called `fly.toml`. Open that file and modify/add the following settings.
 
 Note: Be sure to replace `${PUT_YOUR_LNBITS_ENV_VARS_HERE}` with all relevant environment variables in `.env` or `.env.example`. Environment variable strings should be quoted here, so if in `.env` you have `LNBITS_ENDPOINT=https://legend.lnbits.com` in `fly.toml` you should have `LNBITS_ENDPOINT="https://legend.lnbits.com"`.
 
@@ -166,10 +174,10 @@ kill_timeout = 30
 [env]
   HOST="127.0.0.1"
   PORT=5000
-  LNBITS_FORCE_HTTPS=true
   FORWARDED_ALLOW_IPS="*"
+  LNBITS_BASEURL="https://mylnbits.lnbits.org/"
   LNBITS_DATA_FOLDER="/data"
-  
+
   ${PUT_YOUR_LNBITS_ENV_VARS_HERE}
 ...
 

lnbits/app.py

@@ -1,10 +1,14 @@
 import asyncio
+import glob
 import importlib
 import logging
+import os
+import shutil
 import signal
 import sys
 import traceback
 from http import HTTPStatus
+from typing import Callable, List
 
 from fastapi import FastAPI, Request
 from fastapi.exceptions import HTTPException, RequestValidationError
@@ -14,20 +18,28 @@ from fastapi.responses import JSONResponse
 from fastapi.staticfiles import StaticFiles
 from loguru import logger
 
+from lnbits.core.crud import get_installed_extensions
+from lnbits.core.helpers import migrate_extension_database
 from lnbits.core.tasks import register_task_listeners
 from lnbits.settings import get_wallet_class, set_wallet_class, settings
 
-from .commands import migrate_databases
-from .core import core_app
+from .commands import db_versions, load_disabled_extension_list, migrate_databases
+from .core import (
+    add_installed_extension,
+    core_app,
+    core_app_extra,
+    update_installed_extension_state,
+)
 from .core.services import check_admin_settings
 from .core.views.generic import core_html_routes
+from .extension_manager import Extension, InstallableExtension, get_valid_extensions
 from .helpers import (
     get_css_vendored,
     get_js_vendored,
-    get_valid_extensions,
     template_renderer,
     url_for_vendored,
 )
+from .middleware import ExtensionsRedirectMiddleware, InstalledExtensionMiddleware
 from .requestvars import g
 from .tasks import (
     catch_everything_and_restart,
@@ -66,12 +78,19 @@ def create_app() -> FastAPI:
 
     app.add_middleware(GZipMiddleware, minimum_size=1000)
 
+    # order of these two middlewares is important
+    app.add_middleware(InstalledExtensionMiddleware)
+    app.add_middleware(ExtensionsRedirectMiddleware)
+
     register_startup(app)
     register_assets(app)
     register_routes(app)
     register_async_tasks(app)
     register_exception_handlers(app)
 
+    # Allow registering new extensions routes without direct access to the `app` object
+    setattr(core_app_extra, "register_new_ext_routes", register_new_ext_routes(app))
+
     return app
 
 
@@ -80,7 +99,7 @@ async def check_funding_source() -> None:
     original_sigint_handler = signal.getsignal(signal.SIGINT)
 
     def signal_handler(signal, frame):
-        logger.debug(f"SIGINT received, terminating LNbits.")
+        logger.debug("SIGINT received, terminating LNbits.")
         sys.exit(1)
 
     signal.signal(signal.SIGINT, signal_handler)
@@ -105,6 +124,82 @@ async def check_funding_source() -> None:
     )
 
 
+async def check_installed_extensions(app: FastAPI):
+    """
+    Check extensions that have been installed, but for some reason no longer present in the 'lnbits/extensions' directory.
+    One reason might be a docker-container that was re-created.
+    The 'data' directory (where the '.zip' files live) is expected to persist state.
+    Zips that are missing will be re-downloaded.
+    """
+    shutil.rmtree(os.path.join("lnbits", "upgrades"), True)
+    await load_disabled_extension_list()
+    installed_extensions = await build_all_installed_extensions_list()
+
+    for ext in installed_extensions:
+        try:
+            installed = check_installed_extension(ext)
+            if not installed:
+                await restore_installed_extension(app, ext)
+                logger.info(f"✔️ Successfully re-installed extension: {ext.id}")
+        except Exception as e:
+            logger.warning(e)
+            logger.warning(f"Failed to re-install extension: {ext.id}")
+
+
+async def build_all_installed_extensions_list() -> List[InstallableExtension]:
+    """
+    Returns a list of all the installed extensions plus the extensions that
+    MUST be installed by default (see LNBITS_EXTENSIONS_DEFAULT_INSTALL).
+    """
+    installed_extensions = await get_installed_extensions()
+
+    installed_extensions_ids = [e.id for e in installed_extensions]
+    for ext_id in settings.lnbits_extensions_default_install:
+        if ext_id in installed_extensions_ids:
+            continue
+
+        ext_releases = await InstallableExtension.get_extension_releases(ext_id)
+        release = ext_releases[0] if len(ext_releases) else None
+
+        if release:
+            ext_info = InstallableExtension(
+                id=ext_id, name=ext_id, installed_release=release, icon=release.icon
+            )
+            installed_extensions.append(ext_info)
+            await add_installed_extension(ext_info)
+            await update_installed_extension_state(ext_id=ext_id, active=True)
+
+    return installed_extensions
+
+
+def check_installed_extension(ext: InstallableExtension) -> bool:
+    if ext.has_installed_version:
+        return True
+
+    zip_files = glob.glob(
+        os.path.join(settings.lnbits_data_folder, "extensions", "*.zip")
+    )
+
+    if ext.zip_path not in zip_files:
+        ext.download_archive()
+    ext.extract_archive()
+
+    return False
+
+
+async def restore_installed_extension(app: FastAPI, ext: InstallableExtension):
+    extension = Extension.from_installable_ext(ext)
+    register_ext_routes(app, extension)
+
+    current_version = (await db_versions()).get(ext.id, 0)
+    await migrate_extension_database(extension, current_version)
+
+    # mount routes for the new version
+    core_app_extra.register_new_ext_routes(extension)
+    if extension.upgrade_hash:
+        ext.nofiy_upgrade()
+
+
 def register_routes(app: FastAPI) -> None:
     """Register FastAPI routes / LNbits extensions."""
     app.include_router(core_app)
@@ -112,20 +207,7 @@ def register_routes(app: FastAPI) -> None:
 
     for ext in get_valid_extensions():
         try:
-            ext_module = importlib.import_module(f"lnbits.extensions.{ext.code}")
-            ext_route = getattr(ext_module, f"{ext.code}_ext")
-
-            if hasattr(ext_module, f"{ext.code}_start"):
-                ext_start_func = getattr(ext_module, f"{ext.code}_start")
-                ext_start_func()
-
-            if hasattr(ext_module, f"{ext.code}_static_files"):
-                ext_statics = getattr(ext_module, f"{ext.code}_static_files")
-                for s in ext_statics:
-                    app.mount(s["path"], s["app"], s["name"])
-
-            logger.trace(f"adding route for extension {ext_module}")
-            app.include_router(ext_route)
+            register_ext_routes(app, ext)
         except Exception as e:
             logger.error(str(e))
             raise ImportError(
@@ -133,24 +215,67 @@ def register_routes(app: FastAPI) -> None:
             )
 
 
+def register_new_ext_routes(app: FastAPI) -> Callable:
+    # Returns a function that registers new routes for an extension.
+    # The returned function encapsulates (creates a closure around) the `app` object but does expose it.
+    def register_new_ext_routes_fn(ext: Extension):
+        register_ext_routes(app, ext)
+
+    return register_new_ext_routes_fn
+
+
+def register_ext_routes(app: FastAPI, ext: Extension) -> None:
+    """Register FastAPI routes for extension."""
+    ext_module = importlib.import_module(ext.module_name)
+
+    ext_route = getattr(ext_module, f"{ext.code}_ext")
+
+    if hasattr(ext_module, f"{ext.code}_start"):
+        ext_start_func = getattr(ext_module, f"{ext.code}_start")
+        ext_start_func()
+
+    if hasattr(ext_module, f"{ext.code}_static_files"):
+        ext_statics = getattr(ext_module, f"{ext.code}_static_files")
+        for s in ext_statics:
+            app.mount(s["path"], s["app"], s["name"])
+
+    if hasattr(ext_module, f"{ext.code}_redirect_paths"):
+        ext_redirects = getattr(ext_module, f"{ext.code}_redirect_paths")
+        settings.lnbits_extensions_redirects = [
+            r for r in settings.lnbits_extensions_redirects if r["ext_id"] != ext.code
+        ]
+        for r in ext_redirects:
+            r["ext_id"] = ext.code
+            settings.lnbits_extensions_redirects.append(r)
+
+    logger.trace(f"adding route for extension {ext_module}")
+
+    prefix = f"/upgrades/{ext.upgrade_hash}" if ext.upgrade_hash != "" else ""
+    app.include_router(router=ext_route, prefix=prefix)
+
+
 def register_startup(app: FastAPI):
     @app.on_event("startup")
     async def lnbits_startup():
 
         try:
-            # 1. wait till migration is done
+            # wait till migration is done
             await migrate_databases()
 
-            # 2. setup admin settings
+            # setup admin settings
             await check_admin_settings()
 
             log_server_info()
 
-            # 3. initialize WALLET
+            # initialize WALLET
             set_wallet_class()
 
-            # 4. initialize funding source
+            # initialize funding source
             await check_funding_source()
+
+            # check extensions after restart
+            await check_installed_extensions(app)
+
         except Exception as e:
             logger.error(str(e))
             raise ImportError("Failed to run 'startup' event.")
@@ -158,6 +283,7 @@ def register_startup(app: FastAPI):
 
 def log_server_info():
     logger.info("Starting LNbits")
+    logger.info(f"Baseurl: {settings.lnbits_baseurl}")
     logger.info(f"Host: {settings.host}")
     logger.info(f"Port: {settings.port}")
     logger.info(f"Debug: {settings.debug}")
@@ -302,7 +428,7 @@ class Formatter:
             self.fmt: str = self.minimal_fmt
 
     def format(self, record):
-        function = "{function}".format(**record)
+        function = "{function}".format(**record)  # pylint: disable=C0209
         if function == "emit":  # uvicorn logs
             return self.minimal_fmt
         return self.fmt

lnbits/bolt11.py

@@ -5,7 +5,6 @@ from decimal import Decimal
 from typing import List, NamedTuple, Optional
 
 import bitstring
-import embit
 import secp256k1
 from bech32 import CHARSET, bech32_decode, bech32_encode
 from ecdsa import SECP256k1, VerifyingKey
@@ -20,7 +19,7 @@ class Route(NamedTuple):
     cltv: int
 
 
-class Invoice(object):
+class Invoice:
     payment_hash: str
     amount_msat: int = 0
     description: Optional[str] = None
@@ -166,9 +165,7 @@ def lnencode(addr, privkey):
         amount = Decimal(str(addr.amount))
         # We can only send down to millisatoshi.
         if amount * 10**12 % 10:
-            raise ValueError(
-                "Cannot encode {}: too many decimal places".format(addr.amount)
-            )
+            raise ValueError(f"Cannot encode {addr.amount}: too many decimal places")
 
         amount = addr.currency + shorten_amount(amount)
     else:
@@ -190,7 +187,7 @@ def lnencode(addr, privkey):
         # A writer MUST NOT include more than one `d`, `h`, `n` or `x` fields,
         if k in ("d", "h", "n", "x"):
             if k in tags_set:
-                raise ValueError("Duplicate '{}' tag".format(k))
+                raise ValueError(f"Duplicate '{k}' tag")
 
         if k == "r":
             route = bitstring.BitArray()
@@ -220,7 +217,7 @@ def lnencode(addr, privkey):
             data += tagged_bytes("n", v)
         else:
             # FIXME: Support unknown tags?
-            raise ValueError("Unknown tag {}".format(k))
+            raise ValueError(f"Unknown tag {k}")
 
         tags_set.add(k)
 
@@ -230,7 +227,7 @@ def lnencode(addr, privkey):
     # both.
     if "d" in tags_set and "h" in tags_set:
         raise ValueError("Cannot include both 'd' and 'h'")
-    if not "d" in tags_set and not "h" in tags_set:
+    if "d" not in tags_set and "h" not in tags_set:
         raise ValueError("Must include either 'd' or 'h'")
 
     # We actually sign the hrp, then data (padded to 8 bits with zeroes).
@@ -245,7 +242,7 @@ def lnencode(addr, privkey):
     return bech32_encode(hrp, bitarray_to_u5(data))
 
 
-class LnAddr(object):
+class LnAddr:
     def __init__(
         self, paymenthash=None, amount=None, currency="bc", tags=None, date=None
     ):
@@ -259,12 +256,9 @@ class LnAddr(object):
         self.amount = amount
 
     def __str__(self):
-        return "LnAddr[{}, amount={}{} tags=[{}]]".format(
-            bytes.hex(self.pubkey.serialize()).decode(),
-            self.amount,
-            self.currency,
-            ", ".join([k + "=" + str(v) for k, v in self.tags]),
-        )
+        pubkey = bytes.hex(self.pubkey.serialize()).decode()
+        tags = ", ".join([k + "=" + str(v) for k, v in self.tags])
+        return f"LnAddr[{pubkey}, amount={self.amount}{self.currency} tags=[{tags}]]"
 
 
 def shorten_amount(amount):
@@ -296,7 +290,7 @@ def _unshorten_amount(amount: str) -> int:
     # A reader SHOULD fail if `amount` contains a non-digit, or is followed by
     # anything except a `multiplier` in the table above.
     if not re.fullmatch(r"\d+[pnum]?", str(amount)):
-        raise ValueError("Invalid amount '{}'".format(amount))
+        raise ValueError(f"Invalid amount '{amount}'")
 
     if unit in units:
         return int(int(amount[:-1]) * 100_000_000_000 / units[unit])
@@ -347,11 +341,10 @@ def _trim_to_bytes(barr):
 
 
 def _readable_scid(short_channel_id: int) -> str:
-    return "{blockheight}x{transactionindex}x{outputindex}".format(
-        blockheight=((short_channel_id >> 40) & 0xFFFFFF),
-        transactionindex=((short_channel_id >> 16) & 0xFFFFFF),
-        outputindex=(short_channel_id & 0xFFFF),
-    )
+    blockheight = (short_channel_id >> 40) & 0xFFFFFF
+    transactionindex = (short_channel_id >> 16) & 0xFFFFFF
+    outputindex = short_channel_id & 0xFFFF
+    return f"{blockheight}x{transactionindex}x{outputindex}"
 
 
 def _u5_to_bitarray(arr: List[int]) -> bitstring.BitArray:

lnbits/commands.py

@@ -1,7 +1,5 @@
 import asyncio
-import importlib
 import os
-import re
 import warnings
 
 import click
@@ -11,13 +9,11 @@ from lnbits.settings import settings
 
 from .core import db as core_db
 from .core import migrations as core_migrations
+from .core.crud import get_dbversions, get_inactive_extensions
+from .core.helpers import migrate_extension_database, run_migration
 from .db import COCKROACH, POSTGRES, SQLITE
-from .helpers import (
-    get_css_vendored,
-    get_js_vendored,
-    get_valid_extensions,
-    url_for_vendored,
-)
+from .extension_manager import get_valid_extensions
+from .helpers import get_css_vendored, get_js_vendored, url_for_vendored
 
 
 @click.command("migrate")
@@ -59,30 +55,6 @@ def bundle_vendored():
 async def migrate_databases():
     """Creates the necessary databases if they don't exist already; or migrates them."""
 
-    async def set_migration_version(conn, db_name, version):
-        await conn.execute(
-            """
-            INSERT INTO dbversions (db, version) VALUES (?, ?)
-            ON CONFLICT (db) DO UPDATE SET version = ?
-            """,
-            (db_name, version, version),
-        )
-
-    async def run_migration(db, migrations_module, db_name):
-        for key, migrate in migrations_module.__dict__.items():
-            match = match = matcher.match(key)
-            if match:
-                version = int(match.group(1))
-                if version > current_versions.get(db_name, 0):
-                    logger.debug(f"running migration {db_name}.{version}")
-                    await migrate(db)
-
-                    if db.schema == None:
-                        await set_migration_version(db, db_name, version)
-                    else:
-                        async with core_db.connect() as conn:
-                            await set_migration_version(conn, db_name, version)
-
     async with core_db.connect() as conn:
         if conn.type == SQLITE:
             exists = await conn.fetchone(
@@ -90,33 +62,30 @@ async def migrate_databases():
             )
         elif conn.type in {POSTGRES, COCKROACH}:
             exists = await conn.fetchone(
-                "SELECT * FROM information_schema.tables WHERE table_name = 'dbversions'"
+                "SELECT * FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'dbversions'"
             )
 
         if not exists:
             await core_migrations.m000_create_migrations_table(conn)
 
-        rows = await (await conn.execute("SELECT * FROM dbversions")).fetchall()
-        current_versions = {row["db"]: row["version"] for row in rows}
-        matcher = re.compile(r"^m(\d\d\d)_")
-        db_name = core_migrations.__name__.split(".")[-2]
-        await run_migration(conn, core_migrations, db_name)
+        current_versions = await get_dbversions(conn)
+        core_version = current_versions.get("core", 0)
+        await run_migration(conn, core_migrations, core_version)
 
     for ext in get_valid_extensions():
-        try:
-
-            module_str = (
-                ext.migration_module or f"lnbits.extensions.{ext.code}.migrations"
-            )
-            ext_migrations = importlib.import_module(module_str)
-            ext_db = importlib.import_module(f"lnbits.extensions.{ext.code}").db
-            db_name = ext.db_name or module_str.split(".")[-2]
-        except ImportError:
-            raise ImportError(
-                f"Please make sure that the extension `{ext.code}` has a migrations file."
-            )
-
-        async with ext_db.connect() as ext_conn:
-            await run_migration(ext_conn, ext_migrations, db_name)
+        current_version = current_versions.get(ext.code, 0)
+        await migrate_extension_database(ext, current_version)
 
     logger.info("✔️ All migrations done.")
+
+
+async def db_versions():
+    async with core_db.connect() as conn:
+        current_versions = await get_dbversions(conn)
+        return current_versions
+
+
+async def load_disabled_extension_list() -> None:
+    """Update list of extensions that have been explicitly disabled"""
+    inactive_extensions = await get_inactive_extensions()
+    settings.lnbits_deactivated_extensions += inactive_extensions

lnbits/core/__init__.py

@@ -1,12 +1,15 @@
 from fastapi.routing import APIRouter
 
+from lnbits.core.models import CoreAppExtra
 from lnbits.db import Database
 
 db = Database("database")
 
 core_app: APIRouter = APIRouter()
 
-from .views.admin_api import *  # noqa
-from .views.api import *  # noqa
-from .views.generic import *  # noqa
-from .views.public_api import *  # noqa
+core_app_extra: CoreAppExtra = CoreAppExtra()
+
+from .views.admin_api import *  # noqa: F401,F403
+from .views.api import *  # noqa: F401,F403
+from .views.generic import *  # noqa: F401,F403
+from .views.public_api import *  # noqa: F401,F403

lnbits/core/crud.py

@@ -8,6 +8,7 @@ import shortuuid
 
 from lnbits import bolt11
 from lnbits.db import COCKROACH, POSTGRES, Connection
+from lnbits.extension_manager import InstallableExtension
 from lnbits.settings import AdminSettings, EditableSettings, SuperSettings, settings
 
 from . import db
@@ -68,6 +69,97 @@ async def get_user(user_id: str, conn: Optional[Connection] = None) -> Optional[
     )
 
 
+# extensions
+# -------
+
+
+async def add_installed_extension(
+    ext: InstallableExtension,
+    conn: Optional[Connection] = None,
+) -> None:
+    meta = {
+        "installed_release": dict(ext.installed_release)
+        if ext.installed_release
+        else None,
+        "dependencies": ext.dependencies,
+    }
+
+    version = ext.installed_release.version if ext.installed_release else ""
+
+    await (conn or db).execute(
+        """
+        INSERT INTO installed_extensions (id, version, name, short_description, icon, stars, meta) VALUES (?, ?, ?, ?, ?, ?, ?)
+        ON CONFLICT (id) DO
+        UPDATE SET (version, name, active, short_description, icon, stars, meta) = (?, ?, ?, ?, ?, ?, ?)
+        """,
+        (
+            ext.id,
+            version,
+            ext.name,
+            ext.short_description,
+            ext.icon,
+            ext.stars,
+            json.dumps(meta),
+            version,
+            ext.name,
+            False,
+            ext.short_description,
+            ext.icon,
+            ext.stars,
+            json.dumps(meta),
+        ),
+    )
+
+
+async def update_installed_extension_state(
+    *, ext_id: str, active: bool, conn: Optional[Connection] = None
+) -> None:
+    await (conn or db).execute(
+        """
+        UPDATE installed_extensions SET active = ? WHERE id = ?
+        """,
+        (active, ext_id),
+    )
+
+
+async def delete_installed_extension(
+    *, ext_id: str, conn: Optional[Connection] = None
+) -> None:
+    await (conn or db).execute(
+        """
+        DELETE from installed_extensions  WHERE id = ?
+        """,
+        (ext_id,),
+    )
+
+
+async def get_installed_extension(ext_id: str, conn: Optional[Connection] = None):
+    row = await (conn or db).fetchone(
+        "SELECT * FROM installed_extensions WHERE id = ?",
+        (ext_id,),
+    )
+
+    return dict(row) if row else None
+
+
+async def get_installed_extensions(
+    conn: Optional[Connection] = None,
+) -> List["InstallableExtension"]:
+    rows = await (conn or db).fetchall(
+        "SELECT * FROM installed_extensions",
+        (),
+    )
+    return [InstallableExtension.from_row(row) for row in rows]
+
+
+async def get_inactive_extensions(*, conn: Optional[Connection] = None) -> List[str]:
+    inactive_extensions = await (conn or db).fetchall(
+        """SELECT id FROM installed_extensions WHERE NOT active""",
+        (),
+    )
+    return [ext[0] for ext in inactive_extensions]
+
+
 async def update_user_extension(
     *, user_id: str, extension: str, active: bool, conn: Optional[Connection] = None
 ) -> None:
@@ -266,7 +358,7 @@ async def get_payments(
     args: List[Any] = []
     clause: List[str] = []
 
-    if since != None:
+    if since is not None:
         if db.type == POSTGRES:
             clause.append("time > to_timestamp(?)")
         elif db.type == COCKROACH:
@@ -610,7 +702,7 @@ async def delete_admin_settings():
 
 
 async def update_admin_settings(data: EditableSettings):
-    await db.execute(f"UPDATE settings SET editable_settings = ?", (json.dumps(data),))
+    await db.execute("UPDATE settings SET editable_settings = ?", (json.dumps(data),))
 
 
 async def update_super_user(super_user: str):
@@ -619,11 +711,28 @@ async def update_super_user(super_user: str):
 
 
 async def create_admin_settings(super_user: str, new_settings: dict):
-    sql = f"INSERT INTO settings (super_user, editable_settings) VALUES (?, ?)"
+    sql = "INSERT INTO settings (super_user, editable_settings) VALUES (?, ?)"
     await db.execute(sql, (super_user, json.dumps(new_settings)))
     return await get_super_settings()
 
 
+# db versions
+# --------------
+async def get_dbversions(conn: Optional[Connection] = None):
+    rows = await (conn or db).fetchall("SELECT * FROM dbversions")
+    return {row["db"]: row["version"] for row in rows}
+
+
+async def update_migration_version(conn, db_name, version):
+    await (conn or db).execute(
+        """
+        INSERT INTO dbversions (db, version) VALUES (?, ?)
+        ON CONFLICT (db) DO UPDATE SET version = ?
+        """,
+        (db_name, version, version),
+    )
+
+
 # tinyurl
 # -------
 
@@ -631,7 +740,7 @@ async def create_admin_settings(super_user: str, new_settings: dict):
 async def create_tinyurl(domain: str, endless: bool, wallet: str):
     tinyurl_id = shortuuid.uuid()[:8]
     await db.execute(
-        f"INSERT INTO tiny_url (id, url, endless, wallet) VALUES (?, ?, ?, ?)",
+        "INSERT INTO tiny_url (id, url, endless, wallet) VALUES (?, ?, ?, ?)",
         (
             tinyurl_id,
             domain,
@@ -644,7 +753,7 @@ async def create_tinyurl(domain: str, endless: bool, wallet: str):
 
 async def get_tinyurl(tinyurl_id: str) -> Optional[TinyURL]:
     row = await db.fetchone(
-        f"SELECT * FROM tiny_url WHERE id = ?",
+        "SELECT * FROM tiny_url WHERE id = ?",
         (tinyurl_id,),
     )
     return TinyURL.from_row(row) if row else None
@@ -652,14 +761,14 @@ async def get_tinyurl(tinyurl_id: str) -> Optional[TinyURL]:
 
 async def get_tinyurl_by_url(url: str) -> List[TinyURL]:
     rows = await db.fetchall(
-        f"SELECT * FROM tiny_url WHERE url = ?",
+        "SELECT * FROM tiny_url WHERE url = ?",
         (url,),
     )
     return [TinyURL.from_row(row) for row in rows]
 
 
 async def delete_tinyurl(tinyurl_id: str):
-    row = await db.execute(
-        f"DELETE FROM tiny_url WHERE id = ?",
+    await db.execute(
+        "DELETE FROM tiny_url WHERE id = ?",
         (tinyurl_id,),
     )

lnbits/core/helpers.py

@@ -0,0 +1,65 @@
+import importlib
+import re
+from typing import Any
+
+import httpx
+from loguru import logger
+
+from lnbits.db import Connection
+from lnbits.extension_manager import Extension
+from lnbits.settings import settings
+
+from . import db as core_db
+from .crud import update_migration_version
+
+
+async def migrate_extension_database(ext: Extension, current_version):
+    try:
+        ext_migrations = importlib.import_module(f"{ext.module_name}.migrations")
+        ext_db = importlib.import_module(ext.module_name).db
+    except ImportError as e:
+        logger.error(e)
+        raise ImportError(
+            f"Please make sure that the extension `{ext.code}` has a migrations file."
+        )
+
+    async with ext_db.connect() as ext_conn:
+        await run_migration(ext_conn, ext_migrations, current_version)
+
+
+async def run_migration(db: Connection, migrations_module: Any, current_version: int):
+    matcher = re.compile(r"^m(\d\d\d)_")
+    db_name = migrations_module.__name__.split(".")[-2]
+    for key, migrate in migrations_module.__dict__.items():
+        match = matcher.match(key)
+        if match:
+            version = int(match.group(1))
+            if version > current_version:
+                logger.debug(f"running migration {db_name}.{version}")
+                print(f"running migration {db_name}.{version}")
+                await migrate(db)
+
+                if db.schema is None:
+                    await update_migration_version(db, db_name, version)
+                else:
+                    async with core_db.connect() as conn:
+                        await update_migration_version(conn, db_name, version)
+
+
+async def stop_extension_background_work(ext_id: str, user: str):
+    """
+    Stop background work for extension (like asyncio.Tasks, WebSockets, etc).
+    Extensions SHOULD expose a DELETE enpoint at the root level of their API.
+    This function tries first to call the endpoint using `http` and if if fails it tries using `https`.
+    """
+    async with httpx.AsyncClient() as client:
+        try:
+            url = f"http://{settings.host}:{settings.port}/{ext_id}/api/v1?usr={user}"
+            await client.delete(url)
+        except Exception as ex:
+            logger.warning(ex)
+            try:
+                # try https
+                url = f"https://{settings.host}:{settings.port}/{ext_id}/api/v1?usr={user}"
+            except Exception as ex:
+                logger.warning(ex)

lnbits/core/migrations.py

@@ -283,3 +283,20 @@ async def m009_create_tinyurl_table(db):
         );
     """
     )
+
+
+async def m010_create_installed_extensions_table(db):
+    await db.execute(
+        """
+        CREATE TABLE IF NOT EXISTS installed_extensions (
+            id TEXT PRIMARY KEY,
+            version TEXT NOT NULL,
+            name TEXT NOT NULL,
+            short_description TEXT,
+            icon TEXT,
+            stars INT NOT NULL DEFAULT 0,
+            active BOOLEAN DEFAULT false,
+            meta TEXT NOT NULL DEFAULT '{}'
+        );
+    """
+    )

lnbits/core/models.py

@@ -4,10 +4,9 @@ import hmac
 import json
 import time
 from sqlite3 import Row
-from typing import Dict, List, Optional
+from typing import Callable, Dict, List, Optional
 
 from ecdsa import SECP256k1, SigningKey
-from fastapi import Query
 from lnurl import encode as lnurl_encode
 from loguru import logger
 from pydantic import BaseModel
@@ -215,6 +214,10 @@ class BalanceCheck(BaseModel):
         return cls(wallet=row["wallet"], service=row["service"], url=row["url"])
 
 
+class CoreAppExtra:
+    register_new_ext_routes: Callable
+
+
 class TinyURL(BaseModel):
     id: str
     url: str

lnbits/core/services.py

@@ -14,7 +14,6 @@ from lnbits import bolt11
 from lnbits.db import Connection
 from lnbits.decorators import WalletTypeInfo, require_admin_key
 from lnbits.helpers import url_for, urlsafe_short_hash
-from lnbits.requestvars import g
 from lnbits.settings import (
     FAKE_WALLET,
     EditableSettings,
@@ -64,11 +63,16 @@ async def create_invoice(
     memo: str,
     description_hash: Optional[bytes] = None,
     unhashed_description: Optional[bytes] = None,
+    expiry: Optional[int] = None,
     extra: Optional[Dict] = None,
     webhook: Optional[str] = None,
     internal: Optional[bool] = False,
     conn: Optional[Connection] = None,
 ) -> Tuple[str, str]:
+
+    if not amount > 0:
+        raise InvoiceFailure("Amountless invoices not supported.")
+
     invoice_memo = None if description_hash else memo
 
     # use the fake wallet if the invoice is for internal use only
@@ -79,6 +83,7 @@ async def create_invoice(
         memo=invoice_memo,
         description_hash=description_hash,
         unhashed_description=unhashed_description,
+        expiry=expiry or settings.lightning_invoice_expiry,
     )
     if not ok:
         raise InvoiceFailure(error_message or "unexpected backend error.")
@@ -211,22 +216,22 @@ async def pay_invoice(
             )
 
         logger.debug(f"backend: pay_invoice finished {temp_id}")
-        if payment.checking_id and payment.ok != False:
+        if payment.checking_id and payment.ok is not False:
             # payment.ok can be True (paid) or None (pending)!
             logger.debug(f"updating payment {temp_id}")
             async with db.connect() as conn:
                 await update_payment_details(
                     checking_id=temp_id,
-                    pending=payment.ok != True,
+                    pending=payment.ok is not True,
                     fee=payment.fee_msat,
                     preimage=payment.preimage,
                     new_checking_id=payment.checking_id,
                     conn=conn,
                 )
                 logger.debug(f"payment successful {payment.checking_id}")
-        elif payment.checking_id is None and payment.ok == False:
+        elif payment.checking_id is None and payment.ok is False:
             # payment failed
-            logger.warning(f"backend sent payment failure")
+            logger.warning("backend sent payment failure")
             async with db.connect() as conn:
                 logger.debug(f"deleting temporary payment {temp_id}")
                 await delete_wallet_payment(temp_id, wallet_id, conn=conn)
@@ -428,13 +433,11 @@ async def check_admin_settings():
         update_cached_settings(settings_db.dict())
 
         # printing settings for debugging
-        logger.debug(f"Admin settings:")
+        logger.debug("Admin settings:")
         for key, value in settings.dict(exclude_none=True).items():
             logger.debug(f"{key}: {value}")
 
-        admin_url = (
-            f"http://{settings.host}:{settings.port}/wallet?usr={settings.super_user}"
-        )
+        admin_url = f"{settings.lnbits_baseurl}wallet?usr={settings.super_user}"
         logger.success(f"✔️ Access super user account at: {admin_url}")
 
         # callback for saas
@@ -448,7 +451,7 @@ async def check_admin_settings():
 
 def update_cached_settings(sets_dict: dict):
     for key, value in sets_dict.items():
-        if not key in readonly_variables:
+        if key not in readonly_variables:
             try:
                 setattr(settings, key, value)
             except:

lnbits/core/static/js/extensions.js

@@ -3,7 +3,9 @@ new Vue({
   data: function () {
     return {
       searchTerm: '',
-      filteredExtensions: null
+      filteredExtensions: [],
+      maxStars: 5,
+      user: null
     }
   },
   mounted() {
@@ -32,5 +34,10 @@ new Vue({
       }
     }
   },
+  created() {
+    if (window.user) {
+      this.user = LNbits.map.user(window.user)
+    }
+  },
   mixins: [windowMixin]
 })

lnbits/core/static/js/wallet.js

@@ -266,7 +266,7 @@ new Vue({
           this.g.user.wallets[0].adminkey,
           {
             amount: credit,
-            id: this.g.user.wallets[0].id
+            id: this.g.wallet.id
           }
         )
         .then(response => {

lnbits/core/templates/admin/_tab_funding.html

@@ -16,7 +16,7 @@
         </div>
       </div>
       <div class="row q-col-gutter-md">
-        <div class="col-12 col-md-6">
+        <div class="col-12 col-md-4">
           <div class="row">
             <div class="col-12">
               <p>Active Funding<small> (Requires server restart)</small></p>
@@ -30,28 +30,40 @@
             </div>
           </div>
         </div>
-        <div class="col-12 col-md-6">
-          <div class="col-12">
-            <p>Fee reserve</p>
-            <div class="row q-col-gutter-md">
-              <div class="col-6">
-                <q-input
-                  type="number"
-                  filled
-                  v-model="formData.lnbits_reserve_fee_min"
-                  label="Reserve fee in msats"
-                >
-                </q-input>
-              </div>
-              <div class="col-6">
-                <q-input
-                  type="number"
-                  filled
-                  name="lnbits_reserve_fee_percent"
-                  v-model="formData.lnbits_reserve_fee_percent"
-                  label="Reserve fee in percent"
-                  step="0.1"
-                ></q-input>
+        <div class="col-12 col-md-8">
+          <div class="row q-col-gutter-md">
+            <div class="col-12 col-md-4">
+              <p>Invoice Expiry</p>
+              <q-input
+                filled
+                v-model="formData.lightning_invoice_expiry"
+                label="Invoice expiry (seconds)"
+                mask="#######"
+              >
+              </q-input>
+            </div>
+            <div class="col-12 col-md-8">
+              <p>Fee reserve</p>
+              <div class="row q-col-gutter-md">
+                <div class="col-6">
+                  <q-input
+                    type="number"
+                    filled
+                    v-model="formData.lnbits_reserve_fee_min"
+                    label="Reserve fee in msats"
+                  >
+                  </q-input>
+                </div>
+                <div class="col-6">
+                  <q-input
+                    type="number"
+                    filled
+                    name="lnbits_reserve_fee_percent"
+                    v-model="formData.lnbits_reserve_fee_percent"
+                    label="Reserve fee in percent"
+                    step="0.1"
+                  ></q-input>
+                </div>
               </div>
             </div>
           </div>

lnbits/core/templates/admin/_tab_server.html

@@ -33,22 +33,7 @@
           <br />
         </div>
         <div class="col-12 col-md-6">
-          <p>Miscelaneous</p>
-          <q-item tag="label" v-ripple>
-            <q-item-section>
-              <q-item-label>Force HTTPS</q-item-label>
-              <q-item-label caption>Prefer secure URLs</q-item-label>
-            </q-item-section>
-            <q-item-section avatar>
-              <q-toggle
-                size="md"
-                v-model="formData.lnbits_force_https"
-                checked-icon="check"
-                color="green"
-                unchecked-icon="clear"
-              />
-            </q-item-section>
-          </q-item>
+          <p>Miscellaneous</p>
           <q-item tag="label" v-ripple>
             <q-item-section>
               <q-item-label>Hide API</q-item-label>
@@ -69,6 +54,61 @@
           <br />
         </div>
       </div>
+      <div class="row q-col-gutter-md">
+        <div class="col-12 col-md-6">
+          <p>Admin Extensions</p>
+          <q-select
+            filled
+            v-model="formData.lnbits_admin_extensions"
+            multiple
+            hint="Extensions only user with admin privileges can use"
+            label="Admin extensions"
+            :options="g.extensions.map(e => e.name)"
+          ></q-select>
+          <br />
+        </div>
+        <div class="col-12 col-md-6">
+          <p>Disabled Extensions</p>
+          <q-select
+            filled
+            v-model="formData.lnbits_disabled_extensions"
+            :options="g.extensions.map(e => e.name)"
+            multiple
+            hint="Disable extensions *amilk disabled by default as resource heavy"
+            label="Disable extensions"
+          ></q-select>
+          <br />
+        </div>
+      </div>
+
+      <div>
+        <p>Extension Sources</p>
+        <q-input
+          filled
+          v-model="formAddExtensionsManifest"
+          @keydown.enter="addExtensionsManifest"
+          type="text"
+          label="Source URL (only use the official LNbits extension source, and sources you can trust)"
+          hint="Repositories from where the extensions can be downloaded"
+        >
+          <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"
+            removable
+            @remove="removeExtensionsManifest(manifestUrl)"
+            color="primary"
+            text-color="white"
+          >
+            {{ manifestUrl }}
+          </q-chip>
+          {%endraw%}
+        </div>
+        <br />
+      </div>
     </div>
   </q-card-section>
 </q-tab-panel>

lnbits/core/templates/admin/_tab_users.html

@@ -58,31 +58,5 @@
       </div>
       <br />
     </div>
-    <div class="row q-col-gutter-md">
-      <div class="col-12 col-md-6">
-        <p>Admin Extensions</p>
-        <q-select
-          filled
-          v-model="formData.lnbits_admin_extensions"
-          multiple
-          hint="Extensions only user with admin privileges can use"
-          label="Admin extensions"
-          :options="g.extensions.map(e => e.name)"
-        ></q-select>
-        <br />
-      </div>
-      <div class="col-12 col-md-6">
-        <p>Disabled Extensions</p>
-        <q-select
-          filled
-          v-model="formData.lnbits_disabled_extensions"
-          :options="g.extensions.map(e => e.name)"
-          multiple
-          hint="Disable extensions *amilk disabled by default as resource heavy"
-          label="Disable extensions"
-        ></q-select>
-        <br />
-      </div>
-    </div>
   </q-card-section>
 </q-tab-panel>

lnbits/core/templates/admin/index.html

@@ -9,6 +9,7 @@
       :disabled="!checkChanges"
     >
       <q-tooltip v-if="checkChanges"> Save your changes </q-tooltip>
+
       <q-badge
         v-if="checkChanges"
         color="red"
@@ -17,6 +18,7 @@
         style="padding: 6px; border-radius: 6px"
       />
     </q-btn>
+
     <q-btn
       v-if="isSuperUser"
       label="Restart server"
@@ -26,6 +28,7 @@
       <q-tooltip v-if="needsRestart">
         Restart the server for changes to take effect
       </q-tooltip>
+
       <q-badge
         v-if="needsRestart"
         color="red"
@@ -34,6 +37,7 @@
         style="padding: 6px; border-radius: 6px"
       />
     </q-btn>
+
     <q-btn
       v-if="isSuperUser"
       label="Topup"
@@ -42,11 +46,13 @@
     >
       <q-tooltip> Add funds to a wallet. </q-tooltip>
     </q-btn>
+
     <!-- <q-btn
       label="Download Database Backup"
       flat
       @click="downloadBackup"
       ></q-btn> -->
+
     <q-btn
       flat
       v-if="isSuperUser"
@@ -59,6 +65,7 @@
     </q-btn>
   </div>
 </div>
+
 <div class="row q-col-gutter-md justify-center">
   <div class="col q-gutter-y-md">
     <q-card>
@@ -70,16 +77,19 @@
               label="Funding"
               @update="val => tab = val.name"
             ></q-tab>
+
             <q-tab
               name="users"
               label="Users"
               @update="val => tab = val.name"
             ></q-tab>
+
             <q-tab
               name="server"
               label="Server"
               @update="val => tab = val.name"
             ></q-tab>
+
             <q-tab
               name="theme"
               label="Theme"
@@ -88,6 +98,7 @@
           </q-tabs>
         </div>
       </div>
+
       <q-form name="settings_form" id="settings_form">
         <q-tab-panels v-model="tab" animated>
           {% include "admin/_tab_funding.html" %} {% include
@@ -98,10 +109,12 @@
     </q-card>
   </div>
 </div>
+
 <q-dialog v-if="isSuperUser" v-model="topUpDialog.show" position="top">
   <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
     <q-form class="q-gutter-md">
       <p>TopUp a wallet</p>
+
       <div class="row">
         <div class="col-12">
           <q-input
@@ -112,8 +125,10 @@
             label="Wallet ID"
             hint="Use the wallet ID to topup any wallet"
           ></q-input>
+
           <br />
         </div>
+
         <div class="col-12">
           <q-input
             dense
@@ -124,14 +139,15 @@
           ></q-input>
         </div>
       </div>
+
       <div class="row q-mt-lg">
         <q-btn label="Topup" color="primary" @click="topupWallet"></q-btn>
+
         <q-btn v-close-popup flat color="grey" class="q-ml-auto">Cancel</q-btn>
       </div>
     </q-form>
   </q-card>
 </q-dialog>
-
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script>
   new Vue({
@@ -144,6 +160,7 @@
           'classic',
           'bitcoin',
           'flamingo',
+          'cyber',
           'freedom',
           'mint',
           'autumn',
@@ -153,6 +170,7 @@
         formData: {},
         formAddAdmin: '',
         formAddUser: '',
+        formAddExtensionsManifest: '',
         isSuperUser: false,
         wallet: {},
         cancel: {},
@@ -173,7 +191,7 @@
             }
           ],
           [
-            'CLightningWallet',
+            'CoreLightningWallet',
             {
               corelightning_rpc: {
                 value: null,
@@ -244,15 +262,15 @@
             }
           ],
           [
-            'LntxbotWallet',
+            'LnTipsWallet',
             {
-              lntxbot_api_endpoint: {
+              lntips_api_endpoint: {
                 value: null,
                 label: 'Endpoint'
               },
-              lntxbot_key: {
+              lntips_api_key: {
                 value: null,
-                label: 'Key'
+                label: 'API Key'
               }
             }
           ],
@@ -278,7 +296,7 @@
             {
               eclair_url: {
                 value: null,
-                label: 'Endpoint'
+                label: 'URL'
               },
               eclair_pass: {
                 value: null,
@@ -333,19 +351,6 @@
                 label: 'Token'
               }
             }
-          ],
-          [
-            'LnTipsWallet',
-            {
-              lntips_api_endpoint: {
-                value: null,
-                label: 'Endpoint'
-              },
-              lntips_api_key: {
-                value: null,
-                label: 'API Key'
-              }
-            }
           ]
         ])
       }
@@ -388,6 +393,27 @@
           u => u !== user
         )
       },
+      addExtensionsManifest() {
+        const addManifest = this.formAddExtensionsManifest.trim()
+        const manifests = this.formData.lnbits_extensions_manifests
+        if (
+          addManifest &&
+          addManifest.length &&
+          !manifests.includes(addManifest)
+        ) {
+          this.formData.lnbits_extensions_manifests = [
+            ...manifests,
+            addManifest
+          ]
+          this.formAddExtensionsManifest = ''
+        }
+      },
+      removeExtensionsManifest(manifest) {
+        const manifests = this.formData.lnbits_extensions_manifests
+        this.formData.lnbits_extensions_manifests = manifests.filter(
+          m => m !== manifest
+        )
+      },
       restartServer() {
         LNbits.api
           .request('GET', '/admin/api/v1/restart/?usr=' + this.g.user.id)

lnbits/core/templates/core/_api_docs.html

@@ -48,9 +48,9 @@
         <code>{"X-Api-Key": "<i>{{ wallet.inkey }}</i>"}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
         <code
-          >{"out": false, "amount": &lt;int&gt;, "memo": &lt;string&gt;, "unit":
-          &lt;string&gt;, "webhook": &lt;url:string&gt;, "internal":
-          &lt;bool&gt;}</code
+          >{"out": false, "amount": &lt;int&gt;, "memo": &lt;string&gt;,
+          "expiry": &lt;int&gt;, "unit": &lt;string&gt;, "webhook":
+          &lt;url:string&gt;, "internal": &lt;bool&gt;}</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">
           Returns 201 CREATED (application/json)
@@ -62,8 +62,7 @@
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
         <code
           >curl -X POST {{ request.base_url }}api/v1/payments -d '{"out": false,
-          "amount": &lt;int&gt;, "memo": &lt;string&gt;, "webhook":
-          &lt;url:string&gt;, "unit": &lt;string&gt;}' -H "X-Api-Key:
+          "amount": &lt;int&gt;, "memo": &lt;string&gt;}' -H "X-Api-Key:
           <i>{{ wallet.inkey }}</i>" -H "Content-type: application/json"</code
         >
       </q-card-section>

lnbits/core/templates/core/extensions.html

@@ -3,7 +3,20 @@
 <script src="/core/static/js/extensions.js"></script>
 {% endblock %} {% block page %}
 <div class="row q-col-gutter-md q-mb-md">
-  <div class="col-sm-3 col-xs-8 q-ml-auto">
+  <div class="col-sm-9 gt-sm col-xs-12 mt-lg">
+    <p class="text-h4">
+      Extensions
+      <q-btn
+        flat
+        color="primary"
+        type="a"
+        :href="['/install?usr=', user.id].join('')"
+        >Manage Extensions</q-btn
+      >
+    </p>
+  </div>
+
+  <div class="col-sm-3 col-xs-12 q-ml-auto">
     <q-input v-model="searchTerm" label="Search extensions">
       <q-icon
         v-if="searchTerm !== ''"
@@ -14,7 +27,9 @@
     </q-input>
   </div>
 </div>
-
+<p v-if="!filteredExtensions.length">
+  You don't have any extensions installed :(
+</p>
 <div class="row q-col-gutter-md">
   <div
     class="col-6 col-md-4 col-lg-3"
@@ -22,18 +37,39 @@
     :key="extension.code"
   >
     <q-card>
-      <q-card-section>
+      <q-card-section style="min-height: 140px">
         <div class="row">
           <div class="col-3">
             <q-img
+              v-if="extension.tile"
               :src="extension.tile"
               spinner-color="white"
               style="max-width: 100%"
             ></q-img>
+            <div v-else>
+              <q-icon
+                class="gt-sm"
+                name="extension"
+                color="primary"
+                size="70px"
+              ></q-icon>
+              <q-icon
+                class="lt-md"
+                name="extension"
+                color="primary"
+                size="35px"
+              ></q-icon>
+            </div>
           </div>
           <div class="col-9 q-pl-sm">
             {% raw %}
-            <div class="text-h5 gt-sm q-mt-sm q-mb-xs">
+            <div class="text-h5 gt-sm q-mt-sm q-mb-xs gt-sm">
+              {{ extension.name }}
+            </div>
+            <div
+              class="text-h5 gt-sm q-mt-sm q-mb-xs lt-md"
+              style="min-height: 60px"
+            >
               {{ extension.name }}
             </div>
             <div
@@ -59,12 +95,14 @@
         <div>
           <q-rating
             class="gt-sm"
+            v-model="maxStars"
             disable
-            size="2em"
+            size="1.5em"
             :max="5"
             color="primary"
-          ></q-rating
-          ><q-rating
+          ></q-rating>
+          <q-rating
+            v-model="maxStars"
             class="lt-md"
             size="1.5em"
             :max="5"

lnbits/core/templates/core/install.html

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

lnbits/core/views/api.py

@@ -5,7 +5,7 @@ import time
 import uuid
 from http import HTTPStatus
 from io import BytesIO
-from typing import Dict, Optional, Tuple, Union
+from typing import Dict, List, Optional, Tuple, Union
 from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
 
 import async_timeout
@@ -29,7 +29,11 @@ from sse_starlette.sse import EventSourceResponse
 from starlette.responses import RedirectResponse, StreamingResponse
 
 from lnbits import bolt11, lnurl
-from lnbits.core.models import Payment, Wallet
+from lnbits.core.helpers import (
+    migrate_extension_database,
+    stop_extension_background_work,
+)
+from lnbits.core.models import Payment, User, Wallet
 from lnbits.decorators import (
     WalletTypeInfo,
     check_admin,
@@ -37,6 +41,13 @@ from lnbits.decorators import (
     require_admin_key,
     require_invoice_key,
 )
+from lnbits.extension_manager import (
+    CreateExtension,
+    Extension,
+    ExtensionRelease,
+    InstallableExtension,
+    get_valid_extensions,
+)
 from lnbits.helpers import url_for
 from lnbits.settings import get_wallet_class, settings
 from lnbits.utils.exchange_rates import (
@@ -45,10 +56,13 @@ from lnbits.utils.exchange_rates import (
     satoshis_amount_as_fiat,
 )
 
-from .. import core_app, db
+from .. import core_app, core_app_extra, db
 from ..crud import (
+    add_installed_extension,
     create_tinyurl,
+    delete_installed_extension,
     delete_tinyurl,
+    get_dbversions,
     get_payments,
     get_standalone_payment,
     get_tinyurl,
@@ -133,6 +147,7 @@ class CreateInvoiceData(BaseModel):
     unit: Optional[str] = "sat"
     description_hash: Optional[str] = None
     unhashed_description: Optional[str] = None
+    expiry: Optional[int] = None
     lnurl_callback: Optional[str] = None
     lnurl_balance_check: Optional[str] = None
     extra: Optional[dict] = None
@@ -172,12 +187,13 @@ async def api_payments_create_invoice(data: CreateInvoiceData, wallet: Wallet):
 
     async with db.connect() as conn:
         try:
-            payment_hash, payment_request = await create_invoice(
+            _, payment_request = await create_invoice(
                 wallet_id=wallet.id,
                 amount=amount,
                 memo=memo,
                 description_hash=description_hash,
                 unhashed_description=unhashed_description,
+                expiry=data.expiry,
                 extra=data.extra,
                 webhook=data.webhook,
                 internal=data.internal,
@@ -374,7 +390,7 @@ async def subscribe_wallet_invoices(request: Request, wallet: Wallet):
                 async with async_timeout.timeout(1):
                     payment: Payment = await payment_queue.get()
                     if payment.wallet_id == this_wallet_id:
-                        logger.debug("sse listener: payment receieved", payment)
+                        logger.debug("sse listener: payment received", payment)
                         await send_queue.put(("payment-received", payment))
             except asyncio.TimeoutError:
                 pass
@@ -547,10 +563,10 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type
                 for [k, v] in metadata:
                     if k == "text/plain":
                         params.update(description=v)
-                    if k == "image/jpeg;base64" or k == "image/png;base64":
+                    if k in ("image/jpeg;base64", "image/png;base64"):
                         data_uri = "data:" + k + "," + v
                         params.update(image=data_uri)
-                    if k == "text/email" or k == "text/identifier":
+                    if k in ("text/email", "text/identifier"):
                         params.update(targetUser=v)
                 params.update(commentAllowed=data.get("commentAllowed", 0))
 
@@ -689,7 +705,7 @@ async def websocket_connect(websocket: WebSocket, item_id: str):
     await websocketManager.connect(websocket)
     try:
         while True:
-            data = await websocket.receive_text()
+            await websocket.receive_text()
     except WebSocketDisconnect:
         websocketManager.disconnect(websocket)
 
@@ -712,6 +728,111 @@ async def websocket_update_get(item_id: str, data: str):
         return {"sent": False, "data": data}
 
 
+@core_app.post("/api/v1/extension")
+async def api_install_extension(
+    data: CreateExtension, user: User = Depends(check_admin)
+):
+    release = await InstallableExtension.get_extension_release(
+        data.ext_id, data.source_repo, data.archive
+    )
+    if not release:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Release not found"
+        )
+    ext_info = InstallableExtension(
+        id=data.ext_id, name=data.ext_id, installed_release=release, icon=release.icon
+    )
+
+    ext_info.download_archive()
+
+    try:
+        ext_info.extract_archive()
+
+        extension = Extension.from_installable_ext(ext_info)
+
+        db_version = (await get_dbversions()).get(data.ext_id, 0)
+        await migrate_extension_database(extension, db_version)
+
+        await add_installed_extension(ext_info)
+
+        # call stop while the old routes are still active
+        await stop_extension_background_work(data.ext_id, user.id)
+
+        if data.ext_id not in settings.lnbits_deactivated_extensions:
+            settings.lnbits_deactivated_extensions += [data.ext_id]
+
+        # mount routes for the new version
+        core_app_extra.register_new_ext_routes(extension)
+
+        if extension.upgrade_hash:
+            ext_info.nofiy_upgrade()
+
+        return extension
+
+    except Exception as ex:
+        logger.warning(ex)
+        ext_info.clean_extension_files()
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail="Failed to install extension.",
+        )
+
+
+@core_app.delete("/api/v1/extension/{ext_id}")
+async def api_uninstall_extension(ext_id: str, user: User = Depends(check_admin)):
+
+    installable_extensions = await InstallableExtension.get_installable_extensions()
+
+    extensions = [e for e in installable_extensions if e.id == ext_id]
+    if len(extensions) == 0:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=f"Unknown extension id: {ext_id}",
+        )
+
+    # check that other extensions do not depend on this one
+    for valid_ext_id in list(map(lambda e: e.code, get_valid_extensions())):
+        installed_ext = next(
+            (ext for ext in installable_extensions if ext.id == valid_ext_id), None
+        )
+        if installed_ext and ext_id in installed_ext.dependencies:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail=f"Cannot uninstall. Extension '{installed_ext.name}' depends on this one.",
+            )
+
+    try:
+        # call stop while the old routes are still active
+        await stop_extension_background_work(ext_id, user.id)
+
+        if ext_id not in settings.lnbits_deactivated_extensions:
+            settings.lnbits_deactivated_extensions += [ext_id]
+
+        for ext_info in extensions:
+            ext_info.clean_extension_files()
+            await delete_installed_extension(ext_id=ext_info.id)
+
+    except Exception as ex:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
+        )
+
+
+@core_app.get("/api/v1/extension/{ext_id}/releases")
+async def get_extension_releases(ext_id: str, user: User = Depends(check_admin)):
+    try:
+        extension_releases: List[
+            ExtensionRelease
+        ] = await InstallableExtension.get_extension_releases(ext_id)
+
+        return extension_releases
+
+    except Exception as ex:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
+        )
+
+
 ############################TINYURL##################################
 
 

lnbits/core/views/generic.py

@@ -1,6 +1,6 @@
 import asyncio
 from http import HTTPStatus
-from typing import Optional
+from typing import List, Optional
 
 from fastapi import Depends, Query, Request, status
 from fastapi.exceptions import HTTPException
@@ -16,14 +16,17 @@ from lnbits.decorators import check_admin, check_user_exists
 from lnbits.helpers import template_renderer, url_for
 from lnbits.settings import get_wallet_class, settings
 
-from ...helpers import get_valid_extensions
+from ...extension_manager import InstallableExtension, get_valid_extensions
 from ..crud import (
     create_account,
     create_wallet,
     delete_wallet,
     get_balance_check,
+    get_inactive_extensions,
+    get_installed_extensions,
     get_user,
     save_balance_notify,
+    update_installed_extension_state,
     update_user_extension,
 )
 from ..services import pay_invoice, redeem_lnurl_withdraw
@@ -61,35 +64,10 @@ async def extensions(
     enable: str = Query(None),
     disable: str = Query(None),
 ):
-    extension_to_enable = enable
-    extension_to_disable = disable
-
-    if extension_to_enable and extension_to_disable:
-        raise HTTPException(
-            HTTPStatus.BAD_REQUEST, "You can either `enable` or `disable` an extension."
-        )
-
-    # check if extension exists
-    if extension_to_enable or extension_to_disable:
-        ext = extension_to_enable or extension_to_disable
-        if ext not in [e.code for e in get_valid_extensions()]:
-            raise HTTPException(
-                HTTPStatus.BAD_REQUEST, f"Extension '{ext}' doesn't exist."
-            )
-
-    if extension_to_enable:
-        logger.info(f"Enabling extension: {extension_to_enable} for user {user.id}")
-        await update_user_extension(
-            user_id=user.id, extension=extension_to_enable, active=True
-        )
-    elif extension_to_disable:
-        logger.info(f"Disabling extension: {extension_to_disable} for user {user.id}")
-        await update_user_extension(
-            user_id=user.id, extension=extension_to_disable, active=False
-        )
+    await toggle_extension(enable, disable, user.id)
 
     # Update user as his extensions have been updated
-    if extension_to_enable or extension_to_disable:
+    if enable or disable:
         user = await get_user(user.id)  # type: ignore
 
     return template_renderer().TemplateResponse(
@@ -97,6 +75,93 @@ async def extensions(
     )
 
 
+@core_html_routes.get(
+    "/install", name="install.extensions", response_class=HTMLResponse
+)
+async def extensions_install(
+    request: Request,
+    user: User = Depends(check_user_exists),
+    activate: str = Query(None),
+    deactivate: str = Query(None),
+):
+    try:
+        installed_exts: List["InstallableExtension"] = await get_installed_extensions()
+        installed_exts_ids = [e.id for e in installed_exts]
+
+        installable_exts: List[
+            InstallableExtension
+        ] = await InstallableExtension.get_installable_extensions()
+        installable_exts += [
+            e for e in installed_exts if e.id not in installed_exts_ids
+        ]
+
+        for e in installable_exts:
+            installed_ext = next((ie for ie in installed_exts if e.id == ie.id), None)
+            if installed_ext:
+                e.installed_release = installed_ext.installed_release
+                # use the installed extension values
+                e.name = installed_ext.name
+                e.short_description = installed_ext.short_description
+                e.icon = installed_ext.icon
+
+    except Exception as ex:
+        logger.warning(ex)
+        installable_exts = []
+
+    try:
+        ext_id = activate or deactivate
+        if ext_id and user.admin:
+            if deactivate and deactivate not in settings.lnbits_deactivated_extensions:
+                settings.lnbits_deactivated_extensions += [deactivate]
+            elif activate:
+                settings.lnbits_deactivated_extensions = list(
+                    filter(
+                        lambda e: e != activate, settings.lnbits_deactivated_extensions
+                    )
+                )
+            await update_installed_extension_state(
+                ext_id=ext_id, active=activate is not None
+            )
+
+        all_extensions = list(map(lambda e: e.code, get_valid_extensions()))
+        inactive_extensions = await get_inactive_extensions()
+        extensions = list(
+            map(
+                lambda ext: {
+                    "id": ext.id,
+                    "name": ext.name,
+                    "icon": ext.icon,
+                    "shortDescription": ext.short_description,
+                    "stars": ext.stars,
+                    "isFeatured": ext.featured,
+                    "dependencies": ext.dependencies,
+                    "isInstalled": ext.id in installed_exts_ids,
+                    "isAvailable": ext.id in all_extensions,
+                    "isActive": ext.id not in inactive_extensions,
+                    "latestRelease": dict(ext.latest_release)
+                    if ext.latest_release
+                    else None,
+                    "installedRelease": dict(ext.installed_release)
+                    if ext.installed_release
+                    else None,
+                },
+                installable_exts,
+            )
+        )
+
+        return template_renderer().TemplateResponse(
+            "core/install.html",
+            {
+                "request": request,
+                "user": user.dict(),
+                "extensions": extensions,
+            },
+        )
+    except Exception as e:
+        logger.warning(e)
+        raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))
+
+
 @core_html_routes.get(
     "/wallet",
     response_class=HTMLResponse,
@@ -324,6 +389,9 @@ async def manifest(usr: str):
 
 @core_html_routes.get("/admin", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_admin)):
+    if not settings.lnbits_admin_ui:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
+
     WALLET = get_wallet_class()
     _, balance = await WALLET.status()
 
@@ -336,3 +404,29 @@ async def index(request: Request, user: User = Depends(check_admin)):
             "balance": balance,
         },
     )
+
+
+async def toggle_extension(extension_to_enable, extension_to_disable, user_id):
+    if extension_to_enable and extension_to_disable:
+        raise HTTPException(
+            HTTPStatus.BAD_REQUEST, "You can either `enable` or `disable` an extension."
+        )
+
+    # check if extension exists
+    if extension_to_enable or extension_to_disable:
+        ext = extension_to_enable or extension_to_disable
+        if ext not in [e.code for e in get_valid_extensions()]:
+            raise HTTPException(
+                HTTPStatus.BAD_REQUEST, f"Extension '{ext}' doesn't exist."
+            )
+
+    if extension_to_enable:
+        logger.info(f"Enabling extension: {extension_to_enable} for user {user_id}")
+        await update_user_extension(
+            user_id=user_id, extension=extension_to_enable, active=True
+        )
+    elif extension_to_disable:
+        logger.info(f"Disabling extension: {extension_to_disable} for user {user_id}")
+        await update_user_extension(
+            user_id=user_id, extension=extension_to_disable, active=False
+        )

lnbits/core/views/public_api.py

@@ -1,11 +1,9 @@
 import asyncio
 import datetime
 from http import HTTPStatus
-from urllib.parse import urlparse
 
 from fastapi import HTTPException
 from loguru import logger
-from starlette.requests import Request
 
 from lnbits import bolt11
 
@@ -14,14 +12,6 @@ from ..crud import get_standalone_payment
 from ..tasks import api_invoice_listeners
 
 
-@core_app.get("/.well-known/lnurlp/{username}")
-async def lnaddress(username: str, request: Request):
-    from lnbits.extensions.lnaddress.lnurl import lnurl_response  # type: ignore
-
-    domain = urlparse(str(request.url)).netloc
-    return await lnurl_response(username, domain, request)
-
-
 @core_app.get("/public/v1/payment/{payment_hash}")
 async def api_public_payment_longpolling(payment_hash):
     payment = await get_standalone_payment(payment_hash)

lnbits/db.py

@@ -135,7 +135,7 @@ class Database(Compat):
                 if value is None:
                     return None
                 f = "%Y-%m-%d %H:%M:%S.%f"
-                if not "." in value:
+                if "." not in value:
                     f = "%Y-%m-%d %H:%M:%S"
                 return time.mktime(datetime.datetime.strptime(value, f).timetuple())
 

lnbits/decorators.py

@@ -245,7 +245,7 @@ async def check_user_exists(usr: UUID4) -> User:
 
 async def check_admin(usr: UUID4) -> User:
     user = await check_user_exists(usr)
-    if user.id != settings.super_user and not user.id in settings.lnbits_admin_users:
+    if user.id != settings.super_user and user.id not in settings.lnbits_admin_users:
         raise HTTPException(
             status_code=HTTPStatus.UNAUTHORIZED,
             detail="User not authorized. No admin privileges.",

lnbits/extension_manager.py

@@ -0,0 +1,550 @@
+import hashlib
+import json
+import os
+import shutil
+import sys
+import urllib.request
+import zipfile
+from http import HTTPStatus
+from pathlib import Path
+from typing import Any, List, NamedTuple, Optional, Tuple
+
+import httpx
+from fastapi.exceptions import HTTPException
+from loguru import logger
+from pydantic import BaseModel
+
+from lnbits.settings import settings
+
+
+class Extension(NamedTuple):
+    code: str
+    is_valid: bool
+    is_admin_only: bool
+    name: Optional[str] = None
+    short_description: Optional[str] = None
+    tile: Optional[str] = None
+    contributors: Optional[List[str]] = None
+    hidden: bool = False
+    migration_module: Optional[str] = None
+    db_name: Optional[str] = None
+    upgrade_hash: Optional[str] = ""
+
+    @property
+    def module_name(self):
+        return (
+            f"lnbits.extensions.{self.code}"
+            if self.upgrade_hash == ""
+            else f"lnbits.upgrades.{self.code}-{self.upgrade_hash}.{self.code}"
+        )
+
+    @classmethod
+    def from_installable_ext(cls, ext_info: "InstallableExtension") -> "Extension":
+        return Extension(
+            code=ext_info.id,
+            is_valid=True,
+            is_admin_only=False,  # todo: is admin only
+            name=ext_info.name,
+            upgrade_hash=ext_info.hash if ext_info.module_installed else "",
+        )
+
+
+# All subdirectories in the current directory, not recursive.
+
+
+class ExtensionManager:
+    def __init__(self):
+        self._disabled: List[str] = settings.lnbits_disabled_extensions
+        self._admin_only: List[str] = settings.lnbits_admin_extensions
+        p = Path(settings.lnbits_path, "extensions")
+        os.makedirs(p, exist_ok=True)
+        self._extension_folders: List[Path] = [f for f in p.iterdir() if f.is_dir()]
+
+    @property
+    def extensions(self) -> List[Extension]:
+        output: List[Extension] = []
+
+        if "all" in self._disabled:
+            return output
+
+        for extension in [
+            ext for ext in self._extension_folders if ext not in self._disabled
+        ]:
+            try:
+                with open(extension / "config.json") as json_file:
+                    config = json.load(json_file)
+                is_valid = True
+                is_admin_only = True if extension in self._admin_only else False
+            except Exception:
+                config = {}
+                is_valid = False
+                is_admin_only = False
+
+            *_, extension_code = extension.parts
+            output.append(
+                Extension(
+                    extension_code,
+                    is_valid,
+                    is_admin_only,
+                    config.get("name"),
+                    config.get("short_description"),
+                    config.get("tile"),
+                    config.get("contributors"),
+                    config.get("hidden") or False,
+                    config.get("migration_module"),
+                    config.get("db_name"),
+                )
+            )
+
+        return output
+
+
+class ExtensionRelease(BaseModel):
+    name: str
+    version: str
+    archive: str
+    source_repo: str
+    is_github_release = False
+    hash: Optional[str]
+    html_url: Optional[str]
+    description: Optional[str]
+    details_html: Optional[str] = None
+    icon: Optional[str]
+
+    @classmethod
+    def from_github_release(
+        cls, source_repo: str, r: "GitHubRepoRelease"
+    ) -> "ExtensionRelease":
+        return ExtensionRelease(
+            name=r.name,
+            description=r.name,
+            version=r.tag_name,
+            archive=r.zipball_url,
+            source_repo=source_repo,
+            is_github_release=True,
+            # description=r.body, # bad for JSON
+            html_url=r.html_url,
+        )
+
+    @classmethod
+    async def all_releases(cls, org: str, repo: str) -> List["ExtensionRelease"]:
+        try:
+            github_releases = await fetch_github_releases(org, repo)
+            return [
+                ExtensionRelease.from_github_release(f"{org}/{repo}", r)
+                for r in github_releases
+            ]
+        except Exception as e:
+            logger.warning(e)
+            return []
+
+
+class ExplicitRelease(BaseModel):
+    id: str
+    name: str
+    version: str
+    archive: str
+    hash: str
+    dependencies: List[str] = []
+    icon: Optional[str]
+    short_description: Optional[str]
+    html_url: Optional[str]
+    details: Optional[str]
+    info_notification: Optional[str]
+    critical_notification: Optional[str]
+
+
+class GitHubRelease(BaseModel):
+    id: str
+    organisation: str
+    repository: str
+
+
+class Manifest(BaseModel):
+    featured: List[str] = []
+    extensions: List["ExplicitRelease"] = []
+    repos: List["GitHubRelease"] = []
+
+
+class GitHubRepoRelease(BaseModel):
+    name: str
+    tag_name: str
+    zipball_url: str
+    html_url: str
+
+
+class GitHubRepo(BaseModel):
+    stargazers_count: str
+    html_url: str
+    default_branch: str
+
+
+class ExtensionConfig(BaseModel):
+    name: str
+    short_description: str
+    tile: str = ""
+
+
+class InstallableExtension(BaseModel):
+    id: str
+    name: str
+    short_description: Optional[str] = None
+    icon: Optional[str] = None
+    dependencies: List[str] = []
+    is_admin_only: bool = False
+    stars: int = 0
+    featured = False
+    latest_release: Optional[ExtensionRelease]
+    installed_release: Optional[ExtensionRelease]
+
+    @property
+    def hash(self) -> str:
+        if self.installed_release:
+            if self.installed_release.hash:
+                return self.installed_release.hash
+            m = hashlib.sha256()
+            m.update(f"{self.installed_release.archive}".encode())
+            return m.hexdigest()
+        return "not-installed"
+
+    @property
+    def zip_path(self) -> str:
+        extensions_data_dir = os.path.join(settings.lnbits_data_folder, "extensions")
+        os.makedirs(extensions_data_dir, exist_ok=True)
+        return os.path.join(extensions_data_dir, f"{self.id}.zip")
+
+    @property
+    def ext_dir(self) -> str:
+        return os.path.join("lnbits", "extensions", self.id)
+
+    @property
+    def ext_upgrade_dir(self) -> str:
+        return os.path.join("lnbits", "upgrades", f"{self.id}-{self.hash}")
+
+    @property
+    def module_name(self) -> str:
+        return f"lnbits.extensions.{self.id}"
+
+    @property
+    def module_installed(self) -> bool:
+        return self.module_name in sys.modules
+
+    @property
+    def has_installed_version(self) -> bool:
+        if not Path(self.ext_dir).is_dir():
+            return False
+        config_file = os.path.join(self.ext_dir, "config.json")
+        if not Path(config_file).is_file():
+            return False
+        with open(config_file, "r") as json_file:
+            config_json = json.load(json_file)
+            return config_json.get("is_installed") is True
+
+    def download_archive(self):
+        logger.info(f"Downloading extension {self.name}.")
+        ext_zip_file = self.zip_path
+        if os.path.isfile(ext_zip_file):
+            os.remove(ext_zip_file)
+        try:
+            download_url(self.installed_release.archive, ext_zip_file)
+        except Exception as ex:
+            logger.warning(ex)
+            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 os.path.isfile(ext_zip_file):
+                os.remove(ext_zip_file)
+            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}.")
+        os.makedirs(os.path.join("lnbits", "upgrades"), exist_ok=True)
+        shutil.rmtree(self.ext_upgrade_dir, True)
+        with zipfile.ZipFile(self.zip_path, "r") as zip_ref:
+            zip_ref.extractall(self.ext_upgrade_dir)
+        generated_dir_name = os.listdir(self.ext_upgrade_dir)[0]
+        os.rename(
+            os.path.join(self.ext_upgrade_dir, generated_dir_name),
+            os.path.join(self.ext_upgrade_dir, self.id),
+        )
+
+        # Pre-packed extensions can be upgraded
+        # Mark the extension as installed so we know it is not the pre-packed version
+        with open(
+            os.path.join(self.ext_upgrade_dir, self.id, "config.json"), "r+"
+        ) as json_file:
+            config_json = json.load(json_file)
+            config_json["is_installed"] = True
+            json_file.seek(0)
+            json.dump(config_json, json_file)
+            json_file.truncate()
+
+            self.name = config_json.get("name")
+            self.short_description = config_json.get("short_description")
+
+            if (
+                self.installed_release
+                and self.installed_release.is_github_release
+                and config_json.get("tile")
+            ):
+                self.icon = icon_to_github_url(
+                    self.installed_release.source_repo, config_json.get("tile")
+                )
+
+        shutil.rmtree(self.ext_dir, True)
+        shutil.copytree(
+            os.path.join(self.ext_upgrade_dir, self.id),
+            os.path.join("lnbits", "extensions", self.id),
+        )
+        logger.success(f"Extension {self.name} installed.")
+
+    def nofiy_upgrade(self) -> None:
+        """Update the list of upgraded extensions. The middleware will perform redirects based on this"""
+
+        clean_upgraded_exts = list(
+            filter(
+                lambda old_ext: not old_ext.endswith(f"/{self.id}"),
+                settings.lnbits_upgraded_extensions,
+            )
+        )
+        settings.lnbits_upgraded_extensions = clean_upgraded_exts + [
+            f"{self.hash}/{self.id}"
+        ]
+
+    def clean_extension_files(self):
+        # remove downloaded archive
+        if os.path.isfile(self.zip_path):
+            os.remove(self.zip_path)
+
+        # remove module from extensions
+        shutil.rmtree(self.ext_dir, True)
+
+        shutil.rmtree(self.ext_upgrade_dir, True)
+
+    @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"])
+        return ext
+
+    @classmethod
+    async def from_github_release(
+        cls, github_release: GitHubRelease
+    ) -> Optional["InstallableExtension"]:
+        try:
+            repo, latest_release, config = await fetch_github_repo_info(
+                github_release.organisation, github_release.repository
+            )
+
+            return InstallableExtension(
+                id=github_release.id,
+                name=config.name,
+                short_description=config.short_description,
+                version="0",
+                stars=repo.stargazers_count,
+                icon=icon_to_github_url(
+                    f"{github_release.organisation}/{github_release.repository}",
+                    config.tile,
+                ),
+                latest_release=ExtensionRelease.from_github_release(
+                    repo.html_url, latest_release
+                ),
+            )
+        except Exception as e:
+            logger.warning(e)
+        return None
+
+    @classmethod
+    def from_explicit_release(cls, e: ExplicitRelease) -> "InstallableExtension":
+        return InstallableExtension(
+            id=e.id,
+            name=e.name,
+            archive=e.archive,
+            hash=e.hash,
+            short_description=e.short_description,
+            icon=e.icon,
+            dependencies=e.dependencies,
+        )
+
+    @classmethod
+    async def get_installable_extensions(
+        cls,
+    ) -> List["InstallableExtension"]:
+        extension_list: List[InstallableExtension] = []
+        extension_id_list: List[str] = []
+
+        for url in settings.lnbits_extensions_manifests:
+            try:
+                manifest = await fetch_manifest(url)
+
+                for r in manifest.repos:
+                    if r.id in extension_id_list:
+                        continue
+                    ext = await InstallableExtension.from_github_release(r)
+                    if ext:
+                        ext.featured = ext.id in manifest.featured
+                        extension_list += [ext]
+                        extension_id_list += [ext.id]
+
+                for e in manifest.extensions:
+                    if e.id in extension_id_list:
+                        continue
+                    ext = InstallableExtension.from_explicit_release(e)
+                    ext.featured = ext.id in manifest.featured
+                    extension_list += [ext]
+                    extension_id_list += [e.id]
+            except Exception as e:
+                logger.warning(f"Manifest {url} failed with '{str(e)}'")
+
+        return extension_list
+
+    @classmethod
+    async def get_extension_releases(cls, ext_id: str) -> List["ExtensionRelease"]:
+        extension_releases: List[ExtensionRelease] = []
+
+        for url in settings.lnbits_extensions_manifests:
+            try:
+                manifest = await fetch_manifest(url)
+                for r in manifest.repos:
+                    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:
+                        extension_releases += [
+                            ExtensionRelease(
+                                name=e.name,
+                                version=e.version,
+                                archive=e.archive,
+                                hash=e.hash,
+                                source_repo=url,
+                                description=e.short_description,
+                                details_html=e.details,
+                                html_url=e.html_url,
+                                icon=e.icon,
+                            )
+                        ]
+
+            except Exception as e:
+                logger.warning(f"Manifest {url} failed with '{str(e)}'")
+
+        return extension_releases
+
+    @classmethod
+    async def get_extension_release(
+        cls, ext_id: str, source_repo: str, archive: str
+    ) -> Optional["ExtensionRelease"]:
+        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
+        ]
+
+        return selected_release[0] if len(selected_release) != 0 else None
+
+
+class CreateExtension(BaseModel):
+    ext_id: str
+    archive: str
+    source_repo: str
+
+
+def get_valid_extensions() -> List[Extension]:
+    return [
+        extension for extension in ExtensionManager().extensions if extension.is_valid
+    ]
+
+
+def download_url(url, save_path):
+    with urllib.request.urlopen(url) as dl_file:
+        with open(save_path, "wb") as out_file:
+            out_file.write(dl_file.read())
+
+
+def file_hash(filename):
+    h = hashlib.sha256()
+    b = bytearray(128 * 1024)
+    mv = memoryview(b)
+    with open(filename, "rb", buffering=0) as f:
+        while n := f.readinto(mv):
+            h.update(mv[:n])
+    return h.hexdigest()
+
+
+def icon_to_github_url(source_repo: str, path: Optional[str]) -> str:
+    if not path:
+        return ""
+    _, _, *rest = path.split("/")
+    tail = "/".join(rest)
+    return f"https://github.com/{source_repo}/raw/main/{tail}"
+
+
+async def fetch_github_repo_info(
+    org: str, repository: str
+) -> Tuple[GitHubRepo, GitHubRepoRelease, ExtensionConfig]:
+    repo_url = f"https://api.github.com/repos/{org}/{repository}"
+    error_msg = "Cannot fetch extension repo"
+    repo = await gihub_api_get(repo_url, error_msg)
+    github_repo = GitHubRepo.parse_obj(repo)
+
+    lates_release_url = (
+        f"https://api.github.com/repos/{org}/{repository}/releases/latest"
+    )
+    error_msg = "Cannot fetch extension releases"
+    latest_release: Any = await gihub_api_get(lates_release_url, error_msg)
+
+    config_url = f"https://raw.githubusercontent.com/{org}/{repository}/{github_repo.default_branch}/config.json"
+    error_msg = "Cannot fetch config for extension"
+    config = await gihub_api_get(config_url, error_msg)
+
+    return (
+        github_repo,
+        GitHubRepoRelease.parse_obj(latest_release),
+        ExtensionConfig.parse_obj(config),
+    )
+
+
+async def fetch_manifest(url) -> Manifest:
+    error_msg = "Cannot fetch extensions manifest"
+    manifest = await gihub_api_get(url, error_msg)
+    return Manifest.parse_obj(manifest)
+
+
+async def fetch_github_releases(org: str, repo: str) -> List[GitHubRepoRelease]:
+    releases_url = f"https://api.github.com/repos/{org}/{repo}/releases"
+    error_msg = "Cannot fetch extension releases"
+    releases = await gihub_api_get(releases_url, error_msg)
+    return [GitHubRepoRelease.parse_obj(r) for r in releases]
+
+
+async def gihub_api_get(url: str, error_msg: Optional[str]) -> Any:
+    async with httpx.AsyncClient() as client:
+        headers = (
+            {"Authorization": "Bearer " + settings.lnbits_ext_github_token}
+            if settings.lnbits_ext_github_token
+            else None
+        )
+        resp = await client.get(
+            url,
+            headers=headers,
+        )
+        if resp.status_code != 200:
+            logger.warning(f"{error_msg} ({url}): {resp.text}")
+        resp.raise_for_status()
+        return resp.json()

lnbits/extensions/bleskomat/README.md

@@ -1,21 +0,0 @@
-# Bleskomat Extension for lnbits
-
-This extension allows you to connect a Bleskomat ATM to an lnbits wallet. It will work with both the [open-source DIY Bleskomat ATM project](https://github.com/samotari/bleskomat) as well as the [commercial Bleskomat ATM](https://www.bleskomat.com/).
-
-
-## Connect Your Bleskomat ATM
-
-* Click the "Add Bleskomat" button on this page to begin.
-* Choose a wallet. This will be the wallet that is used to pay satoshis to your ATM customers.
-* Choose the fiat currency. This should match the fiat currency that your ATM accepts.
-* Pick an exchange rate provider. This is the API that will be used to query the fiat to satoshi exchange rate at the time your customer attempts to withdraw their funds.
-* Set your ATM's fee percentage.
-* Click the "Done" button.
-* Find the new Bleskomat in the list and then click the export icon to download a new configuration file for your ATM.
-* Copy the configuration file ("bleskomat.conf") to your ATM's SD card.
-* Restart Your Bleskomat ATM. It should automatically reload the configurations from the SD card.
-
-
-## How Does It Work?
-
-Since the Bleskomat ATMs are designed to be offline, a cryptographic signing scheme is used to verify that the URL was generated by an authorized device. When one of your customers inserts fiat money into the device, a signed URL (lnurl-withdraw) is created and displayed as a QR code. Your customer scans the QR code with their lnurl-supporting mobile app, their mobile app communicates with the web API of lnbits to verify the signature, the fiat currency amount is converted to sats, the customer accepts the withdrawal, and finally lnbits will pay the customer from your lnbits wallet.

lnbits/extensions/bleskomat/__init__.py

@@ -1,26 +0,0 @@
-from fastapi import APIRouter
-from starlette.staticfiles import StaticFiles
-
-from lnbits.db import Database
-from lnbits.helpers import template_renderer
-
-db = Database("ext_bleskomat")
-
-bleskomat_static_files = [
-    {
-        "path": "/bleskomat/static",
-        "app": StaticFiles(packages=[("lnbits", "extensions/bleskomat/static")]),
-        "name": "bleskomat_static",
-    }
-]
-
-bleskomat_ext: APIRouter = APIRouter(prefix="/bleskomat", tags=["Bleskomat"])
-
-
-def bleskomat_renderer():
-    return template_renderer(["lnbits/extensions/bleskomat/templates"])
-
-
-from .lnurl_api import *  # noqa
-from .views import *  # noqa
-from .views_api import *  # noqa

lnbits/extensions/bleskomat/config.json

@@ -1,6 +0,0 @@
-{
-    "name": "Bleskomat",
-    "short_description": "Connect a Bleskomat ATM to an lnbits",
-    "tile": "/bleskomat/static/image/bleskomat.png",
-    "contributors": ["chill117"]
-}

lnbits/extensions/bleskomat/crud.py

@@ -1,113 +0,0 @@
-import secrets
-import time
-from typing import List, Optional, Union
-from uuid import uuid4
-
-from . import db
-from .helpers import generate_bleskomat_lnurl_hash
-from .models import Bleskomat, BleskomatLnurl, CreateBleskomat
-
-
-async def create_bleskomat(data: CreateBleskomat, wallet_id: str) -> Bleskomat:
-    bleskomat_id = uuid4().hex
-    api_key_id = secrets.token_hex(8)
-    api_key_secret = secrets.token_hex(32)
-    api_key_encoding = "hex"
-    await db.execute(
-        """
-        INSERT INTO bleskomat.bleskomats (id, wallet, api_key_id, api_key_secret, api_key_encoding, name, fiat_currency, exchange_rate_provider, fee)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-        """,
-        (
-            bleskomat_id,
-            wallet_id,
-            api_key_id,
-            api_key_secret,
-            api_key_encoding,
-            data.name,
-            data.fiat_currency,
-            data.exchange_rate_provider,
-            data.fee,
-        ),
-    )
-    bleskomat = await get_bleskomat(bleskomat_id)
-    assert bleskomat, "Newly created bleskomat couldn't be retrieved"
-    return bleskomat
-
-
-async def get_bleskomat(bleskomat_id: str) -> Optional[Bleskomat]:
-    row = await db.fetchone(
-        "SELECT * FROM bleskomat.bleskomats WHERE id = ?", (bleskomat_id,)
-    )
-    return Bleskomat(**row) if row else None
-
-
-async def get_bleskomat_by_api_key_id(api_key_id: str) -> Optional[Bleskomat]:
-    row = await db.fetchone(
-        "SELECT * FROM bleskomat.bleskomats WHERE api_key_id = ?", (api_key_id,)
-    )
-    return Bleskomat(**row) if row else None
-
-
-async def get_bleskomats(wallet_ids: Union[str, List[str]]) -> List[Bleskomat]:
-    if isinstance(wallet_ids, str):
-        wallet_ids = [wallet_ids]
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM bleskomat.bleskomats WHERE wallet IN ({q})", (*wallet_ids,)
-    )
-    return [Bleskomat(**row) for row in rows]
-
-
-async def update_bleskomat(bleskomat_id: str, **kwargs) -> Optional[Bleskomat]:
-    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-    await db.execute(
-        f"UPDATE bleskomat.bleskomats SET {q} WHERE id = ?",
-        (*kwargs.values(), bleskomat_id),
-    )
-    row = await db.fetchone(
-        "SELECT * FROM bleskomat.bleskomats WHERE id = ?", (bleskomat_id,)
-    )
-    return Bleskomat(**row) if row else None
-
-
-async def delete_bleskomat(bleskomat_id: str) -> None:
-    await db.execute("DELETE FROM bleskomat.bleskomats WHERE id = ?", (bleskomat_id,))
-
-
-async def create_bleskomat_lnurl(
-    *, bleskomat: Bleskomat, secret: str, tag: str, params: str, uses: int = 1
-) -> BleskomatLnurl:
-    bleskomat_lnurl_id = uuid4().hex
-    hash = generate_bleskomat_lnurl_hash(secret)
-    now = int(time.time())
-    await db.execute(
-        """
-        INSERT INTO bleskomat.bleskomat_lnurls (id, bleskomat, wallet, hash, tag, params, api_key_id, initial_uses, remaining_uses, created_time, updated_time)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        """,
-        (
-            bleskomat_lnurl_id,
-            bleskomat.id,
-            bleskomat.wallet,
-            hash,
-            tag,
-            params,
-            bleskomat.api_key_id,
-            uses,
-            uses,
-            now,
-            now,
-        ),
-    )
-    bleskomat_lnurl = await get_bleskomat_lnurl(secret)
-    assert bleskomat_lnurl, "Newly created bleskomat LNURL couldn't be retrieved"
-    return bleskomat_lnurl
-
-
-async def get_bleskomat_lnurl(secret: str) -> Optional[BleskomatLnurl]:
-    hash = generate_bleskomat_lnurl_hash(secret)
-    row = await db.fetchone(
-        "SELECT * FROM bleskomat.bleskomat_lnurls WHERE hash = ?", (hash,)
-    )
-    return BleskomatLnurl(**row) if row else None

lnbits/extensions/bleskomat/exchange_rates.py

@@ -1,86 +0,0 @@
-import json
-import os
-from typing import Callable, Dict, Union
-
-import httpx
-
-fiat_currencies = json.load(
-    open(
-        os.path.join(
-            os.path.dirname(os.path.realpath(__file__)), "fiat_currencies.json"
-        ),
-        "r",
-    )
-)
-
-exchange_rate_providers: dict[
-    str, dict[str, Union[str, Callable[[dict, dict], str]]]
-] = {
-    "bitfinex": {
-        "name": "Bitfinex",
-        "domain": "bitfinex.com",
-        "api_url": "https://api.bitfinex.com/v1/pubticker/{from}{to}",
-        "getter": lambda data, replacements: data["last_price"],
-    },
-    "bitstamp": {
-        "name": "Bitstamp",
-        "domain": "bitstamp.net",
-        "api_url": "https://www.bitstamp.net/api/v2/ticker/{from}{to}/",
-        "getter": lambda data, replacements: data["last"],
-    },
-    "coinbase": {
-        "name": "Coinbase",
-        "domain": "coinbase.com",
-        "api_url": "https://api.coinbase.com/v2/exchange-rates?currency={FROM}",
-        "getter": lambda data, replacements: data["data"]["rates"][replacements["TO"]],
-    },
-    "coinmate": {
-        "name": "CoinMate",
-        "domain": "coinmate.io",
-        "api_url": "https://coinmate.io/api/ticker?currencyPair={FROM}_{TO}",
-        "getter": lambda data, replacements: data["data"]["last"],
-    },
-    "kraken": {
-        "name": "Kraken",
-        "domain": "kraken.com",
-        "api_url": "https://api.kraken.com/0/public/Ticker?pair=XBT{TO}",
-        "getter": lambda data, replacements: data["result"][
-            "XXBTZ" + replacements["TO"]
-        ]["c"][0],
-    },
-}
-
-exchange_rate_providers_serializable = {}
-for ref, exchange_rate_provider in exchange_rate_providers.items():
-    exchange_rate_provider_serializable = {}
-    for key, value in exchange_rate_provider.items():
-        if not callable(value):
-            exchange_rate_provider_serializable[key] = value
-    exchange_rate_providers_serializable[ref] = exchange_rate_provider_serializable
-
-
-async def fetch_fiat_exchange_rate(currency: str, provider: str):
-
-    replacements = {
-        "FROM": "BTC",
-        "from": "btc",
-        "TO": currency.upper(),
-        "to": currency.lower(),
-    }
-
-    api_url_or_none = exchange_rate_providers[provider]["api_url"]
-    if api_url_or_none is not None:
-        api_url = str(api_url_or_none)
-        for key in replacements.keys():
-            api_url = api_url.replace("{" + key + "}", replacements[key])
-        async with httpx.AsyncClient() as client:
-            r = await client.get(api_url)
-            r.raise_for_status()
-            data = r.json()
-    else:
-        data = {}
-    getter = exchange_rate_providers[provider]["getter"]
-    print(getter)
-    if callable(getter):
-        rate = float(getter(data, replacements))
-    return rate

lnbits/extensions/bleskomat/fiat_currencies.json

@@ -1,166 +0,0 @@
-{
-    "AED": "United Arab Emirates Dirham",
-    "AFN": "Afghan Afghani",
-    "ALL": "Albanian Lek",
-    "AMD": "Armenian Dram",
-    "ANG": "Netherlands Antillean Gulden",
-    "AOA": "Angolan Kwanza",
-    "ARS": "Argentine Peso",
-    "AUD": "Australian Dollar",
-    "AWG": "Aruban Florin",
-    "AZN": "Azerbaijani Manat",
-    "BAM": "Bosnia and Herzegovina Convertible Mark",
-    "BBD": "Barbadian Dollar",
-    "BDT": "Bangladeshi Taka",
-    "BGN": "Bulgarian Lev",
-    "BHD": "Bahraini Dinar",
-    "BIF": "Burundian Franc",
-    "BMD": "Bermudian Dollar",
-    "BND": "Brunei Dollar",
-    "BOB": "Bolivian Boliviano",
-    "BRL": "Brazilian Real",
-    "BSD": "Bahamian Dollar",
-    "BTN": "Bhutanese Ngultrum",
-    "BWP": "Botswana Pula",
-    "BYN": "Belarusian Ruble",
-    "BYR": "Belarusian Ruble",
-    "BZD": "Belize Dollar",
-    "CAD": "Canadian Dollar",
-    "CDF": "Congolese Franc",
-    "CHF": "Swiss Franc",
-    "CLF": "Unidad de Fomento",
-    "CLP": "Chilean Peso",
-    "CNH": "Chinese Renminbi Yuan Offshore",
-    "CNY": "Chinese Renminbi Yuan",
-    "COP": "Colombian Peso",
-    "CRC": "Costa Rican Colón",
-    "CUC": "Cuban Convertible Peso",
-    "CVE": "Cape Verdean Escudo",
-    "CZK": "Czech Koruna",
-    "DJF": "Djiboutian Franc",
-    "DKK": "Danish Krone",
-    "DOP": "Dominican Peso",
-    "DZD": "Algerian Dinar",
-    "EGP": "Egyptian Pound",
-    "ERN": "Eritrean Nakfa",
-    "ETB": "Ethiopian Birr",
-    "EUR": "Euro",
-    "FJD": "Fijian Dollar",
-    "FKP": "Falkland Pound",
-    "GBP": "British Pound",
-    "GEL": "Georgian Lari",
-    "GGP": "Guernsey Pound",
-    "GHS": "Ghanaian Cedi",
-    "GIP": "Gibraltar Pound",
-    "GMD": "Gambian Dalasi",
-    "GNF": "Guinean Franc",
-    "GTQ": "Guatemalan Quetzal",
-    "GYD": "Guyanese Dollar",
-    "HKD": "Hong Kong Dollar",
-    "HNL": "Honduran Lempira",
-    "HRK": "Croatian Kuna",
-    "HTG": "Haitian Gourde",
-    "HUF": "Hungarian Forint",
-    "IDR": "Indonesian Rupiah",
-    "ILS": "Israeli New Sheqel",
-    "IMP": "Isle of Man Pound",
-    "INR": "Indian Rupee",
-    "IQD": "Iraqi Dinar",
-    "ISK": "Icelandic Króna",
-    "JEP": "Jersey Pound",
-    "JMD": "Jamaican Dollar",
-    "JOD": "Jordanian Dinar",
-    "JPY": "Japanese Yen",
-    "KES": "Kenyan Shilling",
-    "KGS": "Kyrgyzstani Som",
-    "KHR": "Cambodian Riel",
-    "KMF": "Comorian Franc",
-    "KRW": "South Korean Won",
-    "KWD": "Kuwaiti Dinar",
-    "KYD": "Cayman Islands Dollar",
-    "KZT": "Kazakhstani Tenge",
-    "LAK": "Lao Kip",
-    "LBP": "Lebanese Pound",
-    "LKR": "Sri Lankan Rupee",
-    "LRD": "Liberian Dollar",
-    "LSL": "Lesotho Loti",
-    "LYD": "Libyan Dinar",
-    "MAD": "Moroccan Dirham",
-    "MDL": "Moldovan Leu",
-    "MGA": "Malagasy Ariary",
-    "MKD": "Macedonian Denar",
-    "MMK": "Myanmar Kyat",
-    "MNT": "Mongolian Tögrög",
-    "MOP": "Macanese Pataca",
-    "MRO": "Mauritanian Ouguiya",
-    "MUR": "Mauritian Rupee",
-    "MVR": "Maldivian Rufiyaa",
-    "MWK": "Malawian Kwacha",
-    "MXN": "Mexican Peso",
-    "MYR": "Malaysian Ringgit",
-    "MZN": "Mozambican Metical",
-    "NAD": "Namibian Dollar",
-    "NGN": "Nigerian Naira",
-    "NIO": "Nicaraguan Córdoba",
-    "NOK": "Norwegian Krone",
-    "NPR": "Nepalese Rupee",
-    "NZD": "New Zealand Dollar",
-    "OMR": "Omani Rial",
-    "PAB": "Panamanian Balboa",
-    "PEN": "Peruvian Sol",
-    "PGK": "Papua New Guinean Kina",
-    "PHP": "Philippine Peso",
-    "PKR": "Pakistani Rupee",
-    "PLN": "Polish Złoty",
-    "PYG": "Paraguayan Guaraní",
-    "QAR": "Qatari Riyal",
-    "RON": "Romanian Leu",
-    "RSD": "Serbian Dinar",
-    "RUB": "Russian Ruble",
-    "RWF": "Rwandan Franc",
-    "SAR": "Saudi Riyal",
-    "SBD": "Solomon Islands Dollar",
-    "SCR": "Seychellois Rupee",
-    "SEK": "Swedish Krona",
-    "SGD": "Singapore Dollar",
-    "SHP": "Saint Helenian Pound",
-    "SLL": "Sierra Leonean Leone",
-    "SOS": "Somali Shilling",
-    "SRD": "Surinamese Dollar",
-    "SSP": "South Sudanese Pound",
-    "STD": "São Tomé and Príncipe Dobra",
-    "SVC": "Salvadoran Colón",
-    "SZL": "Swazi Lilangeni",
-    "THB": "Thai Baht",
-    "TJS": "Tajikistani Somoni",
-    "TMT": "Turkmenistani Manat",
-    "TND": "Tunisian Dinar",
-    "TOP": "Tongan Paʻanga",
-    "TRY": "Turkish Lira",
-    "TTD": "Trinidad and Tobago Dollar",
-    "TWD": "New Taiwan Dollar",
-    "TZS": "Tanzanian Shilling",
-    "UAH": "Ukrainian Hryvnia",
-    "UGX": "Ugandan Shilling",
-    "USD": "US Dollar",
-    "UYU": "Uruguayan Peso",
-    "UZS": "Uzbekistan Som",
-    "VEF": "Venezuelan Bolívar",
-    "VES": "Venezuelan Bolívar Soberano",
-    "VND": "Vietnamese Đồng",
-    "VUV": "Vanuatu Vatu",
-    "WST": "Samoan Tala",
-    "XAF": "Central African Cfa Franc",
-    "XAG": "Silver (Troy Ounce)",
-    "XAU": "Gold (Troy Ounce)",
-    "XCD": "East Caribbean Dollar",
-    "XDR": "Special Drawing Rights",
-    "XOF": "West African Cfa Franc",
-    "XPD": "Palladium",
-    "XPF": "Cfp Franc",
-    "XPT": "Platinum",
-    "YER": "Yemeni Rial",
-    "ZAR": "South African Rand",
-    "ZMW": "Zambian Kwacha",
-    "ZWL": "Zimbabwean Dollar"
-}

lnbits/extensions/bleskomat/helpers.py

@@ -1,153 +0,0 @@
-import base64
-import hashlib
-import hmac
-from http import HTTPStatus
-from typing import Dict
-from urllib import parse
-
-from fastapi import Request
-
-
-def generate_bleskomat_lnurl_hash(secret: str):
-    m = hashlib.sha256()
-    m.update(f"{secret}".encode())
-    return m.hexdigest()
-
-
-def generate_bleskomat_lnurl_signature(
-    payload: str, api_key_secret: str, api_key_encoding: str = "hex"
-):
-    if api_key_encoding == "hex":
-        key = bytes.fromhex(api_key_secret)
-    elif api_key_encoding == "base64":
-        key = base64.b64decode(api_key_secret)
-    else:
-        key = bytes.fromhex(api_key_secret)
-    return hmac.new(key=key, msg=payload.encode(), digestmod=hashlib.sha256).hexdigest()
-
-
-def generate_bleskomat_lnurl_secret(api_key_id: str, signature: str):
-    # The secret is not randomly generated by the server.
-    # Instead it is the hash of the API key ID and signature concatenated together.
-    m = hashlib.sha256()
-    m.update(f"{api_key_id}-{signature}".encode())
-    return m.hexdigest()
-
-
-def get_callback_url(req: Request):
-    return req.url_for("bleskomat.api_bleskomat_lnurl")
-
-
-def is_supported_lnurl_subprotocol(tag: str) -> bool:
-    return tag == "withdrawRequest"
-
-
-class LnurlHttpError(Exception):
-    def __init__(
-        self,
-        message: str = "",
-        http_status: HTTPStatus = HTTPStatus.INTERNAL_SERVER_ERROR,
-    ):
-        self.message = message
-        self.http_status = http_status
-        super().__init__(self.message)
-
-
-class LnurlValidationError(Exception):
-    pass
-
-
-def prepare_lnurl_params(tag: str, query: dict) -> dict:
-    params: dict = {}
-    if not is_supported_lnurl_subprotocol(tag):
-        raise LnurlValidationError(f'Unsupported subprotocol: "{tag}"')
-    if tag == "withdrawRequest":
-        params["minWithdrawable"] = float(query["minWithdrawable"])
-        params["maxWithdrawable"] = float(query["maxWithdrawable"])
-        params["defaultDescription"] = query["defaultDescription"]
-        if not params["minWithdrawable"] > 0:
-            raise LnurlValidationError('"minWithdrawable" must be greater than zero')
-        if not params["maxWithdrawable"] >= params["minWithdrawable"]:
-            raise LnurlValidationError(
-                '"maxWithdrawable" must be greater than or equal to "minWithdrawable"'
-            )
-    return params
-
-
-encode_uri_component_safe_chars = (
-    "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.!~*'()"
-)
-
-
-def query_to_signing_payload(query: Dict[str, str]) -> str:
-    # Sort the query by key, then stringify it to create the payload.
-    sorted_keys = sorted(query.keys(), key=str.lower)
-    payload = []
-    for key in sorted_keys:
-        if not key == "signature":
-            encoded_key = parse.quote(key, safe=encode_uri_component_safe_chars)
-            encoded_value = parse.quote(
-                query[key], safe=encode_uri_component_safe_chars
-            )
-            payload.append(f"{encoded_key}={encoded_value}")
-    return "&".join(payload)
-
-
-unshorten_rules: dict[str, dict] = {
-    "query": {"n": "nonce", "s": "signature", "t": "tag"},
-    "tags": {
-        "c": "channelRequest",
-        "l": "login",
-        "p": "payRequest",
-        "w": "withdrawRequest",
-    },
-    "params": {
-        "channelRequest": {"pl": "localAmt", "pp": "pushAmt"},
-        "login": {},
-        "payRequest": {"pn": "minSendable", "px": "maxSendable", "pm": "metadata"},
-        "withdrawRequest": {
-            "pn": "minWithdrawable",
-            "px": "maxWithdrawable",
-            "pd": "defaultDescription",
-        },
-    },
-}
-
-
-def unshorten_lnurl_query(query: dict) -> Dict[str, str]:
-    new_query = {}
-    rules = unshorten_rules
-    if "tag" in query:
-        tag = query["tag"]
-    elif "t" in query:
-        tag = query["t"]
-    else:
-        raise LnurlValidationError('Missing required query parameter: "tag"')
-    # Unshorten tag:
-    if tag in rules["tags"]:
-        long_tag = rules["tags"][tag]
-        new_query["tag"] = long_tag
-        tag = long_tag
-    if not tag in rules["params"]:
-        raise LnurlValidationError(f'Unknown tag: "{tag}"')
-    for key in query:
-        if key in rules["params"][str(tag)]:
-            short_param_key = key
-            long_param_key = rules["params"][str(tag)][short_param_key]
-            if short_param_key in query:
-                new_query[long_param_key] = query[short_param_key]
-            else:
-                new_query[long_param_key] = query[long_param_key]
-        elif key in rules["query"]:
-            # Unshorten general keys:
-            short_key = key
-            long_key = rules["query"][short_key]
-            if not long_key in new_query:
-                if short_key in query:
-                    new_query[long_key] = query[short_key]
-                else:
-                    new_query[long_key] = query[str(long_key)]
-        else:
-            # Keep unknown key/value pairs unchanged:
-            new_query[key] = query[key]
-    return new_query

lnbits/extensions/bleskomat/lnurl_api.py

@@ -1,132 +0,0 @@
-import json
-import math
-from http import HTTPStatus
-
-from loguru import logger
-from starlette.requests import Request
-
-from . import bleskomat_ext
-from .crud import (
-    create_bleskomat_lnurl,
-    get_bleskomat_by_api_key_id,
-    get_bleskomat_lnurl,
-)
-from .exchange_rates import fetch_fiat_exchange_rate
-from .helpers import (
-    LnurlHttpError,
-    LnurlValidationError,
-    generate_bleskomat_lnurl_secret,
-    generate_bleskomat_lnurl_signature,
-    prepare_lnurl_params,
-    query_to_signing_payload,
-    unshorten_lnurl_query,
-)
-
-
-# Handles signed URL from Bleskomat ATMs and "action" callback of auto-generated LNURLs.
-@bleskomat_ext.get("/u", name="bleskomat.api_bleskomat_lnurl")
-async def api_bleskomat_lnurl(req: Request):
-    try:
-        query = dict(req.query_params)
-
-        # Unshorten query if "s" is used instead of "signature".
-        if "s" in query:
-            query = unshorten_lnurl_query(query)
-
-        if "signature" in query:
-
-            # Signature provided.
-            # Use signature to verify that the URL was generated by an authorized device.
-            # Later validate parameters, auto-generate LNURL, reply with LNURL response object.
-            signature = query["signature"]
-
-            # The API key ID, nonce, and tag should be present in the query string.
-            for field in ["id", "nonce", "tag"]:
-                if not field in query:
-                    raise LnurlHttpError(
-                        f'Failed API key signature check: Missing "{field}"',
-                        HTTPStatus.BAD_REQUEST,
-                    )
-
-            # URL signing scheme is described here:
-            # https://github.com/chill117/lnurl-node#how-to-implement-url-signing-scheme
-            payload = query_to_signing_payload(query)
-            api_key_id = query["id"]
-            bleskomat = await get_bleskomat_by_api_key_id(api_key_id)
-            if not bleskomat:
-                raise LnurlHttpError("Unknown API key", HTTPStatus.BAD_REQUEST)
-            api_key_secret = bleskomat.api_key_secret
-            api_key_encoding = bleskomat.api_key_encoding
-            expected_signature = generate_bleskomat_lnurl_signature(
-                payload, api_key_secret, api_key_encoding
-            )
-            if signature != expected_signature:
-                raise LnurlHttpError("Invalid API key signature", HTTPStatus.FORBIDDEN)
-
-            # Signature is valid.
-            # In the case of signed URLs, the secret is deterministic based on the API key ID and signature.
-            secret = generate_bleskomat_lnurl_secret(api_key_id, signature)
-            lnurl = await get_bleskomat_lnurl(secret)
-            if not lnurl:
-                try:
-                    tag = query["tag"]
-                    params = prepare_lnurl_params(tag, query)
-                    if "f" in query:
-                        rate = await fetch_fiat_exchange_rate(
-                            currency=query["f"],
-                            provider=bleskomat.exchange_rate_provider,
-                        )
-                        # Convert fee (%) to decimal:
-                        fee = float(bleskomat.fee) / 100
-                        if tag == "withdrawRequest":
-                            for key in ["minWithdrawable", "maxWithdrawable"]:
-                                amount_sats = int(
-                                    math.floor((params[key] / rate) * 1e8)
-                                )
-                                fee_sats = int(math.floor(amount_sats * fee))
-                                amount_sats_less_fee = amount_sats - fee_sats
-                                # Convert to msats:
-                                params[key] = int(amount_sats_less_fee * 1e3)
-                except LnurlValidationError as e:
-                    raise LnurlHttpError(str(e), HTTPStatus.BAD_REQUEST)
-                # Create a new LNURL using the query parameters provided in the signed URL.
-                json_params = json.JSONEncoder().encode(params)
-                lnurl = await create_bleskomat_lnurl(
-                    bleskomat=bleskomat,
-                    secret=secret,
-                    tag=tag,
-                    params=json_params,
-                    uses=1,
-                )
-
-            # Reply with LNURL response object.
-            return lnurl.get_info_response_object(secret, req)
-
-        # No signature provided.
-        # Treat as "action" callback.
-
-        if not "k1" in query:
-            raise LnurlHttpError("Missing secret", HTTPStatus.BAD_REQUEST)
-
-        secret = query["k1"]
-        lnurl = await get_bleskomat_lnurl(secret)
-        if not lnurl:
-            raise LnurlHttpError("Invalid secret", HTTPStatus.BAD_REQUEST)
-
-        if not lnurl.has_uses_remaining():
-            raise LnurlHttpError(
-                "Maximum number of uses already reached", HTTPStatus.BAD_REQUEST
-            )
-
-        try:
-            await lnurl.execute_action(query)
-        except LnurlValidationError as e:
-            raise LnurlHttpError(str(e), HTTPStatus.BAD_REQUEST)
-
-    except LnurlHttpError as e:
-        return {"status": "ERROR", "reason": str(e)}
-    except Exception as e:
-        logger.error(str(e))
-        return {"status": "ERROR", "reason": "Unexpected error"}
-
-    return {"status": "OK"}

lnbits/extensions/bleskomat/migrations.py

@@ -1,37 +0,0 @@
-async def m001_initial(db):
-
-    await db.execute(
-        """
-        CREATE TABLE bleskomat.bleskomats (
-            id TEXT PRIMARY KEY,
-            wallet TEXT NOT NULL,
-            api_key_id TEXT NOT NULL,
-            api_key_secret TEXT NOT NULL,
-            api_key_encoding TEXT NOT NULL,
-            name TEXT NOT NULL,
-            fiat_currency TEXT NOT NULL,
-            exchange_rate_provider TEXT NOT NULL,
-            fee TEXT NOT NULL,
-            UNIQUE(api_key_id)
-        );
-    """
-    )
-
-    await db.execute(
-        """
-        CREATE TABLE bleskomat.bleskomat_lnurls (
-            id TEXT PRIMARY KEY,
-            bleskomat TEXT NOT NULL,
-            wallet TEXT NOT NULL,
-            hash TEXT NOT NULL,
-            tag TEXT NOT NULL,
-            params TEXT NOT NULL,
-            api_key_id TEXT NOT NULL,
-            initial_uses INTEGER DEFAULT 1,
-            remaining_uses INTEGER DEFAULT 0,
-            created_time INTEGER,
-            updated_time INTEGER,
-            UNIQUE(hash)
-        );
-    """
-    )

lnbits/extensions/bleskomat/models.py

@@ -1,142 +0,0 @@
-import json
-import time
-from typing import Dict
-
-from fastapi import Query, Request
-from loguru import logger
-from pydantic import BaseModel, validator
-
-from lnbits import bolt11
-from lnbits.core.services import PaymentFailure, pay_invoice
-
-from . import db
-from .exchange_rates import exchange_rate_providers, fiat_currencies
-from .helpers import LnurlValidationError, get_callback_url
-
-
-class CreateBleskomat(BaseModel):
-    name: str = Query(...)
-    fiat_currency: str = Query(...)
-    exchange_rate_provider: str = Query(...)
-    fee: str = Query(...)
-
-    @validator("fiat_currency")
-    def allowed_fiat_currencies(cls, v):
-        if v not in fiat_currencies.keys():
-            raise ValueError("Not allowed currency")
-        return v
-
-    @validator("exchange_rate_provider")
-    def allowed_providers(cls, v):
-        if v not in exchange_rate_providers.keys():
-            raise ValueError("Not allowed provider")
-        return v
-
-    @validator("fee")
-    def fee_type(cls, v):
-        if not isinstance(v, (str, float, int)):
-            raise ValueError("Fee type not allowed")
-        return v
-
-
-class Bleskomat(BaseModel):
-    id: str
-    wallet: str
-    api_key_id: str
-    api_key_secret: str
-    api_key_encoding: str
-    name: str
-    fiat_currency: str
-    exchange_rate_provider: str
-    fee: str
-
-
-class BleskomatLnurl(BaseModel):
-    id: str
-    bleskomat: str
-    wallet: str
-    hash: str
-    tag: str
-    params: str
-    api_key_id: str
-    initial_uses: int
-    remaining_uses: int
-    created_time: int
-    updated_time: int
-
-    def has_uses_remaining(self) -> bool:
-        # When initial uses is 0 then the LNURL has unlimited uses.
-        return self.initial_uses == 0 or self.remaining_uses > 0
-
-    def get_info_response_object(self, secret: str, req: Request) -> Dict[str, str]:
-        tag = self.tag
-        params = json.loads(self.params)
-        response = {"tag": tag}
-        if tag == "withdrawRequest":
-            for key in ["minWithdrawable", "maxWithdrawable", "defaultDescription"]:
-                response[key] = params[key]
-            response["callback"] = get_callback_url(req)
-            response["k1"] = secret
-        return response
-
-    def validate_action(self, query) -> None:
-        tag = self.tag
-        params = json.loads(self.params)
-        # Perform tag-specific checks.
-        if tag == "withdrawRequest":
-            for field in ["pr"]:
-                if not field in query:
-                    raise LnurlValidationError(f'Missing required parameter: "{field}"')
-            # Check the bolt11 invoice(s) provided.
-            pr = query["pr"]
-            if "," in pr:
-                raise LnurlValidationError("Multiple payment requests not supported")
-            try:
-                invoice = bolt11.decode(pr)
-            except ValueError:
-                raise LnurlValidationError(
-                    'Invalid parameter ("pr"): Lightning payment request expected'
-                )
-            if invoice.amount_msat < params["minWithdrawable"]:
-                raise LnurlValidationError(
-                    'Amount in invoice must be greater than or equal to "minWithdrawable"'
-                )
-            if invoice.amount_msat > params["maxWithdrawable"]:
-                raise LnurlValidationError(
-                    'Amount in invoice must be less than or equal to "maxWithdrawable"'
-                )
-        else:
-            raise LnurlValidationError(f'Unknown subprotocol: "{tag}"')
-
-    async def execute_action(self, query):
-        self.validate_action(query)
-        used = False
-        async with db.connect() as conn:
-            if self.initial_uses > 0:
-                used = await self.use(conn)
-                if not used:
-                    raise LnurlValidationError("Maximum number of uses already reached")
-            tag = self.tag
-            if tag == "withdrawRequest":
-                try:
-                    await pay_invoice(
-                        wallet_id=self.wallet, payment_request=query["pr"]
-                    )
-                except (ValueError, PermissionError, PaymentFailure) as e:
-                    raise LnurlValidationError("Failed to pay invoice: " + str(e))
-                except Exception as e:
-                    logger.error(str(e))
-                    raise LnurlValidationError("Unexpected error")
-
-    async def use(self, conn) -> bool:
-        now = int(time.time())
-        result = await conn.execute(
-            """
-            UPDATE bleskomat.bleskomat_lnurls
-            SET remaining_uses = remaining_uses - 1, updated_time = ?
-            WHERE id = ?
-                AND remaining_uses > 0
-            """,
-            (now, self.id),
-        )
-        return result.rowcount > 0

lnbits/extensions/bleskomat/static/js/index.js

@@ -1,216 +0,0 @@
-/* global Vue, VueQrcode, _, Quasar, LOCALE, windowMixin, LNbits */
-
-Vue.component(VueQrcode.name, VueQrcode)
-
-var mapBleskomat = function (obj) {
-  obj._data = _.clone(obj)
-  return obj
-}
-
-var defaultValues = {
-  name: 'My Bleskomat',
-  fiat_currency: 'EUR',
-  exchange_rate_provider: 'coinbase',
-  fee: '0.00'
-}
-
-new Vue({
-  el: '#vue',
-  mixins: [windowMixin],
-  data: function () {
-    return {
-      checker: null,
-      bleskomats: [],
-      bleskomatsTable: {
-        columns: [
-          {
-            name: 'api_key_id',
-            align: 'left',
-            label: 'API Key ID',
-            field: 'api_key_id'
-          },
-          {
-            name: 'name',
-            align: 'left',
-            label: 'Name',
-            field: 'name'
-          },
-          {
-            name: 'fiat_currency',
-            align: 'left',
-            label: 'Fiat Currency',
-            field: 'fiat_currency'
-          },
-          {
-            name: 'exchange_rate_provider',
-            align: 'left',
-            label: 'Exchange Rate Provider',
-            field: 'exchange_rate_provider'
-          },
-          {
-            name: 'fee',
-            align: 'left',
-            label: 'Fee (%)',
-            field: 'fee'
-          }
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      formDialog: {
-        show: false,
-        fiatCurrencies: _.keys(window.bleskomat_vars.fiat_currencies),
-        exchangeRateProviders: _.keys(
-          window.bleskomat_vars.exchange_rate_providers
-        ),
-        data: _.clone(defaultValues)
-      }
-    }
-  },
-  computed: {
-    sortedBleskomats: function () {
-      return this.bleskomats.sort(function (a, b) {
-        // Sort by API Key ID alphabetically.
-        var apiKeyId_A = a.api_key_id.toLowerCase()
-        var apiKeyId_B = b.api_key_id.toLowerCase()
-        return apiKeyId_A < apiKeyId_B ? -1 : apiKeyId_A > apiKeyId_B ? 1 : 0
-      })
-    }
-  },
-  methods: {
-    getBleskomats: function () {
-      var self = this
-      LNbits.api
-        .request(
-          'GET',
-          '/bleskomat/api/v1/bleskomats?all_wallets=true',
-          this.g.user.wallets[0].adminkey
-        )
-        .then(function (response) {
-          self.bleskomats = response.data.map(function (obj) {
-            return mapBleskomat(obj)
-          })
-        })
-        .catch(function (error) {
-          clearInterval(self.checker)
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    closeFormDialog: function () {
-      this.formDialog.data = _.clone(defaultValues)
-    },
-    exportConfigFile: function (bleskomatId) {
-      var bleskomat = _.findWhere(this.bleskomats, {id: bleskomatId})
-      var fieldToKey = {
-        api_key_id: 'apiKey.id',
-        api_key_secret: 'apiKey.key',
-        api_key_encoding: 'apiKey.encoding',
-        fiat_currency: 'fiatCurrency'
-      }
-      var lines = _.chain(bleskomat)
-        .map(function (value, field) {
-          var key = fieldToKey[field] || null
-          return key ? [key, value].join('=') : null
-        })
-        .compact()
-        .value()
-      lines.push('callbackUrl=' + window.bleskomat_vars.callback_url)
-      lines.push('shorten=true')
-      var content = lines.join('\n')
-      var status = Quasar.utils.exportFile(
-        'bleskomat.conf',
-        content,
-        'text/plain'
-      )
-      if (status !== true) {
-        Quasar.plugins.Notify.create({
-          message: 'Browser denied file download...',
-          color: 'negative',
-          icon: null
-        })
-      }
-    },
-    openUpdateDialog: function (bleskomatId) {
-      var bleskomat = _.findWhere(this.bleskomats, {id: bleskomatId})
-      this.formDialog.data = _.clone(bleskomat._data)
-      this.formDialog.show = true
-    },
-    sendFormData: function () {
-      var wallet = _.findWhere(this.g.user.wallets, {
-        id: this.formDialog.data.wallet
-      })
-      var data = _.omit(this.formDialog.data, 'wallet')
-      if (data.id) {
-        this.updateBleskomat(wallet, data)
-      } else {
-        this.createBleskomat(wallet, data)
-      }
-    },
-    updateBleskomat: function (wallet, data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/bleskomat/api/v1/bleskomat/' + data.id,
-          wallet.adminkey,
-          _.pick(data, 'name', 'fiat_currency', 'exchange_rate_provider', 'fee')
-        )
-        .then(function (response) {
-          self.bleskomats = _.reject(self.bleskomats, function (obj) {
-            return obj.id === data.id
-          })
-          self.bleskomats.push(mapBleskomat(response.data))
-          self.formDialog.show = false
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createBleskomat: function (wallet, data) {
-      var self = this
-      LNbits.api
-        .request('POST', '/bleskomat/api/v1/bleskomat', wallet.adminkey, data)
-        .then(function (response) {
-          self.bleskomats.push(mapBleskomat(response.data))
-          self.formDialog.show = false
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteBleskomat: function (bleskomatId) {
-      var self = this
-      var bleskomat = _.findWhere(this.bleskomats, {id: bleskomatId})
-      LNbits.utils
-        .confirmDialog(
-          'Are you sure you want to delete "' + bleskomat.name + '"?'
-        )
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/bleskomat/api/v1/bleskomat/' + bleskomatId,
-              _.findWhere(self.g.user.wallets, {id: bleskomat.wallet}).adminkey
-            )
-            .then(function (response) {
-              self.bleskomats = _.reject(self.bleskomats, function (obj) {
-                return obj.id === bleskomatId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    }
-  },
-  created: function () {
-    if (this.g.user.wallets.length) {
-      var getBleskomats = this.getBleskomats
-      getBleskomats()
-      this.checker = setInterval(function () {
-        getBleskomats()
-      }, 20000)
-    }
-  }
-})

lnbits/extensions/bleskomat/templates/bleskomat/_api_docs.html

@@ -1,68 +0,0 @@
-<q-expansion-item
-  group="extras"
-  icon="swap_vertical_circle"
-  label="Setup guide"
-  :content-inset-level="0.5"
->
-  <q-card>
-    <q-card-section>
-      <p>
-        This extension allows you to connect a Bleskomat ATM to an lnbits
-        wallet. It will work with both the
-        <a class="text-secondary" href="https://github.com/samotari/bleskomat"
-          >open-source DIY Bleskomat ATM project</a
-        >
-        as well as the
-        <a class="text-secondary" href="https://www.bleskomat.com/"
-          >commercial Bleskomat ATM</a
-        >.
-      </p>
-      <h5 class="text-subtitle1 q-my-none">Connect Your Bleskomat ATM</h5>
-      <div>
-        <ol>
-          <li>Click the "Add Bleskomat" button on this page to begin.</li>
-          <li>
-            Choose a wallet. This will be the wallet that is used to pay
-            satoshis to your ATM customers.
-          </li>
-          <li>
-            Choose the fiat currency. This should match the fiat currency that
-            your ATM accepts.
-          </li>
-          <li>
-            Pick an exchange rate provider. This is the API that will be used to
-            query the fiat to satoshi exchange rate at the time your customer
-            attempts to withdraw their funds.
-          </li>
-          <li>Set your ATM's fee percentage.</li>
-          <li>Click the "Done" button.</li>
-          <li>
-            Find the new Bleskomat in the list and then click the export icon to
-            download a new configuration file for your ATM.
-          </li>
-          <li>
-            Copy the configuration file ("bleskomat.conf") to your ATM's SD
-            card.
-          </li>
-          <li>
-            Restart Your Bleskomat ATM. It should automatically reload the
-            configurations from the SD card.
-          </li>
-        </ol>
-      </div>
-      <h5 class="text-subtitle1 q-my-none">How does it work?</h5>
-      <p>
-        Since the Bleskomat ATMs are designed to be offline, a cryptographic
-        signing scheme is used to verify that the URL was generated by an
-        authorized device. When one of your customers inserts fiat money into
-        the device, a signed URL (lnurl-withdraw) is created and displayed as a
-        QR code. Your customer scans the QR code with their lnurl-supporting
-        mobile app, their mobile app communicates with the web API of lnbits to
-        verify the signature, the fiat currency amount is converted to sats, the
-        customer accepts the withdrawal, and finally lnbits will pay the
-        customer from your lnbits wallet.
-      </p>
-    </q-card-section>
-  </q-card>
-  <q-btn flat label="Swagger API" type="a" href="../docs#/Bleskomat"></q-btn>
-</q-expansion-item>

lnbits/extensions/bleskomat/templates/bleskomat/index.html

@@ -1,180 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block scripts %} {{ window_vars(user) }}
-<script>
-  {% if bleskomat_vars %}
-  window.bleskomat_vars = {{ bleskomat_vars | tojson | safe }}
-  {% endif %}
-</script>
-<script src="/bleskomat/static/js/index.js"></script>
-{% endblock %} {% block page %}
-<div class="row q-col-gutter-md">
-  <div class="col-12 col-md-7 q-gutter-y-md">
-    <q-card>
-      <q-card-section>
-        <q-btn unelevated color="primary" @click="formDialog.show = true"
-          >Add Bleskomat</q-btn
-        >
-      </q-card-section>
-    </q-card>
-
-    <q-card>
-      <q-card-section>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Bleskomats</h5>
-          </div>
-        </div>
-        <q-table
-          dense
-          flat
-          :data="sortedBleskomats"
-          row-key="id"
-          :columns="bleskomatsTable.columns"
-          :pagination.sync="bleskomatsTable.pagination"
-        >
-          {% raw %}
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th auto-width></q-th>
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
-              </q-th>
-              <q-th auto-width></q-th>
-            </q-tr>
-          </template>
-          <template v-slot:body="props">
-            <q-tr :props="props">
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  icon="file_download"
-                  color="orange"
-                  @click="exportConfigFile(props.row.id)"
-                >
-                  <q-tooltip content-class="bg-accent"
-                    >Export Configuration</q-tooltip
-                  >
-                </q-btn>
-              </q-td>
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="openUpdateDialog(props.row.id)"
-                  icon="edit"
-                  color="light-blue"
-                >
-                  <q-tooltip content-class="bg-accent">Edit</q-tooltip>
-                </q-btn>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="deleteBleskomat(props.row.id)"
-                  icon="cancel"
-                  color="pink"
-                >
-                  <q-tooltip content-class="bg-accent">Delete</q-tooltip>
-                </q-btn>
-              </q-td>
-            </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
-  </div>
-
-  <div class="col-12 col-md-5 q-gutter-y-md">
-    <q-card>
-      <q-card-section>
-        <h6 class="text-subtitle1 q-my-none">
-          {{SITE_TITLE}} Bleskomat extension
-        </h6>
-      </q-card-section>
-      <q-card-section class="q-pa-none">
-        <q-separator></q-separator>
-        <q-list> {% include "bleskomat/_api_docs.html" %} </q-list>
-      </q-card-section>
-    </q-card>
-  </div>
-
-  <q-dialog v-model="formDialog.show" position="top" @hide="closeFormDialog">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form @submit="sendFormData" class="q-gutter-md">
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="formDialog.data.wallet"
-          :options="g.user.walletOptions"
-          label="Wallet *"
-        >
-        </q-select>
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialog.data.name"
-          type="text"
-          label="Name *"
-        ></q-input>
-        <q-select
-          filled
-          dense
-          v-model="formDialog.data.fiat_currency"
-          :options="formDialog.fiatCurrencies"
-          label="Fiat Currency *"
-        >
-        </q-select>
-        <q-select
-          filled
-          dense
-          v-model="formDialog.data.exchange_rate_provider"
-          :options="formDialog.exchangeRateProviders"
-          label="Exchange Rate Provider *"
-        >
-        </q-select>
-        <q-input
-          filled
-          dense
-          v-model.number="formDialog.data.fee"
-          type="string"
-          :default="0.00"
-          label="Fee (%) *"
-        ></q-input>
-        <div class="row q-mt-lg">
-          <q-btn
-            v-if="formDialog.data.id"
-            unelevated
-            color="primary"
-            type="submit"
-            >Update Bleskomat</q-btn
-          >
-          <q-btn
-            v-else
-            unelevated
-            color="primary"
-            :disable="
-                formDialog.data.wallet == null ||
-                formDialog.data.name == null ||
-                formDialog.data.fiat_currency == null ||
-                formDialog.data.exchange_rate_provider == null ||
-                formDialog.data.fee == null"
-            type="submit"
-            >Add Bleskomat</q-btn
-          >
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-            >Cancel</q-btn
-          >
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-</div>
-{% endblock %}

lnbits/extensions/bleskomat/views.py

@@ -1,25 +0,0 @@
-from fastapi import Depends, Request
-from fastapi.templating import Jinja2Templates
-from starlette.responses import HTMLResponse
-
-from lnbits.core.models import User
-from lnbits.decorators import check_user_exists
-
-from . import bleskomat_ext, bleskomat_renderer
-from .exchange_rates import exchange_rate_providers_serializable, fiat_currencies
-from .helpers import get_callback_url
-
-templates = Jinja2Templates(directory="templates")
-
-
-@bleskomat_ext.get("/", response_class=HTMLResponse)
-async def index(req: Request, user: User = Depends(check_user_exists)):
-    bleskomat_vars = {
-        "callback_url": get_callback_url(req),
-        "exchange_rate_providers": exchange_rate_providers_serializable,
-        "fiat_currencies": fiat_currencies,
-    }
-    return bleskomat_renderer().TemplateResponse(
-        "bleskomat/index.html",
-        {"request": req, "user": user.dict(), "bleskomat_vars": bleskomat_vars},
-    )

lnbits/extensions/bleskomat/views_api.py

@@ -1,100 +0,0 @@
-from http import HTTPStatus
-
-from fastapi import Depends, Query
-from loguru import logger
-from starlette.exceptions import HTTPException
-
-from lnbits.core.crud import get_user
-from lnbits.decorators import WalletTypeInfo, require_admin_key
-
-from . import bleskomat_ext
-from .crud import (
-    create_bleskomat,
-    delete_bleskomat,
-    get_bleskomat,
-    get_bleskomats,
-    update_bleskomat,
-)
-from .exchange_rates import fetch_fiat_exchange_rate
-from .models import CreateBleskomat
-
-
-@bleskomat_ext.get("/api/v1/bleskomats")
-async def api_bleskomats(
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-    all_wallets: bool = Query(False),
-):
-    wallet_ids = [wallet.wallet.id]
-
-    if all_wallets:
-        user = await get_user(wallet.wallet.user)
-        wallet_ids = user.wallet_ids if user else []
-
-    return [bleskomat.dict() for bleskomat in await get_bleskomats(wallet_ids)]
-
-
-@bleskomat_ext.get("/api/v1/bleskomat/{bleskomat_id}")
-async def api_bleskomat_retrieve(
-    bleskomat_id, wallet: WalletTypeInfo = Depends(require_admin_key)
-):
-    bleskomat = await get_bleskomat(bleskomat_id)
-
-    if not bleskomat or bleskomat.wallet != wallet.wallet.id:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND,
-            detail="Bleskomat configuration not found.",
-        )
-
-    return bleskomat.dict()
-
-
-@bleskomat_ext.post("/api/v1/bleskomat")
-@bleskomat_ext.put("/api/v1/bleskomat/{bleskomat_id}")
-async def api_bleskomat_create_or_update(
-    data: CreateBleskomat,
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-    bleskomat_id=None,
-):
-    fiat_currency = data.fiat_currency
-    exchange_rate_provider = data.exchange_rate_provider
-    try:
-        await fetch_fiat_exchange_rate(
-            currency=fiat_currency, provider=exchange_rate_provider
-        )
-    except Exception as e:
-        logger.error(e)
-        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail=f'Failed to fetch BTC/{fiat_currency} currency pair from "{exchange_rate_provider}"',
-        )
-
-    if bleskomat_id:
-        bleskomat = await get_bleskomat(bleskomat_id)
-        if not bleskomat or bleskomat.wallet != wallet.wallet.id:
-            raise HTTPException(
-                status_code=HTTPStatus.NOT_FOUND,
-                detail="Bleskomat configuration not found.",
-            )
-
-        bleskomat = await update_bleskomat(bleskomat_id, **data.dict())
-    else:
-        bleskomat = await create_bleskomat(wallet_id=wallet.wallet.id, data=data)
-
-    assert bleskomat
-    return bleskomat.dict()
-
-
-@bleskomat_ext.delete("/api/v1/bleskomat/{bleskomat_id}")
-async def api_bleskomat_delete(
-    bleskomat_id, wallet: WalletTypeInfo = Depends(require_admin_key)
-):
-    bleskomat = await get_bleskomat(bleskomat_id)
-
-    if not bleskomat or bleskomat.wallet != wallet.wallet.id:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND,
-            detail="Bleskomat configuration not found.",
-        )
-
-    await delete_bleskomat(bleskomat_id)
-    return "", HTTPStatus.NO_CONTENT

lnbits/extensions/boltcards/README.md

@@ -1,88 +0,0 @@
-# Bolt cards (NXP NTAG) Extension
-
-This extension allows you to link your Bolt Card (or other compatible NXP NTAG device) with a LNbits instance and use it in a more secure way than a static LNURLw. A technology called [Secure Unique NFC](https://mishka-scan.com/blog/secure-unique-nfc) is utilized in this workflow. 
-
-<a class="text-secondary" href="https://www.youtube.com/watch?v=wJ7QLFTRjK0">Tutorial</a>
-
-**Disclaimer:** ***Use this only if you either know what you are doing or are a reckless lightning pioneer. Only you are responsible for all your sats, cards and other devices. Always backup all your card keys!***
-
-
-***In order to use this extension you need to be able to setup your own card.*** That means writing a URL template pointing to your LNbits instance, configuring some SUN (SDM) settings and optionally changing the card's keys. There's a [guide](https://www.whitewolftech.com/articles/payment-card/) to set it up with a card reader connected to your computer. It can be done (without setting the keys) with [TagWriter app by NXP](https://play.google.com/store/apps/details?id=com.nxp.nfc.tagwriter) Android app. Last but not least, an OSS android app by name [Boltcard NFC Card Creator](https://github.com/boltcard/bolt-nfc-android-app) is being developed for these purposes. It's available from Google Play [here](https://play.google.com/store/apps/details?id=com.lightningnfcapp).
-
-## About the keys
-
-Up to five 16-byte keys can be stored on the card, numbered from 00 to 04. In the empty state they all should be set to zeros (00000000000000000000000000000000). For this extension only two keys need to be set, but for the security reasons all five keys should be changed from default (empty) state. The keys directly needed by this extension are: 
-
-- One for encrypting the card UID and the counter (p parameter), let's called it meta key, key #01 or K1.
-
-- One for calculating CMAC (c parameter), let's called it file key, key #02 or K2.
-
-The key #00, K0 (also know as auth key) is used as authentification key. It is not directly needed by this extension, but should be filled in order to write the keys in cooperation with Boltcard NFC Card Creator. In this case also K3 is set to same value as K1 and K4 as K2, so all keys are changed from default values. Keep that in your mind in case you ever need to reset the keys manually.
-
-***Always backup all keys that you're trying to write on the card. Without them you may not be able to change them in the future!***
-
-
-## Setting the card - Boltcard NFC Card Creator (easy way)
-Updated for v0.1.3
-
-- Add new card in the extension. 
-    - Set a max sats per transaction. Any transaction greater than this amount will be rejected.
-    - Set a max sats per day. After the card spends this amount of sats in a day, additional transactions will be rejected.
-    - Set a card name. This is just for your reference inside LNbits.
-    - Set the card UID. This is the unique identifier on your NFC card and is 7 bytes.
-        - If on an Android device with a newish version of Chrome, you can click the icon next to the input and tap your card to autofill this field.
-        - Otherwise read it with the Android app (Advanced -> Read NFC) and paste it to the field.
-    - Advanced Options
-        - Card Keys (k0, k1, k2) will be automatically generated if not explicitly set.
-            - Set to 16 bytes of 0s (00000000000000000000000000000000) to leave the keys in default (empty) state (this is unsecure).
-            - GENERATE KEY button fill the keys randomly.  
-    - Click CREATE CARD button
-- Click the QR code button next to a card to view its details. Backup the keys now! They'll be comfortable in your password manager.
-    - Now you can scan the QR code with the Android app (Create Bolt Card -> SCAN QR CODE). 
-    - Or you can Click the "KEYS / AUTH LINK" button to copy the auth URL to the clipboard. Then paste it into the Android app (Create Bolt Card -> PASTE AUTH URL).
-- Click WRITE CARD NOW and approach the NFC card to set it up. DO NOT REMOVE THE CARD PREMATURELY! 
-
-## Erasing the card - Boltcard NFC Card Creator
-Updated for v0.1.3
-
-Since v0.1.2 of Boltcard NFC Card Creator it is possible not only reset the keys but also disable the SUN function and do the complete erase so the card can be use again as a static tag (or set as a new Bolt Card, ofc).
-
-- Click the QR code button next to a card to view its details and select WIPE 
-- OR click the red cross icon on the right side to reach the same 
-- In the android app (Advanced -> Reset Keys)
-    - Click SCAN QR CODE to scan the QR
-    - Or click WIPE DATA in LNbits to copy and paste in to the app (PASTE KEY JSON)
-- Click RESET CARD NOW and approach the NFC card to erase it. DO NOT REMOVE THE CARD PREMATURELY! 
-- Now if there is all success the card can be safely delete from LNbits (but keep the keys backuped anyway; batter safe than brick).
-
-If you somehow find yourself in some non-standard state (for instance only k3 and k4 remains filled after previous unsuccessful reset), then you need edit the key fields manually (for instance leave k0-k2 to zeroes and provide the right k3 and k4).  
-
-## Setting the card - computer (hard way)
-
-Follow the guide. 
-
-The URI should be `lnurlw://YOUR-DOMAIN.COM/boltcards/api/v1/scan/{YOUR_card_external_id}?p=00000000000000000000000000000000&c=0000000000000000`
-
-Then fill up the card parameters in the extension. Card Auth key (K0) can be filled in the extension just for the record. Initical counter can be 0.
-
-## Setting the card - android NXP app (hard way)
-- If you don't know the card ID, use NXP TagInfo app to find it out.
-- In the TagWriter app tap Write tags
-- New Data Set > Link
-- Set URI type to Custom URL
-- URL should look like lnurlw://YOUR_LNBITS_DOMAIN/boltcards/api/v1/scan/{YOUR_card_external_id}?p=00000000000000000000000000000000&c=0000000000000000
-- click Configure mirroring options
-- Select Card Type NTAG 424 DNA
-- Check Enable SDM Mirroring
-- Select SDM Meta Read Access Right to 01
-- Check Enable UID Mirroring
-- Check Enable Counter Mirroring
-- Set SDM Counter Retrieval Key to 0E
-- Set PICC Data Offset to immediately after e=
-- Set Derivation Key for CMAC Calculation to 00
-- Set SDM MAC Input Offset to immediately after c=
-- Set SDM MAC Offset to immediately after c=
-- Save & Write
-- Scan with compatible Wallet
-
-This app afaik cannot change the keys. If you cannot change them any other way, leave them empty in the extension dialog and remember you're not secured. Card Auth key (K0) can be omitted anyway. Initical counter can be 0.

lnbits/extensions/boltcards/__init__.py

@@ -1,37 +0,0 @@
-import asyncio
-
-from fastapi import APIRouter
-from starlette.staticfiles import StaticFiles
-
-from lnbits.db import Database
-from lnbits.helpers import template_renderer
-from lnbits.tasks import catch_everything_and_restart
-
-db = Database("ext_boltcards")
-
-boltcards_static_files = [
-    {
-        "path": "/boltcards/static",
-        "app": StaticFiles(packages=[("lnbits", "extensions/boltcards/static")]),
-        "name": "boltcards_static",
-    }
-]
-
-boltcards_ext: APIRouter = APIRouter(prefix="/boltcards", tags=["boltcards"])
-
-
-def boltcards_renderer():
-    return template_renderer(["lnbits/extensions/boltcards/templates"])
-
-
-from .lnurl import *  # noqa
-from .tasks import *  # noqa
-
-
-def boltcards_start():
-    loop = asyncio.get_event_loop()
-    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
-
-
-from .views import *  # noqa
-from .views_api import *  # noqa

lnbits/extensions/boltcards/config.json

@@ -1,6 +0,0 @@
-{
-  "name": "Bolt Cards",
-  "short_description": "Self custody Bolt Cards with one time LNURLw",
-  "tile": "/boltcards/static/image/boltcard.png",
-  "contributors": ["iwarpbtc", "arcbtc", "leesalminen"]
-}

lnbits/extensions/boltcards/crud.py

@@ -1,278 +0,0 @@
-import secrets
-from datetime import datetime
-from typing import List, Optional
-
-from lnbits.helpers import urlsafe_short_hash
-
-from . import db
-from .models import Card, CreateCardData, Hit, Refund
-
-
-async def create_card(data: CreateCardData, wallet_id: str) -> Card:
-    card_id = urlsafe_short_hash().upper()
-    extenal_id = urlsafe_short_hash().lower()
-
-    await db.execute(
-        """
-        INSERT INTO boltcards.cards (
-            id,
-            uid,
-            external_id,
-            wallet,
-            card_name,
-            counter,
-            tx_limit,
-            daily_limit,
-            enable,
-            k0,
-            k1,
-            k2,
-            otp
-        )
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        """,
-        (
-            card_id,
-            data.uid.upper(),
-            extenal_id,
-            wallet_id,
-            data.card_name,
-            data.counter,
-            data.tx_limit,
-            data.daily_limit,
-            True,
-            data.k0,
-            data.k1,
-            data.k2,
-            secrets.token_hex(16),
-        ),
-    )
-    card = await get_card(card_id)
-    assert card, "Newly created card couldn't be retrieved"
-    return card
-
-
-async def update_card(card_id: str, **kwargs) -> Optional[Card]:
-    if "is_unique" in kwargs:
-        kwargs["is_unique"] = int(kwargs["is_unique"])
-    if "uid" in kwargs:
-        kwargs["uid"] = kwargs["uid"].upper()
-    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-    await db.execute(
-        f"UPDATE boltcards.cards SET {q} WHERE id = ?",
-        (*kwargs.values(), card_id),
-    )
-    row = await db.fetchone("SELECT * FROM boltcards.cards WHERE id = ?", (card_id,))
-    return Card(**row) if row else None
-
-
-async def get_cards(wallet_ids: List[str]) -> List[Card]:
-    if len(wallet_ids) == 0:
-        return []
-
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM boltcards.cards WHERE wallet IN ({q})", (*wallet_ids,)
-    )
-
-    return [Card(**row) for row in rows]
-
-
-async def get_card(card_id: str) -> Optional[Card]:
-    row = await db.fetchone("SELECT * FROM boltcards.cards WHERE id = ?", (card_id,))
-    if not row:
-        return None
-
-    card = dict(**row)
-
-    return Card.parse_obj(card)
-
-
-async def get_card_by_uid(card_uid: str) -> Optional[Card]:
-    row = await db.fetchone(
-        "SELECT * FROM boltcards.cards WHERE uid = ?", (card_uid.upper(),)
-    )
-    if not row:
-        return None
-
-    card = dict(**row)
-
-    return Card.parse_obj(card)
-
-
-async def get_card_by_external_id(external_id: str) -> Optional[Card]:
-    row = await db.fetchone(
-        "SELECT * FROM boltcards.cards WHERE external_id = ?", (external_id.lower(),)
-    )
-    if not row:
-        return None
-
-    card = dict(**row)
-
-    return Card.parse_obj(card)
-
-
-async def get_card_by_otp(otp: str) -> Optional[Card]:
-    row = await db.fetchone("SELECT * FROM boltcards.cards WHERE otp = ?", (otp,))
-    if not row:
-        return None
-
-    card = dict(**row)
-
-    return Card.parse_obj(card)
-
-
-async def delete_card(card_id: str) -> None:
-    # Delete cards
-    await db.execute("DELETE FROM boltcards.cards WHERE id = ?", (card_id,))
-    # Delete hits
-    hits = await get_hits([card_id])
-    for hit in hits:
-        await db.execute("DELETE FROM boltcards.hits WHERE id = ?", (hit.id,))
-        # Delete refunds
-        refunds = await get_refunds([hit.id])
-        for refund in refunds:
-            await db.execute(
-                "DELETE FROM boltcards.refunds WHERE id = ?", (refund.hit_id,)
-            )
-
-
-async def update_card_counter(counter: int, id: str):
-    await db.execute(
-        "UPDATE boltcards.cards SET counter = ? WHERE id = ?",
-        (counter, id),
-    )
-
-
-async def enable_disable_card(enable: bool, id: str) -> Optional[Card]:
-    await db.execute(
-        "UPDATE boltcards.cards SET enable = ? WHERE id = ?",
-        (enable, id),
-    )
-    return await get_card(id)
-
-
-async def update_card_otp(otp: str, id: str):
-    await db.execute(
-        "UPDATE boltcards.cards SET otp = ? WHERE id = ?",
-        (otp, id),
-    )
-
-
-async def get_hit(hit_id: str) -> Optional[Hit]:
-    row = await db.fetchone(f"SELECT * FROM boltcards.hits WHERE id = ?", (hit_id,))
-    if not row:
-        return None
-
-    hit = dict(**row)
-
-    return Hit.parse_obj(hit)
-
-
-async def get_hits(cards_ids: List[str]) -> List[Hit]:
-    if len(cards_ids) == 0:
-        return []
-
-    q = ",".join(["?"] * len(cards_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM boltcards.hits WHERE card_id IN ({q})", (*cards_ids,)
-    )
-
-    return [Hit(**row) for row in rows]
-
-
-async def get_hits_today(card_id: str) -> List[Hit]:
-    rows = await db.fetchall(
-        f"SELECT * FROM boltcards.hits WHERE card_id = ?",
-        (card_id,),
-    )
-    updatedrow = []
-    for row in rows:
-        if datetime.now().date() == datetime.fromtimestamp(row.time).date():
-            updatedrow.append(row)
-
-    return [Hit(**row) for row in updatedrow]
-
-
-async def spend_hit(id: str, amount: int):
-    await db.execute(
-        "UPDATE boltcards.hits SET spent = ?, amount = ? WHERE id = ?",
-        (True, amount, id),
-    )
-    return await get_hit(id)
-
-
-async def create_hit(card_id, ip, useragent, old_ctr, new_ctr) -> Hit:
-    hit_id = urlsafe_short_hash()
-    await db.execute(
-        """
-        INSERT INTO boltcards.hits (
-            id,
-            card_id,
-            ip,
-            spent,
-            useragent,
-            old_ctr,
-            new_ctr,
-            amount
-        )
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-        """,
-        (
-            hit_id,
-            card_id,
-            ip,
-            False,
-            useragent,
-            old_ctr,
-            new_ctr,
-            0,
-        ),
-    )
-    hit = await get_hit(hit_id)
-    assert hit, "Newly recorded hit couldn't be retrieved"
-    return hit
-
-
-async def create_refund(hit_id, refund_amount) -> Refund:
-    refund_id = urlsafe_short_hash()
-    await db.execute(
-        """
-        INSERT INTO boltcards.refunds (
-            id,
-            hit_id,
-            refund_amount
-        )
-        VALUES (?, ?, ?)
-        """,
-        (
-            refund_id,
-            hit_id,
-            refund_amount,
-        ),
-    )
-    refund = await get_refund(refund_id)
-    assert refund, "Newly recorded hit couldn't be retrieved"
-    return refund
-
-
-async def get_refund(refund_id: str) -> Optional[Refund]:
-    row = await db.fetchone(
-        f"SELECT * FROM boltcards.refunds WHERE id = ?", (refund_id,)
-    )
-    if not row:
-        return None
-    refund = dict(**row)
-    return Refund.parse_obj(refund)
-
-
-async def get_refunds(hits_ids: List[str]) -> List[Refund]:
-    if len(hits_ids) == 0:
-        return []
-
-    q = ",".join(["?"] * len(hits_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM boltcards.refunds WHERE hit_id IN ({q})", (*hits_ids,)
-    )
-
-    return [Refund(**row) for row in rows]

lnbits/extensions/boltcards/lnurl.py

@@ -1,221 +0,0 @@
-import json
-import secrets
-from http import HTTPStatus
-from urllib.parse import urlparse
-
-from fastapi import HTTPException, Query, Request
-from lnurl import encode as lnurl_encode
-from lnurl.types import LnurlPayMetadata
-from starlette.responses import HTMLResponse
-
-from lnbits import bolt11
-from lnbits.core.services import create_invoice
-from lnbits.core.views.api import pay_invoice
-
-from . import boltcards_ext
-from .crud import (
-    create_hit,
-    get_card,
-    get_card_by_external_id,
-    get_card_by_otp,
-    get_hit,
-    get_hits_today,
-    spend_hit,
-    update_card_counter,
-    update_card_otp,
-)
-from .nxp424 import decryptSUN, getSunMAC
-
-###############LNURLWITHDRAW#################
-
-# /boltcards/api/v1/scan?p=00000000000000000000000000000000&c=0000000000000000
-@boltcards_ext.get("/api/v1/scan/{external_id}")
-async def api_scan(p, c, request: Request, external_id: str = Query(None)):
-    # some wallets send everything as lower case, no bueno
-    p = p.upper()
-    c = c.upper()
-    card = None
-    counter = b""
-    card = await get_card_by_external_id(external_id)
-    if not card:
-        return {"status": "ERROR", "reason": "No card."}
-    if not card.enable:
-        return {"status": "ERROR", "reason": "Card is disabled."}
-    try:
-        card_uid, counter = decryptSUN(bytes.fromhex(p), bytes.fromhex(card.k1))
-        if card.uid.upper() != card_uid.hex().upper():
-            return {"status": "ERROR", "reason": "Card UID mis-match."}
-        if c != getSunMAC(card_uid, counter, bytes.fromhex(card.k2)).hex().upper():
-            return {"status": "ERROR", "reason": "CMAC does not check."}
-    except:
-        return {"status": "ERROR", "reason": "Error decrypting card."}
-
-    ctr_int = int.from_bytes(counter, "little")
-
-    if ctr_int <= card.counter:
-        return {"status": "ERROR", "reason": "This link is already used."}
-
-    await update_card_counter(ctr_int, card.id)
-
-    # gathering some info for hit record
-    assert request.client
-    ip = request.client.host
-    if "x-real-ip" in request.headers:
-        ip = request.headers["x-real-ip"]
-    elif "x-forwarded-for" in request.headers:
-        ip = request.headers["x-forwarded-for"]
-
-    agent = request.headers["user-agent"] if "user-agent" in request.headers else ""
-    todays_hits = await get_hits_today(card.id)
-
-    hits_amount = 0
-    for hit in todays_hits:
-        hits_amount = hits_amount + hit.amount
-    if hits_amount > card.daily_limit:
-        return {"status": "ERROR", "reason": "Max daily limit spent."}
-    hit = await create_hit(card.id, ip, agent, card.counter, ctr_int)
-    lnurlpay = lnurl_encode(request.url_for("boltcards.lnurlp_response", hit_id=hit.id))
-    return {
-        "tag": "withdrawRequest",
-        "callback": request.url_for("boltcards.lnurl_callback", hitid=hit.id),
-        "k1": hit.id,
-        "minWithdrawable": 1 * 1000,
-        "maxWithdrawable": card.tx_limit * 1000,
-        "defaultDescription": f"Boltcard (refund address lnurl://{lnurlpay})",
-    }
-
-
-@boltcards_ext.get(
-    "/api/v1/lnurl/cb/{hitid}",
-    status_code=HTTPStatus.OK,
-    name="boltcards.lnurl_callback",
-)
-async def lnurl_callback(
-    pr: str = Query(None),
-    k1: str = Query(None),
-):
-    if not k1:
-        return {"status": "ERROR", "reason": "Missing K1 token"}
-
-    hit = await get_hit(k1)
-
-    if not hit:
-        return {
-            "status": "ERROR",
-            "reason": "Record not found for this charge (bad k1)",
-        }
-    if hit.spent:
-        return {"status": "ERROR", "reason": "Payment already claimed"}
-    if not pr:
-        return {"status": "ERROR", "reason": "Missing payment request"}
-
-    try:
-        invoice = bolt11.decode(pr)
-    except:
-        return {"status": "ERROR", "reason": "Failed to decode payment request"}
-
-    card = await get_card(hit.card_id)
-    assert card
-    hit = await spend_hit(id=hit.id, amount=int(invoice.amount_msat / 1000))
-    assert hit
-    try:
-        await pay_invoice(
-            wallet_id=card.wallet,
-            payment_request=pr,
-            max_sat=card.tx_limit,
-            extra={"tag": "boltcard", "tag": hit.id},
-        )
-        return {"status": "OK"}
-    except Exception as exc:
-        return {"status": "ERROR", "reason": f"Payment failed - {exc}"}
-
-
-# /boltcards/api/v1/auth?a=00000000000000000000000000000000
-@boltcards_ext.get("/api/v1/auth")
-async def api_auth(a, request: Request):
-    if a == "00000000000000000000000000000000":
-        response = {"k0": "0" * 32, "k1": "1" * 32, "k2": "2" * 32}
-        return response
-
-    card = await get_card_by_otp(a)
-    if not card:
-        raise HTTPException(
-            detail="Card does not exist.", status_code=HTTPStatus.NOT_FOUND
-        )
-
-    new_otp = secrets.token_hex(16)
-    await update_card_otp(new_otp, card.id)
-
-    lnurlw_base = (
-        f"{urlparse(str(request.url)).netloc}/boltcards/api/v1/scan/{card.external_id}"
-    )
-
-    response = {
-        "card_name": card.card_name,
-        "id": str(1),
-        "k0": card.k0,
-        "k1": card.k1,
-        "k2": card.k2,
-        "k3": card.k1,
-        "k4": card.k2,
-        "lnurlw_base": "lnurlw://" + lnurlw_base,
-        "protocol_name": "new_bolt_card_response",
-        "protocol_version": str(1),
-    }
-
-    return response
-
-
-###############LNURLPAY REFUNDS#################
-
-
-@boltcards_ext.get(
-    "/api/v1/lnurlp/{hit_id}",
-    response_class=HTMLResponse,
-    name="boltcards.lnurlp_response",
-)
-async def lnurlp_response(req: Request, hit_id: str = Query(None)):
-    hit = await get_hit(hit_id)
-    assert hit
-    card = await get_card(hit.card_id)
-    assert card
-    if not hit:
-        return {"status": "ERROR", "reason": f"LNURL-pay record not found."}
-    if not card.enable:
-        return {"status": "ERROR", "reason": "Card is disabled."}
-    payResponse = {
-        "tag": "payRequest",
-        "callback": req.url_for("boltcards.lnurlp_callback", hit_id=hit_id),
-        "metadata": LnurlPayMetadata(json.dumps([["text/plain", "Refund"]])),
-        "minSendable": 1 * 1000,
-        "maxSendable": card.tx_limit * 1000,
-    }
-    return json.dumps(payResponse)
-
-
-@boltcards_ext.get(
-    "/api/v1/lnurlp/cb/{hit_id}",
-    response_class=HTMLResponse,
-    name="boltcards.lnurlp_callback",
-)
-async def lnurlp_callback(hit_id: str = Query(None), amount: str = Query(None)):
-    hit = await get_hit(hit_id)
-    assert hit
-    card = await get_card(hit.card_id)
-    assert card
-    if not hit:
-        return {"status": "ERROR", "reason": f"LNURL-pay record not found."}
-
-    _, payment_request = await create_invoice(
-        wallet_id=card.wallet,
-        amount=int(int(amount) / 1000),
-        memo=f"Refund {hit_id}",
-        unhashed_description=LnurlPayMetadata(
-            json.dumps([["text/plain", "Refund"]])
-        ).encode(),
-        extra={"refund": hit_id},
-    )
-
-    payResponse = {"pr": payment_request, "routes": []}
-
-    return json.dumps(payResponse)

lnbits/extensions/boltcards/migrations.py

@@ -1,60 +0,0 @@
-from lnbits.helpers import urlsafe_short_hash
-
-
-async def m001_initial(db):
-    await db.execute(
-        """
-        CREATE TABLE boltcards.cards (
-            id TEXT PRIMARY KEY UNIQUE,
-            wallet TEXT NOT NULL,
-            card_name TEXT NOT NULL,
-            uid TEXT NOT NULL UNIQUE,
-            external_id TEXT NOT NULL UNIQUE,
-            counter INT NOT NULL DEFAULT 0,
-            tx_limit TEXT NOT NULL,
-            daily_limit TEXT NOT NULL,
-            enable BOOL NOT NULL,
-            k0 TEXT NOT NULL DEFAULT '00000000000000000000000000000000',
-            k1 TEXT NOT NULL DEFAULT '00000000000000000000000000000000',
-            k2 TEXT NOT NULL DEFAULT '00000000000000000000000000000000',
-            prev_k0 TEXT NOT NULL DEFAULT '00000000000000000000000000000000',
-            prev_k1 TEXT NOT NULL DEFAULT '00000000000000000000000000000000',
-            prev_k2 TEXT NOT NULL DEFAULT '00000000000000000000000000000000',
-            otp TEXT NOT NULL DEFAULT '',
-            time TIMESTAMP NOT NULL DEFAULT """
-        + db.timestamp_now
-        + """
-        );
-    """
-    )
-
-    await db.execute(
-        f"""
-        CREATE TABLE boltcards.hits (
-            id TEXT PRIMARY KEY UNIQUE,
-            card_id TEXT NOT NULL,
-            ip TEXT NOT NULL,
-            spent BOOL NOT NULL DEFAULT True,
-            useragent TEXT,
-            old_ctr INT NOT NULL DEFAULT 0,
-            new_ctr INT NOT NULL DEFAULT 0,
-            amount {db.big_int} NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT """
-        + db.timestamp_now
-        + """
-        );
-    """
-    )
-
-    await db.execute(
-        f"""
-        CREATE TABLE boltcards.refunds (
-            id TEXT PRIMARY KEY UNIQUE,
-            hit_id TEXT NOT NULL,
-            refund_amount {db.big_int} NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT """
-        + db.timestamp_now
-        + """
-        );
-    """
-    )

lnbits/extensions/boltcards/models.py

@@ -1,83 +0,0 @@
-import json
-from sqlite3 import Row
-
-from fastapi import Query, Request
-from lnurl import Lnurl
-from lnurl import encode as lnurl_encode
-from lnurl.types import LnurlPayMetadata
-from pydantic import BaseModel
-
-ZERO_KEY = "00000000000000000000000000000000"
-
-
-class Card(BaseModel):
-    id: str
-    wallet: str
-    card_name: str
-    uid: str
-    external_id: str
-    counter: int
-    tx_limit: int
-    daily_limit: int
-    enable: bool
-    k0: str
-    k1: str
-    k2: str
-    prev_k0: str
-    prev_k1: str
-    prev_k2: str
-    otp: str
-    time: int
-
-    @classmethod
-    def from_row(cls, row: Row) -> "Card":
-        return cls(**dict(row))
-
-    def lnurl(self, req: Request) -> Lnurl:
-        url = req.url_for("boltcard.lnurl_response", device_id=self.id, _external=True)
-        return lnurl_encode(url)
-
-    async def lnurlpay_metadata(self) -> LnurlPayMetadata:
-        return LnurlPayMetadata(json.dumps([["text/plain", self.card_name]]))
-
-
-class CreateCardData(BaseModel):
-    card_name: str = Query(...)
-    uid: str = Query(...)
-    counter: int = Query(0)
-    tx_limit: int = Query(0)
-    daily_limit: int = Query(0)
-    enable: bool = Query(True)
-    k0: str = Query(ZERO_KEY)
-    k1: str = Query(ZERO_KEY)
-    k2: str = Query(ZERO_KEY)
-    prev_k0: str = Query(ZERO_KEY)
-    prev_k1: str = Query(ZERO_KEY)
-    prev_k2: str = Query(ZERO_KEY)
-
-
-class Hit(BaseModel):
-    id: str
-    card_id: str
-    ip: str
-    spent: bool
-    useragent: str
-    old_ctr: int
-    new_ctr: int
-    amount: int
-    time: int
-
-    @classmethod
-    def from_row(cls, row: Row) -> "Hit":
-        return cls(**dict(row))
-
-
-class Refund(BaseModel):
-    id: str
-    hit_id: str
-    refund_amount: int
-    time: int
-
-    @classmethod
-    def from_row(cls, row: Row) -> "Refund":
-        return cls(**dict(row))

lnbits/extensions/boltcards/nxp424.py

@@ -1,36 +0,0 @@
-# https://www.nxp.com/docs/en/application-note/AN12196.pdf
-from typing import Tuple
-
-from Cryptodome.Cipher import AES
-from Cryptodome.Hash import CMAC
-
-SV2 = "3CC300010080"
-
-
-def myCMAC(key: bytes, msg: bytes = b"") -> bytes:
-    cobj = CMAC.new(key, ciphermod=AES)
-    if msg != b"":
-        cobj.update(msg)
-    return cobj.digest()
-
-
-def decryptSUN(sun: bytes, key: bytes) -> Tuple[bytes, bytes]:
-    IVbytes = b"\x00" * 16
-
-    cipher = AES.new(key, AES.MODE_CBC, IVbytes)
-    sun_plain = cipher.decrypt(sun)
-
-    UID = sun_plain[1:8]
-    counter = sun_plain[8:11]
-
-    return UID, counter
-
-
-def getSunMAC(UID: bytes, counter: bytes, key: bytes) -> bytes:
-    sv2prefix = bytes.fromhex(SV2)
-    sv2bytes = sv2prefix + UID + counter
-
-    mac1 = myCMAC(key, sv2bytes)
-    mac2 = myCMAC(mac1)
-
-    return mac2[1::2]

lnbits/extensions/boltcards/static/js/index.js

@@ -1,456 +0,0 @@
-Vue.component(VueQrcode.name, VueQrcode)
-
-const mapCards = obj => {
-  obj.date = Quasar.utils.date.formatDate(
-    new Date(obj.time * 1000),
-    'YYYY-MM-DD HH:mm'
-  )
-
-  return obj
-}
-
-new Vue({
-  el: '#vue',
-  mixins: [windowMixin],
-  data: function () {
-    return {
-      toggleAdvanced: false,
-      nfcTagReading: false,
-      lnurlLink: `${window.location.host}/boltcards/api/v1/scan/`,
-      cards: [],
-      hits: [],
-      refunds: [],
-      cardDialog: {
-        show: false,
-        data: {
-          counter: 1,
-          k0: '',
-          k1: '',
-          k2: '',
-          uid: '',
-          card_name: ''
-        },
-        temp: {}
-      },
-      cardsTable: {
-        columns: [
-          {
-            name: 'card_name',
-            align: 'left',
-            label: 'Card name',
-            field: 'card_name'
-          },
-          {
-            name: 'counter',
-            align: 'left',
-            label: 'Counter',
-            field: 'counter'
-          },
-          {
-            name: 'wallet',
-            align: 'left',
-            label: 'Wallet',
-            field: 'wallet'
-          },
-          {
-            name: 'tx_limit',
-            align: 'left',
-            label: 'Max tx',
-            field: 'tx_limit'
-          },
-          {
-            name: 'daily_limit',
-            align: 'left',
-            label: 'Daily tx limit',
-            field: 'daily_limit'
-          }
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      refundsTable: {
-        columns: [
-          {
-            name: 'hit_id',
-            align: 'left',
-            label: 'Hit ID',
-            field: 'hit_id'
-          },
-          {
-            name: 'refund_amount',
-            align: 'left',
-            label: 'Refund Amount',
-            field: 'refund_amount'
-          },
-          {
-            name: 'date',
-            align: 'left',
-            label: 'Time',
-            field: 'date'
-          }
-        ],
-        pagination: {
-          rowsPerPage: 10,
-          sortBy: 'date',
-          descending: true
-        }
-      },
-      hitsTable: {
-        columns: [
-          {
-            name: 'card_name',
-            align: 'left',
-            label: 'Card name',
-            field: 'card_name'
-          },
-          {
-            name: 'amount',
-            align: 'left',
-            label: 'Amount',
-            field: 'amount'
-          },
-          {
-            name: 'old_ctr',
-            align: 'left',
-            label: 'Old counter',
-            field: 'old_ctr'
-          },
-          {
-            name: 'new_ctr',
-            align: 'left',
-            label: 'New counter',
-            field: 'new_ctr'
-          },
-          {
-            name: 'date',
-            align: 'left',
-            label: 'Time',
-            field: 'date'
-          },
-          {
-            name: 'ip',
-            align: 'left',
-            label: 'IP',
-            field: 'ip'
-          },
-          {
-            name: 'useragent',
-            align: 'left',
-            label: 'User agent',
-            field: 'useragent'
-          }
-        ],
-        pagination: {
-          rowsPerPage: 10,
-          sortBy: 'date',
-          descending: true
-        }
-      },
-      qrCodeDialog: {
-        show: false,
-        wipe: false,
-        data: null
-      }
-    }
-  },
-  methods: {
-    readNfcTag: function () {
-      try {
-        const self = this
-
-        if (typeof NDEFReader == 'undefined') {
-          throw {
-            toString: function () {
-              return 'NFC not supported on this device or browser.'
-            }
-          }
-        }
-
-        const ndef = new NDEFReader()
-
-        const readerAbortController = new AbortController()
-        readerAbortController.signal.onabort = event => {
-          console.log('All NFC Read operations have been aborted.')
-        }
-
-        this.nfcTagReading = true
-        this.$q.notify({
-          message: 'Tap your NFC tag to copy its UID here.'
-        })
-
-        return ndef.scan({signal: readerAbortController.signal}).then(() => {
-          ndef.onreadingerror = () => {
-            self.nfcTagReading = false
-
-            this.$q.notify({
-              type: 'negative',
-              message: 'There was an error reading this NFC tag.'
-            })
-
-            readerAbortController.abort()
-          }
-
-          ndef.onreading = ({message, serialNumber}) => {
-            //Decode NDEF data from tag
-            var self = this
-            self.cardDialog.data.uid = serialNumber
-              .toUpperCase()
-              .replaceAll(':', '')
-            this.$q.notify({
-              type: 'positive',
-              message: 'NFC tag read successfully.'
-            })
-          }
-        })
-      } catch (error) {
-        this.nfcTagReading = false
-        this.$q.notify({
-          type: 'negative',
-          message: error
-            ? error.toString()
-            : 'An unexpected error has occurred.'
-        })
-      }
-    },
-    getCards: function () {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/boltcards/api/v1/cards?all_wallets=true',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.cards = response.data.map(function (obj) {
-            return mapCards(obj)
-          })
-        })
-        .then(function () {
-          self.getHits()
-        })
-    },
-    getHits: function () {
-      var self = this
-      LNbits.api
-        .request(
-          'GET',
-          '/boltcards/api/v1/hits?all_wallets=true',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.hits = response.data.map(function (obj) {
-            obj.card_name = self.cards.find(d => d.id == obj.card_id).card_name
-            return mapCards(obj)
-          })
-        })
-    },
-    getRefunds: function () {
-      var self = this
-      LNbits.api
-        .request(
-          'GET',
-          '/boltcards/api/v1/refunds?all_wallets=true',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.refunds = response.data.map(function (obj) {
-            return mapCards(obj)
-          })
-        })
-    },
-    openQrCodeDialog(cardId, wipe) {
-      var card = _.findWhere(this.cards, {id: cardId})
-      this.qrCodeDialog.data = {
-        id: card.id,
-        link: window.location.origin + '/boltcards/api/v1/auth?a=' + card.otp,
-        name: card.card_name,
-        uid: card.uid,
-        external_id: card.external_id,
-        k0: card.k0,
-        k1: card.k1,
-        k2: card.k2,
-        k3: card.k1,
-        k4: card.k2
-      }
-      this.qrCodeDialog.data_wipe = JSON.stringify({
-        action: 'wipe',
-        k0: card.k0,
-        k1: card.k1,
-        k2: card.k2,
-        k3: card.k1,
-        k4: card.k2,
-        uid: card.uid,
-        version: 1
-      })
-      this.qrCodeDialog.wipe = wipe
-      this.qrCodeDialog.show = true
-    },
-    addCardOpen: function () {
-      this.cardDialog.show = true
-      this.generateKeys()
-    },
-    generateKeys: function () {
-      var self = this
-      const genRanHex = size =>
-        [...Array(size)]
-          .map(() => Math.floor(Math.random() * 16).toString(16))
-          .join('')
-
-      debugcard =
-        typeof this.cardDialog.data.card_name === 'string' &&
-        this.cardDialog.data.card_name.search('debug') > -1
-
-      self.cardDialog.data.k0 = debugcard
-        ? '11111111111111111111111111111111'
-        : genRanHex(32)
-
-      self.cardDialog.data.k1 = debugcard
-        ? '22222222222222222222222222222222'
-        : genRanHex(32)
-
-      self.cardDialog.data.k2 = debugcard
-        ? '33333333333333333333333333333333'
-        : genRanHex(32)
-    },
-    closeFormDialog: function () {
-      this.cardDialog.data = {}
-    },
-    sendFormData: function () {
-      let wallet = _.findWhere(this.g.user.wallets, {
-        id: this.cardDialog.data.wallet
-      })
-      let data = this.cardDialog.data
-      if (data.id) {
-        this.updateCard(wallet, data)
-      } else {
-        this.createCard(wallet, data)
-      }
-    },
-    createCard: function (wallet, data) {
-      var self = this
-
-      LNbits.api
-        .request('POST', '/boltcards/api/v1/cards', wallet.adminkey, data)
-        .then(function (response) {
-          self.cards.push(mapCards(response.data))
-          self.cardDialog.show = false
-          self.cardDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    updateCardDialog: function (formId) {
-      var card = _.findWhere(this.cards, {id: formId})
-      this.cardDialog.data = _.clone(card)
-
-      this.cardDialog.temp.k0 = this.cardDialog.data.k0
-      this.cardDialog.temp.k1 = this.cardDialog.data.k1
-      this.cardDialog.temp.k2 = this.cardDialog.data.k2
-
-      this.cardDialog.show = true
-    },
-    updateCard: function (wallet, data) {
-      var self = this
-
-      if (
-        this.cardDialog.temp.k0 != data.k0 ||
-        this.cardDialog.temp.k1 != data.k1 ||
-        this.cardDialog.temp.k2 != data.k2
-      ) {
-        data.prev_k0 = this.cardDialog.temp.k0
-        data.prev_k1 = this.cardDialog.temp.k1
-        data.prev_k2 = this.cardDialog.temp.k2
-      }
-
-      LNbits.api
-        .request(
-          'PUT',
-          '/boltcards/api/v1/cards/' + data.id,
-          wallet.adminkey,
-          data
-        )
-        .then(function (response) {
-          self.cards = _.reject(self.cards, function (obj) {
-            return obj.id == data.id
-          })
-          self.cards.push(mapCards(response.data))
-          self.cardDialog.show = false
-          self.cardDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    enableCard: function (wallet, card_id, enable) {
-      var self = this
-      let fullWallet = _.findWhere(self.g.user.wallets, {
-        id: wallet
-      })
-      LNbits.api
-        .request(
-          'GET',
-          '/boltcards/api/v1/cards/enable/' + card_id + '/' + enable,
-          fullWallet.adminkey
-        )
-        .then(function (response) {
-          console.log(response.data)
-          self.cards = _.reject(self.cards, function (obj) {
-            return obj.id == response.data.id
-          })
-          self.cards.push(mapCards(response.data))
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteCard: function (cardId) {
-      let self = this
-      let cards = _.findWhere(this.cards, {id: cardId})
-
-      Quasar.utils.exportFile(
-        cards.card_name + '.json',
-        this.qrCodeDialog.data_wipe,
-        'application/json'
-      )
-
-      LNbits.utils
-        .confirmDialog(
-          "Are you sure you want to delete this card? Without access to the card keys you won't be able to reset them in the future!"
-        )
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/boltcards/api/v1/cards/' + cardId,
-              _.findWhere(self.g.user.wallets, {id: cards.wallet}).adminkey
-            )
-            .then(function (response) {
-              self.cards = _.reject(self.cards, function (obj) {
-                return obj.id == cardId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportCardsCSV: function () {
-      LNbits.utils.exportCSV(this.cardsTable.columns, this.cards)
-    },
-    exportHitsCSV: function () {
-      LNbits.utils.exportCSV(this.hitsTable.columns, this.hits)
-    },
-    exportRefundsCSV: function () {
-      LNbits.utils.exportCSV(this.refundsTable.columns, this.refunds)
-    }
-  },
-  created: function () {
-    if (this.g.user.wallets.length) {
-      this.getCards()
-      this.getRefunds()
-    }
-  }
-})

lnbits/extensions/boltcards/tasks.py

@@ -1,47 +0,0 @@
-import asyncio
-import json
-
-from lnbits.core import db as core_db
-from lnbits.core.models import Payment
-from lnbits.helpers import get_current_extension_name
-from lnbits.tasks import register_invoice_listener
-
-from .crud import create_refund, get_hit
-
-
-async def wait_for_paid_invoices():
-    invoice_queue = asyncio.Queue()
-    register_invoice_listener(invoice_queue, get_current_extension_name())
-
-    while True:
-        payment = await invoice_queue.get()
-        await on_invoice_paid(payment)
-
-
-async def on_invoice_paid(payment: Payment) -> None:
-
-    if not payment.extra.get("refund"):
-        return
-
-    if payment.extra.get("wh_status"):
-        # this webhook has already been sent
-        return
-
-    hit = await get_hit(str(payment.extra.get("refund")))
-
-    if hit:
-        await create_refund(hit_id=hit.id, refund_amount=(payment.amount / 1000))
-        await mark_webhook_sent(payment, 1)
-
-
-async def mark_webhook_sent(payment: Payment, status: int) -> None:
-
-    payment.extra["wh_status"] = status
-
-    await core_db.execute(
-        """
-        UPDATE apipayments SET extra = ?
-        WHERE hash = ?
-        """,
-        (json.dumps(payment.extra), payment.payment_hash),
-    )

lnbits/extensions/boltcards/templates/boltcards/_api_docs.html

@@ -1,22 +0,0 @@
-<q-expansion-item
-  group="extras"
-  icon="swap_vertical_circle"
-  label="About Bolt Cards"
-  :content-inset-level="0.5"
->
-  <q-card>
-    <q-card-section>
-      <h5 class="text-subtitle1 q-my-none">Be your own card association</h5>
-      <p>
-        Manage your Bolt Cards self custodian way<br />
-
-        <a
-          class="text-secondary"
-          href="https://github.com/lnbits/lnbits/tree/main/lnbits/extensions/boltcards"
-          >More details</a
-        >
-        <br />
-      </p>
-    </q-card-section>
-  </q-card>
-</q-expansion-item>

lnbits/extensions/boltcards/templates/boltcards/index.html

@@ -1,474 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block page %}
-
-<div class="row q-col-gutter-md">
-  <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
-    <q-card>
-      <q-card-section>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <div class="row justify-start" style="width: 150px">
-              <div class="col">
-                <h5 class="text-subtitle1 q-my-none">Cards</h5>
-              </div>
-              <div class="col">
-                <q-btn
-                  round
-                  size="sm"
-                  icon="add"
-                  unelevated
-                  color="primary"
-                  @click="addCardOpen"
-                >
-                  <q-tooltip>Add card</q-tooltip>
-                </q-btn>
-              </div>
-            </div>
-          </div>
-          <div class="col-auto">
-            <q-btn flat color="grey" @click="exportCardsCSV"
-              >Export to CSV</q-btn
-            >
-          </div>
-        </div>
-        <q-table
-          dense
-          flat
-          :data="cards"
-          row-key="id"
-          :columns="cardsTable.columns"
-          :pagination.sync="cardsTable.pagination"
-        >
-          {% raw %}
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th auto-width></q-th>
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
-              </q-th>
-              <q-th auto-width></q-th>
-              <q-th auto-width></q-th>
-              <q-th auto-width></q-th>
-            </q-tr>
-          </template>
-          <template v-slot:body="props">
-            <q-tr :props="props">
-              <q-td auto-width>
-                <q-btn
-                  unelevated
-                  dense
-                  icon="qr_code"
-                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-                  @click="openQrCodeDialog(props.row.id, false)"
-                >
-                  <q-tooltip>Card key credentials</q-tooltip>
-                </q-btn>
-              </q-td>
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  v-if="props.row.enable"
-                  dense
-                  @click="enableCard(props.row.wallet, props.row.id, false)"
-                  color="pink"
-                  >DISABLE</q-btn
-                >
-                <q-btn
-                  v-else
-                  dense
-                  @click="enableCard(props.row.wallet, props.row.id, true)"
-                  color="green"
-                  >ENABLE
-                </q-btn>
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="updateCardDialog(props.row.id)"
-                  icon="edit"
-                  color="light-blue"
-                >
-                  <q-tooltip>Edit card</q-tooltip>
-                </q-btn>
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="openQrCodeDialog(props.row.id, true)"
-                  icon="cancel"
-                  color="pink"
-                >
-                  <q-tooltip
-                    >Deleting card will also delete all records</q-tooltip
-                  >
-                </q-btn>
-              </q-td>
-            </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
-    <q-card>
-      <q-card-section>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Hits</h5>
-          </div>
-          <div class="col-auto">
-            <q-btn flat color="grey" @click="exportCardsCSV"
-              >Export to CSV</q-btn
-            >
-          </div>
-        </div>
-        <q-table
-          dense
-          flat
-          :data="hits"
-          row-key="id"
-          :columns="hitsTable.columns"
-          :pagination.sync="hitsTable.pagination"
-        >
-          {% raw %}
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
-              </q-th>
-            </q-tr>
-          </template>
-          <template v-slot:body="props">
-            <q-tr :props="props">
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
-              </q-td>
-            </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
-    <q-card>
-      <q-card-section>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Refunds</h5>
-          </div>
-          <div class="col-auto">
-            <q-btn flat color="grey" @click="exportRefundsCSV"
-              >Export to CSV</q-btn
-            >
-          </div>
-        </div>
-        <q-table
-          dense
-          flat
-          :data="refunds"
-          row-key="id"
-          :columns="refundsTable.columns"
-          :pagination.sync="refundsTable.pagination"
-        >
-          {% raw %}
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
-              </q-th>
-            </q-tr>
-          </template>
-          <template v-slot:body="props">
-            <q-tr :props="props">
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
-              </q-td>
-            </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
-  </div>
-  <div class="col-12 col-md-4 col-lg-5 q-gutter-y-md">
-    <q-card>
-      <q-card-section>
-        <h6 class="text-subtitle1 q-my-none">
-          {{SITE_TITLE}} Bolt Cards extension
-        </h6>
-      </q-card-section>
-      <q-card-section class="q-pa-none">
-        <q-separator></q-separator>
-        <q-list> {% include "boltcards/_api_docs.html" %} </q-list>
-      </q-card-section>
-    </q-card>
-  </div>
-  <q-dialog v-model="cardDialog.show" position="top" @hide="closeFormDialog">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form @submit="sendFormData" class="q-gutter-md">
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="cardDialog.data.wallet"
-          :options="g.user.walletOptions"
-          :disable="cardDialog.data.id != null"
-          label="Wallet *"
-        >
-        </q-select>
-        <div class="row">
-          <div class="col">
-            <q-input
-              filled
-              dense
-              emit-value
-              v-model.trim="cardDialog.data.tx_limit"
-              type="number"
-              label="Max transaction (sats)"
-              class="q-pr-sm"
-            ></q-input>
-          </div>
-          <div class="col">
-            <q-input
-              filled
-              dense
-              emit-value
-              v-model.trim="cardDialog.data.daily_limit"
-              type="number"
-              label="Daily limit (sats)"
-            ></q-input>
-          </div>
-        </div>
-        <q-input
-          filled
-          dense
-          emit-value
-          v-model.trim="cardDialog.data.card_name"
-          type="text"
-          label="Card name "
-        >
-        </q-input>
-        <div class="row">
-          <div class="col-10">
-            <q-input
-              filled
-              dense
-              emit-value
-              v-model.trim="cardDialog.data.uid"
-              type="text"
-              label="Card UID "
-            >
-              <q-tooltip
-                >Get from the card you'll use, using an NFC app</q-tooltip
-              >
-            </q-input>
-          </div>
-          <div class="col-2 q-pl-sm">
-            <q-btn
-              outline
-              disable
-              color="grey"
-              icon="nfc"
-              :disable="nfcTagReading"
-              @click="readNfcTag()"
-            >
-              <q-tooltip>Tap card to scan UID</q-tooltip>
-            </q-btn>
-          </div>
-        </div>
-
-        <q-toggle
-          v-model="toggleAdvanced"
-          label="Show advanced options"
-        ></q-toggle>
-        <div v-show="toggleAdvanced" class="q-gutter-y-md">
-          <q-input
-            filled
-            dense
-            v-model.trim="cardDialog.data.k0"
-            type="text"
-            label="Card Auth key (K0)"
-            hint="Used to authentificate with the card (16 bytes in HEX). "
-            @randomkey
-          >
-          </q-input>
-          <q-input
-            filled
-            dense
-            v-model.trim="cardDialog.data.k1"
-            type="text"
-            label="Card Meta key (K1)"
-            hint="Used for encypting of the message (16 bytes in HEX)."
-          ></q-input>
-          <q-input
-            filled
-            dense
-            v-model.trim="cardDialog.data.k2"
-            type="text"
-            label="Card File key (K2)"
-            hint="Used for CMAC of the message (16 bytes in HEX)."
-          >
-          </q-input>
-          <q-input
-            filled
-            dense
-            v-model.number="cardDialog.data.counter"
-            type="number"
-            label="Initial counter"
-          >
-            <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-              >Zero if you don't know.</q-tooltip
-            >
-          </q-input>
-          <q-btn
-            unelevated
-            color="primary"
-            class="q-ml-auto"
-            v-on:click="generateKeys"
-            v-on:click.right="debugKeys"
-            >Generate keys</q-btn
-          >
-        </div>
-        <div class="row q-mt-lg">
-          <q-btn
-            v-if="cardDialog.data.id"
-            unelevated
-            color="primary"
-            type="submit"
-            >Update Card</q-btn
-          >
-          <q-btn
-            v-else
-            unelevated
-            color="primary"
-            :disable="cardDialog.data.uid == null"
-            type="submit"
-            >Create Card
-          </q-btn>
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-            >Cancel</q-btn
-          >
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-
-  <q-dialog v-model="qrCodeDialog.show" position="top">
-    <q-card v-if="qrCodeDialog.data" class="q-pa-lg lnbits__dialog-card">
-      {% raw %}
-      <div class="col q-mt-lg text-center">
-        <q-responsive
-          :ratio="1"
-          class="q-mx-xl q-mb-md"
-          v-show="!qrCodeDialog.wipe"
-        >
-          <qrcode
-            :value="qrCodeDialog.data.link"
-            :options="{width: 800}"
-            class="rounded-borders"
-          ></qrcode>
-        </q-responsive>
-        <p class="text-center" v-show="!qrCodeDialog.wipe">
-          (QR for <strong>create</strong> the card in
-          <a
-            class="text-secondary"
-            href="https://play.google.com/store/apps/details?id=com.lightningnfcapp"
-            target="_blank"
-            style="color: inherit"
-            >Boltcard NFC Card Creator</a
-          >)
-        </p>
-        <q-responsive
-          :ratio="1"
-          class="q-mx-xl q-mb-md"
-          v-show="qrCodeDialog.wipe"
-        >
-          <qrcode
-            :value="qrCodeDialog.data_wipe"
-            :options="{width: 800}"
-            class="rounded-borders"
-          ></qrcode>
-        </q-responsive>
-        <p class="text-center" v-show="qrCodeDialog.wipe">
-          (QR for <strong>wipe</strong> the card in
-          <a
-            class="text-secondary"
-            href="https://play.google.com/store/apps/details?id=com.lightningnfcapp"
-            target="_blank"
-            style="color: inherit"
-            >Boltcard NFC Card Creator</a
-          >)
-        </p>
-      </div>
-      <div class="col q-mt-md q-mb-md text-center">
-        <q-btn-toggle
-          v-model="qrCodeDialog.wipe"
-          rounded
-          unelevated
-          toggle-color="primary"
-          color="white"
-          text-color="primary"
-          :options="[
-            {label: 'Create', value: false},
-            {label: 'Wipe', value: true}
-          ]"
-        />
-      </div>
-      <p style="word-break: break-all">
-        <strong>Name:</strong> {{ qrCodeDialog.data.name }}<br />
-        <strong>UID:</strong> {{ qrCodeDialog.data.uid }}<br />
-        <strong>External ID:</strong> {{ qrCodeDialog.data.external_id }}<br />
-        <strong>Lock key (K0):</strong> {{ qrCodeDialog.data.k0 }}<br />
-        <strong>Meta key (K1 & K3):</strong> {{ qrCodeDialog.data.k1 }}<br />
-        <strong>File key (K2 & K4):</strong> {{ qrCodeDialog.data.k2 }}<br />
-      </p>
-      <p>
-        Always backup all keys that you're trying to write on the card. Without
-        them you may not be able to change them in the future!
-      </p>
-      <q-btn
-        unelevated
-        outline
-        color="grey"
-        @click="copyText(qrCodeDialog.data.link)"
-        label="Create link"
-        v-show="!qrCodeDialog.wipe"
-      >
-        <q-tooltip>Click to copy, then paste to NFC Card Creator</q-tooltip>
-      </q-btn>
-      <q-btn
-        unelevated
-        outline
-        color="grey"
-        @click="copyText(qrCodeDialog.data_wipe)"
-        label="Wipe data"
-        v-show="qrCodeDialog.wipe"
-      >
-        <q-tooltip>Click to copy, then paste to NFC Card Creator</q-tooltip>
-      </q-btn>
-      <q-btn
-        unelevated
-        outline
-        color="red"
-        @click="deleteCard(qrCodeDialog.data.id)"
-        label="Delete card"
-        v-show="qrCodeDialog.wipe"
-        v-close-popup
-      >
-        <q-tooltip>Backup the keys, or wipe the card first!</q-tooltip>
-      </q-btn>
-      {% endraw %}
-      <div class="row q-mt-lg q-gutter-sm">
-        <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
-      </div>
-    </q-card>
-  </q-dialog>
-</div>
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script src="/boltcards/static/js/index.js"></script>
-{% endblock %}

lnbits/extensions/boltcards/views.py

@@ -1,17 +0,0 @@
-from fastapi import Depends, Request
-from fastapi.templating import Jinja2Templates
-from starlette.responses import HTMLResponse
-
-from lnbits.core.models import User
-from lnbits.decorators import check_user_exists
-
-from . import boltcards_ext, boltcards_renderer
-
-templates = Jinja2Templates(directory="templates")
-
-
-@boltcards_ext.get("/", response_class=HTMLResponse)
-async def index(request: Request, user: User = Depends(check_user_exists)):
-    return boltcards_renderer().TemplateResponse(
-        "boltcards/index.html", {"request": request, "user": user.dict()}
-    )

lnbits/extensions/boltcards/views_api.py

@@ -1,165 +0,0 @@
-from http import HTTPStatus
-
-from fastapi import Depends, HTTPException, Query
-
-from lnbits.core.crud import get_user
-from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
-
-from . import boltcards_ext
-from .crud import (
-    create_card,
-    delete_card,
-    enable_disable_card,
-    get_card,
-    get_card_by_uid,
-    get_cards,
-    get_hits,
-    get_refunds,
-    update_card,
-)
-from .models import CreateCardData
-
-
-@boltcards_ext.get("/api/v1/cards")
-async def api_cards(
-    g: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
-):
-    wallet_ids = [g.wallet.id]
-
-    if all_wallets:
-        user = await get_user(g.wallet.user)
-        wallet_ids = user.wallet_ids if user else []
-
-    return [card.dict() for card in await get_cards(wallet_ids)]
-
-
-@boltcards_ext.post("/api/v1/cards", status_code=HTTPStatus.CREATED)
-@boltcards_ext.put("/api/v1/cards/{card_id}", status_code=HTTPStatus.OK)
-async def api_card_create_or_update(
-    data: CreateCardData,
-    card_id: str = Query(None),
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-):
-    try:
-        if len(bytes.fromhex(data.uid)) != 7:
-            raise HTTPException(
-                detail="Invalid bytes for card uid.", status_code=HTTPStatus.BAD_REQUEST
-            )
-
-        if len(bytes.fromhex(data.k0)) != 16:
-            raise HTTPException(
-                detail="Invalid bytes for k0.", status_code=HTTPStatus.BAD_REQUEST
-            )
-
-        if len(bytes.fromhex(data.k1)) != 16:
-            raise HTTPException(
-                detail="Invalid bytes for k1.", status_code=HTTPStatus.BAD_REQUEST
-            )
-
-        if len(bytes.fromhex(data.k2)) != 16:
-            raise HTTPException(
-                detail="Invalid bytes for k2.", status_code=HTTPStatus.BAD_REQUEST
-            )
-    except:
-        raise HTTPException(
-            detail="Invalid byte data provided.", status_code=HTTPStatus.BAD_REQUEST
-        )
-    if card_id:
-        card = await get_card(card_id)
-        if not card:
-            raise HTTPException(
-                detail="Card does not exist.", status_code=HTTPStatus.NOT_FOUND
-            )
-        if card.wallet != wallet.wallet.id:
-            raise HTTPException(
-                detail="Not your card.", status_code=HTTPStatus.FORBIDDEN
-            )
-        checkUid = await get_card_by_uid(data.uid)
-        if checkUid and checkUid.id != card_id:
-            raise HTTPException(
-                detail="UID already registered. Delete registered card and try again.",
-                status_code=HTTPStatus.BAD_REQUEST,
-            )
-        card = await update_card(card_id, **data.dict())
-    else:
-        checkUid = await get_card_by_uid(data.uid)
-        if checkUid:
-            raise HTTPException(
-                detail="UID already registered. Delete registered card and try again.",
-                status_code=HTTPStatus.BAD_REQUEST,
-            )
-        card = await create_card(wallet_id=wallet.wallet.id, data=data)
-    assert card
-    return card.dict()
-
-
-@boltcards_ext.get("/api/v1/cards/enable/{card_id}/{enable}", status_code=HTTPStatus.OK)
-async def enable_card(
-    card_id,
-    enable,
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-):
-    card = await get_card(card_id)
-    if not card:
-        raise HTTPException(detail="No card found.", status_code=HTTPStatus.NOT_FOUND)
-    if card.wallet != wallet.wallet.id:
-        raise HTTPException(detail="Not your card.", status_code=HTTPStatus.FORBIDDEN)
-    card = await enable_disable_card(enable=enable, id=card_id)
-    assert card
-    return card.dict()
-
-
-@boltcards_ext.delete("/api/v1/cards/{card_id}")
-async def api_card_delete(card_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
-    card = await get_card(card_id)
-
-    if not card:
-        raise HTTPException(
-            detail="Card does not exist.", status_code=HTTPStatus.NOT_FOUND
-        )
-
-    if card.wallet != wallet.wallet.id:
-        raise HTTPException(detail="Not your card.", status_code=HTTPStatus.FORBIDDEN)
-
-    await delete_card(card_id)
-    return "", HTTPStatus.NO_CONTENT
-
-
-@boltcards_ext.get("/api/v1/hits")
-async def api_hits(
-    g: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
-):
-    wallet_ids = [g.wallet.id]
-
-    if all_wallets:
-        user = await get_user(g.wallet.user)
-        wallet_ids = user.wallet_ids if user else []
-
-    cards = await get_cards(wallet_ids)
-    cards_ids = []
-    for card in cards:
-        cards_ids.append(card.id)
-
-    return [hit.dict() for hit in await get_hits(cards_ids)]
-
-
-@boltcards_ext.get("/api/v1/refunds")
-async def api_refunds(
-    g: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
-):
-    wallet_ids = [g.wallet.id]
-
-    if all_wallets:
-        user = await get_user(g.wallet.user)
-        wallet_ids = user.wallet_ids if user else []
-
-    cards = await get_cards(wallet_ids)
-    cards_ids = []
-    for card in cards:
-        cards_ids.append(card.id)
-    hits = await get_hits(cards_ids)
-    hits_ids = []
-    for hit in hits:
-        hits_ids.append(hit.id)
-
-    return [refund.dict() for refund in await get_refunds(hits_ids)]

lnbits/extensions/boltz/README.md

@@ -1,42 +0,0 @@
-# Swap on [Boltz](https://boltz.exchange)
-providing **trustless** and **account-free** swap services since **2018.**
-move **IN** and **OUT** of the **lightning network** and remain in control of your bitcoin, at all times.
-* [Lightning Node](https://amboss.space/node/026165850492521f4ac8abd9bd8088123446d126f648ca35e60f88177dc149ceb2)
-* [Documentation](https://docs.boltz.exchange/en/latest/)
-* [Discord](https://discord.gg/d6EK85KK)
-* [Twitter](https://twitter.com/Boltzhq)
-* [FAQ](https://www.notion.so/Frequently-Asked-Questions-585328ae43944e2eba351050790d5eec) very cool!
-
-# usage
-This extension lets you create swaps, reverse swaps and in the case of failure refund your onchain funds.
-
-## create normal swap (Onchain -> Lightning)
-1. click on "Swap (IN)" button to open following dialog, select a wallet, choose a proper amount in the min-max range and choose a onchain address to do your refund to if the swap fails after you already commited onchain funds.
----
-![create swap](https://imgur.com/OyOh3Nm.png)
----
-2. after you confirm your inputs, following dialog with the QR code for the onchain transaction, onchain- address and amount, will pop up.
----
-![pay onchain tx](https://imgur.com/r2UhwCY.png)
----
-3. after you pay this onchain address with the correct amount, boltz will see it and will pay your invoice and the sats will appear on your wallet.
-
-if anything goes wrong when boltz is trying to pay your invoice, the swap will fail and you will need to refund your onchain funds after the timeout block height hit. (if boltz can pay the invoice, it wont be able to redeem your onchain funds either).
-
-## create reverse swap (Lightning -> Onchain)
-1. click on "Swap (OUT)" button to open following dialog, select a wallet, choose a proper amount in the min-max range and choose a onchain address to receive your funds to. Instant settlement: means that LNbits will create the onchain claim transaction if it sees the boltz lockup transaction in the mempool, but it is not confirmed yet. it is advised to leave this checked because it is faster and the longer is takes to settle, the higher the chances are that the lightning invoice expires and the swap fails.
----
-![reverse swap](https://imgur.com/UEAPpbs.png)
----
-if this swap fails, boltz is doing the onchain refunding, because they have to commit onchain funds.
-
-# refund locked onchain funds from a normal swap (Onchain -> Lightning)
-if for some reason the normal swap fails and you already paid onchain, you can easily refund your btc.
-this can happen if boltz is not able to pay your lightning invoice after you locked up your funds.
-in case that happens, there is a info icon in the Swap (In) List which opens following dialog.
----
-![refund](https://imgur.com/pN81ltf.png)
-----
-if the timeout block height is exceeded you can either press refund and lnbits will do the refunding to the address you specified when creating the swap. Or download the refundfile so you can manually refund your onchain directly on the boltz.exchange website.
-if you think there is something wrong and/or you are unsure, you can ask for help either in LNbits telegram or in Boltz [Discord](https://discord.gg/d6EK85KK).
-In a recent update we made *automated check*, every 15 minutes, to check if LNbits can refund your failed swap.

lnbits/extensions/boltz/__init__.py

@@ -1,35 +0,0 @@
-import asyncio
-
-from fastapi import APIRouter
-from fastapi.staticfiles import StaticFiles
-
-from lnbits.db import Database
-from lnbits.helpers import template_renderer
-from lnbits.tasks import catch_everything_and_restart
-
-db = Database("ext_boltz")
-
-boltz_ext: APIRouter = APIRouter(prefix="/boltz", tags=["boltz"])
-
-
-def boltz_renderer():
-    return template_renderer(["lnbits/extensions/boltz/templates"])
-
-
-boltz_static_files = [
-    {
-        "path": "/boltz/static",
-        "app": StaticFiles(directory="lnbits/extensions/boltz/static"),
-        "name": "boltz_static",
-    }
-]
-
-from .tasks import check_for_pending_swaps, wait_for_paid_invoices
-from .views import *  # noqa
-from .views_api import *  # noqa
-
-
-def boltz_start():
-    loop = asyncio.get_event_loop()
-    loop.create_task(check_for_pending_swaps())
-    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))

lnbits/extensions/boltz/config.json

@@ -1,6 +0,0 @@
-{
-  "name": "Boltz",
-  "short_description": "Perform onchain/offchain swaps",
-  "tile": "/boltz/static/image/boltz.png",
-  "contributors": ["dni"]
-}

lnbits/extensions/boltz/crud.py

@@ -1,284 +0,0 @@
-import time
-from typing import List, Optional, Union
-
-from boltz_client.boltz import BoltzReverseSwapResponse, BoltzSwapResponse
-from loguru import logger
-
-from lnbits.helpers import urlsafe_short_hash
-
-from . import db
-from .models import (
-    AutoReverseSubmarineSwap,
-    CreateAutoReverseSubmarineSwap,
-    CreateReverseSubmarineSwap,
-    CreateSubmarineSwap,
-    ReverseSubmarineSwap,
-    SubmarineSwap,
-)
-
-
-async def get_submarine_swaps(wallet_ids: Union[str, List[str]]) -> List[SubmarineSwap]:
-    if isinstance(wallet_ids, str):
-        wallet_ids = [wallet_ids]
-
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM boltz.submarineswap WHERE wallet IN ({q}) order by time DESC",
-        (*wallet_ids,),
-    )
-
-    return [SubmarineSwap(**row) for row in rows]
-
-
-async def get_all_pending_submarine_swaps() -> List[SubmarineSwap]:
-    rows = await db.fetchall(
-        f"SELECT * FROM boltz.submarineswap WHERE status='pending' order by time DESC",
-    )
-    return [SubmarineSwap(**row) for row in rows]
-
-
-async def get_submarine_swap(swap_id) -> Optional[SubmarineSwap]:
-    row = await db.fetchone(
-        "SELECT * FROM boltz.submarineswap WHERE id = ?", (swap_id,)
-    )
-    return SubmarineSwap(**row) if row else None
-
-
-async def create_submarine_swap(
-    data: CreateSubmarineSwap,
-    swap: BoltzSwapResponse,
-    swap_id: str,
-    refund_privkey_wif: str,
-    payment_hash: str,
-) -> Optional[SubmarineSwap]:
-
-    await db.execute(
-        """
-        INSERT INTO boltz.submarineswap (
-            id,
-            wallet,
-            payment_hash,
-            status,
-            boltz_id,
-            refund_privkey,
-            refund_address,
-            expected_amount,
-            timeout_block_height,
-            address,
-            bip21,
-            redeem_script,
-            amount
-        )
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        """,
-        (
-            swap_id,
-            data.wallet,
-            payment_hash,
-            "pending",
-            swap.id,
-            refund_privkey_wif,
-            data.refund_address,
-            swap.expectedAmount,
-            swap.timeoutBlockHeight,
-            swap.address,
-            swap.bip21,
-            swap.redeemScript,
-            data.amount,
-        ),
-    )
-    return await get_submarine_swap(swap_id)
-
-
-async def get_reverse_submarine_swaps(
-    wallet_ids: Union[str, List[str]]
-) -> List[ReverseSubmarineSwap]:
-    if isinstance(wallet_ids, str):
-        wallet_ids = [wallet_ids]
-
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM boltz.reverse_submarineswap WHERE wallet IN ({q}) order by time DESC",
-        (*wallet_ids,),
-    )
-
-    return [ReverseSubmarineSwap(**row) for row in rows]
-
-
-async def get_all_pending_reverse_submarine_swaps() -> List[ReverseSubmarineSwap]:
-    rows = await db.fetchall(
-        f"SELECT * FROM boltz.reverse_submarineswap WHERE status='pending' order by time DESC"
-    )
-
-    return [ReverseSubmarineSwap(**row) for row in rows]
-
-
-async def get_reverse_submarine_swap(swap_id) -> Optional[ReverseSubmarineSwap]:
-    row = await db.fetchone(
-        "SELECT * FROM boltz.reverse_submarineswap WHERE id = ?", (swap_id,)
-    )
-    return ReverseSubmarineSwap(**row) if row else None
-
-
-async def create_reverse_submarine_swap(
-    data: CreateReverseSubmarineSwap,
-    claim_privkey_wif: str,
-    preimage_hex: str,
-    swap: BoltzReverseSwapResponse,
-) -> ReverseSubmarineSwap:
-
-    swap_id = urlsafe_short_hash()
-
-    reverse_swap = ReverseSubmarineSwap(
-        id=swap_id,
-        wallet=data.wallet,
-        status="pending",
-        boltz_id=swap.id,
-        instant_settlement=data.instant_settlement,
-        preimage=preimage_hex,
-        claim_privkey=claim_privkey_wif,
-        lockup_address=swap.lockupAddress,
-        invoice=swap.invoice,
-        onchain_amount=swap.onchainAmount,
-        onchain_address=data.onchain_address,
-        timeout_block_height=swap.timeoutBlockHeight,
-        redeem_script=swap.redeemScript,
-        amount=data.amount,
-        time=int(time.time()),
-    )
-
-    await db.execute(
-        """
-        INSERT INTO boltz.reverse_submarineswap (
-            id,
-            wallet,
-            status,
-            boltz_id,
-            instant_settlement,
-            preimage,
-            claim_privkey,
-            lockup_address,
-            invoice,
-            onchain_amount,
-            onchain_address,
-            timeout_block_height,
-            redeem_script,
-            amount
-        )
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        """,
-        (
-            reverse_swap.id,
-            reverse_swap.wallet,
-            reverse_swap.status,
-            reverse_swap.boltz_id,
-            reverse_swap.instant_settlement,
-            reverse_swap.preimage,
-            reverse_swap.claim_privkey,
-            reverse_swap.lockup_address,
-            reverse_swap.invoice,
-            reverse_swap.onchain_amount,
-            reverse_swap.onchain_address,
-            reverse_swap.timeout_block_height,
-            reverse_swap.redeem_script,
-            reverse_swap.amount,
-        ),
-    )
-    return reverse_swap
-
-
-async def get_auto_reverse_submarine_swaps(
-    wallet_ids: List[str],
-) -> List[AutoReverseSubmarineSwap]:
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM boltz.auto_reverse_submarineswap WHERE wallet IN ({q}) order by time DESC",
-        (*wallet_ids,),
-    )
-    return [AutoReverseSubmarineSwap(**row) for row in rows]
-
-
-async def get_auto_reverse_submarine_swap(
-    swap_id,
-) -> Optional[AutoReverseSubmarineSwap]:
-    row = await db.fetchone(
-        "SELECT * FROM boltz.auto_reverse_submarineswap WHERE id = ?", (swap_id,)
-    )
-    return AutoReverseSubmarineSwap(**row) if row else None
-
-
-async def get_auto_reverse_submarine_swap_by_wallet(
-    wallet_id,
-) -> Optional[AutoReverseSubmarineSwap]:
-    row = await db.fetchone(
-        "SELECT * FROM boltz.auto_reverse_submarineswap WHERE wallet = ?", (wallet_id,)
-    )
-    return AutoReverseSubmarineSwap(**row) if row else None
-
-
-async def create_auto_reverse_submarine_swap(
-    swap: CreateAutoReverseSubmarineSwap,
-) -> Optional[AutoReverseSubmarineSwap]:
-
-    swap_id = urlsafe_short_hash()
-    await db.execute(
-        """
-        INSERT INTO boltz.auto_reverse_submarineswap (
-            id,
-            wallet,
-            onchain_address,
-            instant_settlement,
-            balance,
-            amount
-        )
-        VALUES (?, ?, ?, ?, ?, ?)
-        """,
-        (
-            swap_id,
-            swap.wallet,
-            swap.onchain_address,
-            swap.instant_settlement,
-            swap.balance,
-            swap.amount,
-        ),
-    )
-    return await get_auto_reverse_submarine_swap(swap_id)
-
-
-async def delete_auto_reverse_submarine_swap(swap_id):
-    await db.execute(
-        "DELETE FROM boltz.auto_reverse_submarineswap WHERE id = ?", (swap_id,)
-    )
-
-
-async def update_swap_status(swap_id: str, status: str):
-
-    swap = await get_submarine_swap(swap_id)
-    if swap:
-        await db.execute(
-            "UPDATE boltz.submarineswap SET status='"
-            + status
-            + "' WHERE id='"
-            + swap.id
-            + "'"
-        )
-        logger.info(
-            f"Boltz - swap status change: {status}. boltz_id: {swap.boltz_id}, wallet: {swap.wallet}"
-        )
-        return swap
-
-    reverse_swap = await get_reverse_submarine_swap(swap_id)
-    if reverse_swap:
-        await db.execute(
-            "UPDATE boltz.reverse_submarineswap SET status='"
-            + status
-            + "' WHERE id='"
-            + reverse_swap.id
-            + "'"
-        )
-        logger.info(
-            f"Boltz - reverse swap status change: {status}. boltz_id: {reverse_swap.boltz_id}, wallet: {reverse_swap.wallet}"
-        )
-        return reverse_swap
-
-    return None

lnbits/extensions/boltz/migrations.py

@@ -1,64 +0,0 @@
-async def m001_initial(db):
-    await db.execute(
-        f"""
-        CREATE TABLE boltz.submarineswap (
-            id TEXT PRIMARY KEY,
-            wallet TEXT NOT NULL,
-            payment_hash TEXT NOT NULL,
-            amount {db.big_int} NOT NULL,
-            status TEXT NOT NULL,
-            boltz_id TEXT NOT NULL,
-            refund_address TEXT NOT NULL,
-            refund_privkey TEXT NOT NULL,
-            expected_amount {db.big_int} NOT NULL,
-            timeout_block_height INT NOT NULL,
-            address TEXT NOT NULL,
-            bip21 TEXT NOT NULL,
-            redeem_script TEXT NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT """
-        + db.timestamp_now
-        + """
-        );
-    """
-    )
-    await db.execute(
-        f"""
-        CREATE TABLE boltz.reverse_submarineswap (
-            id TEXT PRIMARY KEY,
-            wallet TEXT NOT NULL,
-            onchain_address TEXT NOT NULL,
-            amount {db.big_int} NOT NULL,
-            instant_settlement BOOLEAN NOT NULL,
-            status TEXT NOT NULL,
-            boltz_id TEXT NOT NULL,
-            timeout_block_height INT NOT NULL,
-            redeem_script TEXT NOT NULL,
-            preimage TEXT NOT NULL,
-            claim_privkey TEXT NOT NULL,
-            lockup_address TEXT NOT NULL,
-            invoice TEXT NOT NULL,
-            onchain_amount {db.big_int} NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT """
-        + db.timestamp_now
-        + """
-        );
-    """
-    )
-
-
-async def m002_auto_swaps(db):
-    await db.execute(
-        """
-        CREATE TABLE boltz.auto_reverse_submarineswap (
-            id TEXT PRIMARY KEY,
-            wallet TEXT NOT NULL,
-            onchain_address TEXT NOT NULL,
-            amount INT NOT NULL,
-            balance INT NOT NULL,
-            instant_settlement BOOLEAN NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT """
-        + db.timestamp_now
-        + """
-        );
-    """
-    )

lnbits/extensions/boltz/models.py

@@ -1,68 +0,0 @@
-from fastapi import Query
-from pydantic import BaseModel
-
-
-class SubmarineSwap(BaseModel):
-    id: str
-    wallet: str
-    amount: int
-    payment_hash: str
-    time: int
-    status: str
-    refund_privkey: str
-    refund_address: str
-    boltz_id: str
-    expected_amount: int
-    timeout_block_height: int
-    address: str
-    bip21: str
-    redeem_script: str
-
-
-class CreateSubmarineSwap(BaseModel):
-    wallet: str = Query(...)
-    refund_address: str = Query(...)
-    amount: int = Query(...)
-
-
-class ReverseSubmarineSwap(BaseModel):
-    id: str
-    wallet: str
-    amount: int
-    onchain_address: str
-    instant_settlement: bool
-    time: int
-    status: str
-    boltz_id: str
-    preimage: str
-    claim_privkey: str
-    lockup_address: str
-    invoice: str
-    onchain_amount: int
-    timeout_block_height: int
-    redeem_script: str
-
-
-class CreateReverseSubmarineSwap(BaseModel):
-    wallet: str = Query(...)
-    amount: int = Query(...)
-    instant_settlement: bool = Query(...)
-    onchain_address: str = Query(...)
-
-
-class AutoReverseSubmarineSwap(BaseModel):
-    id: str
-    wallet: str
-    amount: int
-    balance: int
-    onchain_address: str
-    instant_settlement: bool
-    time: int
-
-
-class CreateAutoReverseSubmarineSwap(BaseModel):
-    wallet: str = Query(...)
-    amount: int = Query(...)
-    balance: int = Query(0)
-    instant_settlement: bool = Query(...)
-    onchain_address: str = Query(...)

lnbits/extensions/boltz/tasks.py

@@ -1,180 +0,0 @@
-import asyncio
-
-from boltz_client.boltz import BoltzNotFoundException, BoltzSwapStatusException
-from boltz_client.mempool import MempoolBlockHeightException
-from loguru import logger
-
-from lnbits.core.crud import get_wallet
-from lnbits.core.models import Payment
-from lnbits.core.services import check_transaction_status, fee_reserve
-from lnbits.helpers import get_current_extension_name
-from lnbits.tasks import register_invoice_listener
-
-from .crud import (
-    create_reverse_submarine_swap,
-    get_all_pending_reverse_submarine_swaps,
-    get_all_pending_submarine_swaps,
-    get_auto_reverse_submarine_swap_by_wallet,
-    get_submarine_swap,
-    update_swap_status,
-)
-from .models import CreateReverseSubmarineSwap, ReverseSubmarineSwap, SubmarineSwap
-from .utils import create_boltz_client, execute_reverse_swap
-
-
-async def wait_for_paid_invoices():
-    invoice_queue = asyncio.Queue()
-    register_invoice_listener(invoice_queue, get_current_extension_name())
-
-    while True:
-        payment = await invoice_queue.get()
-        await on_invoice_paid(payment)
-
-
-async def on_invoice_paid(payment: Payment) -> None:
-
-    await check_for_auto_swap(payment)
-
-    if payment.extra.get("tag") != "boltz":
-        # not a boltz invoice
-        return
-
-    await payment.set_pending(False)
-
-    if payment.extra:
-        swap_id = payment.extra.get("swap_id")
-        if swap_id:
-            swap = await get_submarine_swap(swap_id)
-            if swap:
-                await update_swap_status(swap_id, "complete")
-
-
-async def check_for_auto_swap(payment: Payment) -> None:
-    auto_swap = await get_auto_reverse_submarine_swap_by_wallet(payment.wallet_id)
-    if auto_swap:
-        wallet = await get_wallet(payment.wallet_id)
-        if wallet:
-            reserve = fee_reserve(wallet.balance_msat) / 1000
-            balance = wallet.balance_msat / 1000
-            amount = balance - auto_swap.balance - reserve
-            if amount >= auto_swap.amount:
-
-                client = create_boltz_client()
-                claim_privkey_wif, preimage_hex, swap = client.create_reverse_swap(
-                    amount=int(amount)
-                )
-                new_swap = await create_reverse_submarine_swap(
-                    CreateReverseSubmarineSwap(
-                        wallet=auto_swap.wallet,
-                        amount=int(amount),
-                        instant_settlement=auto_swap.instant_settlement,
-                        onchain_address=auto_swap.onchain_address,
-                    ),
-                    claim_privkey_wif,
-                    preimage_hex,
-                    swap,
-                )
-                await execute_reverse_swap(client, new_swap)
-
-                logger.info(
-                    f"Boltz: auto reverse swap created with amount: {amount}, boltz_id: {new_swap.boltz_id}"
-                )
-
-
-"""
-testcases for boltz startup
-A. normal swaps
-  1. test: create -> kill -> start -> startup invoice listeners -> pay onchain funds -> should complete
-  2. test: create -> kill -> pay onchain funds -> mine block -> start -> startup check  -> should complete
-  3. test: create -> kill -> mine blocks and hit timeout -> start -> should go timeout/failed
-  4. test: create -> kill -> pay to less onchain funds -> mine blocks hit timeout -> start lnbits -> should be refunded
-
-B. reverse swaps
-  1. test: create instant -> kill -> boltz does lockup -> not confirmed -> start lnbits -> should claim/complete
-  2. test: create -> kill -> boltz does lockup -> not confirmed -> start lnbits -> mine blocks -> should claim/complete
-  3. test: create -> kill -> boltz does lockup -> confirmed -> start lnbits -> should claim/complete
-"""
-
-
-async def check_for_pending_swaps():
-    try:
-        swaps = await get_all_pending_submarine_swaps()
-        reverse_swaps = await get_all_pending_reverse_submarine_swaps()
-        if len(swaps) > 0 or len(reverse_swaps) > 0:
-            logger.debug(f"Boltz - startup swap check")
-    except:
-        logger.error(
-            f"Boltz - startup swap check, database is not created yet, do nothing"
-        )
-        return
-
-    client = create_boltz_client()
-
-    if len(swaps) > 0:
-        logger.debug(f"Boltz - {len(swaps)} pending swaps")
-        for swap in swaps:
-            await check_swap(swap, client)
-
-    if len(reverse_swaps) > 0:
-        logger.debug(f"Boltz - {len(reverse_swaps)} pending reverse swaps")
-        for reverse_swap in reverse_swaps:
-            await check_reverse_swap(reverse_swap, client)
-
-
-async def check_swap(swap: SubmarineSwap, client):
-    try:
-        payment_status = await check_transaction_status(swap.wallet, swap.payment_hash)
-        if payment_status.paid:
-            logger.debug(f"Boltz - swap: {swap.boltz_id} got paid while offline.")
-            await update_swap_status(swap.id, "complete")
-        else:
-            try:
-                _ = client.swap_status(swap.id)
-            except:
-                txs = client.mempool.get_txs_from_address(swap.address)
-                if len(txs) == 0:
-                    await update_swap_status(swap.id, "timeout")
-                else:
-                    await client.refund_swap(
-                        privkey_wif=swap.refund_privkey,
-                        lockup_address=swap.address,
-                        receive_address=swap.refund_address,
-                        redeem_script_hex=swap.redeem_script,
-                        timeout_block_height=swap.timeout_block_height,
-                    )
-                    await update_swap_status(swap.id, "refunded")
-    except BoltzNotFoundException as exc:
-        logger.debug(f"Boltz - swap: {swap.boltz_id} does not exist.")
-        await update_swap_status(swap.id, "failed")
-    except MempoolBlockHeightException as exc:
-        logger.debug(
-            f"Boltz - tried to refund swap: {swap.id}, but has not reached the timeout."
-        )
-    except Exception as exc:
-        logger.error(f"Boltz - unhandled exception, swap: {swap.id} - {str(exc)}")
-
-
-async def check_reverse_swap(reverse_swap: ReverseSubmarineSwap, client):
-    try:
-        _ = client.swap_status(reverse_swap.boltz_id)
-        await client.claim_reverse_swap(
-            lockup_address=reverse_swap.lockup_address,
-            receive_address=reverse_swap.onchain_address,
-            privkey_wif=reverse_swap.claim_privkey,
-            preimage_hex=reverse_swap.preimage,
-            redeem_script_hex=reverse_swap.redeem_script,
-            zeroconf=reverse_swap.instant_settlement,
-        )
-        await update_swap_status(reverse_swap.id, "complete")
-
-    except BoltzSwapStatusException as exc:
-        logger.debug(f"Boltz - swap_status: {str(exc)}")
-        await update_swap_status(reverse_swap.id, "failed")
-    # should only happen while development when regtest is reset
-    except BoltzNotFoundException as exc:
-        logger.debug(f"Boltz - reverse swap: {reverse_swap.boltz_id} does not exist.")
-        await update_swap_status(reverse_swap.id, "failed")
-    except Exception as exc:
-        logger.error(
-            f"Boltz - unhandled exception, reverse swap: {reverse_swap.id} - {str(exc)}"
-        )

lnbits/extensions/boltz/templates/boltz/_api_docs.html

@@ -1,93 +0,0 @@
-<q-card>
-  <q-card-section>
-    <img src="https://boltz.exchange/static/media/Shape.6c1a92b3.svg" alt="" />
-    <img
-      src="https://boltz.exchange/static/media/Boltz.02fb7acb.svg"
-      style="padding: 5px 9px"
-      alt=""
-    />
-    <p><b>NON CUSTODIAL atomic swap service</b></p>
-    <h5 class="text-subtitle1 q-my-none">
-      Providing trustless and account-free swap services since 2018. Move IN and
-      OUT of the lightning network and remain in control of your bitcoin, at all
-      time.
-    </h5>
-    <p>
-      Link:
-      <a target="_blank" href="https://boltz.exchange"
-        >https://boltz.exchange
-      </a>
-      <br />
-      README:
-      <a
-        target="_blank"
-        href="https://github.com/lnbits/lnbits-legend/tree/main/lnbits/extensions/boltz"
-        >read more</a
-      >
-    </p>
-    <p>
-      <small
-        >Extension created by,
-        <a target="_blank" href="https://github.com/dni">dni</a></small
-      >
-    </p>
-  </q-card-section>
-</q-card>
-<q-card>
-  <q-card-section>
-    <h3 class="text-subtitle1 q-my-none">
-      <b>Fee Information</b>
-    </h3>
-    <span>
-      Every swap consists of 2 onchain transactions, lockup and claim / refund,
-      routing fees and a Boltz fee of <b>0.5%</b>.
-    </span>
-  </q-card-section>
-  <q-expansion-item
-    group="extras"
-    icon="swap_vertical_circle"
-    label="Fee example: Lightning -> Onchain"
-    :content-inset-level="0.5"
-  >
-    <q-card-section>
-      You want to swap out 100.000 sats, Lightning to Onchain:
-      <ul style="padding-left: 12px">
-        <li>Onchain lockup tx fee: ~500 sats</li>
-        <li>Onchain claim tx fee: 1000 sats (hardcoded)</li>
-        <li>Routing fees (paid by you): unknown</li>
-        <li>Boltz fees: 500 sats</li>
-        <li>Fees total: 2000 sats + routing fees</li>
-        <li>You receive: 98.000 sats</li>
-      </ul>
-      <p>
-        onchain_amount_received = amount - (amount * boltz_fee / 100) -
-        lockup_fee - claim_fee
-      </p>
-      <p>98.000 = 100.000 - 500 - 500 - 1000</p>
-    </q-card-section>
-  </q-expansion-item>
-  <q-expansion-item
-    group="extras"
-    icon="swap_vertical_circle"
-    label="Fee example: Onchain -> Lightning"
-    :content-inset-level="0.5"
-  >
-    <q-card-section>
-      You want to swap in 100.000 sats, Onchain to Lightning:
-      <ul style="padding-left: 12px">
-        <li>Onchain lockup tx fee: whatever you choose when paying</li>
-        <li>Onchain claim tx fee: ~500 sats</li>
-        <li>Routing fees (paid by boltz): unknown</li>
-        <li>Boltz fees: 500 sats (0.5%)</li>
-        <li>Fees total: 1000 sats + lockup_fee</li>
-        <li>You pay onchain: 101.000 sats + lockup_fee</li>
-        <li>You receive lightning: 100.000 sats</li>
-      </ul>
-      <p>
-        onchain_payment + lockup_fee = amount + (amount * boltz_fee / 100) +
-        claim_fee + lockup_fee
-      </p>
-      <p>101.000 + lockup_fee = 100.000 + 500 + 500 + lockup_fee</p>
-    </q-card-section>
-  </q-expansion-item>
-</q-card>

lnbits/extensions/boltz/templates/boltz/_autoReverseSwapDialog.html

@@ -1,83 +0,0 @@
-<q-dialog v-model="autoReverseSubmarineSwapDialog.show" position="top">
-  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-    <q-form @submit="sendAutoReverseSubmarineSwapFormData" class="q-gutter-md">
-      <q-select
-        filled
-        dense
-        emit-value
-        v-model="autoReverseSubmarineSwapDialog.data.wallet"
-        :options="g.user.walletOptions"
-        label="Wallet *"
-        :disable="autoReverseSubmarineSwapDialog.data.id ? true : false"
-      >
-      </q-select>
-      <q-input
-        filled
-        dense
-        emit-value
-        label="Balance to kept + fee_reserve"
-        v-model="autoReverseSubmarineSwapDialog.data.balance"
-        type="number"
-      >
-        <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left">
-          mininum balance kept in wallet after a swap + the fee_reserve
-        </q-tooltip>
-      </q-input>
-      <q-input
-        filled
-        dense
-        emit-value
-        :label="amountLabel()"
-        v-model.trim="autoReverseSubmarineSwapDialog.data.amount"
-        type="number"
-      ></q-input>
-      <div class="row">
-        <div class="col">
-          <q-checkbox
-            v-model="autoReverseSubmarineSwapDialog.data.instant_settlement"
-            value="false"
-            label="Instant settlement"
-          >
-            <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left">
-              Create Onchain TX when transaction is in mempool, but not
-              confirmed yet.
-            </q-tooltip>
-          </q-checkbox>
-        </div>
-      </div>
-      <q-input
-        filled
-        dense
-        emit-value
-        v-model.trim="autoReverseSubmarineSwapDialog.data.onchain_address"
-        type="string"
-        label="Onchain address to receive funds"
-      ></q-input>
-      <div class="row q-mt-lg">
-        <q-btn
-          v-if="autoReverseSubmarineSwapDialog.data.id"
-          unelevated
-          color="primary"
-          type="submit"
-          label="Update Swap"
-        ></q-btn>
-        <q-btn
-          v-else
-          unelevated
-          color="primary"
-          :disable="disableAutoReverseSubmarineSwapDialog()"
-          type="submit"
-          label="Create Auto Reverse Swap (Out)"
-        ></q-btn>
-        <q-btn
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          @click="resetAutoReverseSubmarineSwapDialog"
-          >Cancel</q-btn
-        >
-      </div>
-    </q-form>
-  </q-card>
-</q-dialog>

lnbits/extensions/boltz/templates/boltz/_autoReverseSwapList.html

@@ -1,54 +0,0 @@
-<q-card>
-  <q-card-section>
-    <div class="row items-center no-wrap q-mb-md">
-      <div class="col">
-        <h5 class="text-subtitle1 q-my-none">Auto Lightning -> Onchain</h5>
-      </div>
-      <div class="col-auto">
-        <q-btn flat color="grey" @click="exportAutoReverseSubmarineSwapCSV"
-          >Export to CSV</q-btn
-        >
-      </div>
-    </div>
-    <q-table
-      dense
-      flat
-      :data="autoReverseSubmarineSwaps"
-      row-key="id"
-      :columns="autoReverseSubmarineSwapTable.columns"
-      :pagination.sync="autoReverseSubmarineSwapTable.pagination"
-    >
-      {% raw %}
-      <template v-slot:header="props">
-        <q-tr :props="props">
-          <q-th auto-width></q-th>
-          <q-th v-for="col in props.cols" :key="col.name" :props="props">
-            {{ col.label }}
-          </q-th>
-        </q-tr>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props">
-          <q-td>
-            <q-btn
-              unelevated
-              dense
-              size="xs"
-              icon="delete"
-              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-              @click="deleteAutoReverseSwap(props.row.id)"
-            >
-              <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-                >delete the automatic reverse swap</q-tooltip
-              >
-            </q-btn>
-          </q-td>
-          <q-td v-for="col in props.cols" :key="col.name" :props="props">
-            {{ col.value }}
-          </q-td>
-        </q-tr>
-      </template>
-      {% endraw %}
-    </q-table>
-  </q-card-section>
-</q-card>

lnbits/extensions/boltz/templates/boltz/_buttons.html

@@ -1,35 +0,0 @@
-<q-card>
-  <q-card-section>
-    <q-btn
-      label="Onchain -> Lightning"
-      unelevated
-      color="primary"
-      @click="submarineSwapDialog.show = true"
-    >
-      <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left">
-        Send onchain funds offchain (BTC -> LN)
-      </q-tooltip>
-    </q-btn>
-    <q-btn
-      label="Lightning -> Onchain"
-      unelevated
-      color="primary"
-      @click="reverseSubmarineSwapDialog.show = true"
-    >
-      <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left">
-        Send offchain funds to onchain address (LN -> BTC)
-      </q-tooltip>
-    </q-btn>
-    <q-btn
-      label="Auto (Lightning -> Onchain)"
-      unelevated
-      color="primary"
-      @click="autoReverseSubmarineSwapDialog.show = true"
-    >
-      <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left">
-        Automatically send offchain funds to onchain address (LN -> BTC) with a
-        predefined threshold
-      </q-tooltip>
-    </q-btn>
-  </q-card-section>
-</q-card>

lnbits/extensions/boltz/templates/boltz/_checkSwapDialog.html

@@ -1,113 +0,0 @@
-<q-dialog v-model="checkSwapDialog.show" maximized position="top">
-  <q-card v-if="checkSwapDialog.data" class="q-pa-lg lnbits__dialog-card">
-    <h5>pending swaps</h5>
-    <q-table
-      dense
-      flat
-      :data="checkSwapDialog.data.swaps"
-      row-key="id"
-      :columns="allStatusTable.columns"
-      :rows-per-page-options="[0]"
-    >
-      {% raw %}
-      <template v-slot:header="props">
-        <q-tr :props="props">
-          <q-th auto-width></q-th>
-          <q-th v-for="col in props.cols" :key="col.name" :props="props">
-            {{ col.label }}
-          </q-th>
-        </q-tr>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props">
-          <q-td style="width: 10%">
-            <q-btn
-              unelevated
-              dense
-              size="xs"
-              icon="cached"
-              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-              @click="refundSwap(props.row.swap_id)"
-            >
-              <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-                >refund swap</q-tooltip
-              >
-            </q-btn>
-            <q-btn
-              unelevated
-              dense
-              size="xs"
-              icon="download"
-              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-              @click="downloadRefundFile(props.row.swap_id)"
-            >
-              <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-                >dowload refund file</q-tooltip
-              >
-            </q-btn>
-            <q-btn
-              unelevated
-              dense
-              size="xs"
-              icon="flip_to_front"
-              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-              @click="openMempool(props.row.swap_id)"
-            >
-              <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-                >open tx on mempool.space</q-tooltip
-              >
-            </q-btn>
-          </q-td>
-          <q-td v-for="col in props.cols" :key="col.name" :props="props">
-            {{ col.value }}
-          </q-td>
-        </q-tr>
-      </template>
-      {% endraw %}
-    </q-table>
-    <h5>pending reverse swaps</h5>
-    <q-table
-      dense
-      flat
-      :data="checkSwapDialog.data.reverse_swaps"
-      row-key="id"
-      :columns="allStatusTable.columns"
-      :rows-per-page-options="[0]"
-    >
-      {% raw %}
-      <template v-slot:header="props">
-        <q-tr :props="props">
-          <q-th auto-width></q-th>
-          <q-th v-for="col in props.cols" :key="col.name" :props="props">
-            {{ col.label }}
-          </q-th>
-        </q-tr>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props">
-          <q-td style="width: 10%">
-            <q-btn
-              unelevated
-              dense
-              size="xs"
-              icon="flip_to_front"
-              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-              @click="openMempool(props.row.swap_id)"
-            >
-              <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-                >open tx on mempool.space</q-tooltip
-              >
-            </q-btn>
-          </q-td>
-          <q-td v-for="col in props.cols" :key="col.name" :props="props">
-            {{ col.value }}
-          </q-td>
-        </q-tr>
-      </template>
-      {% endraw %}
-    </q-table>
-    <div class="row q-mt-lg q-gutter-sm">
-      <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
-    </div>
-  </q-card>
-</q-dialog>

lnbits/extensions/boltz/templates/boltz/_qrDialog.html

@@ -1,31 +0,0 @@
-<q-dialog v-model="qrCodeDialog.show" position="top">
-  <q-card v-if="qrCodeDialog.data" class="q-pa-lg lnbits__dialog-card">
-    <q-responsive :ratio="1" class="q-mx-xl q-mb-md">
-      <qrcode
-        :value="qrCodeDialog.data.bip21"
-        :options="{width: 800}"
-        class="rounded-borders"
-      ></qrcode>
-    </q-responsive>
-    <div>
-      {% raw %}
-      <b>Bitcoin On-Chain TX</b><br />
-      <b>Expected amount (sats): </b> {{ qrCodeDialog.data.expected_amount }}
-      <br />
-      <b>Expected amount (btc): </b> {{ qrCodeDialog.data.expected_amount_btc }}
-      <br />
-      <b>Onchain Address: </b> {{ qrCodeDialog.data.address }} <br />
-      {% endraw %}
-    </div>
-    <div class="row q-mt-lg q-gutter-sm">
-      <q-btn
-        outline
-        color="grey"
-        @click="copyText(qrCodeDialog.data.address, 'Onchain address copied to clipboard!')"
-        class="q-ml-sm"
-        >Copy On-Chain Address</q-btn
-      >
-      <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
-    </div>
-  </q-card>
-</q-dialog>

lnbits/extensions/boltz/templates/boltz/_reverseSubmarineSwapDialog.html

@@ -1,72 +0,0 @@
-<q-dialog v-model="reverseSubmarineSwapDialog.show" position="top">
-  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-    <q-form @submit="sendReverseSubmarineSwapFormData" class="q-gutter-md">
-      <q-select
-        filled
-        dense
-        emit-value
-        v-model="reverseSubmarineSwapDialog.data.wallet"
-        :options="g.user.walletOptions"
-        label="Wallet *"
-        :disable="reverseSubmarineSwapDialog.data.id ? true : false"
-      >
-      </q-select>
-
-      <q-input
-        filled
-        dense
-        emit-value
-        :label="amountLabel()"
-        v-model.trim="reverseSubmarineSwapDialog.data.amount"
-        type="number"
-      ></q-input>
-      <div class="row">
-        <div class="col">
-          <q-checkbox
-            v-model="reverseSubmarineSwapDialog.data.instant_settlement"
-            value="false"
-            label="Instant settlement"
-          >
-            <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left">
-              Create Onchain TX when transaction is in mempool, but not
-              confirmed yet.
-            </q-tooltip>
-          </q-checkbox>
-        </div>
-      </div>
-      <q-input
-        filled
-        dense
-        emit-value
-        v-model.trim="reverseSubmarineSwapDialog.data.onchain_address"
-        type="string"
-        label="Onchain address to receive funds"
-      ></q-input>
-      <div class="row q-mt-lg">
-        <q-btn
-          v-if="reverseSubmarineSwapDialog.data.id"
-          unelevated
-          color="primary"
-          type="submit"
-          label="Update Swap"
-        ></q-btn>
-        <q-btn
-          v-else
-          unelevated
-          color="primary"
-          :disable="disableReverseSubmarineSwapDialog()"
-          type="submit"
-          label="Create Reverse Swap (OUT)"
-        ></q-btn>
-        <q-btn
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          @click="resetReverseSubmarineSwapDialog"
-          >Cancel</q-btn
-        >
-      </div>
-    </q-form>
-  </q-card>
-</q-dialog>

lnbits/extensions/boltz/templates/boltz/_reverseSubmarineSwapList.html

@@ -1,66 +0,0 @@
-<q-card>
-  <q-card-section>
-    <div class="row items-center no-wrap q-mb-md">
-      <div class="col">
-        <h5 class="text-subtitle1 q-my-none">Lightning -> Onchain</h5>
-      </div>
-      <div class="col-auto">
-        <q-btn flat color="grey" @click="exportReverseSubmarineSwapCSV"
-          >Export to CSV</q-btn
-        >
-      </div>
-    </div>
-    <q-table
-      dense
-      flat
-      :data="reverseSubmarineSwaps"
-      row-key="id"
-      :columns="reverseSubmarineSwapTable.columns"
-      :pagination.sync="reverseSubmarineSwapTable.pagination"
-    >
-      {% raw %}
-      <template v-slot:header="props">
-        <q-tr :props="props">
-          <q-th auto-width></q-th>
-          <q-th v-for="col in props.cols" :key="col.name" :props="props">
-            {{ col.label }}
-          </q-th>
-        </q-tr>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props">
-          <q-td style="width: 10%">
-            <q-btn
-              unelevated
-              dense
-              size="xs"
-              icon="info"
-              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-              @click="openStatusDialog(props.row.id, true)"
-            >
-              <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-                >open swap status info</q-tooltip
-              >
-            </q-btn>
-            <q-btn
-              unelevated
-              dense
-              size="xs"
-              icon="flip_to_front"
-              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-              @click="openMempool(props.row.id)"
-            >
-              <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-                >open tx on mempool.space</q-tooltip
-              >
-            </q-btn>
-          </q-td>
-          <q-td v-for="col in props.cols" :key="col.name" :props="props">
-            {{ col.value }}
-          </q-td>
-        </q-tr>
-      </template>
-      {% endraw %}
-    </q-table>
-  </q-card-section>
-</q-card>

lnbits/extensions/boltz/templates/boltz/_statusDialog.html

@@ -1,29 +0,0 @@
-<q-dialog v-model="statusDialog.show" position="top">
-  <q-card v-if="statusDialog.data" class="q-pa-lg lnbits__dialog-card">
-    <div>
-      {% raw %}
-      <b>Status: </b> {{ statusDialog.data.status }} <br />
-      <br />
-      {% endraw %}
-    </div>
-    <div class="row q-mt-lg q-gutter-sm">
-      <q-btn
-        outline
-        color="grey"
-        @click="refundSwap(statusDialog.data.swap_id)"
-        v-if="!statusDialog.data.reverse"
-        class="q-ml-sm"
-        >Refund
-      </q-btn>
-      <q-btn
-        outline
-        color="grey"
-        @click="downloadRefundFile(statusDialog.data.swap_id)"
-        v-if="!statusDialog.data.reverse"
-        class="q-ml-sm"
-        >Download refundfile</q-btn
-      >
-      <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
-    </div>
-  </q-card>
-</q-dialog>

lnbits/extensions/boltz/templates/boltz/_submarineSwapDialog.html

@@ -1,58 +0,0 @@
-<q-dialog v-model="submarineSwapDialog.show" position="top">
-  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-    <q-form @submit="sendSubmarineSwapFormData" class="q-gutter-md">
-      <q-select
-        filled
-        dense
-        emit-value
-        v-model="submarineSwapDialog.data.wallet"
-        :options="g.user.walletOptions"
-        label="Wallet *"
-        :disable="submarineSwapDialog.data.id ? true : false"
-      >
-      </q-select>
-
-      <q-input
-        filled
-        dense
-        emit-value
-        v-model.trim="submarineSwapDialog.data.amount"
-        :label="amountLabel()"
-        type="number"
-      ></q-input>
-      <q-input
-        filled
-        dense
-        emit-value
-        v-model.trim="submarineSwapDialog.data.refund_address"
-        type="string"
-        label="Onchain address to receive funds if swap fails"
-      ></q-input>
-      <div class="row q-mt-lg">
-        <q-btn
-          v-if="submarineSwapDialog.data.id"
-          unelevated
-          color="primary"
-          type="submit"
-          label="Update Swap"
-        ></q-btn>
-        <q-btn
-          v-else
-          unelevated
-          color="primary"
-          :disable="disableSubmarineSwapDialog()"
-          type="submit"
-          label="Create Swap (IN)"
-        ></q-btn>
-        <q-btn
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          @click="resetSubmarineSwapDialog"
-          >Cancel</q-btn
-        >
-      </div>
-    </q-form>
-  </q-card>
-</q-dialog>

lnbits/extensions/boltz/templates/boltz/_submarineSwapList.html

@@ -1,78 +0,0 @@
-<q-card>
-  <q-card-section>
-    <div class="row items-center no-wrap q-mb-md">
-      <div class="col">
-        <h5 class="text-subtitle1 q-my-none">Onchain -> Lightning</h5>
-      </div>
-      <div class="col-auto">
-        <q-btn flat color="grey" @click="exportSubmarineSwapCSV"
-          >Export to CSV</q-btn
-        >
-      </div>
-    </div>
-    <q-table
-      dense
-      flat
-      :data="submarineSwaps"
-      row-key="id"
-      :columns="submarineSwapTable.columns"
-      :pagination.sync="submarineSwapTable.pagination"
-    >
-      {% raw %}
-      <template v-slot:header="props">
-        <q-tr :props="props">
-          <q-th auto-width></q-th>
-          <q-th v-for="col in props.cols" :key="col.name" :props="props">
-            {{ col.label }}
-          </q-th>
-        </q-tr>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props">
-          <q-td style="width: 10%">
-            <q-btn
-              unelevated
-              dense
-              size="xs"
-              icon="visibility"
-              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-              @click="openQrCodeDialog(props.row.id)"
-            >
-              <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-                >open swap onchain details</q-tooltip
-              >
-            </q-btn>
-            <q-btn
-              unelevated
-              dense
-              size="xs"
-              icon="info"
-              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-              @click="openStatusDialog(props.row.id)"
-            >
-              <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-                >open swap status info</q-tooltip
-              >
-            </q-btn>
-            <q-btn
-              unelevated
-              dense
-              size="xs"
-              icon="flip_to_front"
-              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-              @click="openMempool(props.row.id)"
-            >
-              <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-                >open tx on mempool.space</q-tooltip
-              >
-            </q-btn>
-          </q-td>
-          <q-td v-for="col in props.cols" :key="col.name" :props="props">
-            {{ col.value }}
-          </q-td>
-        </q-tr>
-      </template>
-      {% endraw %}
-    </q-table>
-  </q-card-section>
-</q-card>

lnbits/extensions/boltz/templates/boltz/index.html

@@ -1,601 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block page %}
-<div class="row q-col-gutter-md">
-  <div class="col-12 col-md-8 q-gutter-y-md">
-    {% include "boltz/_buttons.html" %} {% include
-    "boltz/_submarineSwapList.html" %} {% include
-    "boltz/_reverseSubmarineSwapList.html" %} {% include
-    "boltz/_autoReverseSwapList.html" %}
-  </div>
-  <div class="col-12 col-md-4 q-gutter-y-md">
-    {% include "boltz/_api_docs.html" %}
-  </div>
-  {% include "boltz/_submarineSwapDialog.html" %} {% include
-  "boltz/_reverseSubmarineSwapDialog.html" %} {% include
-  "boltz/_autoReverseSwapDialog.html" %} {% include "boltz/_qrDialog.html" %} {%
-  include "boltz/_statusDialog.html" %}
-</div>
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script>
-  Vue.component(VueQrcode.name, VueQrcode)
-  new Vue({
-    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
-      return {
-        mempool: '',
-        boltzConfig: {},
-        submarineSwaps: [],
-        reverseSubmarineSwaps: [],
-        autoReverseSubmarineSwaps: [],
-        statuses: [],
-        submarineSwapDialog: {
-          show: false,
-          data: {}
-        },
-        reverseSubmarineSwapDialog: {
-          show: false,
-          data: {
-            instant_settlement: true
-          }
-        },
-        autoReverseSubmarineSwapDialog: {
-          show: false,
-          data: {
-            balance: 100,
-            instant_settlement: true
-          }
-        },
-        qrCodeDialog: {
-          show: false,
-          data: {}
-        },
-        statusDialog: {
-          show: false,
-          data: {}
-        },
-        allStatusTable: {
-          columns: [
-            {
-              name: 'swap_id',
-              align: 'left',
-              label: 'Swap ID',
-              field: 'swap_id'
-            },
-            {
-              name: 'status',
-              align: 'left',
-              label: 'Status',
-              field: 'message'
-            },
-            {
-              name: 'boltz',
-              align: 'left',
-              label: 'Boltz',
-              field: 'boltz'
-            },
-            {
-              name: 'mempool',
-              align: 'left',
-              label: 'Mempool',
-              field: 'mempool'
-            },
-            {
-              name: 'timeout_block_height',
-              align: 'left',
-              label: 'Timeout block height',
-              field: 'timeout_block_height'
-            }
-          ],
-          pagination: {
-            rowsPerPage: 10
-          }
-        },
-        autoReverseSubmarineSwapTable: {
-          columns: [
-            {
-              name: 'time',
-              align: 'left',
-              label: 'Time',
-              field: 'time',
-              sortable: true,
-              format: function (val, row) {
-                return new Date(val * 1000).toUTCString()
-              }
-            },
-            {
-              name: 'wallet',
-              align: 'left',
-              label: 'Wallet',
-              field: data => {
-                let wallet = _.findWhere(this.g.user.wallets, {
-                  id: data.wallet
-                })
-                if (wallet) {
-                  return wallet.name
-                }
-              }
-            },
-            {
-              name: 'balance',
-              align: 'left',
-              label: 'Balance',
-              field: 'balance'
-            },
-            {
-              name: 'amount',
-              align: 'left',
-              label: 'Amount',
-              field: 'amount'
-            },
-            {
-              name: 'onchain_address',
-              align: 'left',
-              label: 'Onchain address',
-              field: 'onchain_address'
-            }
-          ],
-          pagination: {
-            rowsPerPage: 10
-          }
-        },
-        reverseSubmarineSwapTable: {
-          columns: [
-            {
-              name: 'time',
-              align: 'left',
-              label: 'Time',
-              field: 'time',
-              sortable: true,
-              format: function (val, row) {
-                return new Date(val * 1000).toUTCString()
-              }
-            },
-            {
-              name: 'wallet',
-              align: 'left',
-              label: 'Wallet',
-              field: data => {
-                let wallet = _.findWhere(this.g.user.wallets, {
-                  id: data.wallet
-                })
-                if (wallet) {
-                  return wallet.name
-                }
-              }
-            },
-            {
-              name: 'status',
-              align: 'left',
-              label: 'Status',
-              field: 'status'
-            },
-            {
-              name: 'boltz_id',
-              align: 'left',
-              label: 'Boltz ID',
-              field: 'boltz_id'
-            },
-            {
-              name: 'onchain_amount',
-              align: 'left',
-              label: 'Onchain amount',
-              field: 'onchain_amount'
-            },
-            {
-              name: 'timeout_block_height',
-              align: 'left',
-              label: 'Timeout block height',
-              field: 'timeout_block_height'
-            }
-          ],
-          pagination: {
-            rowsPerPage: 10
-          }
-        },
-        submarineSwapTable: {
-          columns: [
-            {
-              name: 'time',
-              align: 'left',
-              label: 'Time',
-              field: 'time',
-              sortable: true,
-              format: function (val, row) {
-                return new Date(val * 1000).toUTCString()
-              }
-            },
-            {
-              name: 'wallet',
-              align: 'left',
-              label: 'Wallet',
-              field: data => {
-                let wallet = _.findWhere(this.g.user.wallets, {
-                  id: data.wallet
-                })
-                if (wallet) {
-                  return wallet.name
-                }
-              }
-            },
-            {
-              name: 'status',
-              align: 'left',
-              label: 'Status',
-              field: 'status'
-            },
-            {
-              name: 'boltz_id',
-              align: 'left',
-              label: 'Boltz ID',
-              field: 'boltz_id'
-            },
-            {
-              name: 'expected_amount',
-              align: 'left',
-              label: 'Expected amount',
-              field: 'expected_amount'
-            },
-            {
-              name: 'timeout_block_height',
-              align: 'left',
-              label: 'Timeout block height',
-              field: 'timeout_block_height'
-            }
-          ],
-          pagination: {
-            rowsPerPage: 10
-          }
-        }
-      }
-    },
-    methods: {
-      getLimits() {
-        if (this.boltzConfig) {
-          return {
-            min: this.boltzConfig.minimal,
-            max: this.boltzConfig.maximal
-          }
-        }
-        return {
-          min: 0,
-          max: 0
-        }
-      },
-      amountLabel() {
-        let limits = this.getLimits()
-        return 'min: (' + limits.min + '), max: (' + limits.max + ')'
-      },
-      disableSubmarineSwapDialog() {
-        const data = this.submarineSwapDialog.data
-        let limits = this.getLimits()
-        return (
-          data.wallet == null ||
-          data.refund_address == null ||
-          data.refund_address.search(
-            /^(bcrt1|bc1|[13])[a-zA-HJ-NP-Z0-9]{25,39}$/
-          ) !== 0 ||
-          data.amount < limits.min ||
-          data.amount > limits.max
-        )
-      },
-      disableReverseSubmarineSwapDialog() {
-        const data = this.reverseSubmarineSwapDialog.data
-        let limits = this.getLimits()
-        return (
-          data.onchain_address == null ||
-          data.onchain_address.search(
-            /^(bcrt1|bc1|[13])[a-zA-HJ-NP-Z0-9]{25,39}$/
-          ) !== 0 ||
-          data.wallet == null ||
-          data.amount < limits.min ||
-          data.amount > limits.max
-        )
-      },
-      disableAutoReverseSubmarineSwapDialog() {
-        const data = this.autoReverseSubmarineSwapDialog.data
-        let limits = this.getLimits()
-        return (
-          data.onchain_address == null ||
-          data.onchain_address.search(
-            /^(bcrt1|bc1|[13])[a-zA-HJ-NP-Z0-9]{25,39}$/
-          ) !== 0 ||
-          data.wallet == null ||
-          data.amount < limits.min ||
-          data.amount > limits.max
-        )
-      },
-      downloadRefundFile(swapId) {
-        let swap = _.findWhere(this.submarineSwaps, {id: swapId})
-        let json = {
-          id: swap.boltz_id,
-          currency: 'BTC',
-          redeemScript: swap.redeem_script,
-          privateKey: swap.refund_privkey,
-          timeoutBlockHeight: swap.timeout_block_height
-        }
-        let hiddenElement = document.createElement('a')
-        hiddenElement.href =
-          'data:application/json;charset=utf-8,' +
-          encodeURI(JSON.stringify(json))
-        hiddenElement.target = '_blank'
-        hiddenElement.download = 'boltz-refund-' + swap.boltz_id + '.json'
-        hiddenElement.click()
-      },
-      refundSwap(swapId) {
-        LNbits.api
-          .request(
-            'POST',
-            '/boltz/api/v1/swap/refund?swap_id=' + swapId,
-            this.g.user.wallets[0].adminkey
-          )
-          .then(res => {
-            this.resetStatusDialog()
-          })
-          .catch(error => {
-            console.log('error', error)
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      openMempool(swap_id) {
-        var swap = _.findWhere(this.submarineSwaps, {id: swap_id})
-        if (swap === undefined) {
-          var swap = _.findWhere(this.reverseSubmarineSwaps, {id: swap_id})
-          var address = swap.lockup_address
-        } else {
-          var address = swap.address
-        }
-        var mempool_address = this.mempool
-
-        // used for development, replace docker hosts with localhost
-        if (mempool_address.search('mempool-web') !== -1) {
-          mempool_address = mempool_address.replace('mempool-web', 'localhost')
-        }
-
-        window.open(mempool_address + '/address/' + address, '_blank')
-      },
-      openStatusDialog(swap_id, reverse) {
-        LNbits.api
-          .request(
-            'POST',
-            '/boltz/api/v1/swap/status?swap_id=' + swap_id,
-            this.g.user.wallets[0].adminkey
-          )
-          .then(res => {
-            this.resetStatusDialog()
-            this.statusDialog.data = {
-              reverse: reverse,
-              swap_id: swap_id,
-              wallet: res.data.wallet,
-              boltz: res.data.boltz,
-              status: res.data.status,
-              mempool: res.data.mempool,
-              timeout_block_height: res.data.timeout_block_height,
-              date: new Date().toUTCString()
-            }
-            this.statusDialog.show = true
-          })
-          .catch(error => {
-            console.log('error', error)
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      openQrCodeDialog(submarineSwapId) {
-        var swap = _.findWhere(this.submarineSwaps, {id: submarineSwapId})
-        if (swap === undefined) {
-          return console.assert('swap is undefined, this should not happen')
-        }
-        this.qrCodeDialog.data = {
-          id: swap.id,
-          expected_amount: swap.expected_amount,
-          expected_amount_btc: swap.expected_amount / 100000000,
-          bip21: swap.bip21,
-          address: swap.address
-        }
-        this.qrCodeDialog.show = true
-      },
-      resetStatusDialog() {
-        this.statusDialog = {
-          show: false,
-          data: {}
-        }
-      },
-      resetSubmarineSwapDialog() {
-        this.submarineSwapDialog = {
-          show: false,
-          data: {}
-        }
-      },
-      resetReverseSubmarineSwapDialog() {
-        this.reverseSubmarineSwapDialog = {
-          show: false,
-          data: {}
-        }
-      },
-      resetAutoReverseSubmarineSwapDialog() {
-        this.autoReverseSubmarineSwapDialog = {
-          show: false,
-          data: {}
-        }
-      },
-      sendReverseSubmarineSwapFormData() {
-        let wallet = _.findWhere(this.g.user.wallets, {
-          id: this.reverseSubmarineSwapDialog.data.wallet
-        })
-        let data = this.reverseSubmarineSwapDialog.data
-        this.createReverseSubmarineSwap(wallet, data)
-      },
-      sendAutoReverseSubmarineSwapFormData() {
-        let wallet = _.findWhere(this.g.user.wallets, {
-          id: this.autoReverseSubmarineSwapDialog.data.wallet
-        })
-        let data = this.autoReverseSubmarineSwapDialog.data
-        this.createAutoReverseSubmarineSwap(wallet, data)
-      },
-      sendSubmarineSwapFormData() {
-        let wallet = _.findWhere(this.g.user.wallets, {
-          id: this.submarineSwapDialog.data.wallet
-        })
-        let data = this.submarineSwapDialog.data
-        this.createSubmarineSwap(wallet, data)
-      },
-      exportSubmarineSwapCSV() {
-        LNbits.utils.exportCSV(
-          this.submarineSwapTable.columns,
-          this.submarineSwaps
-        )
-      },
-      exportReverseSubmarineSwapCSV() {
-        LNbits.utils.exportCSV(
-          this.reverseSubmarineSwapTable.columns,
-          this.reverseSubmarineSwaps
-        )
-      },
-      exportAutoReverseSubmarineSwapCSV() {
-        LNbits.utils.exportCSV(
-          this.autoReverseSubmarineSwapTable.columns,
-          this.autoReverseSubmarineSwaps
-        )
-      },
-      createSubmarineSwap(wallet, data) {
-        LNbits.api
-          .request(
-            'POST',
-            '/boltz/api/v1/swap',
-            this.g.user.wallets[0].adminkey,
-            data
-          )
-          .then(res => {
-            this.submarineSwaps.unshift(res.data)
-            this.resetSubmarineSwapDialog()
-            this.openQrCodeDialog(res.data.id)
-          })
-          .catch(error => {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      createReverseSubmarineSwap(wallet, data) {
-        LNbits.api
-          .request(
-            'POST',
-            '/boltz/api/v1/swap/reverse',
-            this.g.user.wallets[0].adminkey,
-            data
-          )
-          .then(res => {
-            this.reverseSubmarineSwaps.unshift(res.data)
-            this.resetReverseSubmarineSwapDialog()
-          })
-          .catch(error => {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      createAutoReverseSubmarineSwap(wallet, data) {
-        LNbits.api
-          .request(
-            'POST',
-            '/boltz/api/v1/swap/reverse/auto',
-            this.g.user.wallets[0].adminkey,
-            data
-          )
-          .then(res => {
-            this.autoReverseSubmarineSwaps.unshift(res.data)
-            this.resetAutoReverseSubmarineSwapDialog()
-          })
-          .catch(error => {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      deleteAutoReverseSwap(swap_id) {
-        LNbits.api
-          .request(
-            'DELETE',
-            '/boltz/api/v1/swap/reverse/auto/' + swap_id,
-            this.g.user.wallets[0].adminkey
-          )
-          .then(res => {
-            let i = this.autoReverseSubmarineSwaps.findIndex(
-              swap => swap.id === swap_id
-            )
-            this.autoReverseSubmarineSwaps.splice(i, 1)
-          })
-          .catch(error => {
-            console.log(error)
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getSubmarineSwap() {
-        LNbits.api
-          .request(
-            'GET',
-            '/boltz/api/v1/swap?all_wallets=true',
-            this.g.user.wallets[0].inkey
-          )
-          .then(response => {
-            this.submarineSwaps = response.data
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getReverseSubmarineSwap() {
-        LNbits.api
-          .request(
-            'GET',
-            '/boltz/api/v1/swap/reverse?all_wallets=true',
-            this.g.user.wallets[0].inkey
-          )
-          .then(response => {
-            this.reverseSubmarineSwaps = response.data
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getAutoReverseSubmarineSwap() {
-        LNbits.api
-          .request(
-            'GET',
-            '/boltz/api/v1/swap/reverse/auto?all_wallets=true',
-            this.g.user.wallets[0].inkey
-          )
-          .then(response => {
-            this.autoReverseSubmarineSwaps = response.data
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getMempool() {
-        LNbits.api
-          .request('GET', '/boltz/api/v1/swap/mempool')
-          .then(res => {
-            this.mempool = res.data
-          })
-          .catch(error => {
-            console.log('error', error)
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getBoltzConfig() {
-        LNbits.api
-          .request('GET', '/boltz/api/v1/swap/boltz')
-          .then(res => {
-            this.boltzConfig = res.data
-          })
-          .catch(error => {
-            console.log('error', error)
-            LNbits.utils.notifyApiError(error)
-          })
-      }
-    },
-    created: function () {
-      this.getMempool()
-      this.getBoltzConfig()
-      this.getSubmarineSwap()
-      this.getReverseSubmarineSwap()
-      this.getAutoReverseSubmarineSwap()
-    }
-  })
-</script>
-{% endblock %}

lnbits/extensions/boltz/utils.py

@@ -1,87 +0,0 @@
-import asyncio
-import calendar
-import datetime
-from typing import Awaitable
-
-from boltz_client.boltz import BoltzClient, BoltzConfig
-
-from lnbits.core.services import fee_reserve, get_wallet, pay_invoice
-from lnbits.settings import settings
-
-from .models import ReverseSubmarineSwap
-
-
-def create_boltz_client() -> BoltzClient:
-    config = BoltzConfig(
-        network=settings.boltz_network,
-        api_url=settings.boltz_url,
-        mempool_url=f"{settings.boltz_mempool_space_url}/api",
-        mempool_ws_url=f"{settings.boltz_mempool_space_url_ws}/api/v1/ws",
-        referral_id="lnbits",
-    )
-    return BoltzClient(config)
-
-
-async def check_balance(data) -> bool:
-    # check if we can pay the invoice before we create the actual swap on boltz
-    amount_msat = data.amount * 1000
-    fee_reserve_msat = fee_reserve(amount_msat)
-    wallet = await get_wallet(data.wallet)
-    assert wallet
-    if wallet.balance_msat - fee_reserve_msat < amount_msat:
-        return False
-    return True
-
-
-def get_timestamp():
-    date = datetime.datetime.utcnow()
-    return calendar.timegm(date.utctimetuple())
-
-
-async def execute_reverse_swap(client, swap: ReverseSubmarineSwap):
-    # claim_task is watching onchain address for the lockup transaction to arrive / confirm
-    # and if the lockup is there, claim the onchain revealing preimage for hold invoice
-    claim_task = asyncio.create_task(
-        client.claim_reverse_swap(
-            privkey_wif=swap.claim_privkey,
-            preimage_hex=swap.preimage,
-            lockup_address=swap.lockup_address,
-            receive_address=swap.onchain_address,
-            redeem_script_hex=swap.redeem_script,
-        )
-    )
-    # pay_task is paying the hold invoice which gets held until you reveal your preimage when claiming your onchain funds
-    pay_task = pay_invoice_and_update_status(
-        swap.id,
-        claim_task,
-        pay_invoice(
-            wallet_id=swap.wallet,
-            payment_request=swap.invoice,
-            description=f"reverse swap for {swap.onchain_amount} sats on boltz.exchange",
-            extra={"tag": "boltz", "swap_id": swap.id, "reverse": True},
-        ),
-    )
-
-    # they need to run be concurrently, because else pay_task will lock the eventloop and claim_task will not be executed.
-    # the lockup transaction can only happen after you pay the invoice, which cannot be redeemed immediatly -> hold invoice
-    # after getting the lockup transaction, you can claim the onchain funds revealing the preimage for boltz to redeem the hold invoice
-    asyncio.gather(claim_task, pay_task)
-
-
-def pay_invoice_and_update_status(
-    swap_id: str, wstask: asyncio.Task, awaitable: Awaitable
-) -> asyncio.Task:
-    async def _pay_invoice(awaitable):
-        from .crud import update_swap_status
-
-        try:
-            awaited = await awaitable
-            await update_swap_status(swap_id, "complete")
-            return awaited
-        except asyncio.exceptions.CancelledError:
-            """lnbits process was exited, do nothing and handle it in startup script"""
-        except:
-            wstask.cancel()
-            await update_swap_status(swap_id, "failed")
-
-    return asyncio.create_task(_pay_invoice(awaitable))

lnbits/extensions/boltz/views.py

@@ -1,21 +0,0 @@
-from urllib.parse import urlparse
-
-from fastapi import Depends, Request
-from fastapi.templating import Jinja2Templates
-from starlette.responses import HTMLResponse
-
-from lnbits.core.models import User
-from lnbits.decorators import check_user_exists
-
-from . import boltz_ext, boltz_renderer
-
-templates = Jinja2Templates(directory="templates")
-
-
-@boltz_ext.get("/", response_class=HTMLResponse)
-async def index(request: Request, user: User = Depends(check_user_exists)):
-    root_url = urlparse(str(request.url)).netloc
-    return boltz_renderer().TemplateResponse(
-        "boltz/index.html",
-        {"request": request, "user": user.dict(), "root_url": root_url},
-    )

lnbits/extensions/boltz/views_api.py

@@ -1,328 +0,0 @@
-from http import HTTPStatus
-from typing import List
-
-from fastapi import Depends, Query, status
-from starlette.exceptions import HTTPException
-
-from lnbits.core.crud import get_user
-from lnbits.core.services import create_invoice
-from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
-from lnbits.helpers import urlsafe_short_hash
-from lnbits.settings import settings
-
-from . import boltz_ext
-from .crud import (
-    create_auto_reverse_submarine_swap,
-    create_reverse_submarine_swap,
-    create_submarine_swap,
-    delete_auto_reverse_submarine_swap,
-    get_auto_reverse_submarine_swap_by_wallet,
-    get_auto_reverse_submarine_swaps,
-    get_reverse_submarine_swap,
-    get_reverse_submarine_swaps,
-    get_submarine_swap,
-    get_submarine_swaps,
-    update_swap_status,
-)
-from .models import (
-    AutoReverseSubmarineSwap,
-    CreateAutoReverseSubmarineSwap,
-    CreateReverseSubmarineSwap,
-    CreateSubmarineSwap,
-    ReverseSubmarineSwap,
-    SubmarineSwap,
-)
-from .utils import check_balance, create_boltz_client, execute_reverse_swap
-
-
-@boltz_ext.get(
-    "/api/v1/swap/mempool",
-    name=f"boltz.get /swap/mempool",
-    summary="get a the mempool url",
-    description="""
-        This endpoint gets the URL from mempool.space
-    """,
-    response_description="mempool.space url",
-    response_model=str,
-)
-async def api_mempool_url():
-    return settings.boltz_mempool_space_url
-
-
-# NORMAL SWAP
-@boltz_ext.get(
-    "/api/v1/swap",
-    name=f"boltz.get /swap",
-    summary="get a list of swaps a swap",
-    description="""
-        This endpoint gets a list of normal swaps.
-    """,
-    response_description="list of normal swaps",
-    dependencies=[Depends(get_key_type)],
-    response_model=List[SubmarineSwap],
-)
-async def api_submarineswap(
-    g: WalletTypeInfo = Depends(get_key_type),
-    all_wallets: bool = Query(False),
-):
-    wallet_ids = [g.wallet.id]
-    if all_wallets:
-        user = await get_user(g.wallet.user)
-        wallet_ids = user.wallet_ids if user else []
-    return [swap.dict() for swap in await get_submarine_swaps(wallet_ids)]
-
-
-@boltz_ext.post(
-    "/api/v1/swap/refund",
-    name=f"boltz.swap_refund",
-    summary="refund of a swap",
-    description="""
-        This endpoint attempts to refund a normal swaps, creates onchain tx and sets swap status ro refunded.
-    """,
-    response_description="refunded swap with status set to refunded",
-    dependencies=[Depends(require_admin_key)],
-    response_model=SubmarineSwap,
-    responses={
-        400: {"description": "when swap_id is missing"},
-        404: {"description": "when swap is not found"},
-        405: {"description": "when swap is not pending"},
-        500: {
-            "description": "when something goes wrong creating the refund onchain tx"
-        },
-    },
-)
-async def api_submarineswap_refund(swap_id: str):
-    if not swap_id:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST, detail="swap_id missing"
-        )
-    swap = await get_submarine_swap(swap_id)
-    if not swap:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="swap does not exist."
-        )
-    if swap.status != "pending":
-        raise HTTPException(
-            status_code=HTTPStatus.METHOD_NOT_ALLOWED, detail="swap is not pending."
-        )
-
-    client = create_boltz_client()
-    await client.refund_swap(
-        privkey_wif=swap.refund_privkey,
-        lockup_address=swap.address,
-        receive_address=swap.refund_address,
-        redeem_script_hex=swap.redeem_script,
-        timeout_block_height=swap.timeout_block_height,
-    )
-
-    await update_swap_status(swap.id, "refunded")
-    return swap
-
-
-@boltz_ext.post(
-    "/api/v1/swap",
-    status_code=status.HTTP_201_CREATED,
-    name=f"boltz.post /swap",
-    summary="create a submarine swap",
-    description="""
-        This endpoint creates a submarine swap
-    """,
-    response_description="create swap",
-    response_model=SubmarineSwap,
-    dependencies=[Depends(require_admin_key)],
-    responses={
-        405: {
-            "description": "auto reverse swap is active, a swap would immediatly be swapped out again."
-        },
-        500: {"description": "boltz error"},
-    },
-)
-async def api_submarineswap_create(data: CreateSubmarineSwap):
-
-    auto_swap = await get_auto_reverse_submarine_swap_by_wallet(data.wallet)
-    if auto_swap:
-        raise HTTPException(
-            status_code=HTTPStatus.METHOD_NOT_ALLOWED,
-            detail="auto reverse swap is active, a swap would immediatly be swapped out again.",
-        )
-
-    client = create_boltz_client()
-    swap_id = urlsafe_short_hash()
-    payment_hash, payment_request = await create_invoice(
-        wallet_id=data.wallet,
-        amount=data.amount,
-        memo=f"swap of {data.amount} sats on boltz.exchange",
-        extra={"tag": "boltz", "swap_id": swap_id},
-    )
-    refund_privkey_wif, swap = client.create_swap(payment_request)
-    new_swap = await create_submarine_swap(
-        data, swap, swap_id, refund_privkey_wif, payment_hash
-    )
-    return new_swap.dict() if new_swap else None
-
-
-# REVERSE SWAP
-@boltz_ext.get(
-    "/api/v1/swap/reverse",
-    name=f"boltz.get /swap/reverse",
-    summary="get a list of reverse swaps",
-    description="""
-        This endpoint gets a list of reverse swaps.
-    """,
-    response_description="list of reverse swaps",
-    dependencies=[Depends(get_key_type)],
-    response_model=List[ReverseSubmarineSwap],
-)
-async def api_reverse_submarineswap(
-    g: WalletTypeInfo = Depends(get_key_type),
-    all_wallets: bool = Query(False),
-):
-    wallet_ids = [g.wallet.id]
-    if all_wallets:
-        user = await get_user(g.wallet.user)
-        wallet_ids = user.wallet_ids if user else []
-    return [swap for swap in await get_reverse_submarine_swaps(wallet_ids)]
-
-
-@boltz_ext.post(
-    "/api/v1/swap/reverse",
-    status_code=status.HTTP_201_CREATED,
-    name=f"boltz.post /swap/reverse",
-    summary="create a reverse submarine swap",
-    description="""
-        This endpoint creates a reverse submarine swap
-    """,
-    response_description="create reverse swap",
-    response_model=ReverseSubmarineSwap,
-    dependencies=[Depends(require_admin_key)],
-    responses={
-        405: {"description": "not allowed method, insufficient balance"},
-        500: {"description": "boltz error"},
-    },
-)
-async def api_reverse_submarineswap_create(
-    data: CreateReverseSubmarineSwap,
-) -> ReverseSubmarineSwap:
-
-    if not await check_balance(data):
-        raise HTTPException(
-            status_code=HTTPStatus.METHOD_NOT_ALLOWED, detail="Insufficient balance."
-        )
-    client = create_boltz_client()
-    claim_privkey_wif, preimage_hex, swap = client.create_reverse_swap(
-        amount=data.amount
-    )
-    new_swap = await create_reverse_submarine_swap(
-        data, claim_privkey_wif, preimage_hex, swap
-    )
-    await execute_reverse_swap(client, new_swap)
-    return new_swap
-
-
-@boltz_ext.get(
-    "/api/v1/swap/reverse/auto",
-    name=f"boltz.get /swap/reverse/auto",
-    summary="get a list of auto reverse swaps",
-    description="""
-        This endpoint gets a list of auto reverse swaps.
-    """,
-    response_description="list of auto reverse swaps",
-    dependencies=[Depends(get_key_type)],
-    response_model=List[AutoReverseSubmarineSwap],
-)
-async def api_auto_reverse_submarineswap(
-    g: WalletTypeInfo = Depends(get_key_type),
-    all_wallets: bool = Query(False),
-):
-    wallet_ids = [g.wallet.id]
-    if all_wallets:
-        user = await get_user(g.wallet.user)
-        wallet_ids = user.wallet_ids if user else []
-    return [swap.dict() for swap in await get_auto_reverse_submarine_swaps(wallet_ids)]
-
-
-@boltz_ext.post(
-    "/api/v1/swap/reverse/auto",
-    status_code=status.HTTP_201_CREATED,
-    name=f"boltz.post /swap/reverse/auto",
-    summary="create a auto reverse submarine swap",
-    description="""
-        This endpoint creates a auto reverse submarine swap
-    """,
-    response_description="create auto reverse swap",
-    response_model=AutoReverseSubmarineSwap,
-    dependencies=[Depends(require_admin_key)],
-    responses={
-        405: {
-            "description": "auto reverse swap is active, only 1 swap per wallet possible."
-        },
-    },
-)
-async def api_auto_reverse_submarineswap_create(data: CreateAutoReverseSubmarineSwap):
-
-    auto_swap = await get_auto_reverse_submarine_swap_by_wallet(data.wallet)
-    if auto_swap:
-        raise HTTPException(
-            status_code=HTTPStatus.METHOD_NOT_ALLOWED,
-            detail="auto reverse swap is active, only 1 swap per wallet possible.",
-        )
-
-    swap = await create_auto_reverse_submarine_swap(data)
-    return swap.dict() if swap else None
-
-
-@boltz_ext.delete(
-    "/api/v1/swap/reverse/auto/{swap_id}",
-    name=f"boltz.delete /swap/reverse/auto",
-    summary="delete a auto reverse submarine swap",
-    description="""
-        This endpoint deletes a auto reverse submarine swap
-    """,
-    response_description="delete auto reverse swap",
-    dependencies=[Depends(require_admin_key)],
-)
-async def api_auto_reverse_submarineswap_delete(swap_id: str):
-    await delete_auto_reverse_submarine_swap(swap_id)
-    return "OK"
-
-
-@boltz_ext.post(
-    "/api/v1/swap/status",
-    name=f"boltz.swap_status",
-    summary="shows the status of a swap",
-    description="""
-        This endpoint attempts to get the status of the swap.
-    """,
-    response_description="status of swap json",
-    dependencies=[Depends(require_admin_key)],
-    responses={
-        404: {"description": "when swap_id is not found"},
-    },
-)
-async def api_swap_status(swap_id: str):
-    swap = await get_submarine_swap(swap_id) or await get_reverse_submarine_swap(
-        swap_id
-    )
-    if not swap:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="swap does not exist."
-        )
-
-    client = create_boltz_client()
-    status = client.swap_status(swap.boltz_id)
-    return status
-
-
-@boltz_ext.get(
-    "/api/v1/swap/boltz",
-    name=f"boltz.get /swap/boltz",
-    summary="get a boltz configuration",
-    description="""
-        This endpoint gets configuration for boltz. (limits, fees...)
-    """,
-    response_description="dict of boltz config",
-    response_model=dict,
-)
-async def api_boltz_config():
-    client = create_boltz_client()
-    return {"minimal": client.limit_minimal, "maximal": client.limit_maximal}

lnbits/extensions/cashu/README.md

@@ -1,11 +0,0 @@
-# Cashu 
-
-## Create ecash mint for pegging in/out of ecash
-
-
-
-### Usage
-
-1. Enable extension
-2. Create a Mint
-3. Share wallet

lnbits/extensions/cashu/__init__.py

@@ -1,48 +0,0 @@
-import asyncio
-
-from environs import Env
-from fastapi import APIRouter
-from fastapi.staticfiles import StaticFiles
-
-from lnbits.db import Database
-from lnbits.helpers import template_renderer
-from lnbits.tasks import catch_everything_and_restart
-
-db = Database("ext_cashu")
-
-import sys
-
-cashu_static_files = [
-    {
-        "path": "/cashu/static",
-        "app": StaticFiles(directory="lnbits/extensions/cashu/static"),
-        "name": "cashu_static",
-    }
-]
-from cashu.mint.ledger import Ledger
-
-env = Env()
-env.read_env()
-
-ledger = Ledger(
-    db=db,
-    seed=env.str("CASHU_PRIVATE_KEY", default="SuperSecretPrivateKey"),
-    derivation_path="0/0/0/1",
-)
-
-cashu_ext: APIRouter = APIRouter(prefix="/cashu", tags=["cashu"])
-
-
-def cashu_renderer():
-    return template_renderer(["lnbits/extensions/cashu/templates"])
-
-
-from .tasks import startup_cashu_mint, wait_for_paid_invoices
-from .views import *  # noqa
-from .views_api import *  # noqa
-
-
-def cashu_start():
-    loop = asyncio.get_event_loop()
-    loop.create_task(catch_everything_and_restart(startup_cashu_mint))
-    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))