From 83b7779972ddff36a11784342b9926db571268b8 Mon Sep 17 00:00:00 2001 From: Stefan Stammberger Date: Wed, 24 Nov 2021 14:31:55 +0100 Subject: [PATCH] chore: apply black to all .py files --- conv.py | 2 +- lnbits/core/crud.py | 4 +- lnbits/core/services.py | 3 +- lnbits/core/views/public_api.py | 1 + lnbits/extensions/livestream/models.py | 2 +- lnbits/extensions/lnaddress/__init__.py | 6 +- lnbits/extensions/lnaddress/cloudflare.py | 4 +- lnbits/extensions/lnaddress/crud.py | 53 ++++++++++------ lnbits/extensions/lnaddress/lnurl.py | 26 +++++--- lnbits/extensions/lnaddress/migrations.py | 2 + lnbits/extensions/lnaddress/models.py | 5 +- lnbits/extensions/lnaddress/tasks.py | 4 +- lnbits/extensions/lnaddress/views.py | 14 +++-- lnbits/extensions/lnaddress/views_api.py | 75 ++++++++++++++--------- lnbits/extensions/lndhub/views_api.py | 4 +- lnbits/extensions/lnurlpos/crud.py | 5 +- lnbits/extensions/withdraw/lnurl.py | 13 +--- lnbits/wallets/lnbits.py | 6 +- 18 files changed, 139 insertions(+), 90 deletions(-) diff --git a/conv.py b/conv.py index bf408cfbe..14233f2dd 100644 --- a/conv.py +++ b/conv.py @@ -1,5 +1,5 @@ ## Python script to migrate an LNbits SQLite DB to Postgres -## All credits to @Fritz446 for the awesome work +## All credits to @Fritz446 for the awesome work ## pip install psycopg2 OR psycopg2-binary diff --git a/lnbits/core/crud.py b/lnbits/core/crud.py index f69ca95b1..a9f1b3a04 100644 --- a/lnbits/core/crud.py +++ b/lnbits/core/crud.py @@ -278,7 +278,9 @@ async def get_payments( return [Payment.from_row(row) for row in rows] -async def delete_expired_invoices(conn: Optional[Connection] = None,) -> None: +async def delete_expired_invoices( + conn: Optional[Connection] = None, +) -> None: # first we delete all invoices older than one month await (conn or db).execute( f""" diff --git a/lnbits/core/services.py b/lnbits/core/services.py index 64db8d72c..2549b296c 100644 --- a/lnbits/core/services.py +++ b/lnbits/core/services.py @@ -316,8 +316,7 @@ async def check_invoice_status( if not payment.pending: return status if payment.is_out and status.failed: - print( - f" - deleting outgoing failed payment {payment.checking_id}: {status}") + print(f" - deleting outgoing failed payment {payment.checking_id}: {status}") await payment.delete() elif not status.pending: print( diff --git a/lnbits/core/views/public_api.py b/lnbits/core/views/public_api.py index 32abacb6e..6019a1396 100644 --- a/lnbits/core/views/public_api.py +++ b/lnbits/core/views/public_api.py @@ -15,6 +15,7 @@ from ..tasks import api_invoice_listeners @core_app.get("/.well-known/lnurlp/{username}") async def lnaddress(username: str, request: Request): from lnbits.extensions.lnaddress.lnurl import lnurl_response + domain = request.client.host return await lnurl_response(username, domain) diff --git a/lnbits/extensions/livestream/models.py b/lnbits/extensions/livestream/models.py index 1b5d4f7a7..521909a3a 100644 --- a/lnbits/extensions/livestream/models.py +++ b/lnbits/extensions/livestream/models.py @@ -76,7 +76,7 @@ class Track(BaseModel): return None url = request.url_for("livestream.track_redirect_download", track_id=self.id) - url_with_query = f"{url}?p={payment_hash}" + url_with_query = f"{url}?p={payment_hash}" return UrlAction( url=url_with_query, diff --git a/lnbits/extensions/lnaddress/__init__.py b/lnbits/extensions/lnaddress/__init__.py index 102c48ecf..6e8afa37d 100644 --- a/lnbits/extensions/lnaddress/__init__.py +++ b/lnbits/extensions/lnaddress/__init__.py @@ -8,10 +8,8 @@ from lnbits.tasks import catch_everything_and_restart db = Database("ext_lnaddress") -lnaddress_ext: APIRouter = APIRouter( - prefix="/lnaddress", - tags=["lnaddress"] -) +lnaddress_ext: APIRouter = APIRouter(prefix="/lnaddress", tags=["lnaddress"]) + def lnaddress_renderer(): return template_renderer(["lnbits/extensions/lnaddress/templates"]) diff --git a/lnbits/extensions/lnaddress/cloudflare.py b/lnbits/extensions/lnaddress/cloudflare.py index 3f3ed1711..e22daf953 100644 --- a/lnbits/extensions/lnaddress/cloudflare.py +++ b/lnbits/extensions/lnaddress/cloudflare.py @@ -2,9 +2,7 @@ from lnbits.extensions.lnaddress.models import Domains import httpx, json -async def cloudflare_create_record( - domain: Domains, ip: str -): +async def cloudflare_create_record(domain: Domains, ip: str): url = ( "https://api.cloudflare.com/client/v4/zones/" + domain.cf_zone_id diff --git a/lnbits/extensions/lnaddress/crud.py b/lnbits/extensions/lnaddress/crud.py index 36c0d54e4..7ad3598d4 100644 --- a/lnbits/extensions/lnaddress/crud.py +++ b/lnbits/extensions/lnaddress/crud.py @@ -7,9 +7,7 @@ from . import db from .models import Addresses, CreateAddress, CreateDomain, Domains -async def create_domain( - data: CreateDomain -) -> Domains: +async def create_domain(data: CreateDomain) -> Domains: domain_id = urlsafe_short_hash() await db.execute( """ @@ -37,21 +35,20 @@ async def update_domain(domain_id: str, **kwargs) -> Domains: await db.execute( f"UPDATE lnaddress.domain SET {q} WHERE id = ?", (*kwargs.values(), domain_id) ) - row = await db.fetchone( - "SELECT * FROM lnaddress.domain WHERE id = ?", (domain_id,) - ) + row = await db.fetchone("SELECT * FROM lnaddress.domain WHERE id = ?", (domain_id,)) assert row, "Newly updated domain couldn't be retrieved" return Domains(**row) + async def delete_domain(domain_id: str) -> None: await db.execute("DELETE FROM lnaddress.domain WHERE id = ?", (domain_id,)) + async def get_domain(domain_id: str) -> Optional[Domains]: - row = await db.fetchone( - "SELECT * FROM lnaddress.domain WHERE id = ?", (domain_id,) - ) + row = await db.fetchone("SELECT * FROM lnaddress.domain WHERE id = ?", (domain_id,)) return Domains(**row) if row else None + async def get_domains(wallet_ids: Union[str, List[str]]) -> List[Domains]: if isinstance(wallet_ids, str): wallet_ids = [wallet_ids] @@ -63,12 +60,12 @@ async def get_domains(wallet_ids: Union[str, List[str]]) -> List[Domains]: return [Domains(**row) for row in rows] + ## ADRESSES + async def create_address( - payment_hash: str, - wallet: str, - data: CreateAddress + payment_hash: str, wallet: str, data: CreateAddress ) -> Addresses: await db.execute( """ @@ -93,6 +90,7 @@ async def create_address( assert new_address, "Newly created address couldn't be retrieved" return new_address + async def get_address(address_id: str) -> Optional[Addresses]: row = await db.fetchone( "SELECT a.* FROM lnaddress.address AS a INNER JOIN lnaddress.domain AS d ON a.id = ? AND a.domain = d.id", @@ -100,18 +98,24 @@ async def get_address(address_id: str) -> Optional[Addresses]: ) return Addresses(**row) if row else None + async def get_address_by_username(username: str, domain: str) -> Optional[Addresses]: row = await db.fetchone( "SELECT a.* FROM lnaddress.address AS a INNER JOIN lnaddress.domain AS d ON a.username = ? AND d.domain = ?", # "SELECT * FROM lnaddress.address WHERE username = ? AND domain = ?", - (username, domain,), + ( + username, + domain, + ), ) print("ADD", row) return Addresses(**row) if row else None + async def delete_address(address_id: str) -> None: await db.execute("DELETE FROM lnaddress.address WHERE id = ?", (address_id,)) + async def get_addresses(wallet_ids: Union[str, List[str]]) -> List[Addresses]: if isinstance(wallet_ids, str): wallet_ids = [wallet_ids] @@ -124,6 +128,7 @@ async def get_addresses(wallet_ids: Union[str, List[str]]) -> List[Addresses]: print([Addresses(**row) for row in rows]) return [Addresses(**row) for row in rows] + async def set_address_paid(payment_hash: str) -> Addresses: _address = await get_address(payment_hash) address = _address._asdict() @@ -142,6 +147,7 @@ async def set_address_paid(payment_hash: str) -> Addresses: assert new_address, "Newly paid address couldn't be retrieved" return new_address + async def set_address_renewed(address_id: str, duration: int): _address = await get_address(address_id) address = _address._asdict() @@ -153,7 +159,10 @@ async def set_address_renewed(address_id: str, duration: int): SET duration = ? WHERE id = ? """, - (extend_duration, address_id,), + ( + extend_duration, + address_id, + ), ) updated_address = await get_address(address_id) assert updated_address, "Renewed address couldn't be retrieved" @@ -161,17 +170,21 @@ async def set_address_renewed(address_id: str, duration: int): async def check_address_available(username: str, domain: str): - row, = await db.fetchone( + (row,) = await db.fetchone( "SELECT COUNT(username) FROM lnaddress.address WHERE username = ? AND domain = ?", - (username, domain,), + ( + username, + domain, + ), ) return row + async def purge_addresses(domain_id: str): rows = await db.fetchall( "SELECT * FROM lnaddress.address WHERE domain = ?", - (domain_id, ), + (domain_id,), ) now = datetime.now().timestamp() @@ -181,8 +194,10 @@ async def purge_addresses(domain_id: str): start = datetime.fromtimestamp(r["time"]) paid = r["paid"] - pay_expire = now > start.timestamp() + 86400 #if payment wasn't made in 1 day - expired = now > (start + timedelta(days = r["duration"] + 1)).timestamp() #give user 1 day to topup is address + pay_expire = now > start.timestamp() + 86400 # if payment wasn't made in 1 day + expired = ( + now > (start + timedelta(days=r["duration"] + 1)).timestamp() + ) # give user 1 day to topup is address if not paid and pay_expire: print("DELETE UNP_PAY_EXP", r["username"]) diff --git a/lnbits/extensions/lnaddress/lnurl.py b/lnbits/extensions/lnaddress/lnurl.py index ab043a118..cf7da8d45 100644 --- a/lnbits/extensions/lnaddress/lnurl.py +++ b/lnbits/extensions/lnaddress/lnurl.py @@ -23,13 +23,15 @@ async def lnurl_response(username: str, domain: str, request: Request): ## CHECK IF USER IS STILL VALID/PAYING now = datetime.now().timestamp() start = datetime.fromtimestamp(address.time) - expiration = (start + timedelta(days = address.duration)).timestamp() + expiration = (start + timedelta(days=address.duration)).timestamp() if now > expiration: return LnurlErrorResponse(reason="Address has expired.").dict() resp = LnurlPayResponse( - callback=request.url_for("lnaddress.lnurl_callback", address_id=address.id, _external=True), + callback=request.url_for( + "lnaddress.lnurl_callback", address_id=address.id, _external=True + ), min_sendable=1000, max_sendable=1000000000, metadata=await address.lnurlpay_metadata(), @@ -37,14 +39,13 @@ async def lnurl_response(username: str, domain: str, request: Request): return resp.dict() + @lnaddress_ext.get("/lnurl/cb/{address_id}", name="lnaddress.lnurl_callback") async def lnurl_callback(address_id, amount: int = Query(...)): address = await get_address(address_id) if not address: - return LnurlErrorResponse( - reason=f"Address not found" - ).dict() + return LnurlErrorResponse(reason=f"Address not found").dict() amount_received = amount # min = 1000 @@ -64,17 +65,26 @@ async def lnurl_callback(address_id, amount: int = Query(...)): domain = await get_domain(address.domain) - base_url = address.wallet_endpoint[:-1] if address.wallet_endpoint.endswith('/') else address.wallet_endpoint + base_url = ( + address.wallet_endpoint[:-1] + if address.wallet_endpoint.endswith("/") + else address.wallet_endpoint + ) async with httpx.AsyncClient() as client: try: call = await client.post( base_url + "/api/v1/payments", - headers={"X-Api-Key": address.wallet_key, "Content-Type": "application/json"}, + headers={ + "X-Api-Key": address.wallet_key, + "Content-Type": "application/json", + }, json={ "out": False, "amount": int(amount_received / 1000), - "description_hash": hashlib.sha256((await address.lnurlpay_metadata()).encode("utf-8")).hexdigest(), + "description_hash": hashlib.sha256( + (await address.lnurlpay_metadata()).encode("utf-8") + ).hexdigest(), "extra": {"tag": f"Payment to {address.username}@{domain.domain}"}, }, timeout=40, diff --git a/lnbits/extensions/lnaddress/migrations.py b/lnbits/extensions/lnaddress/migrations.py index 4c8b8be19..a9b1137b2 100644 --- a/lnbits/extensions/lnaddress/migrations.py +++ b/lnbits/extensions/lnaddress/migrations.py @@ -16,6 +16,7 @@ async def m001_initial(db): """ ) + async def m002_addresses(db): await db.execute( """ @@ -37,5 +38,6 @@ async def m002_addresses(db): """ ) + # async def m003_create_unique_indexes(db): # await db.execute("CREATE UNIQUE INDEX IF NOT EXISTS address_at_domain ON lnaddress.address (domain, username);") diff --git a/lnbits/extensions/lnaddress/models.py b/lnbits/extensions/lnaddress/models.py index e0ff9fa1d..67ab07bbd 100644 --- a/lnbits/extensions/lnaddress/models.py +++ b/lnbits/extensions/lnaddress/models.py @@ -7,13 +7,14 @@ from pydantic.main import BaseModel # type: ignore class CreateDomain(BaseModel): - wallet: str = Query(...) + wallet: str = Query(...) domain: str = Query(...) cf_token: str = Query(...) cf_zone_id: str = Query(...) webhook: str = Query(None) cost: int = Query(..., ge=0) + class Domains(BaseModel): id: str wallet: str @@ -24,6 +25,7 @@ class Domains(BaseModel): cost: int time: int + class CreateAddress(BaseModel): domain: str = Query(...) username: str = Query(...) @@ -33,6 +35,7 @@ class CreateAddress(BaseModel): sats: int = Query(..., ge=0) duration: int = Query(..., ge=1) + class Addresses(BaseModel): id: str wallet: str diff --git a/lnbits/extensions/lnaddress/tasks.py b/lnbits/extensions/lnaddress/tasks.py index 710b84bda..f962f4abb 100644 --- a/lnbits/extensions/lnaddress/tasks.py +++ b/lnbits/extensions/lnaddress/tasks.py @@ -52,7 +52,9 @@ async def on_invoice_paid(payment: Payment) -> None: elif "renew lnaddress" == payment.extra.get("tag"): await payment.set_pending(False) - await set_address_renewed(address_id=payment.extra["id"], duration=payment.extra["duration"]) + await set_address_renewed( + address_id=payment.extra["id"], duration=payment.extra["duration"] + ) await call_webhook_on_paid(payment.payment_hash) else: diff --git a/lnbits/extensions/lnaddress/views.py b/lnbits/extensions/lnaddress/views.py index 9f6542df1..ac24dbadf 100644 --- a/lnbits/extensions/lnaddress/views.py +++ b/lnbits/extensions/lnaddress/views.py @@ -18,7 +18,10 @@ templates = Jinja2Templates(directory="templates") @lnaddress_ext.get("/", response_class=HTMLResponse) async def index(request: Request, user: User = Depends(check_user_exists)): - return lnaddress_renderer().TemplateResponse("lnaddress/index.html", {"request": request, "user": user.dict()}) + return lnaddress_renderer().TemplateResponse( + "lnaddress/index.html", {"request": request, "user": user.dict()} + ) + @lnaddress_ext.get("/{domain_id}") async def display(domain_id, request: Request): @@ -33,11 +36,12 @@ async def display(domain_id, request: Request): wallet = await get_wallet(domain.wallet) return lnaddress_renderer().TemplateResponse( - "lnaddress/display.html",{ + "lnaddress/display.html", + { "request": request, - "domain_id":domain.id, + "domain_id": domain.id, "domain_domain": domain.domain, "domain_cost": domain.cost, - "domain_wallet_inkey": wallet.inkey - } + "domain_wallet_inkey": wallet.inkey, + }, ) diff --git a/lnbits/extensions/lnaddress/views_api.py b/lnbits/extensions/lnaddress/views_api.py index 38cd723ef..a32cf499c 100644 --- a/lnbits/extensions/lnaddress/views_api.py +++ b/lnbits/extensions/lnaddress/views_api.py @@ -43,7 +43,12 @@ async def api_domains( @lnaddress_ext.post("/api/v1/domains") @lnaddress_ext.put("/api/v1/domains/{domain_id}") -async def api_domain_create(request: Request,data: CreateDomain, domain_id=None, g: WalletTypeInfo = Depends(get_key_type)): +async def api_domain_create( + request: Request, + data: CreateDomain, + domain_id=None, + g: WalletTypeInfo = Depends(get_key_type), +): if domain_id: domain = await get_domain(domain_id) @@ -64,7 +69,7 @@ async def api_domain_create(request: Request,data: CreateDomain, domain_id=None, domain = await create_domain(data=data) root_url = urlparse(request.url.path).netloc - #root_url = request.url_root + # root_url = request.url_root cf_response = await cloudflare_create_record( domain=domain, @@ -75,32 +80,36 @@ async def api_domain_create(request: Request,data: CreateDomain, domain_id=None, await delete_domain(domain.id) raise HTTPException( status_code=HTTPStatus.BAD_REQUEST, - detail="Problem with cloudflare: " + cf_response["errors"][0]["message"], + detail="Problem with cloudflare: " + + cf_response["errors"][0]["message"], ) return domain.dict() + @lnaddress_ext.delete("/api/v1/domains/{domain_id}") async def api_domain_delete(domain_id, g: WalletTypeInfo = Depends(get_key_type)): domain = await get_domain(domain_id) if not domain: raise HTTPException( - status_code=HTTPStatus.NOT_FOUND, - detail="Domain does not exist.", - ) + status_code=HTTPStatus.NOT_FOUND, + detail="Domain does not exist.", + ) if domain.wallet != g.wallet.id: raise HTTPException( - status_code=HTTPStatus.FORBIDDEN, - detail="Not your domain", - ) + status_code=HTTPStatus.FORBIDDEN, + detail="Not your domain", + ) await delete_domain(domain_id) raise HTTPException(status_code=HTTPStatus.NO_CONTENT) + # ADDRESSES + @lnaddress_ext.get("/api/v1/addresses") async def api_addresses( g: WalletTypeInfo = Depends(get_key_type), @@ -113,6 +122,7 @@ async def api_addresses( return [address.dict() for address in await get_addresses(wallet_ids)] + @lnaddress_ext.get("/api/v1/address/{domain}/{username}/{wallet_key}") async def api_get_user_info(username, wallet_key, domain): address = await get_address_by_username(username, domain) @@ -125,39 +135,43 @@ async def api_get_user_info(username, wallet_key, domain): if address.wallet_key != wallet_key: raise HTTPException( - status_code=HTTPStatus.FORBIDDEN, - detail="Incorrect user/wallet information.", - ) + status_code=HTTPStatus.FORBIDDEN, + detail="Incorrect user/wallet information.", + ) return address.dict() + @lnaddress_ext.get("/api/v1/address/availabity/{domain_id}/{username}") async def api_check_available_username(domain_id, username): used_username = await check_address_available(username, domain_id) return used_username + @lnaddress_ext.post("/api/v1/address/{domain_id}") @lnaddress_ext.put("/api/v1/address/{domain_id}/{user}/{wallet_key}") -async def api_lnaddress_make_address(domain_id, data: CreateAddress, user=None, wallet_key=None): +async def api_lnaddress_make_address( + domain_id, data: CreateAddress, user=None, wallet_key=None +): domain = await get_domain(domain_id) # If the request is coming for the non-existant domain if not domain: raise HTTPException( - status_code=HTTPStatus.FORBIDDEN, - detail="The domain does not exist.", - ) + status_code=HTTPStatus.FORBIDDEN, + detail="The domain does not exist.", + ) domain_cost = domain[6] sats = data.sats ## FAILSAFE FOR CREATING ADDRESSES BY API - if(domain_cost * data.duration != data.sats): + if domain_cost * data.duration != data.sats: raise HTTPException( - status_code=HTTPStatus.FORBIDDEN, - detail="The amount is not correct. Either 'duration', or 'sats' are wrong.", - ) + status_code=HTTPStatus.FORBIDDEN, + detail="The amount is not correct. Either 'duration', or 'sats' are wrong.", + ) if user: print("USER", user, domain.domain) @@ -183,7 +197,7 @@ async def api_lnaddress_make_address(domain_id, data: CreateAddress, user=None, extra={ "tag": "renew lnaddress", "id": address.id, - "duration": data.duration + "duration": data.duration, }, ) @@ -215,7 +229,7 @@ async def api_lnaddress_make_address(domain_id, data: CreateAddress, user=None, status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e), ) - + address = await create_address( payment_hash=payment_hash, wallet=domain.wallet, data=data ) @@ -228,6 +242,7 @@ async def api_lnaddress_make_address(domain_id, data: CreateAddress, user=None, return {"payment_hash": payment_hash, "payment_request": payment_request} + @lnaddress_ext.get("/api/v1/addresses/{payment_hash}") async def api_address_send_address(payment_hash): address = await get_address(payment_hash) @@ -236,27 +251,27 @@ async def api_address_send_address(payment_hash): status = await check_invoice_status(domain.wallet, payment_hash) is_paid = not status.pending except Exception as e: - return {"paid": False, 'error': str(e)} + return {"paid": False, "error": str(e)} if is_paid: return {"paid": True} return {"paid": False} + @lnaddress_ext.delete("/api/v1/addresses/{address_id}") async def api_address_delete(address_id, g: WalletTypeInfo = Depends(get_key_type)): address = await get_address(address_id) if not address: raise HTTPException( - status_code=HTTPStatus.NOT_FOUND, - detail="Address does not exist.", - ) + status_code=HTTPStatus.NOT_FOUND, + detail="Address does not exist.", + ) if address.wallet != g.wallet.id: raise HTTPException( - status_code=HTTPStatus.FORBIDDEN, - detail="Not your address.", - ) + status_code=HTTPStatus.FORBIDDEN, + detail="Not your address.", + ) await delete_address(address_id) raise HTTPException(status_code=HTTPStatus.NO_CONTENT) - \ No newline at end of file diff --git a/lnbits/extensions/lndhub/views_api.py b/lnbits/extensions/lndhub/views_api.py index d28bbd9e9..fdda13562 100644 --- a/lnbits/extensions/lndhub/views_api.py +++ b/lnbits/extensions/lndhub/views_api.py @@ -108,7 +108,9 @@ async def lndhub_payinvoice( @lndhub_ext.get("/ext/balance") -async def lndhub_balance(wallet: WalletTypeInfo = Depends(check_wallet),): +async def lndhub_balance( + wallet: WalletTypeInfo = Depends(check_wallet), +): return {"BTC": {"AvailableBalance": wallet.wallet.balance}} diff --git a/lnbits/extensions/lnurlpos/crud.py b/lnbits/extensions/lnurlpos/crud.py index a2ca88c59..55f8bec57 100644 --- a/lnbits/extensions/lnurlpos/crud.py +++ b/lnbits/extensions/lnurlpos/crud.py @@ -8,7 +8,9 @@ from .models import lnurlposs, lnurlpospayment, createLnurlpos ###############lnurlposS########################## -async def create_lnurlpos(data: createLnurlpos,) -> lnurlposs: +async def create_lnurlpos( + data: createLnurlpos, +) -> lnurlposs: print(data) lnurlpos_id = urlsafe_short_hash() lnurlpos_key = urlsafe_short_hash() @@ -60,6 +62,7 @@ async def get_lnurlposs(wallet_ids: Union[str, List[str]]) -> List[lnurlposs]: return [lnurlposs(**row) if row else None for row in rows] + async def delete_lnurlpos(lnurlpos_id: str) -> None: await db.execute("DELETE FROM lnurlpos.lnurlposs WHERE id = ?", (lnurlpos_id,)) diff --git a/lnbits/extensions/withdraw/lnurl.py b/lnbits/extensions/withdraw/lnurl.py index df500dc14..f05386f0c 100644 --- a/lnbits/extensions/withdraw/lnurl.py +++ b/lnbits/extensions/withdraw/lnurl.py @@ -51,19 +51,12 @@ async def api_lnurl_response(request: Request, unique_hash): # CALLBACK - -#https://5650-2001-8a0-fa12-2900-4c13-748a-fbb9-a47f.ngrok.io/withdraw/api/v1/lnurl/cb/eJHybS8hqcBWajZM63H3FP?k1=MUaYBGrUPuAs8SLpfizmCk&pr=lnbc100n1pse2tsypp5ju0yn3w9j0n8rr3squg0knddawu2ude2cgrm6zje5f34e9jzpmlsdq8w3jhxaqxqyjw5qcqpjsp5tyhu78pamqg5zfy96kup329zt40ramc8gs2ev6jxgp66zca2348qrzjqwac3nxyg3f5mfa4ke9577c4u8kvkx8pqtdsusqdfww0aymk823x6znwa5qqzyqqqyqqqqlgqqqqppgq9q9qy9qsq66zp6pctnlmk59xwtqjga5lvqrkyccmafmn43enhhc6ugew80sanxymepshpv44m9yyhfgh8r2upvxhgk00d36rpqzfy3fxemeu4jhqp96l8hx - - @withdraw_ext.get( "/api/v1/lnurl/cb/{unique_hash}", name="withdraw.api_lnurl_callback", ) async def api_lnurl_callback( - unique_hash, - request: Request, - k1: str = Query(...), - pr: str = Query(...) + unique_hash, request: Request, k1: str = Query(...), pr: str = Query(...) ): link = await get_withdraw_link_by_hash(unique_hash) now = int(datetime.now().timestamp()) @@ -101,8 +94,8 @@ async def api_lnurl_callback( "usescsv": usescsv, } await update_withdraw_link(link.id, **changes) - - payment_request=pr + + payment_request = pr await pay_invoice( wallet_id=link.wallet, diff --git a/lnbits/wallets/lnbits.py b/lnbits/wallets/lnbits.py index e24531790..64931818a 100644 --- a/lnbits/wallets/lnbits.py +++ b/lnbits/wallets/lnbits.py @@ -63,7 +63,9 @@ class LNbitsWallet(Wallet): async with httpx.AsyncClient() as client: r = await client.post( - url=f"{self.endpoint}/api/v1/payments", headers=self.key, json=data, + url=f"{self.endpoint}/api/v1/payments", + headers=self.key, + json=data, ) ok, checking_id, payment_request, error_message = ( not r.is_error, @@ -85,7 +87,7 @@ class LNbitsWallet(Wallet): r = await client.post( url=f"{self.endpoint}/api/v1/payments", headers=self.key, - json={"out": True, "bolt11": bolt11}, + json={"out": True, "bolt11": bolt11}, timeout=100, ) ok, checking_id, fee_msat, error_message = not r.is_error, None, 0, None