Merge branch 'main' into gerty

lnbits/core/crud.py

@@ -177,6 +177,11 @@ async def get_wallet_for_key(
     return Wallet(**row)
 
 
+async def get_total_balance(conn: Optional[Connection] = None):
+    row = await (conn or db).fetchone("SELECT SUM(balance) FROM balances")
+    return 0 if row[0] is None else row[0]
+
+
 # wallet payments
 # ---------------
 

lnbits/core/static/js/wallet.js

@@ -675,7 +675,7 @@ new Vue({
       // status is important for export but it is not in paymentsTable
       // because it is manually added with payment detail link and icons
       // and would cause duplication in the list
-      let columns = this.paymentsTable.columns
+      let columns = structuredClone(this.paymentsTable.columns)
       columns.unshift({
         name: 'pending',
         align: 'left',

lnbits/core/views/api.py

@@ -2,6 +2,7 @@ import asyncio
 import binascii
 import hashlib
 import json
+import time
 from http import HTTPStatus
 from io import BytesIO
 from typing import Dict, List, Optional, Tuple, Union
@@ -27,7 +28,7 @@ from lnbits.decorators import (
     require_invoice_key,
 )
 from lnbits.helpers import url_for, urlsafe_short_hash
-from lnbits.settings import LNBITS_ADMIN_USERS, LNBITS_SITE_TITLE
+from lnbits.settings import LNBITS_ADMIN_USERS, LNBITS_SITE_TITLE, WALLET
 from lnbits.utils.exchange_rates import (
     currencies,
     fiat_amount_as_satoshis,
@@ -39,6 +40,7 @@ from ..crud import (
     create_payment,
     get_payments,
     get_standalone_payment,
+    get_total_balance,
     get_wallet,
     get_wallet_for_key,
     save_balance_check,
@@ -657,3 +659,26 @@ async def img(request: Request, data):
             "Expires": "0",
         },
     )
+
+
+@core_app.get("/api/v1/audit/")
+async def api_auditor(wallet: WalletTypeInfo = Depends(get_key_type)):
+    if wallet.wallet.user not in LNBITS_ADMIN_USERS:
+        raise HTTPException(
+            status_code=HTTPStatus.FORBIDDEN, detail="Not an admin user"
+        )
+
+    total_balance = await get_total_balance()
+    error_message, node_balance = await WALLET.status()
+
+    if not error_message:
+        delta = node_balance - total_balance
+    else:
+        node_balance, delta = None, None
+
+    return {
+        "node_balance_msats": node_balance,
+        "lnbits_balance_msats": total_balance,
+        "delta_msats": delta,
+        "timestamp": int(time.time()),
+    }

lnbits/settings.py

@@ -24,18 +24,21 @@ LNBITS_DATA_FOLDER = env.str(
 )
 LNBITS_DATABASE_URL = env.str("LNBITS_DATABASE_URL", default=None)
 
-LNBITS_ALLOWED_USERS: List[str] = env.list(
-    "LNBITS_ALLOWED_USERS", default=[], subcast=str
-)
-LNBITS_ADMIN_USERS: List[str] = env.list("LNBITS_ADMIN_USERS", default=[], subcast=str)
-LNBITS_ADMIN_EXTENSIONS: List[str] = env.list(
-    "LNBITS_ADMIN_EXTENSIONS", default=[], subcast=str
-)
-LNBITS_DISABLED_EXTENSIONS: List[str] = env.list(
-    "LNBITS_DISABLED_EXTENSIONS", default=[], subcast=str
-)
+LNBITS_ALLOWED_USERS: List[str] = [
+    x.strip(" ") for x in env.list("LNBITS_ALLOWED_USERS", default=[], subcast=str)
+]
+LNBITS_ADMIN_USERS: List[str] = [
+    x.strip(" ") for x in env.list("LNBITS_ADMIN_USERS", default=[], subcast=str)
+]
+LNBITS_ADMIN_EXTENSIONS: List[str] = [
+    x.strip(" ") for x in env.list("LNBITS_ADMIN_EXTENSIONS", default=[], subcast=str)
+]
+LNBITS_DISABLED_EXTENSIONS: List[str] = [
+    x.strip(" ")
+    for x in env.list("LNBITS_DISABLED_EXTENSIONS", default=[], subcast=str)
+]
 
-LNBITS_AD_SPACE = env.list("LNBITS_AD_SPACE", default=[])
+LNBITS_AD_SPACE = [x.strip(" ") for x in env.list("LNBITS_AD_SPACE", default=[])]
 LNBITS_HIDE_API = env.bool("LNBITS_HIDE_API", default=False)
 LNBITS_SITE_TITLE = env.str("LNBITS_SITE_TITLE", default="LNbits")
 LNBITS_DENOMINATION = env.str("LNBITS_DENOMINATION", default="sats")
@@ -43,11 +46,14 @@ LNBITS_SITE_TAGLINE = env.str(
     "LNBITS_SITE_TAGLINE", default="free and open-source lightning wallet"
 )
 LNBITS_SITE_DESCRIPTION = env.str("LNBITS_SITE_DESCRIPTION", default="")
-LNBITS_THEME_OPTIONS: List[str] = env.list(
-    "LNBITS_THEME_OPTIONS",
-    default="classic, flamingo, mint, salvador, monochrome, autumn",
-    subcast=str,
-)
+LNBITS_THEME_OPTIONS: List[str] = [
+    x.strip(" ")
+    for x in env.list(
+        "LNBITS_THEME_OPTIONS",
+        default="classic, flamingo, mint, salvador, monochrome, autumn",
+        subcast=str,
+    )
+]
 LNBITS_CUSTOM_LOGO = env.str("LNBITS_CUSTOM_LOGO", default="")
 
 WALLET = wallet_class()

lnbits/templates/base.html

@@ -12,7 +12,7 @@
     <meta charset="utf-8" />
     <meta
       name="viewport"
-      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+      content="width=device-width, initial-scale=1, maximum-scale=1, shrink-to-fit=no"
     />
     <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-capable" content="yes" />