Update installation.md (#1997)

Co-authored-by: jackstar12 <jkranawetter05@gmail.com>

.editorconfig

@@ -0,0 +1,14 @@
+# Top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file, utf-8 charset
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+[/lnbits/static/vendor/*]
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset

.env.example

@@ -8,6 +8,13 @@ PORT=5000
 
 DEBUG=false
 
+# logging into LNBITS_DATA_FOLDER/logs/
+ENABLE_LOG_TO_FILE=true
+
+# https://loguru.readthedocs.io/en/stable/api/logger.html#file
+LOG_ROTATION="100 MB"
+LOG_RETENTION="3 months"
+
 # Server security, rate limiting ips, blocked ips, allowed ips
 LNBITS_RATE_LIMIT_NO="200"
 LNBITS_RATE_LIMIT_UNIT="minute"
@@ -15,11 +22,15 @@ LNBITS_ALLOWED_IPS=""
 LNBITS_BLOCKED_IPS=""
 
 # Allow users and admins by user IDs (comma separated list)
+# if set new users will not be able to create accounts
 LNBITS_ALLOWED_USERS=""
 LNBITS_ADMIN_USERS=""
 # Extensions only admin can access
 LNBITS_ADMIN_EXTENSIONS="ngrok, admin"
 
+# Disable account creation for new users
+# LNBITS_ALLOW_NEW_ACCOUNTS=false
+
 # Enable Admin GUI, available for the first user in LNBITS_ADMIN_USERS if available
 # Warning: Enabling this will make LNbits ignore this configuration file. Your settings will
 # be stored in your database and you will be able to change them only through the Admin UI.
@@ -40,6 +51,11 @@ LNBITS_HIDE_API=false
 # GitHub has rate-limits for its APIs. The limit can be increased specifying a GITHUB_TOKEN
 # LNBITS_EXT_GITHUB_TOKEN=github_pat_xxxxxxxxxxxxxxxxxx
 
+# Path where extensions will be installed (defaults to `./lnbits/`).
+# Inside this directory the `extensions` and `upgrades` sub-directories will be created.
+# LNBITS_EXTENSIONS_PATH="/path/to/some/dir"
+
+
 # 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"
@@ -91,6 +107,12 @@ SPARK_TOKEN=myaccesstoken
 # CoreLightningWallet
 CORELIGHTNING_RPC="/home/bob/.lightning/bitcoin/lightning-rpc"
 
+# CoreLightningRestWallet
+CORELIGHTNING_REST_URL=http://127.0.0.1:8185/
+# Path or BASE64/HEX STRING
+CORELIGHTNING_REST_MACAROON="/path/to/clnrest/access.macaroon"
+CORELIGHTNING_REST_CERT="/path/to/clnrest/tls.cert"
+
 # LnbitsWallet
 LNBITS_ENDPOINT=https://legend.lnbits.com
 LNBITS_KEY=LNBITS_ADMIN_KEY
@@ -133,8 +155,3 @@ ECLAIR_PASS=eclairpw
 # Enter /api in LightningTipBot to get your key
 LNTIPS_API_KEY=LNTIPS_ADMIN_KEY
 LNTIPS_API_ENDPOINT=https://ln.tips
-
-# Cashu Mint
-# Use a long-enough random (!) private key.
-# Once set, you cannot change this key as for now.
-CASHU_PRIVATE_KEY="SuperSecretPrivateKey"

.github/workflows/ci.yml

@@ -1,5 +1,11 @@
 name: LNbits CI
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+
 
 jobs:
 

.github/workflows/codeql.yml

@@ -2,9 +2,9 @@ name: codeql
 
 on:
   push:
-    branches: [main, ]
+    branches: [main, dev]
   pull_request:
-    branches: [main]
+    branches: [main, dev]
   schedule:
     - cron: '0 12 * * 5'
 

.github/workflows/lint.yml

@@ -23,5 +23,5 @@ jobs:
   prettier:
     uses: ./.github/workflows/make.yml
     with:
-      make: prettier
+      make: checkprettier
       npm: true

.github/workflows/nix.yml

@@ -0,0 +1,28 @@
+name: LNbits CI / nix
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+    paths:
+      - 'flake.nix'
+      - 'flake.lock'
+      - 'pyproject.toml'
+      - 'poetry.lock'
+  pull_request:
+    paths:
+      - 'flake.nix'
+      - 'flake.lock'
+      - 'pyproject.toml'
+      - 'poetry.lock'
+
+jobs:
+  nix:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v23
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - run: nix build

Makefile

@@ -30,6 +30,9 @@ checkprettier:
 checkblack:
 	poetry run black --check .
 
+checkeditorconfig:
+	editorconfig-checker
+
 dev:
 	poetry run lnbits --reload
 
@@ -48,18 +51,17 @@ test-real-wallet:
 	poetry run pytest
 
 test-migration:
-	rm -rf ./migration-data
-	mkdir -p ./migration-data
-	unzip tests/data/mock_data.zip -d ./migration-data
+	LNBITS_ADMIN_UI=True \
+	make test
 	HOST=0.0.0.0 \
 	PORT=5002 \
-	LNBITS_DATA_FOLDER="./migration-data" \
+	LNBITS_DATA_FOLDER="./tests/data" \
 	timeout 5s poetry run lnbits --host 0.0.0.0 --port 5002 || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi
 	HOST=0.0.0.0 \
 	PORT=5002 \
 	LNBITS_DATABASE_URL="postgres://lnbits:lnbits@localhost:5432/migration" \
 	timeout 5s poetry run lnbits --host 0.0.0.0 --port 5002 || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi
-	LNBITS_DATA_FOLDER="./migration-data" \
+	LNBITS_DATA_FOLDER="./tests/data" \
 	LNBITS_DATABASE_URL="postgres://lnbits:lnbits@localhost:5432/migration" \
 	poetry run python tools/conv.py
 

README.md

@@ -1,11 +1,11 @@
-# LNbits
+# LNbits BETA
 
 [![license-badge]](LICENSE)
 [![docs-badge]][docs]
 
 ![Lightning network wallet](https://i.imgur.com/EHvK6Lq.png)
 
-# LNbits v0.10 BETA, free and open-source Lightning wallet accounts system
+# Free and Open-Source Lightning Wallet Accounts System
 
 (Join us on [https://t.me/lnbits](https://t.me/lnbits))
 
@@ -52,7 +52,7 @@ LNURL has a fallback scheme, so if scanned by a regular QR code reader it can de
 ![lnurl fallback](https://i.imgur.com/CPBKHIv.png)
 
 Using **lnbits.com/?lightning="LNURL-withdraw"** will trigger a withdraw that builds an LNbits wallet.
-Example use would be an ATM, which utilises LNURL, if the user scans the QR with a regular QR code scanner app, they will still be able to access the funds.
+Example use would be an ATM, which utilizes LNURL, if the user scans the QR with a regular QR code scanner app, they will still be able to access the funds.
 
 ![lnurl ATM](https://i.imgur.com/Gi6bn3L.jpg)
 

docs/CNAME

@@ -1 +1 @@
-docs.lnbits.org
+docs.lnbits.org

docs/_config.yml

@@ -1,7 +1,7 @@
 title: "LNbits docs"
 remote_theme: pmarsceill/just-the-docs
 color_scheme: dark
-logo: "/logos/lnbits-full--inverse.png"
+logo: "/logos/lnbits-full-inverse.png"
 search_enabled: true
 url: https://docs.lnbits.org
 aux_links:

docs/devs/extensions.md

@@ -6,13 +6,13 @@ nav_order: 2
 ---
 
 
-Making extensions
+Extension set up
 =================
 
-Start off by cloning the [example extension](https://github.com/lnbits/example) into your `lnbits/extensions` folder and renaming it to `mysuperplugin`:
+Start off by creating a fork of the [example extension](https://github.com/lnbits/example) into own GitHub repository and rename the repository to `mysuperplugin`:
 ```sh
-cd lnbits/extensions
-git clone https://github.com/lnbits/example.git --depth=1 mysuperplugin # Let's not use dashes or anything; it doesn't like those.
+cd [my-working-folder]
+git clone https://github.com/[my-user-name]/mysuperplugin.git --depth=1 # Let's not use dashes or anything; it doesn't like those.
 cd mysuperplugin
 rm -rf .git/
 find . -type f -print0 | xargs -0 sed -i 's/example/mysuperplugin/g' # Change all occurrences of 'example' to your plugin name 'mysuperplugin'.
@@ -20,7 +20,18 @@ mv templates/example templates/mysuperplugin # Rename templates folder.
 ```
 - if you are on macOS and having difficulty with 'sed', consider `brew install gnu-sed` and use 'gsed', without -0 option after xargs.
 
-Going over the example extension's structure:
+1. Edit `manifest.json` and change the organisation name to your GitHub username.
+1. Push your changes to GitHub. 
+1. In GitHub create a new release for your extension repo. Tag the release with `0.0.1`
+1. Copy the URL of the extension's raw `manifest.json` URL `https://raw.githubusercontent.com/[my-user-name]/mysuperplugin/master/manifest.json`
+1. If you are using the LMNbits Admin UI, go to the Admin UI > Server > Extension Sources, click "Add", paste the URL, then click "Save"
+1. If you are configuring LNbits via environment variables, add the URL to the .env file's `LNBITS_EXTENSIONS_MANIFESTS` variable. Restart the LNbits python process
+1. You will now see your extension in the LNbits > Extensions list. Click "Enable" to enable it.
+1. ...
+1. Profit!!!
+
+Extension structure explained
+-----------------------------
 * views_api.py: This is where your public API would go. It will be exposed at "$DOMAIN/$PLUGIN/$ROUTE". For example: https://lnbits.com/mysuperplugin/api/v1/tools.
 * views.py: The `/` path will show up as your plugin's home page in lnbits' UI. Other pages you can define yourself. The `templates` folder should explain itself in relation to this.
 * migrations.py: Create database tables for your plugin. They'll be created automatically when you start lnbits.

docs/devs/websockets.md

@@ -9,7 +9,7 @@ nav_order: 2
 Websockets
 =================
 
-`websockets` are a great way to add a two way instant data channel between server and client. 
+`websockets` are a great way to add a two way instant data channel between server and client.
 
 LNbits has a useful in built websocket tool. With a websocket client connect to (obv change `somespecificid`) `wss://legend.lnbits.com/api/v1/ws/somespecificid` (you can use an online websocket tester). Now make a get to `https://legend.lnbits.com/api/v1/ws/somespecificid/somedata`. You can send data to that websocket by using `from lnbits.core.services import websocketUpdater` and the function `websocketUpdater("somespecificid", "somdata")`.
 

docs/guide/admin_ui.md

@@ -8,7 +8,7 @@ nav_order: 4
 Admin UI
 ========
 The LNbits Admin UI lets you change LNbits settings via the LNbits frontend.
-It is disabled by default and the first time you set the environment variable LNBITS_ADMIN_UI=true
+It is disabled by default and the first time you set the environment variable `LNBITS_ADMIN_UI=true`
 the settings are initialized and saved to the database and will be used from there as long the UI is enabled.
 From there on the settings from the database are used.
 
@@ -32,15 +32,18 @@ There is also the possibility of posting the super user via webhook to another s
 
 Admin Users
 ===========
-environment variable: LNBITS_ADMIN_USERS, comma-separated list of user ids
-Admin Users can change settings in the admin ui as well, with the exception of funding source settings, because they require e server restart and could potentially make the server inaccessable. Also they have access to all the extension defined in LNBITS_ADMIN_EXTENSIONS.
+environment variable: `LNBITS_ADMIN_USERS`, comma-separated list of user ids
+Admin Users can change settings in the admin ui as well, with the exception of funding source settings, because they require e server restart and could potentially make the server inaccessable. Also they have access to all the extension defined in `LNBITS_ADMIN_EXTENSIONS`.
 
 
 Allowed Users
 =============
-environment variable: LNBITS_ALLOWED_USERS, comma-separated list of user ids
+environment variable: `LNBITS_ALLOWED_USERS`, comma-separated list of user ids
 By defining this users, LNbits will no longer be usable by the public, only defined users and admins can then access the LNbits frontend.
 
+Setting this environment variable also disables account creation.
+Account creation can be also disabled by setting `LNBITS_ALLOW_NEW_ACCOUNTS=false`
+
 
 How to activate
 =============
@@ -52,8 +55,8 @@ $ sudo nano .env
 -> set: `LNBITS_ADMIN_UI=true`
 
 Now start LNbits once in the terminal window
-``` 
-$ poetry run lnbits 
+```
+$ poetry run lnbits
 ```
 You can now `cat` the Super User ID:
 ```

docs/guide/extension-install.md

@@ -15,7 +15,7 @@ An `Extension Manifest` is a link to a `JSON` file which contains information ab
 Multiple repositories can be configured. For more information check the [Manifest File](https://github.com/lnbits/lnbits/blob/main/docs/guide/extension-install.md#manifest-file) section.
 
 
-**LNbits** administrators should configure their instances to use repositories that they trust (like the [lnbits-extensions](https://github.com/lnbits/lnbits-extensions/) one). 
+**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!!
 
@@ -40,9 +40,9 @@ Click the `Manage` button in order to install a particular release of the extens
 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
 
 
@@ -109,12 +109,12 @@ It goes under the `extensions` object and it is of the form:
 | 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.   
+| 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:
 

docs/guide/faq.md

@@ -19,24 +19,24 @@ allow-self-payment=1
 ```
 
 </details>
-  
+
 <details><summary>Funding source only available via tor (e.g. Start9 or Umbrel)</summary>
   <p>If you want your setup to stay behind tor then only apps, pos and wallets that have tor activated can communicate with your wallets. Most likely you will have trouble when people try to redeem your voucher through onion or when importing your lnbits wallets into a wallet-app that doesnt support tor. If you plan to let LNbits wallets interact with plain internet shops and services you should consider <a href="https://github.com/TrezorHannes/Dual-LND-Hybrid-VPS">setting up hybrid mode for your node</a>.</p>
 </details>
-    
+
 <details><summary>Funding source is in a cloud</summary>
   <p>This means that you might not have access to some files which would allow certain administrative functions. E.g. on <a href="https://voltage.cloud/">Voltage</a> lnd.conf can not be edited. Payments from your node to LNbits wallets can therefore not be configurated in this case atm so you will need to take an extra wallet to send from funding source->wallet x->LNbits wallet (only) for the initial funding of the wallet.</p>
 </details>
-    
+
 <details><summary>LNbits via clearnet domain</summary>
   <p><a href="https://github.com/TrezorHannes/Dual-LND-Hybrid-VPS">Step by step guide how to convert your Tor only node</a> into a clearnet node to make apps like LNbits accessible via https.</p>
 </details>
-    
+
 <details><summary>Which funding sources can I use for LNbits?</summary>
   <p>There are several ways to run a LNbits instance funded from different sources. It is important to choose a source that has a good liquidity and good peers connected. If you use LNbits for public services your users´ payments can then flow happily in both directions. If you would like to fund your LNbits wallet via btc please see section Troubleshooting.</p>
   <p>The <a href="http://docs.lnbits.org/guide/wallets.html">LNbits manual</a> shows you which sources can be used and how to configure each: CLN, LND, LNPay, Cliche, OpenNode as well as bots.</p>
 </details>
-    
+
 <!--Later to be added
 <details><summary>Advanced setup options</summary>
   <p>more text coming soon...</p>
@@ -61,7 +61,7 @@ allow-self-payment=1
       <details><summary>LNbits is running via Tor only, you can't open it on a public domain like lnbits.yourdomain.com</summary>
         <ul>
         <li>Given that you want your setup to stay like this open your LNbits wallet using the .onion URI and create it again. In this way the QR is generated to be accessible via this .onion URI so via tor only. Do not generate that QR from a .local URI, because it will not be reachable via internet - only from within your home-LAN.</li>
-        <li>Open your LN wallet app that you used to scan that QR and this time by using tor (see wallet app settings). 
+        <li>Open your LN wallet app that you used to scan that QR and this time by using tor (see wallet app settings).
           If the app doesn't offer tor, you can use Orbot (Android) instead. See section Installation->Clearnet for detailed instructions.</li>
         </ul>
       </details>
@@ -70,7 +70,7 @@ allow-self-payment=1
       <details><summary>LNbits is running via Tor only, you want to offer public LN services via https</summary>
        <ul>
        <li>For this we need to partially open LNbits to a clearnet (domain/IP) through a https SSL certificate. Follow the instructions from <a href="https://docs.lnbits.org/guide/installation.html#reverse-proxy-with-automatic-https-using-caddy">this LNbits caddy installation instruction</a>.
-        You need to have a domain and to be able to configure a CNAME for your DNS record as well as generate a subdomain dedicated to your LNbits instance like eg. lnbits.yourdomain.com. 
+        You need to have a domain and to be able to configure a CNAME for your DNS record as well as generate a subdomain dedicated to your LNbits instance like eg. lnbits.yourdomain.com.
         You also need access to your internet router to open the https port (usually 443) and forward it your LNbits IP within your LAN (usually 80). The ports might depend on your node implementation if those ports do not work please ask for them in a help group of your node supplier.</li>
        <li>You can also follow the Apache installation option, explained in the <a href="https://docs.lnbits.org/guide/installation.html#running-behind-an-apache2-reverse-proxy-over-https">LNbits installation manual</a>.</li>
        <li>If you run LNbits from a bundle node (myNode, Start9, Umbrel,Raspiblitz etc), you can follow <a href="https://github.com/TrezorHannes/vps-lnbits">this extensive guide</a> with many options to switch your Tor only LNbits into a clearnet LNbits. For Citadel there is a HTTPS Option in your manual to activate https for LNbits in the newest version.</li>
@@ -89,9 +89,9 @@ allow-self-payment=1
       </li>
       <li>
         <details><summary>Wallet on your own funding source/node</summary>
-        <p>Always save a copy of your wallet-URL, Export2phone-QR or LNDhub for your own wallets in a safe place. 
-           You can find all LNbits users and wallet-IDs in your LNbits user manager extension or in your sqlite database. 
-           To edit or read the LNbits database, go to the LNbits /data folder and look for the file called sqlite.db. 
+        <p>Always save a copy of your wallet-URL, Export2phone-QR or LNDhub for your own wallets in a safe place.
+           You can find all LNbits users and wallet-IDs in your LNbits user manager extension or in your sqlite database.
+           To edit or read the LNbits database, go to the LNbits /data folder and look for the file called sqlite.db.
            You can open and edit it with excel or with a dedicated SQL-Editor like <a href="https://sqlitebrowser.org/">SQLite browser</a>.</p>
         </details>
       </li>
@@ -100,7 +100,7 @@ allow-self-payment=1
 
 <details><summary>Configure a comment that people see when paying to my LNURLp QR</summary>
   <p>When you create a LNURL-p, by default the comment box is not filled. That means comments are not allowed to be attached to payments.<p>
-  <p>In order to allow comments, add the characters lenght of the box, from 1 to 250. Once you put a number there, 
+  <p>In order to allow comments, add the characters lenght of the box, from 1 to 250. Once you put a number there,
      the comment box will be displayed in the payment process. You can also edit a LNURL-p already created and add that number.</p>
 
 ![lnbits-lnurl-comment.png](https://i.postimg.cc/HkJQ9xKr/lnbits-lnurl-comment.png)
@@ -113,16 +113,16 @@ allow-self-payment=1
     <li>
       <details><summary>A - Via an external swap service</summary>
         <p>If the user do not have full access of your LNbits, is just an external user, can use swap services like <a href="https://boltz.exchange/">Boltz</a>, <a href="https://fixedfloat.com/">FixedFloat</a>, <a href="https://swap.diamondhands.technology/">DiamondHands</a> or <a href="https://zigzag.io/">ZigZag</a>.</p>
-        <p>This is useful if you provide only LNURL/LN invoices from your LNbits instance, but a payer only has onchain sats so 
+        <p>This is useful if you provide only LNURL/LN invoices from your LNbits instance, but a payer only has onchain sats so
            they will have to the swap those sats first on their side.</p>
         <p>The procedure is simple: user sends onchain btc to the swap service and provides the LNURL / LN invoice from LNbits as destination of the swap.</p>
       </details>
     </li>
     <li>
       <details><summary>B - Using the Onchain LNbits extension</summary>
-        <p>Keep in mind that this is a separate wallet, not the LN btc one that is represented by LNbits as "your wallet" upon your LN funding source. 
-           This onchain wallet can be used also to swap LN btc to (e.g. your hardwarewallet) by using the LNbits Boltz or Deezy extension. 
-           If you run a webshop that is linked to your LNbits for LN payments, it is very handy to regularly drain all the sats from LN into onchain. 
+        <p>Keep in mind that this is a separate wallet, not the LN btc one that is represented by LNbits as "your wallet" upon your LN funding source.
+           This onchain wallet can be used also to swap LN btc to (e.g. your hardwarewallet) by using the LNbits Boltz or Deezy extension.
+           If you run a webshop that is linked to your LNbits for LN payments, it is very handy to regularly drain all the sats from LN into onchain.
            This leads to more space in your LN channels to be able to receive new fresh sats.</p>
         <p>Procedure:</p>
           <ul>
@@ -130,25 +130,25 @@ allow-self-payment=1
           <li>Go to wallet information and copy the xpub</li>
           <li>Go to LNbits - Onchain extension and create a new watch-only wallet with that xpub</li>
           <li>Go to LNbits - Tipjar extension and create a new Tipjar. Select also the onchain option besides the LN wallet.</li>
-          <li>Optional - Go to LNbits - SatsPay extension and create a new charge for onchain btc. 
+          <li>Optional - Go to LNbits - SatsPay extension and create a new charge for onchain btc.
               You can choose between onchain and LN or both. It will then create    an invoice that can be shared.</li>
-          <li>Optional - If you use your LNbits linked to a Wordpress + Woocommerce page, once you create/link a watch-only wallet to your LN btc shop wallet, 
+          <li>Optional - If you use your LNbits linked to a Wordpress + Woocommerce page, once you create/link a watch-only wallet to your LN btc shop wallet,
               the customer will have both options to pay on the same screen.</li>
           </ul>
         </details>
     </li>
   </ul>
 </details>
-   
+
 <details><summary>Where can I see payment details?</summary>
-  <p>When you receive a payment in LNbits, the transaction log will display only a resumed type of the transaction. 
+  <p>When you receive a payment in LNbits, the transaction log will display only a resumed type of the transaction.
 
 ![lnbits-tx-log.png](https://i.postimg.cc/gk2FMFG9/lnbits-tx-log.png)
 
   <p>In your transaction overview you will find a little green arrow for received and a red arrow for sended funds.<p>
   <p>If you click on those arrows, a details popup shows attached messages as well as the sender´s name if given.</p>
 </details>
- 
+
   <details><summary>Can I configure a name to the payments i make?</summary>
   <p>In LNbits this is currently not possible to do - but to receive. This is only possible if the sender's LN wallet supports <a href="https://github.com/lnurl/luds">LUD-18</a> (nameDesc) like e.g. <a href="https://darthcoin.substack.com/p/obw-open-bitcoin-wallet">Open Bitcion Wallet - OBW</a> does. You will then see an alias/pseudonym in the details section of your LNbits transactions (click the arrows). Note that you can give any name there and it might not be related to the real sender´s name(!) if your receive such.</p>
 ![lnbits-tx-details.png](https://i.postimg.cc/yYnvyK4w/lnbits-tx-details.png)
@@ -171,7 +171,7 @@ allow-self-payment=1
 <details><summary>ATM - deposit and withdraw in your shop or at your meetup</summary>
   <p>This is a do-it-yourself project consisting of a mini-computer (Raspberry Pi Zero), a coin acceptor, a display, a 3D printed case, and a Bitcoin Lightning wallet as a funding source. It exchanges fiat coins for valuable Bitcoin Lightning ⚡ Satoshis. The user can pick up the Satoshis via QR code (LNURL-withdraw) on a mobile phone wallet. You can get the components as individual parts and build the case yourself e.g. from <a href="https://www.Fulmo.org">Fulmo</a> who also made a <a href="https://blog.fulmo.org/the-lightningatm-pocket-edition/">guide</a> on it. The shop offers payments in Bitcoin and Lightning ⚡. The code can be found on <a href="https://github.com/21isenough/LightningATM">the ATM github project page></a>.</p>
 </details>
-  
+
 <details><summary>POS Terminal - an offline terminal for merchants</summary>
   <p>The LNpos is a self-sufficient point of sale terminal which allows offline onchain payments and an offline Lightning ATM for withdrawals. Free and open source software, free from intermediaries, with integrated battery, WLAN, DIY. You can get the 3D print as well as the whole kit from the LNbits shop from 👇 Resources. It allows
     <li>LNPoS Online interactive Lightning payments</li>
@@ -183,21 +183,21 @@ allow-self-payment=1
       </p>
 </p>
 </details>
-    
+
 <details><summary>Hardware Wallet- build your own, stack harder</summary>
 <p>The hardwarewallet is a very cheap solution for builders. The projects´ <a hrel="https://github.com/lnbits/hardware-wallet">code and installation instructions for the LNbits hardware wallet can be found on github</a></p>
   <p>
     <img width="546" alt="Bildschirm­foto 2023-01-20 um 18 08 37" src="https://user-images.githubusercontent.com/63317640/213760948-38fd77b0-9247-4505-9433-f5af1b223527.png">
   </p>
 </details>
-    
+
 <details><summary>Bitcoin Switch - turn things on with bitcoin</summary>
   <p>Candy dispenser, vending machines (online), grabbing machines, jukeboxes, bandits and <a href="https://github.com/cryptoteun/awesome-lnbits">all sorts of other things have already been build with LNbits´ tools</a>. Further info see 👇 Resources.</p>
 <p>
   <img width="549" alt="Bildschirm­foto 2023-01-20 um 18 11 55" src="https://user-images.githubusercontent.com/63317640/213761646-d25d4745-e50d-4389-98e5-f83237a8cf6b.png">
   </p>
 </details>
-    
+
 <details><summary>Vending machine (offline)</summary>
 <p>This code works similar to the LNpos. Note that the <a href=" https://www.youtube.com/watch?v=Fg0UuuzsYXc&t=762s">setup-video for the vending machine</a> misses the new way of installing it via the new LNURLdevices extension. The <a href="https://github.com/arcbtc/LNURLVend">vending machine project code resides on github</a>.</p>
   <p>
@@ -262,7 +262,7 @@ allow-self-payment=1
 </ul>
 
 ## Developing for LNbits
- <ul> 
+ <ul>
     <li><a href="http://docs.lnbits.org/devs/development.html">Making Estension / how to use Websockets / API reference</a></li>
     <li><a href="https://t.me/lnbits">Telegram LNbits Support Group</a></li></ul>
 </ul>

docs/guide/fastapi_transition.md

@@ -2,7 +2,7 @@
 ## Defining a route with path parameters
 **old:**
 ```python
-# with <> 
+# with <>
 @offlineshop_ext.route("/lnurl/<item_id>", methods=["GET"])
 ```
 
@@ -35,8 +35,8 @@ async def extensions(user: User = Depends(check_user_exists)):
 ```python
 return (
     {
-        "id": wallet.wallet.id, 
-        "name": wallet.wallet.name, 
+        "id": wallet.wallet.id,
+        "name": wallet.wallet.name,
         "balance": wallet.wallet.balance_msat
     },
     HTTPStatus.OK,
@@ -47,8 +47,8 @@ FastAPI returns `HTTPStatus.OK` by default id no Exception is raised
 **new:**
 ```python
 return {
-    "id": wallet.wallet.id, 
-    "name": wallet.wallet.name, 
+    "id": wallet.wallet.id,
+    "name": wallet.wallet.name,
     "balance": wallet.wallet.balance_msat
 }
 ```
@@ -119,4 +119,4 @@ Instead of hitting the database over and over again, we can store a short lived
 Example:
 * Get transactions for a wallet ID
 * User data for a user id
-* Wallet data for a Admin / Invoice key
+* Wallet data for a Admin / Invoice key

docs/guide/installation.md

@@ -16,6 +16,7 @@ Mininum poetry version has is ^1.2, but it is recommended to use latest poetry.
 
 ```sh
 git clone https://github.com/lnbits/lnbits.git
+git checkout main
 cd lnbits
 
 # for making sure python 3.9 is installed, skip if installed. To check your installed version: python3 --version

docs/guide/wallets.md

@@ -18,6 +18,12 @@ A backend wallet can be configured using the following LNbits environment variab
 - `LNBITS_BACKEND_WALLET_CLASS`: **CoreLightningWallet**
 - `CORELIGHTNING_RPC`: /file/path/lightning-rpc
 
+### CoreLightning REST
+- `LNBITS_BACKEND_WALLET_CLASS`: **CoreLightningRestWallet**
+- `CORELIGHTNING_REST_URL`: http://127.0.0.1:8185/
+- `CORELIGHTNING_REST_MACAROON`: /file/path/admin.macaroon or Base64/Hex
+- `CORELIGHTNING_REST_CERT`: /home/lightning/clnrest/tls.cert
+
 ### Spark (Core Lightning)
 
 - `LNBITS_BACKEND_WALLET_CLASS`: **SparkWallet**
@@ -29,7 +35,7 @@ A backend wallet can be configured using the following LNbits environment variab
 - `LNBITS_BACKEND_WALLET_CLASS`: **LndRestWallet**
 - `LND_REST_ENDPOINT`: http://10.147.17.230:8080/
 - `LND_REST_CERT`: /file/path/tls.cert
-- `LND_REST_MACAROON`: /file/path/admin.macaroon or Bech64/Hex
+- `LND_REST_MACAROON`: /file/path/admin.macaroon or Base64/Hex
 
 or
 
@@ -41,7 +47,7 @@ or
 - `LND_GRPC_ENDPOINT`: ip_address
 - `LND_GRPC_PORT`: port
 - `LND_GRPC_CERT`: /file/path/tls.cert
-- `LND_GRPC_MACAROON`: /file/path/admin.macaroon or Bech64/Hex
+- `LND_GRPC_MACAROON`: /file/path/admin.macaroon or Base64/Hex
 
 You can also use an AES-encrypted macaroon (more info) instead by using
 

docs/index.md

@@ -11,7 +11,7 @@ LNbits, free and open-source lightning-network wallet/accounts system
 LNbits is a very simple Python application that sits on top of any funding source, and can be used as:
 
 * Accounts system to mitigate the risk of exposing applications to your full balance, via unique API keys for each wallet
-* Extendable platform for exploring lightning-network functionality via LNbits extension framework 
+* Extendable platform for exploring lightning-network functionality via LNbits extension framework
 * Part of a development stack via LNbits API
 * Fallback wallet for the LNURL scheme
 * Instant wallet for LN demonstrations

docs/logos/lnbits-full--inverse.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 101.041 30.0001"><defs><path id="a" d="M33.2619 148.1667h154.2143v68.7917H33.2619z"/></defs><g fill="#1f2234" aria-label="LNbits" font-family="sans-serif" font-size=".3095" font-weight="400" letter-spacing=".0031" style="line-height:1.25;white-space:pre;shape-inside:url(#a)" transform="matrix(72.4607 0 0 72.4607 -2399.2814 -10741.3589)"><g transform="matrix(.00244 0 0 .00244 33.0708 148.1594)"><circle cx="101.2976" cy="116.4167" r="84.6667" fill="#673ab7" fill-rule="evenodd"/><path fill="#eee" d="M79.1105 71.9667v49.0613h13.3803v40.141l31.2208-53.5213h-17.8404l17.8404-35.681z"/></g><g fill="#eee" font-family="roboto"><path d="M33.6755 148.518h.0962v.0364h-.1416v-.22h.0454zM33.9796 148.5544h-.0453l-.0883-.1448v.1448h-.0453v-.22h.0453l.0884.145v-.145h.0452z" font-weight="700" style="-inkscape-font-specification:'roboto Bold'"/><path d="M34.1625 148.4744q0 .0375-.0172.0603-.0172.0227-.0462.0227-.031 0-.048-.0219l-.0014.019h-.0256v-.2322h.028v.0866q.0168-.021.0466-.021.0298 0 .0467.0225.017.0225.017.0617zm-.028-.003q0-.0286-.011-.044-.011-.0157-.0317-.0157-.0277 0-.0398.0257v.0707q.0129.0257.04.0257.0202 0 .0314-.0156.0112-.0156.0112-.0469zM34.231 148.5544h-.028v-.1635h.028zm-.0302-.2069q0-.007.0041-.0115.0042-.005.0124-.005.0082 0 .0124.005.0042.005.0042.0115 0 .007-.0042.0113-.0042.005-.0124.005-.0082 0-.0124-.005-.004-.005-.004-.0113zM34.3167 148.3513v.0396h.0305v.0216h-.0305v.1014q0 .01.004.0148.0042.005.014.005.0048 0 .0133-.002v.0227q-.011.003-.0215.003-.0187 0-.0283-.0113-.0095-.0113-.0095-.0322v-.1014h-.0297v-.0216h.0297v-.0396zM34.478 148.511q0-.0113-.0086-.0175-.0085-.006-.0298-.0109-.0211-.005-.0337-.0109-.0124-.006-.0184-.015t-.006-.0209q0-.02.017-.034.017-.0139.0435-.0139.0278 0 .045.0144.0174.0144.0174.0367h-.028q0-.0115-.0099-.0198-.0097-.008-.0245-.008-.0152 0-.0238.007-.0086.007-.0086.0174 0 .0101.008.0153.008.005.0288.01.021.005.034.0112.013.007.0192.0157.0063.009.0063.0222 0 .022-.0175.0352-.0175.0131-.0455.0131-.0197 0-.0348-.007-.015-.007-.0237-.0193-.0085-.0125-.0085-.027h.028q.0007.014.0111.0223.0106.008.0279.008.0158 0 .0253-.006.0097-.006.0097-.0172z" style="-inkscape-font-specification:roboto"/></g></g></svg>

docs/logos/lnbits.svg

@@ -1,19 +1,4 @@
 <svg width="900" height="900" viewBox="0 0 900 900" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_i_10_29)">
 <circle cx="450" cy="450" r="450" fill="#1E1E1E"/>
-</g>
 <path d="M387.802 476.423L281.613 730.887L584.54 389.763H459.418L619.113 168.387H407.558L305.485 476.423H387.802Z" fill="#FF1FE1"/>
-<defs>
-<filter id="filter0_i_10_29" x="-0.1" y="-0.1" width="900.1" height="900.1" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feMorphology radius="0.6" operator="dilate" in="SourceAlpha" result="effect1_innerShadow_10_29"/>
-<feOffset dx="-1" dy="-0.4"/>
-<feGaussianBlur stdDeviation="0.35"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.121569 0 0 0 0 0.882353 0 0 0 1 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_10_29"/>
-</filter>
-</defs>
 </svg>

flake.lock

@@ -1,12 +1,15 @@
 {
   "nodes": {
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
@@ -15,6 +18,27 @@
         "type": "github"
       }
     },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "poetry2nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1688870561,
+        "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1678470307,
@@ -34,16 +58,17 @@
     "poetry2nix": {
       "inputs": {
         "flake-utils": "flake-utils",
+        "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1678513806,
-        "narHash": "sha256-bEto1lp9bIQ+DlJsXQyRxN5l6B/oy3Skb7DueYRJJBo=",
+        "lastModified": 1695386222,
+        "narHash": "sha256-5lgnhCCGW0NH5+m5iTED8u6NSSM/dbH9LBPvX0x0XXg=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "bf239d53fafb53cf439a72b3a50e86dd6a3984a5",
+        "rev": "093383b3d7fdd36846a7d84e128ca11865800538",
         "type": "github"
       },
       "original": {
@@ -57,6 +82,21 @@
         "nixpkgs": "nixpkgs",
         "poetry2nix": "poetry2nix"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -28,13 +28,29 @@
       });
       overlays = {
         default = final: prev: {
-          ${projectName} = self.packages.${final.hostPlatform.system}.${projectName};
+          ${projectName} = self.packages.${prev.stdenv.hostPlatform.system}.${projectName};
         };
       };
       packages = forAllSystems (system: pkgs: {
         default = self.packages.${system}.${projectName};
         ${projectName} = pkgs.poetry2nix.mkPoetryApplication {
           projectDir = ./.;
+          meta.rev = self.dirtyRev or self.rev;
+          overrides = pkgs.poetry2nix.overrides.withDefaults (final: prev: {
+            ruff = prev.ruff.override { preferWheel = true; };
+            fastapi = prev.fastapi.overridePythonAttrs (old: {
+              postPatch = ''
+                substituteInPlace pyproject.toml \
+                  --replace '"Framework :: Pydantic",' "" \
+                  --replace '"Framework :: Pydantic :: 1",' ""
+              '';
+            });
+            bolt11 = prev.bolt11.overrideAttrs (old: {
+              nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
+                prev.poetry
+              ];
+            });
+          });
         };
       });
       nixosModules = {

lnbits/app.py

@@ -9,6 +9,7 @@ import sys
 import traceback
 from hashlib import sha256
 from http import HTTPStatus
+from pathlib import Path
 from typing import Callable, List
 
 from fastapi import FastAPI, HTTPException, Request
@@ -33,14 +34,11 @@ from lnbits.utils.cache import cache
 from lnbits.wallets import get_wallet_class, set_wallet_class
 
 from .commands import db_versions, load_disabled_extension_list, migrate_databases
-from .core import (
-    add_installed_extension,
-    core_app,
-    core_app_extra,
-    update_installed_extension_state,
-)
+from .core import init_core_routers
+from .core.db import core_app_extra
 from .core.services import check_admin_settings, check_webpush_settings
-from .core.views.generic import core_html_routes
+from .core.views.api import add_installed_extension
+from .core.views.generic import update_installed_extension_state
 from .extension_manager import Extension, InstallableExtension, get_valid_extensions
 from .helpers import template_renderer
 from .middleware import (
@@ -74,6 +72,10 @@ def create_app() -> FastAPI:
         },
     )
 
+    # Allow registering new extensions routes without direct access to the `app` object
+    setattr(core_app_extra, "register_new_ext_routes", register_new_ext_routes(app))
+    setattr(core_app_extra, "register_new_ratelimiter", register_new_ratelimiter(app))
+
     app.mount("/static", StaticFiles(packages=[("lnbits", "static")]), name="static")
     app.mount(
         "/core/static",
@@ -95,16 +97,18 @@ def create_app() -> FastAPI:
     app.add_middleware(InstalledExtensionMiddleware)
     app.add_middleware(ExtensionsRedirectMiddleware)
 
+    register_custom_extensions_path()
+
+    # adds security middleware
+    add_ip_block_middleware(app)
+    add_ratelimit_middleware(app)
+
     register_startup(app)
     register_routes(app)
     register_async_tasks(app)
     register_exception_handlers(app)
     register_shutdown(app)
 
-    # Allow registering new extensions routes without direct access to the `app` object
-    setattr(core_app_extra, "register_new_ext_routes", register_new_ext_routes(app))
-    setattr(core_app_extra, "register_new_ratelimiter", register_new_ratelimiter(app))
-
     return app
 
 
@@ -228,9 +232,7 @@ def check_installed_extension_files(ext: InstallableExtension) -> bool:
     if ext.has_installed_version:
         return True
 
-    zip_files = glob.glob(
-        os.path.join(settings.lnbits_data_folder, "extensions", "*.zip")
-    )
+    zip_files = glob.glob(os.path.join(settings.lnbits_data_folder, "zips", "*.zip"))
 
     if f"./{str(ext.zip_path)}" not in zip_files:
         ext.download_archive()
@@ -257,17 +259,32 @@ async def restore_installed_extension(app: FastAPI, ext: InstallableExtension):
 
 def register_routes(app: FastAPI) -> None:
     """Register FastAPI routes / LNbits extensions."""
-    app.include_router(core_app)
-    app.include_router(core_html_routes)
+    init_core_routers(app)
 
     for ext in get_valid_extensions():
         try:
             register_ext_routes(app, ext)
         except Exception as e:
-            logger.error(str(e))
-            raise ImportError(
-                f"Please make sure that the extension `{ext.code}` follows conventions."
-            )
+            logger.error(f"Could not load extension `{ext.code}`: {str(e)}")
+
+
+def register_custom_extensions_path():
+    if settings.has_default_extension_path:
+        return
+    default_ext_path = os.path.join("lnbits", "extensions")
+    if os.path.isdir(default_ext_path) and len(os.listdir(default_ext_path)) != 0:
+        logger.warning(
+            "You are using a custom extensions path, "
+            + "but the default extensions directory is not empty. "
+            + f"Please clean-up the '{default_ext_path}' directory."
+        )
+        logger.warning(
+            f"You can move the existing '{default_ext_path}' directory to: "
+            + f" '{settings.lnbits_extensions_path}/extensions'"
+        )
+
+    sys.path.append(str(Path(settings.lnbits_extensions_path, "extensions")))
+    sys.path.append(str(Path(settings.lnbits_extensions_path, "upgrades")))
 
 
 def register_new_ext_routes(app: FastAPI) -> Callable:
@@ -306,7 +323,10 @@ def register_ext_routes(app: FastAPI, ext: Extension) -> None:
     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"])
+            static_dir = Path(
+                settings.lnbits_extensions_path, "extensions", *s["path"].split("/")
+            )
+            app.mount(s["path"], StaticFiles(directory=static_dir), s["name"])
 
     if hasattr(ext_module, f"{ext.code}_redirect_paths"):
         ext_redirects = getattr(ext_module, f"{ext.code}_redirect_paths")
@@ -336,10 +356,6 @@ def register_startup(app: FastAPI):
 
             log_server_info()
 
-            # adds security middleware
-            add_ratelimit_middleware(app)
-            add_ip_block_middleware(app)
-
             # initialize WALLET
             try:
                 set_wallet_class()
@@ -402,7 +418,6 @@ def log_server_info():
     logger.info(f"Site title: {settings.lnbits_site_title}")
     logger.info(f"Funding source: {settings.lnbits_backend_wallet_class}")
     logger.info(f"Data folder: {settings.lnbits_data_folder}")
-    logger.info(f"Git version: {settings.lnbits_commit}")
     logger.info(f"Database: {get_db_vendor_name()}")
     logger.info(f"Service fee: {settings.lnbits_service_fee}")
 
@@ -511,6 +526,23 @@ def configure_logger() -> None:
     log_level: str = "DEBUG" if settings.debug else "INFO"
     formatter = Formatter()
     logger.add(sys.stdout, level=log_level, format=formatter.format)
+
+    if settings.enable_log_to_file:
+        logger.add(
+            Path(settings.lnbits_data_folder, "logs", "lnbits.log"),
+            rotation=settings.log_rotation,
+            retention=settings.log_retention,
+            level="INFO",
+            format=formatter.format,
+        )
+        logger.add(
+            Path(settings.lnbits_data_folder, "logs", "debug.log"),
+            rotation=settings.log_rotation,
+            retention=settings.log_retention,
+            level="DEBUG",
+            format=formatter.format,
+        )
+
     logging.getLogger("uvicorn").handlers = [InterceptHandler()]
     logging.getLogger("uvicorn.access").handlers = [InterceptHandler()]
     logging.getLogger("uvicorn.error").handlers = [InterceptHandler()]

lnbits/bolt11.py

@@ -1,365 +1,7 @@
-import hashlib
-import re
-import time
-from decimal import Decimal
-from typing import List, NamedTuple, Optional
-
-import bitstring
-import secp256k1
-from bech32 import CHARSET, bech32_decode, bech32_encode
-from ecdsa import SECP256k1, VerifyingKey
-from ecdsa.util import sigdecode_string
-
-
-class Route(NamedTuple):
-    pubkey: str
-    short_channel_id: str
-    base_fee_msat: int
-    ppm_fee: int
-    cltv: int
-
-
-class Invoice:
-    payment_hash: str
-    amount_msat: int = 0
-    description: Optional[str] = None
-    description_hash: Optional[str] = None
-    payee: Optional[str] = None
-    date: int
-    expiry: int = 3600
-    secret: Optional[str] = None
-    route_hints: List[Route] = []
-    min_final_cltv_expiry: int = 18
-
-
-def decode(pr: str) -> Invoice:
-    """bolt11 decoder,
-    based on https://github.com/rustyrussell/lightning-payencode/blob/master/lnaddr.py
-    """
-
-    hrp, decoded_data = bech32_decode(pr)
-    if hrp is None or decoded_data is None:
-        raise ValueError("Bad bech32 checksum")
-    if not hrp.startswith("ln"):
-        raise ValueError("Does not start with ln")
-
-    bitarray = _u5_to_bitarray(decoded_data)
-
-    # final signature 65 bytes, split it off.
-    if len(bitarray) < 65 * 8:
-        raise ValueError("Too short to contain signature")
-
-    # extract the signature
-    signature = bitarray[-65 * 8 :].tobytes()
-
-    # the tagged fields as a bitstream
-    data = bitstring.ConstBitStream(bitarray[: -65 * 8])
-
-    # build the invoice object
-    invoice = Invoice()
-
-    # decode the amount from the hrp
-    m = re.search(r"[^\d]+", hrp[2:])
-    if m:
-        amountstr = hrp[2 + m.end() :]
-        if amountstr != "":
-            invoice.amount_msat = _unshorten_amount(amountstr)
-
-    # pull out date
-    date_bin = data.read(35)
-    invoice.date = date_bin.uint  # type: ignore
-
-    while data.pos != data.len:
-        tag, tagdata, data = _pull_tagged(data)
-        data_length = len(tagdata or []) / 5
-
-        if tag == "d":
-            invoice.description = _trim_to_bytes(tagdata).decode()
-        elif tag == "h" and data_length == 52:
-            invoice.description_hash = _trim_to_bytes(tagdata).hex()
-        elif tag == "p" and data_length == 52:
-            invoice.payment_hash = _trim_to_bytes(tagdata).hex()
-        elif tag == "x":
-            invoice.expiry = tagdata.uint  # type: ignore
-        elif tag == "n":
-            invoice.payee = _trim_to_bytes(tagdata).hex()
-            # this won't work in most cases, we must extract the payee
-            # from the signature
-        elif tag == "s":
-            invoice.secret = _trim_to_bytes(tagdata).hex()
-        elif tag == "r":
-            s = bitstring.ConstBitStream(tagdata)
-            while s.pos + 264 + 64 + 32 + 32 + 16 < s.len:
-                route = Route(
-                    pubkey=s.read(264).tobytes().hex(),  # type: ignore
-                    short_channel_id=_readable_scid(s.read(64).intbe),  # type: ignore
-                    base_fee_msat=s.read(32).intbe,  # type: ignore
-                    ppm_fee=s.read(32).intbe,  # type: ignore
-                    cltv=s.read(16).intbe,  # type: ignore
-                )
-                invoice.route_hints.append(route)
-
-    # BOLT #11:
-    # A reader MUST check that the `signature` is valid (see the `n` tagged
-    # field specified below).
-    # A reader MUST use the `n` field to validate the signature instead of
-    # performing signature recovery if a valid `n` field is provided.
-    message = bytearray([ord(c) for c in hrp]) + data.tobytes()
-    sig = signature[0:64]
-    if invoice.payee:
-        key = VerifyingKey.from_string(bytes.fromhex(invoice.payee), curve=SECP256k1)
-        key.verify(sig, message, hashlib.sha256, sigdecode=sigdecode_string)
-    else:
-        keys = VerifyingKey.from_public_key_recovery(
-            sig, message, SECP256k1, hashlib.sha256
-        )
-        signaling_byte = signature[64]
-        key = keys[int(signaling_byte)]
-        invoice.payee = key.to_string("compressed").hex()
-
-    return invoice
-
-
-def encode(options):
-    """Convert options into LnAddr and pass it to the encoder"""
-    addr = LnAddr()
-    addr.currency = options["currency"]
-    addr.fallback = options["fallback"] if options["fallback"] else None
-    if options["amount"]:
-        addr.amount = options["amount"]
-    if options["timestamp"]:
-        addr.date = int(options["timestamp"])
-
-    addr.paymenthash = bytes.fromhex(options["paymenthash"])
-
-    if options["description"]:
-        addr.tags.append(("d", options["description"]))
-    if options["description_hash"]:
-        addr.tags.append(("h", options["description_hash"]))
-    if options["expires"]:
-        addr.tags.append(("x", options["expires"]))
-
-    if options["fallback"]:
-        addr.tags.append(("f", options["fallback"]))
-    if options["route"]:
-        for r in options["route"]:
-            splits = r.split("/")
-            route = []
-            while len(splits) >= 5:
-                route.append(
-                    (
-                        bytes.fromhex(splits[0]),
-                        bytes.fromhex(splits[1]),
-                        int(splits[2]),
-                        int(splits[3]),
-                        int(splits[4]),
-                    )
-                )
-                splits = splits[5:]
-            assert len(splits) == 0
-            addr.tags.append(("r", route))
-    return lnencode(addr, options["privkey"])
-
-
-def lnencode(addr, privkey):
-    if addr.amount:
-        amount = Decimal(str(addr.amount))
-        # We can only send down to millisatoshi.
-        if amount * 10**12 % 10:
-            raise ValueError(f"Cannot encode {addr.amount}: too many decimal places")
-
-        amount = addr.currency + shorten_amount(amount)
-    else:
-        amount = addr.currency if addr.currency else ""
-
-    hrp = f"ln{amount}0n"
-
-    # Start with the timestamp
-    data = bitstring.pack("uint:35", addr.date)
-
-    # Payment hash
-    data += tagged_bytes("p", addr.paymenthash)
-    tags_set = set()
-
-    for k, v in addr.tags:
-        # BOLT #11:
-        #
-        # A writer MUST NOT include more than one `d`, `h`, `n` or `x` fields,
-        if k in ("d", "h", "n", "x"):
-            if k in tags_set:
-                raise ValueError(f"Duplicate '{k}' tag")
-
-        if k == "r":
-            route = bitstring.BitArray()
-            for step in v:
-                pubkey, channel, feebase, feerate, cltv = step
-                route.append(
-                    bitstring.BitArray(pubkey)
-                    + bitstring.BitArray(channel)
-                    + bitstring.pack("intbe:32", feebase)
-                    + bitstring.pack("intbe:32", feerate)
-                    + bitstring.pack("intbe:16", cltv)
-                )
-            data += tagged("r", route)
-        elif k == "f":
-            # NOTE: there was an error fallback here that's now removed
-            continue
-        elif k == "d":
-            data += tagged_bytes("d", v.encode())
-        elif k == "x":
-            # Get minimal length by trimming leading 5 bits at a time.
-            expirybits = bitstring.pack("intbe:64", v)[4:64]
-            while expirybits.startswith("0b00000"):
-                expirybits = expirybits[5:]
-            data += tagged("x", expirybits)
-        elif k == "h":
-            data += tagged_bytes("h", v)
-        elif k == "n":
-            data += tagged_bytes("n", v)
-        else:
-            # FIXME: Support unknown tags?
-            raise ValueError(f"Unknown tag {k}")
-
-        tags_set.add(k)
-
-    # BOLT #11:
-    #
-    # A writer MUST include either a `d` or `h` field, and MUST NOT include
-    # both.
-    if "d" in tags_set and "h" in tags_set:
-        raise ValueError("Cannot include both 'd' and 'h'")
-    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).
-    privkey = secp256k1.PrivateKey(bytes.fromhex(privkey))
-    sig = privkey.ecdsa_sign_recoverable(
-        bytearray([ord(c) for c in hrp]) + data.tobytes()
-    )
-    # This doesn't actually serialize, but returns a pair of values :(
-    sig, recid = privkey.ecdsa_recoverable_serialize(sig)
-    data += bytes(sig) + bytes([recid])
-
-    return bech32_encode(hrp, bitarray_to_u5(data))
-
-
-class LnAddr:
-    def __init__(
-        self,
-        paymenthash=None,
-        amount=None,
-        currency="bc",
-        tags=None,
-        date=None,
-        fallback=None,
-    ):
-        self.date = int(time.time()) if not date else int(date)
-        self.tags = [] if not tags else tags
-        self.unknown_tags = []
-        self.paymenthash = paymenthash
-        self.signature = None
-        self.pubkey = None
-        self.fallback = fallback
-        self.currency = currency
-        self.amount = amount
-
-    def __str__(self):
-        assert self.pubkey, "LnAddr, pubkey must be set"
-        pubkey = bytes.hex(self.pubkey.serialize())
-        tags = ", ".join([f"{k}={v}" for k, v in self.tags])
-        return f"LnAddr[{pubkey}, amount={self.amount}{self.currency} tags=[{tags}]]"
-
-
-def shorten_amount(amount):
-    """Given an amount in bitcoin, shorten it"""
-    # Convert to pico initially
-    amount = int(amount * 10**12)
-    units = ["p", "n", "u", "m", ""]
-    unit = ""
-    for unit in units:
-        if amount % 1000 == 0:
-            amount //= 1000
-        else:
-            break
-    return str(amount) + unit
-
-
-def _unshorten_amount(amount: str) -> int:
-    """Given a shortened amount, return millisatoshis"""
-    # BOLT #11:
-    # The following `multiplier` letters are defined:
-    #
-    # * `m` (milli): multiply by 0.001
-    # * `u` (micro): multiply by 0.000001
-    # * `n` (nano): multiply by 0.000000001
-    # * `p` (pico): multiply by 0.000000000001
-    units = {"p": 10**12, "n": 10**9, "u": 10**6, "m": 10**3}
-    unit = str(amount)[-1]
-
-    # BOLT #11:
-    # 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(f"Invalid amount '{amount}'")
-
-    if unit in units:
-        return int(int(amount[:-1]) * 100_000_000_000 / units[unit])
-    else:
-        return int(amount) * 100_000_000_000
-
-
-def _pull_tagged(stream):
-    tag = stream.read(5).uint
-    length = stream.read(5).uint * 32 + stream.read(5).uint
-    return (CHARSET[tag], stream.read(length * 5), stream)
-
-
-# Tagged field containing BitArray
-def tagged(char, bits):
-    # Tagged fields need to be zero-padded to 5 bits.
-    while bits.len % 5 != 0:
-        bits.append("0b0")
-    return (
-        bitstring.pack(
-            "uint:5, uint:5, uint:5",
-            CHARSET.find(char),
-            (bits.len / 5) / 32,
-            (bits.len / 5) % 32,
-        )
-        + bits
-    )
-
-
-def tagged_bytes(char, bits):
-    return tagged(char, bitstring.BitArray(bits))
-
-
-def _trim_to_bytes(barr):
-    # Adds a byte if necessary.
-    b = barr.tobytes()
-    if barr.len % 8 != 0:
-        return b[:-1]
-    return b
-
-
-def _readable_scid(short_channel_id: int) -> str:
-    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:
-    ret = bitstring.BitArray()
-    for a in arr:
-        ret += bitstring.pack("uint:5", a)
-    return ret
-
-
-def bitarray_to_u5(barr):
-    assert barr.len % 5 == 0
-    ret = []
-    s = bitstring.ConstBitStream(barr)
-    while s.pos != s.len:
-        ret.append(s.read(5).uint)  # type: ignore
-    return ret
+from bolt11 import (
+    Bolt11 as Invoice,  # noqa: F401
+)
+from bolt11 import (
+    decode,  # noqa: F401
+    encode,  # noqa: F401
+)

lnbits/commands.py

@@ -15,31 +15,38 @@ from .extension_manager import get_valid_extensions
 
 
 @click.group()
-def command_group():
+def lnbits_cli():
     """
     Python CLI for LNbits
     """
 
 
+@lnbits_cli.group()
+def db():
+    """
+    Database related commands
+    """
+
+
 def get_super_user() -> str:
     """Get the superuser"""
     with open(Path(settings.lnbits_data_folder) / ".super_user", "r") as file:
         return file.readline()
 
 
-@click.command("superuser")
+@lnbits_cli.command("superuser")
 def superuser():
     """Prints the superuser"""
     click.echo(get_super_user())
 
 
-@click.command("superuser-url")
+@lnbits_cli.command("superuser-url")
 def superuser_url():
     """Prints the superuser"""
     click.echo(f"http://{settings.host}:{settings.port}/wallet?usr={get_super_user()}")
 
 
-@click.command("delete-settings")
+@lnbits_cli.command("delete-settings")
 def delete_settings():
     """Deletes the settings"""
 
@@ -51,7 +58,7 @@ def delete_settings():
     loop.run_until_complete(wrap())
 
 
-@click.command("database-migrate")
+@db.command("migrate")
 def database_migrate():
     """Migrate databases"""
     loop = asyncio.get_event_loop()
@@ -82,16 +89,19 @@ async def migrate_databases():
 
         current_versions = await get_dbversions(conn)
         core_version = current_versions.get("core", 0)
-        await run_migration(conn, core_migrations, core_version)
+        await run_migration(conn, core_migrations, "core", core_version)
 
     for ext in get_valid_extensions():
         current_version = current_versions.get(ext.code, 0)
-        await migrate_extension_database(ext, current_version)
+        try:
+            await migrate_extension_database(ext, current_version)
+        except Exception as e:
+            logger.exception(f"Error migrating extension {ext.code}: {e}")
 
     logger.info("✔️ All migrations done.")
 
 
-@click.command("database-versions")
+@db.command("versions")
 def database_versions():
     """Show current database versions"""
     loop = asyncio.get_event_loop()
@@ -112,12 +122,7 @@ async def load_disabled_extension_list() -> None:
 
 def main():
     """main function"""
-    command_group.add_command(superuser)
-    command_group.add_command(superuser_url)
-    command_group.add_command(delete_settings)
-    command_group.add_command(database_migrate)
-    command_group.add_command(database_versions)
-    command_group()
+    lnbits_cli()
 
 
 if __name__ == "__main__":

lnbits/core/__init__.py

@@ -1,15 +1,24 @@
-from fastapi.routing import APIRouter
+from fastapi import APIRouter
 
-from lnbits.core.models import CoreAppExtra
-from lnbits.db import Database
+from .db import core_app_extra, db
+from .views.admin_api import admin_router
+from .views.api import api_router
 
-db = Database("database")
+# this compat is needed for usermanager extension
+from .views.generic import generic_router, update_user_extension
+from .views.node_api import node_router, public_node_router, super_node_router
+from .views.public_api import public_router
 
-core_app: APIRouter = APIRouter(tags=["Core"])
+# backwards compatibility for extensions
+core_app = APIRouter(tags=["Core"])
 
-core_app_extra: CoreAppExtra = CoreAppExtra()
 
-from .views.admin_api import *
-from .views.api import *
-from .views.generic import *
-from .views.public_api import *
+def init_core_routers(app):
+    app.include_router(core_app)
+    app.include_router(generic_router)
+    app.include_router(public_router)
+    app.include_router(api_router)
+    app.include_router(node_router)
+    app.include_router(super_node_router)
+    app.include_router(public_node_router)
+    app.include_router(admin_router)

lnbits/core/crud.py

@@ -1,27 +1,28 @@
 import datetime
 import json
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Literal, Optional
 from urllib.parse import urlparse
 from uuid import UUID, uuid4
 
 import shortuuid
 
-from lnbits import bolt11
+from lnbits.core.db import db
 from lnbits.core.models import WalletType
-from lnbits.db import Connection, Database, Filters, Page
+from lnbits.db import DB_TYPE, SQLITE, Connection, Database, Filters, Page
 from lnbits.extension_manager import InstallableExtension
 from lnbits.settings import (
     AdminSettings,
+    EditableSettings,
     SuperSettings,
     WebPushSettings,
     settings,
 )
 
-from . import db
 from .models import (
     BalanceCheck,
     Payment,
     PaymentFilters,
+    PaymentHistoryPoint,
     TinyURL,
     User,
     Wallet,
@@ -75,7 +76,7 @@ async def get_user(user_id: str, conn: Optional[Connection] = None) -> Optional[
                 SELECT balance FROM balances WHERE wallet = wallets.id
             ), 0) AS balance_msat
             FROM wallets
-            WHERE "user" = ?
+            WHERE "user" = ? and wallets.deleted = false
             """,
             (user_id,),
         )
@@ -533,22 +534,17 @@ async def create_payment(
     memo: str,
     fee: int = 0,
     preimage: Optional[str] = None,
+    expiry: Optional[datetime.datetime] = None,
     pending: bool = True,
     extra: Optional[Dict] = None,
     webhook: Optional[str] = None,
     conn: Optional[Connection] = None,
 ) -> Payment:
-    # todo: add this when tests are fixed
-    previous_payment = await get_wallet_payment(wallet_id, payment_hash, conn=conn)
+    # we don't allow the creation of the same invoice twice
+    # note: this can be removed if the db uniquess constarints are set appropriately
+    previous_payment = await get_standalone_payment(checking_id, conn=conn)
     assert previous_payment is None, "Payment already exists"
 
-    try:
-        invoice = bolt11.decode(payment_request)
-        expiration_date = datetime.datetime.fromtimestamp(invoice.date + invoice.expiry)
-    except Exception:
-        # assume maximum bolt11 expiry of 31 days to be on the safe side
-        expiration_date = datetime.datetime.now() + datetime.timedelta(days=31)
-
     await (conn or db).execute(
         """
         INSERT INTO apipayments
@@ -568,11 +564,11 @@ async def create_payment(
             fee,
             (
                 json.dumps(extra)
-                if extra and extra != {} and type(extra) is dict
+                if extra and extra != {} and isinstance(extra, dict)
                 else None
             ),
             webhook,
-            db.datetime_to_timestamp(expiration_date),
+            db.datetime_to_timestamp(expiry) if expiry else None,
         ),
     )
 
@@ -653,10 +649,77 @@ async def update_payment_extra(
     )
 
 
-async def delete_payment(checking_id: str, conn: Optional[Connection] = None) -> None:
-    await (conn or db).execute(
-        "DELETE FROM apipayments WHERE checking_id = ?", (checking_id,)
+async def update_pending_payments(wallet_id: str):
+    pending_payments = await get_payments(
+        wallet_id=wallet_id,
+        pending=True,
+        exclude_uncheckable=True,
     )
+    for payment in pending_payments:
+        await payment.check_status()
+
+
+DateTrunc = Literal["hour", "day", "month"]
+sqlite_formats = {
+    "hour": "%Y-%m-%d %H:00:00",
+    "day": "%Y-%m-%d 00:00:00",
+    "month": "%Y-%m-01 00:00:00",
+}
+
+
+async def get_payments_history(
+    wallet_id: Optional[str] = None,
+    group: DateTrunc = "day",
+    filters: Optional[Filters] = None,
+) -> List[PaymentHistoryPoint]:
+    if not filters:
+        filters = Filters()
+    where = ["(pending = False OR amount < 0)"]
+    values = []
+    if wallet_id:
+        where.append("wallet = ?")
+        values.append(wallet_id)
+
+    if DB_TYPE == SQLITE and group in sqlite_formats:
+        date_trunc = f"strftime('{sqlite_formats[group]}', time, 'unixepoch')"
+    elif group in ("day", "hour", "month"):
+        date_trunc = f"date_trunc('{group}', time)"
+    else:
+        raise ValueError(f"Invalid group value: {group}")
+
+    transactions = await db.fetchall(
+        f"""
+        SELECT {date_trunc} date,
+               SUM(CASE WHEN amount > 0 THEN amount ELSE 0 END) income,
+               SUM(CASE WHEN amount < 0 THEN abs(amount) + abs(fee) ELSE 0 END) spending
+        FROM apipayments
+        {filters.where(where)}
+        GROUP BY date
+        ORDER BY date DESC
+        """,
+        filters.values(values),
+    )
+    if wallet_id:
+        wallet = await get_wallet(wallet_id)
+        if wallet:
+            balance = wallet.balance_msat
+        else:
+            raise ValueError("Unknown wallet")
+    else:
+        balance = await get_total_balance()
+
+    # since we dont know the balance at the starting point,
+    # we take the current balance and walk backwards
+    results: list[PaymentHistoryPoint] = []
+    for row in transactions:
+        results.insert(
+            0,
+            PaymentHistoryPoint(
+                balance=balance, date=row[0], income=row[1], spending=row[2]
+            ),
+        )
+        balance -= row.income - row.spending
+    return results
 
 
 async def delete_wallet_payment(
@@ -671,6 +734,10 @@ async def delete_wallet_payment(
 async def check_internal(
     payment_hash: str, conn: Optional[Connection] = None
 ) -> Optional[str]:
+    """
+    Returns the checking_id of the internal payment if it exists,
+    otherwise None
+    """
     row = await (conn or db).fetchone(
         """
         SELECT checking_id FROM apipayments
@@ -797,17 +864,14 @@ async def get_admin_settings(is_super_user: bool = False) -> Optional[AdminSetti
     return admin_settings
 
 
-async def delete_admin_settings():
+async def delete_admin_settings() -> None:
     await db.execute("DELETE FROM settings")
 
 
-async def update_admin_settings(data: dict):
+async def update_admin_settings(data: EditableSettings) -> None:
     row = await db.fetchone("SELECT editable_settings FROM settings")
-    if not row:
-        return None
-    editable_settings = json.loads(row["editable_settings"])
-    for key, value in data.items():
-        editable_settings[key] = value
+    editable_settings = json.loads(row["editable_settings"]) if row else {}
+    editable_settings.update(data.dict(exclude_unset=True))
     await db.execute(
         "UPDATE settings SET editable_settings = ?", (json.dumps(editable_settings),)
     )

lnbits/core/db.py

@@ -0,0 +1,5 @@
+from lnbits.core.models import CoreAppExtra
+from lnbits.db import Database
+
+db = Database("database")
+core_app_extra: CoreAppExtra = CoreAppExtra()

lnbits/core/helpers.py

@@ -6,11 +6,11 @@ from uuid import UUID
 import httpx
 from loguru import logger
 
+from lnbits.core.db import db as core_db
 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
 
 
@@ -25,12 +25,13 @@ async def migrate_extension_database(ext: Extension, current_version):
         )
 
     async with ext_db.connect() as ext_conn:
-        await run_migration(ext_conn, ext_migrations, current_version)
+        await run_migration(ext_conn, ext_migrations, ext.code, current_version)
 
 
-async def run_migration(db: Connection, migrations_module: Any, current_version: int):
+async def run_migration(
+    db: Connection, migrations_module: Any, db_name: str, 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:

lnbits/core/models.py

@@ -235,9 +235,9 @@ class Payment(FromRowModel):
         return status
 
     async def delete(self, conn: Optional[Connection] = None) -> None:
-        from .crud import delete_payment
+        from .crud import delete_wallet_payment
 
-        await delete_payment(self.checking_id, conn=conn)
+        await delete_wallet_payment(self.checking_id, self.wallet_id, conn=conn)
 
 
 class PaymentFilters(FilterModel):
@@ -258,6 +258,13 @@ class PaymentFilters(FilterModel):
     webhook_status: Optional[int]
 
 
+class PaymentHistoryPoint(BaseModel):
+    date: datetime.datetime
+    income: int
+    spending: int
+    balance: int
+
+
 class BalanceCheck(BaseModel):
     wallet: str
     service: str
@@ -332,6 +339,10 @@ class CreateLnurlAuth(BaseModel):
     callback: str
 
 
+class CreateWallet(BaseModel):
+    name: Optional[str] = None
+
+
 class CreateWebPushSubscription(BaseModel):
     subscription: str
 

lnbits/core/services.py

@@ -1,4 +1,5 @@
 import asyncio
+import datetime
 import json
 from io import BytesIO
 from pathlib import Path
@@ -6,6 +7,8 @@ from typing import Dict, List, Optional, Tuple, TypedDict
 from urllib.parse import parse_qs, urlparse
 
 import httpx
+from bolt11 import Bolt11
+from bolt11 import decode as bolt11_decode
 from cryptography.hazmat.primitives import serialization
 from fastapi import Depends, WebSocket
 from lnurl import LnurlErrorResponse
@@ -14,7 +17,7 @@ from loguru import logger
 from py_vapid import Vapid
 from py_vapid.utils import b64urlencode
 
-from lnbits import bolt11
+from lnbits.core.db import db
 from lnbits.db import Connection
 from lnbits.decorators import WalletTypeInfo, require_admin_key
 from lnbits.helpers import url_for
@@ -29,7 +32,6 @@ from lnbits.utils.exchange_rates import fiat_amount_as_satoshis, satoshis_amount
 from lnbits.wallets import FAKE_WALLET, get_wallet_class, set_wallet_class
 from lnbits.wallets.base import PaymentResponse, PaymentStatus
 
-from . import db
 from .crud import (
     check_internal,
     check_internal_pending,
@@ -92,7 +94,9 @@ async def calculate_fiat_amounts(
         extra["wallet_fiat_amount"] = round(fiat_amount, ndigits=3)
         extra["wallet_fiat_rate"] = amount_sat / fiat_amount
 
-    logger.debug(f"Calculated fiat amounts for {wallet}: {extra=}")
+    logger.debug(
+        f"Calculated fiat amounts {wallet.id=} {amount=} {currency=}: {extra=}"
+    )
 
     return amount_sat, extra
 
@@ -136,7 +140,7 @@ async def create_invoice(
     if not ok or not payment_request or not checking_id:
         raise InvoiceFailure(error_message or "unexpected backend error.")
 
-    invoice = bolt11.decode(payment_request)
+    invoice = bolt11_decode(payment_request)
 
     amount_msat = 1000 * amount_sat
     await create_payment(
@@ -145,6 +149,7 @@ async def create_invoice(
         payment_request=payment_request,
         payment_hash=invoice.payment_hash,
         amount=amount_msat,
+        expiry=get_bolt11_expiry(invoice),
         memo=memo,
         extra=extra,
         webhook=webhook,
@@ -173,7 +178,13 @@ async def pay_invoice(
     If the payment is still in flight, we hope that some other process
     will regularly check for the payment.
     """
-    invoice = bolt11.decode(payment_request)
+    invoice = bolt11_decode(payment_request)
+
+    if not invoice.amount_msat or not invoice.amount_msat > 0:
+        raise ValueError("Amountless invoices not supported.")
+    if max_sat and invoice.amount_msat > max_sat * 1000:
+        raise ValueError("Amount in invoice is too high.")
+
     fee_reserve_msat = fee_reserve(invoice.amount_msat)
     async with db.reuse_conn(conn) if conn else db.connect() as conn:
         temp_id = invoice.payment_hash
@@ -185,7 +196,7 @@ async def pay_invoice(
             raise ValueError("Amount in invoice is too high.")
 
         _, extra = await calculate_fiat_amounts(
-            invoice.amount_msat, wallet_id, extra=extra, conn=conn
+            invoice.amount_msat / 1000, wallet_id, extra=extra, conn=conn
         )
 
         # put all parameters that don't change here
@@ -195,6 +206,7 @@ async def pay_invoice(
             payment_hash: str
             amount: int
             memo: str
+            expiry: Optional[datetime.datetime]
             extra: Optional[Dict]
 
         payment_kwargs: PaymentKwargs = PaymentKwargs(
@@ -202,6 +214,7 @@ async def pay_invoice(
             payment_request=payment_request,
             payment_hash=invoice.payment_hash,
             amount=-invoice.amount_msat,
+            expiry=get_bolt11_expiry(invoice),
             memo=description or invoice.description or "",
             extra=extra,
         )
@@ -571,7 +584,7 @@ async def check_webpush_settings():
             "lnbits_webpush_pubkey": pubkey,
         }
         update_cached_settings(push_settings)
-        await update_admin_settings(push_settings)
+        await update_admin_settings(EditableSettings(**push_settings))
 
     logger.info("Initialized webpush settings with generated VAPID key pair.")
     logger.info(f"Pubkey: {settings.lnbits_webpush_pubkey}")
@@ -642,3 +655,11 @@ async def get_balance_delta() -> Tuple[int, int, int]:
     if error_message:
         raise Exception(error_message)
     return node_balance - total_balance, node_balance, total_balance
+
+
+def get_bolt11_expiry(invoice: Bolt11) -> datetime.datetime:
+    if invoice.expiry:
+        return datetime.datetime.fromtimestamp(invoice.date + invoice.expiry)
+    else:
+        # assume maximum bolt11 expiry of 31 days to be on the safe side
+        return datetime.datetime.now() + datetime.timedelta(days=31)

lnbits/core/static/js/index.js

@@ -5,14 +5,22 @@ new Vue({
     return {
       disclaimerDialog: {
         show: false,
-        data: {}
+        data: {},
+        description: ''
       },
       walletName: ''
     }
   },
+  computed: {
+    formatDescription() {
+      return LNbits.utils.convertMarkdown(this.description)
+    }
+  },
   methods: {
     createWallet: function () {
-      LNbits.href.createWallet(this.walletName)
+      LNbits.api.createAccount(this.walletName).then(res => {
+        window.location = '/wallet?usr=' + res.data.user + '&wal=' + res.data.id
+      })
     },
     processing: function () {
       this.$q.notify({
@@ -21,5 +29,8 @@ new Vue({
         icon: null
       })
     }
+  },
+  created() {
+    this.description = SITE_DESCRIPTION
   }
 })

lnbits/core/static/js/node.js

@@ -0,0 +1,268 @@
+function shortenNodeId(nodeId) {
+  return nodeId
+    ? nodeId.substring(0, 5) + '...' + nodeId.substring(nodeId.length - 5)
+    : '...'
+}
+
+Vue.component('lnbits-node-ranks', {
+  props: ['ranks'],
+  data: function () {
+    return {
+      user: {},
+      stats: [
+        {label: 'Capacity', key: 'capacity'},
+        {label: 'Channels', key: 'channelcount'},
+        {label: 'Age', key: 'age'},
+        {label: 'Growth', key: 'growth'},
+        {label: 'Availability', key: 'availability'}
+      ]
+    }
+  },
+  template: `
+    <q-card class='q-my-none'>
+    <div class='column q-ma-md'>
+      <h5 class='text-subtitle1 text-bold q-my-none'>1ml Node Rank</h5>
+      <div v-for='stat in stats' class='q-gutter-sm'>
+        <div class='row items-center'>
+          <div class='col-9'>{{ stat.label }}</div>
+          <div class='col-3 text-subtitle1 text-bold'>
+            {{ (ranks && ranks[stat.key]) ?? '-' }}
+          </div>
+        </div>
+      </div>
+    </div>
+    </q-card>
+  `
+})
+
+Vue.component('lnbits-channel-stats', {
+  props: ['stats'],
+  data: function () {
+    return {
+      states: [
+        {label: 'Active', value: 'active', color: 'green'},
+        {label: 'Pending', value: 'pending', color: 'orange'},
+        {label: 'Inactive', value: 'inactive', color: 'grey'},
+        {label: 'Closed', value: 'closed', color: 'red'}
+      ]
+    }
+  },
+  template: `
+    <q-card>
+    <div class='column q-ma-md'>
+      <h5 class='text-subtitle1 text-bold q-my-none'>Channels</h5>
+      <div v-for='state in states' class='q-gutter-sm'>
+        <div class='row'>
+          <div class='col-9'>
+            <q-badge rounded size='md' :color='state.color'>{{ state.label }}</q-badge>
+          </div>
+          <div class='col-3 text-subtitle1 text-bold'>
+            {{ (stats?.counts && stats.counts[state.value]) ?? "-" }}
+          </div>
+        </div>
+      </div>
+    </div>
+    </q-card>
+  `,
+  created: function () {
+    if (window.user) {
+      this.user = LNbits.map.user(window.user)
+    }
+  }
+})
+
+Vue.component('lnbits-stat', {
+  props: ['title', 'amount', 'msat', 'btc'],
+  computed: {
+    value: function () {
+      return (
+        this.amount ??
+        (this.btc
+          ? LNbits.utils.formatSat(this.btc)
+          : LNbits.utils.formatMsat(this.msat))
+      )
+    }
+  },
+  template: `
+    <q-card>
+    <q-card-section>
+      <div class='text-overline text-primary'>
+        {{ title }}
+      </div>
+      <div>
+        <span class='text-h4 text-bold q-my-none'>{{ value }}</span>
+        <span class='text-h5' v-if='msat != undefined'>sats</span>
+        <span class='text-h5' v-if='btc != undefined'>BTC</span>
+      </div>
+    </q-card-section>
+    </q-card>
+  `
+})
+
+Vue.component('lnbits-node-qrcode', {
+  props: ['info'],
+  mixins: [windowMixin],
+  template: `
+    <q-card class="my-card">
+      <q-card-section>
+        <div class="text-h6">
+          <div style="text-align: center">
+            <qrcode
+              :value="info.addresses[0]"
+              :options="{width: 250}"
+              v-if='info.addresses[0]'
+              class="rounded-borders"
+            ></qrcode>
+            <div v-else class='text-subtitle1'>
+              No addresses available
+            </div>
+          </div>
+        </div>
+      </q-card-section>
+      <q-card-actions vertical>
+        <q-btn
+          dense
+          unelevated
+          size="md"
+          @click="copyText(info.id)"
+        >Public Key<q-tooltip> Click to copy </q-tooltip>
+        </q-btn>
+      </q-card-actions>
+    </q-card>
+  `
+})
+
+Vue.component('lnbits-node-info', {
+  props: ['info'],
+  data() {
+    return {
+      showDialog: false
+    }
+  },
+  mixins: [windowMixin],
+  methods: {
+    shortenNodeId
+  },
+  template: `
+    <div class='row items-baseline q-gutter-x-sm'>
+    <div class='text-h4 text-bold'>{{ this.info.alias }}</div>
+    <div class='row items-center q-gutter-sm'>
+      <div class='text-subtitle1 text-light'>{{ this.info.backend_name }}</div>
+      <q-badge
+        :style='\`background-color: #\${this.info.color}\`'
+        class='text-bold'
+      >
+        #{{ this.info.color }}
+      </q-badge>
+      <div class='text-bold'>{{ shortenNodeId(this.info.id) }}</div>
+      <q-btn
+        size='xs'
+        flat
+        dense
+        icon='content_paste'
+        @click='copyText(info.id)'
+      ></q-btn>
+      <q-btn
+        size='xs'
+        flat
+        dense
+        icon='qr_code'
+        @click='showDialog = true'
+      ></q-btn>
+    </div>
+      <q-dialog v-model="showDialog">
+        <lnbits-node-qrcode :info='info'></lnbits-node-qrcode>
+      </q-dialog>
+    </div>
+  `
+})
+
+Vue.component('lnbits-stat', {
+  props: ['title', 'amount', 'msat', 'btc'],
+  computed: {
+    value: function () {
+      return (
+        this.amount ??
+        (this.btc
+          ? LNbits.utils.formatSat(this.btc)
+          : LNbits.utils.formatMsat(this.msat))
+      )
+    }
+  },
+  template: `
+        <q-card>
+        <q-card-section>
+          <div class='text-overline text-primary'>
+            {{ title }}
+          </div>
+          <div>
+            <span class='text-h4 text-bold q-my-none'>{{ value }}</span>
+            <span class='text-h5' v-if='msat != undefined'>sats</span>
+            <span class='text-h5' v-if='btc != undefined'>BTC</span>
+          </div>
+        </q-card-section>
+        </q-card>
+      `
+})
+
+Vue.component('lnbits-channel-balance', {
+  props: ['balance', 'color'],
+  methods: {
+    formatMsat: function (msat) {
+      return LNbits.utils.formatMsat(msat)
+    }
+  },
+  template: `
+    <div>
+        <div class="row items-center justify-between">
+          <span class="text-weight-thin">
+            Local: {{ formatMsat(balance.local_msat) }}
+            sats
+          </span>
+          <span class="text-weight-thin">
+            Remote: {{ formatMsat(balance.remote_msat) }}
+            sats
+          </span>
+        </div>
+
+        <q-linear-progress
+          rounded
+          size="25px"
+          :value="balance.local_msat / balance.total_msat"
+          :color="color"
+          :style="\`color: #\${this.color}\`"
+        >
+          <div class="absolute-full flex flex-center">
+            <q-badge
+              color="white"
+              text-color="accent"
+              :label="formatMsat(balance.total_msat) + ' sats'"
+            >
+              {{ balance.alias }}
+            </q-badge>
+          </div>
+       </q-linear-progress>
+    </div>
+  `
+})
+
+Vue.component('lnbits-date', {
+  props: ['ts'],
+  computed: {
+    date: function () {
+      return Quasar.utils.date.formatDate(
+        new Date(this.ts * 1000),
+        'YYYY-MM-DD HH:mm'
+      )
+    },
+    dateFrom: function () {
+      return moment(this.date).fromNow()
+    }
+  },
+  template: `
+    <div>
+      <q-tooltip>{{ this.date }}</q-tooltip>
+      {{ this.dateFrom }}
+    </div>
+  `
+})

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

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

lnbits/core/static/js/wallet.js

@@ -3,45 +3,24 @@
 Vue.component(VueQrcode.name, VueQrcode)
 Vue.use(VueQrcodeReader)
 
-function generateChart(canvas, payments) {
-  var txs = []
-  var n = 0
-  var data = {
-    labels: [],
-    income: [],
-    outcome: [],
-    cumulative: []
-  }
-
-  _.each(
-    payments.filter(p => !p.pending).sort((a, b) => a.time - b.time),
-    tx => {
-      txs.push({
-        hour: Quasar.utils.date.formatDate(tx.date, 'YYYY-MM-DDTHH:00'),
-        sat: tx.sat
-      })
+function generateChart(canvas, rawData) {
+  const data = rawData.reduce(
+    (previous, current) => {
+      previous.labels.push(current.date)
+      previous.income.push(current.income)
+      previous.spending.push(current.spending)
+      previous.cumulative.push(current.balance)
+      return previous
+    },
+    {
+      labels: [],
+      income: [],
+      spending: [],
+      cumulative: []
     }
   )
 
-  _.each(_.groupBy(txs, 'hour'), (value, day) => {
-    var income = _.reduce(
-      value,
-      (memo, tx) => (tx.sat >= 0 ? memo + tx.sat : memo),
-      0
-    )
-    var outcome = _.reduce(
-      value,
-      (memo, tx) => (tx.sat < 0 ? memo + Math.abs(tx.sat) : memo),
-      0
-    )
-    n = n + income - outcome
-    data.labels.push(day)
-    data.income.push(income)
-    data.outcome.push(outcome)
-    data.cumulative.push(n)
-  })
-
-  new Chart(canvas.getContext('2d'), {
+  return new Chart(canvas.getContext('2d'), {
     type: 'bar',
     data: {
       labels: data.labels,
@@ -64,7 +43,7 @@ function generateChart(canvas, payments) {
           backgroundColor: window.Color('rgb(76,175,80)').alpha(0.5).rgbString() // green
         },
         {
-          data: data.outcome,
+          data: data.spending,
           type: 'bar',
           label: 'out',
           barPercentage: 0.75,
@@ -85,7 +64,7 @@ function generateChart(canvas, payments) {
           {
             type: 'time',
             display: true,
-            offset: true,
+            //offset: true,
             time: {
               minUnit: 'hour',
               stepSize: 3
@@ -248,7 +227,14 @@ new Vue({
         loading: false
       },
       paymentsChart: {
-        show: false
+        show: false,
+        group: {value: 'hour', label: 'Hour'},
+        groupOptions: [
+          {value: 'month', label: 'Month'},
+          {value: 'day', label: 'Day'},
+          {value: 'hour', label: 'Hour'}
+        ],
+        instance: null
       },
       disclaimerDialog: {
         show: false,
@@ -301,9 +287,27 @@ new Vue({
     },
     showChart: function () {
       this.paymentsChart.show = true
-      this.$nextTick(() => {
-        generateChart(this.$refs.canvas, this.payments)
-      })
+      LNbits.api
+        .request(
+          'GET',
+          '/api/v1/payments/history?group=' + this.paymentsChart.group.value,
+          this.g.wallet.adminkey
+        )
+        .then(response => {
+          this.$nextTick(() => {
+            if (this.paymentsChart.instance) {
+              this.paymentsChart.instance.destroy()
+            }
+            this.paymentsChart.instance = generateChart(
+              this.$refs.canvas,
+              response.data
+            )
+          })
+        })
+        .catch(err => {
+          LNbits.utils.notifyApiError(err)
+          this.paymentsChart.show = false
+        })
     },
     focusInput(el) {
       this.$nextTick(() => this.$refs[el].focus())
@@ -331,6 +335,7 @@ new Vue({
       this.parse.data.comment = ''
       this.parse.data.paymentChecker = null
       this.parse.camera.show = false
+      this.focusInput('textArea')
     },
     updateBalance: function (credit) {
       LNbits.api
@@ -697,7 +702,7 @@ new Vue({
 
       LNbits.api
         .authLnurl(this.g.wallet, this.parse.lnurlauth.callback)
-        .then(response => {
+        .then(_ => {
           dismissAuthMsg()
           this.$q.notify({
             message: `Authentication successful.`,
@@ -723,27 +728,35 @@ new Vue({
     updateWallet: function (data) {
       LNbits.api
         .request('PATCH', '/api/v1/wallet', this.g.wallet.adminkey, data)
-        .then(res => {
+        .then(_ => {
           this.$q.notify({
             message: `Wallet updated.`,
             type: 'positive',
             timeout: 3500
           })
-          LNbits.href.updateWallet(
-            res.data.name,
-            this.user.id,
-            this.g.wallet.id
-          )
+          window.location.reload()
         })
         .catch(err => {
           LNbits.utils.notifyApiError(err)
         })
     },
-    deleteWallet: function (walletId, user) {
+    deleteWallet: function () {
       LNbits.utils
         .confirmDialog('Are you sure you want to delete this wallet?')
         .onOk(() => {
-          LNbits.href.deleteWallet(walletId, user)
+          LNbits.api
+            .deleteWallet(this.g.wallet)
+            .then(_ => {
+              this.$q.notify({
+                timeout: 3000,
+                message: `Wallet deleted!`,
+                spinner: true
+              })
+            })
+            .catch(err => {
+              this.paymentsTable.loading = false
+              LNbits.utils.notifyApiError(err)
+            })
         })
     },
     fetchPayments: function (props) {
@@ -791,10 +804,15 @@ new Vue({
       // and would cause duplication in the list
       LNbits.api.getPayments(this.g.wallet, {}).then(response => {
         const payments = response.data.data.map(LNbits.map.payment)
-        LNbits.utils.exportCSV(this.paymentsCSV.columns, payments)
+        LNbits.utils.exportCSV(
+          this.paymentsCSV.columns,
+          payments,
+          this.g.wallet.name + '-payments'
+        )
       })
     },
     pasteToTextArea: function () {
+      this.$refs.textArea.focus() // Set cursor to textarea
       navigator.clipboard.readText().then(text => {
         this.$refs.textArea.value = text
       })
@@ -803,6 +821,9 @@ new Vue({
   watch: {
     payments: function () {
       this.fetchBalance()
+    },
+    'paymentsChart.group': function () {
+      this.showChart()
     }
   },
   created: function () {

lnbits/core/tasks.py

@@ -4,6 +4,18 @@ from typing import Dict
 import httpx
 from loguru import logger
 
+from lnbits.core.crud import (
+    get_balance_notify,
+    get_wallet,
+    get_webpush_subscriptions_for_user,
+)
+from lnbits.core.db import db
+from lnbits.core.models import Payment
+from lnbits.core.services import (
+    get_balance_delta,
+    send_payment_notification,
+    switch_to_voidwallet,
+)
 from lnbits.settings import get_wallet_class, settings
 from lnbits.tasks import (
     SseListenersDict,
@@ -13,15 +25,6 @@ from lnbits.tasks import (
     send_push_notification,
 )
 
-from . import db
-from .crud import (
-    get_balance_notify,
-    get_wallet,
-    get_webpush_subscriptions_for_user,
-)
-from .models import Payment
-from .services import get_balance_delta, send_payment_notification, switch_to_voidwallet
-
 api_invoice_listeners: Dict[str, asyncio.Queue] = SseListenersDict(
     "api_invoice_listeners"
 )

lnbits/core/templates/admin/_tab_funding.html

@@ -25,94 +25,71 @@
           </ul>
           <br />
         </div>
+        <div class="col">
+          {% if LNBITS_NODE_UI_AVAILABLE %}
+          <p>Node Management</p>
+          <q-toggle
+            label="Node UI"
+            v-model="formData.lnbits_node_ui"
+          ></q-toggle>
+          <q-toggle
+            v-if="formData.lnbits_node_ui"
+            label="Public node UI"
+            v-model="formData.lnbits_public_node_ui"
+          ></q-toggle>
+          <br />
+          <q-toggle
+            v-if="formData.lnbits_node_ui"
+            label="Transactions Tab (Disable on large CLN nodes)"
+            v-model="formData.lnbits_node_ui_transactions"
+          ></q-toggle>
+          {% else %}
+          <p>Node Management not supported by active funding source</p>
+          {% endif %}
+        </div>
       </div>
       <div class="row q-col-gutter-md">
         <div class="col-12 col-md-4">
-          <div class="row">
-            <div class="col-12">
-              <p>Active Funding<small> (Requires server restart)</small></p>
-              <q-select
-                :disable="!isSuperUser"
-                filled
-                v-model="formData.lnbits_backend_wallet_class"
-                hint="Select the active funding wallet"
-                :options="settings.lnbits_allowed_funding_sources"
-              ></q-select>
-            </div>
-          </div>
+          <p>Invoice Expiry</p>
+          <q-input
+            filled
+            v-model.number="formData.lightning_invoice_expiry"
+            type="number"
+            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-12 col-md-4">
-              <p>Invoice Expiry</p>
+            <div class="col-6">
               <q-input
-                filled
-                v-model.number="formData.lightning_invoice_expiry"
                 type="number"
-                label="Invoice expiry (seconds)"
-                mask="#######"
+                filled
+                v-model="formData.lnbits_reserve_fee_min"
+                label="Reserve fee in msats"
               >
               </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 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>
       <div v-if="isSuperUser">
-        <p class="q-my-md">
-          Funding Sources<small> (Requires server restart)</small>
-        </p>
-        <q-list
-          v-for="(fund, idx) in settings.lnbits_allowed_funding_sources"
-          :key="idx"
-        >
-          <q-expansion-item
-            expand-separator
-            icon="payments"
-            :label="fund"
-            v-if="funding_sources.get(fund)"
-          >
-            <q-card>
-              <q-card-section
-                v-for="([key, prop], i) in Object.entries(funding_sources.get(fund))"
-                :key="i"
-              >
-                <q-input
-                  dense
-                  filled
-                  type="text"
-                  v-model="formData[key]"
-                  :label="prop.label"
-                  class="q-pr-md"
-                  :hint="prop.hint"
-                ></q-input>
-              </q-card-section>
-            </q-card>
-          </q-expansion-item>
-        </q-list>
+        <lnbits-funding-sources
+          :form-data="formData"
+          :allowed-funding-sources="settings.lnbits_allowed_funding_sources"
+        />
       </div>
     </div>
   </q-card-section>

lnbits/core/templates/admin/_tab_security_notifications.html

@@ -14,7 +14,7 @@
   </template>
 </q-banner>
 <q-banner v-if="!updateAvailable" class="bg-green text-white">
-  <q-icon size="28px" name="checknark"></q-icon>
+  <q-icon size="28px" name="checkmark"></q-icon>
   <span v-text="$t('latest_update', {version: statusData.version})"></span>
 </q-banner>
 <q-card>

lnbits/core/templates/admin/_tab_server.html

@@ -75,7 +75,7 @@
             clearable
             hint="Default currency for accounting"
             label="Currency"
-            :options="formData.lnbits_allowed_currencies.length ? formData.lnbits_allowed_currencies : {{ currencies }}"
+            :options="formData.lnbits_allowed_currencies?.length ? formData.lnbits_allowed_currencies : {{ currencies }}"
           ></q-select>
           <br />
         </div>

lnbits/core/templates/admin/_tab_theme.html

@@ -31,12 +31,12 @@
           v-model="formData.lnbits_site_description"
           filled
           type="textarea"
-          hint="Use plain text or raw HTML"
+          hint="Use plain text, Markdown, or raw HTML"
         />
       </div>
       <br />
       <div class="row q-col-gutter-md">
-        <div class="col-12 col-md-6">
+        <div class="col-12 col-md-4">
           <p>Default Wallet Name</p>
           <q-input
             filled
@@ -46,7 +46,7 @@
           ></q-input>
           <br />
         </div>
-        <div class="col-12 col-md-6">
+        <div class="col-12 col-md-4">
           <p>Denomination</p>
           <q-input
             filled
@@ -57,6 +57,17 @@
           ></q-input>
           <br />
         </div>
+        <div class="col-12 col-md-4">
+          <p>QR code logo</p>
+          <q-input
+            filled
+            type="text"
+            v-model="formData.lnbits_qr_logo"
+            label="https://example.com/image.svg"
+            hint="URL to logo image in QR code"
+          ></q-input>
+          <br />
+        </div>
       </div>
       <div class="row q-col-gutter-md">
         <div class="col-12 col-md-6">

lnbits/core/templates/admin/index.html

@@ -164,522 +164,5 @@
   </q-card>
 </q-dialog>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script>
-  new Vue({
-    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
-      return {
-        settings: {},
-        logs: [],
-        serverlogEnabled: false,
-        lnbits_theme_options: [
-          'classic',
-          'bitcoin',
-          'flamingo',
-          'cyber',
-          'freedom',
-          'mint',
-          'autumn',
-          'monochrome',
-          'salvador'
-        ],
-        auditData: {},
-        statusData: {},
-        statusDataTable: {
-          columns: [
-            {
-              name: 'date',
-              align: 'left',
-              label: this.$t('date'),
-              field: 'date'
-            },
-            {
-              name: 'message',
-              align: 'left',
-              label: this.$t('memo'),
-              field: 'message'
-            }
-          ]
-        },
-        formData: {},
-        formAddAdmin: '',
-        formAddUser: '',
-        formAddExtensionsManifest: '',
-        formAllowedIPs: '',
-        formBlockedIPs: '',
-        isSuperUser: false,
-        wallet: {},
-        cancel: {},
-        topUpDialog: {
-          show: false
-        },
-        tab: 'funding',
-        needsRestart: false,
-        funding_sources: new Map([
-          ['VoidWallet', null],
-          [
-            'FakeWallet',
-            {
-              fake_wallet_secret: {
-                value: null,
-                label: 'Secret'
-              }
-            }
-          ],
-          [
-            'CoreLightningWallet',
-            {
-              corelightning_rpc: {
-                value: null,
-                label: 'Endpoint'
-              }
-            }
-          ],
-          [
-            'CoreLightningRestWallet',
-            {
-              corelightning_rest_url: {
-                value: null,
-                label: 'Endpoint'
-              },
-              corelightning_rest_cert: {
-                value: null,
-                label: 'Certificate'
-              },
-              corelightning_rest_macaroon: {
-                value: null,
-                label: 'Macaroon'
-              }
-            }
-          ],
-          [
-            'LndRestWallet',
-            {
-              lnd_rest_endpoint: {
-                value: null,
-                label: 'Endpoint'
-              },
-              lnd_rest_cert: {
-                value: null,
-                label: 'Certificate'
-              },
-              lnd_rest_macaroon: {
-                value: null,
-                label: 'Macaroon'
-              },
-              lnd_rest_macaroon_encrypted: {
-                value: null,
-                label: 'Encrypted Macaroon'
-              }
-            }
-          ],
-          [
-            'LndWallet',
-            {
-              lnd_grpc_endpoint: {
-                value: null,
-                label: 'Endpoint'
-              },
-              lnd_grpc_cert: {
-                value: null,
-                label: 'Certificate'
-              },
-              lnd_grpc_port: {
-                value: null,
-                label: 'Port'
-              },
-              lnd_grpc_admin_macaroon: {
-                value: null,
-                label: 'Admin Macaroon'
-              },
-              lnd_grpc_macaroon_encrypted: {
-                value: null,
-                label: 'Encrypted Macaroon'
-              }
-            }
-          ],
-          [
-            'LnTipsWallet',
-            {
-              lntips_api_endpoint: {
-                value: null,
-                label: 'Endpoint'
-              },
-              lntips_api_key: {
-                value: null,
-                label: 'API Key'
-              }
-            }
-          ],
-          [
-            'LNPayWallet',
-            {
-              lnpay_api_endpoint: {
-                value: null,
-                label: 'Endpoint'
-              },
-              lnpay_api_key: {
-                value: null,
-                label: 'API Key'
-              },
-              lnpay_wallet_key: {
-                value: null,
-                label: 'Wallet Key'
-              }
-            }
-          ],
-          [
-            'EclairWallet',
-            {
-              eclair_url: {
-                value: null,
-                label: 'URL'
-              },
-              eclair_pass: {
-                value: null,
-                label: 'Password'
-              }
-            }
-          ],
-          [
-            'LNbitsWallet',
-            {
-              lnbits_endpoint: {
-                value: null,
-                label: 'Endpoint'
-              },
-              lnbits_key: {
-                value: null,
-                label: 'Admin Key'
-              }
-            }
-          ],
-          [
-            'OpenNodeWallet',
-            {
-              opennode_api_endpoint: {
-                value: null,
-                label: 'Endpoint'
-              },
-              opennode_key: {
-                value: null,
-                label: 'Key'
-              }
-            }
-          ],
-          [
-            'ClicheWallet',
-            {
-              cliche_endpoint: {
-                value: null,
-                label: 'Endpoint'
-              }
-            }
-          ],
-          [
-            'SparkWallet',
-            {
-              spark_url: {
-                value: null,
-                label: 'Endpoint'
-              },
-              spark_token: {
-                value: null,
-                label: 'Token'
-              }
-            }
-          ]
-        ])
-      }
-    },
-    created() {
-      this.getSettings()
-      this.getAudit()
-      this.balance = +'{{ balance|safe }}'
-    },
-    computed: {
-      lnbitsVersion() {
-        return LNBITS_VERSION
-      },
-      checkChanges() {
-        return !_.isEqual(this.settings, this.formData)
-      },
-      updateAvailable() {
-        return LNBITS_VERSION !== this.statusData.version
-      }
-    },
-    methods: {
-      addAdminUser() {
-        let addUser = this.formAddAdmin
-        let admin_users = this.formData.lnbits_admin_users
-        if (addUser && addUser.length && !admin_users.includes(addUser)) {
-          //admin_users = [...admin_users, addUser]
-          this.formData.lnbits_admin_users = [...admin_users, addUser]
-          this.formAddAdmin = ''
-        }
-      },
-      removeAdminUser(user) {
-        let admin_users = this.formData.lnbits_admin_users
-        this.formData.lnbits_admin_users = admin_users.filter(u => u !== user)
-      },
-      addAllowedUser() {
-        let addUser = this.formAddUser
-        let allowed_users = this.formData.lnbits_allowed_users
-        if (addUser && addUser.length && !allowed_users.includes(addUser)) {
-          this.formData.lnbits_allowed_users = [...allowed_users, addUser]
-          this.formAddUser = ''
-        }
-      },
-      removeAllowedUser(user) {
-        let allowed_users = this.formData.lnbits_allowed_users
-        this.formData.lnbits_allowed_users = allowed_users.filter(
-          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
-        )
-      },
-      async toggleServerLog() {
-        this.serverlogEnabled = !this.serverlogEnabled
-        if (this.serverlogEnabled) {
-          const wsProto = location.protocol !== 'http:' ? 'wss://' : 'ws://'
-          const digestHex = await LNbits.utils.digestMessage(this.g.user.id)
-          const localUrl =
-            wsProto +
-            document.domain +
-            ':' +
-            location.port +
-            '/api/v1/ws/' +
-            digestHex
-          this.ws = new WebSocket(localUrl)
-          this.ws.addEventListener('message', async ({data}) => {
-            this.logs.push(data.toString())
-            const scrollArea = this.$refs.logScroll
-            if (scrollArea) {
-              const scrollTarget = scrollArea.getScrollTarget()
-              const duration = 0
-              scrollArea.setScrollPosition(scrollTarget.scrollHeight, duration)
-            }
-          })
-        } else {
-          this.ws.close()
-        }
-      },
-      addAllowedIPs() {
-        const allowedIPs = this.formAllowedIPs.trim()
-        const allowed_ips = this.formData.lnbits_allowed_ips
-        if (
-          allowedIPs &&
-          allowedIPs.length &&
-          !allowed_ips.includes(allowedIPs)
-        ) {
-          this.formData.lnbits_allowed_ips = [...allowed_ips, allowedIPs]
-          this.formAllowedIPs = ''
-        }
-      },
-      removeAllowedIPs(allowed_ip) {
-        const allowed_ips = this.formData.lnbits_allowed_ips
-        this.formData.lnbits_allowed_ips = allowed_ips.filter(
-          a => a !== allowed_ip
-        )
-      },
-      addBlockedIPs() {
-        const blockedIPs = this.formBlockedIPs.trim()
-        const blocked_ips = this.formData.lnbits_blocked_ips
-        if (
-          blockedIPs &&
-          blockedIPs.length &&
-          !blocked_ips.includes(blockedIPs)
-        ) {
-          this.formData.lnbits_blocked_ips = [...blocked_ips, blockedIPs]
-          this.formBlockedIPs = ''
-        }
-      },
-      removeBlockedIPs(blocked_ip) {
-        const blocked_ips = this.formData.lnbits_blocked_ips
-        this.formData.lnbits_blocked_ips = blocked_ips.filter(
-          b => b !== blocked_ip
-        )
-      },
-      restartServer() {
-        LNbits.api
-          .request('GET', '/admin/api/v1/restart/?usr=' + this.g.user.id)
-          .then(response => {
-            this.$q.notify({
-              type: 'positive',
-              message: 'Success! Restarted Server',
-              icon: null
-            })
-            this.needsRestart = false
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      topupWallet() {
-        LNbits.api
-          .request(
-            'PUT',
-            '/admin/api/v1/topup/?usr=' + this.g.user.id,
-            this.g.user.wallets[0].adminkey,
-            this.wallet
-          )
-          .then(response => {
-            this.$q.notify({
-              type: 'positive',
-              message:
-                'Success! Added ' +
-                this.wallet.amount +
-                ' to ' +
-                this.wallet.id,
-              icon: null
-            })
-            this.wallet = {}
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      updateFundingData() {
-        this.settings.lnbits_allowed_funding_sources.map(f => {
-          let opts = this.funding_sources.get(f)
-          if (!opts) return
-          Object.keys(opts).forEach(e => {
-            opts[e].value = this.settings[e]
-          })
-        })
-      },
-      formatDate(date) {
-        return moment(date * 1000).fromNow()
-      },
-      getNotifications() {
-        if (this.settings.lnbits_notifications) {
-          axios
-            .get(this.settings.lnbits_status_manifest)
-            .then(response => {
-              this.statusData = response.data
-            })
-            .catch(error => {
-              this.formData.lnbits_notifications = false
-              error.response.data = {}
-              error.response.data.message = 'Could not fetch status manifest.'
-              LNbits.utils.notifyApiError(error)
-            })
-        }
-      },
-      getAudit() {
-        LNbits.api
-          .request(
-            'GET',
-            '/admin/api/v1/audit/?usr=' + this.g.user.id,
-            this.g.user.wallets[0].adminkey
-          )
-          .then(response => {
-            this.auditData = response.data
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getSettings() {
-        LNbits.api
-          .request(
-            'GET',
-            '/admin/api/v1/settings/?usr=' + this.g.user.id,
-            this.g.user.wallets[0].adminkey
-          )
-          .then(response => {
-            this.isSuperUser = response.data.is_super_user || false
-            this.settings = response.data
-            this.formData = {...this.settings}
-            this.updateFundingData()
-            this.getNotifications()
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      updateSettings() {
-        let data = _.omit(this.formData, [
-          'is_super_user',
-          'lnbits_allowed_funding_sources'
-        ])
-        LNbits.api
-          .request(
-            'PUT',
-            '/admin/api/v1/settings/?usr=' + this.g.user.id,
-            this.g.user.wallets[0].adminkey,
-            data
-          )
-          .then(response => {
-            this.needsRestart =
-              this.settings.lnbits_backend_wallet_class !==
-                this.formData.lnbits_backend_wallet_class ||
-              this.settings.lnbits_killswitch !==
-                this.formData.lnbits_killswitch
-            this.settings = this.formData
-            this.formData = _.clone(this.settings)
-            this.updateFundingData()
-            this.$q.notify({
-              type: 'positive',
-              message: `Success! Settings changed! ${
-                this.needsRestart ? 'Restart required!' : ''
-              }`,
-              icon: null
-            })
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      deleteSettings() {
-        LNbits.utils
-          .confirmDialog(
-            'Are you sure you want to restore settings to default?'
-          )
-          .onOk(() => {
-            LNbits.api
-              .request(
-                'DELETE',
-                '/admin/api/v1/settings/?usr=' + this.g.user.id
-              )
-              .then(response => {
-                this.$q.notify({
-                  type: 'positive',
-                  message:
-                    'Success! Restored settings to defaults, restart required!',
-                  icon: null
-                })
-                this.needsRestart = true
-              })
-              .catch(function (error) {
-                LNbits.utils.notifyApiError(error)
-              })
-          })
-      },
-      downloadBackup() {
-        window.open('/admin/api/v1/backup/?usr=' + this.g.user.id, '_blank')
-      }
-    }
-  })
-</script>
+<script src="/static/js/admin.js"></script>
 {% endblock %}

lnbits/core/templates/core/extensions.html

@@ -165,7 +165,7 @@
           <q-toggle
             v-if="extension.isAvailable && extension.isInstalled && g.user.admin"
             :label="extension.isActive ? $t('activated'):  $t('deactivated') "
-            color="secodary"
+            color="secondary"
             style="max-height: 21px"
             v-model="extension.isActive"
             @input="toggleExtension(extension)"

lnbits/core/templates/core/index.html

@@ -3,6 +3,7 @@
 {% endblock %} {% block page %}
 <div class="row q-col-gutter-md justify-center">
   <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
+    {% if lnurl or LNBITS_NEW_ACCOUNTS_ALLOWED %}
     <q-card>
       <q-card-section>
         {% if lnurl %}
@@ -14,7 +15,7 @@
           href="{{ url_for('core.lnurlwallet') }}?lightning={{ lnurl }}"
           v-text="$t('press_to_claim')"
         ></q-btn>
-        {% else %}
+        {% elif LNBITS_NEW_ACCOUNTS_ALLOWED %}
         <q-form @submit="createWallet" class="q-gutter-md">
           <q-input
             filled
@@ -33,6 +34,7 @@
         {% endif %}
       </q-card-section>
     </q-card>
+    {% endif %}
 
     <q-card>
       <q-card-section>
@@ -61,7 +63,9 @@
             ></q-btn>
           </div>
         </div>
-        <p v-else>{{SITE_DESCRIPTION | safe}}</p>
+        <div v-else>
+          <div v-html="formatDescription"></div>
+        </div>
       </q-card-section>
     </q-card>
   </div>

lnbits/core/templates/core/wallet.html

@@ -240,11 +240,9 @@
                         >
                           <a :href="'lightning:' + props.row.bolt11">
                             <q-responsive :ratio="1" class="q-mx-xl">
-                              <qrcode
+                              <lnbits-qrcode
                                 :value="'lightning:' + props.row.bolt11.toUpperCase()"
-                                :options="{width: 340}"
-                                class="rounded-borders"
-                              ></qrcode>
+                              ></lnbits-qrcode>
                             </q-responsive>
                           </a>
                         </div>
@@ -330,12 +328,11 @@
                   <q-card>
                     <q-card-section class="text-center">
                       <a href="lightning:{{wallet.lnurlwithdraw_full}}">
-                        <qrcode
-                          value="lightning:{{wallet.lnurlwithdraw_full}}"
-                          :options="{width:240}"
-                        ></qrcode>
+                        <lnbits-qrcode
+                          :value="lightning:{{wallet.lnurlwithdraw_full}}"
+                        ></lnbits-qrcode>
                       </a>
-                      <p v-text="$('drain_funds_desc')"></p>
+                      <p v-text="$t('drain_funds_desc')"></p>
                     </q-card-section>
                   </q-card>
                 </q-expansion-item>
@@ -352,7 +349,6 @@
                       <p v-text="$t('export_to_phone_desc')"></p>
                       <qrcode
                         :value="'{{request.base_url}}' +'wallet?usr={{user.id}}&wal={{wallet.id}}'"
-                        :options="{width:240}"
                       ></qrcode>
                     </q-card-section>
                   </q-card>
@@ -428,7 +424,7 @@
                       <q-btn
                         unelevated
                         color="red-10"
-                        @click="deleteWallet('{{ wallet.id }}', '{{ user.id }}')"
+                        @click="deleteWallet()"
                         :label="$t('delete_wallet')"
                       ></q-btn>
                     </q-card-section>
@@ -481,7 +477,7 @@
               filled
               dense
               v-model.number="receive.data.amount"
-              :label="$('amount')+' ({{LNBITS_DENOMINATION}}) *'"
+              :label="$t('amount')+' ({{LNBITS_DENOMINATION}}) *'"
               mask="#.##"
               fill-mask="0"
               reverse-fill-mask
@@ -552,11 +548,9 @@
           <div class="text-center q-mb-lg">
             <a :href="'lightning:' + receive.paymentReq">
               <q-responsive :ratio="1" class="q-mx-xl">
-                <qrcode
+                <lnbits-qrcode
                   :value="'lightning:' + receive.paymentReq.toUpperCase()"
-                  :options="{width: 340}"
-                  class="rounded-borders"
-                ></qrcode>
+                ></lnbits-qrcode>
               </q-responsive>
             </a>
           </div>
@@ -827,6 +821,19 @@
       <q-dialog v-model="paymentsChart.show">
         <q-card class="q-pa-sm" style="width: 800px; max-width: unset">
           <q-card-section>
+            <div class="row q-gutter-sm justify-between">
+              <div class="text-h6">Payments Chart</div>
+              <q-select
+                label="Group"
+                filled
+                dense
+                v-model="paymentsChart.group"
+                style="min-width: 120px"
+                :options="paymentsChart.groupOptions"
+              >
+              </q-select>
+            </div>
+
             <canvas ref="canvas" width="600" height="400"></canvas>
           </q-card-section>
         </q-card>

lnbits/core/templates/node/_tab_channels.html

@@ -0,0 +1,312 @@
+<q-tab-panel name="channels">
+  <q-dialog v-model="connectPeerDialog.show">
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <q-form class="q-gutter-md">
+        <q-input
+          dense
+          type="text"
+          filled
+          v-model="connectPeerDialog.data.uri"
+          label="Node URI"
+          hint="pubkey@host:port"
+        ></q-input>
+
+        <div class="row q-mt-lg">
+          <q-btn
+            :label="$t('connect')"
+            color="primary"
+            @click="connectPeer"
+          ></q-btn>
+          <q-btn
+            v-close-popup
+            flat
+            color="grey"
+            class="q-ml-auto"
+            :label="$t('cancel')"
+          ></q-btn>
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+  <q-dialog v-model="openChannelDialog.show">
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <q-form class="q-gutter-md">
+        <q-input
+          dense
+          type="text"
+          filled
+          v-model="openChannelDialog.data.peer_id"
+          label="Peer ID"
+        ></q-input>
+        <q-input
+          dense
+          type="number"
+          filled
+          v-model.number="openChannelDialog.data.funding_amount"
+          label="Funding Amount"
+        ></q-input>
+        <q-expansion-item icon="warning" label="Advanced">
+          <q-card>
+            <q-card-section>
+              <div class="column q-gutter-md">
+                <q-input
+                  dense
+                  type="number"
+                  filled
+                  v-model.number="openChannelDialog.data.push_amount"
+                  label="Push Amount"
+                  hint="This gifts sats to the other side!"
+                ></q-input>
+
+                <q-input
+                  dense
+                  type="number"
+                  filled
+                  v-model.number="openChannelDialog.data.fee_rate"
+                  label="Fee Rate"
+                ></q-input>
+              </div>
+            </q-card-section>
+          </q-card>
+        </q-expansion-item>
+
+        <div class="row q-mt-lg">
+          <q-btn
+            :label="$t('open')"
+            color="primary"
+            @click="openChannel"
+          ></q-btn>
+          <q-btn
+            v-close-popup
+            flat
+            color="grey"
+            class="q-ml-auto"
+            :label="$t('cancel')"
+          ></q-btn>
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+  <q-dialog v-model="closeChannelDialog.show">
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <q-form class="q-gutter-md">
+        <div>
+          <q-checkbox v-model="closeChannelDialog.data.force" label="Force" />
+        </div>
+
+        <div class="row q-mt-lg">
+          <q-btn
+            :label="$t('close')"
+            color="primary"
+            @click="closeChannel"
+          ></q-btn>
+          <q-btn
+            v-close-popup
+            flat
+            color="grey"
+            class="q-ml-auto"
+            :label="$t('cancel')"
+          ></q-btn>
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+  <q-card-section class="q-pa-none">
+    <div class="row q-col-gutter-lg">
+      <div class="col-12 col-xl-6">
+        <q-card class="full-height">
+          <q-card-section class="q-gutter-y-sm">
+            <div class="row items-center q-mt-none q-gutter-x-sm no-wrap">
+              <div class="col-grow text-h6 q-my-none col-grow">Channels</div>
+              <q-input
+                filled
+                dense
+                clearable
+                v-model="channels.filter"
+                placeholder="Search..."
+                class="col-auto"
+              ></q-input>
+              <q-select
+                dense
+                size="sm"
+                style="min-width: 200px"
+                filled
+                multiple
+                clearable
+                v-model="stateFilters"
+                :options="this.states"
+                class="col-auto"
+              ></q-select>
+              <q-btn
+                unelevated
+                color="primary"
+                size="md"
+                class="col-auto"
+                @click="showOpenChannelDialog()"
+              >
+                Open channel
+              </q-btn>
+            </div>
+            {% raw %}
+            <div>
+              <div class="text-subtitle1 col-grow">Total</div>
+              <lnbits-channel-balance
+                :balance="this.totalBalance"
+              ></lnbits-channel-balance>
+            </div>
+            <q-separator></q-separator>
+            <q-table
+              dense
+              flat
+              :data="this.filteredChannels"
+              :filter="channels.filter"
+              no-data-label="No channels opened"
+            >
+              <template v-slot:header="props">
+                <q-tr :props="props" style="height: 0"> </q-tr>
+              </template>
+              <template v-slot:body="props">
+                <q-tr :props="props">
+                  <div class="q-pb-sm">
+                    <div class="row items-center q-gutter-sm">
+                      <div class="text-subtitle1 col-grow">
+                        {{props.row.name}}
+                      </div>
+                      <div class="text-caption" v-if="props.row.short_id">
+                        {{ props.row.short_id }}
+                        <q-btn
+                          size="xs"
+                          flat
+                          dense
+                          icon="content_paste"
+                          @click="copyText(props.row.short_id)"
+                        ></q-btn>
+                      </div>
+                      <q-badge
+                        rounded
+                        :color="states.find(s => s.value == props.row.state)?.color"
+                      >
+                        {{ states.find(s => s.value == props.row.state)?.label
+                        }}
+                      </q-badge>
+                      <q-btn
+                        :disable='props.row.state !== "active"'
+                        flat
+                        dense
+                        size="md"
+                        @click="showCloseChannelDialog(props.row)"
+                        icon="cancel"
+                        color="pink"
+                      ></q-btn>
+                    </div>
+                    <lnbits-channel-balance
+                      :balance="props.row.balance"
+                      :color="props.row.color"
+                    ></lnbits-channel-balance>
+                  </div>
+                </q-tr>
+              </template>
+            </q-table>
+
+            {% endraw %}
+          </q-card-section>
+        </q-card>
+      </div>
+      <div class="col-12 col-xl-6">
+        <q-card class="full-height">
+          <q-card-section class="column q-gutter-y-sm">
+            {% raw %}
+            <div
+              class="row items-center q-mt-none justify-between q-gutter-x-md no-wrap"
+            >
+              <div class="col-grow text-h6 q-my-none">Peers</div>
+              <q-input
+                filled
+                dense
+                clearable
+                v-model="peers.filter"
+                placeholder="Search..."
+                class="col-auto"
+              ></q-input>
+              <q-btn
+                class="col-auto"
+                color="primary"
+                @click="connectPeerDialog.show = true"
+              >
+                Connect Peer
+              </q-btn>
+            </div>
+            <q-separator></q-separator>
+            <q-table
+              dense
+              flat
+              :data="peers.data"
+              :filter="peers.filter"
+              no-data-label="No transactions made yet"
+            >
+              <template v-slot:header="props">
+                <q-tr :props="props" style="height: 0"> </q-tr>
+              </template>
+              <template v-slot:body="props">
+                <q-tr :props="props">
+                  <div class="row no-wrap items-center q-gutter-sm">
+                    <div class="q-my-sm col-grow">
+                      <div class="text-subtitle1 text-bold">
+                        {{ props.row.alias }}
+                      </div>
+                      <div class="row items-center q-gutter-sm">
+                        <q-badge
+                          :style="`background-color: #${props.row.color}`"
+                          class="text-bold"
+                        >
+                          #{{ props.row.color }}
+                        </q-badge>
+                        <div class="text-bold">
+                          {{ shortenNodeId(props.row.id) }}
+                        </div>
+                        <q-btn
+                          size="xs"
+                          flat
+                          dense
+                          icon="content_paste"
+                          @click="copyText(props.row.id)"
+                        ></q-btn>
+                        <q-btn
+                          size="xs"
+                          flat
+                          dense
+                          icon="qr_code"
+                          @click="showNodeInfoDialog(props.row)"
+                        ></q-btn>
+                      </div>
+                    </div>
+                    <q-btn
+                      unelevated
+                      color="primary"
+                      @click="showOpenChannelDialog(props.row.id)"
+                    >
+                      Open channel
+                    </q-btn>
+                    <q-btn
+                      flat
+                      dense
+                      size="md"
+                      @click="disconnectPeer(props.row.id)"
+                      icon="cancel"
+                      color="pink"
+                    ></q-btn>
+                  </div>
+                </q-tr>
+              </template>
+            </q-table>
+
+            {% endraw %}
+          </q-card-section>
+        </q-card>
+      </div>
+    </div>
+  </q-card-section>
+</q-tab-panel>

lnbits/core/templates/node/_tab_dashboard.html

@@ -0,0 +1,70 @@
+<q-tab-panel name="dashboard">
+  <q-card-section class="q-pa-none">
+    {% raw %}
+    <lnbits-node-info :info="this.info"></lnbits-node-info>
+    <div class="row q-col-gutter-lg q-mt-sm">
+      <div class="col-12 col-md-8 q-gutter-y-md">
+        <div class="row q-col-gutter-md q-pb-lg">
+          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
+            <lnbits-stat
+              title="Total Capacity"
+              :msat="this.channel_stats.total_capacity"
+            />
+          </div>
+          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
+            <lnbits-stat title="Balance" :msat="this.info.balance_msat" />
+          </div>
+
+          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
+            <lnbits-stat
+              title="Fees collected"
+              :msat="this.info.fees?.total_msat"
+            />
+          </div>
+
+          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
+            <lnbits-stat
+              title="Onchain Balance"
+              :btc="this.info.onchain_balance_sat / 100000000"
+            />
+          </div>
+
+          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
+            <lnbits-stat
+              title="Onchain Confirmed"
+              :btc="this.info.onchain_confirmed_sat / 100000000"
+            />
+          </div>
+          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
+            <lnbits-stat title="Peers" :amount="this.info.num_peers" />
+          </div>
+          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
+            <lnbits-stat
+              :title="$t('avg_channel_size')"
+              :msat="this.channel_stats.avg_size"
+            />
+          </div>
+          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
+            <lnbits-stat
+              :title="$t('biggest_channel_size')"
+              :msat="this.channel_stats.biggest_size"
+            />
+          </div>
+          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
+            <lnbits-stat
+              :title="$t('smallest_channel_size')"
+              :msat="this.channel_stats.smallest_size"
+            />
+          </div>
+        </div>
+      </div>
+      <div class="column col-12 col-md-4 q-gutter-y-md">
+        <lnbits-node-ranks :ranks="this.ranks"></lnbits-node-ranks>
+        <lnbits-channel-stats
+          :stats="this.channel_stats"
+        ></lnbits-channel-stats>
+      </div>
+    </div>
+    {% endraw %}
+  </q-card-section>
+</q-tab-panel>

lnbits/core/templates/node/_tab_transactions.html

@@ -0,0 +1,316 @@
+<q-tab-panel name="transactions">
+  <q-card-section class="q-pa-none">
+    <q-dialog v-model="transactionDetailsDialog.show">
+      <q-card class="my-card">
+        <q-card-section>
+          {% raw %}
+          <div class="text-center q-mb-lg">
+            <div
+              v-if="transactionDetailsDialog.data.isIn && transactionDetailsDialog.data.pending"
+            >
+              <q-icon
+                size="18px"
+                :name="'call_received'"
+                :color="'green'"
+              ></q-icon>
+              <span v-text="$t('payment_received')"></span>
+            </div>
+            <div class="row q-my-md">
+              <div class="col-3"><b v-text="$t('payment_hash')"></b>:</div>
+              <div class="col-9 text-wrap mono">
+                {{ transactionDetailsDialog.data.payment_hash }}
+                <q-icon
+                  name="content_copy"
+                  @click="copyText(transactionDetailsDialog.data.payment_hash)"
+                  size="1em"
+                  color="grey"
+                  class="q-mb-xs cursor-pointer"
+                />
+              </div>
+              <div
+                class="row"
+                v-if="transactionDetailsDialog.data.preimage && !transactionDetailsDialog.data.pending"
+              >
+                <div class="col-3"><b v-text="$t('payment_proof')"></b>:</div>
+                <div class="col-9 text-wrap mono">
+                  {{ transactionDetailsDialog.data.preimage }}
+                  <q-icon
+                    name="content_copy"
+                    @click="copyText(transactionDetailsDialog.data.preimage)"
+                    size="1em"
+                    color="grey"
+                    class="q-mb-xs cursor-pointer"
+                  />
+                </div>
+              </div>
+            </div>
+            <div
+              v-if="transactionDetailsDialog.data.bolt11"
+              class="text-center q-mb-lg"
+            >
+              <a :href="'lightning:' + transactionDetailsDialog.data.bolt11">
+                <q-responsive :ratio="1" class="q-mx-xl">
+                  <qrcode
+                    :value="'lightning:' + transactionDetailsDialog.data.bolt11.toUpperCase()"
+                    :options="{width: 340}"
+                    class="rounded-borders"
+                  ></qrcode>
+                </q-responsive>
+              </a>
+              <q-btn
+                outline
+                color="grey"
+                @click="copyText(transactionDetailsDialog.data.bolt11)"
+                :label="$t('copy_invoice')"
+                class="q-mt-sm"
+              ></q-btn>
+            </div>
+          </div>
+          {% endraw %}
+        </q-card-section>
+      </q-card>
+    </q-dialog>
+
+    <div class="row q-col-gutter-md q-pb-lg"></div>
+
+    <div class="row q-col-gutter-lg">
+      <div class="col-12 col-lg-6 q-gutter-y-md">
+        <q-card>
+          <q-card-section>
+            <div class="row items-center no-wrap q-mb-sm">
+              <div class="col text-h6 q-my-none">Payments</div>
+              <q-input
+                v-if="payments.length > 10"
+                filled
+                dense
+                clearable
+                v-model="paymentsTable.filter"
+                debounce="300"
+                placeholder="Search by tag, memo, amount"
+                class="q-mb-md"
+              >
+              </q-input>
+            </div>
+            <q-table
+              dense
+              flat
+              :data="paymentsTable.data"
+              :columns="paymentsTable.columns"
+              :pagination.sync="paymentsTable.pagination"
+              row-key="payment_hash"
+              no-data-label="No transactions made yet"
+              :filter="paymentsTable.filter"
+              @request="getPayments"
+            >
+              {% raw %}
+              <template v-slot:body-cell-pending="props">
+                <q-td auto-width class="text-center">
+                  <q-icon
+                    v-if="!props.row.pending"
+                    size="xs"
+                    name="call_made"
+                    color="green"
+                    @click="showTransactionDetailsDialog(props.row)"
+                  ></q-icon>
+                  <q-icon
+                    v-else
+                    size="xs"
+                    name="settings_ethernet"
+                    color="grey"
+                    @click="showTransactionDetailsDialog(props.row)"
+                  >
+                    <q-tooltip>Pending</q-tooltip>
+                  </q-icon>
+                  <q-dialog v-model="props.row.expand" :props="props">
+                    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+                      <div class="text-center q-mb-lg">
+                        <div v-if="props.row.isIn && props.row.pending">
+                          <q-icon
+                            name="settings_ethernet"
+                            color="grey"
+                          ></q-icon>
+                          <span v-text="$t('invoice_waiting')"></span>
+                          <lnbits-payment-details
+                            :payment="props.row"
+                          ></lnbits-payment-details>
+                          <div
+                            v-if="props.row.bolt11"
+                            class="text-center q-mb-lg"
+                          >
+                            <a :href="'lightning:' + props.row.bolt11">
+                              <q-responsive :ratio="1" class="q-mx-xl">
+                                <qrcode
+                                  :value="'lightning:' + props.row.bolt11.toUpperCase()"
+                                  :options="{width: 340}"
+                                  class="rounded-borders"
+                                ></qrcode>
+                              </q-responsive>
+                            </a>
+                          </div>
+                          <div class="row q-mt-lg">
+                            <q-btn
+                              outline
+                              color="grey"
+                              @click="copyText(props.row.bolt11)"
+                              :label="$t('copy_invoice')"
+                            ></q-btn>
+                            <q-btn
+                              v-close-popup
+                              flat
+                              color="grey"
+                              class="q-ml-auto"
+                              :label="$t('close')"
+                            ></q-btn>
+                          </div>
+                        </div>
+                        <div v-else-if="props.row.isPaid && props.row.isIn">
+                          <q-icon
+                            size="18px"
+                            :name="'call_received'"
+                            :color="'green'"
+                          ></q-icon>
+                          <span v-text="$t('payment_received')"></span>
+                          <lnbits-payment-details
+                            :payment="props.row"
+                          ></lnbits-payment-details>
+                        </div>
+                        <div v-else-if="props.row.isPaid && props.row.isOut">
+                          <q-icon
+                            size="18px"
+                            :name="'call_made'"
+                            :color="'pink'"
+                          ></q-icon>
+                          <span v-text="$t('payment_sent')"></span>
+                          <lnbits-payment-details
+                            :payment="props.row"
+                          ></lnbits-payment-details>
+                        </div>
+                        <div v-else-if="props.row.isOut && props.row.pending">
+                          <q-icon
+                            name="settings_ethernet"
+                            color="grey"
+                          ></q-icon>
+                          <span v-text="$t('outgoing_payment_pending')"></span>
+                          <lnbits-payment-details
+                            :payment="props.row"
+                          ></lnbits-payment-details>
+                        </div>
+                      </div>
+                    </q-card>
+                  </q-dialog>
+                </q-td>
+              </template>
+              <template v-slot:body-cell-date="props">
+                <q-td auto-width key="date" :props="props">
+                  <lnbits-date :ts="props.row.time"></lnbits-date>
+                </q-td>
+              </template>
+              <template v-slot:body-cell-destination="props">
+                <q-td auto-width key="destination">
+                  <div class="row items-center justify-between no-wrap">
+                    <q-badge
+                      :style="`background-color: #${props.row.destination?.color}`"
+                      class="text-bold"
+                    >
+                      {{ props.row.destination?.alias }}
+                    </q-badge>
+                    <div>
+                      <q-btn
+                        size="xs"
+                        flat
+                        dense
+                        icon="content_paste"
+                        @click="copyText(info.id)"
+                      ></q-btn>
+                      <q-btn
+                        size="xs"
+                        flat
+                        dense
+                        icon="qr_code"
+                        @click="showNodeInfoDialog(props.row.destination)"
+                      ></q-btn>
+                    </div>
+                  </div>
+                </q-td>
+              </template>
+              {% endraw %}
+            </q-table>
+          </q-card-section>
+        </q-card>
+      </div>
+      <div class="col-12 col-lg-6 q-gutter-y-md">
+        <q-card>
+          <q-card-section>
+            <div class="row items-center no-wrap q-mb-sm">
+              <div class="col text-h6 q-my-none">Invoices</div>
+              <q-input
+                v-if="payments.length > 10"
+                filled
+                dense
+                clearable
+                v-model="paymentsTable.filter"
+                debounce="300"
+                placeholder="Search by tag, memo, amount"
+                class="q-mb-md"
+              >
+              </q-input>
+            </div>
+
+            <q-table
+              dense
+              flat
+              :data="invoiceTable.data"
+              :columns="invoiceTable.columns"
+              :pagination.sync="invoiceTable.pagination"
+              no-data-label="No transactions made yet"
+              :filter="invoiceTable.filter"
+              @request="getInvoices"
+            >
+              {% raw %}
+              <template v-slot:body-cell-pending="props">
+                <q-td auto-width class="text-center">
+                  <q-icon
+                    v-if="!props.row.pending"
+                    size="xs"
+                    name="call_received"
+                    color="green"
+                    @click="showTransactionDetailsDialog(props.row)"
+                  ></q-icon>
+                  <q-icon
+                    v-else
+                    size="xs"
+                    name="settings_ethernet"
+                    color="grey"
+                    @click="showTransactionDetailsDialog(props.row)"
+                  >
+                    <q-tooltip>Pending</q-tooltip>
+                  </q-icon>
+                </q-td>
+              </template>
+
+              <template v-slot:body-cell-paid_at="props">
+                <q-td auto-width :props="props">
+                  <lnbits-date
+                    v-if="props.row.paid_at"
+                    :ts="props.row.paid_at"
+                  ></lnbits-date>
+                </q-td>
+              </template>
+
+              <template v-slot:body-cell-expiry="props">
+                <q-td auto-width :props="props">
+                  <lnbits-date
+                    v-if="props.row.expiry"
+                    :ts="props.row.expiry"
+                  ></lnbits-date>
+                </q-td>
+              </template>
+
+              {% endraw %}
+            </q-table>
+          </q-card-section>
+        </q-card>
+      </div>
+    </div>
+  </q-card-section>
+</q-tab-panel>

lnbits/core/templates/node/index.html

@@ -0,0 +1,377 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %}
+
+<q-dialog v-model="nodeInfoDialog.show">
+  <lnbits-node-qrcode :info="nodeInfoDialog.data"></lnbits-node-qrcode>
+</q-dialog>
+
+<div class="row q-col-gutter-md justify-center">
+  <div class="col q-gutter-y-md">
+    <q-card>
+      <div class="q-pa-md">
+        <div class="q-gutter-y-md">
+          <q-tabs v-model="tab" active-color="primary" align="justify">
+            <q-tab
+              name="dashboard"
+              :label="$t('dashboard')"
+              @update="val => tab = val.name"
+            ></q-tab>
+            <q-tab
+              name="channels"
+              :label="$t('channels')"
+              @update="val => tab = val.name"
+            ></q-tab>
+            <q-tab
+              name="transactions"
+              :label="$t('transactions')"
+              @update="val => tab = val.name"
+            ></q-tab>
+          </q-tabs>
+        </div>
+      </div>
+
+      <q-form name="settings_form" id="settings_form">
+        <q-tab-panels v-model="tab" animated>
+          {% include "node/_tab_dashboard.html" %} {% include
+          "node/_tab_channels.html" %} {% include "node/_tab_transactions.html"
+          %}
+        </q-tab-panels>
+      </q-form>
+    </q-card>
+  </div>
+</div>
+
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+<script src="/core/static/js/node.js"></script>
+<script>
+  Vue.component(VueQrcode.name, VueQrcode)
+  Vue.use(VueQrcodeReader)
+
+  new Vue({
+    el: '#vue',
+    config: {
+      globalProperties: {
+        LNbits,
+        msg: 'hello'
+      }
+    },
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        isSuperUser: false,
+        wallet: {},
+        tab: 'dashboard',
+        payments: 1000,
+        info: {},
+        channel_stats: {},
+
+        channels: {
+          data: [],
+          filter: ''
+        },
+
+        activeBalance: {},
+        ranks: {},
+
+        peers: {
+          data: [],
+          filter: ''
+        },
+
+        connectPeerDialog: {
+          show: false,
+          data: {}
+        },
+
+        openChannelDialog: {
+          show: false,
+          data: {}
+        },
+
+        closeChannelDialog: {
+          show: false,
+          data: {}
+        },
+
+        nodeInfoDialog: {
+          show: false,
+          data: {}
+        },
+
+        transactionDetailsDialog: {
+          show: false,
+          data: {}
+        },
+
+        states: [
+          {label: 'Active', value: 'active', color: 'green'},
+          {label: 'Pending', value: 'pending', color: 'orange'},
+          {label: 'Inactive', value: 'inactive', color: 'grey'},
+          {label: 'Closed', value: 'closed', color: 'red'}
+        ],
+
+        stateFilters: [
+          {label: 'Active', value: 'active'},
+          {label: 'Pending', value: 'pending'}
+        ],
+
+        paymentsTable: {
+          data: [],
+          columns: [
+            {
+              name: 'pending',
+              label: ''
+            },
+            {
+              name: 'memo',
+              align: 'left',
+              label: this.$t('memo'),
+              field: 'memo'
+            },
+            {
+              name: 'date',
+              align: 'left',
+              label: this.$t('date'),
+              field: 'date',
+              sortable: true
+            },
+            {
+              name: 'sat',
+              align: 'right',
+              label: this.$t('amount') + ' (' + LNBITS_DENOMINATION + ')',
+              field: row => this.formatMsat(row.amount),
+              sortable: true
+            },
+            {
+              name: 'fee',
+              align: 'right',
+              label: this.$t('fee') + ' (m' + LNBITS_DENOMINATION + ')',
+              field: 'fee'
+            },
+            {
+              name: 'destination',
+              align: 'right',
+              label: 'Destination',
+              field: 'destination'
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10,
+            page: 1,
+            rowsNumber: 10
+          },
+          filter: null
+        },
+        invoiceTable: {
+          data: [],
+          columns: [
+            {
+              name: 'pending',
+              label: ''
+            },
+            {
+              name: 'memo',
+              align: 'left',
+              label: this.$t('memo'),
+              field: 'memo'
+            },
+            {
+              name: 'paid_at',
+              field: 'paid_at',
+              align: 'right',
+              label: 'Paid at',
+              sortable: true
+            },
+            {
+              name: 'expiry',
+              label: this.$t('expiry'),
+              field: 'expiry',
+              align: 'right',
+              sortable: true
+            },
+            {
+              name: 'amount',
+              label: this.$t('amount') + ' (' + LNBITS_DENOMINATION + ')',
+              field: row => this.formatMsat(row.amount),
+              sortable: true
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10,
+            page: 1,
+            rowsNumber: 10
+          },
+          filter: null
+        }
+      }
+    },
+    created: function () {
+      this.getInfo()
+      this.get1MLStats()
+    },
+    watch: {
+      tab: function (val) {
+        if (val === 'transactions' && !this.paymentsTable.data.length) {
+          this.getPayments()
+          this.getInvoices()
+        } else if (val === 'channels' && !this.channels.data.length) {
+          this.getChannels()
+          this.getPeers()
+        }
+      }
+    },
+    computed: {
+      checkChanges() {
+        return !_.isEqual(this.settings, this.formData)
+      },
+      filteredChannels: function () {
+        return this.stateFilters
+          ? this.channels.data.filter(channel => {
+              return this.stateFilters.find(({value}) => value == channel.state)
+            })
+          : this.channels.data
+      },
+      totalBalance: function () {
+        return this.filteredChannels.reduce(
+          (balance, channel) => {
+            balance.local_msat += channel.balance.local_msat
+            balance.remote_msat += channel.balance.remote_msat
+            balance.total_msat += channel.balance.total_msat
+            return balance
+          },
+          {local_msat: 0, remote_msat: 0, total_msat: 0}
+        )
+      }
+    },
+    methods: {
+      formatMsat: function (msat) {
+        return LNbits.utils.formatMsat(msat)
+      },
+      api: function (method, url, options) {
+        const params = new URLSearchParams(options?.query)
+        params.set('usr', this.g.user.id)
+        return LNbits.api
+          .request(method, `/node/api/v1${url}?${params}`, {}, options?.data)
+          .catch(error => {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      getChannels: function () {
+        return this.api('GET', '/channels').then(response => {
+          this.channels.data = response.data
+        })
+      },
+      getInfo: function () {
+        return this.api('GET', '/info').then(response => {
+          this.info = response.data
+          this.channel_stats = response.data.channel_stats
+        })
+      },
+      get1MLStats: function () {
+        return this.api('GET', '/rank').then(response => {
+          this.ranks = response.data
+        })
+      },
+      getPayments: function (props) {
+        if (props) {
+          this.paymentsTable.pagination = props.pagination
+        }
+        let pagination = this.paymentsTable.pagination
+        const query = {
+          limit: pagination.rowsPerPage,
+          offset: (pagination.page - 1) * pagination.rowsPerPage ?? 0
+        }
+        return this.api('GET', '/payments', {query}).then(response => {
+          this.paymentsTable.data = response.data.data
+          this.paymentsTable.pagination.rowsNumber = response.data.total
+        })
+      },
+      getInvoices: function (props) {
+        if (props) {
+          this.invoiceTable.pagination = props.pagination
+        }
+        let pagination = this.invoiceTable.pagination
+        const query = {
+          limit: pagination.rowsPerPage,
+          offset: (pagination.page - 1) * pagination.rowsPerPage ?? 0
+        }
+        return this.api('GET', '/invoices', {query}).then(response => {
+          this.invoiceTable.data = response.data.data
+          this.invoiceTable.pagination.rowsNumber = response.data.total
+        })
+      },
+      getPeers: function () {
+        return this.api('GET', '/peers').then(response => {
+          this.peers.data = response.data
+          console.log('peers', this.peers)
+        })
+      },
+      connectPeer: function () {
+        console.log('peer', this.connectPeerDialog)
+        this.api('POST', '/peers', {data: this.connectPeerDialog.data}).then(
+          () => {
+            this.connectPeerDialog.show = false
+            this.getPeers()
+          }
+        )
+      },
+      disconnectPeer: function (id) {
+        LNbits.utils
+          .confirmDialog('Do you really wanna disconnect this peer?')
+          .onOk(() => {
+            this.api('DELETE', `/peers/${id}`).then(response => {
+              this.$q.notify({
+                message: 'Disconnected',
+                icon: null
+              })
+              this.needsRestart = true
+              this.getPeers()
+            })
+          })
+      },
+      openChannel: function () {
+        this.api('POST', '/channels', {data: this.openChannelDialog.data})
+          .then(response => {
+            this.openChannelDialog.show = false
+            this.getChannels()
+          })
+          .catch(error => {
+            console.log(error)
+          })
+      },
+      showCloseChannelDialog: function (channel) {
+        this.closeChannelDialog.show = true
+        this.closeChannelDialog.data = {
+          force: false,
+          short_id: channel.short_id,
+          ...channel.point
+        }
+      },
+      closeChannel: function () {
+        this.api('DELETE', '/channels', {
+          query: this.closeChannelDialog.data
+        }).then(response => {
+          this.closeChannelDialog.show = false
+          this.getChannels()
+        })
+      },
+      showOpenChannelDialog: function (peer_id) {
+        this.openChannelDialog.show = true
+        this.openChannelDialog.data = {peer_id, funding_amount: 0}
+      },
+      showNodeInfoDialog: function (node) {
+        this.nodeInfoDialog.show = true
+        this.nodeInfoDialog.data = node
+      },
+      showTransactionDetailsDialog: function (details) {
+        this.transactionDetailsDialog.show = true
+        this.transactionDetailsDialog.data = details
+        console.log('details', details)
+      },
+      exportCSV: function () {},
+      shortenNodeId
+    }
+  })
+</script>
+
+{% endblock %}

lnbits/core/templates/node/public.html

@@ -0,0 +1,136 @@
+{% extends "public.html" %} {% from "macros.jinja" import window_vars with
+context %} {% block page %}
+
+<div class="q-ma-lg-xl q-mx-auto q-ma-xl" style="max-width: 1048px">
+  <lnbits-node-info :info="this.info"></lnbits-node-info>
+
+  <div class="row q-col-gutter-lg q-mt-sm">
+    <div class="col-12 col-md-8 q-gutter-y-md">
+      <div class="row q-col-gutter-md q-pb-lg">
+        <div class="col-12 col-md-6 q-gutter-y-md">
+          <lnbits-stat
+            title="Total Capacity"
+            :msat="this.channel_stats.total_capacity"
+          />
+        </div>
+
+        <div class="col-12 col-md-6 q-gutter-y-md">
+          <lnbits-stat title="Peers" :amount="this.info.num_peers" />
+        </div>
+        <div class="col-12 col-md-6 q-gutter-y-md">
+          <lnbits-stat
+            :title="$t('avg_channel_size')"
+            :msat="this.channel_stats.avg_size"
+          />
+        </div>
+        <div class="col-12 col-md-6 q-gutter-y-md">
+          <lnbits-stat
+            :title="$t('biggest_channel_size')"
+            :msat="this.channel_stats.biggest_size"
+          />
+        </div>
+        <div class="col-12 col-md-6 q-gutter-y-md">
+          <lnbits-stat
+            :title="$t('smallest_channel_size')"
+            :msat="this.channel_stats.smallest_size"
+          />
+        </div>
+        <div class="col-12 col-md-6 q-gutter-y-md">
+          <lnbits-stat
+            :title="$t('smallest_channel_size')"
+            :msat="this.channel_stats.smallest_size"
+          />
+        </div>
+      </div>
+    </div>
+    <div class="column col-12 col-md-4 q-gutter-y-md">
+      <lnbits-node-ranks :ranks="this.ranks"></lnbits-node-ranks>
+      <lnbits-channel-stats :stats="this.channel_stats"></lnbits-channel-stats>
+    </div>
+  </div>
+</div>
+
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+<script src="/core/static/js/node.js"></script>
+<script>
+  Vue.component(VueQrcode.name, VueQrcode)
+  Vue.use(VueQrcodeReader)
+
+  new Vue({
+    el: '#vue',
+    config: {
+      globalProperties: {
+        LNbits,
+        msg: 'hello'
+      }
+    },
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        isSuperUser: false,
+        wallet: {},
+        tab: 'dashboard',
+        payments: 1000,
+        info: {},
+        channel_stats: {},
+        channels: [],
+        activeBalance: {},
+        ranks: {},
+
+        peers: [],
+
+        connectPeerDialog: {
+          show: false,
+          data: {}
+        },
+
+        openChannelDialog: {
+          show: false,
+          data: {}
+        },
+
+        closeChannelDialog: {
+          show: false,
+          data: {}
+        },
+
+        nodeInfoDialog: {
+          show: false,
+          data: {}
+        },
+
+        states: [
+          {label: 'Active', value: 'active', color: 'green'},
+          {label: 'Pending', value: 'pending', color: 'orange'},
+          {label: 'Inactive', value: 'inactive', color: 'grey'},
+          {label: 'Closed', value: 'closed', color: 'red'}
+        ]
+      }
+    },
+    created: function () {
+      this.getInfo()
+      this.get1MLStats()
+    },
+    methods: {
+      formatMsat: function (msat) {
+        return LNbits.utils.formatMsat(msat)
+      },
+      api: function (method, url, data) {
+        return LNbits.api.request(method, '/node/public/api/v1' + url, {}, data)
+      },
+      getInfo: function () {
+        this.api('GET', '/info', {}).then(response => {
+          this.info = response.data
+          this.channel_stats = response.data.channel_stats
+        })
+      },
+      get1MLStats: function () {
+        this.api('GET', '/rank', {}).then(response => {
+          this.ranks = response.data
+        })
+      }
+    }
+  })
+</script>
+
+{% endblock %}

lnbits/core/views/admin_api.py

@@ -6,7 +6,7 @@ from subprocess import Popen
 from typing import Optional
 from urllib.parse import urlparse
 
-from fastapi import Depends
+from fastapi import APIRouter, Depends
 from fastapi.responses import FileResponse
 from starlette.exceptions import HTTPException
 
@@ -19,13 +19,15 @@ from lnbits.core.services import (
 )
 from lnbits.decorators import check_admin, check_super_user
 from lnbits.server import server_restart
-from lnbits.settings import AdminSettings, settings
+from lnbits.settings import AdminSettings, UpdateSettings, settings
 
-from .. import core_app, core_app_extra
+from .. import core_app_extra
 from ..crud import delete_admin_settings, get_admin_settings, update_admin_settings
 
+admin_router = APIRouter()
 
-@core_app.get(
+
+@admin_router.get(
     "/admin/api/v1/audit",
     name="Audit",
     description="show the current balance of the node and the LNbits database",
@@ -46,7 +48,7 @@ async def api_auditor():
         )
 
 
-@core_app.get("/admin/api/v1/settings/")
+@admin_router.get("/admin/api/v1/settings/", response_model=Optional[AdminSettings])
 async def api_get_settings(
     user: User = Depends(check_admin),
 ) -> Optional[AdminSettings]:
@@ -54,11 +56,11 @@ async def api_get_settings(
     return admin_settings
 
 
-@core_app.put(
+@admin_router.put(
     "/admin/api/v1/settings/",
     status_code=HTTPStatus.OK,
 )
-async def api_update_settings(data: dict, user: User = Depends(check_admin)):
+async def api_update_settings(data: UpdateSettings, user: User = Depends(check_admin)):
     await update_admin_settings(data)
     admin_settings = await get_admin_settings(user.super_user)
     assert admin_settings, "Updated admin settings not found."
@@ -67,7 +69,7 @@ async def api_update_settings(data: dict, user: User = Depends(check_admin)):
     return {"status": "Success"}
 
 
-@core_app.delete(
+@admin_router.delete(
     "/admin/api/v1/settings/",
     status_code=HTTPStatus.OK,
     dependencies=[Depends(check_super_user)],
@@ -77,7 +79,7 @@ async def api_delete_settings() -> None:
     server_restart.set()
 
 
-@core_app.get(
+@admin_router.get(
     "/admin/api/v1/restart/",
     status_code=HTTPStatus.OK,
     dependencies=[Depends(check_super_user)],
@@ -87,7 +89,7 @@ async def api_restart_server() -> dict[str, str]:
     return {"status": "Success"}
 
 
-@core_app.put(
+@admin_router.put(
     "/admin/api/v1/topup/",
     name="Topup",
     status_code=HTTPStatus.OK,
@@ -111,7 +113,7 @@ async def api_topup_balance(data: CreateTopup) -> dict[str, str]:
     return {"status": "Success"}
 
 
-@core_app.get(
+@admin_router.get(
     "/admin/api/v1/backup/",
     status_code=HTTPStatus.OK,
     dependencies=[Depends(check_super_user)],

lnbits/core/views/api.py

@@ -11,20 +11,22 @@ from urllib.parse import ParseResult, parse_qs, unquote, urlencode, urlparse, ur
 import httpx
 import pyqrcode
 from fastapi import (
+    APIRouter,
     Body,
     Depends,
     Header,
     Request,
-    Response,
     WebSocket,
     WebSocketDisconnect,
 )
 from fastapi.exceptions import HTTPException
+from fastapi.responses import JSONResponse
 from loguru import logger
 from sse_starlette.sse import EventSourceResponse
 from starlette.responses import RedirectResponse, StreamingResponse
 
 from lnbits import bolt11, lnurl
+from lnbits.core.db import core_app_extra, db
 from lnbits.core.helpers import (
     migrate_extension_database,
     stop_extension_background_work,
@@ -34,10 +36,13 @@ from lnbits.core.models import (
     CreateInvoice,
     CreateLnurl,
     CreateLnurlAuth,
+    CreateWallet,
     CreateWebPushSubscription,
     DecodePayment,
     Payment,
     PaymentFilters,
+    PaymentHistoryPoint,
+    Query,
     User,
     Wallet,
     WalletType,
@@ -68,18 +73,22 @@ from lnbits.utils.exchange_rates import (
     satoshis_amount_as_fiat,
 )
 
-from .. import core_app, core_app_extra, db
 from ..crud import (
+    DateTrunc,
     add_installed_extension,
+    create_account,
     create_tinyurl,
+    create_wallet,
     create_webpush_subscription,
     delete_dbversion,
     delete_installed_extension,
     delete_tinyurl,
+    delete_wallet,
     delete_webpush_subscription,
     drop_extension_db,
     get_dbversions,
     get_payments,
+    get_payments_history,
     get_payments_paginated,
     get_standalone_payment,
     get_tinyurl,
@@ -87,6 +96,7 @@ from ..crud import (
     get_wallet_for_key,
     get_webpush_subscription,
     save_balance_check,
+    update_pending_payments,
     update_wallet,
 )
 from ..services import (
@@ -101,13 +111,15 @@ from ..services import (
 )
 from ..tasks import api_invoice_listeners
 
+api_router = APIRouter()
 
-@core_app.get("/api/v1/health", status_code=HTTPStatus.OK)
+
+@api_router.get("/api/v1/health", status_code=HTTPStatus.OK)
 async def health():
     return
 
 
-@core_app.get("/api/v1/wallet")
+@api_router.get("/api/v1/wallet")
 async def api_wallet(wallet: WalletTypeInfo = Depends(get_key_type)):
     if wallet.wallet_type == WalletType.admin:
         return {
@@ -119,7 +131,7 @@ async def api_wallet(wallet: WalletTypeInfo = Depends(get_key_type)):
         return {"name": wallet.wallet.name, "balance": wallet.wallet.balance_msat}
 
 
-@core_app.put("/api/v1/wallet/{new_name}")
+@api_router.put("/api/v1/wallet/{new_name}")
 async def api_update_wallet_name(
     new_name: str, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
@@ -131,7 +143,7 @@ async def api_update_wallet_name(
     }
 
 
-@core_app.patch("/api/v1/wallet", response_model=Wallet)
+@api_router.patch("/api/v1/wallet", response_model=Wallet)
 async def api_update_wallet(
     name: Optional[str] = Body(None),
     currency: Optional[str] = Body(None),
@@ -140,7 +152,36 @@ async def api_update_wallet(
     return await update_wallet(wallet.wallet.id, name, currency)
 
 
-@core_app.get(
+@api_router.delete("/api/v1/wallet")
+async def api_delete_wallet(
+    wallet: WalletTypeInfo = Depends(require_admin_key),
+) -> None:
+    await delete_wallet(
+        user_id=wallet.wallet.user,
+        wallet_id=wallet.wallet.id,
+    )
+
+
+@api_router.post("/api/v1/wallet", response_model=Wallet)
+async def api_create_wallet(
+    data: CreateWallet,
+    wallet: WalletTypeInfo = Depends(require_admin_key),
+) -> Wallet:
+    return await create_wallet(user_id=wallet.wallet.user, wallet_name=data.name)
+
+
+@api_router.post("/api/v1/account", response_model=Wallet)
+async def api_create_account(data: CreateWallet) -> Wallet:
+    if not settings.new_accounts_allowed:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Account creation is disabled.",
+        )
+    account = await create_account()
+    return await create_wallet(user_id=account.id, wallet_name=data.name)
+
+
+@api_router.get(
     "/api/v1/payments",
     name="Payment List",
     summary="get list of payments",
@@ -152,16 +193,7 @@ async def api_payments(
     wallet: WalletTypeInfo = Depends(get_key_type),
     filters: Filters = Depends(parse_filters(PaymentFilters)),
 ):
-    pending_payments = await get_payments(
-        wallet_id=wallet.wallet.id,
-        pending=True,
-        exclude_uncheckable=True,
-        filters=filters,
-    )
-    for payment in pending_payments:
-        await check_transaction_status(
-            wallet_id=payment.wallet_id, payment_hash=payment.payment_hash
-        )
+    await update_pending_payments(wallet.wallet.id)
     return await get_payments(
         wallet_id=wallet.wallet.id,
         pending=True,
@@ -170,7 +202,22 @@ async def api_payments(
     )
 
 
-@core_app.get(
+@api_router.get(
+    "/api/v1/payments/history",
+    name="Get payments history",
+    response_model=List[PaymentHistoryPoint],
+    openapi_extra=generate_filter_params_openapi(PaymentFilters),
+)
+async def api_payments_history(
+    wallet: WalletTypeInfo = Depends(get_key_type),
+    group: DateTrunc = Query("day"),
+    filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
+):
+    await update_pending_payments(wallet.wallet.id)
+    return await get_payments_history(wallet.wallet.id, group, filters)
+
+
+@api_router.get(
     "/api/v1/payments/paginated",
     name="Payment List",
     summary="get paginated list of payments",
@@ -182,16 +229,7 @@ async def api_payments_paginated(
     wallet: WalletTypeInfo = Depends(get_key_type),
     filters: Filters = Depends(parse_filters(PaymentFilters)),
 ):
-    pending = await get_payments_paginated(
-        wallet_id=wallet.wallet.id,
-        pending=True,
-        exclude_uncheckable=True,
-        filters=filters,
-    )
-    for payment in pending.data:
-        await check_transaction_status(
-            wallet_id=payment.wallet_id, payment_hash=payment.payment_hash
-        )
+    await update_pending_payments(wallet.wallet.id)
     page = await get_payments_paginated(
         wallet_id=wallet.wallet.id,
         pending=True,
@@ -312,7 +350,7 @@ async def api_payments_pay_invoice(bolt11: str, wallet: Wallet):
     }
 
 
-@core_app.post(
+@api_router.post(
     "/api/v1/payments",
     summary="Create or pay an invoice",
     description="""
@@ -348,7 +386,7 @@ async def api_payments_create(
         )
 
 
-@core_app.post("/api/v1/payments/lnurl")
+@api_router.post("/api/v1/payments/lnurl")
 async def api_payments_pay_lnurl(
     data: CreateLnurl, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
@@ -394,17 +432,6 @@ async def api_payments_pay_lnurl(
             ),
         )
 
-    if invoice.description_hash != data.description_hash:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail=(
-                (
-                    f"{domain} returned an invalid invoice. Expected description_hash"
-                    f" == {data.description_hash}, got {invoice.description_hash}."
-                ),
-            ),
-        )
-
     extra = {}
 
     if params.get("successAction"):
@@ -451,11 +478,13 @@ async def subscribe_wallet_invoices(request: Request, wallet: Wallet):
                 yield dict(data=payment.json(), event="payment-received")
     except asyncio.CancelledError:
         logger.debug(f"removing listener for wallet {uid}")
+    except Exception as exc:
+        logger.error(f"Error in sse: {exc}")
+    finally:
         api_invoice_listeners.pop(uid)
-        return
 
 
-@core_app.get("/api/v1/payments/sse")
+@api_router.get("/api/v1/payments/sse")
 async def api_payments_sse(
     request: Request, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
@@ -467,7 +496,7 @@ async def api_payments_sse(
 
 
 # TODO: refactor this route into a public and admin one
-@core_app.get("/api/v1/payments/{payment_hash}")
+@api_router.get("/api/v1/payments/{payment_hash}")
 async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):
     # We use X_Api_Key here because we want this call to work with and without keys
     # If a valid key is given, we also return the field "details", otherwise not
@@ -512,7 +541,7 @@ async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):
     return {"paid": not payment.pending, "preimage": payment.preimage}
 
 
-@core_app.get("/api/v1/lnurlscan/{code}")
+@api_router.get("/api/v1/lnurlscan/{code}")
 async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type)):
     try:
         url = lnurl.decode(code)
@@ -627,33 +656,24 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type
     return params
 
 
-@core_app.post("/api/v1/payments/decode", status_code=HTTPStatus.OK)
-async def api_payments_decode(data: DecodePayment, response: Response):
+@api_router.post("/api/v1/payments/decode", status_code=HTTPStatus.OK)
+async def api_payments_decode(data: DecodePayment) -> JSONResponse:
     payment_str = data.data
     try:
         if payment_str[:5] == "LNURL":
             url = lnurl.decode(payment_str)
-            return {"domain": url}
+            return JSONResponse({"domain": url})
         else:
             invoice = bolt11.decode(payment_str)
-            return {
-                "payment_hash": invoice.payment_hash,
-                "amount_msat": invoice.amount_msat,
-                "description": invoice.description,
-                "description_hash": invoice.description_hash,
-                "payee": invoice.payee,
-                "date": invoice.date,
-                "expiry": invoice.expiry,
-                "secret": invoice.secret,
-                "route_hints": invoice.route_hints,
-                "min_final_cltv_expiry": invoice.min_final_cltv_expiry,
-            }
-    except Exception:
-        response.status_code = HTTPStatus.BAD_REQUEST
-        return {"message": "Failed to decode"}
+            return JSONResponse(invoice.data)
+    except Exception as exc:
+        return JSONResponse(
+            {"message": f"Failed to decode: {str(exc)}"},
+            status_code=HTTPStatus.BAD_REQUEST,
+        )
 
 
-@core_app.post("/api/v1/lnurlauth")
+@api_router.post("/api/v1/lnurlauth")
 async def api_perform_lnurlauth(
     data: CreateLnurlAuth, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
@@ -665,7 +685,7 @@ async def api_perform_lnurlauth(
     return ""
 
 
-@core_app.get("/api/v1/currencies")
+@api_router.get("/api/v1/currencies")
 async def api_list_currencies_available():
     if len(settings.lnbits_allowed_currencies) > 0:
         return [
@@ -676,7 +696,7 @@ async def api_list_currencies_available():
     return list(currencies.keys())
 
 
-@core_app.post("/api/v1/conversion")
+@api_router.post("/api/v1/conversion")
 async def api_fiat_as_sats(data: ConversionData):
     output = {}
     if data.from_ == "sat":
@@ -694,7 +714,7 @@ async def api_fiat_as_sats(data: ConversionData):
         return output
 
 
-@core_app.get("/api/v1/qrcode/{data}", response_class=StreamingResponse)
+@api_router.get("/api/v1/qrcode/{data}", response_class=StreamingResponse)
 async def img(data):
     qr = pyqrcode.create(data)
     stream = BytesIO()
@@ -715,7 +735,7 @@ async def img(data):
     )
 
 
-@core_app.websocket("/api/v1/ws/{item_id}")
+@api_router.websocket("/api/v1/ws/{item_id}")
 async def websocket_connect(websocket: WebSocket, item_id: str):
     await websocketManager.connect(websocket, item_id)
     try:
@@ -725,7 +745,7 @@ async def websocket_connect(websocket: WebSocket, item_id: str):
         websocketManager.disconnect(websocket)
 
 
-@core_app.post("/api/v1/ws/{item_id}")
+@api_router.post("/api/v1/ws/{item_id}")
 async def websocket_update_post(item_id: str, data: str):
     try:
         await websocketUpdater(item_id, data)
@@ -734,7 +754,7 @@ async def websocket_update_post(item_id: str, data: str):
         return {"sent": False, "data": data}
 
 
-@core_app.get("/api/v1/ws/{item_id}/{data}")
+@api_router.get("/api/v1/ws/{item_id}/{data}")
 async def websocket_update_get(item_id: str, data: str):
     try:
         await websocketUpdater(item_id, data)
@@ -743,7 +763,7 @@ async def websocket_update_get(item_id: str, data: str):
         return {"sent": False, "data": data}
 
 
-@core_app.post("/api/v1/extension")
+@api_router.post("/api/v1/extension")
 async def api_install_extension(
     data: CreateExtension, user: User = Depends(check_admin)
 ):
@@ -802,7 +822,7 @@ async def api_install_extension(
         )
 
 
-@core_app.delete("/api/v1/extension/{ext_id}")
+@api_router.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()
 
@@ -845,7 +865,7 @@ async def api_uninstall_extension(ext_id: str, user: User = Depends(check_admin)
         )
 
 
-@core_app.get(
+@api_router.get(
     "/api/v1/extension/{ext_id}/releases", dependencies=[Depends(check_admin)]
 )
 async def get_extension_releases(ext_id: str):
@@ -862,7 +882,7 @@ async def get_extension_releases(ext_id: str):
         )
 
 
-@core_app.get(
+@api_router.get(
     "/api/v1/extension/release/{org}/{repo}/{tag_name}",
     dependencies=[Depends(check_admin)],
 )
@@ -883,7 +903,7 @@ async def get_extension_release(org: str, repo: str, tag_name: str):
         )
 
 
-@core_app.delete(
+@api_router.delete(
     "/api/v1/extension/{ext_id}/db",
     dependencies=[Depends(check_admin)],
 )
@@ -909,10 +929,7 @@ async def delete_extension_db(ext_id: str):
         )
 
 
-# TINYURL
-
-
-@core_app.post(
+@api_router.post(
     "/api/v1/tinyurl",
     name="Tinyurl",
     description="creates a tinyurl",
@@ -933,7 +950,7 @@ async def api_create_tinyurl(
         )
 
 
-@core_app.get(
+@api_router.get(
     "/api/v1/tinyurl/{tinyurl_id}",
     name="Tinyurl",
     description="get a tinyurl by id",
@@ -955,7 +972,7 @@ async def api_get_tinyurl(
         )
 
 
-@core_app.delete(
+@api_router.delete(
     "/api/v1/tinyurl/{tinyurl_id}",
     name="Tinyurl",
     description="delete a tinyurl by id",
@@ -978,7 +995,7 @@ async def api_delete_tinyurl(
         )
 
 
-@core_app.get(
+@api_router.get(
     "/t/{tinyurl_id}",
     name="Tinyurl",
     description="redirects a tinyurl by id",
@@ -994,10 +1011,7 @@ async def api_tinyurl(tinyurl_id: str):
         )
 
 
-############################WEBPUSH##################################
-
-
-@core_app.post("/api/v1/webpush", status_code=HTTPStatus.CREATED)
+@api_router.post("/api/v1/webpush", status_code=HTTPStatus.CREATED)
 async def api_create_webpush_subscription(
     request: Request,
     data: CreateWebPushSubscription,
@@ -1019,12 +1033,12 @@ async def api_create_webpush_subscription(
         )
 
 
-@core_app.delete("/api/v1/webpush", status_code=HTTPStatus.OK)
+@api_router.delete("/api/v1/webpush", status_code=HTTPStatus.OK)
 async def api_delete_webpush_subscription(
     request: Request,
     wallet: WalletTypeInfo = Depends(require_admin_key),
 ):
     endpoint = unquote(
-        base64.b64decode(request.query_params.get("endpoint")).decode("utf-8")
+        base64.b64decode(str(request.query_params.get("endpoint"))).decode("utf-8")
     )
     await delete_webpush_subscription(endpoint, wallet.wallet.user)

lnbits/core/views/generic.py

@@ -5,13 +5,12 @@ from urllib.parse import urlparse
 
 from fastapi import Depends, Query, Request, status
 from fastapi.exceptions import HTTPException
-from fastapi.responses import FileResponse, RedirectResponse
+from fastapi.responses import FileResponse, HTMLResponse, JSONResponse, RedirectResponse
 from fastapi.routing import APIRouter
 from loguru import logger
 from pydantic.types import UUID4
-from starlette.responses import HTMLResponse, JSONResponse
 
-from lnbits.core import db
+from lnbits.core.db import db
 from lnbits.core.helpers import to_valid_user_id
 from lnbits.core.models import User
 from lnbits.decorators import check_admin, check_user_exists
@@ -24,7 +23,6 @@ from ...utils.exchange_rates import currencies
 from ..crud import (
     create_account,
     create_wallet,
-    delete_wallet,
     get_balance_check,
     get_dbversions,
     get_inactive_extensions,
@@ -36,24 +34,24 @@ from ..crud import (
 )
 from ..services import pay_invoice, redeem_lnurl_withdraw
 
-core_html_routes: APIRouter = APIRouter(
+generic_router = APIRouter(
     tags=["Core NON-API Website Routes"], include_in_schema=False
 )
 
 
-@core_html_routes.get("/favicon.ico", response_class=FileResponse)
+@generic_router.get("/favicon.ico", response_class=FileResponse)
 async def favicon():
     return FileResponse("lnbits/core/static/favicon.ico")
 
 
-@core_html_routes.get("/", response_class=HTMLResponse)
+@generic_router.get("/", response_class=HTMLResponse)
 async def home(request: Request, lightning: str = ""):
     return template_renderer().TemplateResponse(
         "core/index.html", {"request": request, "lnurl": lightning}
     )
 
 
-@core_html_routes.get("/robots.txt", response_class=HTMLResponse)
+@generic_router.get("/robots.txt", response_class=HTMLResponse)
 async def robots():
     data = """
     User-agent: *
@@ -62,7 +60,7 @@ async def robots():
     return HTMLResponse(content=data, media_type="text/plain")
 
 
-@core_html_routes.get(
+@generic_router.get(
     "/extensions", name="install.extensions", response_class=HTMLResponse
 )
 async def extensions_install(
@@ -159,80 +157,55 @@ async def extensions_install(
         raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))
 
 
-@core_html_routes.get(
+@generic_router.get(
     "/wallet",
     response_class=HTMLResponse,
-    description="""
-just **wallet_name**: create a new user, then create a new wallet
-                      for user with wallet_name
-just **user_id**: return the first user wallet or create one if none found
-                  (with default wallet_name)
-**user_id** and **wallet_name**: create a new wallet for user with wallet_name
-**user_id** and **wallet_id**: return that wallet if user is the owner
-nothing: create everything
-""",
+    description="show wallet page",
 )
 async def wallet(
-    request: Request = Query(None),
-    nme: Optional[str] = Query(None),
-    usr: Optional[UUID4] = Query(None),
+    request: Request,
+    usr: UUID4 = Query(...),
     wal: Optional[UUID4] = Query(None),
 ):
-    user_id = usr.hex if usr else None
-    wallet_id = wal.hex if wal else None
-    wallet_name = nme
+    user_id = usr.hex
+    user = await get_user(user_id)
 
-    if not user_id:
-        new_user = await create_account()
-        user = await get_user(new_user.id)
-        assert user, "Newly created user has to exist."
-        logger.info(f"Create user {user.id}")
-    else:
-        user = await get_user(user_id)
-        if not user:
-            return template_renderer().TemplateResponse(
-                "error.html", {"request": request, "err": "User does not exist."}
-            )
-        if (
-            len(settings.lnbits_allowed_users) > 0
-            and user_id not in settings.lnbits_allowed_users
-            and user_id not in settings.lnbits_admin_users
-            and user_id != settings.super_user
-        ):
-            return template_renderer().TemplateResponse(
-                "error.html", {"request": request, "err": "User not authorized."}
-            )
-        if user_id == settings.super_user or user_id in settings.lnbits_admin_users:
-            user.admin = True
-        if user_id == settings.super_user:
-            user.super_user = True
-
-    if not wallet_id:
-        if user.wallets and not wallet_name:
-            wallet = user.wallets[0]
-        else:
-            wallet = await create_wallet(user_id=user.id, wallet_name=wallet_name)
-            logger.info(
-                f"Created new wallet {wallet_name if wallet_name else '(no name)'} for"
-                f" user {user.id}"
-            )
-
-        return RedirectResponse(
-            f"/wallet?usr={user.id}&wal={wallet.id}",
-            status_code=status.HTTP_307_TEMPORARY_REDIRECT,
+    if not user:
+        return template_renderer().TemplateResponse(
+            "error.html", {"request": request, "err": "User does not exist."}
         )
 
-    logger.debug(
-        "Access "
-        f"{'user '+ user.id + ' ' if user else ''} "
-        f"{'wallet ' + wallet_name if wallet_name else ''}"
-    )
+    if not wal:
+        if len(user.wallets) == 0:
+            wallet = await create_wallet(user_id=user.id)
+            return RedirectResponse(url=f"/wallet?usr={user_id}&wal={wallet.id}")
+        return RedirectResponse(url=f"/wallet?usr={user_id}&wal={user.wallets[0].id}")
+    else:
+        wallet_id = wal.hex
+
     userwallet = user.get_wallet(wallet_id)
-    if not userwallet:
+    if not userwallet or userwallet.deleted:
         return template_renderer().TemplateResponse(
             "error.html", {"request": request, "err": "Wallet not found"}
         )
 
+    if (
+        len(settings.lnbits_allowed_users) > 0
+        and user_id not in settings.lnbits_allowed_users
+        and user_id not in settings.lnbits_admin_users
+        and user_id != settings.super_user
+    ):
+        return template_renderer().TemplateResponse(
+            "error.html", {"request": request, "err": "User not authorized."}
+        )
+
+    if user_id == settings.super_user or user_id in settings.lnbits_admin_users:
+        user.admin = True
+    if user_id == settings.super_user:
+        user.super_user = True
+
+    logger.debug(f"Access user {user.id} wallet {userwallet.name}")
+
     return template_renderer().TemplateResponse(
         "core/wallet.html",
         {
@@ -245,13 +218,21 @@ async def wallet(
     )
 
 
-@core_html_routes.get("/withdraw", response_class=JSONResponse)
+@generic_router.get("/withdraw", response_class=JSONResponse)
 async def lnurl_full_withdraw(request: Request):
-    user = await get_user(request.query_params.get("usr"))
+    usr_param = request.query_params.get("usr")
+    if not usr_param:
+        return {"status": "ERROR", "reason": "usr parameter not provided."}
+
+    user = await get_user(usr_param)
     if not user:
         return {"status": "ERROR", "reason": "User does not exist."}
 
-    wallet = user.get_wallet(request.query_params.get("wal"))
+    wal_param = request.query_params.get("wal")
+    if not wal_param:
+        return {"status": "ERROR", "reason": "wal parameter not provided."}
+
+    wallet = user.get_wallet(wal_param)
     if not wallet:
         return {"status": "ERROR", "reason": "Wallet does not exist."}
 
@@ -268,17 +249,27 @@ async def lnurl_full_withdraw(request: Request):
     }
 
 
-@core_html_routes.get("/withdraw/cb", response_class=JSONResponse)
+@generic_router.get("/withdraw/cb", response_class=JSONResponse)
 async def lnurl_full_withdraw_callback(request: Request):
-    user = await get_user(request.query_params.get("usr"))
+    usr_param = request.query_params.get("usr")
+    if not usr_param:
+        return {"status": "ERROR", "reason": "usr parameter not provided."}
+
+    user = await get_user(usr_param)
     if not user:
         return {"status": "ERROR", "reason": "User does not exist."}
 
-    wallet = user.get_wallet(request.query_params.get("wal"))
+    wal_param = request.query_params.get("wal")
+    if not wal_param:
+        return {"status": "ERROR", "reason": "wal parameter not provided."}
+
+    wallet = user.get_wallet(wal_param)
     if not wallet:
         return {"status": "ERROR", "reason": "Wallet does not exist."}
 
     pr = request.query_params.get("pr")
+    if not pr:
+        return {"status": "ERROR", "reason": "payment_request not provided."}
 
     async def pay():
         try:
@@ -295,40 +286,18 @@ async def lnurl_full_withdraw_callback(request: Request):
     return {"status": "OK"}
 
 
-@core_html_routes.get("/deletewallet", response_class=RedirectResponse)
-async def deletewallet(wal: str = Query(...), usr: str = Query(...)):
-    user = await get_user(usr)
-    if not user:
-        raise HTTPException(HTTPStatus.FORBIDDEN, "User not found.")
-
-    user_wallet_ids = [u.id for u in user.wallets]
-
-    if wal not in user_wallet_ids:
-        raise HTTPException(HTTPStatus.FORBIDDEN, "Not your wallet.")
-    else:
-        await delete_wallet(user_id=user.id, wallet_id=wal)
-        user_wallet_ids.remove(wal)
-        logger.debug("Deleted wallet {wal} of user {user.id}")
-
-    if user_wallet_ids:
-        return RedirectResponse(
-            url_for("/wallet", usr=user.id, wal=user_wallet_ids[0]),
-            status_code=status.HTTP_307_TEMPORARY_REDIRECT,
-        )
-
-    return RedirectResponse(
-        url_for("/"), status_code=status.HTTP_307_TEMPORARY_REDIRECT
-    )
-
-
-@core_html_routes.get("/withdraw/notify/{service}")
+@generic_router.get("/withdraw/notify/{service}")
 async def lnurl_balance_notify(request: Request, service: str):
-    bc = await get_balance_check(request.query_params.get("wal"), service)
+    wal_param = request.query_params.get("wal")
+    if not wal_param:
+        return {"status": "ERROR", "reason": "wal parameter not provided."}
+
+    bc = await get_balance_check(wal_param, service)
     if bc:
         await redeem_lnurl_withdraw(bc.wallet, bc.url)
 
 
-@core_html_routes.get(
+@generic_router.get(
     "/lnurlwallet", response_class=RedirectResponse, name="core.lnurlwallet"
 )
 async def lnurlwallet(request: Request):
@@ -338,10 +307,14 @@ async def lnurlwallet(request: Request):
         assert user, "Newly created user not found."
         wallet = await create_wallet(user_id=user.id, conn=conn)
 
+    lightning_param = request.query_params.get("lightning")
+    if not lightning_param:
+        return {"status": "ERROR", "reason": "lightning parameter not provided."}
+
     asyncio.create_task(
         redeem_lnurl_withdraw(
             wallet.id,
-            request.query_params.get("lightning"),
+            lightning_param,
             "LNbits initial funding: voucher redeem.",
             {"tag": "lnurlwallet"},
             5,  # wait 5 seconds before sending the invoice to the service
@@ -354,12 +327,12 @@ async def lnurlwallet(request: Request):
     )
 
 
-@core_html_routes.get("/service-worker.js", response_class=FileResponse)
+@generic_router.get("/service-worker.js", response_class=FileResponse)
 async def service_worker():
     return FileResponse("lnbits/core/static/js/service-worker.js")
 
 
-@core_html_routes.get("/manifest/{usr}.webmanifest")
+@generic_router.get("/manifest/{usr}.webmanifest")
 async def manifest(request: Request, usr: str):
     host = urlparse(str(request.url)).netloc
 
@@ -375,7 +348,7 @@ async def manifest(request: Request, usr: str):
                 "src": (
                     settings.lnbits_custom_logo
                     if settings.lnbits_custom_logo
-                    else "https://cdn.jsdelivr.net/gh/lnbits/lnbits@0.3.0/docs/logos/lnbits.png"
+                    else "https://cdn.jsdelivr.net/gh/lnbits/lnbits@main/docs/logos/lnbits.png"
                 ),
                 "type": "image/png",
                 "sizes": "900x900",
@@ -400,7 +373,45 @@ async def manifest(request: Request, usr: str):
     }
 
 
-@core_html_routes.get("/admin", response_class=HTMLResponse)
+@generic_router.get("/node", response_class=HTMLResponse)
+async def node(request: Request, user: User = Depends(check_admin)):
+    if not settings.lnbits_node_ui:
+        raise HTTPException(status_code=HTTPStatus.SERVICE_UNAVAILABLE)
+
+    WALLET = get_wallet_class()
+    _, balance = await WALLET.status()
+
+    return template_renderer().TemplateResponse(
+        "node/index.html",
+        {
+            "request": request,
+            "user": user.dict(),
+            "settings": settings.dict(),
+            "balance": balance,
+            "wallets": user.wallets[0].dict(),
+        },
+    )
+
+
+@generic_router.get("/node/public", response_class=HTMLResponse)
+async def node_public(request: Request):
+    if not settings.lnbits_public_node_ui:
+        raise HTTPException(status_code=HTTPStatus.SERVICE_UNAVAILABLE)
+
+    WALLET = get_wallet_class()
+    _, balance = await WALLET.status()
+
+    return template_renderer().TemplateResponse(
+        "node/public.html",
+        {
+            "request": request,
+            "settings": settings.dict(),
+            "balance": balance,
+        },
+    )
+
+
+@generic_router.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)
@@ -420,7 +431,7 @@ async def index(request: Request, user: User = Depends(check_admin)):
     )
 
 
-@core_html_routes.get("/uuidv4/{hex_value}")
+@generic_router.get("/uuidv4/{hex_value}")
 async def hex_to_uuid4(hex_value: str):
     try:
         user_id = to_valid_user_id(hex_value).hex

lnbits/core/views/node_api.py

@@ -0,0 +1,188 @@
+from http import HTTPStatus
+from typing import List, Optional
+
+import httpx
+from fastapi import APIRouter, Body, Depends, HTTPException
+from pydantic import BaseModel
+from starlette.status import HTTP_503_SERVICE_UNAVAILABLE
+
+from lnbits.decorators import check_admin, check_super_user, parse_filters
+from lnbits.nodes import get_node_class
+from lnbits.settings import settings
+
+from ...db import Filters, Page
+from ...nodes.base import (
+    ChannelPoint,
+    Node,
+    NodeChannel,
+    NodeInfoResponse,
+    NodeInvoice,
+    NodeInvoiceFilters,
+    NodePayment,
+    NodePaymentsFilters,
+    NodePeerInfo,
+    PublicNodeInfo,
+)
+from ...utils.cache import cache
+
+
+def require_node():
+    NODE = get_node_class()
+    if not NODE:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_IMPLEMENTED,
+            detail="Active backend does not implement Node API",
+        )
+    if not settings.lnbits_node_ui:
+        raise HTTPException(
+            status_code=HTTPStatus.SERVICE_UNAVAILABLE,
+            detail="Not enabled",
+        )
+    return NODE
+
+
+def check_public():
+    if not (settings.lnbits_node_ui and settings.lnbits_public_node_ui):
+        raise HTTPException(
+            status_code=HTTPStatus.SERVICE_UNAVAILABLE,
+            detail="Not enabled",
+        )
+
+
+node_router = APIRouter(prefix="/node/api/v1", dependencies=[Depends(check_admin)])
+super_node_router = APIRouter(
+    prefix="/node/api/v1", dependencies=[Depends(check_super_user)]
+)
+public_node_router = APIRouter(
+    prefix="/node/public/api/v1", dependencies=[Depends(check_public)]
+)
+
+
+@node_router.get(
+    "/ok",
+    description="Check if node api can be enabled",
+    status_code=200,
+    dependencies=[Depends(require_node)],
+)
+async def api_get_ok():
+    pass
+
+
+@public_node_router.get("/info", response_model=PublicNodeInfo)
+async def api_get_public_info(node: Node = Depends(require_node)) -> PublicNodeInfo:
+    return await cache.save_result(node.get_public_info, key="node:public_info")
+
+
+@node_router.get("/info")
+async def api_get_info(
+    node: Node = Depends(require_node),
+) -> Optional[NodeInfoResponse]:
+    return await node.get_info()
+
+
+@node_router.get("/channels")
+async def api_get_channels(
+    node: Node = Depends(require_node),
+) -> Optional[List[NodeChannel]]:
+    return await node.get_channels()
+
+
+@super_node_router.post("/channels", response_model=ChannelPoint)
+async def api_create_channel(
+    node: Node = Depends(require_node),
+    peer_id: str = Body(),
+    funding_amount: int = Body(),
+    push_amount: Optional[int] = Body(None),
+    fee_rate: Optional[int] = Body(None),
+):
+    return await node.open_channel(peer_id, funding_amount, push_amount, fee_rate)
+
+
+@super_node_router.delete("/channels")
+async def api_delete_channel(
+    short_id: Optional[str],
+    funding_txid: Optional[str],
+    output_index: Optional[int],
+    force: bool = False,
+    node: Node = Depends(require_node),
+) -> Optional[List[NodeChannel]]:
+    return await node.close_channel(
+        short_id,
+        ChannelPoint(funding_txid=funding_txid, output_index=output_index)
+        if funding_txid is not None and output_index is not None
+        else None,
+        force,
+    )
+
+
+@node_router.get("/payments", response_model=Page[NodePayment])
+async def api_get_payments(
+    node: Node = Depends(require_node),
+    filters: Filters = Depends(parse_filters(NodePaymentsFilters)),
+) -> Optional[Page[NodePayment]]:
+    if not settings.lnbits_node_ui_transactions:
+        raise HTTPException(
+            HTTP_503_SERVICE_UNAVAILABLE,
+            detail="You can enable node transactions in the Admin UI",
+        )
+    return await node.get_payments(filters)
+
+
+@node_router.get("/invoices", response_model=Page[NodeInvoice])
+async def api_get_invoices(
+    node: Node = Depends(require_node),
+    filters: Filters = Depends(parse_filters(NodeInvoiceFilters)),
+) -> Optional[Page[NodeInvoice]]:
+    if not settings.lnbits_node_ui_transactions:
+        raise HTTPException(
+            HTTP_503_SERVICE_UNAVAILABLE,
+            detail="You can enable node transactions in the Admin UI",
+        )
+    return await node.get_invoices(filters)
+
+
+@node_router.get("/peers", response_model=List[NodePeerInfo])
+async def api_get_peers(node: Node = Depends(require_node)) -> List[NodePeerInfo]:
+    return await node.get_peers()
+
+
+@super_node_router.post("/peers")
+async def api_connect_peer(
+    uri: str = Body(embed=True), node: Node = Depends(require_node)
+):
+    return await node.connect_peer(uri)
+
+
+@super_node_router.delete("/peers/{peer_id}")
+async def api_disconnect_peer(peer_id: str, node: Node = Depends(require_node)):
+    return await node.disconnect_peer(peer_id)
+
+
+class NodeRank(BaseModel):
+    capacity: Optional[int]
+    channelcount: Optional[int]
+    age: Optional[int]
+    growth: Optional[int]
+    availability: Optional[int]
+
+
+# Same for public and private api
+@node_router.get(
+    "/rank",
+    description="Retrieve node ranks from https://1ml.com",
+    response_model=Optional[NodeRank],
+)
+@public_node_router.get(
+    "/rank",
+    description="Retrieve node ranks from https://1ml.com",
+    response_model=Optional[NodeRank],
+)
+async def api_get_1ml_stats(node: Node = Depends(require_node)) -> Optional[NodeRank]:
+    node_id = await node.get_id()
+    async with httpx.AsyncClient() as client:
+        r = await client.get(url=f"https://1ml.com/node/{node_id}/json", timeout=15)
+        try:
+            r.raise_for_status()
+            return r.json()["noderank"]
+        except httpx.HTTPStatusError:
+            raise HTTPException(status_code=404, detail="Node not found on 1ml.com")

lnbits/core/views/public_api.py

@@ -1,18 +1,18 @@
 import asyncio
-import datetime
 from http import HTTPStatus
 
-from fastapi import HTTPException
+from fastapi import APIRouter, HTTPException
 from loguru import logger
 
 from lnbits import bolt11
 
-from .. import core_app
 from ..crud import get_standalone_payment
 from ..tasks import api_invoice_listeners
 
+public_router = APIRouter()
 
-@core_app.get("/public/v1/payment/{payment_hash}")
+
+@public_router.get("/public/v1/payment/{payment_hash}")
 async def api_public_payment_longpolling(payment_hash):
     payment = await get_standalone_payment(payment_hash)
 
@@ -25,8 +25,7 @@ async def api_public_payment_longpolling(payment_hash):
 
     try:
         invoice = bolt11.decode(payment.bolt11)
-        expiration = datetime.datetime.fromtimestamp(invoice.date + invoice.expiry)
-        if expiration < datetime.datetime.now():
+        if invoice.has_expired():
             return {"status": "expired"}
     except Exception:
         raise HTTPException(

lnbits/db.py

@@ -50,13 +50,10 @@ if settings.lnbits_database_url:
 
     register_type(new_type((1184, 1114), "TIMESTAMP2INT", _parse_timestamp))
 else:
-    if os.path.isdir(settings.lnbits_data_folder):
-        DB_TYPE = SQLITE
-    else:
-        raise NotADirectoryError(
-            f"LNBITS_DATA_FOLDER named {settings.lnbits_data_folder} was not created"
-            f" - please 'mkdir {settings.lnbits_data_folder}' and try again"
-        )
+    if not os.path.isdir(settings.lnbits_data_folder):
+        os.mkdir(settings.lnbits_data_folder)
+        logger.info(f"Created {settings.lnbits_data_folder}")
+    DB_TYPE = SQLITE
 
 
 def compat_timestamp_placeholder():

lnbits/extension_manager.py

@@ -182,12 +182,19 @@ class Extension(NamedTuple):
     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}"
-        )
+    def module_name(self) -> str:
+        if self.is_upgrade_extension:
+            if settings.has_default_extension_path:
+                return f"lnbits.upgrades.{self.code}-{self.upgrade_hash}"
+            return f"{self.code}-{self.upgrade_hash}"
+
+        if settings.has_default_extension_path:
+            return f"lnbits.extensions.{self.code}"
+        return self.code
+
+    @property
+    def is_upgrade_extension(self) -> bool:
+        return self.upgrade_hash != ""
 
     @classmethod
     def from_installable_ext(cls, ext_info: "InstallableExtension") -> "Extension":
@@ -205,7 +212,7 @@ class Extension(NamedTuple):
 
 class ExtensionManager:
     def __init__(self) -> None:
-        p = Path(settings.lnbits_path, "extensions")
+        p = Path(settings.lnbits_extensions_path, "extensions")
         Path(p).mkdir(parents=True, exist_ok=True)
         self._extension_folders: List[Path] = [f for f in p.iterdir() if f.is_dir()]
 
@@ -330,21 +337,25 @@ class InstallableExtension(BaseModel):
 
     @property
     def zip_path(self) -> Path:
-        extensions_data_dir = Path(settings.lnbits_data_folder, "extensions")
+        extensions_data_dir = Path(settings.lnbits_data_folder, "zips")
         Path(extensions_data_dir).mkdir(parents=True, exist_ok=True)
         return Path(extensions_data_dir, f"{self.id}.zip")
 
     @property
     def ext_dir(self) -> Path:
-        return Path(settings.lnbits_path, "extensions", self.id)
+        return Path(settings.lnbits_extensions_path, "extensions", self.id)
 
     @property
     def ext_upgrade_dir(self) -> Path:
-        return Path("lnbits", "upgrades", f"{self.id}-{self.hash}")
+        return Path(
+            settings.lnbits_extensions_path, "upgrades", f"{self.id}-{self.hash}"
+        )
 
     @property
     def module_name(self) -> str:
-        return f"lnbits.extensions.{self.id}"
+        if settings.has_default_extension_path:
+            return f"lnbits.extensions.{self.id}"
+        return self.id
 
     @property
     def module_installed(self) -> bool:
@@ -389,21 +400,26 @@ class InstallableExtension(BaseModel):
 
     def extract_archive(self):
         logger.info(f"Extracting extension {self.name} ({self.installed_version}).")
-        Path("lnbits", "upgrades").mkdir(parents=True, exist_ok=True)
-        shutil.rmtree(self.ext_upgrade_dir, True)
-        with zipfile.ZipFile(self.zip_path, "r") as zip_ref:
-            zip_ref.extractall(self.ext_upgrade_dir)
-        generated_dir_name = os.listdir(self.ext_upgrade_dir)[0]
-        os.rename(
-            Path(self.ext_upgrade_dir, generated_dir_name),
-            Path(self.ext_upgrade_dir, self.id),
+        Path(settings.lnbits_extensions_path, "upgrades").mkdir(
+            parents=True, exist_ok=True
         )
 
+        tmp_dir = Path(settings.lnbits_data_folder, "unzip-temp", self.hash)
+        shutil.rmtree(tmp_dir, True)
+
+        with zipfile.ZipFile(self.zip_path, "r") as zip_ref:
+            zip_ref.extractall(tmp_dir)
+        generated_dir_name = os.listdir(tmp_dir)[0]
+        shutil.rmtree(self.ext_upgrade_dir, True)
+        shutil.copytree(
+            Path(tmp_dir, generated_dir_name),
+            Path(self.ext_upgrade_dir),
+        )
+        shutil.rmtree(tmp_dir, True)
+
         # Pre-packed extensions can be upgraded
         # Mark the extension as installed so we know it is not the pre-packed version
-        with open(
-            Path(self.ext_upgrade_dir, self.id, "config.json"), "r+"
-        ) as json_file:
+        with open(Path(self.ext_upgrade_dir, "config.json"), "r+") as json_file:
             config_json = json.load(json_file)
 
             self.name = config_json.get("name")
@@ -419,10 +435,7 @@ class InstallableExtension(BaseModel):
                 )
 
         shutil.rmtree(self.ext_dir, True)
-        shutil.copytree(
-            Path(self.ext_upgrade_dir, self.id),
-            Path(settings.lnbits_path, "extensions", self.id),
-        )
+        shutil.copytree(Path(self.ext_upgrade_dir), Path(self.ext_dir))
         logger.success(f"Extension {self.name} ({self.installed_version}) installed.")
 
     def nofiy_upgrade(self) -> None:

lnbits/helpers.py

@@ -4,9 +4,11 @@ from typing import Any, List, Optional, Type
 
 import jinja2
 import shortuuid
+from pydantic import BaseModel
 from pydantic.schema import field_schema
 
 from lnbits.jinja2_templating import Jinja2Templates
+from lnbits.nodes import get_node_class
 from lnbits.requestvars import g
 from lnbits.settings import settings
 
@@ -30,6 +32,10 @@ def url_for(endpoint: str, external: Optional[bool] = False, **params: Any) -> s
 def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templates:
     folders = ["lnbits/templates", "lnbits/core/templates"]
     if additional_folders:
+        additional_folders += [
+            Path(settings.lnbits_extensions_path, "extensions", f)
+            for f in additional_folders
+        ]
         folders.extend(additional_folders)
     t = Jinja2Templates(loader=jinja2.FileSystemLoader(folders))
 
@@ -44,9 +50,14 @@ def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templa
     t.env.globals["SITE_TAGLINE"] = settings.lnbits_site_tagline
     t.env.globals["SITE_DESCRIPTION"] = settings.lnbits_site_description
     t.env.globals["LNBITS_THEME_OPTIONS"] = settings.lnbits_theme_options
-    t.env.globals["COMMIT_VERSION"] = settings.lnbits_commit
+    t.env.globals["LNBITS_QR_LOGO"] = settings.lnbits_qr_logo
     t.env.globals["LNBITS_VERSION"] = settings.version
+    t.env.globals["LNBITS_NEW_ACCOUNTS_ALLOWED"] = settings.new_accounts_allowed
     t.env.globals["LNBITS_ADMIN_UI"] = settings.lnbits_admin_ui
+    t.env.globals["LNBITS_NODE_UI"] = (
+        settings.lnbits_node_ui and get_node_class() is not None
+    )
+    t.env.globals["LNBITS_NODE_UI_AVAILABLE"] = get_node_class() is not None
     t.env.globals["EXTENSIONS"] = [
         e
         for e in get_valid_extensions()
@@ -125,3 +136,25 @@ def generate_filter_params_openapi(model: Type[FilterModel], keep_optional=False
     return {
         "parameters": params,
     }
+
+
+def insert_query(table_name: str, model: BaseModel) -> str:
+    """
+    Generate an insert query with placeholders for a given table and model
+    :param table_name: Name of the table
+    :param model: Pydantic model
+    """
+    placeholders = ", ".join(["?"] * len(model.dict().keys()))
+    fields = ", ".join(model.dict().keys())
+    return f"INSERT INTO {table_name} ({fields}) VALUES ({placeholders})"
+
+
+def update_query(table_name: str, model: BaseModel, where: str = "WHERE id = ?") -> str:
+    """
+    Generate an update query with placeholders for a given table and model
+    :param table_name: Name of the table
+    :param model: Pydantic model
+    :param where: Where string, default to `WHERE id = ?`
+    """
+    query = ", ".join([f"{field} = ?" for field in model.dict().keys()])
+    return f"UPDATE {table_name} SET {query} {where}"

lnbits/lnurl.py

@@ -1,4 +1,7 @@
+from typing import Union
+
 from bech32 import bech32_decode, bech32_encode, convertbits
+from fastapi.datastructures import URL
 
 
 def decode(lnurl: str) -> str:
@@ -10,8 +13,8 @@ def decode(lnurl: str) -> str:
     return bytes(bech32_data).decode()
 
 
-def encode(url: str) -> str:
-    bech32_data = convertbits(url.encode(), 8, 5, True)
+def encode(url: Union[str, URL]) -> str:
+    bech32_data = convertbits(str(url).encode(), 8, 5, True)
     assert bech32_data
     lnurl = bech32_encode("lnurl", bech32_data)
     return lnurl.upper()

lnbits/middleware.py

@@ -2,7 +2,7 @@ from http import HTTPStatus
 from typing import Any, List, Tuple, Union
 from urllib.parse import parse_qs
 
-from fastapi import FastAPI, Request, Response
+from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse, JSONResponse
 from slowapi import _rate_limit_exceeded_handler
 from slowapi.errors import RateLimitExceeded
@@ -10,7 +10,7 @@ from slowapi.middleware import SlowAPIMiddleware
 from starlette.middleware.gzip import GZipMiddleware
 from starlette.types import ASGIApp, Receive, Scope, Send
 
-from lnbits.core import core_app_extra
+from lnbits.core.db import core_app_extra
 from lnbits.helpers import template_renderer
 from lnbits.settings import settings
 
@@ -233,15 +233,6 @@ def add_ip_block_middleware(app: FastAPI):
                 status_code=403,  # Forbidden
                 content={"detail": "IP is blocked"},
             )
-        # this try: except: block is not needed on latest FastAPI
-        # (await call_next(request) is enough)
-        # https://stackoverflow.com/questions/71222144/runtimeerror-no-response-returned-in-fastapi-when-refresh-request
-        # TODO: remove after https://github.com/lnbits/lnbits/pull/1609 is merged
-        try:
-            return await call_next(request)
-        except RuntimeError as exc:
-            if str(exc) == "No response returned." and await request.is_disconnected():
-                return Response(status_code=HTTPStatus.NO_CONTENT)
-            raise  # bubble up different exceptions
+        return await call_next(request)
 
     app.middleware("http")(block_allow_ip_middleware)

lnbits/nodes/__init__.py

@@ -0,0 +1,15 @@
+from typing import Optional
+
+from .base import Node
+
+
+def get_node_class() -> Optional[Node]:
+    return NODE
+
+
+def set_node_class(node: Node):
+    global NODE
+    NODE = node
+
+
+NODE: Optional[Node] = None

lnbits/nodes/base.py

@@ -0,0 +1,227 @@
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from enum import Enum
+from typing import TYPE_CHECKING, List, Optional
+
+from pydantic import BaseModel
+
+from lnbits.db import FilterModel, Filters, Page
+from lnbits.utils.cache import cache
+
+if TYPE_CHECKING:
+    from lnbits.wallets.base import Wallet
+
+
+class NodePeerInfo(BaseModel):
+    id: str
+    alias: Optional[str] = None
+    color: Optional[str] = None
+    last_timestamp: Optional[int] = None
+    addresses: Optional[list[str]] = None
+
+
+class ChannelState(Enum):
+    ACTIVE = "active"
+    PENDING = "pending"
+    CLOSED = "closed"
+    INACTIVE = "inactive"
+
+
+class ChannelBalance(BaseModel):
+    local_msat: int
+    remote_msat: int
+    total_msat: int
+
+
+class ChannelPoint(BaseModel):
+    funding_txid: str
+    output_index: int
+
+
+class NodeChannel(BaseModel):
+    short_id: Optional[str] = None
+    point: Optional[ChannelPoint] = None
+    peer_id: str
+    balance: ChannelBalance
+    state: ChannelState
+    name: Optional[str]
+    color: Optional[str]
+
+
+class ChannelStats(BaseModel):
+    counts: dict[ChannelState, int]
+    avg_size: int
+    biggest_size: Optional[int]
+    smallest_size: Optional[int]
+    total_capacity: int
+
+    @classmethod
+    def from_list(cls, channels: list[NodeChannel]):
+        counts: dict[ChannelState, int] = {}
+        for channel in channels:
+            counts[channel.state] = counts.get(channel.state, 0) + 1
+
+        active_channel_sizes = [
+            channel.balance.total_msat
+            for channel in channels
+            if channel.state == ChannelState.ACTIVE
+        ]
+
+        return cls(
+            counts=counts,
+            avg_size=int(sum(active_channel_sizes) / len(active_channel_sizes)),
+            biggest_size=max(active_channel_sizes),
+            smallest_size=min(active_channel_sizes),
+            total_capacity=sum(active_channel_sizes),
+        )
+
+
+class NodeFees(BaseModel):
+    total_msat: int
+    daily_msat: Optional[int] = None
+    weekly_msat: Optional[int] = None
+    monthly_msat: Optional[int] = None
+
+
+class PublicNodeInfo(BaseModel):
+    id: str
+    backend_name: str
+    alias: str
+    color: str
+    num_peers: int
+    blockheight: int
+    channel_stats: ChannelStats
+    addresses: list[str]
+
+
+class NodeInfoResponse(PublicNodeInfo):
+    onchain_balance_sat: int
+    onchain_confirmed_sat: int
+    fees: NodeFees
+    balance_msat: int
+
+
+class NodePayment(BaseModel):
+    pending: bool
+    amount: int
+    fee: Optional[int] = None
+    memo: Optional[str] = None
+    time: int
+    bolt11: Optional[str] = None
+    preimage: Optional[str]
+    payment_hash: str
+    expiry: Optional[float] = None
+    destination: Optional[NodePeerInfo] = None
+
+
+class NodeInvoice(BaseModel):
+    pending: bool
+    amount: int
+    memo: Optional[str]
+    bolt11: str
+    preimage: Optional[str]
+    payment_hash: str
+    paid_at: Optional[int] = None
+    expiry: Optional[int] = None
+
+
+class NodeInvoiceFilters(FilterModel):
+    pass
+
+
+class NodePaymentsFilters(FilterModel):
+    pass
+
+
+class Node(ABC):
+    wallet: Wallet
+
+    def __init__(self, wallet: Wallet):
+        self.wallet = wallet
+        self.id: Optional[str] = None
+
+    @property
+    def name(self):
+        return self.__class__.__name__
+
+    async def get_id(self):
+        if not self.id:
+            self.id = await self._get_id()
+        return self.id
+
+    @abstractmethod
+    async def _get_id(self) -> str:
+        pass
+
+    async def get_peers(self) -> list[NodePeerInfo]:
+        peer_ids = await self.get_peer_ids()
+        return [await self.get_peer_info(peer_id) for peer_id in peer_ids]
+
+    @abstractmethod
+    async def get_peer_ids(self) -> list[str]:
+        pass
+
+    @abstractmethod
+    async def connect_peer(self, uri: str):
+        pass
+
+    @abstractmethod
+    async def disconnect_peer(self, peer_id: str):
+        pass
+
+    @abstractmethod
+    async def _get_peer_info(self, peer_id: str) -> NodePeerInfo:
+        pass
+
+    async def get_peer_info(self, peer_id: str) -> NodePeerInfo:
+        key = f"node:peers:{peer_id}"
+        info = cache.get(key)
+        if not info:
+            info = await self._get_peer_info(peer_id)
+            if info.last_timestamp:
+                cache.set(key, info)
+        return info
+
+    @abstractmethod
+    async def open_channel(
+        self,
+        peer_id: str,
+        local_amount: int,
+        push_amount: Optional[int] = None,
+        fee_rate: Optional[int] = None,
+    ) -> ChannelPoint:
+        pass
+
+    @abstractmethod
+    async def close_channel(
+        self,
+        short_id: Optional[str] = None,
+        point: Optional[ChannelPoint] = None,
+        force: bool = False,
+    ):
+        pass
+
+    @abstractmethod
+    async def get_channels(self) -> List[NodeChannel]:
+        pass
+
+    @abstractmethod
+    async def get_info(self) -> NodeInfoResponse:
+        pass
+
+    async def get_public_info(self) -> PublicNodeInfo:
+        info = await self.get_info()
+        return PublicNodeInfo(**info.__dict__)
+
+    @abstractmethod
+    async def get_payments(
+        self, filters: Filters[NodePaymentsFilters]
+    ) -> Page[NodePayment]:
+        pass
+
+    @abstractmethod
+    async def get_invoices(
+        self, filters: Filters[NodeInvoiceFilters]
+    ) -> Page[NodeInvoice]:
+        pass

lnbits/nodes/cln.py

@@ -0,0 +1,325 @@
+from __future__ import annotations
+
+import asyncio
+from http import HTTPStatus
+from typing import TYPE_CHECKING, List, Optional
+
+from fastapi import HTTPException
+
+from lnbits.db import Filters, Page
+
+from ..utils.cache import cache
+
+try:
+    from pyln.client import RpcError  # type: ignore
+
+    if TYPE_CHECKING:
+        # override the false type
+        class RpcError(RpcError):  # type: ignore
+            error: dict
+
+except ImportError:  # pragma: nocover
+    LightningRpc = None
+
+from lnbits.nodes.base import (
+    ChannelBalance,
+    ChannelPoint,
+    ChannelState,
+    ChannelStats,
+    Node,
+    NodeFees,
+    NodeInvoice,
+    NodeInvoiceFilters,
+    NodePaymentsFilters,
+    NodePeerInfo,
+)
+
+from .base import NodeChannel, NodeInfoResponse, NodePayment
+
+if TYPE_CHECKING:
+    from lnbits.wallets import CoreLightningWallet
+
+
+def catch_rpc_errors(f):
+    async def wrapper(*args, **kwargs):
+        try:
+            return await f(*args, **kwargs)
+        except RpcError as e:
+            if e.error["code"] == -32602:
+                raise HTTPException(status_code=400, detail=e.error["message"])
+            else:
+                raise HTTPException(status_code=500, detail=e.error["message"])
+
+    return wrapper
+
+
+class CoreLightningNode(Node):
+    wallet: CoreLightningWallet
+
+    async def ln_rpc(self, method, *args, **kwargs) -> dict:
+        loop = asyncio.get_event_loop()
+        fn = getattr(self.wallet.ln, method)
+        return await loop.run_in_executor(None, lambda: fn(*args, **kwargs))
+
+    @catch_rpc_errors
+    async def connect_peer(self, uri: str):
+        # https://docs.corelightning.org/reference/lightning-connect
+        try:
+            await self.ln_rpc("connect", uri)
+        except RpcError as e:
+            if e.error["code"] == 400:
+                raise HTTPException(HTTPStatus.BAD_REQUEST, detail=e.error["message"])
+            else:
+                raise
+
+    @catch_rpc_errors
+    async def disconnect_peer(self, peer_id: str):
+        try:
+            await self.ln_rpc("disconnect", peer_id)
+        except RpcError as e:
+            if e.error["code"] == -1:
+                raise HTTPException(
+                    HTTPStatus.BAD_REQUEST,
+                    detail=e.error["message"],
+                )
+            else:
+                raise
+
+    @catch_rpc_errors
+    async def open_channel(
+        self,
+        peer_id: str,
+        local_amount: int,
+        push_amount: Optional[int] = None,
+        fee_rate: Optional[int] = None,
+    ) -> ChannelPoint:
+        try:
+            result = await self.ln_rpc(
+                "fundchannel",
+                peer_id,
+                amount=local_amount,
+                push_msat=int(push_amount * 1000) if push_amount else None,
+                feerate=fee_rate,
+            )
+            return ChannelPoint(
+                funding_txid=result["txid"],
+                output_index=result["outnum"],
+            )
+        except RpcError as e:
+            message = e.error["message"]
+
+            if "amount: should be a satoshi amount" in message:
+                raise HTTPException(
+                    HTTPStatus.BAD_REQUEST,
+                    detail="The amount is not a valid satoshi amount.",
+                )
+
+            if "Unknown peer" in message:
+                raise HTTPException(
+                    HTTPStatus.INTERNAL_SERVER_ERROR,
+                    detail=(
+                        "We where able to connect to the peer but CLN "
+                        "can't find it when opening a channel."
+                    ),
+                )
+
+            if "Owning subdaemon openingd died" in message:
+                # https://github.com/ElementsProject/lightning/issues/2798#issuecomment-511205719
+                raise HTTPException(
+                    HTTPStatus.BAD_REQUEST,
+                    detail=(
+                        "Likely the peer didn't like our channel opening "
+                        "proposal and disconnected from us."
+                    ),
+                )
+
+            if (
+                "Number of pending channels exceed maximum" in message
+                or "exceeds maximum chan size of 10 BTC" in message
+                or "Could not afford" in message
+            ):
+                raise HTTPException(HTTPStatus.BAD_REQUEST, detail=message)
+            raise
+
+    @catch_rpc_errors
+    async def close_channel(
+        self,
+        short_id: Optional[str] = None,
+        point: Optional[ChannelPoint] = None,
+        force: bool = False,
+    ):
+        if not short_id:
+            raise HTTPException(status_code=400, detail="Short id required")
+        try:
+            await self.ln_rpc("close", short_id)
+        except RpcError as e:
+            message = e.error["message"]
+            if (
+                "Short channel ID not active:" in message
+                or "Short channel ID not found" in message
+            ):
+                raise HTTPException(HTTPStatus.BAD_REQUEST, detail=message)
+            else:
+                raise
+
+    @catch_rpc_errors
+    async def _get_id(self) -> str:
+        info = await self.ln_rpc("getinfo")
+        return info["id"]
+
+    @catch_rpc_errors
+    async def get_peer_ids(self) -> List[str]:
+        peers = await self.ln_rpc("listpeers")
+        return [p["id"] for p in peers["peers"] if p["connected"]]
+
+    @catch_rpc_errors
+    async def _get_peer_info(self, peer_id: str) -> NodePeerInfo:
+        result = await self.ln_rpc("listnodes", peer_id)
+        nodes = result["nodes"]
+        if len(nodes) == 0:
+            return NodePeerInfo(id=peer_id)
+        node = nodes[0]
+        if "last_timestamp" in node:
+            return NodePeerInfo(
+                id=node["nodeid"],
+                alias=node["alias"],
+                color=node["color"],
+                last_timestamp=node["last_timestamp"],
+                addresses=[
+                    address["address"] + ":" + str(address["port"])
+                    for address in node["addresses"]
+                ],
+            )
+        else:
+            return NodePeerInfo(id=node["nodeid"])
+
+    @catch_rpc_errors
+    async def get_channels(self) -> List[NodeChannel]:
+        funds = await self.ln_rpc("listfunds")
+        nodes = await self.ln_rpc("listnodes")
+        nodes_by_id = {n["nodeid"]: n for n in nodes["nodes"]}
+
+        return [
+            NodeChannel(
+                short_id=ch.get("short_channel_id"),
+                point=ChannelPoint(
+                    funding_txid=ch["funding_txid"],
+                    output_index=ch["funding_output"],
+                ),
+                peer_id=ch["peer_id"],
+                balance=ChannelBalance(
+                    local_msat=ch["our_amount_msat"],
+                    remote_msat=ch["amount_msat"] - ch["our_amount_msat"],
+                    total_msat=ch["amount_msat"],
+                ),
+                name=nodes_by_id.get(ch["peer_id"], {}).get("alias"),
+                color=nodes_by_id.get(ch["peer_id"], {}).get("color"),
+                state=(
+                    ChannelState.ACTIVE
+                    if ch["state"] == "CHANNELD_NORMAL"
+                    else ChannelState.PENDING
+                    if ch["state"] in ("CHANNELD_AWAITING_LOCKIN", "OPENINGD")
+                    else ChannelState.CLOSED
+                    if ch["state"]
+                    in (
+                        "CHANNELD_CLOSING",
+                        "CLOSINGD_COMPLETE",
+                        "CLOSINGD_SIGEXCHANGE",
+                        "ONCHAIN",
+                    )
+                    else ChannelState.INACTIVE
+                ),
+            )
+            for ch in funds["channels"]
+        ]
+
+    @catch_rpc_errors
+    async def get_info(self) -> NodeInfoResponse:
+        info = await self.ln_rpc("getinfo")
+        funds = await self.ln_rpc("listfunds")
+
+        channels = await self.get_channels()
+        active_channels = [
+            channel for channel in channels if channel.state == ChannelState.ACTIVE
+        ]
+        return NodeInfoResponse(
+            id=info["id"],
+            backend_name="CLN",
+            alias=info["alias"],
+            color=info["color"],
+            onchain_balance_sat=sum(
+                output["amount_msat"] / 1000 for output in funds["outputs"]
+            ),
+            onchain_confirmed_sat=sum(
+                output["amount_msat"] / 1000
+                for output in funds["outputs"]
+                if output["status"] == "confirmed"
+            ),
+            channel_stats=ChannelStats.from_list(channels),
+            num_peers=info["num_peers"],
+            blockheight=info["blockheight"],
+            balance_msat=sum(channel.balance.local_msat for channel in active_channels),
+            fees=NodeFees(total_msat=info["fees_collected_msat"]),
+            addresses=[address["address"] for address in info["address"]],
+        )
+
+    @catch_rpc_errors
+    async def get_payments(
+        self, filters: Filters[NodePaymentsFilters]
+    ) -> Page[NodePayment]:
+        async def get_payments():
+            result = await self.ln_rpc("listpays")
+            return [
+                NodePayment(
+                    bolt11=pay.get("bolt11"),
+                    amount=pay["amount_msat"],
+                    fee=int(pay["amount_msat"]) - int(pay["amount_sent_msat"]),
+                    memo=pay.get("description"),
+                    time=pay["created_at"],
+                    preimage=pay.get("preimage"),
+                    payment_hash=pay["payment_hash"],
+                    pending=pay["status"] != "complete",
+                    destination=await self.get_peer_info(pay["destination"]),
+                )
+                for pay in reversed(result["pays"])
+                if pay["status"] != "failed"
+            ]
+
+        results = await cache.save_result(get_payments, key="node:payments")
+        count = len(results)
+        if filters.offset:
+            results = results[filters.offset :]
+        if filters.limit:
+            results = results[: filters.limit]
+        return Page(data=results, total=count)
+
+    @catch_rpc_errors
+    async def get_invoices(
+        self, filters: Filters[NodeInvoiceFilters]
+    ) -> Page[NodeInvoice]:
+        result = await cache.save_result(
+            lambda: self.ln_rpc("listinvoices"), key="node:invoices"
+        )
+        invoices = result["invoices"]
+        invoices.reverse()
+        count = len(invoices)
+        if filters.offset:
+            invoices = invoices[filters.offset :]
+        if filters.limit:
+            invoices = invoices[: filters.limit]
+        return Page(
+            data=[
+                NodeInvoice(
+                    bolt11=invoice["bolt11"],
+                    amount=invoice["amount_msat"],
+                    preimage=invoice.get("payment_preimage"),
+                    memo=invoice["description"],
+                    paid_at=invoice.get("paid_at"),
+                    expiry=invoice["expires_at"],
+                    payment_hash=invoice["payment_hash"],
+                    pending=invoice["status"] != "paid",
+                )
+                for invoice in invoices
+            ],
+            total=count,
+        )

lnbits/nodes/lndrest.py

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

lnbits/server.py

@@ -37,9 +37,12 @@ def main(
 
     # create data dir if it does not exist
     Path(settings.lnbits_data_folder).mkdir(parents=True, exist_ok=True)
+    Path(settings.lnbits_data_folder, "logs").mkdir(parents=True, exist_ok=True)
 
-    # create extension dir if it does not exist
-    Path(settings.lnbits_path, "extensions").mkdir(parents=True, exist_ok=True)
+    # create `extensions`` dir if it does not exist
+    Path(settings.lnbits_extensions_path, "extensions").mkdir(
+        parents=True, exist_ok=True
+    )
 
     set_cli_settings(host=host, port=port, forwarded_allow_ips=forwarded_allow_ips)
 

lnbits/settings.py

@@ -1,15 +1,16 @@
+from __future__ import annotations
+
 import importlib
 import importlib.metadata
 import inspect
 import json
-import subprocess
 from os import path
 from sqlite3 import Row
 from typing import Any, List, Optional
 
 import httpx
 from loguru import logger
-from pydantic import BaseSettings, Extra, Field, validator
+from pydantic import BaseModel, BaseSettings, Extra, Field, validator
 
 
 def list_parse_fallback(v: str):
@@ -23,24 +24,22 @@ def list_parse_fallback(v: str):
         return []
 
 
-class LNbitsSettings(BaseSettings):
+class LNbitsSettings(BaseModel):
     @classmethod
-    def validate(cls, val):
+    def validate_list(cls, val):
         if isinstance(val, str):
             val = val.split(",") if val else []
         return val
 
-    class Config:
-        env_file = ".env"
-        env_file_encoding = "utf-8"
-        case_sensitive = False
-        json_loads = list_parse_fallback
-        extra = Extra.ignore
-
 
 class UsersSettings(LNbitsSettings):
     lnbits_admin_users: List[str] = Field(default=[])
     lnbits_allowed_users: List[str] = Field(default=[])
+    lnbits_allow_new_accounts: bool = Field(default=True)
+
+    @property
+    def new_accounts_allowed(self) -> bool:
+        return self.lnbits_allow_new_accounts and len(self.lnbits_allowed_users) == 0
 
 
 class ExtensionsSettings(LNbitsSettings):
@@ -91,6 +90,7 @@ class ThemesSettings(LNbitsSettings):
     lnbits_ad_space_enabled: bool = Field(default=False)
     lnbits_allowed_currencies: List[str] = Field(default=[])
     lnbits_default_accounting_currency: Optional[str] = Field(default=None)
+    lnbits_qr_logo: str = Field(default="/static/images/logos/lnbits.png")
 
 
 class OpsSettings(LNbitsSettings):
@@ -233,6 +233,16 @@ class WebPushSettings(LNbitsSettings):
     lnbits_webpush_privkey: str = Field(default=None)
 
 
+class NodeUISettings(LNbitsSettings):
+    # on-off switch for node ui
+    lnbits_node_ui: bool = Field(default=False)
+    # whether to display the public node ui (only if lnbits_node_ui is True)
+    lnbits_public_node_ui: bool = Field(default=False)
+    # can be used to disable the transactions tab in the node ui
+    # (recommended for large cln nodes)
+    lnbits_node_ui_transactions: bool = Field(default=False)
+
+
 class EditableSettings(
     UsersSettings,
     ExtensionsSettings,
@@ -243,6 +253,7 @@ class EditableSettings(
     BoltzExtensionSettings,
     LightningSettings,
     WebPushSettings,
+    NodeUISettings,
 ):
     @validator(
         "lnbits_admin_users",
@@ -253,7 +264,7 @@ class EditableSettings(
     )
     @classmethod
     def validate_editable_settings(cls, val):
-        return super().validate(val)
+        return super().validate_list(val)
 
     @classmethod
     def from_dict(cls, d: dict):
@@ -269,6 +280,11 @@ class EditableSettings(
                 prop.pop("env_names", None)
 
 
+class UpdateSettings(EditableSettings):
+    class Config:
+        extra = Extra.forbid
+
+
 class EnvSettings(LNbitsSettings):
     debug: bool = Field(default=False)
     bundle_assets: bool = Field(default=True)
@@ -277,9 +293,16 @@ class EnvSettings(LNbitsSettings):
     forwarded_allow_ips: str = Field(default="*")
     lnbits_title: str = Field(default="LNbits API")
     lnbits_path: str = Field(default=".")
-    lnbits_commit: str = Field(default="unknown")
+    lnbits_extensions_path: str = Field(default="lnbits")
     super_user: str = Field(default="")
     version: str = Field(default="0.0.0")
+    enable_log_to_file: bool = Field(default=True)
+    log_rotation: str = Field(default="100 MB")
+    log_retention: str = Field(default="3 months")
+
+    @property
+    def has_default_extension_path(self) -> bool:
+        return self.lnbits_extensions_path == "lnbits"
 
 
 class SaaSSettings(LNbitsSettings):
@@ -338,19 +361,25 @@ class ReadOnlySettings(
     )
     @classmethod
     def validate_readonly_settings(cls, val):
-        return super().validate(val)
+        return super().validate_list(val)
 
     @classmethod
     def readonly_fields(cls):
         return [f for f in inspect.signature(cls).parameters if not f.startswith("_")]
 
 
-class Settings(EditableSettings, ReadOnlySettings, TransientSettings):
+class Settings(EditableSettings, ReadOnlySettings, TransientSettings, BaseSettings):
     @classmethod
     def from_row(cls, row: Row) -> "Settings":
         data = dict(row)
         return cls(**data)
 
+    class Config:
+        env_file = ".env"
+        env_file_encoding = "utf-8"
+        case_sensitive = False
+        json_loads = list_parse_fallback
+
 
 class SuperSettings(EditableSettings):
     super_user: str
@@ -398,20 +427,14 @@ settings = Settings()
 
 settings.lnbits_path = str(path.dirname(path.realpath(__file__)))
 
-try:
-    settings.lnbits_commit = (
-        subprocess.check_output(
-            ["git", "-C", settings.lnbits_path, "rev-parse", "HEAD"],
-            stderr=subprocess.DEVNULL,
-        )
-        .strip()
-        .decode("ascii")
-    )
-except Exception:
-    settings.lnbits_commit = "docker"
-
 settings.version = importlib.metadata.version("lnbits")
 
+# printing environment variable for debugging
+if not settings.lnbits_admin_ui:
+    logger.debug("Environment Settings:")
+    for key, value in settings.dict(exclude_none=True).items():
+        logger.debug(f"{key}: {value}")
+
 
 def get_wallet_class():
     """

lnbits/static/css/base.css

@@ -535,3 +535,24 @@ video {
 .q-card code {
   overflow-wrap: break-word;
 }
+
+.qrcode__wrapper canvas {
+  position: relative;
+  width: 100% !important;
+  max-width: 100%;
+  max-height: 100%;
+}
+
+.qrcode__image {
+  width: 15%;
+  height: 15%;
+  overflow: hidden;
+  background: #fff;
+  left: 50%;
+  overflow: hidden;
+  position: absolute;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  padding: 0.2rem;
+  border-radius: 0.2rem;
+}

lnbits/static/i18n/br.js

@@ -37,7 +37,6 @@ window.localisation.br = {
   toggle_darkmode: 'Alternar modo escuro',
   view_swagger_docs: 'Ver a documentação da API do LNbits Swagger',
   api_docs: 'Documentação da API',
-  commit_version: 'Versão de commit',
   lnbits_version: 'Versão do LNbits',
   runs_on: 'Executa em',
   credit_hint: 'Pressione Enter para creditar a conta',

lnbits/static/i18n/cn.js

@@ -36,7 +36,6 @@ window.localisation.cn = {
   toggle_darkmode: '切换暗黑模式',
   view_swagger_docs: '查看 LNbits Swagger API 文档',
   api_docs: 'API文档',
-  commit_version: '提交版本',
   lnbits_version: 'LNbits版本',
   runs_on: '可运行在',
   credit_hint: '按 Enter 键充值账户',

lnbits/static/i18n/de.js

@@ -40,7 +40,6 @@ window.localisation.de = {
   toggle_darkmode: 'Auf Dark Mode umschalten',
   view_swagger_docs: 'LNbits Swagger API-Dokumente',
   api_docs: 'API docs',
-  commit_version: 'Commit Version',
   runs_on: 'Läuft auf',
   credit_hint: 'Klicke Enter, um das Konto zu belasten',
   credit_label: '%{denomination} zu belasten',

lnbits/static/i18n/en.js

@@ -3,7 +3,25 @@ window.localisation.en = {
   server: 'Server',
   theme: 'Theme',
   funding: 'Funding',
+
   users: 'Users',
+  apps: 'Apps',
+  channels: 'Channels',
+  transactions: 'Transactions',
+  dashboard: 'Dashboard',
+  manage_node: 'Manage Node',
+  total_capacity: 'Total Capacity',
+  avg_channel_size: 'Avg. Channel Size',
+  biggest_channel_size: 'Biggest Channel Size',
+  smallest_channel_size: 'Smallest Channel Size',
+  number_of_channels: 'Number of Channels',
+  active_channels: 'Active Channels',
+  connect_peer: 'Connect Peer',
+  connect: 'Connect',
+  open_channel: 'Open Channel',
+  open: 'Open',
+  close_channel: 'Close Channel',
+  close: 'Close',
   restart: 'Restart server',
   save: 'Save',
   save_tooltip: 'Save your changes',
@@ -40,7 +58,6 @@ window.localisation.en = {
   toggle_darkmode: 'Toggle Dark Mode',
   view_swagger_docs: 'View LNbits Swagger API docs',
   api_docs: 'Api docs',
-  commit_version: 'Commit version',
   lnbits_version: 'LNbits version',
   runs_on: 'Runs on',
   credit_hint: 'Press Enter to credit account',

lnbits/static/i18n/es.js

@@ -38,7 +38,6 @@ window.localisation.es = {
   toggle_darkmode: 'Cambiar modo oscuro',
   view_swagger_docs: 'Ver documentos de API de LNbits Swagger',
   api_docs: 'Documentos de API',
-  commit_version: 'Versión de compromiso',
   runs_on: 'Corre en',
   credit_hint: 'Presione Enter para cargar la cuenta',
   credit_label: 'Cargar %{denomination}',

lnbits/static/i18n/fr.js

@@ -41,7 +41,6 @@ window.localisation.fr = {
   toggle_darkmode: 'Basculer le mode sombre',
   view_swagger_docs: "Voir les documents de l'API Swagger de LNbits",
   api_docs: "Documents de l'API",
-  commit_version: 'Version de commit',
   lnbits_version: 'Version de LNbits',
   runs_on: 'Fonctionne sur',
   credit_hint: 'Appuyez sur Entrée pour créditer le compte',

lnbits/static/i18n/it.js

@@ -38,7 +38,6 @@ window.localisation.it = {
   toggle_darkmode: 'Attiva la modalità notturna',
   view_swagger_docs: "Visualizza i documenti dell'API Swagger di LNbits",
   api_docs: 'Documenti API',
-  commit_version: 'Commit version',
   lnbits_version: 'Versione di LNbits',
   runs_on: 'Esegue su',
   credit_hint: 'Premere Invio per accreditare i fondi',

lnbits/static/i18n/jp.js

@@ -36,7 +36,6 @@ window.localisation.jp = {
   toggle_dark_mode: 'ダークモードを切り替える',
   view_swagger_docs: 'Swaggerドキュメントを表示',
   api_docs: 'APIドキュメント',
-  commit_version: 'コミットバージョン',
   runs_on: 'で実行',
   credit_hint:
     'クレジットカードを使用して資金を追加するには、LNbitsを使用してください。',

lnbits/static/i18n/nl.js

@@ -39,7 +39,6 @@ window.localisation.nl = {
   toggle_darkmode: 'Donkere modus aan/uit',
   view_swagger_docs: 'Bekijk LNbits Swagger API-documentatie',
   api_docs: 'API-documentatie',
-  commit_version: 'Commit-versie',
   lnbits_version: 'LNbits-versie',
   runs_on: 'Draait op',
   credit_hint: 'Druk op Enter om de rekening te crediteren',

lnbits/static/i18n/pi.js

@@ -38,7 +38,6 @@ window.localisation.pi = {
   toggle_darkmode: 'Toggle Dark Mode, arr!',
   view_swagger_docs: 'View LNbits Swagger API docs and learn the secrets',
   api_docs: 'API docs for the scallywags',
-  commit_version: 'Commit version like a true pirate',
   lnbits_version: 'LNbits version, arr!',
   runs_on: 'Runs on, matey',
   credit_hint: 'Press Enter to credit account and make it richer',

lnbits/static/i18n/pl.js

@@ -36,7 +36,6 @@ window.localisation.pl = {
   toggle_darkmode: 'Tryb nocny',
   view_swagger_docs: 'Dokumentacja Swagger API',
   api_docs: 'Dokumentacja API',
-  commit_version: 'Commit',
   lnbits_version: 'Wersja LNbits',
   runs_on: 'Działa na',
   credit_hint: 'Naciśnij Enter aby doładować konto',

lnbits/static/i18n/pt.js

@@ -37,7 +37,6 @@ window.localisation.pt = {
   toggle_darkmode: 'Alternar modo escuro',
   view_swagger_docs: 'Ver a documentação da API do LNbits Swagger',
   api_docs: 'Documentação da API',
-  commit_version: 'Versão de commit',
   lnbits_version: 'Versão do LNbits',
   runs_on: 'Executa em',
   credit_hint: 'Pressione Enter para creditar a conta',

lnbits/static/i18n/we.js

@@ -37,7 +37,6 @@ window.localisation.we = {
   toggle_darkmode: 'Toglo Modd Tywyll',
   view_swagger_docs: 'Gweld dogfennau API LNbits Swagger',
   api_docs: 'Api docs',
-  commit_version: 'fersiwn ymrwymo',
   lnbits_version: 'Fersiwn LNbits',
   Runs_on: 'Yn rhedeg ymlaen',
   credit_hint: 'Pwyswch Enter i gyfrif credyd',

lnbits/static/images/logos/lnbits.svg

@@ -0,0 +1,4 @@
+<svg width="900" height="900" viewBox="0 0 900 900" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="450" cy="450" r="450" fill="#1E1E1E"/>
+<path d="M387.802 476.423L281.613 730.887L584.54 389.763H459.418L619.113 168.387H407.558L305.485 476.423H387.802Z" fill="#FF1FE1"/>
+</svg>

lnbits/static/js/admin.js

@@ -0,0 +1,316 @@
+new Vue({
+  el: '#vue',
+  mixins: [windowMixin],
+  data: function () {
+    return {
+      settings: {},
+      logs: [],
+      serverlogEnabled: false,
+      lnbits_theme_options: [
+        'classic',
+        'bitcoin',
+        'flamingo',
+        'cyber',
+        'freedom',
+        'mint',
+        'autumn',
+        'monochrome',
+        'salvador'
+      ],
+      auditData: {},
+      statusData: {},
+      statusDataTable: {
+        columns: [
+          {
+            name: 'date',
+            align: 'left',
+            label: this.$t('date'),
+            field: 'date'
+          },
+          {
+            name: 'message',
+            align: 'left',
+            label: this.$t('memo'),
+            field: 'message'
+          }
+        ]
+      },
+      formData: {},
+      formAddAdmin: '',
+      formAddUser: '',
+      formAddExtensionsManifest: '',
+      formAllowedIPs: '',
+      formBlockedIPs: '',
+      isSuperUser: false,
+      wallet: {},
+      cancel: {},
+      topUpDialog: {
+        show: false
+      },
+      tab: 'funding',
+      needsRestart: false
+    }
+  },
+  created() {
+    this.getSettings()
+    this.getAudit()
+    this.balance = +'{{ balance|safe }}'
+  },
+  computed: {
+    lnbitsVersion() {
+      return LNBITS_VERSION
+    },
+    checkChanges() {
+      return !_.isEqual(this.settings, this.formData)
+    },
+    updateAvailable() {
+      return LNBITS_VERSION !== this.statusData.version
+    }
+  },
+  methods: {
+    addAdminUser() {
+      let addUser = this.formAddAdmin
+      let admin_users = this.formData.lnbits_admin_users
+      if (addUser && addUser.length && !admin_users.includes(addUser)) {
+        //admin_users = [...admin_users, addUser]
+        this.formData.lnbits_admin_users = [...admin_users, addUser]
+        this.formAddAdmin = ''
+      }
+    },
+    removeAdminUser(user) {
+      let admin_users = this.formData.lnbits_admin_users
+      this.formData.lnbits_admin_users = admin_users.filter(u => u !== user)
+    },
+    addAllowedUser() {
+      let addUser = this.formAddUser
+      let allowed_users = this.formData.lnbits_allowed_users
+      if (addUser && addUser.length && !allowed_users.includes(addUser)) {
+        this.formData.lnbits_allowed_users = [...allowed_users, addUser]
+        this.formAddUser = ''
+      }
+    },
+    removeAllowedUser(user) {
+      let allowed_users = this.formData.lnbits_allowed_users
+      this.formData.lnbits_allowed_users = allowed_users.filter(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
+      )
+    },
+    async toggleServerLog() {
+      this.serverlogEnabled = !this.serverlogEnabled
+      if (this.serverlogEnabled) {
+        const wsProto = location.protocol !== 'http:' ? 'wss://' : 'ws://'
+        const digestHex = await LNbits.utils.digestMessage(this.g.user.id)
+        const localUrl =
+          wsProto +
+          document.domain +
+          ':' +
+          location.port +
+          '/api/v1/ws/' +
+          digestHex
+        this.ws = new WebSocket(localUrl)
+        this.ws.addEventListener('message', async ({data}) => {
+          this.logs.push(data.toString())
+          const scrollArea = this.$refs.logScroll
+          if (scrollArea) {
+            const scrollTarget = scrollArea.getScrollTarget()
+            const duration = 0
+            scrollArea.setScrollPosition(scrollTarget.scrollHeight, duration)
+          }
+        })
+      } else {
+        this.ws.close()
+      }
+    },
+    addAllowedIPs() {
+      const allowedIPs = this.formAllowedIPs.trim()
+      const allowed_ips = this.formData.lnbits_allowed_ips
+      if (
+        allowedIPs &&
+        allowedIPs.length &&
+        !allowed_ips.includes(allowedIPs)
+      ) {
+        this.formData.lnbits_allowed_ips = [...allowed_ips, allowedIPs]
+        this.formAllowedIPs = ''
+      }
+    },
+    removeAllowedIPs(allowed_ip) {
+      const allowed_ips = this.formData.lnbits_allowed_ips
+      this.formData.lnbits_allowed_ips = allowed_ips.filter(
+        a => a !== allowed_ip
+      )
+    },
+    addBlockedIPs() {
+      const blockedIPs = this.formBlockedIPs.trim()
+      const blocked_ips = this.formData.lnbits_blocked_ips
+      if (
+        blockedIPs &&
+        blockedIPs.length &&
+        !blocked_ips.includes(blockedIPs)
+      ) {
+        this.formData.lnbits_blocked_ips = [...blocked_ips, blockedIPs]
+        this.formBlockedIPs = ''
+      }
+    },
+    removeBlockedIPs(blocked_ip) {
+      const blocked_ips = this.formData.lnbits_blocked_ips
+      this.formData.lnbits_blocked_ips = blocked_ips.filter(
+        b => b !== blocked_ip
+      )
+    },
+    restartServer() {
+      LNbits.api
+        .request('GET', '/admin/api/v1/restart/?usr=' + this.g.user.id)
+        .then(response => {
+          this.$q.notify({
+            type: 'positive',
+            message: 'Success! Restarted Server',
+            icon: null
+          })
+          this.needsRestart = false
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    topupWallet() {
+      LNbits.api
+        .request(
+          'PUT',
+          '/admin/api/v1/topup/?usr=' + this.g.user.id,
+          this.g.user.wallets[0].adminkey,
+          this.wallet
+        )
+        .then(response => {
+          this.$q.notify({
+            type: 'positive',
+            message:
+              'Success! Added ' + this.wallet.amount + ' to ' + this.wallet.id,
+            icon: null
+          })
+          this.wallet = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    formatDate(date) {
+      return moment(date * 1000).fromNow()
+    },
+    getNotifications() {
+      if (this.settings.lnbits_notifications) {
+        axios
+          .get(this.settings.lnbits_status_manifest)
+          .then(response => {
+            this.statusData = response.data
+          })
+          .catch(error => {
+            this.formData.lnbits_notifications = false
+            error.response.data = {}
+            error.response.data.message = 'Could not fetch status manifest.'
+            LNbits.utils.notifyApiError(error)
+          })
+      }
+    },
+    getAudit() {
+      LNbits.api
+        .request(
+          'GET',
+          '/admin/api/v1/audit/?usr=' + this.g.user.id,
+          this.g.user.wallets[0].adminkey
+        )
+        .then(response => {
+          this.auditData = response.data
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    getSettings() {
+      LNbits.api
+        .request(
+          'GET',
+          '/admin/api/v1/settings/?usr=' + this.g.user.id,
+          this.g.user.wallets[0].adminkey
+        )
+        .then(response => {
+          this.isSuperUser = response.data.is_super_user || false
+          this.settings = response.data
+          this.formData = {...this.settings}
+          this.getNotifications()
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    updateSettings() {
+      let data = _.omit(this.formData, [
+        'is_super_user',
+        'lnbits_allowed_funding_sources'
+      ])
+      LNbits.api
+        .request(
+          'PUT',
+          '/admin/api/v1/settings/?usr=' + this.g.user.id,
+          this.g.user.wallets[0].adminkey,
+          data
+        )
+        .then(response => {
+          this.needsRestart =
+            this.settings.lnbits_backend_wallet_class !==
+              this.formData.lnbits_backend_wallet_class ||
+            this.settings.lnbits_killswitch !== this.formData.lnbits_killswitch
+          this.settings = this.formData
+          this.formData = _.clone(this.settings)
+          this.$q.notify({
+            type: 'positive',
+            message: `Success! Settings changed! ${
+              this.needsRestart ? 'Restart required!' : ''
+            }`,
+            icon: null
+          })
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteSettings() {
+      LNbits.utils
+        .confirmDialog('Are you sure you want to restore settings to default?')
+        .onOk(() => {
+          LNbits.api
+            .request('DELETE', '/admin/api/v1/settings/?usr=' + this.g.user.id)
+            .then(response => {
+              this.$q.notify({
+                type: 'positive',
+                message:
+                  'Success! Restored settings to defaults, restart required!',
+                icon: null
+              })
+              this.needsRestart = true
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    downloadBackup() {
+      window.open('/admin/api/v1/backup/?usr=' + this.g.user.id, '_blank')
+    }
+  }
+})

lnbits/static/js/base.js

@@ -64,9 +64,35 @@ window.LNbits = {
         callback
       })
     },
+    createAccount: function (name) {
+      return this.request('post', '/api/v1/account', null, {
+        name: name
+      })
+    },
     getWallet: function (wallet) {
       return this.request('get', '/api/v1/wallet', wallet.inkey)
     },
+    createWallet: function (wallet, name) {
+      return this.request('post', '/api/v1/wallet', wallet.adminkey, {
+        name: name
+      }).then(res => {
+        window.location = '/wallet?usr=' + res.data.user + '&wal=' + res.data.id
+      })
+    },
+    updateWallet: function (name, wallet) {
+      return this.request('patch', '/api/v1/wallet', wallet.adminkey, {
+        name: name
+      })
+    },
+    deleteWallet: function (wallet) {
+      return this.request('delete', '/api/v1/wallet', wallet.adminkey).then(
+        _ => {
+          let url = new URL(window.location.href)
+          url.searchParams.delete('wal')
+          window.location = url
+        }
+      )
+    },
     getPayments: function (wallet, query) {
       const params = new URLSearchParams(query)
       return this.request(
@@ -118,18 +144,6 @@ window.LNbits = {
       }
     }
   },
-  href: {
-    createWallet: function (walletName, userId) {
-      window.location.href =
-        '/wallet?' + (userId ? 'usr=' + userId + '&' : '') + 'nme=' + walletName
-    },
-    updateWallet: function (walletName, userId, walletId) {
-      window.location.href = `/wallet?usr=${userId}&wal=${walletId}&nme=${walletName}`
-    },
-    deleteWallet: function (walletId, userId) {
-      window.location.href = '/deletewallet?usr=' + userId + '&wal=' + walletId
-    }
-  },
   map: {
     extension: function (data) {
       var obj = _.object(
@@ -221,7 +235,7 @@ window.LNbits = {
       obj.expirydateFrom = moment(obj.expirydate).fromNow()
       obj.msat = obj.amount
       obj.sat = obj.msat / 1000
-      obj.tag = obj.extra.tag
+      obj.tag = obj.extra?.tag
       obj.fsat = new Intl.NumberFormat(window.LOCALE).format(obj.sat)
       obj.isIn = obj.amount > 0
       obj.isOut = obj.amount < 0
@@ -262,6 +276,9 @@ window.LNbits = {
     formatSat: function (value) {
       return new Intl.NumberFormat(window.LOCALE).format(value)
     },
+    formatMsat: function (value) {
+      return this.formatSat(value / 1000)
+    },
     notifyApiError: function (error) {
       var types = {
         400: 'warning',
@@ -340,6 +357,12 @@ window.LNbits = {
           icon: null
         })
       }
+    },
+    convertMarkdown(text) {
+      const converter = new showdown.Converter()
+      converter.setFlavor('github')
+      converter.setOption('simpleLineBreaks', true)
+      return converter.makeHtml(text)
     }
   }
 }
@@ -348,6 +371,7 @@ window.windowMixin = {
   i18n: window.i18n,
   data: function () {
     return {
+      toggleSubs: true,
       g: {
         offline: !navigator.onLine,
         visibleDrawer: false,
@@ -451,7 +475,7 @@ window.windowMixin = {
             return !obj.hidden
           })
           .filter(function (obj) {
-            if (window.user.admin) return obj
+            if (window.user?.admin) return obj
             return !obj.isAdminOnly
           })
           .map(function (obj) {

lnbits/static/js/components.js

@@ -86,7 +86,7 @@ Vue.component('lnbits-wallet-list', {
   },
   methods: {
     createWallet: function () {
-      LNbits.href.createWallet(this.walletName, this.user.id)
+      LNbits.api.createWallet(this.user.wallets[0], this.walletName)
     },
     updateWalletBalance: function (payload) {
       this.activeBalance = payload
@@ -178,6 +178,7 @@ Vue.component('lnbits-extension-list', {
 })
 
 Vue.component('lnbits-admin-ui', {
+  props: ['showNode'],
   data: function () {
     return {
       extensions: [],
@@ -195,6 +196,14 @@ Vue.component('lnbits-admin-ui', {
           <q-item-label lines="1" class="text-caption" v-text="$t('manage_server')"></q-item-label>
         </q-item-section>
       </q-item>
+      <q-item v-if='showNode' clickable tag="a" :href="['/node?usr=', user.id].join('')">
+        <q-item-section side>
+          <q-icon name="developer_board" color="grey-5" size="md"></q-icon>
+        </q-item-section>
+        <q-item-section>
+          <q-item-label lines="1" class="text-caption" v-text="$t('manage_node')"></q-item-label>
+        </q-item-section>
+      </q-item>
     </q-list>
   `,
 
@@ -347,6 +356,24 @@ Vue.component('lnbits-lnurlpay-success-action', {
   }
 })
 
+Vue.component('lnbits-qrcode', {
+  mixins: [windowMixin],
+  props: ['value'],
+  components: {[VueQrcode.name]: VueQrcode},
+  data() {
+    return {
+      logo: LNBITS_QR_LOGO
+    }
+  },
+  template: `
+  <div class="qrcode__wrapper">
+    <qrcode :value="value"
+    :options="{errorCorrectionLevel: 'Q', width: 800}" class="rounded-borders"></qrcode>
+    <img class="qrcode__image" :src="logo" alt="..." />
+  </div>
+  `
+})
+
 Vue.component('lnbits-notifications-btn', {
   mixins: [windowMixin],
   props: ['pubkey'],
@@ -559,3 +586,75 @@ Vue.component('lnbits-notifications-btn', {
     }
   }
 })
+
+Vue.component('lnbits-dynamic-fields', {
+  mixins: [windowMixin],
+  props: ['options', 'value'],
+  data() {
+    return {
+      formData: null
+    }
+  },
+
+  template: `
+    <div v-if="formData">
+      <div class="row q-mb-lg" v-for="o in options">
+        <div class="col auto-width">
+          <p v-if=o.options?.length class="q-ml-xl">
+            <span v-text="o.name"></span> <small v-if="o.description"> (<span v-text="o.description"></span>)</small>
+          </p>
+          <lnbits-dynamic-fields v-if="o.options?.length" :options="o.options" v-model="formData[o.name]" class="q-ml-xl">
+          </lnbits-dynamic-fields>
+          <div v-else>
+            <q-input v-if="o.type === 'number'" v-model="formData[o.name]" @input="handleValueChanged" type="number"
+              :label="o.name" :hint="o.description" filled dense>
+            </q-input>
+            <q-input v-else-if="o.type === 'text'" v-model="formData[o.name]" @input="handleValueChanged" type="textarea"
+              rows="5" :label="o.name" :hint="o.description" filled dense>
+            </q-input>
+            <div v-else-if="o.type === 'bool'">
+              <q-item tag="label" v-ripple>
+                <q-item-section avatar top>
+                  <q-checkbox v-model="formData[o.name]" @input="handleValueChanged" />
+                </q-item-section>
+                <q-item-section>
+                  <q-item-label><span v-text="o.name"></span></q-item-label>
+                  <q-item-label caption> <span v-text="o.description"></span> </q-item-label>
+                </q-item-section>
+              </q-item>
+            </div>
+            <q-select v-else-if="o.type === 'select'" v-model="formData[o.name]" @input="handleValueChanged" :label="o.name"
+              :hint="o.description" :options="o.values"></q-select>
+
+            <q-select v-else-if="o.isList" filled multiple dense v-model.trim="formData[o.name]" use-input use-chips
+              @input="handleValueChanged" multiple hide-dropdown-icon input-debounce="0" new-value-mode="add-unique"
+              :label="o.name" :hint="o.description">
+            </q-select>
+            <q-input v-else v-model="formData[o.name]" @input="handleValueChanged" :label="o.name" :hint="o.description"
+              filled dense>
+            </q-input>
+
+          </div>
+        </div>
+      </div>
+    </div>
+  `,
+  methods: {
+    buildData(options, data = {}) {
+      return options.reduce((d, option) => {
+        if (option.options?.length) {
+          d[option.name] = this.buildData(option.options, data[option.name])
+        } else {
+          d[option.name] = data[option.name] ?? option.default
+        }
+        return d
+      }, {})
+    },
+    handleValueChanged() {
+      this.$emit('input', this.formData)
+    }
+  },
+  created: function () {
+    this.formData = this.buildData(this.options, this.value)
+  }
+})

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

@@ -0,0 +1,165 @@
+Vue.component('lnbits-funding-sources', {
+  mixins: [windowMixin],
+  props: ['form-data', 'allowed-funding-sources'],
+  computed: {
+    fundingSources() {
+      let tmp = []
+      for (const [key, _, obj] of this.rawFundingSources) {
+        const tmpObj = {}
+        if (obj !== null) {
+          for (let [k, v] of Object.entries(obj)) {
+            tmpObj[k] = {label: v, value: null}
+          }
+        }
+        tmp.push([key, tmpObj])
+      }
+      return new Map(tmp)
+    }
+  },
+  data() {
+    return {
+      rawFundingSources: [
+        ['VoidWallet', 'Void Wallet', null],
+        [
+          'FakeWallet',
+          'Fake Wallet',
+          {
+            fake_wallet_secret: 'Secret'
+          }
+        ],
+        [
+          'CoreLightningWallet',
+          'Core Lightning',
+          {
+            corelightning_rpc: 'Endpoint'
+          }
+        ],
+        [
+          'CoreLightningRestWallet',
+          'Core Lightning Rest',
+          {
+            corelightning_rest_url: 'Endpoint',
+            corelightning_rest_cert: 'Certificate',
+            corelightning_rest_macaroon: 'Macaroon'
+          }
+        ],
+        [
+          'LndRestWallet',
+          'Lightning Network Daemon (LND Rest)',
+          {
+            lnd_rest_endpoint: 'Endpoint',
+            lnd_rest_cert: 'Certificate',
+            lnd_rest_macaroon: 'Macaroon',
+            lnd_rest_macaroon_encrypted: 'Encrypted Macaroon'
+          }
+        ],
+        [
+          'LndWallet',
+          'Lightning Network Daemon (LND)',
+          {
+            lnd_grpc_endpoint: 'Endpoint',
+            lnd_grpc_cert: 'Certificate',
+            lnd_grpc_port: 'Port',
+            lnd_grpc_admin_macaroon: 'Admin Macaroon',
+            lnd_grpc_macaroon_encrypted: 'Encrypted Macaroon'
+          }
+        ],
+        [
+          'LnTipsWallet',
+          'LN.Tips',
+          {
+            lntips_api_endpoint: 'Endpoint',
+            lntips_api_key: 'API Key'
+          }
+        ],
+        [
+          'LNPayWallet',
+          'LN Pay',
+          {
+            lnpay_api_endpoint: 'Endpoint',
+            lnpay_api_key: 'API Key',
+            lnpay_wallet_key: 'Wallet Key'
+          }
+        ],
+        [
+          'EclairWallet',
+          'Eclair (ACINQ)',
+          {
+            eclair_url: 'URL',
+            eclair_pass: 'Password'
+          }
+        ],
+        [
+          'LNbitsWallet',
+          'LNBits',
+          {
+            lnbits_endpoint: 'Endpoint',
+            lnbits_key: 'Admin Key'
+          }
+        ],
+        [
+          'OpenNodeWallet',
+          'OpenNode',
+          {
+            opennode_api_endpoint: 'Endpoint',
+            opennode_key: 'Key'
+          }
+        ],
+        [
+          'ClicheWallet',
+          'Cliche (NBD)',
+          {
+            cliche_endpoint: 'Endpoint'
+          }
+        ],
+        [
+          'SparkWallet',
+          'Spark',
+          {
+            spark_url: 'Endpoint',
+            spark_token: 'Token'
+          }
+        ]
+      ]
+    }
+  },
+  template: `
+    <div class="funding-sources">
+        <h6 class="q-mt-xl q-mb-md">Funding Sources</h6>
+        <div class="row">
+          <div class="col-12">
+            <p>Active Funding<small> (Requires server restart)</small></p>
+            <q-select
+              filled
+              v-model="formData.lnbits_backend_wallet_class"
+              hint="Select the active funding wallet"
+              :options="allowedFundingSources"
+            ></q-select>
+          </div>
+        </div>
+        <q-list
+          class="q-mt-md"
+          v-for="(fund, idx) in allowedFundingSources"
+          :key="idx"
+        >
+          <div v-if="fundingSources.get(fund) && fund === formData.lnbits_backend_wallet_class">
+            <div class="row"
+              v-for="([key, prop], i) in Object.entries(fundingSources.get(fund))"
+              :key="i"
+            >
+              <div class="col-12">
+                <q-input
+                  filled
+                  type="text"
+                  class="q-mt-sm"
+                  v-model="formData[key]"
+                  :label="prop.label"
+                  :hint="prop.hint"
+                ></q-input>
+              </div>
+            </div>
+          </div>
+        </q-list>
+    </div>
+  `
+})

lnbits/static/scss/base.scss

@@ -213,3 +213,25 @@ video {
     overflow-wrap: break-word;
   }
 }
+
+// qrcode
+.qrcode__wrapper canvas {
+  position: relative;
+  width: 100% !important; // important to override qrcode inline width
+  max-width: 100%;
+  max-height: 100%;
+}
+
+.qrcode__image {
+  width: 15%;
+  height: 15%;
+  overflow: hidden;
+  background: #fff;
+  left: 50%;
+  overflow: hidden;
+  position: absolute;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  padding: 0.2rem;
+  border-radius: 0.2rem;
+}

lnbits/static/vendor.json

@@ -12,6 +12,7 @@
     "/static/vendor/quasar.umd.js",
     "/static/vendor/Chart.bundle.js",
     "/static/vendor/vue-i18n.js",
+    "/static/vendor/showdown.js",
     "/static/i18n/i18n.js",
     "/static/i18n/de.js",
     "/static/i18n/en.js",
@@ -30,6 +31,7 @@
     "/static/i18n/br.js",
     "/static/js/base.js",
     "/static/js/components.js",
+    "/static/js/components/lnbits-funding-sources.js",
     "/static/js/bolt11-decoder.js"
   ],
   "css": [

lnbits/tasks.py

@@ -22,8 +22,6 @@ from lnbits.core.services import redeem_lnurl_withdraw
 from lnbits.settings import settings
 from lnbits.wallets import get_wallet_class
 
-from .core import db
-
 tasks: List[asyncio.Task] = []
 
 
@@ -150,37 +148,36 @@ async def check_pending_payments():
     incoming = True
 
     while True:
-        async with db.connect() as conn:
-            logger.info(
-                f"Task: checking all pending payments (incoming={incoming},"
-                f" outgoing={outgoing}) of last 15 days"
-            )
-            start_time = time.time()
-            pending_payments = await get_payments(
-                since=(int(time.time()) - 60 * 60 * 24 * 15),  # 15 days ago
-                complete=False,
-                pending=True,
-                outgoing=outgoing,
-                incoming=incoming,
-                exclude_uncheckable=True,
-                conn=conn,
-            )
-            for payment in pending_payments:
-                await payment.check_status(conn=conn)
+        logger.info(
+            f"Task: checking all pending payments (incoming={incoming},"
+            f" outgoing={outgoing}) of last 15 days"
+        )
+        start_time = time.time()
+        pending_payments = await get_payments(
+            since=(int(time.time()) - 60 * 60 * 24 * 15),  # 15 days ago
+            complete=False,
+            pending=True,
+            outgoing=outgoing,
+            incoming=incoming,
+            exclude_uncheckable=True,
+        )
+        for payment in pending_payments:
+            await payment.check_status()
+            await asyncio.sleep(0.01)  # to avoid complete blocking
 
+        logger.info(
+            f"Task: pending check finished for {len(pending_payments)} payments"
+            f" (took {time.time() - start_time:0.3f} s)"
+        )
+        # we delete expired invoices once upon the first pending check
+        if incoming:
+            logger.debug("Task: deleting all expired invoices")
+            start_time = time.time()
+            await delete_expired_invoices()
             logger.info(
-                f"Task: pending check finished for {len(pending_payments)} payments"
-                f" (took {time.time() - start_time:0.3f} s)"
+                "Task: expired invoice deletion finished (took"
+                f" {time.time() - start_time:0.3f} s)"
             )
-            # we delete expired invoices once upon the first pending check
-            if incoming:
-                logger.debug("Task: deleting all expired invoices")
-                start_time = time.time()
-                await delete_expired_invoices(conn=conn)
-                logger.info(
-                    "Task: expired invoice deletion finished (took"
-                    f" {time.time() - start_time:0.3f} s)"
-                )
 
         # after the first check we will only check outgoing, not incoming
         # that will be handled by the global invoice listeners, hopefully

lnbits/templates/base.html

@@ -37,10 +37,9 @@
               <img height="30px" alt="Logo" src="{{ USE_CUSTOM_LOGO }}" />
               {%else%} {% if SITE_TITLE != 'LNbits' %} {{ SITE_TITLE }} {% else
               %}
-              <span><strong>LN</strong>bits</span> {% endif %} {%endif%} {%
-              endblock %}
-            </q-btn>
-            {% block toolbar_subtitle %}{%if user and user.super_user%}
+              <span><strong>LN</strong>bits</span> {% endif %} {%endif%} </q-btn
+            >{% endblock %} {% block toolbar_subtitle %}{%if user and
+            user.super_user%}
             <q-badge align="middle">Super User</q-badge>
             {% elif user and user.admin %}
             <q-badge align="middle">Admin User</q-badge>
@@ -228,6 +227,7 @@
 
         <lnbits-admin-ui
           v-if="'{{LNBITS_ADMIN_UI}}' == 'True'"
+          :show-node="'{{LNBITS_NODE_UI}}' == 'True'"
         ></lnbits-admin-ui>
         <lnbits-extension-list class="q-pb-xl"></lnbits-extension-list>
       </q-drawer>
@@ -250,12 +250,8 @@
             <br />
             <small
               >{% raw %}{{ $t('lnbits_version') }}{% endraw %}:
-              {{LNBITS_VERSION}},
+              {{LNBITS_VERSION}}
             </small>
-            <small
-              >{% raw %}{{ $t('commit_version') }}{% endraw %}:
-              {{COMMIT_VERSION}}</small
-            >
           </q-toolbar-title>
           <q-space></q-space>
           <q-btn
@@ -297,26 +293,28 @@
     {% endfor %}
     <!---->
     <script type="text/javascript">
+      const SITE_DESCRIPTION = {{ SITE_DESCRIPTION | tojson}}
       const themes = {{ LNBITS_THEME_OPTIONS | tojson }}
       const LNBITS_DENOMINATION = {{ LNBITS_DENOMINATION | tojson }}
       const LNBITS_VERSION = {{ LNBITS_VERSION | tojson }}
+      const LNBITS_QR_LOGO = {{ LNBITS_QR_LOGO | tojson }}
       if (themes && themes.length) {
         window.allowedThemes = themes.map(str => str.trim())
       }
       window.langs = [
-        {value: 'en', label: 'English', display: 'EN'},
-        {value: 'de', label: 'Deutsch', display: 'DE'},
-        {value: 'es', label: 'Español', display: 'ES'},
-        {value: 'jp', label: '日本語', display: 'JP'},
-        {value: 'cn', label: '中文', display: 'CN'},
-        {value: 'fr', label: 'Français', display: 'FR'},
-        {value: 'it', label: 'Italiano', display: 'IT'},
-        {value: 'pi', label: 'Pirate', display: 'PI'},
-        {value: 'nl', label: 'Nederlands', display: 'NL'},
-        {value: 'we', label: 'Cymraeg', display: 'CY'},
-        {value: 'pl', label: 'Polski', display: 'PL'},
-        {value: 'pt', label: 'Português', display: 'PT'},
-        {value: 'br', label: 'Português', display: 'BR'}
+        { value: 'en', label: 'English', display: 'EN' },
+        { value: 'de', label: 'Deutsch', display: 'DE' },
+        { value: 'es', label: 'Español', display: 'ES' },
+        { value: 'jp', label: '日本語', display: 'JP' },
+        { value: 'cn', label: '中文', display: 'CN' },
+        { value: 'fr', label: 'Français', display: 'FR' },
+        { value: 'it', label: 'Italiano', display: 'IT' },
+        { value: 'pi', label: 'Pirate', display: 'PI' },
+        { value: 'nl', label: 'Nederlands', display: 'NL' },
+        { value: 'we', label: 'Cymraeg', display: 'CY' },
+        { value: 'pl', label: 'Polski', display: 'PL' },
+        { value: 'pt', label: 'Português', display: 'PT' },
+        { value: 'br', label: 'Português', display: 'BR' }
       ]
     </script>
     {% block scripts %}{% endblock %}

lnbits/wallets/__init__.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import importlib
 from typing import Optional
 
+from lnbits.nodes import set_node_class
 from lnbits.settings import settings
 from lnbits.wallets.base import Wallet
 
@@ -27,6 +28,8 @@ def set_wallet_class(class_name: Optional[str] = None):
     wallet_class = getattr(wallets_module, backend_wallet_class)
     global WALLET
     WALLET = wallet_class()
+    if WALLET.__node_cls__:
+        set_node_class(WALLET.__node_cls__(WALLET))
 
 
 def get_wallet_class() -> Wallet:
@@ -34,7 +37,7 @@ def get_wallet_class() -> Wallet:
 
 
 wallets_module = importlib.import_module("lnbits.wallets")
-FAKE_WALLET: Wallet = FakeWallet()
+FAKE_WALLET = FakeWallet()
 
 # initialize as fake wallet
 WALLET: Wallet = FAKE_WALLET

lnbits/wallets/base.py

@@ -1,5 +1,10 @@
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
-from typing import AsyncGenerator, Coroutine, NamedTuple, Optional
+from typing import TYPE_CHECKING, AsyncGenerator, Coroutine, NamedTuple, Optional, Type
+
+if TYPE_CHECKING:
+    from lnbits.nodes.base import Node
 
 
 class StatusResponse(NamedTuple):
@@ -51,6 +56,8 @@ class Wallet(ABC):
     async def cleanup(self):
         pass
 
+    __node_cls__: Optional[Type[Node]] = None
+
     @abstractmethod
     def status(self) -> Coroutine[None, None, StatusResponse]:
         pass
@@ -61,6 +68,7 @@ class Wallet(ABC):
         amount: int,
         memo: Optional[str] = None,
         description_hash: Optional[bytes] = None,
+        unhashed_description: Optional[bytes] = None,
         **kwargs,
     ) -> Coroutine[None, None, InvoiceResponse]:
         pass

lnbits/wallets/corelightning.py

@@ -2,10 +2,12 @@ import asyncio
 import random
 from typing import Any, AsyncGenerator, Optional
 
+from bolt11.decode import decode as bolt11_decode
+from bolt11.exceptions import Bolt11Exception
 from loguru import logger
 from pyln.client import LightningRpc, RpcError
 
-from lnbits import bolt11 as lnbits_bolt11
+from lnbits.nodes.cln import CoreLightningNode
 from lnbits.settings import settings
 
 from .base import (
@@ -24,6 +26,8 @@ async def run_sync(func) -> Any:
 
 
 class CoreLightningWallet(Wallet):
+    __node_cls__ = CoreLightningNode
+
     def __init__(self):
         self.rpc = settings.corelightning_rpc or settings.clightning_rpc
         self.ln = LightningRpc(self.rpc)
@@ -95,12 +99,20 @@ class CoreLightningWallet(Wallet):
             return InvoiceResponse(False, None, None, str(e))
 
     async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
-        invoice = lnbits_bolt11.decode(bolt11)
+        try:
+            invoice = bolt11_decode(bolt11)
+        except Bolt11Exception as exc:
+            return PaymentResponse(False, None, None, None, str(exc))
 
         previous_payment = await self.get_payment_status(invoice.payment_hash)
         if previous_payment.paid:
             return PaymentResponse(False, None, None, None, "invoice already paid")
 
+        if not invoice.amount_msat or invoice.amount_msat <= 0:
+            return PaymentResponse(
+                False, None, None, None, "CLN 0 amount invoice not supported"
+            )
+
         fee_limit_percent = fee_limit_msat / invoice.amount_msat * 100
         # so fee_limit_percent is applied even on payments with fee < 5000 millisatoshi
         # (which is default value of exemptfee)
@@ -108,6 +120,9 @@ class CoreLightningWallet(Wallet):
             "bolt11": bolt11,
             "maxfeepercent": f"{fee_limit_percent:.11}",
             "exemptfee": 0,
+            # so fee_limit_percent is applied even on payments with fee < 5000
+            # millisatoshi (which is default value of exemptfee)
+            "description": invoice.description,
         }
         try:
             r = await run_sync(lambda: self.ln.call("pay", payload))