Michilis/lnbits
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: update python packages + formatting + cleanup (#3221)

Browse Source
This commit is contained in:
dni ⚡
2025-07-08 10:17:27 +02:00
parent c4c03d96a3
commit a16078a6ba
53 changed files with 1159 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lnbits/__init__.py
+5 -8
View File
@@ -9,16 +9,13 @@ from .decorators import (
from .exceptions import InvoiceError, PaymentError
__all__ = [
# decorators
"require_admin_key",
"require_invoice_key",
"InvoiceError",
"PaymentError",
"check_admin",
"check_super_user",
"check_user_exists",
# services
"pay_invoice",
"create_invoice",
# exceptions
"PaymentError",
"InvoiceError",
"pay_invoice",
"require_admin_key",
"require_invoice_key",
]
lnbits/app.py
-3
View File
@@ -65,7 +65,6 @@ from .middleware import (
add_ip_block_middleware,
add_ratelimit_middleware,
)
from .requestvars import g
from .tasks import (
check_pending_payments,
internal_invoice_listener,
@@ -171,8 +170,6 @@ def create_app() -> FastAPI:
name="library",
)
g().base_url = f"http://{settings.host}:{settings.port}"
app.add_middleware(
CORSMiddleware, allow_origins=["*"], allow_methods=["*"], allow_headers=["*"]
)
lnbits/core/crud/__init__.py
+57 -66
View File
@@ -85,87 +85,78 @@ from .webpush import (
)
__all__ = [
# audit
"create_audit_entry",
# db_versions
"get_db_version",
"get_db_versions",
"update_migration_version",
"delete_dbversion",
# extensions
"create_installed_extension",
"create_user_extension",
"delete_installed_extension",
"drop_extension_db",
"get_installed_extension",
"get_installed_extensions",
"get_user_active_extensions_ids",
"get_user_extension",
"update_installed_extension",
"update_installed_extension_state",
"update_user_extension",
"get_user_extensions",
# payments
"DateTrunc",
"check_internal",
"create_payment",
"delete_expired_invoices",
"delete_wallet_payment",
"get_latest_payments_by_extension",
"get_payment",
"get_payments",
"get_payments_history",
"get_payments_paginated",
"get_standalone_payment",
"get_wallet_payment",
"is_internal_status_success",
"mark_webhook_sent",
"update_payment",
"update_payment_checking_id",
"update_payment_extra",
# settings
"create_admin_settings",
"delete_admin_settings",
"get_admin_settings",
"get_super_settings",
"update_admin_settings",
"update_super_user",
"reset_core_settings",
# tinyurl
"create_tinyurl",
"delete_tinyurl",
"get_tinyurl",
"get_tinyurl_by_url",
# users
"create_account",
"create_admin_settings",
"create_audit_entry",
"create_installed_extension",
"create_payment",
"create_tinyurl",
"create_user_extension",
"create_wallet",
"create_webpush_subscription",
"delete_account",
"delete_accounts_no_wallets",
"delete_admin_settings",
"delete_dbversion",
"delete_expired_invoices",
"delete_installed_extension",
"delete_tinyurl",
"delete_unused_wallets",
"delete_wallet",
"delete_wallet_by_id",
"delete_wallet_payment",
"delete_webpush_subscription",
"delete_webpush_subscriptions",
"drop_extension_db",
"force_delete_wallet",
"get_account",
"get_account_by_email",
"get_account_by_pubkey",
"get_account_by_username",
"get_account_by_username_or_email",
"get_accounts",
"get_user",
"get_user_from_account",
"get_user_access_control_lists",
"update_account",
# wallets
"create_wallet",
"delete_unused_wallets",
"delete_wallet",
"delete_wallet_by_id",
"force_delete_wallet",
"get_admin_settings",
"get_db_version",
"get_db_versions",
"get_installed_extension",
"get_installed_extensions",
"get_latest_payments_by_extension",
"get_payment",
"get_payments",
"get_payments_history",
"get_payments_paginated",
"get_standalone_payment",
"get_super_settings",
"get_tinyurl",
"get_tinyurl_by_url",
"get_total_balance",
"get_user",
"get_user_access_control_lists",
"get_user_active_extensions_ids",
"get_user_extension",
"get_user_extensions",
"get_user_from_account",
"get_wallet",
"get_wallet_for_key",
"get_wallet_payment",
"get_wallets",
"remove_deleted_wallets",
"update_wallet",
# webpush
"create_webpush_subscription",
"delete_webpush_subscription",
"delete_webpush_subscriptions",
"get_webpush_subscription",
"get_webpush_subscriptions_for_user",
"is_internal_status_success",
"mark_webhook_sent",
"remove_deleted_wallets",
"reset_core_settings",
"update_account",
"update_admin_settings",
"update_installed_extension",
"update_installed_extension_state",
"update_migration_version",
"update_payment",
"update_payment_checking_id",
"update_payment_extra",
"update_super_user",
"update_user_extension",
"update_wallet",
]
lnbits/core/crud/payments.py
+2 -2
View File
@@ -1,5 +1,5 @@
from time import time
from typing import Any, Optional, Tuple
from typing import Any, Optional
from lnbits.core.crud.wallets import get_total_balance, get_wallet, get_wallets_ids
from lnbits.core.db import db
@@ -394,7 +394,7 @@ async def get_daily_stats(
filters: Optional[Filters[PaymentFilters]] = None,
user_id: Optional[str] = None,
conn: Optional[Connection] = None,
) -> Tuple[list[PaymentDailyStats], list[PaymentDailyStats]]:
) -> tuple[list[PaymentDailyStats], list[PaymentDailyStats]]:
if not filters:
filters = Filters()
lnbits/core/models/__init__.py
+32 -40
View File
@@ -48,62 +48,54 @@ from .wallets import BaseWallet, CreateWallet, KeyType, Wallet, WalletTypeInfo
from .webpush import CreateWebPushSubscription, WebPushSubscription
__all__ = [
# audit
"AuditEntry",
"AuditFilters",
# lnurl
"CreateLnurl",
"CreateLnurlAuth",
"PayLnurlWData",
# misc
"BalanceDelta",
"Callback",
"ConversionData",
"CoreAppExtra",
"DbVersion",
"SimpleStatus",
# payments
"CreateInvoice",
"CreatePayment",
"DecodePayment",
"PayInvoice",
"Payment",
"PaymentCountField",
"PaymentCountStat",
"PaymentDailyStats",
"PaymentsStatusCount",
"PaymentWalletStats",
"PaymentExtra",
"PaymentFilters",
"PaymentHistoryPoint",
"PaymentState",
# tinyurl
"TinyURL",
# users
"AccessTokenPayload",
"Account",
"AccountFilters",
"AccountOverview",
"UserAcls",
"AuditEntry",
"AuditFilters",
"BalanceDelta",
"BaseWallet",
"Callback",
"ConversionData",
"CoreAppExtra",
"CreateInvoice",
"CreateLnurl",
"CreateLnurlAuth",
"CreatePayment",
"CreateUser",
"RegisterUser",
"CreateWallet",
"CreateWebPushSubscription",
"DbVersion",
"DecodePayment",
"KeyType",
"LoginUsernamePassword",
"LoginUsr",
"PayInvoice",
"PayLnurlWData",
"Payment",
"PaymentCountField",
"PaymentCountStat",
"PaymentDailyStats",
"PaymentExtra",
"PaymentFilters",
"PaymentHistoryPoint",
"PaymentState",
"PaymentWalletStats",
"PaymentsStatusCount",
"RegisterUser",
"ResetUserPassword",
"SimpleStatus",
"TinyURL",
"UpdateBalance",
"UpdateSuperuserPassword",
"UpdateUser",
"UpdateUserPassword",
"UpdateUserPubkey",
"User",
"UserAcls",
"UserExtra",
# wallets
"BaseWallet",
"CreateWallet",
"KeyType",
"Wallet",
"WalletTypeInfo",
# webpush
"CreateWebPushSubscription",
"WebPushSubscription",
]
lnbits/core/models/sso/keycloak.py
+1 -2
View File
@@ -1,5 +1,4 @@
"""Keycloak SSO Login Helper
"""
"""Keycloak SSO Login Helper"""
from typing import Optional
lnbits/core/services/__init__.py
+19 -26
View File
@@ -34,40 +34,33 @@ from .users import (
from .websockets import websocket_manager, websocket_updater
__all__ = [
# funding source
"get_balance_delta",
"switch_to_voidwallet",
# lnurl
"redeem_lnurl_withdraw",
"perform_lnurlauth",
# notifications
"enqueue_notification",
"send_payment_notification",
# payments
"calculate_fiat_amounts",
"check_admin_settings",
"check_transaction_status",
"check_wallet_limits",
"create_invoice",
"create_wallet_invoice",
"create_fiat_invoice",
"fee_reserve",
"fee_reserve_total",
"get_payments_daily_stats",
"pay_invoice",
"service_fee",
"update_pending_payment",
"update_pending_payments",
"update_wallet_balance",
# settings
"check_webpush_settings",
"update_cached_settings",
# users
"check_admin_settings",
"create_fiat_invoice",
"create_invoice",
"create_user_account",
"create_user_account_no_ckeck",
"create_wallet_invoice",
"enqueue_notification",
"fee_reserve",
"fee_reserve_total",
"get_balance_delta",
"get_payments_daily_stats",
"pay_invoice",
"perform_lnurlauth",
"redeem_lnurl_withdraw",
"send_payment_notification",
"service_fee",
"switch_to_voidwallet",
"update_cached_settings",
"update_pending_payment",
"update_pending_payments",
"update_user_account",
"update_user_extensions",
# websockets
"update_wallet_balance",
"websocket_manager",
"websocket_updater",
]
lnbits/core/services/nostr.py
+1 -2
View File
@@ -1,5 +1,4 @@
import asyncio
from typing import Tuple
import httpx
from loguru import logger
@@ -48,7 +47,7 @@ async def send_nostr_dm(
return dm_event.to_dict()
async def fetch_nip5_details(identifier: str) -> Tuple[str, list[str]]:
async def fetch_nip5_details(identifier: str) -> tuple[str, list[str]]:
identifier, domain = identifier.split("@")
if not identifier or not domain:
raise ValueError("Invalid NIP5 identifier")
lnbits/core/services/notifications.py
+2 -2
View File
@@ -4,7 +4,7 @@ import smtplib
from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText
from http import HTTPStatus
from typing import Optional, Tuple
from typing import Optional
import httpx
from loguru import logger
@@ -186,7 +186,7 @@ def is_message_type_enabled(message_type: NotificationType) -> bool:
def _notification_message_to_text(
notification_message: NotificationMessage,
) -> Tuple[str, str]:
) -> tuple[str, str]:
message_type = notification_message.message_type.value
meesage_value = NOTIFICATION_TEMPLATES.get(message_type, message_type)
try:
lnbits/core/tasks.py
+2 -1
View File
@@ -1,6 +1,7 @@
import asyncio
import traceback
from typing import Callable, Coroutine
from collections.abc import Coroutine
from typing import Callable
from loguru import logger
lnbits/core/views/generic.py
+2 -2
View File
@@ -1,5 +1,5 @@
from http import HTTPStatus
from typing import Annotated, List, Optional, Union
from typing import Annotated, Optional, Union
from urllib.parse import urlencode, urlparse
import httpx
@@ -70,7 +70,7 @@ async def robots():
@generic_router.get("/extensions", name="extensions", response_class=HTMLResponse)
async def extensions(request: Request, user: User = Depends(check_user_exists)):
installed_exts: List[InstallableExtension] = await get_installed_extensions()
installed_exts: list[InstallableExtension] = await get_installed_extensions()
installed_exts_ids = [e.id for e in installed_exts]
installable_exts = await InstallableExtension.get_installable_extensions()
lnbits/core/views/node_api.py
+4 -4
View File
@@ -1,5 +1,5 @@
from http import HTTPStatus
from typing import List, Optional
from typing import Optional
import httpx
from fastapi import APIRouter, Body, Depends, HTTPException
@@ -91,7 +91,7 @@ async def api_get_info(
@node_router.get("/channels")
async def api_get_channels(
node: Node = Depends(require_node),
) -> Optional[List[NodeChannel]]:
) -> Optional[list[NodeChannel]]:
return await node.get_channels()
@@ -121,7 +121,7 @@ async def api_delete_channel(
output_index: Optional[int],
force: bool = False,
node: Node = Depends(require_node),
) -> Optional[List[NodeChannel]]:
) -> Optional[list[NodeChannel]]:
return await node.close_channel(
short_id,
(
@@ -170,7 +170,7 @@ async def api_get_invoices(
@node_router.get("/peers")
async def api_get_peers(node: Node = Depends(require_node)) -> List[NodePeerInfo]:
async def api_get_peers(node: Node = Depends(require_node)) -> list[NodePeerInfo]:
return await node.get_peers()
lnbits/core/views/payment_api.py
+6 -6
View File
@@ -2,7 +2,7 @@ import json
import ssl
from http import HTTPStatus
from math import ceil
from typing import List, Optional
from typing import Optional
from urllib.parse import urlparse
import httpx
@@ -79,7 +79,7 @@ payment_router = APIRouter(prefix="/api/v1/payments", tags=["Payments"])
name="Payment List",
summary="get list of payments",
response_description="list of payments",
response_model=List[Payment],
response_model=list[Payment],
openapi_extra=generate_filter_params_openapi(PaymentFilters),
)
async def api_payments(
@@ -98,7 +98,7 @@ async def api_payments(
@payment_router.get(
"/history",
name="Get payments history",
response_model=List[PaymentHistoryPoint],
response_model=list[PaymentHistoryPoint],
openapi_extra=generate_filter_params_openapi(PaymentFilters),
)
async def api_payments_history(
@@ -113,7 +113,7 @@ async def api_payments_history(
@payment_router.get(
"/stats/count",
name="Get payments history for all users",
response_model=List[PaymentCountStat],
response_model=list[PaymentCountStat],
openapi_extra=generate_filter_params_openapi(PaymentFilters),
)
async def api_payments_counting_stats(
@@ -135,7 +135,7 @@ async def api_payments_counting_stats(
@payment_router.get(
"/stats/wallets",
name="Get payments history for all users",
response_model=List[PaymentWalletStats],
response_model=list[PaymentWalletStats],
openapi_extra=generate_filter_params_openapi(PaymentFilters),
)
async def api_payments_wallets_stats(
@@ -156,7 +156,7 @@ async def api_payments_wallets_stats(
@payment_router.get(
"/stats/daily",
name="Get payments history per day",
response_model=List[PaymentDailyStats],
response_model=list[PaymentDailyStats],
openapi_extra=generate_filter_params_openapi(PaymentFilters),
)
async def api_payments_daily_stats(
lnbits/core/views/user_api.py
+2 -2
View File
@@ -2,7 +2,7 @@ import base64
import json
import time
from http import HTTPStatus
from typing import List, Optional
from typing import Optional
from uuid import uuid4
import shortuuid
@@ -216,7 +216,7 @@ async def api_users_toggle_admin(user_id: str) -> SimpleStatus:
@users_router.get("/user/{user_id}/wallet", name="Get wallets for user")
async def api_users_get_user_wallet(user_id: str) -> List[Wallet]:
async def api_users_get_user_wallet(user_id: str) -> list[Wallet]:
return await get_wallets(user_id)
lnbits/decorators.py
+2 -2
View File
@@ -1,5 +1,5 @@
from http import HTTPStatus
from typing import Annotated, Literal, Optional, Type, Union
from typing import Annotated, Literal, Optional, Union
import jwt
from fastapi import Cookie, Depends, Query, Request, Security
@@ -223,7 +223,7 @@ async def check_super_user(user: Annotated[User, Depends(check_user_exists)]) ->
return user
def parse_filters(model: Type[TFilterModel]):
def parse_filters(model: type[TFilterModel]):
"""
Parses the query params as filters.
:param model: model used for validation of filter values
lnbits/fiat/base.py
+2 -1
View File
@@ -1,7 +1,8 @@
from __future__ import annotations
from abc import ABC, abstractmethod
from typing import TYPE_CHECKING, AsyncGenerator, Coroutine, NamedTuple
from collections.abc import AsyncGenerator, Coroutine
from typing import TYPE_CHECKING, NamedTuple
if TYPE_CHECKING:
pass
lnbits/fiat/stripe.py
+2 -1
View File
@@ -1,7 +1,8 @@
import asyncio
import json
from collections.abc import AsyncGenerator
from datetime import datetime, timedelta, timezone
from typing import AsyncGenerator, Optional
from typing import Optional
from urllib.parse import urlencode
import httpx
lnbits/helpers.py
+3 -4
View File
@@ -3,7 +3,7 @@ import json
import re
from datetime import datetime, timedelta, timezone
from pathlib import Path
from typing import Any, Optional, Type
from typing import Any, Optional
from urllib import request
from urllib.parse import urlparse
@@ -17,7 +17,6 @@ from pydantic.schema import field_schema
from lnbits.jinja2_templating import Jinja2Templates
from lnbits.nodes import get_node_class
from lnbits.requestvars import g
from lnbits.settings import settings
from lnbits.utils.crypto import AESCipher
@@ -42,7 +41,7 @@ def urlsafe_short_hash() -> str:
def url_for(endpoint: str, external: Optional[bool] = False, **params: Any) -> str:
base = g().base_url if external else ""
base = f"http://{settings.host}:{settings.port}" if external else ""
url_params = "?"
for key, value in params.items():
url_params += f"{key}={value}&"
@@ -154,7 +153,7 @@ def get_current_extension_name() -> str:
return ext_name
def generate_filter_params_openapi(model: Type[FilterModel], keep_optional=False):
def generate_filter_params_openapi(model: type[FilterModel], keep_optional=False):
"""
Generate openapi documentation for Filters. This is intended to be used along
parse_filters (see example)
lnbits/lnurl.py
+2 -2
View File
@@ -58,9 +58,9 @@ class LnurlErrorResponseHandler(APIRoute):
__all__ = [
"LnurlErrorResponse",
"LnurlErrorResponseHandler",
"decode",
"encode",
"handle",
"LnurlErrorResponse",
"LnurlErrorResponseHandler",
]
lnbits/middleware.py
+2 -2
View File
@@ -2,7 +2,7 @@ import asyncio
import json
from datetime import datetime, timezone
from http import HTTPStatus
from typing import Any, List, Optional, Union
from typing import Any, Optional, Union
from fastapi import FastAPI, Request, Response
from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
@@ -61,7 +61,7 @@ class InstalledExtensionMiddleware:
await self.app(scope, receive, send)
def _response_by_accepted_type(
self, scope: Scope, headers: List[Any], msg: str, status_code: HTTPStatus
self, scope: Scope, headers: list[Any], msg: str, status_code: HTTPStatus
) -> Union[HTMLResponse, JSONResponse]:
"""
Build an HTTP response containing the `msg` as HTTP body and the `status_code`
lnbits/requestvars.py
-10
View File
@@ -1,10 +0,0 @@
import contextvars
import types
request_global = contextvars.ContextVar(
"request_global", default=types.SimpleNamespace()
)
def g() -> types.SimpleNamespace:
return request_global.get()
lnbits/tasks.py
+4 -6
View File
@@ -2,11 +2,9 @@ import asyncio
import time
import traceback
import uuid
from collections.abc import Coroutine
from typing import (
Callable,
Coroutine,
Dict,
List,
Optional,
)
@@ -22,8 +20,8 @@ from lnbits.core.services.fiat_providers import handle_fiat_payment_confirmation
from lnbits.settings import settings
from lnbits.wallets import get_funding_source
tasks: List[asyncio.Task] = []
unique_tasks: Dict[str, asyncio.Task] = {}
tasks: list[asyncio.Task] = []
unique_tasks: dict[str, asyncio.Task] = {}
def create_task(coro: Coroutine) -> asyncio.Task:
@@ -83,7 +81,7 @@ async def catch_everything_and_restart(
return await catch_everything_and_restart(func, name)
invoice_listeners: Dict[str, asyncio.Queue] = {}
invoice_listeners: dict[str, asyncio.Queue] = {}
# TODO: name should not be optional
lnbits/utils/nostr.py
+7 -7
View File
@@ -2,7 +2,7 @@ import base64
import hashlib
import json
import re
from typing import Dict, Tuple, Union
from typing import Union
from urllib.parse import urlparse
import secp256k1
@@ -13,7 +13,7 @@ from Cryptodome.Util.Padding import pad, unpad
from pynostr.key import PrivateKey
def generate_keypair() -> Tuple[str, str]:
def generate_keypair() -> tuple[str, str]:
private_key = PrivateKey()
public_key = private_key.public_key
return private_key.hex(), public_key.hex()
@@ -82,7 +82,7 @@ def decrypt_content(
return decrypted
def verify_event(event: Dict) -> bool:
def verify_event(event: dict) -> bool:
"""
Verify the event signature
@@ -115,8 +115,8 @@ def verify_event(event: Dict) -> bool:
def sign_event(
event: Dict, account_public_key_hex: str, account_private_key: secp256k1.PrivateKey
) -> Dict:
event: dict, account_public_key_hex: str, account_private_key: secp256k1.PrivateKey
) -> dict:
"""
Signs the event (in place) with the service secret
@@ -149,7 +149,7 @@ def sign_event(
return event
def json_dumps(data: Union[Dict, list]) -> str:
def json_dumps(data: Union[dict, list]) -> str:
"""
Converts a Python dictionary to a JSON string with compact encoding.
@@ -159,7 +159,7 @@ def json_dumps(data: Union[Dict, list]) -> str:
Returns:
str: The compact JSON string.
"""
if isinstance(data, Dict):
if isinstance(data, dict):
data = {k: v for k, v in data.items() if v is not None}
return json.dumps(data, separators=(",", ":"), ensure_ascii=False)
lnbits/wallets/__init__.py
+5 -5
View File
@@ -58,17 +58,17 @@ __all__ = [
"BlinkWallet",
"BoltzWallet",
"BreezSdkWallet",
"ClicheWallet",
"CoreLightningWallet",
"CLightningWallet",
"ClicheWallet",
"CoreLightningRestWallet",
"CoreLightningWallet",
"EclairWallet",
"FakeWallet",
"LNbitsWallet",
"LndWallet",
"LndRestWallet",
"LNPayWallet",
"LNbitsWallet",
"LnTipsWallet",
"LndRestWallet",
"LndWallet",
"NWCWallet",
"OpenNodeWallet",
"PhoenixdWallet",
lnbits/wallets/alby.py
+2 -1
View File
@@ -1,7 +1,8 @@
import asyncio
import hashlib
import json
from typing import AsyncGenerator, Optional
from collections.abc import AsyncGenerator
from typing import Optional
import httpx
from loguru import logger
lnbits/wallets/base.py
+2 -1
View File
@@ -2,7 +2,8 @@ from __future__ import annotations
import asyncio
from abc import ABC, abstractmethod
from typing import TYPE_CHECKING, AsyncGenerator, Coroutine, NamedTuple
from collections.abc import AsyncGenerator, Coroutine
from typing import TYPE_CHECKING, NamedTuple
from loguru import logger
lnbits/wallets/blink.py
+3 -2
View File
@@ -1,12 +1,13 @@
import asyncio
import hashlib
import json
from typing import AsyncGenerator, Optional
from collections.abc import AsyncGenerator
from typing import Optional
import httpx
from loguru import logger
from pydantic import BaseModel
from websockets.client import WebSocketClientProtocol, connect
from websockets.legacy.client import WebSocketClientProtocol, connect
from websockets.typing import Subprotocol
from lnbits import bolt11
lnbits/wallets/boltz.py
+2 -1
View File
@@ -1,5 +1,6 @@
import asyncio
from typing import AsyncGenerator, Optional
from collections.abc import AsyncGenerator
from typing import Optional
from bolt11.decode import decode
from grpc.aio import AioRpcError
lnbits/wallets/breez.py
+2 -1
View File
@@ -20,8 +20,9 @@ if not BREEZ_SDK_INSTALLED:
else:
import asyncio
from collections.abc import AsyncGenerator
from pathlib import Path
from typing import AsyncGenerator, Optional
from typing import Optional
from loguru import logger
lnbits/wallets/cliche.py
+2 -1
View File
@@ -1,7 +1,8 @@
import asyncio
import hashlib
import json
from typing import AsyncGenerator, Optional
from collections.abc import AsyncGenerator
from typing import Optional
from loguru import logger
from websocket import create_connection
lnbits/wallets/eclair.py
+1 -1
View File
@@ -9,7 +9,7 @@ from typing import Any, Optional
import httpx
from loguru import logger
from websockets.client import connect
from websockets.legacy.client import connect
from lnbits.helpers import normalize_endpoint
from lnbits.settings import settings
lnbits/wallets/fake.py
+2 -1
View File
@@ -1,8 +1,9 @@
import asyncio
from collections.abc import AsyncGenerator
from datetime import datetime
from hashlib import sha256
from os import urandom
from typing import AsyncGenerator, Optional
from typing import Optional
from bolt11 import (
Bolt11,
lnbits/wallets/lnbits.py
+4 -3
View File
@@ -1,10 +1,11 @@
import asyncio
import json
from typing import AsyncGenerator, Dict, Optional
from collections.abc import AsyncGenerator
from typing import Optional
import httpx
from loguru import logger
from websockets.client import connect
from websockets.legacy.client import connect
from lnbits.helpers import normalize_endpoint
from lnbits.settings import settings
@@ -75,7 +76,7 @@ class LNbitsWallet(Wallet):
unhashed_description: Optional[bytes] = None,
**kwargs,
) -> InvoiceResponse:
data: Dict = {"out": False, "amount": amount, "memo": memo or ""}
data: dict = {"out": False, "amount": amount, "memo": memo or ""}
if kwargs.get("expiry"):
data["expiry"] = kwargs["expiry"]
if description_hash:
lnbits/wallets/lndgrpc.py
+3 -2
View File
@@ -1,8 +1,9 @@
import asyncio
import base64
from collections.abc import AsyncGenerator
from hashlib import sha256
from os import environ
from typing import AsyncGenerator, Dict, Optional
from typing import Optional
import grpc
from loguru import logger
@@ -121,7 +122,7 @@ class LndWallet(Wallet):
unhashed_description: Optional[bytes] = None,
**kwargs,
) -> InvoiceResponse:
data: Dict = {
data: dict = {
"description_hash": b"",
"value": amount,
"private": True,
lnbits/wallets/lndrest.py
+3 -2
View File
@@ -2,7 +2,8 @@ import asyncio
import base64
import hashlib
import json
from typing import Any, AsyncGenerator, Dict, Optional
from collections.abc import AsyncGenerator
from typing import Any, Optional
import httpx
from loguru import logger
@@ -105,7 +106,7 @@ class LndRestWallet(Wallet):
unhashed_description: Optional[bytes] = None,
**kwargs,
) -> InvoiceResponse:
_data: Dict = {
_data: dict = {
"value": amount,
"private": settings.lnd_rest_route_hints,
"memo": memo or "",
lnbits/wallets/lnpay.py
+3 -2
View File
@@ -1,6 +1,7 @@
import asyncio
import hashlib
from typing import AsyncGenerator, Dict, Optional
from collections.abc import AsyncGenerator
from typing import Optional
import httpx
from loguru import logger
@@ -79,7 +80,7 @@ class LNPayWallet(Wallet):
unhashed_description: Optional[bytes] = None,
**_,
) -> InvoiceResponse:
data: Dict = {"num_satoshis": f"{amount}"}
data: dict = {"num_satoshis": f"{amount}"}
if description_hash:
data["description_hash"] = description_hash.hex()
elif unhashed_description:
lnbits/wallets/lntips.py
+3 -2
View File
@@ -2,7 +2,8 @@ import asyncio
import hashlib
import json
import time
from typing import AsyncGenerator, Dict, Optional
from collections.abc import AsyncGenerator
from typing import Optional
import httpx
from loguru import logger
@@ -73,7 +74,7 @@ class LnTipsWallet(Wallet):
unhashed_description: Optional[bytes] = None,
**_,
) -> InvoiceResponse:
data: Dict = {"amount": amount, "description_hash": "", "memo": memo or ""}
data: dict = {"amount": amount, "description_hash": "", "memo": memo or ""}
if description_hash:
data["description_hash"] = description_hash.hex()
elif unhashed_description:
lnbits/wallets/nwc.py
+13 -12
View File
@@ -3,13 +3,14 @@ import hashlib
import json
import random
import time
from typing import AsyncGenerator, Dict, List, Optional, Union, cast
from collections.abc import AsyncGenerator
from typing import Optional, Union, cast
from urllib.parse import parse_qs, unquote, urlparse
import secp256k1
from bolt11 import decode as bolt11_decode
from loguru import logger
from websockets.client import connect as ws_connect
from websockets.legacy.client import connect as ws_connect
from lnbits.settings import settings
from lnbits.utils.nostr import (
@@ -358,7 +359,7 @@ class NWCConnection:
"""
return self.shutdown or not settings.lnbits_running
async def _send(self, data: List[Union[str, Dict]]):
async def _send(self, data: list[Union[str, dict]]):
"""
Sends data to the NWC relay.
@@ -394,7 +395,7 @@ class NWCConnection:
async def _close_subscription_by_subid(
self, sub_id: str, send_event: bool = True
) -> Optional[Dict]:
) -> Optional[dict]:
"""
Closes a subscription by its sub_id.
@@ -425,7 +426,7 @@ class NWCConnection:
async def _close_subscription_by_eventid(
self, event_id, send_event=True
) -> Optional[Dict]:
) -> Optional[dict]:
"""
Closes a subscription associated to an event_id.
@@ -498,7 +499,7 @@ class NWCConnection:
except Exception as e:
logger.error("Error handling subscription timeout: " + str(e))
async def _on_ok_message(self, msg: List[str]):
async def _on_ok_message(self, msg: list[str]):
"""
Handles OK messages from the relay.
"""
@@ -512,12 +513,12 @@ class NWCConnection:
if subscription: # Check if the subscription exists first
subscription["future"].set_exception(Exception(info))
async def _on_event_message(self, msg: List[Union[str, Dict]]):
async def _on_event_message(self, msg: list[Union[str, dict]]):
"""
Handles EVENT messages from the relay.
"""
sub_id = cast(str, msg[1])
event = cast(Dict, msg[2])
event = cast(dict, msg[2])
if not verify_event(event): # Ensure the event is valid (do not trust relays)
raise Exception("Invalid event signature")
tags = event["tags"]
@@ -571,7 +572,7 @@ class NWCConnection:
else:
subscription["future"].set_result(result)
async def _on_closed_message(self, msg: List[str]):
async def _on_closed_message(self, msg: list[str]):
"""
Handles CLOSED messages from the relay.
"""
@@ -646,7 +647,7 @@ class NWCConnection:
logger.debug("Reconnecting to NWC relay in 5 seconds...")
await asyncio.sleep(5)
async def call(self, method: str, params: Dict) -> Dict:
async def call(self, method: str, params: dict) -> dict:
"""
Call a NWC method.
@@ -708,7 +709,7 @@ class NWCConnection:
# Wait for the response
return await future
async def get_info(self) -> Dict:
async def get_info(self) -> dict:
"""
Get the info about the service provider and cache it.
@@ -793,7 +794,7 @@ class NWCConnection:
logger.warning("Error closing connection: " + str(e))
def parse_nwc(nwc) -> Dict:
def parse_nwc(nwc) -> dict:
"""
Parses a NWC URL (nostr+walletconnect://...) and extracts relevant information.
lnbits/wallets/opennode.py
+2 -1
View File
@@ -1,5 +1,6 @@
import asyncio
from typing import AsyncGenerator, Optional
from collections.abc import AsyncGenerator
from typing import Optional
import httpx
from loguru import logger
lnbits/wallets/phoenixd.py
+4 -3
View File
@@ -3,11 +3,12 @@ import base64
import hashlib
import json
import urllib.parse
from typing import Any, AsyncGenerator, Dict, Optional
from collections.abc import AsyncGenerator
from typing import Any, Optional
import httpx
from loguru import logger
from websockets.client import connect
from websockets.legacy.client import connect
from lnbits.helpers import normalize_endpoint
from lnbits.settings import settings
@@ -101,7 +102,7 @@ class PhoenixdWallet(Wallet):
try:
msats_amount = amount
data: Dict[str, Any] = {
data: dict[str, Any] = {
"amountSat": f"{msats_amount}",
"externalId": "",
}
lnbits/wallets/spark.py
+2 -1
View File
@@ -2,7 +2,8 @@ import asyncio
import hashlib
import json
import random
from typing import AsyncGenerator, Optional
from collections.abc import AsyncGenerator
from typing import Optional
import httpx
from loguru import logger
lnbits/wallets/strike.py
+11 -10
View File
@@ -1,7 +1,8 @@
import asyncio
import time
from collections.abc import AsyncGenerator
from decimal import Decimal
from typing import Any, AsyncGenerator, Dict, Optional
from typing import Any, Optional
import httpx
from loguru import logger
@@ -111,8 +112,8 @@ class StrikeWallet(Wallet):
# runtime state
self.pending_invoices: list[str] = [] # Keep it as a list
self.pending_payments: Dict[str, str] = {}
self.failed_payments: Dict[str, str] = {}
self.pending_payments: dict[str, str] = {}
self.failed_payments: dict[str, str] = {}
# balance cache
self._cached_balance: Optional[int] = None
@@ -183,7 +184,7 @@ class StrikeWallet(Wallet):
if btc and "available" in btc:
available_btc = Decimal(btc["available"]) # Get available BTC amount.
msats = int(
available_btc * Decimal(1e11)
available_btc * Decimal("1e11")
) # Convert BTC to millisatoshis.
self._cached_balance = msats
self._cached_balance_ts = now
@@ -204,10 +205,10 @@ class StrikeWallet(Wallet):
**kwargs,
) -> InvoiceResponse:
try:
btc_amt = (Decimal(amount) / Decimal(1e8)).quantize(
btc_amt = (Decimal(amount) / Decimal("1e8")).quantize(
Decimal("0.00000001")
) # Convert amount from millisatoshis to BTC.
payload: Dict[str, Any] = {
payload: dict[str, Any] = {
"bolt11": {
"amount": {
"currency": "BTC",
@@ -270,7 +271,7 @@ class StrikeWallet(Wallet):
# Network fee → msat.
fee_obj = data.get("lightningNetworkFee") or data.get("totalFee") or {}
fee_btc = Decimal(fee_obj.get("amount", "0"))
fee_msat = int(fee_btc * Decimal(1e11)) # millisatoshis.
fee_msat = int(fee_btc * Decimal("1e11")) # millisatoshis.
if state in {"SUCCEEDED", "COMPLETED"}:
preimage = data.get("preimage") or data.get("preImage")
@@ -427,9 +428,9 @@ class StrikeWallet(Wallet):
orderby: Optional[str] = None,
skip: Optional[int] = None,
top: Optional[int] = None,
) -> Dict[str, Any]:
) -> dict[str, Any]:
try:
params: Dict[str, Any] = {}
params: dict[str, Any] = {}
if filters:
params["$filter"] = filters
if orderby:
@@ -465,7 +466,7 @@ class StrikeWallet(Wallet):
try:
if currency_str == "BTC":
fee_btc_decimal = Decimal(amount_str)
fee_msat = int(fee_btc_decimal * Decimal(1e11))
fee_msat = int(fee_btc_decimal * Decimal("1e11"))
elif currency_str == "SAT":
fee_sat_decimal = Decimal(amount_str)
fee_msat = int(fee_sat_decimal * 1000)
lnbits/wallets/void.py
+1 -1
View File
@@ -1,4 +1,4 @@
from typing import AsyncGenerator
from collections.abc import AsyncGenerator
from loguru import logger
lnbits/wallets/zbd.py
+3 -2
View File
@@ -1,6 +1,7 @@
import asyncio
import hashlib
from typing import AsyncGenerator, Dict, Optional
from collections.abc import AsyncGenerator
from typing import Optional
import httpx
from bolt11 import decode as bolt11_decode
@@ -67,7 +68,7 @@ class ZBDWallet(Wallet):
# https://api.zebedee.io/v0/charges
msats_amount = amount * 1000
data: Dict = {
data: dict = {
"amount": f"{msats_amount}",
"expiresIn": 3600,
"callbackUrl": "",