fix sqlite database locked issues by using an async lock on the database and requiring explicit transaction control (or each command will be its own transaction).

lnbits/core/views/api.py

@@ -66,7 +66,7 @@ async def api_payments_create_invoice():
         description_hash = b""
         memo = g.data["memo"]
 
-    try:
+    async with db.connect() as conn:
         payment_hash, payment_request = await create_invoice(
             wallet_id=g.wallet.id,
             amount=g.data["amount"],
@@ -74,12 +74,8 @@ async def api_payments_create_invoice():
             description_hash=description_hash,
             extra=g.data.get("extra"),
             webhook=g.data.get("webhook"),
+            conn=conn,
         )
-    except Exception as exc:
-        await db.rollback()
-        raise exc
-
-    await db.commit()
 
     invoice = bolt11.decode(payment_request)
 
@@ -124,14 +120,14 @@ async def api_payments_create_invoice():
 async def api_payments_pay_invoice():
     try:
         payment_hash = await pay_invoice(
-            wallet_id=g.wallet.id, payment_request=g.data["bolt11"]
+            wallet_id=g.wallet.id,
+            payment_request=g.data["bolt11"],
         )
     except ValueError as e:
         return jsonify({"message": str(e)}), HTTPStatus.BAD_REQUEST
     except PermissionError as e:
         return jsonify({"message": str(e)}), HTTPStatus.FORBIDDEN
     except Exception as exc:
-        await db.rollback()
         raise exc
 
     return (
@@ -217,23 +213,19 @@ async def api_payments_pay_lnurl():
             HTTPStatus.BAD_REQUEST,
         )
 
-    try:
-        extra = {}
+    extra = {}
 
-        if params.get("successAction"):
-            extra["success_action"] = params["successAction"]
-        if g.data["comment"]:
-            extra["comment"] = g.data["comment"]
+    if params.get("successAction"):
+        extra["success_action"] = params["successAction"]
+    if g.data["comment"]:
+        extra["comment"] = g.data["comment"]
 
-        payment_hash = await pay_invoice(
-            wallet_id=g.wallet.id,
-            payment_request=params["pr"],
-            description=g.data.get("description", ""),
-            extra=extra,
-        )
-    except Exception as exc:
-        await db.rollback()
-        raise exc
+    payment_hash = await pay_invoice(
+        wallet_id=g.wallet.id,
+        payment_request=params["pr"],
+        description=g.data.get("description", ""),
+        extra=extra,
+    )
 
     return (
         jsonify(

lnbits/core/views/generic.py

@@ -13,11 +13,10 @@ from quart import (
 )
 from lnurl import LnurlResponse, LnurlWithdrawResponse, decode as decode_lnurl  # type: ignore
 
-from lnbits.core import core_app
+from lnbits.core import core_app, db
 from lnbits.decorators import check_user_exists, validate_uuids
 from lnbits.settings import LNBITS_ALLOWED_USERS, SERVICE_FEE
 
-from .. import db
 from ..crud import (
     create_account,
     get_user,
@@ -152,10 +151,10 @@ async def lnurlwallet():
                 HTTPStatus.INTERNAL_SERVER_ERROR,
             )
 
-    account = await create_account()
-    user = await get_user(account.id)
-    wallet = await create_wallet(user_id=user.id)
-    await db.commit()
+    async with db.connect() as conn:
+        account = await create_account(conn=conn)
+        user = await get_user(account.id, conn=conn)
+        wallet = await create_wallet(user_id=user.id, conn=conn)
 
     g.nursery.start_soon(
         redeem_lnurl_withdraw,