Admin ext working

lnbits/core/crud.py

@@ -5,7 +5,7 @@ from typing import List, Optional, Dict
 from flask import g
 
 from lnbits import bolt11
-
+from lnbits.settings import DEFAULT_WALLET_NAME
 
 from .models import User, Wallet, Payment, Admin, Funding
 
@@ -66,13 +66,12 @@ def update_user_extension(*, user_id: str, extension: str, active: int) -> None:
 
 def create_wallet(*, user_id: str, wallet_name: Optional[str] = None) -> Wallet:
     wallet_id = uuid4().hex
-    admin = get_admin()
     g.db.execute(
         """
         INSERT INTO wallets (id, name, user, adminkey, inkey)
         VALUES (?, ?, ?, ?, ?)
         """,
-        (wallet_id, wallet_name or admin[6], user_id, uuid4().hex, uuid4().hex),
+        (wallet_id, wallet_name or DEFAULT_WALLET_NAME, user_id, uuid4().hex, uuid4().hex),
     )
 
     new_wallet = get_wallet(wallet_id=wallet_id)

lnbits/settings.py

@@ -1,22 +1,27 @@
 import importlib
+
+from environs import Env  # type: ignore
+from os import path
 from typing import List
-from lnbits.core.crud import get_admin
 
-admin = get_admin()
 
-wallet_class = admin.funding_source
+env = Env()
+env.read_env()
+
+wallets_module = importlib.import_module("lnbits.wallets")
+wallet_class = getattr(wallets_module, env.str("LNBITS_BACKEND_WALLET_CLASS", default="VoidWallet"))
 
-ENV = "production"
+ENV = env.str("FLASK_ENV", default="production")
 DEBUG = ENV == "development"
 
 LNBITS_PATH = path.dirname(path.realpath(__file__))
-LNBITS_DATA_FOLDER = admin.data_folder
-LNBITS_ALLOWED_USERS: List[str] = admin.allowed_users
-LNBITS_ADMIN_USERS: List[str] = admin.user
-LNBITS_DISABLED_EXTENSIONS: List[str] = admin.disabled_ext
-LNBITS_SITE_TITLE = admin.site_title
+LNBITS_DATA_FOLDER = env.str("LNBITS_DATA_FOLDER", default=path.join(LNBITS_PATH, "data"))
+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_DISABLED_EXTENSIONS: List[str] = env.list("LNBITS_DISABLED_EXTENSIONS", default=[], subcast=str)
+LNBITS_SITE_TITLE = env.str("LNBITS_SITE_TITLE", default="LNbits")
 
 WALLET = wallet_class()
-DEFAULT_WALLET_NAME = admin.default_wallet_name
-FORCE_HTTPS = admin.force_https
-SERVICE_FEE = admin.service_fee
+DEFAULT_WALLET_NAME = env.str("LNBITS_DEFAULT_WALLET_NAME", default="LNbits wallet")
+FORCE_HTTPS = env.bool("LNBITS_FORCE_HTTPS", default=True)
+SERVICE_FEE = env.float("LNBITS_SERVICE_FEE", default=0.0)