Update installation.md (#1997)

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

.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"
@@ -21,6 +28,9 @@ 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.

.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/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

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))
 

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/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
 =============

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/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>

lnbits/app.py

@@ -526,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/commands.py

@@ -89,7 +89,7 @@ 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)

lnbits/core/crud.py

@@ -5,7 +5,6 @@ from urllib.parse import urlparse
 from uuid import UUID, uuid4
 
 import shortuuid
-from bolt11.decode import decode
 
 from lnbits.core.db import db
 from lnbits.core.models import WalletType
@@ -535,6 +534,7 @@ 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,
@@ -545,14 +545,6 @@ async def create_payment(
     previous_payment = await get_standalone_payment(checking_id, conn=conn)
     assert previous_payment is None, "Payment already exists"
 
-    invoice = decode(payment_request)
-
-    if invoice.expiry:
-        expiration_date = datetime.datetime.fromtimestamp(invoice.date + invoice.expiry)
-    else:
-        # 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
@@ -576,7 +568,7 @@ async def create_payment(
                 else None
             ),
             webhook,
-            db.datetime_to_timestamp(expiration_date),
+            db.datetime_to_timestamp(expiry) if expiry else None,
         ),
     )
 

lnbits/core/helpers.py

@@ -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/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,6 @@ 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
@@ -138,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(
@@ -147,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,
@@ -175,7 +178,7 @@ 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.")
@@ -203,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(
@@ -210,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,
         )
@@ -650,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/node.js

@@ -176,3 +176,93 @@ Vue.component('lnbits-node-info', {
     </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 = 58
+const CACHE_VERSION = 64
 const CURRENT_CACHE = `lnbits-${CACHE_VERSION}-`
 
 const getApiKey = request => {

lnbits/core/static/js/wallet.js

@@ -804,7 +804,11 @@ 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 () {

lnbits/core/templates/admin/_tab_funding.html

@@ -25,117 +25,71 @@
           </ul>
           <br />
         </div>
-      </div>
-      <div class="row">
         <div class="col">
-          <div v-if="'{{LNBITS_NODE_UI_AVAILABLE}}' === 'True'">
-            <div>Node Management</div>
-            <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>
-            <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>
-            <br />
-          </div>
-          <p v-else>Node Management not supported by active funding source</p>
+          {% 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="prettyFunding.get(fund) || 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_theme.html

@@ -36,7 +36,7 @@
       </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,537 +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,
-        prettyFunding: new Map([
-          ['VoidWallet', 'Void Wallet'],
-          ['FakeWallet', 'Fake Wallet'],
-          ['CoreLightningWallet', 'Core Lightning'],
-          ['CoreLightningRestWallet', 'Core Lightning'],
-          ['LndRestWallet', 'Lightning Network Daemon (LND Rest)'],
-          ['LndWallet', 'Lightning Network Daemon (LND)'],
-          ['LnTipsWallet', 'LN.Tips'],
-          ['LNPayWallet', 'LN Pay'],
-          ['EclairWallet', 'Eclair (ACINQ)'],
-          ['LNbitsWallet', 'LNBits'],
-          ['OpenNodeWallet', 'OpenNode'],
-          ['ClicheWallet', 'Cliche (NBD)'],
-          ['SparkWallet', 'Spark']
-        ]),
-        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/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>

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,10 +328,9 @@
                   <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="$t('drain_funds_desc')"></p>
                     </q-card-section>
@@ -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>
@@ -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>

lnbits/core/templates/node/index.html

@@ -47,126 +47,6 @@
   Vue.component(VueQrcode.name, VueQrcode)
   Vue.use(VueQrcodeReader)
 
-  {% raw %}
-  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>
-      `
-    }
-  )
-
-
-  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>
-      `
-    }
-  )
-
-  {% endraw %}
-
-
   new Vue({
     el: '#vue',
     config: {
@@ -190,13 +70,12 @@
           filter: ''
         },
 
-
         activeBalance: {},
         ranks: {},
 
         peers: {
           data: [],
-          filter: '',
+          filter: ''
         },
 
         connectPeerDialog: {
@@ -315,7 +194,7 @@
               label: this.$t('amount') + ' (' + LNBITS_DENOMINATION + ')',
               field: row => this.formatMsat(row.amount),
               sortable: true
-            },
+            }
           ],
           pagination: {
             rowsPerPage: 10,
@@ -346,9 +225,11 @@
         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
+        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(
@@ -360,7 +241,7 @@
           },
           {local_msat: 0, remote_msat: 0, total_msat: 0}
         )
-      },
+      }
     },
     methods: {
       formatMsat: function (msat) {
@@ -369,29 +250,27 @@
       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)
+        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
-          })
+        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
-          })
+        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
-          })
+        return this.api('GET', '/rank').then(response => {
+          this.ranks = response.data
+        })
       },
       getPayments: function (props) {
         if (props) {
@@ -400,13 +279,12 @@
         let pagination = this.paymentsTable.pagination
         const query = {
           limit: pagination.rowsPerPage,
-          offset: ((pagination.page - 1) * pagination.rowsPerPage) ?? 0,
+          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
-          })
+        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) {
@@ -415,44 +293,40 @@
         let pagination = this.invoiceTable.pagination
         const query = {
           limit: pagination.rowsPerPage,
-          offset: ((pagination.page - 1) * pagination.rowsPerPage) ?? 0,
+          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
-          })
+        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)
-          })
+        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.api('POST', '/peers', {data: this.connectPeerDialog.data}).then(
+          () => {
             this.connectPeerDialog.show = false
             this.getPeers()
-          })
+          }
+        )
       },
-      disconnectPeer: function(id) {
+      disconnectPeer: function (id) {
         LNbits.utils
-          .confirmDialog(
-            'Do you really wanna disconnect this peer?'
-          )
+          .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()
+            this.api('DELETE', `/peers/${id}`).then(response => {
+              this.$q.notify({
+                message: 'Disconnected',
+                icon: null
               })
+              this.needsRestart = true
+              this.getPeers()
+            })
           })
       },
       openChannel: function () {
@@ -467,14 +341,19 @@
       },
       showCloseChannelDialog: function (channel) {
         this.closeChannelDialog.show = true
-        this.closeChannelDialog.data = {force: false, short_id: channel.short_id, ...channel.point}
+        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()
-          })
+        this.api('DELETE', '/channels', {
+          query: this.closeChannelDialog.data
+        }).then(response => {
+          this.closeChannelDialog.show = false
+          this.getChannels()
+        })
       },
       showOpenChannelDialog: function (peer_id) {
         this.openChannelDialog.show = true
@@ -489,9 +368,7 @@
         this.transactionDetailsDialog.data = details
         console.log('details', details)
       },
-      exportCSV: function () {
-
-      },
+      exportCSV: function () {},
       shortenNodeId
     }
   })

lnbits/core/templates/node/public.html

@@ -56,11 +56,6 @@ context %} {% block page %}
   Vue.component(VueQrcode.name, VueQrcode)
   Vue.use(VueQrcodeReader)
 
-  {% raw %}
-
-  {% endraw %}
-
-
   new Vue({
     el: '#vue',
     config: {
@@ -109,7 +104,7 @@ context %} {% block page %}
           {label: 'Pending', value: 'pending', color: 'orange'},
           {label: 'Inactive', value: 'inactive', color: 'grey'},
           {label: 'Closed', value: 'closed', color: 'red'}
-        ],
+        ]
       }
     },
     created: function () {
@@ -124,18 +119,16 @@ context %} {% block page %}
         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
-          })
+        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
-          })
-      },
+        this.api('GET', '/rank', {}).then(response => {
+          this.ranks = response.data
+        })
+      }
     }
   })
 </script>

lnbits/core/views/api.py

@@ -172,7 +172,7 @@ async def api_create_wallet(
 
 @api_router.post("/api/v1/account", response_model=Wallet)
 async def api_create_account(data: CreateWallet) -> Wallet:
-    if len(settings.lnbits_allowed_users) > 0:
+    if not settings.new_accounts_allowed:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST,
             detail="Account creation is disabled.",

lnbits/core/views/generic.py

@@ -348,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",

lnbits/helpers.py

@@ -4,6 +4,7 @@ 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
@@ -49,7 +50,9 @@ 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["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
@@ -133,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/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
@@ -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/base.py

@@ -62,14 +62,18 @@ class ChannelStats(BaseModel):
         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(channel.balance.total_msat for channel in channels) / len(channels)
-            ),
-            biggest_size=max(channel.balance.total_msat for channel in channels),
-            smallest_size=min(channel.balance.total_msat for channel in channels),
-            total_capacity=sum(channel.balance.total_msat for channel in channels),
+            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),
         )
 
 
@@ -104,7 +108,7 @@ class NodePayment(BaseModel):
     fee: Optional[int] = None
     memo: Optional[str] = None
     time: int
-    bolt11: str
+    bolt11: Optional[str] = None
     preimage: Optional[str]
     payment_hash: str
     expiry: Optional[float] = None

lnbits/nodes/cln.py

@@ -247,7 +247,9 @@ class CoreLightningNode(Node):
             backend_name="CLN",
             alias=info["alias"],
             color=info["color"],
-            onchain_balance_sat=sum(output["value"] for output in funds["outputs"]),
+            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"]
@@ -269,7 +271,7 @@ class CoreLightningNode(Node):
             result = await self.ln_rpc("listpays")
             return [
                 NodePayment(
-                    bolt11=pay["bolt11"],
+                    bolt11=pay.get("bolt11"),
                     amount=pay["amount_msat"],
                     fee=int(pay["amount_msat"]) - int(pay["amount_sent_msat"]),
                     memo=pay.get("description"),

lnbits/server.py

@@ -37,6 +37,7 @@ 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 `extensions`` dir if it does not exist
     Path(settings.lnbits_extensions_path, "extensions").mkdir(

lnbits/settings.py

@@ -35,6 +35,11 @@ class LNbitsSettings(BaseModel):
 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):
@@ -85,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):
@@ -290,6 +296,9 @@ class EnvSettings(LNbitsSettings):
     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:

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/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/components.js

@@ -356,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'],
@@ -568,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

@@ -31,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/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>
@@ -251,7 +250,7 @@
             <br />
             <small
               >{% raw %}{{ $t('lnbits_version') }}{% endraw %}:
-              {{LNBITS_VERSION}},
+              {{LNBITS_VERSION}}
             </small>
           </q-toolbar-title>
           <q-space></q-space>
@@ -298,6 +297,7 @@
       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())
       }

package.json

@@ -80,6 +80,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": [

poetry.lock

@@ -32,17 +32,6 @@ files = [
     {file = "asn1crypto-1.5.1.tar.gz", hash = "sha256:13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c"},
 ]
 
-[[package]]
-name = "async-timeout"
-version = "4.0.3"
-description = "Timeout context manager for asyncio programs"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "async-timeout-4.0.3.tar.gz", hash = "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f"},
-    {file = "async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"},
-]
-
 [[package]]
 name = "attrs"
 version = "23.1.0"
@@ -163,19 +152,6 @@ click = "*"
 ecdsa = "*"
 secp256k1 = "*"
 
-[[package]]
-name = "cerberus"
-version = "1.3.4"
-description = "Lightweight, extensible schema and data validation tool for Python dictionaries."
-optional = false
-python-versions = ">=2.7"
-files = [
-    {file = "Cerberus-1.3.4.tar.gz", hash = "sha256:d1b21b3954b2498d9a79edf16b3170a3ac1021df88d197dc2ce5928ba519237c"},
-]
-
-[package.dependencies]
-setuptools = "*"
-
 [[package]]
 name = "certifi"
 version = "2023.7.22"
@@ -189,75 +165,63 @@ files = [
 
 [[package]]
 name = "cffi"
-version = "1.15.1"
+version = "1.16.0"
 description = "Foreign Function Interface for Python calling C code."
 optional = false
-python-versions = "*"
+python-versions = ">=3.8"
 files = [
-    {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"},
-    {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"},
-    {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"},
-    {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"},
-    {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"},
-    {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"},
-    {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"},
-    {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"},
-    {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"},
-    {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"},
-    {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"},
-    {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"},
-    {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"},
-    {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"},
-    {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"},
-    {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"},
-    {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"},
-    {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"},
-    {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"},
-    {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"},
-    {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"},
-    {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"},
-    {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"},
-    {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"},
-    {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"},
-    {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"},
-    {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"},
-    {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"},
-    {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"},
-    {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"},
-    {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"},
-    {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"},
-    {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"},
-    {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"},
-    {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"},
+    {file = "cffi-1.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088"},
+    {file = "cffi-1.16.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614"},
+    {file = "cffi-1.16.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743"},
+    {file = "cffi-1.16.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d"},
+    {file = "cffi-1.16.0-cp310-cp310-win32.whl", hash = "sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a"},
+    {file = "cffi-1.16.0-cp310-cp310-win_amd64.whl", hash = "sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1"},
+    {file = "cffi-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404"},
+    {file = "cffi-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e"},
+    {file = "cffi-1.16.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc"},
+    {file = "cffi-1.16.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb"},
+    {file = "cffi-1.16.0-cp311-cp311-win32.whl", hash = "sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab"},
+    {file = "cffi-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba"},
+    {file = "cffi-1.16.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956"},
+    {file = "cffi-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969"},
+    {file = "cffi-1.16.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520"},
+    {file = "cffi-1.16.0-cp312-cp312-win32.whl", hash = "sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b"},
+    {file = "cffi-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235"},
+    {file = "cffi-1.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324"},
+    {file = "cffi-1.16.0-cp38-cp38-win32.whl", hash = "sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a"},
+    {file = "cffi-1.16.0-cp38-cp38-win_amd64.whl", hash = "sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36"},
+    {file = "cffi-1.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed"},
+    {file = "cffi-1.16.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098"},
+    {file = "cffi-1.16.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000"},
+    {file = "cffi-1.16.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe"},
+    {file = "cffi-1.16.0-cp39-cp39-win32.whl", hash = "sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4"},
+    {file = "cffi-1.16.0-cp39-cp39-win_amd64.whl", hash = "sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8"},
+    {file = "cffi-1.16.0.tar.gz", hash = "sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0"},
 ]
 
 [package.dependencies]
@@ -276,86 +240,101 @@ files = [
 
 [[package]]
 name = "charset-normalizer"
-version = "3.2.0"
+version = "3.3.0"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 optional = false
 python-versions = ">=3.7.0"
 files = [
-    {file = "charset-normalizer-3.2.0.tar.gz", hash = "sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-win32.whl", hash = "sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-win32.whl", hash = "sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-win32.whl", hash = "sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-win32.whl", hash = "sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-win32.whl", hash = "sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80"},
-    {file = "charset_normalizer-3.2.0-py3-none-any.whl", hash = "sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6"},
+    {file = "charset-normalizer-3.3.0.tar.gz", hash = "sha256:63563193aec44bce707e0c5ca64ff69fa72ed7cf34ce6e11d5127555756fd2f6"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:effe5406c9bd748a871dbcaf3ac69167c38d72db8c9baf3ff954c344f31c4cbe"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4162918ef3098851fcd8a628bf9b6a98d10c380725df9e04caf5ca6dd48c847a"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0570d21da019941634a531444364f2482e8db0b3425fcd5ac0c36565a64142c8"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5707a746c6083a3a74b46b3a631d78d129edab06195a92a8ece755aac25a3f3d"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:278c296c6f96fa686d74eb449ea1697f3c03dc28b75f873b65b5201806346a69"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a4b71f4d1765639372a3b32d2638197f5cd5221b19531f9245fcc9ee62d38f56"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5969baeaea61c97efa706b9b107dcba02784b1601c74ac84f2a532ea079403e"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a3f93dab657839dfa61025056606600a11d0b696d79386f974e459a3fbc568ec"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:db756e48f9c5c607b5e33dd36b1d5872d0422e960145b08ab0ec7fd420e9d649"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:232ac332403e37e4a03d209a3f92ed9071f7d3dbda70e2a5e9cff1c4ba9f0678"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e5c1502d4ace69a179305abb3f0bb6141cbe4714bc9b31d427329a95acfc8bdd"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:2502dd2a736c879c0f0d3e2161e74d9907231e25d35794584b1ca5284e43f596"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:23e8565ab7ff33218530bc817922fae827420f143479b753104ab801145b1d5b"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-win32.whl", hash = "sha256:1872d01ac8c618a8da634e232f24793883d6e456a66593135aeafe3784b0848d"},
+    {file = "charset_normalizer-3.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:557b21a44ceac6c6b9773bc65aa1b4cc3e248a5ad2f5b914b91579a32e22204d"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:d7eff0f27edc5afa9e405f7165f85a6d782d308f3b6b9d96016c010597958e63"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6a685067d05e46641d5d1623d7c7fdf15a357546cbb2f71b0ebde91b175ffc3e"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0d3d5b7db9ed8a2b11a774db2bbea7ba1884430a205dbd54a32d61d7c2a190fa"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2935ffc78db9645cb2086c2f8f4cfd23d9b73cc0dc80334bc30aac6f03f68f8c"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9fe359b2e3a7729010060fbca442ca225280c16e923b37db0e955ac2a2b72a05"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:380c4bde80bce25c6e4f77b19386f5ec9db230df9f2f2ac1e5ad7af2caa70459"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f0d1e3732768fecb052d90d62b220af62ead5748ac51ef61e7b32c266cac9293"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1b2919306936ac6efb3aed1fbf81039f7087ddadb3160882a57ee2ff74fd2382"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f8888e31e3a85943743f8fc15e71536bda1c81d5aa36d014a3c0c44481d7db6e"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:82eb849f085624f6a607538ee7b83a6d8126df6d2f7d3b319cb837b289123078"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7b8b8bf1189b3ba9b8de5c8db4d541b406611a71a955bbbd7385bbc45fcb786c"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:5adf257bd58c1b8632046bbe43ee38c04e1038e9d37de9c57a94d6bd6ce5da34"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c350354efb159b8767a6244c166f66e67506e06c8924ed74669b2c70bc8735b1"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-win32.whl", hash = "sha256:02af06682e3590ab952599fbadac535ede5d60d78848e555aa58d0c0abbde786"},
+    {file = "charset_normalizer-3.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:86d1f65ac145e2c9ed71d8ffb1905e9bba3a91ae29ba55b4c46ae6fc31d7c0d4"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:3b447982ad46348c02cb90d230b75ac34e9886273df3a93eec0539308a6296d7"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:abf0d9f45ea5fb95051c8bfe43cb40cda383772f7e5023a83cc481ca2604d74e"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b09719a17a2301178fac4470d54b1680b18a5048b481cb8890e1ef820cb80455"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b3d9b48ee6e3967b7901c052b670c7dda6deb812c309439adaffdec55c6d7b78"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:edfe077ab09442d4ef3c52cb1f9dab89bff02f4524afc0acf2d46be17dc479f5"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3debd1150027933210c2fc321527c2299118aa929c2f5a0a80ab6953e3bd1908"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:86f63face3a527284f7bb8a9d4f78988e3c06823f7bea2bd6f0e0e9298ca0403"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:24817cb02cbef7cd499f7c9a2735286b4782bd47a5b3516a0e84c50eab44b98e"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c71f16da1ed8949774ef79f4a0260d28b83b3a50c6576f8f4f0288d109777989"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:9cf3126b85822c4e53aa28c7ec9869b924d6fcfb76e77a45c44b83d91afd74f9"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:b3b2316b25644b23b54a6f6401074cebcecd1244c0b8e80111c9a3f1c8e83d65"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:03680bb39035fbcffe828eae9c3f8afc0428c91d38e7d61aa992ef7a59fb120e"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4cc152c5dd831641e995764f9f0b6589519f6f5123258ccaca8c6d34572fefa8"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-win32.whl", hash = "sha256:b8f3307af845803fb0b060ab76cf6dd3a13adc15b6b451f54281d25911eb92df"},
+    {file = "charset_normalizer-3.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:8eaf82f0eccd1505cf39a45a6bd0a8cf1c70dcfc30dba338207a969d91b965c0"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dc45229747b67ffc441b3de2f3ae5e62877a282ea828a5bdb67883c4ee4a8810"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f4a0033ce9a76e391542c182f0d48d084855b5fcba5010f707c8e8c34663d77"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ada214c6fa40f8d800e575de6b91a40d0548139e5dc457d2ebb61470abf50186"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b1121de0e9d6e6ca08289583d7491e7fcb18a439305b34a30b20d8215922d43c"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1063da2c85b95f2d1a430f1c33b55c9c17ffaf5e612e10aeaad641c55a9e2b9d"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:70f1d09c0d7748b73290b29219e854b3207aea922f839437870d8cc2168e31cc"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:250c9eb0f4600361dd80d46112213dff2286231d92d3e52af1e5a6083d10cad9"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:750b446b2ffce1739e8578576092179160f6d26bd5e23eb1789c4d64d5af7dc7"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:fc52b79d83a3fe3a360902d3f5d79073a993597d48114c29485e9431092905d8"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:588245972aca710b5b68802c8cad9edaa98589b1b42ad2b53accd6910dad3545"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e39c7eb31e3f5b1f88caff88bcff1b7f8334975b46f6ac6e9fc725d829bc35d4"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-win32.whl", hash = "sha256:abecce40dfebbfa6abf8e324e1860092eeca6f7375c8c4e655a8afb61af58f2c"},
+    {file = "charset_normalizer-3.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:24a91a981f185721542a0b7c92e9054b7ab4fea0508a795846bc5b0abf8118d4"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:67b8cc9574bb518ec76dc8e705d4c39ae78bb96237cb533edac149352c1f39fe"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ac71b2977fb90c35d41c9453116e283fac47bb9096ad917b8819ca8b943abecd"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3ae38d325b512f63f8da31f826e6cb6c367336f95e418137286ba362925c877e"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:542da1178c1c6af8873e143910e2269add130a299c9106eef2594e15dae5e482"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:30a85aed0b864ac88309b7d94be09f6046c834ef60762a8833b660139cfbad13"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:aae32c93e0f64469f74ccc730a7cb21c7610af3a775157e50bbd38f816536b38"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:15b26ddf78d57f1d143bdf32e820fd8935d36abe8a25eb9ec0b5a71c82eb3895"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7f5d10bae5d78e4551b7be7a9b29643a95aded9d0f602aa2ba584f0388e7a557"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:249c6470a2b60935bafd1d1d13cd613f8cd8388d53461c67397ee6a0f5dce741"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:c5a74c359b2d47d26cdbbc7845e9662d6b08a1e915eb015d044729e92e7050b7"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:b5bcf60a228acae568e9911f410f9d9e0d43197d030ae5799e20dca8df588287"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:187d18082694a29005ba2944c882344b6748d5be69e3a89bf3cc9d878e548d5a"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:81bf654678e575403736b85ba3a7867e31c2c30a69bc57fe88e3ace52fb17b89"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-win32.whl", hash = "sha256:85a32721ddde63c9df9ebb0d2045b9691d9750cb139c161c80e500d210f5e26e"},
+    {file = "charset_normalizer-3.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:468d2a840567b13a590e67dd276c570f8de00ed767ecc611994c301d0f8c014f"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e0fc42822278451bc13a2e8626cf2218ba570f27856b536e00cfa53099724828"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:09c77f964f351a7369cc343911e0df63e762e42bac24cd7d18525961c81754f4"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:12ebea541c44fdc88ccb794a13fe861cc5e35d64ed689513a5c03d05b53b7c82"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:805dfea4ca10411a5296bcc75638017215a93ffb584c9e344731eef0dcfb026a"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:96c2b49eb6a72c0e4991d62406e365d87067ca14c1a729a870d22354e6f68115"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:aaf7b34c5bc56b38c931a54f7952f1ff0ae77a2e82496583b247f7c969eb1479"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:619d1c96099be5823db34fe89e2582b336b5b074a7f47f819d6b3a57ff7bdb86"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a0ac5e7015a5920cfce654c06618ec40c33e12801711da6b4258af59a8eff00a"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:93aa7eef6ee71c629b51ef873991d6911b906d7312c6e8e99790c0f33c576f89"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7966951325782121e67c81299a031f4c115615e68046f79b85856b86ebffc4cd"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:02673e456dc5ab13659f85196c534dc596d4ef260e4d86e856c3b2773ce09843"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:c2af80fb58f0f24b3f3adcb9148e6203fa67dd3f61c4af146ecad033024dde43"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:153e7b6e724761741e0974fc4dcd406d35ba70b92bfe3fedcb497226c93b9da7"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-win32.whl", hash = "sha256:d47ecf253780c90ee181d4d871cd655a789da937454045b17b5798da9393901a"},
+    {file = "charset_normalizer-3.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:d97d85fa63f315a8bdaba2af9a6a686e0eceab77b3089af45133252618e70884"},
+    {file = "charset_normalizer-3.3.0-py3-none-any.whl", hash = "sha256:e46cd37076971c1040fc8c41273a8b3e2c624ce4f2be3f5dfcb7a430c1d3acc2"},
 ]
 
 [[package]]
@@ -440,63 +419,63 @@ files = [
 
 [[package]]
 name = "coverage"
-version = "7.3.1"
+version = "7.3.2"
 description = "Code coverage measurement for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "coverage-7.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:cd0f7429ecfd1ff597389907045ff209c8fdb5b013d38cfa7c60728cb484b6e3"},
-    {file = "coverage-7.3.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:966f10df9b2b2115da87f50f6a248e313c72a668248be1b9060ce935c871f276"},
-    {file = "coverage-7.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0575c37e207bb9b98b6cf72fdaaa18ac909fb3d153083400c2d48e2e6d28bd8e"},
-    {file = "coverage-7.3.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:245c5a99254e83875c7fed8b8b2536f040997a9b76ac4c1da5bff398c06e860f"},
-    {file = "coverage-7.3.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c96dd7798d83b960afc6c1feb9e5af537fc4908852ef025600374ff1a017392"},
-    {file = "coverage-7.3.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:de30c1aa80f30af0f6b2058a91505ea6e36d6535d437520067f525f7df123887"},
-    {file = "coverage-7.3.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:50dd1e2dd13dbbd856ffef69196781edff26c800a74f070d3b3e3389cab2600d"},
-    {file = "coverage-7.3.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b9c0c19f70d30219113b18fe07e372b244fb2a773d4afde29d5a2f7930765136"},
-    {file = "coverage-7.3.1-cp310-cp310-win32.whl", hash = "sha256:770f143980cc16eb601ccfd571846e89a5fe4c03b4193f2e485268f224ab602f"},
-    {file = "coverage-7.3.1-cp310-cp310-win_amd64.whl", hash = "sha256:cdd088c00c39a27cfa5329349cc763a48761fdc785879220d54eb785c8a38520"},
-    {file = "coverage-7.3.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:74bb470399dc1989b535cb41f5ca7ab2af561e40def22d7e188e0a445e7639e3"},
-    {file = "coverage-7.3.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:025ded371f1ca280c035d91b43252adbb04d2aea4c7105252d3cbc227f03b375"},
-    {file = "coverage-7.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6191b3a6ad3e09b6cfd75b45c6aeeffe7e3b0ad46b268345d159b8df8d835f9"},
-    {file = "coverage-7.3.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7eb0b188f30e41ddd659a529e385470aa6782f3b412f860ce22b2491c89b8593"},
-    {file = "coverage-7.3.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75c8f0df9dfd8ff745bccff75867d63ef336e57cc22b2908ee725cc552689ec8"},
-    {file = "coverage-7.3.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7eb3cd48d54b9bd0e73026dedce44773214064be93611deab0b6a43158c3d5a0"},
-    {file = "coverage-7.3.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ac3c5b7e75acac31e490b7851595212ed951889918d398b7afa12736c85e13ce"},
-    {file = "coverage-7.3.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5b4ee7080878077af0afa7238df1b967f00dc10763f6e1b66f5cced4abebb0a3"},
-    {file = "coverage-7.3.1-cp311-cp311-win32.whl", hash = "sha256:229c0dd2ccf956bf5aeede7e3131ca48b65beacde2029f0361b54bf93d36f45a"},
-    {file = "coverage-7.3.1-cp311-cp311-win_amd64.whl", hash = "sha256:c6f55d38818ca9596dc9019eae19a47410d5322408140d9a0076001a3dcb938c"},
-    {file = "coverage-7.3.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5289490dd1c3bb86de4730a92261ae66ea8d44b79ed3cc26464f4c2cde581fbc"},
-    {file = "coverage-7.3.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ca833941ec701fda15414be400c3259479bfde7ae6d806b69e63b3dc423b1832"},
-    {file = "coverage-7.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd694e19c031733e446c8024dedd12a00cda87e1c10bd7b8539a87963685e969"},
-    {file = "coverage-7.3.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aab8e9464c00da5cb9c536150b7fbcd8850d376d1151741dd0d16dfe1ba4fd26"},
-    {file = "coverage-7.3.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87d38444efffd5b056fcc026c1e8d862191881143c3aa80bb11fcf9dca9ae204"},
-    {file = "coverage-7.3.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:8a07b692129b8a14ad7a37941a3029c291254feb7a4237f245cfae2de78de037"},
-    {file = "coverage-7.3.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:2829c65c8faaf55b868ed7af3c7477b76b1c6ebeee99a28f59a2cb5907a45760"},
-    {file = "coverage-7.3.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:1f111a7d85658ea52ffad7084088277135ec5f368457275fc57f11cebb15607f"},
-    {file = "coverage-7.3.1-cp312-cp312-win32.whl", hash = "sha256:c397c70cd20f6df7d2a52283857af622d5f23300c4ca8e5bd8c7a543825baa5a"},
-    {file = "coverage-7.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:5ae4c6da8b3d123500f9525b50bf0168023313963e0e2e814badf9000dd6ef92"},
-    {file = "coverage-7.3.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ca70466ca3a17460e8fc9cea7123c8cbef5ada4be3140a1ef8f7b63f2f37108f"},
-    {file = "coverage-7.3.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f2781fd3cabc28278dc982a352f50c81c09a1a500cc2086dc4249853ea96b981"},
-    {file = "coverage-7.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6407424621f40205bbe6325686417e5e552f6b2dba3535dd1f90afc88a61d465"},
-    {file = "coverage-7.3.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:04312b036580ec505f2b77cbbdfb15137d5efdfade09156961f5277149f5e344"},
-    {file = "coverage-7.3.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ac9ad38204887349853d7c313f53a7b1c210ce138c73859e925bc4e5d8fc18e7"},
-    {file = "coverage-7.3.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:53669b79f3d599da95a0afbef039ac0fadbb236532feb042c534fbb81b1a4e40"},
-    {file = "coverage-7.3.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:614f1f98b84eb256e4f35e726bfe5ca82349f8dfa576faabf8a49ca09e630086"},
-    {file = "coverage-7.3.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:f1a317fdf5c122ad642db8a97964733ab7c3cf6009e1a8ae8821089993f175ff"},
-    {file = "coverage-7.3.1-cp38-cp38-win32.whl", hash = "sha256:defbbb51121189722420a208957e26e49809feafca6afeef325df66c39c4fdb3"},
-    {file = "coverage-7.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:f4f456590eefb6e1b3c9ea6328c1e9fa0f1006e7481179d749b3376fc793478e"},
-    {file = "coverage-7.3.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f12d8b11a54f32688b165fd1a788c408f927b0960984b899be7e4c190ae758f1"},
-    {file = "coverage-7.3.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f09195dda68d94a53123883de75bb97b0e35f5f6f9f3aa5bf6e496da718f0cb6"},
-    {file = "coverage-7.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c6601a60318f9c3945be6ea0f2a80571f4299b6801716f8a6e4846892737ebe4"},
-    {file = "coverage-7.3.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07d156269718670d00a3b06db2288b48527fc5f36859425ff7cec07c6b367745"},
-    {file = "coverage-7.3.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:636a8ac0b044cfeccae76a36f3b18264edcc810a76a49884b96dd744613ec0b7"},
-    {file = "coverage-7.3.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5d991e13ad2ed3aced177f524e4d670f304c8233edad3210e02c465351f785a0"},
-    {file = "coverage-7.3.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:586649ada7cf139445da386ab6f8ef00e6172f11a939fc3b2b7e7c9082052fa0"},
-    {file = "coverage-7.3.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4aba512a15a3e1e4fdbfed2f5392ec221434a614cc68100ca99dcad7af29f3f8"},
-    {file = "coverage-7.3.1-cp39-cp39-win32.whl", hash = "sha256:6bc6f3f4692d806831c136c5acad5ccedd0262aa44c087c46b7101c77e139140"},
-    {file = "coverage-7.3.1-cp39-cp39-win_amd64.whl", hash = "sha256:553d7094cb27db58ea91332e8b5681bac107e7242c23f7629ab1316ee73c4981"},
-    {file = "coverage-7.3.1-pp38.pp39.pp310-none-any.whl", hash = "sha256:220eb51f5fb38dfdb7e5d54284ca4d0cd70ddac047d750111a68ab1798945194"},
-    {file = "coverage-7.3.1.tar.gz", hash = "sha256:6cb7fe1581deb67b782c153136541e20901aa312ceedaf1467dcb35255787952"},
+    {file = "coverage-7.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d872145f3a3231a5f20fd48500274d7df222e291d90baa2026cc5152b7ce86bf"},
+    {file = "coverage-7.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:310b3bb9c91ea66d59c53fa4989f57d2436e08f18fb2f421a1b0b6b8cc7fffda"},
+    {file = "coverage-7.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f47d39359e2c3779c5331fc740cf4bce6d9d680a7b4b4ead97056a0ae07cb49a"},
+    {file = "coverage-7.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aa72dbaf2c2068404b9870d93436e6d23addd8bbe9295f49cbca83f6e278179c"},
+    {file = "coverage-7.3.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:beaa5c1b4777f03fc63dfd2a6bd820f73f036bfb10e925fce067b00a340d0f3f"},
+    {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:dbc1b46b92186cc8074fee9d9fbb97a9dd06c6cbbef391c2f59d80eabdf0faa6"},
+    {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:315a989e861031334d7bee1f9113c8770472db2ac484e5b8c3173428360a9148"},
+    {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d1bc430677773397f64a5c88cb522ea43175ff16f8bfcc89d467d974cb2274f9"},
+    {file = "coverage-7.3.2-cp310-cp310-win32.whl", hash = "sha256:a889ae02f43aa45032afe364c8ae84ad3c54828c2faa44f3bfcafecb5c96b02f"},
+    {file = "coverage-7.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:c0ba320de3fb8c6ec16e0be17ee1d3d69adcda99406c43c0409cb5c41788a611"},
+    {file = "coverage-7.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ac8c802fa29843a72d32ec56d0ca792ad15a302b28ca6203389afe21f8fa062c"},
+    {file = "coverage-7.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:89a937174104339e3a3ffcf9f446c00e3a806c28b1841c63edb2b369310fd074"},
+    {file = "coverage-7.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e267e9e2b574a176ddb983399dec325a80dbe161f1a32715c780b5d14b5f583a"},
+    {file = "coverage-7.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2443cbda35df0d35dcfb9bf8f3c02c57c1d6111169e3c85fc1fcc05e0c9f39a3"},
+    {file = "coverage-7.3.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4175e10cc8dda0265653e8714b3174430b07c1dca8957f4966cbd6c2b1b8065a"},
+    {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1"},
+    {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:5c913b556a116b8d5f6ef834038ba983834d887d82187c8f73dec21049abd65c"},
+    {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1981f785239e4e39e6444c63a98da3a1db8e971cb9ceb50a945ba6296b43f312"},
+    {file = "coverage-7.3.2-cp311-cp311-win32.whl", hash = "sha256:43668cabd5ca8258f5954f27a3aaf78757e6acf13c17604d89648ecc0cc66640"},
+    {file = "coverage-7.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:e10c39c0452bf6e694511c901426d6b5ac005acc0f78ff265dbe36bf81f808a2"},
+    {file = "coverage-7.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:4cbae1051ab791debecc4a5dcc4a1ff45fc27b91b9aee165c8a27514dd160836"},
+    {file = "coverage-7.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63"},
+    {file = "coverage-7.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c7bba973ebee5e56fe9251300c00f1579652587a9f4a5ed8404b15a0471f216"},
+    {file = "coverage-7.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fe494faa90ce6381770746077243231e0b83ff3f17069d748f645617cefe19d4"},
+    {file = "coverage-7.3.2-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6e9589bd04d0461a417562649522575d8752904d35c12907d8c9dfeba588faf"},
+    {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d51ac2a26f71da1b57f2dc81d0e108b6ab177e7d30e774db90675467c847bbdf"},
+    {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:99b89d9f76070237975b315b3d5f4d6956ae354a4c92ac2388a5695516e47c84"},
+    {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fa28e909776dc69efb6ed975a63691bc8172b64ff357e663a1bb06ff3c9b589a"},
+    {file = "coverage-7.3.2-cp312-cp312-win32.whl", hash = "sha256:289fe43bf45a575e3ab10b26d7b6f2ddb9ee2dba447499f5401cfb5ecb8196bb"},
+    {file = "coverage-7.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:7dbc3ed60e8659bc59b6b304b43ff9c3ed858da2839c78b804973f613d3e92ed"},
+    {file = "coverage-7.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f94b734214ea6a36fe16e96a70d941af80ff3bfd716c141300d95ebc85339738"},
+    {file = "coverage-7.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:af3d828d2c1cbae52d34bdbb22fcd94d1ce715d95f1a012354a75e5913f1bda2"},
+    {file = "coverage-7.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:630b13e3036e13c7adc480ca42fa7afc2a5d938081d28e20903cf7fd687872e2"},
+    {file = "coverage-7.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9eacf273e885b02a0273bb3a2170f30e2d53a6d53b72dbe02d6701b5296101c"},
+    {file = "coverage-7.3.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d8f17966e861ff97305e0801134e69db33b143bbfb36436efb9cfff6ec7b2fd9"},
+    {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b4275802d16882cf9c8b3d057a0839acb07ee9379fa2749eca54efbce1535b82"},
+    {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:72c0cfa5250f483181e677ebc97133ea1ab3eb68645e494775deb6a7f6f83901"},
+    {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:cb536f0dcd14149425996821a168f6e269d7dcd2c273a8bff8201e79f5104e76"},
+    {file = "coverage-7.3.2-cp38-cp38-win32.whl", hash = "sha256:307adb8bd3abe389a471e649038a71b4eb13bfd6b7dd9a129fa856f5c695cf92"},
+    {file = "coverage-7.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:88ed2c30a49ea81ea3b7f172e0269c182a44c236eb394718f976239892c0a27a"},
+    {file = "coverage-7.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b631c92dfe601adf8f5ebc7fc13ced6bb6e9609b19d9a8cd59fa47c4186ad1ce"},
+    {file = "coverage-7.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d3d9df4051c4a7d13036524b66ecf7a7537d14c18a384043f30a303b146164e9"},
+    {file = "coverage-7.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f7363d3b6a1119ef05015959ca24a9afc0ea8a02c687fe7e2d557705375c01f"},
+    {file = "coverage-7.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2f11cc3c967a09d3695d2a6f03fb3e6236622b93be7a4b5dc09166a861be6d25"},
+    {file = "coverage-7.3.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9"},
+    {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3a4006916aa6fee7cd38db3bfc95aa9c54ebb4ffbfc47c677c8bba949ceba0a6"},
+    {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9028a3871280110d6e1aa2df1afd5ef003bab5fb1ef421d6dc748ae1c8ef2ebc"},
+    {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9f805d62aec8eb92bab5b61c0f07329275b6f41c97d80e847b03eb894f38d083"},
+    {file = "coverage-7.3.2-cp39-cp39-win32.whl", hash = "sha256:d1c88ec1a7ff4ebca0219f5b1ef863451d828cccf889c173e1253aa84b1e07ce"},
+    {file = "coverage-7.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b4767da59464bb593c07afceaddea61b154136300881844768037fd5e859353f"},
+    {file = "coverage-7.3.2-pp38.pp39.pp310-none-any.whl", hash = "sha256:ae97af89f0fbf373400970c0a21eef5aa941ffeed90aee43650b81f7d7f47637"},
+    {file = "coverage-7.3.2.tar.gz", hash = "sha256:be32ad29341b0170e795ca590e1c07e81fc061cb5b10c74ce7203491484404ef"},
 ]
 
 [package.dependencies]
@@ -606,6 +585,27 @@ files = [
     {file = "embit-0.7.0.tar.gz", hash = "sha256:3dbd42582b5c3e40623e7b2af02956ba6019f6e1ca1c3363f27aa9f9bca03366"},
 ]
 
+[[package]]
+name = "environs"
+version = "9.5.0"
+description = "simplified environment variable parsing"
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "environs-9.5.0-py2.py3-none-any.whl", hash = "sha256:1e549569a3de49c05f856f40bce86979e7d5ffbbc4398e7f338574c220189124"},
+    {file = "environs-9.5.0.tar.gz", hash = "sha256:a76307b36fbe856bdca7ee9161e6c466fd7fcffc297109a118c59b54e27e30c9"},
+]
+
+[package.dependencies]
+marshmallow = ">=3.0.0"
+python-dotenv = "*"
+
+[package.extras]
+dev = ["dj-database-url", "dj-email-url", "django-cache-url", "flake8 (==4.0.1)", "flake8-bugbear (==21.9.2)", "mypy (==0.910)", "pre-commit (>=2.4,<3.0)", "pytest", "tox"]
+django = ["dj-database-url", "dj-email-url", "django-cache-url"]
+lint = ["flake8 (==4.0.1)", "flake8-bugbear (==21.9.2)", "mypy (==0.910)", "pre-commit (>=2.4,<3.0)"]
+tests = ["dj-database-url", "dj-email-url", "django-cache-url", "pytest"]
+
 [[package]]
 name = "exceptiongroup"
 version = "1.1.3"
@@ -783,13 +783,13 @@ socks = ["socksio (==1.*)"]
 
 [[package]]
 name = "identify"
-version = "2.5.29"
+version = "2.5.30"
 description = "File identification library for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "identify-2.5.29-py2.py3-none-any.whl", hash = "sha256:24437fbf6f4d3fe6efd0eb9d67e24dd9106db99af5ceb27996a5f7895f24bf1b"},
-    {file = "identify-2.5.29.tar.gz", hash = "sha256:d43d52b86b15918c137e3a74fff5224f60385cd0e9c38e99d07c257f02f151a5"},
+    {file = "identify-2.5.30-py2.py3-none-any.whl", hash = "sha256:afe67f26ae29bab007ec21b03d4114f41316ab9dd15aa8736a167481e108da54"},
+    {file = "identify-2.5.30.tar.gz", hash = "sha256:f302a4256a15c849b91cfcdcec052a8ce914634b2f77ae87dad29cd749f2d88d"},
 ]
 
 [package.extras]
@@ -1070,6 +1070,26 @@ files = [
     {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"},
 ]
 
+[[package]]
+name = "marshmallow"
+version = "3.20.1"
+description = "A lightweight library for converting complex datatypes to and from native Python datatypes."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "marshmallow-3.20.1-py3-none-any.whl", hash = "sha256:684939db93e80ad3561392f47be0230743131560a41c5110684c16e21ade0a5c"},
+    {file = "marshmallow-3.20.1.tar.gz", hash = "sha256:5d2371bbe42000f2b3fb5eaa065224df7d8f8597bc19a1bbfa5bfe7fba8da889"},
+]
+
+[package.dependencies]
+packaging = ">=17.0"
+
+[package.extras]
+dev = ["flake8 (==6.0.0)", "flake8-bugbear (==23.7.10)", "mypy (==1.4.1)", "pre-commit (>=2.4,<4.0)", "pytest", "pytz", "simplejson", "tox"]
+docs = ["alabaster (==0.7.13)", "autodocsumm (==0.2.11)", "sphinx (==7.0.1)", "sphinx-issues (==3.0.1)", "sphinx-version-warning (==1.1.2)"]
+lint = ["flake8 (==6.0.0)", "flake8-bugbear (==23.7.10)", "mypy (==1.4.1)", "pre-commit (>=2.4,<4.0)"]
+tests = ["pytest", "pytz", "simplejson"]
+
 [[package]]
 name = "mypy"
 version = "1.5.1"
@@ -1143,13 +1163,13 @@ setuptools = "*"
 
 [[package]]
 name = "openapi-schema-validator"
-version = "0.6.1"
+version = "0.6.2"
 description = "OpenAPI schema validation for Python"
 optional = false
 python-versions = ">=3.8.0,<4.0.0"
 files = [
-    {file = "openapi_schema_validator-0.6.1-py3-none-any.whl", hash = "sha256:e39f2cc92a458a1b9971d8a0519fcc94a4c454d9accffab5189575716fe53bed"},
-    {file = "openapi_schema_validator-0.6.1.tar.gz", hash = "sha256:b8b25e2cb600a0ed18452e675b5dd8cbb99009909c2641c973a4b02c93e33ca2"},
+    {file = "openapi_schema_validator-0.6.2-py3-none-any.whl", hash = "sha256:c4887c1347c669eb7cded9090f4438b710845cd0f90d1fb9e1b3303fb37339f8"},
+    {file = "openapi_schema_validator-0.6.2.tar.gz", hash = "sha256:11a95c9c9017912964e3e5f2545a5b11c3814880681fcacfb73b1759bb4f2804"},
 ]
 
 [package.dependencies]
@@ -1223,13 +1243,13 @@ files = [
 
 [[package]]
 name = "platformdirs"
-version = "3.10.0"
+version = "3.11.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "platformdirs-3.10.0-py3-none-any.whl", hash = "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d"},
-    {file = "platformdirs-3.10.0.tar.gz", hash = "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d"},
+    {file = "platformdirs-3.11.0-py3-none-any.whl", hash = "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e"},
+    {file = "platformdirs-3.11.0.tar.gz", hash = "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3"},
 ]
 
 [package.extras]
@@ -1605,6 +1625,38 @@ pytest = ">=4.6"
 [package.extras]
 testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
 
+[[package]]
+name = "python-crontab"
+version = "3.0.0"
+description = "Python Crontab API"
+optional = false
+python-versions = "*"
+files = [
+    {file = "python-crontab-3.0.0.tar.gz", hash = "sha256:79fb7465039ddfd4fb93d072d6ee0d45c1ac8bf1597f0686ea14fd4361dba379"},
+    {file = "python_crontab-3.0.0-py3-none-any.whl", hash = "sha256:6d5ba3c190ec76e4d252989a1644fcb233dbf53fbc8fceeb9febe1657b9fb1d4"},
+]
+
+[package.dependencies]
+python-dateutil = "*"
+
+[package.extras]
+cron-description = ["cron-descriptor"]
+cron-schedule = ["croniter"]
+
+[[package]]
+name = "python-dateutil"
+version = "2.8.2"
+description = "Extensions to the standard Python datetime module"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+files = [
+    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+]
+
+[package.dependencies]
+six = ">=1.5"
+
 [[package]]
 name = "python-dotenv"
 version = "1.0.0"
@@ -2128,13 +2180,13 @@ files = [
 
 [[package]]
 name = "urllib3"
-version = "2.0.5"
+version = "2.0.6"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "urllib3-2.0.5-py3-none-any.whl", hash = "sha256:ef16afa8ba34a1f989db38e1dbbe0c302e4289a47856990d0682e374563ce35e"},
-    {file = "urllib3-2.0.5.tar.gz", hash = "sha256:13abf37382ea2ce6fb744d4dad67838eec857c9f4f57009891805e0b5e123594"},
+    {file = "urllib3-2.0.6-py3-none-any.whl", hash = "sha256:7a7c7003b000adf9e7ca2a377c9688bbc54ed41b985789ed576570342a375cd2"},
+    {file = "urllib3-2.0.6.tar.gz", hash = "sha256:b19e1a85d206b56d7df1d5e683df4a7725252a964e3993648dd0fb5a1c157564"},
 ]
 
 [package.extras]
@@ -2437,4 +2489,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10 | ^3.9"
-content-hash = "4fd361a6f46c9a1ad34b000ad13a56c076593398eab4f4bad157c608bfa6d6f4"
+content-hash = "8fa58347ff00053e7e81feb763555ea6e892d23a6d953a592dea3fe4ba424b79"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lnbits"
-version = "0.11.0"
+version = "0.11.1"
 description = "LNbits, free and open-source Lightning wallet and accounts system."
 authors = ["Alan Bits <alan@lnbits.com>"]
 
@@ -9,7 +9,6 @@ python = "^3.10 | ^3.9"
 bech32 = "1.2.0"
 click = "8.1.7"
 ecdsa = "0.18.0"
-embit = "0.7.0"
 fastapi = "0.103.1"
 httpx = "0.25.0"
 jinja2 = "3.0.1"
@@ -28,17 +27,22 @@ websockets = "11.0.3"
 loguru = "0.7.2"
 grpcio = "1.58.0"
 protobuf = "4.24.3"
-Cerberus = "1.3.4"
-async-timeout = "4.0.3"
 pyln-client = "23.8"
 pywebpush = "1.14.0"
 slowapi = "0.1.8"
 python-dotenv = "1.0.0"
 websocket-client = "1.6.3"
-secp256k1 = "0.14.0"
 pycryptodomex = "3.19.0"
 packaging = "23.1"
-bolt11 = "^2.0.5"
+bolt11 = "2.0.5"
+# needed for boltz, lnurldevice, watchonly extensions
+embit = "0.7.0"
+# needed for cashu, lnurlp, nostrclient, nostrmarket, nostrrelay extensions
+secp256k1 = "0.14.0"
+# keep for backwards compatibility with lnurlp and cashu
+environs = "9.5.0"
+# needed for scheduler extension
+python-crontab = "3.0.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "^23.7.0"
@@ -50,6 +54,9 @@ types-protobuf = "^4.24.0.2"
 pre-commit = "^3.2.2"
 openapi-spec-validator = "^0.6.0"
 ruff = "^0.0.291"
+# not our dependency but needed indirectly by openapi-spec-validator
+# we want to use 0.10.3 because newer versions are broken on nix
+rpds-py = "0.10.3"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

tests/core/test_helpers_query.py

@@ -0,0 +1,27 @@
+import pytest
+from pydantic import BaseModel
+
+from lnbits.helpers import (
+    insert_query,
+    update_query,
+)
+
+
+class TestModel(BaseModel):
+    id: int
+    name: str
+
+
+test = TestModel(id=1, name="test")
+
+
+@pytest.mark.asyncio
+async def test_helpers_insert_query():
+    q = insert_query("test_helpers_query", test)
+    assert q == "INSERT INTO test_helpers_query (id, name) VALUES (?, ?)"
+
+
+@pytest.mark.asyncio
+async def test_helpers_update_query():
+    q = update_query("test_helpers_query", test)
+    assert q == "UPDATE test_helpers_query SET id = ?, name = ? WHERE id = ?"