[<paywall_object>, ...]
Curl example
curl -X GET {{ request.url_root }}paywall/api/v1/paywalls -H
- "X-Api-Key: {{ g.user.wallets[0].inkey }}"
+ >curl -X GET {{ request.url_root }}api/v1/paywalls -H "X-Api-Key: {{
+ g.user.wallets[0].inkey }}"
@@ -48,11 +48,11 @@
>
Curl example
curl -X POST {{ request.url_root }}paywall/api/v1/paywalls -d
- '{"url": <string>, "memo": <string>, "description":
- <string>, "amount": <integer>, "remembers":
- <boolean>}' -H "Content-type: application/json" -H "X-Api-Key:
- {{ g.user.wallets[0].adminkey }}"
+ >curl -X POST {{ request.url_root }}api/v1/paywalls -d '{"url":
+ <string>, "memo": <string>, "description": <string>,
+ "amount": <integer>, "remembers": <boolean>}' -H
+ "Content-type: application/json" -H "X-Api-Key: {{
+ g.user.wallets[0].adminkey }}"
@@ -81,7 +81,7 @@
Curl example
curl -X POST {{ request.url_root
- }}paywall/api/v1/paywalls/<paywall_id>/invoice -d '{"amount":
+ }}api/v1/paywalls/<paywall_id>/invoice -d '{"amount":
<integer>}' -H "Content-type: application/json"
@@ -112,7 +112,7 @@
Curl example
curl -X POST {{ request.url_root
- }}paywall/api/v1/paywalls/<paywall_id>/check_invoice -d
+ }}api/v1/paywalls/<paywall_id>/check_invoice -d
'{"payment_hash": <string>}' -H "Content-type: application/json"
@@ -138,7 +138,7 @@
Curl example
curl -X DELETE {{ request.url_root
- }}paywall/api/v1/paywalls/<paywall_id> -H "X-Api-Key: {{
+ }}api/v1/paywalls/<paywall_id> -H "X-Api-Key: {{
g.user.wallets[0].adminkey }}"
diff --git a/lnbits/extensions/paywall/views.py b/lnbits/extensions/paywall/views.py
index 7373d5c4..0dcbad2f 100644
--- a/lnbits/extensions/paywall/views.py
+++ b/lnbits/extensions/paywall/views.py
@@ -16,5 +16,7 @@ async def index():
@paywall_ext.route("/Subdomains Extension
+ +So the goal of the extension is to allow the owner of a domain to sell their subdomain to the anyone who is willing to pay some money for it. + +## Requirements + +- Free cloudflare account +- Cloudflare as a dns server provider +- Cloudflare TOKEN and Cloudflare zone-id where the domain is parked + +## Usage + +1. Register at cloudflare and setup your domain with them. (Just follow instructions they provide...) +2. Change DNS server at your domain registrar to point to cloudflare's +3. Get Cloudflare zoneID for your domain +
+4. get Cloudflare API TOKEN
+ 
+ 
+5. Open the lnbits subdomains extension and register your domain with lnbits
+6. Click on the button in the table to open the public form that was generated for your domain
+
+- Extension also supports webhooks so you can get notified when someone buys a new domain
+ 
+
+## API Endpoints
+
+- **Domains**
+ - GET /api/v1/domains
+ - POST /api/v1/domains
+ - PUT /api/v1/domains/+ lnSubdomains: Get paid sats to sell your subdomains +
+
+ Charge people for using your subdomain name...
+ Are you the owner of cool-domain.com and want to sell
+ cool-subdomain.cool-domain.com
+
+
+ Created by, Kris
+
+
+
+
+
+
+
+
+
+{% endblock %} {% block scripts %}
+
+{% endblock %}
diff --git a/lnbits/extensions/subdomains/templates/subdomains/index.html b/lnbits/extensions/subdomains/templates/subdomains/index.html
new file mode 100644
index 00000000..d62f8f38
--- /dev/null
+++ b/lnbits/extensions/subdomains/templates/subdomains/index.html
@@ -0,0 +1,545 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ domain_domain }}
++
{{ domain_desc }}
++
+ Cost per day: {{ domain_cost }} sats
+ {% raw %} Total cost: {{amountSats}} sats {% endraw %}
+
+ Submit
+ Cancel
+
+
+
+
+
+
+
+
+ Copy invoice
+ Close
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+
+{% endblock %}
diff --git a/lnbits/extensions/subdomains/util.py b/lnbits/extensions/subdomains/util.py
new file mode 100644
index 00000000..c7d66307
--- /dev/null
+++ b/lnbits/extensions/subdomains/util.py
@@ -0,0 +1,36 @@
+from lnbits.extensions.subdomains.models import Subdomains
+
+# Python3 program to validate
+# domain name
+# using regular expression
+import re
+import socket
+
+# Function to validate domain name.
+def isValidDomain(str):
+ # Regex to check valid
+ # domain name.
+ regex = "^((?!-)[A-Za-z0-9-]{1,63}(?")
+async def display(domain_id):
+ domain = await get_domain(domain_id)
+ if not domain:
+ abort(HTTPStatus.NOT_FOUND, "Domain does not exist.")
+ allowed_records = (
+ domain.allowed_record_types.replace('"', "").replace(" ", "").split(",")
+ )
+ print(allowed_records)
+ return await render_template(
+ "subdomains/display.html",
+ domain_id=domain.id,
+ domain_domain=domain.domain,
+ domain_desc=domain.description,
+ domain_cost=domain.cost,
+ domain_allowed_record_types=allowed_records,
+ )
diff --git a/lnbits/extensions/subdomains/views_api.py b/lnbits/extensions/subdomains/views_api.py
new file mode 100644
index 00000000..c11cd4be
--- /dev/null
+++ b/lnbits/extensions/subdomains/views_api.py
@@ -0,0 +1,222 @@
+from quart import g, jsonify, request
+from http import HTTPStatus
+
+from lnbits.core.crud import get_user
+from lnbits.core.services import create_invoice, check_invoice_status
+from lnbits.decorators import api_check_wallet_key, api_validate_post_request
+
+from . import subdomains_ext
+from .crud import (
+ create_subdomain,
+ get_subdomain,
+ get_subdomains,
+ delete_subdomain,
+ create_domain,
+ update_domain,
+ get_domain,
+ get_domains,
+ delete_domain,
+ get_subdomainBySubdomain,
+)
+from .cloudflare import cloudflare_create_subdomain, cloudflare_deletesubdomain
+
+
+# domainS
+
+
+@subdomains_ext.route("/api/v1/domains", methods=["GET"])
+@api_check_wallet_key("invoice")
+async def api_domains():
+ wallet_ids = [g.wallet.id]
+
+ if "all_wallets" in request.args:
+ wallet_ids = (await get_user(g.wallet.user)).wallet_ids
+
+ return (
+ jsonify([domain._asdict() for domain in await get_domains(wallet_ids)]),
+ HTTPStatus.OK,
+ )
+
+
+@subdomains_ext.route("/api/v1/domains", methods=["POST"])
+@subdomains_ext.route("/api/v1/domains/
+
+
+ New Domain
+
+
+
+
+
+
+ {% raw %}
+
+
+
+ {{ col.label }}
+
+
+
+
+
+
+
+
+ {{ col.value }}
+
+
+
+
+
+
+
+
+
+ {% endraw %}
+
+
+
+
+
+
+
+ {% raw %}
+
+
+
+ {{ col.label }}
+
+
+
+
+
+
+
+
+
+ {{ col.value }}
+
+
+
+
+
+
+ {% endraw %}
+
+
+
+
+
+
+
+
+
+ Domains
+
+ Export to CSV
+
+
+
+
+
+ Subdomains
+
+ Export to CSV
+
+
+
+
+
+
+ {% include "subdomains/_api_docs.html" %}
+
+
+
+ LNbits Subdomain extension
+
+ Update Form
+ Create Domain
+ Cancel
+
+ [<tpos_object>, ...]
Curl example
curl -X GET {{ request.url_root }}tpos/api/v1/tposs -H "X-Api-Key:
+ >curl -X GET {{ request.url_root }}api/v1/tposs -H "X-Api-Key:
<invoice_key>"
@@ -42,7 +42,7 @@
>
Curl example
curl -X POST {{ request.url_root }}tpos/api/v1/tposs -d '{"name":
+ >curl -X POST {{ request.url_root }}api/v1/tposs -d '{"name":
<string>, "currency": <string>}' -H "Content-type:
application/json" -H "X-Api-Key: <admin_key>"
@@ -69,8 +69,8 @@
Curl example
curl -X DELETE {{ request.url_root
- }}tpos/api/v1/tposs/<tpos_id> -H "X-Api-Key: <admin_key>"
+ >curl -X DELETE {{ request.url_root }}api/v1/tposs/<tpos_id> -H
+ "X-Api-Key: <admin_key>"
diff --git a/lnbits/extensions/tpos/views_api.py b/lnbits/extensions/tpos/views_api.py
index 22980fce..1f0802c7 100644
--- a/lnbits/extensions/tpos/views_api.py
+++ b/lnbits/extensions/tpos/views_api.py
@@ -16,7 +16,10 @@ async def api_tposs():
if "all_wallets" in request.args:
wallet_ids = (await get_user(g.wallet.user)).wallet_ids
- return jsonify([tpos._asdict() for tpos in await get_tposs(wallet_ids)]), HTTPStatus.OK
+ return (
+ jsonify([tpos._asdict() for tpos in await get_tposs(wallet_ids)]),
+ HTTPStatus.OK,
+ )
@tpos_ext.route("/api/v1/tposs", methods=["POST"])
@@ -49,7 +52,9 @@ async def api_tpos_delete(tpos_id):
@tpos_ext.route("/api/v1/tposs/JSON list of users
Curl example
curl -X GET {{ request.url_root }}usermanager/api/v1/users -H
- "X-Api-Key: {{ g.user.wallets[0].inkey }}"
+ >curl -X GET {{ request.url_root }}api/v1/users -H "X-Api-Key: {{
+ g.user.wallets[0].inkey }}"
@@ -64,9 +64,8 @@
JSON wallet data
Curl example
curl -X GET {{ request.url_root
- }}usermanager/api/v1/wallets/<user_id> -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
+ >curl -X GET {{ request.url_root }}api/v1/wallets/<user_id> -H
+ "X-Api-Key: {{ g.user.wallets[0].inkey }}"
@@ -87,9 +86,8 @@
JSON a wallets transactions
Curl example
curl -X GET {{ request.url_root
- }}usermanager/api/v1/wallets<wallet_id> -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
+ >curl -X GET {{ request.url_root }}api/v1/wallets<wallet_id> -H
+ "X-Api-Key: {{ g.user.wallets[0].inkey }}"
@@ -128,10 +126,10 @@
>
Curl example
curl -X POST {{ request.url_root }}usermanager/api/v1/users -d
- '{"admin_id": "{{ g.user.id }}", "wallet_name": <string>,
- "user_name": <string>}' -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}" -H "Content-type: application/json"
+ >curl -X POST {{ request.url_root }}api/v1/users -d '{"admin_id": "{{
+ g.user.id }}", "wallet_name": <string>, "user_name":
+ <string>}' -H "X-Api-Key: {{ g.user.wallets[0].inkey }}" -H
+ "Content-type: application/json"
@@ -165,10 +163,10 @@
>
Curl example
curl -X POST {{ request.url_root }}usermanager/api/v1/wallets -d
- '{"user_id": <string>, "wallet_name": <string>,
- "admin_id": "{{ g.user.id }}"}' -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}" -H "Content-type: application/json"
+ >curl -X POST {{ request.url_root }}api/v1/wallets -d '{"user_id":
+ <string>, "wallet_name": <string>, "admin_id": "{{
+ g.user.id }}"}' -H "X-Api-Key: {{ g.user.wallets[0].inkey }}" -H
+ "Content-type: application/json"
@@ -189,9 +187,8 @@
{"X-Api-Key": <string>}
Curl example
curl -X DELETE {{ request.url_root
- }}usermanager/api/v1/users/<user_id> -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
+ >curl -X DELETE {{ request.url_root }}api/v1/users/<user_id> -H
+ "X-Api-Key: {{ g.user.wallets[0].inkey }}"
@@ -207,9 +204,8 @@
{"X-Api-Key": <string>}
Curl example
curl -X DELETE {{ request.url_root
- }}usermanager/api/v1/wallets/<wallet_id> -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
+ >curl -X DELETE {{ request.url_root }}api/v1/wallets/<wallet_id>
+ -H "X-Api-Key: {{ g.user.wallets[0].inkey }}"
@@ -230,8 +226,8 @@
{"X-Api-Key": <string>}
Curl example
curl -X POST {{ request.url_root }}usermanager/api/v1/extensions -d
- '{"userid": <string>, "extension": <string>, "active":
+ >curl -X POST {{ request.url_root }}api/v1/extensions -d '{"userid":
+ <string>, "extension": <string>, "active":
<integer>}' -H "X-Api-Key: {{ g.user.wallets[0].inkey }}" -H
"Content-type: application/json"
diff --git a/lnbits/extensions/usermanager/views_api.py b/lnbits/extensions/usermanager/views_api.py
index 557aa8b9..bd64c070 100644
--- a/lnbits/extensions/usermanager/views_api.py
+++ b/lnbits/extensions/usermanager/views_api.py
@@ -26,7 +26,10 @@ from lnbits.core import update_user_extension
@api_check_wallet_key(key_type="invoice")
async def api_usermanager_users():
user_id = g.wallet.user
- return jsonify([user._asdict() for user in await get_usermanager_users(user_id)]), HTTPStatus.OK
+ return (
+ jsonify([user._asdict() for user in await get_usermanager_users(user_id)]),
+ HTTPStatus.OK,
+ )
@usermanager_ext.route("/api/v1/users", methods=["POST"])
@@ -39,7 +42,9 @@ async def api_usermanager_users():
}
)
async def api_usermanager_users_create():
- user = await create_usermanager_user(g.data["user_name"], g.data["wallet_name"], g.data["admin_id"])
+ user = await create_usermanager_user(
+ g.data["user_name"], g.data["wallet_name"], g.data["admin_id"]
+ )
return jsonify(user._asdict()), HTTPStatus.CREATED
@@ -69,7 +74,9 @@ async def api_usermanager_activate_extension():
user = await get_user(g.data["userid"])
if not user:
return jsonify({"message": "no such user"}), HTTPStatus.NOT_FOUND
- update_user_extension(user_id=g.data["userid"], extension=g.data["extension"], active=g.data["active"])
+ update_user_extension(
+ user_id=g.data["userid"], extension=g.data["extension"], active=g.data["active"]
+ )
return jsonify({"extension": "updated"}), HTTPStatus.CREATED
@@ -80,7 +87,12 @@ async def api_usermanager_activate_extension():
@api_check_wallet_key(key_type="invoice")
async def api_usermanager_wallets():
user_id = g.wallet.user
- return jsonify([wallet._asdict() for wallet in await get_usermanager_wallets(user_id)]), HTTPStatus.OK
+ return (
+ jsonify(
+ [wallet._asdict() for wallet in await get_usermanager_wallets(user_id)]
+ ),
+ HTTPStatus.OK,
+ )
@usermanager_ext.route("/api/v1/wallets", methods=["POST"])
@@ -93,7 +105,9 @@ async def api_usermanager_wallets():
}
)
async def api_usermanager_wallets_create():
- user = await create_usermanager_wallet(g.data["user_id"], g.data["wallet_name"], g.data["admin_id"])
+ user = await create_usermanager_wallet(
+ g.data["user_id"], g.data["wallet_name"], g.data["admin_id"]
+ )
return jsonify(user._asdict()), HTTPStatus.CREATED
diff --git a/lnbits/extensions/withdraw/__init__.py b/lnbits/extensions/withdraw/__init__.py
index 7afbf23c..69e45e4d 100644
--- a/lnbits/extensions/withdraw/__init__.py
+++ b/lnbits/extensions/withdraw/__init__.py
@@ -4,7 +4,9 @@ from lnbits.db import Database
db = Database("ext_withdraw")
-withdraw_ext: Blueprint = Blueprint("withdraw", __name__, static_folder="static", template_folder="templates")
+withdraw_ext: Blueprint = Blueprint(
+ "withdraw", __name__, static_folder="static", template_folder="templates"
+)
from .views_api import * # noqa
diff --git a/lnbits/extensions/withdraw/crud.py b/lnbits/extensions/withdraw/crud.py
index 78fd7f56..dcc72af6 100644
--- a/lnbits/extensions/withdraw/crud.py
+++ b/lnbits/extensions/withdraw/crud.py
@@ -3,7 +3,7 @@ from typing import List, Optional, Union
from lnbits.helpers import urlsafe_short_hash
from . import db
-from .models import WithdrawLink
+from .models import WithdrawLink, HashCheck
async def create_withdraw_link(
@@ -58,6 +58,9 @@ async def create_withdraw_link(
async def get_withdraw_link(link_id: str, num=0) -> Optional[WithdrawLink]:
row = await db.fetchone("SELECT * FROM withdraw_link WHERE id = ?", (link_id,))
+ if not row:
+ return None
+
link = []
for item in row:
link.append(item)
@@ -66,7 +69,12 @@ async def get_withdraw_link(link_id: str, num=0) -> Optional[WithdrawLink]:
async def get_withdraw_link_by_hash(unique_hash: str, num=0) -> Optional[WithdrawLink]:
- row = await db.fetchone("SELECT * FROM withdraw_link WHERE unique_hash = ?", (unique_hash,))
+ row = await db.fetchone(
+ "SELECT * FROM withdraw_link WHERE unique_hash = ?", (unique_hash,)
+ )
+ if not row:
+ return None
+
link = []
for item in row:
link.append(item)
@@ -79,14 +87,18 @@ async def get_withdraw_links(wallet_ids: Union[str, List[str]]) -> List[Withdraw
wallet_ids = [wallet_ids]
q = ",".join(["?"] * len(wallet_ids))
- rows = await db.fetchall(f"SELECT * FROM withdraw_link WHERE wallet IN ({q})", (*wallet_ids,))
+ rows = await db.fetchall(
+ f"SELECT * FROM withdraw_link WHERE wallet IN ({q})", (*wallet_ids,)
+ )
return [WithdrawLink.from_row(row) for row in rows]
async def update_withdraw_link(link_id: str, **kwargs) -> Optional[WithdrawLink]:
q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
- await db.execute(f"UPDATE withdraw_link SET {q} WHERE id = ?", (*kwargs.values(), link_id))
+ await db.execute(
+ f"UPDATE withdraw_link SET {q} WHERE id = ?", (*kwargs.values(), link_id)
+ )
row = await db.fetchone("SELECT * FROM withdraw_link WHERE id = ?", (link_id,))
return WithdrawLink.from_row(row) if row else None
@@ -98,3 +110,40 @@ async def delete_withdraw_link(link_id: str) -> None:
def chunks(lst, n):
for i in range(0, len(lst), n):
yield lst[i : i + n]
+
+
+async def create_hash_check(
+ the_hash: str,
+ lnurl_id: str,
+) -> HashCheck:
+ await db.execute(
+ """
+ INSERT INTO hash_check (
+ id,
+ lnurl_id
+ )
+ VALUES (?, ?)
+ """,
+ (
+ the_hash,
+ lnurl_id,
+ ),
+ )
+ hashCheck = await get_hash_check(the_hash, lnurl_id)
+ return hashCheck
+
+
+async def get_hash_check(the_hash: str, lnurl_id: str) -> Optional[HashCheck]:
+ rowid = await db.fetchone("SELECT * FROM hash_check WHERE id = ?", (the_hash,))
+ rowlnurl = await db.fetchone(
+ "SELECT * FROM hash_check WHERE lnurl_id = ?", (lnurl_id,)
+ )
+ if not rowlnurl:
+ await create_hash_check(the_hash, lnurl_id)
+ return {"lnurl": True, "hash": False}
+ else:
+ if not rowid:
+ await create_hash_check(the_hash, lnurl_id)
+ return {"lnurl": True, "hash": False}
+ else:
+ return {"lnurl": True, "hash": True}
diff --git a/lnbits/extensions/withdraw/lnurl.py b/lnbits/extensions/withdraw/lnurl.py
index 0a3cc629..e699e5b4 100644
--- a/lnbits/extensions/withdraw/lnurl.py
+++ b/lnbits/extensions/withdraw/lnurl.py
@@ -17,10 +17,16 @@ async def api_lnurl_response(unique_hash):
link = await get_withdraw_link_by_hash(unique_hash)
if not link:
- return jsonify({"status": "ERROR", "reason": "LNURL-withdraw not found."}), HTTPStatus.OK
+ return (
+ jsonify({"status": "ERROR", "reason": "LNURL-withdraw not found."}),
+ HTTPStatus.OK,
+ )
if link.is_spent:
- return jsonify({"status": "ERROR", "reason": "Withdraw is spent."}), HTTPStatus.OK
+ return (
+ jsonify({"status": "ERROR", "reason": "Withdraw is spent."}),
+ HTTPStatus.OK,
+ )
return jsonify(link.lnurl_response.dict()), HTTPStatus.OK
@@ -33,10 +39,16 @@ async def api_lnurl_multi_response(unique_hash, id_unique_hash):
link = await get_withdraw_link_by_hash(unique_hash)
if not link:
- return jsonify({"status": "ERROR", "reason": "LNURL-withdraw not found."}), HTTPStatus.OK
+ return (
+ jsonify({"status": "ERROR", "reason": "LNURL-withdraw not found."}),
+ HTTPStatus.OK,
+ )
if link.is_spent:
- return jsonify({"status": "ERROR", "reason": "Withdraw is spent."}), HTTPStatus.OK
+ return (
+ jsonify({"status": "ERROR", "reason": "Withdraw is spent."}),
+ HTTPStatus.OK,
+ )
useslist = link.usescsv.split(",")
found = False
@@ -45,7 +57,10 @@ async def api_lnurl_multi_response(unique_hash, id_unique_hash):
if id_unique_hash == shortuuid.uuid(name=tohash):
found = True
if not found:
- return jsonify({"status": "ERROR", "reason": "LNURL-withdraw not found."}), HTTPStatus.OK
+ return (
+ jsonify({"status": "ERROR", "reason": "LNURL-withdraw not found."}),
+ HTTPStatus.OK,
+ )
return jsonify(link.lnurl_response.dict()), HTTPStatus.OK
@@ -61,16 +76,27 @@ async def api_lnurl_callback(unique_hash):
now = int(datetime.now().timestamp())
if not link:
- return jsonify({"status": "ERROR", "reason": "LNURL-withdraw not found."}), HTTPStatus.OK
+ return (
+ jsonify({"status": "ERROR", "reason": "LNURL-withdraw not found."}),
+ HTTPStatus.OK,
+ )
if link.is_spent:
- return jsonify({"status": "ERROR", "reason": "Withdraw is spent."}), HTTPStatus.OK
+ return (
+ jsonify({"status": "ERROR", "reason": "Withdraw is spent."}),
+ HTTPStatus.OK,
+ )
if link.k1 != k1:
return jsonify({"status": "ERROR", "reason": "Bad request."}), HTTPStatus.OK
if now < link.open_time:
- return jsonify({"status": "ERROR", "reason": f"Wait {link.open_time - now} seconds."}), HTTPStatus.OK
+ return (
+ jsonify(
+ {"status": "ERROR", "reason": f"Wait {link.open_time - now} seconds."}
+ ),
+ HTTPStatus.OK,
+ )
try:
await pay_invoice(
@@ -85,12 +111,18 @@ async def api_lnurl_callback(unique_hash):
usecv = link.usescsv.split(",")
usescsv += "," + str(usecv[x])
usescsv = usescsv[1:]
- changes = {"open_time": link.wait_time + now, "used": link.used + 1, "usescsv": usescsv}
+ changes = {
+ "open_time": link.wait_time + now,
+ "used": link.used + 1,
+ "usescsv": usescsv,
+ }
await update_withdraw_link(link.id, **changes)
except ValueError as e:
- return jsonify({"status": "ERROR", "reason": str(e)}), HTTPStatus.OK
+ return jsonify({"status": "ERROR", "reason": str(e)})
except PermissionError:
- return jsonify({"status": "ERROR", "reason": "Withdraw link is empty."}), HTTPStatus.OK
+ return jsonify({"status": "ERROR", "reason": "Withdraw link is empty."})
+ except Exception as e:
+ return jsonify({"status": "ERROR", "reason": str(e)})
return jsonify({"status": "OK"}), HTTPStatus.OK
diff --git a/lnbits/extensions/withdraw/migrations.py b/lnbits/extensions/withdraw/migrations.py
index 4af24f8f..197a629c 100644
--- a/lnbits/extensions/withdraw/migrations.py
+++ b/lnbits/extensions/withdraw/migrations.py
@@ -47,7 +47,9 @@ async def m002_change_withdraw_table(db):
"""
)
await db.execute("CREATE INDEX IF NOT EXISTS wallet_idx ON withdraw_link (wallet)")
- await db.execute("CREATE UNIQUE INDEX IF NOT EXISTS unique_hash_idx ON withdraw_link (unique_hash)")
+ await db.execute(
+ "CREATE UNIQUE INDEX IF NOT EXISTS unique_hash_idx ON withdraw_link (unique_hash)"
+ )
for row in [list(row) for row in await db.fetchall("SELECT * FROM withdraw_links")]:
usescsv = ""
@@ -94,3 +96,17 @@ async def m002_change_withdraw_table(db):
),
)
await db.execute("DROP TABLE withdraw_links")
+
+
+async def m003_make_hash_check(db):
+ """
+ Creates a hash check table.
+ """
+ await db.execute(
+ """
+ CREATE TABLE IF NOT EXISTS hash_check (
+ id TEXT PRIMARY KEY,
+ lnurl_id TEXT
+ );
+ """
+ )
diff --git a/lnbits/extensions/withdraw/models.py b/lnbits/extensions/withdraw/models.py
index 7e80a789..b7a98970 100644
--- a/lnbits/extensions/withdraw/models.py
+++ b/lnbits/extensions/withdraw/models.py
@@ -45,17 +45,32 @@ class WithdrawLink(NamedTuple):
_external=True,
)
else:
- url = url_for("withdraw.api_lnurl_response", unique_hash=self.unique_hash, _external=True)
+ url = url_for(
+ "withdraw.api_lnurl_response",
+ unique_hash=self.unique_hash,
+ _external=True,
+ )
return lnurl_encode(url)
@property
def lnurl_response(self) -> LnurlWithdrawResponse:
- url = url_for("withdraw.api_lnurl_callback", unique_hash=self.unique_hash, _external=True)
+ url = url_for(
+ "withdraw.api_lnurl_callback", unique_hash=self.unique_hash, _external=True
+ )
return LnurlWithdrawResponse(
callback=url,
k1=self.k1,
min_withdrawable=self.min_withdrawable * 1000,
max_withdrawable=self.max_withdrawable * 1000,
- default_description="LNbits voucher",
+ default_description=self.title,
)
+
+
+class HashCheck(NamedTuple):
+ id: str
+ lnurl_id: str
+
+ @classmethod
+ def from_row(cls, row: Row) -> "Hash":
+ return cls(**dict(row))
diff --git a/lnbits/extensions/withdraw/templates/withdraw/_api_docs.html b/lnbits/extensions/withdraw/templates/withdraw/_api_docs.html
index b87e3e3b..484464ba 100644
--- a/lnbits/extensions/withdraw/templates/withdraw/_api_docs.html
+++ b/lnbits/extensions/withdraw/templates/withdraw/_api_docs.html
@@ -22,8 +22,8 @@
[<withdraw_link_object>, ...]
Curl example
curl -X GET {{ request.url_root }}withdraw/api/v1/links -H
- "X-Api-Key: {{ g.user.wallets[0].inkey }}"
+ >curl -X GET {{ request.url_root }}api/v1/links -H "X-Api-Key: {{
+ g.user.wallets[0].inkey }}"
@@ -49,9 +49,8 @@
{"lnurl": <string>}
Curl example
curl -X GET {{ request.url_root
- }}withdraw/api/v1/links/<withdraw_id> -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
+ >curl -X GET {{ request.url_root }}api/v1/links/<withdraw_id> -H
+ "X-Api-Key: {{ g.user.wallets[0].inkey }}"
@@ -79,8 +78,8 @@
{"lnurl": <string>}
Curl example
curl -X POST {{ request.url_root }}withdraw/api/v1/links -d
- '{"title": <string>, "min_withdrawable": <integer>,
+ >curl -X POST {{ request.url_root }}api/v1/links -d '{"title":
+ <string>, "min_withdrawable": <integer>,
"max_withdrawable": <integer>, "uses": <integer>,
"wait_time": <integer>, "is_unique": <boolean>}' -H
"Content-type: application/json" -H "X-Api-Key: {{
@@ -115,9 +114,8 @@
{"lnurl": <string>}
Curl example
curl -X PUT {{ request.url_root
- }}withdraw/api/v1/links/<withdraw_id> -d '{"title":
- <string>, "min_withdrawable": <integer>,
+ >curl -X PUT {{ request.url_root }}api/v1/links/<withdraw_id> -d
+ '{"title": <string>, "min_withdrawable": <integer>,
"max_withdrawable": <integer>, "uses": <integer>,
"wait_time": <integer>, "is_unique": <boolean>}' -H
"Content-type: application/json" -H "X-Api-Key: {{
@@ -131,7 +129,6 @@
dense
expand-separator
label="Delete a withdraw link"
- class="q-pb-md"
>
@@ -145,9 +142,56 @@
Curl example
curl -X DELETE {{ request.url_root
- }}withdraw/api/v1/links/<withdraw_id> -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
+ >curl -X DELETE {{ request.url_root }}api/v1/links/<withdraw_id>
+ -H "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
+
+
+
+
+
+
+
+ GET
+ /withdraw/api/v1/links/<the_hash>/<lnurl_id>
+ Headers
+ {"X-Api-Key": <invoice_key>}
+ Body (application/json)
+
+ Returns 201 CREATED (application/json)
+
+ {"status": <bool>}
+ Curl example
+ curl -X GET {{ request.url_root
+ }}api/v1/links/<the_hash>/<lnurl_id> -H "X-Api-Key: {{
+ g.user.wallets[0].inkey }}"
+
+
+
+
+
+
+
+ GET
+ /withdraw/img/<lnurl_id>
+ Curl example
+ curl -X GET {{ request.url_root }}/withdraw/img/<lnurl_id>"
diff --git a/lnbits/extensions/withdraw/templates/withdraw/index.html b/lnbits/extensions/withdraw/templates/withdraw/index.html
index 9e142a49..7442ca96 100644
--- a/lnbits/extensions/withdraw/templates/withdraw/index.html
+++ b/lnbits/extensions/withdraw/templates/withdraw/index.html
@@ -58,7 +58,20 @@
type="a"
:href="props.row.withdraw_url"
target="_blank"
- >
+ >
+ shareable link
+ embeddable image view LNURL
{{ col.value }}
diff --git a/lnbits/extensions/withdraw/views.py b/lnbits/extensions/withdraw/views.py
index 574cb3ad..28f25756 100644
--- a/lnbits/extensions/withdraw/views.py
+++ b/lnbits/extensions/withdraw/views.py
@@ -1,6 +1,7 @@
from quart import g, abort, render_template
from http import HTTPStatus
-
+import pyqrcode
+from io import BytesIO
from lnbits.decorators import check_user_exists, validate_uuids
from . import withdraw_ext
@@ -16,19 +17,45 @@ async def index():
@withdraw_ext.route("/")
async def display(link_id):
- link = await get_withdraw_link(link_id, 0) or abort(HTTPStatus.NOT_FOUND, "Withdraw link does not exist.")
+ link = await get_withdraw_link(link_id, 0) or abort(
+ HTTPStatus.NOT_FOUND, "Withdraw link does not exist."
+ )
return await render_template("withdraw/display.html", link=link, unique=True)
+@withdraw_ext.route("/img/")
+async def img(link_id):
+ link = await get_withdraw_link(link_id, 0) or abort(
+ HTTPStatus.NOT_FOUND, "Withdraw link does not exist."
+ )
+ qr = pyqrcode.create(link.lnurl)
+ stream = BytesIO()
+ qr.svg(stream, scale=3)
+ return (
+ stream.getvalue(),
+ 200,
+ {
+ "Content-Type": "image/svg+xml",
+ "Cache-Control": "no-cache, no-store, must-revalidate",
+ "Pragma": "no-cache",
+ "Expires": "0",
+ },
+ )
+
+
@withdraw_ext.route("/print/")
async def print_qr(link_id):
- link = await get_withdraw_link(link_id) or abort(HTTPStatus.NOT_FOUND, "Withdraw link does not exist.")
+ link = await get_withdraw_link(link_id) or abort(
+ HTTPStatus.NOT_FOUND, "Withdraw link does not exist."
+ )
if link.uses == 0:
return await render_template("withdraw/print_qr.html", link=link, unique=False)
links = []
count = 0
for x in link.usescsv.split(","):
- linkk = await get_withdraw_link(link_id, count) or abort(HTTPStatus.NOT_FOUND, "Withdraw link does not exist.")
+ linkk = await get_withdraw_link(link_id, count) or abort(
+ HTTPStatus.NOT_FOUND, "Withdraw link does not exist."
+ )
links.append(str(linkk.lnurl))
count = count + 1
page_link = list(chunks(links, 2))
diff --git a/lnbits/extensions/withdraw/views_api.py b/lnbits/extensions/withdraw/views_api.py
index cb8b7f0a..4979b932 100644
--- a/lnbits/extensions/withdraw/views_api.py
+++ b/lnbits/extensions/withdraw/views_api.py
@@ -12,6 +12,8 @@ from .crud import (
get_withdraw_links,
update_withdraw_link,
delete_withdraw_link,
+ create_hash_check,
+ get_hash_check,
)
@@ -37,7 +39,11 @@ async def api_links():
)
except LnurlInvalidUrl:
return (
- jsonify({"message": "LNURLs need to be delivered over a publically accessible `https` domain or Tor."}),
+ jsonify(
+ {
+ "message": "LNURLs need to be delivered over a publically accessible `https` domain or Tor."
+ }
+ ),
HTTPStatus.UPGRADE_REQUIRED,
)
@@ -48,7 +54,10 @@ async def api_link_retrieve(link_id):
link = await get_withdraw_link(link_id, 0)
if not link:
- return jsonify({"message": "Withdraw link does not exist."}), HTTPStatus.NOT_FOUND
+ return (
+ jsonify({"message": "Withdraw link does not exist."}),
+ HTTPStatus.NOT_FOUND,
+ )
if link.wallet != g.wallet.id:
return jsonify({"message": "Not your withdraw link."}), HTTPStatus.FORBIDDEN
@@ -72,7 +81,11 @@ async def api_link_retrieve(link_id):
async def api_link_create_or_update(link_id=None):
if g.data["max_withdrawable"] < g.data["min_withdrawable"]:
return (
- jsonify({"message": "`max_withdrawable` needs to be at least `min_withdrawable`."}),
+ jsonify(
+ {
+ "message": "`max_withdrawable` needs to be at least `min_withdrawable`."
+ }
+ ),
HTTPStatus.BAD_REQUEST,
)
@@ -87,14 +100,22 @@ async def api_link_create_or_update(link_id=None):
if link_id:
link = await get_withdraw_link(link_id, 0)
if not link:
- return jsonify({"message": "Withdraw link does not exist."}), HTTPStatus.NOT_FOUND
+ return (
+ jsonify({"message": "Withdraw link does not exist."}),
+ HTTPStatus.NOT_FOUND,
+ )
if link.wallet != g.wallet.id:
return jsonify({"message": "Not your withdraw link."}), HTTPStatus.FORBIDDEN
link = await update_withdraw_link(link_id, **g.data, usescsv=usescsv, used=0)
else:
- link = await create_withdraw_link(wallet_id=g.wallet.id, **g.data, usescsv=usescsv)
+ link = await create_withdraw_link(
+ wallet_id=g.wallet.id, **g.data, usescsv=usescsv
+ )
- return jsonify({**link._asdict(), **{"lnurl": link.lnurl}}), HTTPStatus.OK if link_id else HTTPStatus.CREATED
+ return (
+ jsonify({**link._asdict(), **{"lnurl": link.lnurl}}),
+ HTTPStatus.OK if link_id else HTTPStatus.CREATED,
+ )
@withdraw_ext.route("/api/v1/links/", methods=["DELETE"])
@@ -103,7 +124,10 @@ async def api_link_delete(link_id):
link = await get_withdraw_link(link_id)
if not link:
- return jsonify({"message": "Withdraw link does not exist."}), HTTPStatus.NOT_FOUND
+ return (
+ jsonify({"message": "Withdraw link does not exist."}),
+ HTTPStatus.NOT_FOUND,
+ )
if link.wallet != g.wallet.id:
return jsonify({"message": "Not your withdraw link."}), HTTPStatus.FORBIDDEN
@@ -111,3 +135,10 @@ async def api_link_delete(link_id):
await delete_withdraw_link(link_id)
return "", HTTPStatus.NO_CONTENT
+
+
+@withdraw_ext.route("/api/v1/links//", methods=["GET"])
+@api_check_wallet_key("invoice")
+async def api_hash_retrieve(the_hash, lnurl_id):
+ hashCheck = await get_hash_check(the_hash, lnurl_id)
+ return jsonify(hashCheck), HTTPStatus.OK
diff --git a/lnbits/helpers.py b/lnbits/helpers.py
index ec7ec904..0370edbc 100644
--- a/lnbits/helpers.py
+++ b/lnbits/helpers.py
@@ -15,20 +15,27 @@ class Extension(NamedTuple):
short_description: Optional[str] = None
icon: Optional[str] = None
contributors: Optional[List[str]] = None
+ hidden: bool = False
class ExtensionManager:
def __init__(self):
self._disabled: List[str] = LNBITS_DISABLED_EXTENSIONS
- self._extension_folders: List[str] = [x[1] for x in os.walk(os.path.join(LNBITS_PATH, "extensions"))][0]
+ self._extension_folders: List[str] = [
+ x[1] for x in os.walk(os.path.join(LNBITS_PATH, "extensions"))
+ ][0]
@property
def extensions(self) -> List[Extension]:
output = []
- for extension in [ext for ext in self._extension_folders if ext not in self._disabled]:
+ for extension in [
+ ext for ext in self._extension_folders if ext not in self._disabled
+ ]:
try:
- with open(os.path.join(LNBITS_PATH, "extensions", extension, "config.json")) as json_file:
+ with open(
+ os.path.join(LNBITS_PATH, "extensions", extension, "config.json")
+ ) as json_file:
config = json.load(json_file)
is_valid = True
except Exception:
@@ -43,6 +50,7 @@ class ExtensionManager:
config.get("short_description"),
config.get("icon"),
config.get("contributors"),
+ config.get("hidden") or False,
)
)
@@ -50,7 +58,9 @@ class ExtensionManager:
def get_valid_extensions() -> List[Extension]:
- return [extension for extension in ExtensionManager().extensions if extension.is_valid]
+ return [
+ extension for extension in ExtensionManager().extensions if extension.is_valid
+ ]
def urlsafe_short_hash() -> str:
@@ -91,7 +101,9 @@ def get_css_vendored(prefer_minified: bool = False) -> List[str]:
def get_vendored(ext: str, prefer_minified: bool = False) -> List[str]:
paths: List[str] = []
- for path in glob.glob(os.path.join(LNBITS_PATH, "static/vendor/**"), recursive=True):
+ for path in glob.glob(
+ os.path.join(LNBITS_PATH, "static/vendor/**"), recursive=True
+ ):
if path.endswith(".min" + ext):
# path is minified
unminified = path.replace(".min" + ext, ext)
diff --git a/lnbits/settings.py b/lnbits/settings.py
index 1ce46ec2..b42d06ec 100644
--- a/lnbits/settings.py
+++ b/lnbits/settings.py
@@ -10,7 +10,9 @@ 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"))
+wallet_class = getattr(
+ wallets_module, env.str("LNBITS_BACKEND_WALLET_CLASS", default="VoidWallet")
+)
ENV = env.str("QUART_ENV", default="production")
DEBUG = env.bool("QUART_DEBUG", default=False) or ENV == "development"
@@ -18,9 +20,15 @@ HOST = env.str("HOST", default="127.0.0.1")
PORT = env.int("PORT", default=5000)
LNBITS_PATH = path.dirname(path.realpath(__file__))
-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_DISABLED_EXTENSIONS: List[str] = env.list("LNBITS_DISABLED_EXTENSIONS", default=[], subcast=str)
+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_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()
diff --git a/lnbits/static/js/base.js b/lnbits/static/js/base.js
index ed0583e5..122d676d 100644
--- a/lnbits/static/js/base.js
+++ b/lnbits/static/js/base.js
@@ -52,13 +52,8 @@ window.LNbits = {
getWallet: function (wallet) {
return this.request('get', '/api/v1/wallet', wallet.inkey)
},
- getPayments: function (wallet, checkPending) {
- var query_param = checkPending ? '?check_pending' : ''
- return this.request(
- 'get',
- ['/api/v1/payments', query_param].join(''),
- wallet.inkey
- )
+ getPayments: function (wallet) {
+ return this.request('get', '/api/v1/payments', wallet.inkey)
},
getPayment: function (wallet, paymentHash) {
return this.request(
@@ -93,7 +88,15 @@ window.LNbits = {
map: {
extension: function (data) {
var obj = _.object(
- ['code', 'isValid', 'name', 'shortDescription', 'icon'],
+ [
+ 'code',
+ 'isValid',
+ 'name',
+ 'shortDescription',
+ 'icon',
+ 'contributors',
+ 'hidden'
+ ],
data
)
obj.url = ['/', obj.code, '/'].join('')
@@ -309,6 +312,9 @@ window.windowMixin = {
.map(function (data) {
return window.LNbits.map.extension(data)
})
+ .filter(function (obj) {
+ return !obj.hidden
+ })
.map(function (obj) {
if (user) {
obj.isEnabled = user.extensions.indexOf(obj.code) !== -1
diff --git a/lnbits/tasks.py b/lnbits/tasks.py
index 3acb2a07..d8f26a75 100644
--- a/lnbits/tasks.py
+++ b/lnbits/tasks.py
@@ -1,10 +1,15 @@
+import time
import trio # type: ignore
from http import HTTPStatus
from typing import Optional, List, Callable
from quart_trio import QuartTrio
from lnbits.settings import WALLET
-from lnbits.core.crud import get_standalone_payment
+from lnbits.core.crud import (
+ get_payments,
+ get_standalone_payment,
+ delete_expired_invoices,
+)
main_app: Optional[QuartTrio] = None
@@ -54,16 +59,38 @@ async def webhook_handler():
internal_invoice_paid, internal_invoice_received = trio.open_memory_channel(0)
-async def internal_invoice_listener():
- async with trio.open_nursery() as nursery:
- async for checking_id in internal_invoice_received:
- nursery.start_soon(invoice_callback_dispatcher, checking_id)
+async def internal_invoice_listener(nursery):
+ async for checking_id in internal_invoice_received:
+ nursery.start_soon(invoice_callback_dispatcher, checking_id)
-async def invoice_listener():
- async with trio.open_nursery() as nursery:
- async for checking_id in WALLET.paid_invoices_stream():
- nursery.start_soon(invoice_callback_dispatcher, checking_id)
+async def invoice_listener(nursery):
+ async for checking_id in WALLET.paid_invoices_stream():
+ nursery.start_soon(invoice_callback_dispatcher, checking_id)
+
+
+async def check_pending_payments():
+ await delete_expired_invoices()
+
+ outgoing = True
+ incoming = True
+
+ while True:
+ for payment in await get_payments(
+ since=(int(time.time()) - 60 * 60 * 24 * 15), # 15 days ago
+ complete=False,
+ pending=True,
+ outgoing=outgoing,
+ incoming=incoming,
+ exclude_uncheckable=True,
+ ):
+ await payment.check_pending()
+
+ # after the first check we will only check outgoing, not incoming
+ # that will be handled by the global invoice listeners, hopefully
+ incoming = False
+
+ await trio.sleep(60 * 30) # every 30 minutes
async def invoice_callback_dispatcher(checking_id: str):
diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html
index d81cf2a9..59016e99 100644
--- a/lnbits/templates/base.html
+++ b/lnbits/templates/base.html
@@ -14,6 +14,8 @@
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
+
+
{% block head_scripts %}{% endblock %}
diff --git a/lnbits/utils/__init__.py b/lnbits/utils/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/lnbits/utils/exchange_rates.py b/lnbits/utils/exchange_rates.py
new file mode 100644
index 00000000..ef4d3306
--- /dev/null
+++ b/lnbits/utils/exchange_rates.py
@@ -0,0 +1,267 @@
+import trio # type: ignore
+import httpx
+from typing import Callable, NamedTuple
+
+currencies = {
+ "AED": "United Arab Emirates Dirham",
+ "AFN": "Afghan Afghani",
+ "ALL": "Albanian Lek",
+ "AMD": "Armenian Dram",
+ "ANG": "Netherlands Antillean Gulden",
+ "AOA": "Angolan Kwanza",
+ "ARS": "Argentine Peso",
+ "AUD": "Australian Dollar",
+ "AWG": "Aruban Florin",
+ "AZN": "Azerbaijani Manat",
+ "BAM": "Bosnia and Herzegovina Convertible Mark",
+ "BBD": "Barbadian Dollar",
+ "BDT": "Bangladeshi Taka",
+ "BGN": "Bulgarian Lev",
+ "BHD": "Bahraini Dinar",
+ "BIF": "Burundian Franc",
+ "BMD": "Bermudian Dollar",
+ "BND": "Brunei Dollar",
+ "BOB": "Bolivian Boliviano",
+ "BRL": "Brazilian Real",
+ "BSD": "Bahamian Dollar",
+ "BTN": "Bhutanese Ngultrum",
+ "BWP": "Botswana Pula",
+ "BYN": "Belarusian Ruble",
+ "BYR": "Belarusian Ruble",
+ "BZD": "Belize Dollar",
+ "CAD": "Canadian Dollar",
+ "CDF": "Congolese Franc",
+ "CHF": "Swiss Franc",
+ "CLF": "Unidad de Fomento",
+ "CLP": "Chilean Peso",
+ "CNH": "Chinese Renminbi Yuan Offshore",
+ "CNY": "Chinese Renminbi Yuan",
+ "COP": "Colombian Peso",
+ "CRC": "Costa Rican Colón",
+ "CUC": "Cuban Convertible Peso",
+ "CVE": "Cape Verdean Escudo",
+ "CZK": "Czech Koruna",
+ "DJF": "Djiboutian Franc",
+ "DKK": "Danish Krone",
+ "DOP": "Dominican Peso",
+ "DZD": "Algerian Dinar",
+ "EGP": "Egyptian Pound",
+ "ERN": "Eritrean Nakfa",
+ "ETB": "Ethiopian Birr",
+ "EUR": "Euro",
+ "FJD": "Fijian Dollar",
+ "FKP": "Falkland Pound",
+ "GBP": "British Pound",
+ "GEL": "Georgian Lari",
+ "GGP": "Guernsey Pound",
+ "GHS": "Ghanaian Cedi",
+ "GIP": "Gibraltar Pound",
+ "GMD": "Gambian Dalasi",
+ "GNF": "Guinean Franc",
+ "GTQ": "Guatemalan Quetzal",
+ "GYD": "Guyanese Dollar",
+ "HKD": "Hong Kong Dollar",
+ "HNL": "Honduran Lempira",
+ "HRK": "Croatian Kuna",
+ "HTG": "Haitian Gourde",
+ "HUF": "Hungarian Forint",
+ "IDR": "Indonesian Rupiah",
+ "ILS": "Israeli New Sheqel",
+ "IMP": "Isle of Man Pound",
+ "INR": "Indian Rupee",
+ "IQD": "Iraqi Dinar",
+ "ISK": "Icelandic Króna",
+ "JEP": "Jersey Pound",
+ "JMD": "Jamaican Dollar",
+ "JOD": "Jordanian Dinar",
+ "JPY": "Japanese Yen",
+ "KES": "Kenyan Shilling",
+ "KGS": "Kyrgyzstani Som",
+ "KHR": "Cambodian Riel",
+ "KMF": "Comorian Franc",
+ "KRW": "South Korean Won",
+ "KWD": "Kuwaiti Dinar",
+ "KYD": "Cayman Islands Dollar",
+ "KZT": "Kazakhstani Tenge",
+ "LAK": "Lao Kip",
+ "LBP": "Lebanese Pound",
+ "LKR": "Sri Lankan Rupee",
+ "LRD": "Liberian Dollar",
+ "LSL": "Lesotho Loti",
+ "LYD": "Libyan Dinar",
+ "MAD": "Moroccan Dirham",
+ "MDL": "Moldovan Leu",
+ "MGA": "Malagasy Ariary",
+ "MKD": "Macedonian Denar",
+ "MMK": "Myanmar Kyat",
+ "MNT": "Mongolian Tögrög",
+ "MOP": "Macanese Pataca",
+ "MRO": "Mauritanian Ouguiya",
+ "MUR": "Mauritian Rupee",
+ "MVR": "Maldivian Rufiyaa",
+ "MWK": "Malawian Kwacha",
+ "MXN": "Mexican Peso",
+ "MYR": "Malaysian Ringgit",
+ "MZN": "Mozambican Metical",
+ "NAD": "Namibian Dollar",
+ "NGN": "Nigerian Naira",
+ "NIO": "Nicaraguan Córdoba",
+ "NOK": "Norwegian Krone",
+ "NPR": "Nepalese Rupee",
+ "NZD": "New Zealand Dollar",
+ "OMR": "Omani Rial",
+ "PAB": "Panamanian Balboa",
+ "PEN": "Peruvian Sol",
+ "PGK": "Papua New Guinean Kina",
+ "PHP": "Philippine Peso",
+ "PKR": "Pakistani Rupee",
+ "PLN": "Polish Złoty",
+ "PYG": "Paraguayan Guaraní",
+ "QAR": "Qatari Riyal",
+ "RON": "Romanian Leu",
+ "RSD": "Serbian Dinar",
+ "RUB": "Russian Ruble",
+ "RWF": "Rwandan Franc",
+ "SAR": "Saudi Riyal",
+ "SBD": "Solomon Islands Dollar",
+ "SCR": "Seychellois Rupee",
+ "SEK": "Swedish Krona",
+ "SGD": "Singapore Dollar",
+ "SHP": "Saint Helenian Pound",
+ "SLL": "Sierra Leonean Leone",
+ "SOS": "Somali Shilling",
+ "SRD": "Surinamese Dollar",
+ "SSP": "South Sudanese Pound",
+ "STD": "São Tomé and Príncipe Dobra",
+ "SVC": "Salvadoran Colón",
+ "SZL": "Swazi Lilangeni",
+ "THB": "Thai Baht",
+ "TJS": "Tajikistani Somoni",
+ "TMT": "Turkmenistani Manat",
+ "TND": "Tunisian Dinar",
+ "TOP": "Tongan Paʻanga",
+ "TRY": "Turkish Lira",
+ "TTD": "Trinidad and Tobago Dollar",
+ "TWD": "New Taiwan Dollar",
+ "TZS": "Tanzanian Shilling",
+ "UAH": "Ukrainian Hryvnia",
+ "UGX": "Ugandan Shilling",
+ "USD": "US Dollar",
+ "UYU": "Uruguayan Peso",
+ "UZS": "Uzbekistan Som",
+ "VEF": "Venezuelan Bolívar",
+ "VES": "Venezuelan Bolívar Soberano",
+ "VND": "Vietnamese Đồng",
+ "VUV": "Vanuatu Vatu",
+ "WST": "Samoan Tala",
+ "XAF": "Central African Cfa Franc",
+ "XAG": "Silver (Troy Ounce)",
+ "XAU": "Gold (Troy Ounce)",
+ "XCD": "East Caribbean Dollar",
+ "XDR": "Special Drawing Rights",
+ "XOF": "West African Cfa Franc",
+ "XPD": "Palladium",
+ "XPF": "Cfp Franc",
+ "XPT": "Platinum",
+ "YER": "Yemeni Rial",
+ "ZAR": "South African Rand",
+ "ZMW": "Zambian Kwacha",
+ "ZWL": "Zimbabwean Dollar",
+}
+
+
+class Provider(NamedTuple):
+ name: str
+ domain: str
+ api_url: str
+ getter: Callable
+
+
+exchange_rate_providers = {
+ "bitfinex": Provider(
+ "Bitfinex",
+ "bitfinex.com",
+ "https://api.bitfinex.com/v1/pubticker/{from}{to}",
+ lambda data, replacements: data["last_price"],
+ ),
+ "bitstamp": Provider(
+ "Bitstamp",
+ "bitstamp.net",
+ "https://www.bitstamp.net/api/v2/ticker/{from}{to}/",
+ lambda data, replacements: data["last"],
+ ),
+ "coinbase": Provider(
+ "Coinbase",
+ "coinbase.com",
+ "https://api.coinbase.com/v2/exchange-rates?currency={FROM}",
+ lambda data, replacements: data["data"]["rates"][replacements["TO"]],
+ ),
+ "coinmate": Provider(
+ "CoinMate",
+ "coinmate.io",
+ "https://coinmate.io/api/ticker?currencyPair={FROM}_{TO}",
+ lambda data, replacements: data["data"]["last"],
+ ),
+ "kraken": Provider(
+ "Kraken",
+ "kraken.com",
+ "https://api.kraken.com/0/public/Ticker?pair=XBT{TO}",
+ lambda data, replacements: data["result"]["XXBTZ" + replacements["TO"]]["c"][0],
+ ),
+}
+
+
+async def btc_price(currency: str) -> float:
+ replacements = {
+ "FROM": "BTC",
+ "from": "btc",
+ "TO": currency.upper(),
+ "to": currency.lower(),
+ }
+ rates = []
+ send_channel, receive_channel = trio.open_memory_channel(0)
+
+ async def controller(nursery):
+ failures = 0
+ while True:
+ rate = await receive_channel.receive()
+ if rate:
+ rates.append(rate)
+ else:
+ failures += 1
+ if len(rates) >= 2 or len(rates) == 1 and failures >= 2:
+ nursery.cancel_scope.cancel()
+ break
+ if failures == len(exchange_rate_providers):
+ nursery.cancel_scope.cancel()
+ break
+
+ async def fetch_price(key: str, provider: Provider):
+ try:
+ url = provider.api_url.format(**replacements)
+ async with httpx.AsyncClient() as client:
+ r = await client.get(url, timeout=0.5)
+ r.raise_for_status()
+ data = r.json()
+ rate = float(provider.getter(data, replacements))
+ await send_channel.send(rate)
+ except Exception:
+ await send_channel.send(None)
+
+ async with trio.open_nursery() as nursery:
+ nursery.start_soon(controller, nursery)
+ for key, provider in exchange_rate_providers.items():
+ nursery.start_soon(fetch_price, key, provider)
+
+ if not rates:
+ return 9999999999
+
+ return sum([rate for rate in rates]) / len(rates)
+
+
+async def get_fiat_rate_satoshis(currency: str) -> float:
+ return int(100_000_000 / (await btc_price(currency)))
+
+
+async def fiat_amount_as_satoshis(amount: float, currency: str) -> int:
+ return int(amount * (await get_fiat_rate_satoshis(currency)))
diff --git a/lnbits/wallets/base.py b/lnbits/wallets/base.py
index d2486c73..973c1808 100644
--- a/lnbits/wallets/base.py
+++ b/lnbits/wallets/base.py
@@ -1,5 +1,5 @@
from abc import ABC, abstractmethod
-from typing import NamedTuple, Optional, AsyncGenerator
+from typing import NamedTuple, Optional, AsyncGenerator, Coroutine
class StatusResponse(NamedTuple):
@@ -15,7 +15,8 @@ class InvoiceResponse(NamedTuple):
class PaymentResponse(NamedTuple):
- ok: bool
+ # when ok is None it means we don't know if this succeeded
+ ok: Optional[bool] = None
checking_id: Optional[str] = None # payment_hash, rcp_id
fee_msat: int = 0
preimage: Optional[str] = None
@@ -29,28 +30,49 @@ class PaymentStatus(NamedTuple):
def pending(self) -> bool:
return self.paid is not True
+ @property
+ def failed(self) -> bool:
+ return self.paid == False
+
+ def __str__(self) -> str:
+ if self.paid == True:
+ return "settled"
+ elif self.paid == False:
+ return "failed"
+ elif self.paid == None:
+ return "still pending"
+ else:
+ return "unknown (should never happen)"
+
class Wallet(ABC):
@abstractmethod
- def status(self) -> StatusResponse:
+ def status(self) -> Coroutine[None, None, StatusResponse]:
pass
@abstractmethod
def create_invoice(
- self, amount: int, memo: Optional[str] = None, description_hash: Optional[bytes] = None
- ) -> InvoiceResponse:
+ self,
+ amount: int,
+ memo: Optional[str] = None,
+ description_hash: Optional[bytes] = None,
+ ) -> Coroutine[None, None, InvoiceResponse]:
pass
@abstractmethod
- def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ def pay_invoice(self, bolt11: str) -> Coroutine[None, None, PaymentResponse]:
pass
@abstractmethod
- def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ def get_invoice_status(
+ self, checking_id: str
+ ) -> Coroutine[None, None, PaymentStatus]:
pass
@abstractmethod
- def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ def get_payment_status(
+ self, checking_id: str
+ ) -> Coroutine[None, None, PaymentStatus]:
pass
@abstractmethod
diff --git a/lnbits/wallets/clightning.py b/lnbits/wallets/clightning.py
index 48d304bb..b9f24f57 100644
--- a/lnbits/wallets/clightning.py
+++ b/lnbits/wallets/clightning.py
@@ -10,13 +10,22 @@ import json
from os import getenv
from typing import Optional, AsyncGenerator
-from .base import StatusResponse, InvoiceResponse, PaymentResponse, PaymentStatus, Wallet, Unsupported
+from .base import (
+ StatusResponse,
+ InvoiceResponse,
+ PaymentResponse,
+ PaymentStatus,
+ Wallet,
+ Unsupported,
+)
class CLightningWallet(Wallet):
def __init__(self):
if LightningRpc is None: # pragma: nocover
- raise ImportError("The `pylightning` library must be installed to use `CLightningWallet`.")
+ raise ImportError(
+ "The `pylightning` library must be installed to use `CLightningWallet`."
+ )
self.rpc = getenv("CLIGHTNING_RPC")
self.ln = LightningRpc(self.rpc)
@@ -40,7 +49,7 @@ class CLightningWallet(Wallet):
self.last_pay_index = inv["pay_index"]
break
- def status(self) -> StatusResponse:
+ async def status(self) -> StatusResponse:
try:
funds = self.ln.listfunds()
return StatusResponse(
@@ -51,8 +60,11 @@ class CLightningWallet(Wallet):
error_message = f"lightningd '{exc.method}' failed with '{exc.error}'."
return StatusResponse(error_message, 0)
- def create_invoice(
- self, amount: int, memo: Optional[str] = None, description_hash: Optional[bytes] = None
+ async def create_invoice(
+ self,
+ amount: int,
+ memo: Optional[str] = None,
+ description_hash: Optional[bytes] = None,
) -> InvoiceResponse:
label = "lbl{}".format(random.random())
msat = amount * 1000
@@ -72,7 +84,7 @@ class CLightningWallet(Wallet):
error_message = f"lightningd '{exc.method}' failed with '{exc.error}'."
return InvoiceResponse(False, label, None, error_message)
- def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str) -> PaymentResponse:
try:
r = self.ln.pay(bolt11)
except RpcError as exc:
@@ -82,7 +94,7 @@ class CLightningWallet(Wallet):
preimage = r["payment_preimage"]
return PaymentResponse(True, r["payment_hash"], fee_msat, preimage, None)
- def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
r = self.ln.listinvoices(checking_id)
if not r["invoices"]:
return PaymentStatus(False)
@@ -90,7 +102,7 @@ class CLightningWallet(Wallet):
return PaymentStatus(r["invoices"][0]["status"] == "paid")
raise KeyError("supplied an invalid checking_id")
- def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
r = self.ln.call("listpays", {"payment_hash": checking_id})
if not r["pays"]:
return PaymentStatus(False)
diff --git a/lnbits/wallets/lnbits.py b/lnbits/wallets/lnbits.py
index 30c62c60..786a4b03 100644
--- a/lnbits/wallets/lnbits.py
+++ b/lnbits/wallets/lnbits.py
@@ -3,7 +3,13 @@ import httpx
from os import getenv
from typing import Optional, Dict, AsyncGenerator
-from .base import StatusResponse, InvoiceResponse, PaymentResponse, PaymentStatus, Wallet
+from .base import (
+ StatusResponse,
+ InvoiceResponse,
+ PaymentResponse,
+ PaymentStatus,
+ Wallet,
+)
class LNbitsWallet(Wallet):
@@ -12,23 +18,34 @@ class LNbitsWallet(Wallet):
def __init__(self):
self.endpoint = getenv("LNBITS_ENDPOINT")
- key = getenv("LNBITS_KEY") or getenv("LNBITS_ADMIN_KEY") or getenv("LNBITS_INVOICE_KEY")
+ key = (
+ getenv("LNBITS_KEY")
+ or getenv("LNBITS_ADMIN_KEY")
+ or getenv("LNBITS_INVOICE_KEY")
+ )
self.key = {"X-Api-Key": key}
- def status(self) -> StatusResponse:
- r = httpx.get(url=f"{self.endpoint}/api/v1/wallet", headers=self.key)
+ async def status(self) -> StatusResponse:
+ async with httpx.AsyncClient() as client:
+ r = await client.get(url=f"{self.endpoint}/api/v1/wallet", headers=self.key)
+
try:
data = r.json()
except:
- return StatusResponse(f"Failed to connect to {self.endpoint}, got: '{r.text[:200]}...'", 0)
+ return StatusResponse(
+ f"Failed to connect to {self.endpoint}, got: '{r.text[:200]}...'", 0
+ )
if r.is_error:
return StatusResponse(data["message"], 0)
return StatusResponse(None, data["balance"])
- def create_invoice(
- self, amount: int, memo: Optional[str] = None, description_hash: Optional[bytes] = None
+ async def create_invoice(
+ self,
+ amount: int,
+ memo: Optional[str] = None,
+ description_hash: Optional[bytes] = None,
) -> InvoiceResponse:
data: Dict = {"out": False, "amount": amount}
if description_hash:
@@ -36,12 +53,18 @@ class LNbitsWallet(Wallet):
else:
data["memo"] = memo or ""
- r = httpx.post(
- url=f"{self.endpoint}/api/v1/payments",
- headers=self.key,
- json=data,
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ url=f"{self.endpoint}/api/v1/payments",
+ headers=self.key,
+ json=data,
+ )
+ ok, checking_id, payment_request, error_message = (
+ not r.is_error,
+ None,
+ None,
+ None,
)
- ok, checking_id, payment_request, error_message = not r.is_error, None, None, None
if r.is_error:
error_message = r.json()["message"]
@@ -51,8 +74,13 @@ class LNbitsWallet(Wallet):
return InvoiceResponse(ok, checking_id, payment_request, error_message)
- def pay_invoice(self, bolt11: str) -> PaymentResponse:
- r = httpx.post(url=f"{self.endpoint}/api/v1/payments", headers=self.key, json={"out": True, "bolt11": bolt11})
+ async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ url=f"{self.endpoint}/api/v1/payments",
+ headers=self.key,
+ json={"out": True, "bolt11": bolt11},
+ )
ok, checking_id, fee_msat, error_message = not r.is_error, None, 0, None
if r.is_error:
@@ -63,16 +91,22 @@ class LNbitsWallet(Wallet):
return PaymentResponse(ok, checking_id, fee_msat, error_message)
- def get_invoice_status(self, checking_id: str) -> PaymentStatus:
- r = httpx.get(url=f"{self.endpoint}/api/v1/payments/{checking_id}", headers=self.key)
+ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient() as client:
+ r = await client.get(
+ url=f"{self.endpoint}/api/v1/payments/{checking_id}", headers=self.key
+ )
if r.is_error:
return PaymentStatus(None)
return PaymentStatus(r.json()["paid"])
- def get_payment_status(self, checking_id: str) -> PaymentStatus:
- r = httpx.get(url=f"{self.endpoint}/api/v1/payments/{checking_id}", headers=self.key)
+ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient() as client:
+ r = await client.get(
+ url=f"{self.endpoint}/api/v1/payments/{checking_id}", headers=self.key
+ )
if r.is_error:
return PaymentStatus(None)
diff --git a/lnbits/wallets/lndgrpc.py b/lnbits/wallets/lndgrpc.py
index d92b568f..25c9b283 100644
--- a/lnbits/wallets/lndgrpc.py
+++ b/lnbits/wallets/lndgrpc.py
@@ -15,7 +15,13 @@ import hashlib
from os import getenv
from typing import Optional, Dict, AsyncGenerator
-from .base import StatusResponse, InvoiceResponse, PaymentResponse, PaymentStatus, Wallet
+from .base import (
+ StatusResponse,
+ InvoiceResponse,
+ PaymentResponse,
+ PaymentStatus,
+ Wallet,
+)
def get_ssl_context(cert_path: str):
@@ -76,10 +82,14 @@ def stringify_checking_id(r_hash: bytes) -> str:
class LndWallet(Wallet):
def __init__(self):
if lndgrpc is None: # pragma: nocover
- raise ImportError("The `lndgrpc` library must be installed to use `LndWallet`.")
+ raise ImportError(
+ "The `lndgrpc` library must be installed to use `LndWallet`."
+ )
if purerpc is None: # pragma: nocover
- raise ImportError("The `purerpc` library must be installed to use `LndWallet`.")
+ raise ImportError(
+ "The `purerpc` library must be installed to use `LndWallet`."
+ )
endpoint = getenv("LND_GRPC_ENDPOINT")
self.endpoint = endpoint[:-1] if endpoint.endswith("/") else endpoint
@@ -102,7 +112,7 @@ class LndWallet(Wallet):
macaroon_filepath=self.macaroon_path,
)
- def status(self) -> StatusResponse:
+ async def status(self) -> StatusResponse:
try:
resp = self.rpc._ln_stub.ChannelBalance(ln.ChannelBalanceRequest())
except Exception as exc:
@@ -110,8 +120,11 @@ class LndWallet(Wallet):
return StatusResponse(None, resp.balance * 1000)
- def create_invoice(
- self, amount: int, memo: Optional[str] = None, description_hash: Optional[bytes] = None
+ async def create_invoice(
+ self,
+ amount: int,
+ memo: Optional[str] = None,
+ description_hash: Optional[bytes] = None,
) -> InvoiceResponse:
params: Dict = {"value": amount, "expiry": 600, "private": True}
@@ -131,7 +144,7 @@ class LndWallet(Wallet):
payment_request = str(resp.payment_request)
return InvoiceResponse(True, checking_id, payment_request, None)
- def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str) -> PaymentResponse:
resp = self.rpc.send_payment(payment_request=bolt11)
if resp.payment_error:
@@ -143,7 +156,7 @@ class LndWallet(Wallet):
preimage = resp.payment_preimage.hex()
return PaymentResponse(True, checking_id, fee_msat, preimage, None)
- def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
try:
r_hash = parse_checking_id(checking_id)
if len(r_hash) != 32:
@@ -159,7 +172,7 @@ class LndWallet(Wallet):
return PaymentStatus(None)
- def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
return PaymentStatus(True)
async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
diff --git a/lnbits/wallets/lndrest.py b/lnbits/wallets/lndrest.py
index 4ee42aa7..b6746c6b 100644
--- a/lnbits/wallets/lndrest.py
+++ b/lnbits/wallets/lndrest.py
@@ -5,7 +5,13 @@ import base64
from os import getenv
from typing import Optional, Dict, AsyncGenerator
-from .base import StatusResponse, InvoiceResponse, PaymentResponse, PaymentStatus, Wallet
+from .base import (
+ StatusResponse,
+ InvoiceResponse,
+ PaymentResponse,
+ PaymentStatus,
+ Wallet,
+)
class LndRestWallet(Wallet):
@@ -14,7 +20,9 @@ class LndRestWallet(Wallet):
def __init__(self):
endpoint = getenv("LND_REST_ENDPOINT")
endpoint = endpoint[:-1] if endpoint.endswith("/") else endpoint
- endpoint = "https://" + endpoint if not endpoint.startswith("http") else endpoint
+ endpoint = (
+ "https://" + endpoint if not endpoint.startswith("http") else endpoint
+ )
self.endpoint = endpoint
macaroon = (
@@ -27,13 +35,13 @@ class LndRestWallet(Wallet):
self.auth = {"Grpc-Metadata-macaroon": macaroon}
self.cert = getenv("LND_REST_CERT")
- def status(self) -> StatusResponse:
+ async def status(self) -> StatusResponse:
try:
- r = httpx.get(
- f"{self.endpoint}/v1/balance/channels",
- headers=self.auth,
- verify=self.cert,
- )
+ async with httpx.AsyncClient(verify=self.cert) as client:
+ r = await client.get(
+ f"{self.endpoint}/v1/balance/channels",
+ headers=self.auth,
+ )
except (httpx.ConnectError, httpx.RequestError):
return StatusResponse(f"Unable to connect to {self.endpoint}.", 0)
@@ -46,24 +54,29 @@ class LndRestWallet(Wallet):
return StatusResponse(None, int(data["balance"]) * 1000)
- def create_invoice(
- self, amount: int, memo: Optional[str] = None, description_hash: Optional[bytes] = None
+ async def create_invoice(
+ self,
+ amount: int,
+ memo: Optional[str] = None,
+ description_hash: Optional[bytes] = None,
) -> InvoiceResponse:
data: Dict = {
"value": amount,
"private": True,
}
if description_hash:
- data["description_hash"] = base64.b64encode(description_hash).decode("ascii")
+ data["description_hash"] = base64.b64encode(description_hash).decode(
+ "ascii"
+ )
else:
data["memo"] = memo or ""
- r = httpx.post(
- url=f"{self.endpoint}/v1/invoices",
- headers=self.auth,
- verify=self.cert,
- json=data,
- )
+ async with httpx.AsyncClient(verify=self.cert) as client:
+ r = await client.post(
+ url=f"{self.endpoint}/v1/invoices",
+ headers=self.auth,
+ json=data,
+ )
if r.is_error:
error_message = r.text
@@ -80,21 +93,17 @@ class LndRestWallet(Wallet):
return InvoiceResponse(True, checking_id, payment_request, None)
- def pay_invoice(self, bolt11: str) -> PaymentResponse:
- r = httpx.post(
- url=f"{self.endpoint}/v1/channels/transactions",
- headers=self.auth,
- verify=self.cert,
- json={"payment_request": bolt11},
- timeout=180,
- )
+ async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async with httpx.AsyncClient(verify=self.cert) as client:
+ r = await client.post(
+ url=f"{self.endpoint}/v1/channels/transactions",
+ headers=self.auth,
+ json={"payment_request": bolt11},
+ timeout=180,
+ )
- if r.is_error:
- error_message = r.text
- try:
- error_message = r.json()["error"]
- except:
- pass
+ if r.is_error or r.json().get("payment_error"):
+ error_message = r.json().get("payment_error") or r.text
return PaymentResponse(False, None, 0, None, error_message)
data = r.json()
@@ -103,13 +112,14 @@ class LndRestWallet(Wallet):
preimage = base64.b64decode(data["payment_preimage"]).hex()
return PaymentResponse(True, checking_id, 0, preimage, None)
- def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
checking_id = checking_id.replace("_", "/")
- r = httpx.get(
- url=f"{self.endpoint}/v1/invoice/{checking_id}",
- headers=self.auth,
- verify=self.cert,
- )
+
+ async with httpx.AsyncClient(verify=self.cert) as client:
+ r = await client.get(
+ url=f"{self.endpoint}/v1/invoice/{checking_id}",
+ headers=self.auth,
+ )
if r.is_error or not r.json().get("settled"):
# this must also work when checking_id is not a hex recognizable by lnd
@@ -118,20 +128,25 @@ class LndRestWallet(Wallet):
return PaymentStatus(True)
- def get_payment_status(self, checking_id: str) -> PaymentStatus:
- r = httpx.get(
- url=f"{self.endpoint}/v1/payments",
- headers=self.auth,
- verify=self.cert,
- params={"max_payments": "20", "reversed": True},
- )
+ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient(verify=self.cert) as client:
+ r = await client.get(
+ url=f"{self.endpoint}/v1/payments",
+ headers=self.auth,
+ params={"max_payments": "20", "reversed": True},
+ )
if r.is_error:
return PaymentStatus(None)
# check payment.status:
# https://api.lightning.community/rest/index.html?python#peersynctype
- statuses = {"UNKNOWN": None, "IN_FLIGHT": None, "SUCCEEDED": True, "FAILED": False}
+ statuses = {
+ "UNKNOWN": None,
+ "IN_FLIGHT": None,
+ "SUCCEEDED": True,
+ "FAILED": False,
+ }
# for some reason our checking_ids are in base64 but the payment hashes
# returned here are in hex, lnd is weird
diff --git a/lnbits/wallets/lnpay.py b/lnbits/wallets/lnpay.py
index 9951e4ec..dc4a2e58 100644
--- a/lnbits/wallets/lnpay.py
+++ b/lnbits/wallets/lnpay.py
@@ -6,7 +6,13 @@ from http import HTTPStatus
from typing import Optional, Dict, AsyncGenerator
from quart import request
-from .base import StatusResponse, InvoiceResponse, PaymentResponse, PaymentStatus, Wallet
+from .base import (
+ StatusResponse,
+ InvoiceResponse,
+ PaymentResponse,
+ PaymentStatus,
+ Wallet,
+)
class LNPayWallet(Wallet):
@@ -18,10 +24,11 @@ class LNPayWallet(Wallet):
self.wallet_key = getenv("LNPAY_WALLET_KEY") or getenv("LNPAY_ADMIN_KEY")
self.auth = {"X-Api-Key": getenv("LNPAY_API_KEY")}
- def status(self) -> StatusResponse:
+ async def status(self) -> StatusResponse:
url = f"{self.endpoint}/wallet/{self.wallet_key}"
try:
- r = httpx.get(url, headers=self.auth, timeout=60)
+ async with httpx.AsyncClient() as client:
+ r = await client.get(url, headers=self.auth, timeout=60)
except (httpx.ConnectError, httpx.RequestError):
return StatusResponse(f"Unable to connect to '{url}'", 0)
@@ -31,12 +38,13 @@ class LNPayWallet(Wallet):
data = r.json()
if data["statusType"]["name"] != "active":
return StatusResponse(
- f"Wallet {data['user_label']} (data['id']) not active, but {data['statusType']['name']}", 0
+ f"Wallet {data['user_label']} (data['id']) not active, but {data['statusType']['name']}",
+ 0,
)
return StatusResponse(None, data["balance"] * 1000)
- def create_invoice(
+ async def create_invoice(
self,
amount: int,
memo: Optional[str] = None,
@@ -48,12 +56,13 @@ class LNPayWallet(Wallet):
else:
data["memo"] = memo or ""
- r = httpx.post(
- f"{self.endpoint}/wallet/{self.wallet_key}/invoice",
- headers=self.auth,
- json=data,
- timeout=60,
- )
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.endpoint}/wallet/{self.wallet_key}/invoice",
+ headers=self.auth,
+ json=data,
+ timeout=60,
+ )
ok, checking_id, payment_request, error_message = (
r.status_code == 201,
None,
@@ -67,18 +76,21 @@ class LNPayWallet(Wallet):
return InvoiceResponse(ok, checking_id, payment_request, error_message)
- def pay_invoice(self, bolt11: str) -> PaymentResponse:
- r = httpx.post(
- f"{self.endpoint}/wallet/{self.wallet_key}/withdraw",
- headers=self.auth,
- json={"payment_request": bolt11},
- timeout=180,
- )
+ async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.endpoint}/wallet/{self.wallet_key}/withdraw",
+ headers=self.auth,
+ json={"payment_request": bolt11},
+ timeout=180,
+ )
try:
data = r.json()
except:
- return PaymentResponse(False, None, 0, None, f"Got invalid JSON: {r.text[:200]}")
+ return PaymentResponse(
+ False, None, 0, None, f"Got invalid JSON: {r.text[:200]}"
+ )
if r.is_error:
return PaymentResponse(False, None, 0, None, data["message"])
@@ -88,14 +100,15 @@ class LNPayWallet(Wallet):
preimage = data["lnTx"]["payment_preimage"]
return PaymentResponse(True, checking_id, fee_msat, preimage, None)
- def get_invoice_status(self, checking_id: str) -> PaymentStatus:
- return self.get_payment_status(checking_id)
+ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ return await self.get_payment_status(checking_id)
- def get_payment_status(self, checking_id: str) -> PaymentStatus:
- r = httpx.get(
- url=f"{self.endpoint}/lntx/{checking_id}?fields=settled",
- headers=self.auth,
- )
+ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient() as client:
+ r = await client.get(
+ url=f"{self.endpoint}/lntx/{checking_id}?fields=settled",
+ headers=self.auth,
+ )
if r.is_error:
return PaymentStatus(None)
@@ -115,7 +128,11 @@ class LNPayWallet(Wallet):
except json.decoder.JSONDecodeError:
print(f"got something wrong on lnpay webhook endpoint: {text[:200]}")
data = None
- if type(data) is not dict or "event" not in data or data["event"].get("name") != "wallet_receive":
+ if (
+ type(data) is not dict
+ or "event" not in data
+ or data["event"].get("name") != "wallet_receive"
+ ):
return "", HTTPStatus.NO_CONTENT
lntx_id = data["data"]["wtx"]["lnTx"]["id"]
diff --git a/lnbits/wallets/lntxbot.py b/lnbits/wallets/lntxbot.py
index dab12a3f..a346cd43 100644
--- a/lnbits/wallets/lntxbot.py
+++ b/lnbits/wallets/lntxbot.py
@@ -4,7 +4,13 @@ import httpx
from os import getenv
from typing import Optional, Dict, AsyncGenerator
-from .base import StatusResponse, InvoiceResponse, PaymentResponse, PaymentStatus, Wallet
+from .base import (
+ StatusResponse,
+ InvoiceResponse,
+ PaymentResponse,
+ PaymentStatus,
+ Wallet,
+)
class LntxbotWallet(Wallet):
@@ -14,27 +20,37 @@ class LntxbotWallet(Wallet):
endpoint = getenv("LNTXBOT_API_ENDPOINT")
self.endpoint = endpoint[:-1] if endpoint.endswith("/") else endpoint
- key = getenv("LNTXBOT_KEY") or getenv("LNTXBOT_ADMIN_KEY") or getenv("LNTXBOT_INVOICE_KEY")
+ key = (
+ getenv("LNTXBOT_KEY")
+ or getenv("LNTXBOT_ADMIN_KEY")
+ or getenv("LNTXBOT_INVOICE_KEY")
+ )
self.auth = {"Authorization": f"Basic {key}"}
- def status(self) -> StatusResponse:
- r = httpx.get(
- f"{self.endpoint}/balance",
- headers=self.auth,
- timeout=40,
- )
+ async def status(self) -> StatusResponse:
+ async with httpx.AsyncClient() as client:
+ r = await client.get(
+ f"{self.endpoint}/balance",
+ headers=self.auth,
+ timeout=40,
+ )
try:
data = r.json()
except:
- return StatusResponse(f"Failed to connect to {self.endpoint}, got: '{r.text[:200]}...'", 0)
+ return StatusResponse(
+ f"Failed to connect to {self.endpoint}, got: '{r.text[:200]}...'", 0
+ )
if data.get("error"):
return StatusResponse(data["message"], 0)
return StatusResponse(None, data["BTC"]["AvailableBalance"] * 1000)
- def create_invoice(
- self, amount: int, memo: Optional[str] = None, description_hash: Optional[bytes] = None
+ async def create_invoice(
+ self,
+ amount: int,
+ memo: Optional[str] = None,
+ description_hash: Optional[bytes] = None,
) -> InvoiceResponse:
data: Dict = {"amt": str(amount)}
if description_hash:
@@ -42,12 +58,13 @@ class LntxbotWallet(Wallet):
else:
data["memo"] = memo or ""
- r = httpx.post(
- f"{self.endpoint}/addinvoice",
- headers=self.auth,
- json=data,
- timeout=40,
- )
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.endpoint}/addinvoice",
+ headers=self.auth,
+ json=data,
+ timeout=40,
+ )
if r.is_error:
try:
@@ -62,13 +79,14 @@ class LntxbotWallet(Wallet):
data = r.json()
return InvoiceResponse(True, data["payment_hash"], data["pay_req"], None)
- def pay_invoice(self, bolt11: str) -> PaymentResponse:
- r = httpx.post(
- f"{self.endpoint}/payinvoice",
- headers=self.auth,
- json={"invoice": bolt11},
- timeout=40,
- )
+ async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.endpoint}/payinvoice",
+ headers=self.auth,
+ json={"invoice": bolt11},
+ timeout=40,
+ )
if r.is_error:
try:
@@ -82,15 +100,16 @@ class LntxbotWallet(Wallet):
data = r.json()
checking_id = data["payment_hash"]
- fee_msat = data["fee_msat"]
+ fee_msat = -data["fee_msat"]
preimage = data["payment_preimage"]
return PaymentResponse(True, checking_id, fee_msat, preimage, None)
- def get_invoice_status(self, checking_id: str) -> PaymentStatus:
- r = httpx.post(
- f"{self.endpoint}/invoicestatus/{checking_id}?wait=false",
- headers=self.auth,
- )
+ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.endpoint}/invoicestatus/{checking_id}?wait=false",
+ headers=self.auth,
+ )
data = r.json()
if r.is_error or "error" in data:
@@ -101,11 +120,12 @@ class LntxbotWallet(Wallet):
return PaymentStatus(True)
- def get_payment_status(self, checking_id: str) -> PaymentStatus:
- r = httpx.post(
- url=f"{self.endpoint}/paymentstatus/{checking_id}",
- headers=self.auth,
- )
+ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ url=f"{self.endpoint}/paymentstatus/{checking_id}",
+ headers=self.auth,
+ )
data = r.json()
if r.is_error or "error" in data:
diff --git a/lnbits/wallets/opennode.py b/lnbits/wallets/opennode.py
index 97b395d0..8354e819 100644
--- a/lnbits/wallets/opennode.py
+++ b/lnbits/wallets/opennode.py
@@ -1,4 +1,3 @@
-import json
import trio # type: ignore
import hmac
import httpx
@@ -7,7 +6,14 @@ from os import getenv
from typing import Optional, AsyncGenerator
from quart import request, url_for
-from .base import StatusResponse, InvoiceResponse, PaymentResponse, PaymentStatus, Wallet, Unsupported
+from .base import (
+ StatusResponse,
+ InvoiceResponse,
+ PaymentResponse,
+ PaymentStatus,
+ Wallet,
+ Unsupported,
+)
class OpenNodeWallet(Wallet):
@@ -17,16 +23,21 @@ class OpenNodeWallet(Wallet):
endpoint = getenv("OPENNODE_API_ENDPOINT")
self.endpoint = endpoint[:-1] if endpoint.endswith("/") else endpoint
- key = getenv("OPENNODE_KEY") or getenv("OPENNODE_ADMIN_KEY") or getenv("OPENNODE_INVOICE_KEY")
+ key = (
+ getenv("OPENNODE_KEY")
+ or getenv("OPENNODE_ADMIN_KEY")
+ or getenv("OPENNODE_INVOICE_KEY")
+ )
self.auth = {"Authorization": key}
- def status(self) -> StatusResponse:
+ async def status(self) -> StatusResponse:
try:
- r = httpx.get(
- f"{self.endpoint}/v1/account/balance",
- headers=self.auth,
- timeout=40,
- )
+ async with httpx.AsyncClient() as client:
+ r = await client.get(
+ f"{self.endpoint}/v1/account/balance",
+ headers=self.auth,
+ timeout=40,
+ )
except (httpx.ConnectError, httpx.RequestError):
return StatusResponse(f"Unable to connect to '{self.endpoint}'", 0)
@@ -36,22 +47,26 @@ class OpenNodeWallet(Wallet):
return StatusResponse(None, data["balance"]["BTC"] / 100_000_000_000)
- def create_invoice(
- self, amount: int, memo: Optional[str] = None, description_hash: Optional[bytes] = None
+ async def create_invoice(
+ self,
+ amount: int,
+ memo: Optional[str] = None,
+ description_hash: Optional[bytes] = None,
) -> InvoiceResponse:
if description_hash:
raise Unsupported("description_hash")
- r = httpx.post(
- f"{self.endpoint}/v1/charges",
- headers=self.auth,
- json={
- "amount": amount,
- "description": memo or "",
- "callback_url": url_for("webhook_listener", _external=True),
- },
- timeout=40,
- )
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.endpoint}/v1/charges",
+ headers=self.auth,
+ json={
+ "amount": amount,
+ "description": memo or "",
+ "callback_url": url_for("webhook_listener", _external=True),
+ },
+ timeout=40,
+ )
if r.is_error:
error_message = r.json()["message"]
@@ -62,13 +77,14 @@ class OpenNodeWallet(Wallet):
payment_request = data["lightning_invoice"]["payreq"]
return InvoiceResponse(True, checking_id, payment_request, None)
- def pay_invoice(self, bolt11: str) -> PaymentResponse:
- r = httpx.post(
- f"{self.endpoint}/v2/withdrawals",
- headers=self.auth,
- json={"type": "ln", "address": bolt11},
- timeout=180,
- )
+ async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.endpoint}/v2/withdrawals",
+ headers=self.auth,
+ json={"type": "ln", "address": bolt11},
+ timeout=180,
+ )
if r.is_error:
error_message = r.json()["message"]
@@ -79,21 +95,33 @@ class OpenNodeWallet(Wallet):
fee_msat = data["fee"] * 1000
return PaymentResponse(True, checking_id, fee_msat, None, None)
- def get_invoice_status(self, checking_id: str) -> PaymentStatus:
- r = httpx.get(f"{self.endpoint}/v1/charge/{checking_id}", headers=self.auth)
+ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient() as client:
+ r = await client.get(
+ f"{self.endpoint}/v1/charge/{checking_id}", headers=self.auth
+ )
if r.is_error:
return PaymentStatus(None)
statuses = {"processing": None, "paid": True, "unpaid": False}
return PaymentStatus(statuses[r.json()["data"]["status"]])
- def get_payment_status(self, checking_id: str) -> PaymentStatus:
- r = httpx.get(f"{self.endpoint}/v1/withdrawal/{checking_id}", headers=self.auth)
+ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient() as client:
+ r = await client.get(
+ f"{self.endpoint}/v1/withdrawal/{checking_id}", headers=self.auth
+ )
if r.is_error:
return PaymentStatus(None)
- statuses = {"initial": None, "pending": None, "confirmed": True, "error": False, "failed": False}
+ statuses = {
+ "initial": None,
+ "pending": None,
+ "confirmed": True,
+ "error": False,
+ "failed": False,
+ }
return PaymentStatus(statuses[r.json()["data"]["status"]])
async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
diff --git a/lnbits/wallets/spark.py b/lnbits/wallets/spark.py
index 5ab40ddd..5d0f024a 100644
--- a/lnbits/wallets/spark.py
+++ b/lnbits/wallets/spark.py
@@ -1,11 +1,17 @@
import trio # type: ignore
-import random
import json
import httpx
+import random
from os import getenv
from typing import Optional, AsyncGenerator
-from .base import StatusResponse, InvoiceResponse, PaymentResponse, PaymentStatus, Wallet
+from .base import (
+ StatusResponse,
+ InvoiceResponse,
+ PaymentResponse,
+ PaymentStatus,
+ Wallet,
+)
class SparkError(Exception):
@@ -22,9 +28,11 @@ class SparkWallet(Wallet):
self.token = getenv("SPARK_TOKEN")
def __getattr__(self, key):
- def call(*args, **kwargs):
+ async def call(*args, **kwargs):
if args and kwargs:
- raise TypeError(f"must supply either named arguments or a list of arguments, not both: {args} {kwargs}")
+ raise TypeError(
+ f"must supply either named arguments or a list of arguments, not both: {args} {kwargs}"
+ )
elif args:
params = args
elif kwargs:
@@ -32,12 +40,17 @@ class SparkWallet(Wallet):
else:
params = {}
- r = httpx.post(
- self.url + "/rpc",
- headers={"X-Access": self.token},
- json={"method": key, "params": params},
- timeout=40,
- )
+ try:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ self.url + "/rpc",
+ headers={"X-Access": self.token},
+ json={"method": key, "params": params},
+ timeout=40,
+ )
+ except (OSError, httpx.ConnectError, httpx.RequestError) as exc:
+ raise UnknownError("error connecting to spark: " + str(exc))
+
try:
data = r.json()
except:
@@ -53,9 +66,9 @@ class SparkWallet(Wallet):
return call
- def status(self) -> StatusResponse:
+ async def status(self) -> StatusResponse:
try:
- funds = self.listfunds()
+ funds = await self.listfunds()
except (httpx.ConnectError, httpx.RequestError):
return StatusResponse("Couldn't connect to Spark server", 0)
except (SparkError, UnknownError) as e:
@@ -66,22 +79,28 @@ class SparkWallet(Wallet):
sum([ch["channel_sat"] * 1000 for ch in funds["channels"]]),
)
- def create_invoice(
- self, amount: int, memo: Optional[str] = None, description_hash: Optional[bytes] = None
+ async def create_invoice(
+ self,
+ amount: int,
+ memo: Optional[str] = None,
+ description_hash: Optional[bytes] = None,
) -> InvoiceResponse:
label = "lbs{}".format(random.random())
checking_id = label
try:
if description_hash:
- r = self.invoicewithdescriptionhash(
+ r = await self.invoicewithdescriptionhash(
msatoshi=amount * 1000,
label=label,
description_hash=description_hash.hex(),
)
else:
- r = self.invoice(
- msatoshi=amount * 1000, label=label, description=memo or "", exposeprivatechannels=True
+ r = await self.invoice(
+ msatoshi=amount * 1000,
+ label=label,
+ description=memo or "",
+ exposeprivatechannels=True,
)
ok, payment_request, error_message = True, r["bolt11"], ""
except (SparkError, UnknownError) as e:
@@ -89,26 +108,70 @@ class SparkWallet(Wallet):
return InvoiceResponse(ok, checking_id, payment_request, error_message)
- def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str) -> PaymentResponse:
try:
- r = self.pay(bolt11)
+ r = await self.pay(bolt11)
except (SparkError, UnknownError) as exc:
- return PaymentResponse(False, None, 0, None, str(exc))
+ listpays = await self.listpays(bolt11)
+ if listpays:
+ pays = listpays["pays"]
+
+ if len(pays) == 0:
+ return PaymentResponse(False, None, 0, None, str(exc))
+
+ pay = pays[0]
+ payment_hash = pay["payment_hash"]
+
+ if len(pays) > 1:
+ raise SparkError(
+ f"listpays({payment_hash}) returned an unexpected response: {listpays}"
+ )
+
+ if pay["status"] == "failed":
+ return PaymentResponse(False, None, 0, None, str(exc))
+ elif pay["status"] == "pending":
+ return PaymentResponse(None, payment_hash, 0, None, None)
+ elif pay["status"] == "complete":
+ r = pay
+ r["payment_preimage"] = pay["preimage"]
+ r["msatoshi"] = int(pay["amount_msat"][0:-4])
+ r["msatoshi_sent"] = int(pay["amount_sent_msat"][0:-4])
+ # this may result in an error if it was paid previously
+ # our database won't allow the same payment_hash to be added twice
+ # this is good
+ pass
fee_msat = r["msatoshi_sent"] - r["msatoshi"]
preimage = r["payment_preimage"]
return PaymentResponse(True, r["payment_hash"], fee_msat, preimage, None)
- def get_invoice_status(self, checking_id: str) -> PaymentStatus:
- r = self.listinvoices(label=checking_id)
+ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ try:
+ r = await self.listinvoices(label=checking_id)
+ except (SparkError, UnknownError):
+ return PaymentStatus(None)
+
if not r or not r.get("invoices"):
return PaymentStatus(None)
if r["invoices"][0]["status"] == "unpaid":
return PaymentStatus(False)
return PaymentStatus(True)
- def get_payment_status(self, checking_id: str) -> PaymentStatus:
- r = self.listpays(payment_hash=checking_id)
+ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ # check if it's 32 bytes hex
+ if len(checking_id) != 64:
+ return PaymentStatus(None)
+ try:
+ int(checking_id, 16)
+ except ValueError:
+ return PaymentStatus(None)
+
+ # ask sparko
+ try:
+ r = await self.listpays(payment_hash=checking_id)
+ except (SparkError, UnknownError):
+ return PaymentStatus(None)
+
if not r["pays"]:
return PaymentStatus(False)
if r["pays"][0]["payment_hash"] == checking_id:
@@ -132,7 +195,7 @@ class SparkWallet(Wallet):
data = json.loads(line[5:])
if "pay_index" in data and data.get("status") == "paid":
yield data["label"]
- except (OSError, httpx.ReadError):
+ except (OSError, httpx.ReadError, httpx.ConnectError):
pass
print("lost connection to spark /stream, retrying in 5 seconds")
diff --git a/lnbits/wallets/void.py b/lnbits/wallets/void.py
index b6617363..591fa042 100644
--- a/lnbits/wallets/void.py
+++ b/lnbits/wallets/void.py
@@ -1,27 +1,37 @@
from typing import Optional, AsyncGenerator
-from .base import StatusResponse, InvoiceResponse, PaymentResponse, PaymentStatus, Wallet, Unsupported
+from .base import (
+ StatusResponse,
+ InvoiceResponse,
+ PaymentResponse,
+ PaymentStatus,
+ Wallet,
+ Unsupported,
+)
class VoidWallet(Wallet):
- def create_invoice(
- self, amount: int, memo: Optional[str] = None, description_hash: Optional[bytes] = None
+ async def create_invoice(
+ self,
+ amount: int,
+ memo: Optional[str] = None,
+ description_hash: Optional[bytes] = None,
) -> InvoiceResponse:
raise Unsupported("")
- def status(self) -> StatusResponse:
+ async def status(self) -> StatusResponse:
return StatusResponse(
"This backend does nothing, it is here just as a placeholder, you must configure an actual backend before being able to do anything useful with LNbits.",
0,
)
- def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str) -> PaymentResponse:
raise Unsupported("")
- def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
raise Unsupported("")
- def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
raise Unsupported("")
async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
diff --git a/pyproject.toml b/pyproject.toml
deleted file mode 100644
index 55ec8d78..00000000
--- a/pyproject.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[tool.black]
-line-length = 120
diff --git a/requirements.txt b/requirements.txt
index 18250051..fec167af 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,40 +6,42 @@ bitstring==3.1.7
blinker==1.4
brotli==1.0.9
cerberus==1.3.2
-certifi==2020.11.8
+certifi==2020.12.5
click==7.1.2
ecdsa==0.16.1
-environs==9.2.0
-h11==0.11.0
+environs==9.3.1
+h11==0.12.0
h2==4.0.0
hpack==4.0.0
-httpcore==0.12.2
+httpcore==0.12.3
httpx==0.16.1
-hypercorn==0.11.1
+hypercorn==0.11.2
hyperframe==6.0.0
-idna==2.10
+idna==3.1
itsdangerous==1.1.0
-jinja2==2.11.2
+jinja2==2.11.3
lnurl==0.3.5
markupsafe==1.1.1
-marshmallow==3.9.1
+marshmallow==3.10.0
outcome==1.1.0
priority==1.3.0
-pydantic==1.7.2
+pydantic==1.8
+pypng==0.0.20
+pyqrcode==1.2.1
pyscss==1.3.7
python-dotenv==0.15.0
-quart==0.13.1
+quart==0.14.1
quart-compress==0.2.1
quart-cors==0.3.0
-quart-trio==0.6.0
-represent==1.6.0
+quart-trio==0.7.0
+represent==1.6.0.post0
rfc3986==1.4.0
secure==0.2.1
shortuuid==1.0.1
six==1.15.0
sniffio==1.2.0
sortedcontainers==2.3.0
-sqlalchemy==1.3.20
+sqlalchemy==1.3.23
sqlalchemy-aio==0.16.0
toml==0.10.2
trio==0.16.0