{"X-Api-Key": "{{ wallet.inkey }}"}Body (application/json)
{"out": false, "amount": <int>, "memo": <string>}{"out": false, "amount": <int>, "memo": <string>, "unit": <string>, "webhook": <url:string>}
Returns 201 CREATED (application/json)
@@ -61,7 +61,7 @@
curl -X POST {{ request.base_url }}api/v1/payments -d '{"out": false,
"amount": <int>, "memo": <string>, "webhook":
- <url:string>}' -H "X-Api-Key: {{ wallet.inkey }}" -H
+ <url:string>, "unit": <string>}' -H "X-Api-Key: {{ wallet.inkey }}" -H
"Content-type: application/json"
diff --git a/lnbits/core/templates/core/index.html b/lnbits/core/templates/core/index.html
index 88dc496d..f363a841 100644
--- a/lnbits/core/templates/core/index.html
+++ b/lnbits/core/templates/core/index.html
@@ -11,7 +11,7 @@
color="primary"
@click="processing"
type="a"
- href="{{ url_for('core.lnurlwallet', lightning=lnurl) }}"
+ href="{{ url_for('core.lnurlwallet') }}?lightning={{ lnurl }}"
>
Press to claim bitcoin
diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index 2b6ec5de..db435866 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -273,442 +273,469 @@
-
-
-
-
- {{ SITE_TITLE }} Wallet: {{ wallet.name }}
-
-
-
-
- {% include "core/_api_docs.html" %}
+ {% if HIDE_API %}
+
+ {% else %}
+
+
+
+
+ {{ SITE_TITLE }} Wallet: {{ wallet.name }}
+
+
+
-
-
-
- This is an LNURL-withdraw QR code for slurping everything from
- this wallet. Do not share with anyone.
-
-
+
+ {% include "core/_api_docs.html" %}
+
+
+
+
+ This is an LNURL-withdraw QR code for slurping everything
+ from this wallet. Do not share with anyone.
+
+
+
+ It is compatible with balanceCheck and
+ balanceNotify so your wallet may keep pulling
+ the funds continuously from here after the first withdraw.
+
+
+
+
+
+
+
+
+ This QR code contains your wallet URL with full access. You
+ can scan it from your phone to open your wallet from there.
+
-
- It is compatible with balanceCheck and
- balanceNotify so your wallet may keep pulling the
- funds continuously from here after the first withdraw.
-
-
-
-
-
-
-
-
- This QR code contains your wallet URL with full access. You
- can scan it from your phone to open your wallet from there.
-
-
-
-
-
-
-
-
- Update name
-
-
-
-
-
-
-
- This whole wallet will be deleted, the funds will be
- UNRECOVERABLE.
-
- Delete wallet
-
-
-
-
-
-
+
+
+
+
+
+
+
+ Update name
+
+
+
+
+
+
+
+ This whole wallet will be deleted, the funds will be
+ UNRECOVERABLE.
+
+ Delete wallet
+
+
+
+
+
+
+ {% endif %} {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD =
+ ADS.split(';') %}
+
+ 
{% endfor %} {% endif %}
+
-
-
- {% raw %}
-
-
-
- {{receive.lnurl.domain}} is requesting an invoice:
-
- {% endraw %} {% if LNBITS_DENOMINATION != 'sats' %}
-
-
- Withdraw from {{receive.lnurl.domain}}
-
- Create invoice
-
- Cancel
-
-
-
-
-
-
-
-
-
-
-
- Copy invoice
- Close
-
-
- {% endraw %}
-
-
-
-
-
-
- {% raw %} {{ parseFloat(String(parse.invoice.fsat).replaceAll(",", ""))
- / 100 }} {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
-
-
- {{ parse.invoice.fsat }}{% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
-
-
- Description: {{ parse.invoice.description }}
- Expire date: {{ parse.invoice.expireDate }}
- Hash: {{ parse.invoice.hash }}
-
- {% endraw %}
-
- Pay
- Cancel
-
-
- Not enough funds!
- Cancel
-
-
-
- {% raw %}
-
-
- Authenticate with {{ parse.lnurlauth.domain }}?
+
+ {% raw %}
+
+
+
+ {{receive.lnurl.domain}} is requesting an invoice:
-
- For every website and for every LNbits wallet, a new keypair will be
- deterministically generated so your identity can't be tied to your
- LNbits wallet or linked across websites. No other data will be shared
- with {{ parse.lnurlauth.domain }}.
-
- Your public key for {{ parse.lnurlauth.domain }} is:
-
- {{ parse.lnurlauth.pubkey }}
-
-
- Login
- Cancel
-
-
- {% endraw %}
-
-
- {% raw %}
-
-
- {{ parse.lnurlpay.domain }} is requesting {{
- parse.lnurlpay.maxSendable | msatoshiFormat }} {{LNBITS_DENOMINATION}}
-
-
- and a {{parse.lnurlpay.commentAllowed}}-char comment
-
-
-
- {{ parse.lnurlpay.targetUser || parse.lnurlpay.domain }} is
- requesting
- between {{ parse.lnurlpay.minSendable | msatoshiFormat }} and
- {{ parse.lnurlpay.maxSendable | msatoshiFormat }}
- {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
-
-
- and a {{parse.lnurlpay.commentAllowed}}-char comment
-
-
-
- {{ parse.lnurlpay.description }}
-
-
-
-
-
-
- {% endraw %}
- Send {{LNBITS_DENOMINATION}}
- Cancel
-
-
- {% endraw %}
-
-
-
+ {% endraw %} {% if LNBITS_DENOMINATION != 'sats' %}
-
-
+ v-model.number="receive.data.amount"
+ label="Amount ({{LNBITS_DENOMINATION}}) *"
+ mask="#.##"
+ fill-mask="0"
+ reverse-fill-mask
+ :min="receive.minMax[0]"
+ :max="receive.minMax[1]"
+ :readonly="receive.lnurl && receive.lnurl.fixed"
+ >
+ {% else %}
+ Read
+
+ Withdraw from {{receive.lnurl.domain}}
+
+ Create invoice
+
+ Cancel
+
+
+
+
+
+
+
+
+
+ Copy invoice
+ Close
+
+
+ {% endraw %}
+
+
+
+
+
+
+ {% raw %} {{ parseFloat(String(parse.invoice.fsat).replaceAll(",",
+ "")) / 100 }} {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
+
+
+ {{ parse.invoice.fsat }}{% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
+
+
+ Description: {{ parse.invoice.description }}
+ Expire date: {{ parse.invoice.expireDate }}
+ Hash: {{ parse.invoice.hash }}
+
+ {% endraw %}
+
+ Pay
+ Cancel
+
+
+ Not enough funds!
Cancel
-
+
+
+ {% raw %}
+
+
+ Authenticate with {{ parse.lnurlauth.domain }}?
+
+
+ For every website and for every LNbits wallet, a new keypair will be
+ deterministically generated so your identity can't be tied to your
+ LNbits wallet or linked across websites. No other data will be
+ shared with {{ parse.lnurlauth.domain }}.
+
+ Your public key for {{ parse.lnurlauth.domain }} is:
+
+ {{ parse.lnurlauth.pubkey }}
+
+
+ Login
+ Cancel
+
+
+ {% endraw %}
+
+
+ {% raw %}
+
+
+ {{ parse.lnurlpay.domain }} is requesting {{
+ parse.lnurlpay.maxSendable | msatoshiFormat }}
+ {{LNBITS_DENOMINATION}}
+
+
+ and a {{parse.lnurlpay.commentAllowed}}-char comment
+
+
+
+ {{ parse.lnurlpay.targetUser || parse.lnurlpay.domain }} is
+ requesting
+ between {{ parse.lnurlpay.minSendable | msatoshiFormat }} and
+ {{ parse.lnurlpay.maxSendable | msatoshiFormat }}
+ {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
+
+
+ and a {{parse.lnurlpay.commentAllowed}}-char comment
+
+
+
+ {{ parse.lnurlpay.description }}
+
+
+
+
+
+
+ {% endraw %}
+ Send {{LNBITS_DENOMINATION}}
+ Cancel
+
+
+ {% endraw %}
+
-
-
-
-
- Cancel
-
+
+
+
+
+ Read
+ Cancel
+
+
+
+
+
+
+
+ Cancel
+
+
-
-
-
+
+
-
-
-
- Cancel
-
-
-
+
+
+
+ Cancel
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-{% if service_fee > 0 %}
-
-
-
- Warning
-
- Login functionality to be released in v0.2, for now,
- make sure you bookmark this page for future access to your
- wallet!
-
-
- This service is in BETA, and we hold no responsibility for people losing
- access to funds. To encourage you to run your own LNbits installation, any
- balance on {% raw %}{{ disclaimerDialog.location.host }}{% endraw %} will
- incur a charge of {{ service_fee }}% service fee per
- week.
-
-
- Copy wallet URL
- I understand
-
-
-
-{% endif %} {% endblock %}
+
+
+
+
+
+ Warning
+
+ Login functionality to be released in v0.2, for now,
+ make sure you bookmark this page for future access to your
+ wallet!
+
+
+ This service is in BETA, and we hold no responsibility for people losing
+ access to funds. {% if service_fee > 0 %} To encourage you to run your
+ own LNbits installation, any balance on {% raw %}{{
+ disclaimerDialog.location.host }}{% endraw %} will incur a charge of
+ {{ service_fee }}% service fee per week. {% endif %}
+
+
+ Copy wallet URL
+ I understand
+
+
+
+ {% endblock %}
+
diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py
index 107a2684..3b2f8b3a 100644
--- a/lnbits/core/views/api.py
+++ b/lnbits/core/views/api.py
@@ -7,7 +7,7 @@ from typing import Dict, List, Optional, Union
from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
import httpx
-from fastapi import Query, Request
+from fastapi import Header, Query, Request
from fastapi.exceptions import HTTPException
from fastapi.param_functions import Depends
from fastapi.params import Body
@@ -23,9 +23,11 @@ from lnbits.decorators import (
WalletInvoiceKeyChecker,
WalletTypeInfo,
get_key_type,
+ require_admin_key,
)
-from lnbits.helpers import url_for
+from lnbits.helpers import url_for, urlsafe_short_hash
from lnbits.requestvars import g
+from lnbits.settings import LNBITS_ADMIN_USERS, LNBITS_SITE_TITLE
from lnbits.utils.exchange_rates import (
currencies,
fiat_amount_as_satoshis,
@@ -34,13 +36,14 @@ from lnbits.utils.exchange_rates import (
from .. import core_app, db
from ..crud import (
+ create_payment,
get_payments,
get_standalone_payment,
- save_balance_check,
- update_wallet,
- create_payment,
get_wallet,
+ get_wallet_for_key,
+ save_balance_check,
update_payment_status,
+ update_wallet,
)
from ..services import (
InvoiceFailure,
@@ -51,8 +54,6 @@ from ..services import (
perform_lnurlauth,
)
from ..tasks import api_invoice_listeners
-from lnbits.settings import LNBITS_ADMIN_USERS
-from lnbits.helpers import urlsafe_short_hash
@core_app.get("/api/v1/wallet")
@@ -98,7 +99,7 @@ async def api_update_balance(
@core_app.put("/api/v1/wallet/{new_name}")
async def api_update_wallet(
- new_name: str, wallet: WalletTypeInfo = Depends(WalletAdminKeyChecker())
+ new_name: str, wallet: WalletTypeInfo = Depends(require_admin_key)
):
await update_wallet(wallet.wallet.id, new_name)
return {
@@ -123,8 +124,8 @@ async def api_payments(wallet: WalletTypeInfo = Depends(get_key_type)):
class CreateInvoiceData(BaseModel):
out: Optional[bool] = True
- amount: int = Query(None, ge=1)
- memo: str = None
+ amount: float = Query(None, ge=0)
+ memo: Optional[str] = None
unit: Optional[str] = "sat"
description_hash: Optional[str] = None
lnurl_callback: Optional[str] = None
@@ -140,9 +141,9 @@ async def api_payments_create_invoice(data: CreateInvoiceData, wallet: Wallet):
memo = ""
else:
description_hash = b""
- memo = data.memo
+ memo = data.memo or LNBITS_SITE_TITLE
if data.unit == "sat":
- amount = data.amount
+ amount = int(data.amount)
else:
price_in_sats = await fiat_amount_as_satoshis(data.amount, data.unit)
amount = price_in_sats
@@ -292,11 +293,11 @@ async def api_payments_pay_lnurl(
detail=f"{domain} returned an invalid invoice. Expected {data.amount} msat, got {invoice.amount_msat}.",
)
- # if invoice.description_hash != data.description_hash:
- # raise HTTPException(
- # status_code=HTTPStatus.BAD_REQUEST,
- # detail=f"{domain} returned an invalid invoice. Expected description_hash == {data.description_hash}, got {invoice.description_hash}.",
- # )
+ # if invoice.description_hash != data.description_hash:
+ # raise HTTPException(
+ # status_code=HTTPStatus.BAD_REQUEST,
+ # detail=f"{domain} returned an invalid invoice. Expected description_hash == {data.description_hash}, got {invoice.description_hash}.",
+ # )
extra = {}
@@ -363,7 +364,13 @@ async def api_payments_sse(
@core_app.get("/api/v1/payments/{payment_hash}")
-async def api_payment(payment_hash):
+async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):
+ wallet = None
+ try:
+ if X_Api_Key.extra:
+ print("No key")
+ except:
+ wallet = await get_wallet_for_key(X_Api_Key)
payment = await get_standalone_payment(payment_hash)
await check_invoice_status(payment.wallet_id, payment_hash)
payment = await get_standalone_payment(payment_hash)
@@ -372,13 +379,23 @@ async def api_payment(payment_hash):
status_code=HTTPStatus.NOT_FOUND, detail="Payment does not exist."
)
elif not payment.pending:
+ if wallet and wallet.id == payment.wallet_id:
+ return {"paid": True, "preimage": payment.preimage, "details": payment}
return {"paid": True, "preimage": payment.preimage}
try:
await payment.check_pending()
except Exception:
+ if wallet and wallet.id == payment.wallet_id:
+ return {"paid": False, "details": payment}
return {"paid": False}
+ if wallet and wallet.id == payment.wallet_id:
+ return {
+ "paid": not payment.pending,
+ "preimage": payment.preimage,
+ "details": payment,
+ }
return {"paid": not payment.pending, "preimage": payment.preimage}
@@ -500,14 +517,19 @@ async def api_lnurlscan(code: str):
return params
+class DecodePayment(BaseModel):
+ data: str
+
+
@core_app.post("/api/v1/payments/decode")
-async def api_payments_decode(data: str = Query(None)):
+async def api_payments_decode(data: DecodePayment):
+ payment_str = data.data
try:
- if data["data"][:5] == "LNURL":
- url = lnurl.decode(data["data"])
+ if payment_str[:5] == "LNURL":
+ url = lnurl.decode(payment_str)
return {"domain": url}
else:
- invoice = bolt11.decode(data["data"])
+ invoice = bolt11.decode(payment_str)
return {
"payment_hash": invoice.payment_hash,
"amount_msat": invoice.amount_msat,
@@ -559,6 +581,6 @@ async def api_fiat_as_sats(data: ConversionData):
return output
else:
output[data.from_.upper()] = data.amount
- output["sats"] = await fiat_amount_as_satoshis(data.amount, data.to)
+ output["sats"] = await fiat_amount_as_satoshis(data.amount, data.from_)
output["BTC"] = output["sats"] / 100000000
return output
diff --git a/lnbits/core/views/generic.py b/lnbits/core/views/generic.py
index d917ffab..d9687e16 100644
--- a/lnbits/core/views/generic.py
+++ b/lnbits/core/views/generic.py
@@ -15,8 +15,8 @@ from lnbits.core.models import User
from lnbits.decorators import check_user_exists
from lnbits.helpers import template_renderer, url_for
from lnbits.settings import (
- LNBITS_ALLOWED_USERS,
LNBITS_ADMIN_USERS,
+ LNBITS_ALLOWED_USERS,
LNBITS_SITE_TITLE,
SERVICE_FEE,
)
@@ -226,7 +226,9 @@ async def lnurl_balance_notify(request: Request, service: str):
redeem_lnurl_withdraw(bc.wallet, bc.url)
-@core_html_routes.get("/lnurlwallet", response_class=RedirectResponse)
+@core_html_routes.get(
+ "/lnurlwallet", response_class=RedirectResponse, name="core.lnurlwallet"
+)
async def lnurlwallet(request: Request):
async with db.connect() as conn:
account = await create_account(conn=conn)
diff --git a/lnbits/db.py b/lnbits/db.py
index 02850958..7bbfa5c5 100644
--- a/lnbits/db.py
+++ b/lnbits/db.py
@@ -130,9 +130,15 @@ class Database(Compat):
)
)
else:
- self.path = os.path.join(LNBITS_DATA_FOLDER, f"{self.name}.sqlite3")
- database_uri = f"sqlite:///{self.path}"
- self.type = SQLITE
+ if os.path.isdir(LNBITS_DATA_FOLDER):
+ self.path = os.path.join(LNBITS_DATA_FOLDER, f"{self.name}.sqlite3")
+ database_uri = f"sqlite:///{self.path}"
+ self.type = SQLITE
+ else:
+ raise NotADirectoryError(
+ f"LNBITS_DATA_FOLDER named {LNBITS_DATA_FOLDER} was not created"
+ f" - please 'mkdir {LNBITS_DATA_FOLDER}' and try again"
+ )
self.schema = self.name
if self.name.startswith("ext_"):
diff --git a/lnbits/decorators.py b/lnbits/decorators.py
index 9eee1afa..d6f73f40 100644
--- a/lnbits/decorators.py
+++ b/lnbits/decorators.py
@@ -13,7 +13,11 @@ from starlette.requests import Request
from lnbits.core.crud import get_user, get_wallet_for_key
from lnbits.core.models import User, Wallet
from lnbits.requestvars import g
-from lnbits.settings import LNBITS_ALLOWED_USERS, LNBITS_ADMIN_USERS, LNBITS_ADMIN_EXTENSIONS
+from lnbits.settings import (
+ LNBITS_ALLOWED_USERS,
+ LNBITS_ADMIN_USERS,
+ LNBITS_ADMIN_EXTENSIONS,
+)
class KeyChecker(SecurityBase):
@@ -122,7 +126,7 @@ async def get_key_type(
# 0: admin
# 1: invoice
# 2: invalid
- pathname = r['path'].split('/')[1]
+ pathname = r["path"].split("/")[1]
if not api_key_header and not api_key_query:
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST)
@@ -133,8 +137,12 @@ async def get_key_type(
checker = WalletAdminKeyChecker(api_key=token)
await checker.__call__(r)
wallet = WalletTypeInfo(0, checker.wallet)
- if (LNBITS_ADMIN_USERS and wallet.wallet.user not in LNBITS_ADMIN_USERS) and (LNBITS_ADMIN_EXTENSIONS and pathname in LNBITS_ADMIN_EXTENSIONS):
- raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized.")
+ if (LNBITS_ADMIN_USERS and wallet.wallet.user not in LNBITS_ADMIN_USERS) and (
+ LNBITS_ADMIN_EXTENSIONS and pathname in LNBITS_ADMIN_EXTENSIONS
+ ):
+ raise HTTPException(
+ status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+ )
return wallet
except HTTPException as e:
if e.status_code == HTTPStatus.BAD_REQUEST:
@@ -147,9 +155,13 @@ async def get_key_type(
try:
checker = WalletInvoiceKeyChecker(api_key=token)
await checker.__call__(r)
- wallet = WalletTypeInfo(0, checker.wallet)
- if (LNBITS_ADMIN_USERS and wallet.wallet.user not in LNBITS_ADMIN_USERS) and (LNBITS_ADMIN_EXTENSIONS and pathname in LNBITS_ADMIN_EXTENSIONS):
- raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized.")
+ wallet = WalletTypeInfo(1, checker.wallet)
+ if (LNBITS_ADMIN_USERS and wallet.wallet.user not in LNBITS_ADMIN_USERS) and (
+ LNBITS_ADMIN_EXTENSIONS and pathname in LNBITS_ADMIN_EXTENSIONS
+ ):
+ raise HTTPException(
+ status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+ )
return wallet
except HTTPException as e:
if e.status_code == HTTPStatus.BAD_REQUEST:
diff --git a/lnbits/extensions/copilot/crud.py b/lnbits/extensions/copilot/crud.py
index e456334e..d0da044e 100644
--- a/lnbits/extensions/copilot/crud.py
+++ b/lnbits/extensions/copilot/crud.py
@@ -88,7 +88,7 @@ async def get_copilot(copilot_id: str) -> Copilots:
async def get_copilots(user: str) -> List[Copilots]:
rows = await db.fetchall(
- "SELECT * FROM copilot.newer_copilots WHERE user = ?", (user,)
+ 'SELECT * FROM copilot.newer_copilots WHERE "user" = ?', (user,)
)
return [Copilots(**row) for row in rows]
diff --git a/lnbits/extensions/discordbot/Pipfile b/lnbits/extensions/discordbot/Pipfile
new file mode 100644
index 00000000..d5820662
--- /dev/null
+++ b/lnbits/extensions/discordbot/Pipfile
@@ -0,0 +1,11 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3.9"
diff --git a/lnbits/extensions/discordbot/README.md b/lnbits/extensions/discordbot/README.md
new file mode 100644
index 00000000..a1408317
--- /dev/null
+++ b/lnbits/extensions/discordbot/README.md
@@ -0,0 +1,34 @@
+# Discord Bot
+
+## Provide LNbits wallets for all your Discord users
+
+_This extension is a modifed version of LNbits [User Manager](../usermanager/README.md)_
+
+The intended usage of this extension is to connect it to a specifically designed [Discord Bot](https://github.com/chrislennon/lnbits-discord-bot) leveraging LNbits as a community based lightning node.
+
+## Setup
+This bot can target [lnbits.com](https://lnbits.com) or a self hosted instance.
+
+To setup and run the bot instructions are located [here](https://github.com/chrislennon/lnbits-discord-bot#installation)
+
+## Usage
+This bot will allow users to interact with it in the following ways [full command list](https://github.com/chrislennon/lnbits-discord-bot#commands):
+
+`/create` Will create a wallet for the Discord user
+ - (currently limiting 1 Discord user == 1 LNbits user == 1 user wallet)
+
+
+
+`/balance` Will show the balance of the users wallet.
+
+
+
+`/tip @user [amount]` Will sent money from one user to another
+ - If the recieving user does not have a wallet, one will be created for them
+ - The receiving user will receive a direct message from the bot with a link to their wallet
+
+
+
+`/payme [amount] [description]` Will open an invoice that can be paid by any user
+
+
diff --git a/lnbits/extensions/discordbot/__init__.py b/lnbits/extensions/discordbot/__init__.py
new file mode 100644
index 00000000..ff60dd62
--- /dev/null
+++ b/lnbits/extensions/discordbot/__init__.py
@@ -0,0 +1,25 @@
+from fastapi import APIRouter
+from fastapi.staticfiles import StaticFiles
+
+from lnbits.db import Database
+from lnbits.helpers import template_renderer
+
+db = Database("ext_discordbot")
+
+discordbot_static_files = [
+ {
+ "path": "/discordbot/static",
+ "app": StaticFiles(directory="lnbits/extensions/discordbot/static"),
+ "name": "discordbot_static",
+ }
+]
+
+discordbot_ext: APIRouter = APIRouter(prefix="/discordbot", tags=["discordbot"])
+
+
+def discordbot_renderer():
+ return template_renderer(["lnbits/extensions/discordbot/templates"])
+
+
+from .views import * # noqa
+from .views_api import * # noqa
diff --git a/lnbits/extensions/discordbot/config.json b/lnbits/extensions/discordbot/config.json
new file mode 100644
index 00000000..eb674122
--- /dev/null
+++ b/lnbits/extensions/discordbot/config.json
@@ -0,0 +1,6 @@
+{
+ "name": "Discord Bot",
+ "short_description": "Generate users and wallets",
+ "icon": "person_add",
+ "contributors": ["bitcoingamer21"]
+}
diff --git a/lnbits/extensions/discordbot/crud.py b/lnbits/extensions/discordbot/crud.py
new file mode 100644
index 00000000..5661fcb4
--- /dev/null
+++ b/lnbits/extensions/discordbot/crud.py
@@ -0,0 +1,123 @@
+from typing import List, Optional
+
+from lnbits.core.crud import (
+ create_account,
+ create_wallet,
+ delete_wallet,
+ get_payments,
+ get_user,
+)
+from lnbits.core.models import Payment
+
+from . import db
+from .models import CreateUserData, Users, Wallets
+
+### Users
+
+
+async def create_discordbot_user(data: CreateUserData) -> Users:
+ account = await create_account()
+ user = await get_user(account.id)
+ assert user, "Newly created user couldn't be retrieved"
+
+ wallet = await create_wallet(user_id=user.id, wallet_name=data.wallet_name)
+
+ await db.execute(
+ """
+ INSERT INTO discordbot.users (id, name, admin, discord_id)
+ VALUES (?, ?, ?, ?)
+ """,
+ (user.id, data.user_name, data.admin_id, data.discord_id),
+ )
+
+ await db.execute(
+ """
+ INSERT INTO discordbot.wallets (id, admin, name, "user", adminkey, inkey)
+ VALUES (?, ?, ?, ?, ?, ?)
+ """,
+ (
+ wallet.id,
+ data.admin_id,
+ data.wallet_name,
+ user.id,
+ wallet.adminkey,
+ wallet.inkey,
+ ),
+ )
+
+ user_created = await get_discordbot_user(user.id)
+ assert user_created, "Newly created user couldn't be retrieved"
+ return user_created
+
+
+async def get_discordbot_user(user_id: str) -> Optional[Users]:
+ row = await db.fetchone("SELECT * FROM discordbot.users WHERE id = ?", (user_id,))
+ return Users(**row) if row else None
+
+
+async def get_discordbot_users(user_id: str) -> List[Users]:
+ rows = await db.fetchall(
+ "SELECT * FROM discordbot.users WHERE admin = ?", (user_id,)
+ )
+
+ return [Users(**row) for row in rows]
+
+
+async def delete_discordbot_user(user_id: str) -> None:
+ wallets = await get_discordbot_wallets(user_id)
+ for wallet in wallets:
+ await delete_wallet(user_id=user_id, wallet_id=wallet.id)
+
+ await db.execute("DELETE FROM discordbot.users WHERE id = ?", (user_id,))
+ await db.execute("""DELETE FROM discordbot.wallets WHERE "user" = ?""", (user_id,))
+
+
+### Wallets
+
+
+async def create_discordbot_wallet(
+ user_id: str, wallet_name: str, admin_id: str
+) -> Wallets:
+ wallet = await create_wallet(user_id=user_id, wallet_name=wallet_name)
+ await db.execute(
+ """
+ INSERT INTO discordbot.wallets (id, admin, name, "user", adminkey, inkey)
+ VALUES (?, ?, ?, ?, ?, ?)
+ """,
+ (wallet.id, admin_id, wallet_name, user_id, wallet.adminkey, wallet.inkey),
+ )
+ wallet_created = await get_discordbot_wallet(wallet.id)
+ assert wallet_created, "Newly created wallet couldn't be retrieved"
+ return wallet_created
+
+
+async def get_discordbot_wallet(wallet_id: str) -> Optional[Wallets]:
+ row = await db.fetchone(
+ "SELECT * FROM discordbot.wallets WHERE id = ?", (wallet_id,)
+ )
+ return Wallets(**row) if row else None
+
+
+async def get_discordbot_wallets(admin_id: str) -> Optional[Wallets]:
+ rows = await db.fetchall(
+ "SELECT * FROM discordbot.wallets WHERE admin = ?", (admin_id,)
+ )
+ return [Wallets(**row) for row in rows]
+
+
+async def get_discordbot_users_wallets(user_id: str) -> Optional[Wallets]:
+ rows = await db.fetchall(
+ """SELECT * FROM discordbot.wallets WHERE "user" = ?""", (user_id,)
+ )
+ return [Wallets(**row) for row in rows]
+
+
+async def get_discordbot_wallet_transactions(wallet_id: str) -> Optional[Payment]:
+ return await get_payments(
+ wallet_id=wallet_id, complete=True, pending=False, outgoing=True, incoming=True
+ )
+
+
+async def delete_discordbot_wallet(wallet_id: str, user_id: str) -> None:
+ await delete_wallet(user_id=user_id, wallet_id=wallet_id)
+ await db.execute("DELETE FROM discordbot.wallets WHERE id = ?", (wallet_id,))
diff --git a/lnbits/extensions/discordbot/migrations.py b/lnbits/extensions/discordbot/migrations.py
new file mode 100644
index 00000000..ababfd7a
--- /dev/null
+++ b/lnbits/extensions/discordbot/migrations.py
@@ -0,0 +1,30 @@
+async def m001_initial(db):
+ """
+ Initial users table.
+ """
+ await db.execute(
+ """
+ CREATE TABLE discordbot.users (
+ id TEXT PRIMARY KEY,
+ name TEXT NOT NULL,
+ admin TEXT NOT NULL,
+ discord_id TEXT
+ );
+ """
+ )
+
+ """
+ Initial wallets table.
+ """
+ await db.execute(
+ """
+ CREATE TABLE discordbot.wallets (
+ id TEXT PRIMARY KEY,
+ admin TEXT NOT NULL,
+ name TEXT NOT NULL,
+ "user" TEXT NOT NULL,
+ adminkey TEXT NOT NULL,
+ inkey TEXT NOT NULL
+ );
+ """
+ )
diff --git a/lnbits/extensions/discordbot/models.py b/lnbits/extensions/discordbot/models.py
new file mode 100644
index 00000000..985eb096
--- /dev/null
+++ b/lnbits/extensions/discordbot/models.py
@@ -0,0 +1,38 @@
+from sqlite3 import Row
+
+from fastapi.param_functions import Query
+from pydantic import BaseModel
+from typing import Optional
+
+
+class CreateUserData(BaseModel):
+ user_name: str = Query(...)
+ wallet_name: str = Query(...)
+ admin_id: str = Query(...)
+ discord_id: str = Query("")
+
+
+class CreateUserWallet(BaseModel):
+ user_id: str = Query(...)
+ wallet_name: str = Query(...)
+ admin_id: str = Query(...)
+
+
+class Users(BaseModel):
+ id: str
+ name: str
+ admin: str
+ discord_id: str
+
+
+class Wallets(BaseModel):
+ id: str
+ admin: str
+ name: str
+ user: str
+ adminkey: str
+ inkey: str
+
+ @classmethod
+ def from_row(cls, row: Row) -> "Wallets":
+ return cls(**dict(row))
diff --git a/lnbits/extensions/discordbot/static/stack.png b/lnbits/extensions/discordbot/static/stack.png
new file mode 100644
index 00000000..3b987db1
Binary files /dev/null and b/lnbits/extensions/discordbot/static/stack.png differ
diff --git a/lnbits/extensions/discordbot/templates/discordbot/_api_docs.html b/lnbits/extensions/discordbot/templates/discordbot/_api_docs.html
new file mode 100644
index 00000000..40fcfb12
--- /dev/null
+++ b/lnbits/extensions/discordbot/templates/discordbot/_api_docs.html
@@ -0,0 +1,260 @@
+
+
+
+
+ Discord Bot: Connect Discord users to LNbits.
+
+
+ Connect your LNbits instance to a Discord Bot leveraging LNbits as a community based lightning node.
+
+ Created by, Chris Lennon
+
+ Based on User Manager, by Ben Arc
+
+
+
+
+
+
+
+
+ GET
+ /discordbot/api/v1/users
+ Body (application/json)
+
+ Returns 201 CREATED (application/json)
+
+ JSON list of users
+ Curl example
+ curl -X GET {{ request.base_url }}discordbot/api/v1/users -H
+ "X-Api-Key: {{ user.wallets[0].inkey }}"
+
+
+
+
+
+
+
+ GET
+ /discordbot/api/v1/users/<user_id>
+ Body (application/json)
+
+ Returns 201 CREATED (application/json)
+
+ JSON list of users
+ Curl example
+ curl -X GET {{ request.base_url
+ }}discordbot/api/v1/users/<user_id> -H "X-Api-Key: {{
+ user.wallets[0].inkey }}"
+
+
+
+
+
+
+
+ GET
+ /discordbot/api/v1/wallets/<user_id>
+ Headers
+ {"X-Api-Key": <string>}
+ Body (application/json)
+
+ Returns 201 CREATED (application/json)
+
+ JSON wallet data
+ Curl example
+ curl -X GET {{ request.base_url
+ }}discordbot/api/v1/wallets/<user_id> -H "X-Api-Key: {{
+ user.wallets[0].inkey }}"
+
+
+
+
+
+
+
+ GET
+ /discordbot/api/v1/wallets<wallet_id>
+ Headers
+ {"X-Api-Key": <string>}
+ Body (application/json)
+
+ Returns 201 CREATED (application/json)
+
+ JSON a wallets transactions
+ Curl example
+ curl -X GET {{ request.base_url
+ }}discordbot/api/v1/wallets<wallet_id> -H "X-Api-Key: {{
+ user.wallets[0].inkey }}"
+
+
+
+
+
+
+
+ POST
+ /discordbot/api/v1/users
+ Headers
+ {"X-Api-Key": <string>, "Content-type":
+ "application/json"}
+
+ Body (application/json) - "admin_id" is a YOUR user ID
+
+ {"admin_id": <string>, "user_name": <string>,
+ "wallet_name": <string>,"discord_id": <string>}
+
+ Returns 201 CREATED (application/json)
+
+ {"id": <string>, "name": <string>, "admin":
+ <string>, "discord_id": <string>}
+ Curl example
+ curl -X POST {{ request.base_url }}discordbot/api/v1/users -d
+ '{"admin_id": "{{ user.id }}", "wallet_name": <string>,
+ "user_name": <string>, "discord_id": <string>}' -H "X-Api-Key: {{
+ user.wallets[0].inkey }}" -H "Content-type: application/json"
+
+
+
+
+
+
+
+ POST
+ /discordbot/api/v1/wallets
+ Headers
+ {"X-Api-Key": <string>, "Content-type":
+ "application/json"}
+
+ Body (application/json) - "admin_id" is a YOUR user ID
+
+ {"user_id": <string>, "wallet_name": <string>,
+ "admin_id": <string>}
+
+ Returns 201 CREATED (application/json)
+
+ {"id": <string>, "admin": <string>, "name":
+ <string>, "user": <string>, "adminkey": <string>,
+ "inkey": <string>}
+ Curl example
+ curl -X POST {{ request.base_url }}discordbot/api/v1/wallets -d
+ '{"user_id": <string>, "wallet_name": <string>,
+ "admin_id": "{{ user.id }}"}' -H "X-Api-Key: {{ user.wallets[0].inkey
+ }}" -H "Content-type: application/json"
+
+
+
+
+
+
+
+ DELETE
+ /discordbot/api/v1/users/<user_id>
+ Headers
+ {"X-Api-Key": <string>}
+ Curl example
+ curl -X DELETE {{ request.base_url
+ }}discordbot/api/v1/users/<user_id> -H "X-Api-Key: {{
+ user.wallets[0].inkey }}"
+
+
+
+
+
+
+
+ DELETE
+ /discordbot/api/v1/wallets/<wallet_id>
+ Headers
+ {"X-Api-Key": <string>}
+ Curl example
+ curl -X DELETE {{ request.base_url
+ }}discordbot/api/v1/wallets/<wallet_id> -H "X-Api-Key: {{
+ user.wallets[0].inkey }}"
+
+
+
+
+
+
+
+ POST
+ /discordbot/api/v1/extensions
+ Headers
+ {"X-Api-Key": <string>}
+ Curl example
+ curl -X POST {{ request.base_url }}discordbot/api/v1/extensions -d
+ '{"userid": <string>, "extension": <string>, "active":
+ <integer>}' -H "X-Api-Key: {{ user.wallets[0].inkey }}" -H
+ "Content-type: application/json"
+
+
+
+
+
diff --git a/lnbits/extensions/discordbot/templates/discordbot/index.html b/lnbits/extensions/discordbot/templates/discordbot/index.html
new file mode 100644
index 00000000..782f8bb6
--- /dev/null
+++ b/lnbits/extensions/discordbot/templates/discordbot/index.html
@@ -0,0 +1,464 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %}
+
+
+
+
+ 
+
+ Soon™ there will be a much easier one-click install discord bot...
+
+
+
+
+
+
+
+ Users
+
+
+ Export to CSV
+
+
+
+ {% raw %}
+
+
+
+ {{ col.label }}
+
+
+
+
+
+
+ {{ col.value }}
+
+
+
+
+
+ {% endraw %}
+
+
+
+
+
+
+
+
+ Wallets
+
+
+ Export to CSV
+
+
+
+ {% raw %}
+
+
+
+ {{ col.label }}
+
+
+
+
+
+
+ Link to wallet
+
+
+ {{ col.value }}
+
+
+
+
+
+ {% endraw %}
+
+
+
+
+
+
+
+
+ LNbits Discord Bot Extension
+
+
+
+
+ {% include "discordbot/_api_docs.html" %}
+
+
+
+
+
+
+
+ Create User
+ Cancel
+
+
+
+
+
+
+
+
+
+ Create Wallet
+ Cancel
+
+
+
+
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+
+{% endblock %}
diff --git a/lnbits/extensions/discordbot/views.py b/lnbits/extensions/discordbot/views.py
new file mode 100644
index 00000000..a5395e21
--- /dev/null
+++ b/lnbits/extensions/discordbot/views.py
@@ -0,0 +1,15 @@
+from fastapi import Request
+from fastapi.params import Depends
+from starlette.responses import HTMLResponse
+
+from lnbits.core.models import User
+from lnbits.decorators import check_user_exists
+
+from . import discordbot_ext, discordbot_renderer
+
+
+@discordbot_ext.get("/", response_class=HTMLResponse)
+async def index(request: Request, user: User = Depends(check_user_exists)):
+ return discordbot_renderer().TemplateResponse(
+ "discordbot/index.html", {"request": request, "user": user.dict()}
+ )
diff --git a/lnbits/extensions/discordbot/views_api.py b/lnbits/extensions/discordbot/views_api.py
new file mode 100644
index 00000000..6f213a89
--- /dev/null
+++ b/lnbits/extensions/discordbot/views_api.py
@@ -0,0 +1,125 @@
+from http import HTTPStatus
+
+from fastapi import Query
+from fastapi.params import Depends
+from starlette.exceptions import HTTPException
+
+from lnbits.core import update_user_extension
+from lnbits.core.crud import get_user
+from lnbits.decorators import WalletTypeInfo, get_key_type
+
+from . import discordbot_ext
+from .crud import (
+ create_discordbot_user,
+ create_discordbot_wallet,
+ delete_discordbot_user,
+ delete_discordbot_wallet,
+ get_discordbot_user,
+ get_discordbot_users,
+ get_discordbot_users_wallets,
+ get_discordbot_wallet,
+ get_discordbot_wallet_transactions,
+ get_discordbot_wallets,
+)
+from .models import CreateUserData, CreateUserWallet
+
+# Users
+
+
+@discordbot_ext.get("/api/v1/users", status_code=HTTPStatus.OK)
+async def api_discordbot_users(wallet: WalletTypeInfo = Depends(get_key_type)):
+ user_id = wallet.wallet.user
+ return [user.dict() for user in await get_discordbot_users(user_id)]
+
+
+@discordbot_ext.get("/api/v1/users/{user_id}", status_code=HTTPStatus.OK)
+async def api_discordbot_user(user_id, wallet: WalletTypeInfo = Depends(get_key_type)):
+ user = await get_discordbot_user(user_id)
+ return user.dict()
+
+
+@discordbot_ext.post("/api/v1/users", status_code=HTTPStatus.CREATED)
+async def api_discordbot_users_create(
+ data: CreateUserData, wallet: WalletTypeInfo = Depends(get_key_type)
+):
+ user = await create_discordbot_user(data)
+ full = user.dict()
+ full["wallets"] = [
+ wallet.dict() for wallet in await get_discordbot_users_wallets(user.id)
+ ]
+ return full
+
+
+@discordbot_ext.delete("/api/v1/users/{user_id}")
+async def api_discordbot_users_delete(
+ user_id, wallet: WalletTypeInfo = Depends(get_key_type)
+):
+ user = await get_discordbot_user(user_id)
+ if not user:
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND, detail="User does not exist."
+ )
+ await delete_discordbot_user(user_id)
+ raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+
+
+# Activate Extension
+
+
+@discordbot_ext.post("/api/v1/extensions")
+async def api_discordbot_activate_extension(
+ extension: str = Query(...), userid: str = Query(...), active: bool = Query(...)
+):
+ user = await get_user(userid)
+ if not user:
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND, detail="User does not exist."
+ )
+ update_user_extension(user_id=userid, extension=extension, active=active)
+ return {"extension": "updated"}
+
+
+# Wallets
+
+
+@discordbot_ext.post("/api/v1/wallets")
+async def api_discordbot_wallets_create(
+ data: CreateUserWallet, wallet: WalletTypeInfo = Depends(get_key_type)
+):
+ user = await create_discordbot_wallet(
+ user_id=data.user_id, wallet_name=data.wallet_name, admin_id=data.admin_id
+ )
+ return user.dict()
+
+
+@discordbot_ext.get("/api/v1/wallets")
+async def api_discordbot_wallets(wallet: WalletTypeInfo = Depends(get_key_type)):
+ admin_id = wallet.wallet.user
+ return [wallet.dict() for wallet in await get_discordbot_wallets(admin_id)]
+
+
+@discordbot_ext.get("/api/v1/transactions/{wallet_id}")
+async def api_discordbot_wallet_transactions(
+ wallet_id, wallet: WalletTypeInfo = Depends(get_key_type)
+):
+ return await get_discordbot_wallet_transactions(wallet_id)
+
+
+@discordbot_ext.get("/api/v1/wallets/{user_id}")
+async def api_discordbot_users_wallets(
+ user_id, wallet: WalletTypeInfo = Depends(get_key_type)
+):
+ return [s_wallet.dict() for s_wallet in await get_discordbot_users_wallets(user_id)]
+
+
+@discordbot_ext.delete("/api/v1/wallets/{wallet_id}")
+async def api_discordbot_wallets_delete(
+ wallet_id, wallet: WalletTypeInfo = Depends(get_key_type)
+):
+ get_wallet = await get_discordbot_wallet(wallet_id)
+ if not get_wallet:
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND, detail="Wallet does not exist."
+ )
+ await delete_discordbot_wallet(wallet_id, get_wallet.user)
+ raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
diff --git a/lnbits/extensions/events/crud.py b/lnbits/extensions/events/crud.py
index 9c6e5c6b..9e04476d 100644
--- a/lnbits/extensions/events/crud.py
+++ b/lnbits/extensions/events/crud.py
@@ -76,7 +76,7 @@ async def delete_ticket(payment_hash: str) -> None:
async def delete_event_tickets(event_id: str) -> None:
- await db.execute("DELETE FROM events.tickets WHERE event = ?", (event_id,))
+ await db.execute("DELETE FROM events.ticket WHERE event = ?", (event_id,))
# EVENTS
diff --git a/lnbits/extensions/example/README.md b/lnbits/extensions/example/README.md
new file mode 100644
index 00000000..27729459
--- /dev/null
+++ b/lnbits/extensions/example/README.md
@@ -0,0 +1,11 @@
+Example Extension
+*tagline*
+This is an example extension to help you organise and build you own.
+
+Try to include an image
+
+
+
+If your extension has API endpoints, include useful ones here
+
+curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/YOUR-EXTENSION/api/v1/EXAMPLE -d '{"amount":"100","memo":"example"}' -H "X-Api-Key: YOUR_WALLET-ADMIN/INVOICE-KEY"
diff --git a/lnbits/extensions/example/__init__.py b/lnbits/extensions/example/__init__.py
new file mode 100644
index 00000000..96cc6428
--- /dev/null
+++ b/lnbits/extensions/example/__init__.py
@@ -0,0 +1,16 @@
+from fastapi import APIRouter
+
+from lnbits.db import Database
+from lnbits.helpers import template_renderer
+
+db = Database("ext_example")
+
+example_ext: APIRouter = APIRouter(prefix="/example", tags=["example"])
+
+
+def example_renderer():
+ return template_renderer(["lnbits/extensions/example/templates"])
+
+
+from .views import * # noqa
+from .views_api import * # noqa
diff --git a/lnbits/extensions/example/example.config.json b/lnbits/extensions/example/example.config.json
new file mode 100644
index 00000000..b8eec193
--- /dev/null
+++ b/lnbits/extensions/example/example.config.json
@@ -0,0 +1,6 @@
+{
+ "name": "Build your own!!",
+ "short_description": "Join us, make an extension",
+ "icon": "info",
+ "contributors": ["github_username"]
+}
diff --git a/lnbits/extensions/example/migrations.py b/lnbits/extensions/example/migrations.py
new file mode 100644
index 00000000..99d7c362
--- /dev/null
+++ b/lnbits/extensions/example/migrations.py
@@ -0,0 +1,10 @@
+# async def m001_initial(db):
+# await db.execute(
+# f"""
+# CREATE TABLE example.example (
+# id TEXT PRIMARY KEY,
+# wallet TEXT NOT NULL,
+# time TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
+# );
+# """
+# )
diff --git a/lnbits/extensions/example/models.py b/lnbits/extensions/example/models.py
new file mode 100644
index 00000000..bfeb7517
--- /dev/null
+++ b/lnbits/extensions/example/models.py
@@ -0,0 +1,5 @@
+# from pydantic import BaseModel
+
+# class Example(BaseModel):
+# id: str
+# wallet: str
diff --git a/lnbits/extensions/example/templates/example/index.html b/lnbits/extensions/example/templates/example/index.html
new file mode 100644
index 00000000..d732ef37
--- /dev/null
+++ b/lnbits/extensions/example/templates/example/index.html
@@ -0,0 +1,59 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %}
+
+
+
+ Frameworks used by {{SITE_TITLE}}
+
+
+
+ {% raw %}
+
+
+ {{ tool.name }}
+ {{ tool.language }}
+
+ {% endraw %}
+
+
+
+ A magical "g" is always available, with info about the user, wallets and
+ extensions:
+
+ {% raw %}{{ g }}{% endraw %}
+
+
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+
+{% endblock %}
diff --git a/lnbits/extensions/example/views.py b/lnbits/extensions/example/views.py
new file mode 100644
index 00000000..252b4726
--- /dev/null
+++ b/lnbits/extensions/example/views.py
@@ -0,0 +1,18 @@
+from fastapi import FastAPI, Request
+from fastapi.params import Depends
+from fastapi.templating import Jinja2Templates
+from starlette.responses import HTMLResponse
+
+from lnbits.core.models import User
+from lnbits.decorators import check_user_exists
+
+from . import example_ext, example_renderer
+
+templates = Jinja2Templates(directory="templates")
+
+
+@example_ext.get("/", response_class=HTMLResponse)
+async def index(request: Request, user: User = Depends(check_user_exists)):
+ return example_renderer().TemplateResponse(
+ "example/index.html", {"request": request, "user": user.dict()}
+ )
diff --git a/lnbits/extensions/example/views_api.py b/lnbits/extensions/example/views_api.py
new file mode 100644
index 00000000..5b702717
--- /dev/null
+++ b/lnbits/extensions/example/views_api.py
@@ -0,0 +1,35 @@
+# views_api.py is for you API endpoints that could be hit by another service
+
+# add your dependencies here
+
+# import httpx
+# (use httpx just like requests, except instead of response.ok there's only the
+# response.is_error that is its inverse)
+
+from . import example_ext
+
+# add your endpoints here
+
+
+@example_ext.get("/api/v1/tools")
+async def api_example():
+ """Try to add descriptions for others."""
+ tools = [
+ {
+ "name": "fastAPI",
+ "url": "https://fastapi.tiangolo.com/",
+ "language": "Python",
+ },
+ {
+ "name": "Vue.js",
+ "url": "https://vuejs.org/",
+ "language": "JavaScript",
+ },
+ {
+ "name": "Quasar Framework",
+ "url": "https://quasar.dev/",
+ "language": "JavaScript",
+ },
+ ]
+
+ return tools
diff --git a/lnbits/extensions/jukebox/crud.py b/lnbits/extensions/jukebox/crud.py
index 14dc4760..d160daee 100644
--- a/lnbits/extensions/jukebox/crud.py
+++ b/lnbits/extensions/jukebox/crud.py
@@ -12,7 +12,7 @@ async def create_jukebox(
juke_id = urlsafe_short_hash()
result = await db.execute(
"""
- INSERT INTO jukebox.jukebox (id, user, title, wallet, sp_user, sp_secret, sp_access_token, sp_refresh_token, sp_device, sp_playlists, price, profit)
+ INSERT INTO jukebox.jukebox (id, "user", title, wallet, sp_user, sp_secret, sp_access_token, sp_refresh_token, sp_device, sp_playlists, price, profit)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
""",
(
@@ -41,6 +41,7 @@ async def update_jukebox(
q = ", ".join([f"{field[0]} = ?" for field in data])
items = [f"{field[1]}" for field in data]
items.append(juke_id)
+ q = q.replace("user", '"user"', 1) # hack to make user be "user"!
await db.execute(f"UPDATE jukebox.jukebox SET {q} WHERE id = ?", (items))
row = await db.fetchone("SELECT * FROM jukebox.jukebox WHERE id = ?", (juke_id,))
return Jukebox(**row) if row else None
@@ -57,11 +58,11 @@ async def get_jukebox_by_user(user: str) -> Optional[Jukebox]:
async def get_jukeboxs(user: str) -> List[Jukebox]:
- rows = await db.fetchall("SELECT * FROM jukebox.jukebox WHERE user = ?", (user,))
+ rows = await db.fetchall('SELECT * FROM jukebox.jukebox WHERE "user" = ?', (user,))
for row in rows:
if row.sp_playlists == None:
await delete_jukebox(row.id)
- rows = await db.fetchall("SELECT * FROM jukebox.jukebox WHERE user = ?", (user,))
+ rows = await db.fetchall('SELECT * FROM jukebox.jukebox WHERE "user" = ?', (user,))
return [Jukebox(**row) for row in rows]
diff --git a/lnbits/extensions/jukebox/views_api.py b/lnbits/extensions/jukebox/views_api.py
index 421ebf3a..1f3723a7 100644
--- a/lnbits/extensions/jukebox/views_api.py
+++ b/lnbits/extensions/jukebox/views_api.py
@@ -75,7 +75,6 @@ async def api_check_credentials_check(
juke_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)
):
jukebox = await get_jukebox(juke_id)
-
return jukebox
@@ -442,7 +441,7 @@ async def api_get_jukebox_currently(
token = await api_get_token(juke_id)
if token == False:
raise HTTPException(
- status_code=HTTPStatus.FORBIDDEN, detail="INvoice not paid"
+ status_code=HTTPStatus.FORBIDDEN, detail="Invoice not paid"
)
elif retry:
raise HTTPException(
@@ -456,5 +455,6 @@ async def api_get_jukebox_currently(
)
except:
raise HTTPException(
- status_code=HTTPStatus.NOT_FOUND, detail="Something went wrong"
+ status_code=HTTPStatus.NOT_FOUND,
+ detail="Something went wrong, or no song is playing yet",
)
diff --git a/lnbits/extensions/livestream/views.py b/lnbits/extensions/livestream/views.py
index 4f1bd1c5..ef035431 100644
--- a/lnbits/extensions/livestream/views.py
+++ b/lnbits/extensions/livestream/views.py
@@ -1,4 +1,5 @@
from http import HTTPStatus
+
# from mmap import MAP_DENYWRITE
from fastapi.param_functions import Depends
diff --git a/lnbits/extensions/lnticket/templates/lnticket/index.html b/lnbits/extensions/lnticket/templates/lnticket/index.html
index 1607925b..6572d98a 100644
--- a/lnbits/extensions/lnticket/templates/lnticket/index.html
+++ b/lnbits/extensions/lnticket/templates/lnticket/index.html
@@ -117,9 +117,10 @@
{% raw %}
+
- {{ col.label }}
+ {{ col.label }}
@@ -136,9 +137,19 @@
:href="'mailto:' + props.row.email"
>
+
+ Click to show ticket
- {{ col.value }}
+ {{ col.label == "Ticket" ? col.value.length > 20 ? `${col.value.substring(0, 20)}...` : col.value : col.value }}
@@ -249,6 +260,29 @@
+
+
+
+ {% raw %}
+
+
+ {{this.ticketDialog.data.name}} sent a ticket
+
+
+ {{this.ticketDialog.data.email}}
+
+ {{this.ticketDialog.data.date}}
+
+
+ {{this.ticketDialog.data.content}}
+
+ {% endraw %}
+
+
+
+
{% endblock %} {% block scripts %} {{ window_vars(user) }}
+{% endblock %}
\ No newline at end of file
diff --git a/lnbits/extensions/withdraw/templates/withdraw/index.html b/lnbits/extensions/withdraw/templates/withdraw/index.html
index 4cffbc38..f6ea220d 100644
--- a/lnbits/extensions/withdraw/templates/withdraw/index.html
+++ b/lnbits/extensions/withdraw/templates/withdraw/index.html
@@ -1,49 +1,38 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block scripts %} {{ window_vars(user) }}
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context %} {% block scripts %} {{ window_vars(user) }}
{% endblock %} {% block page %}
-
-
-
- Quick vouchers
- Advanced withdraw link(s)
-
-
+
+
+
+ Quick vouchers
+ Advanced withdraw link(s)
+
+
-
-
-
-
- Withdraw links
-
-
- Export to CSV
-
-
-
- {% raw %}
-
+
+
+
+
+ Withdraw links
+
+
+ Export to CSV
+
+
+
+ {% raw %}
+
{{ col.label }}
-
+
embeddable image csv list
{{ col.value }}
+
+
+ Webhook to {{ props.row.webhook_url}}
+
+
-
- {% endraw %}
-
-
-
-
+ {% endraw %}
+
+
+
+
-
-
-
-
- {{SITE_TITLE}} LNURL-withdraw extension
-
-
-
-
- {% include "withdraw/_api_docs.html" %}
-
-
-
-
+
+
+
+
+ {{SITE_TITLE}} LNURL-withdraw extension
+
+
+
+
+ {% include "withdraw/_api_docs.html" %}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Use unique withdraw QR codes to reduce
- `assmilking`
- This is recommended if you are sharing the links on social
- media or print QR codes.
-
-
-
-
- Update withdraw link
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Use unique withdraw QR codes to reduce `assmilking`
+
+ This is recommended if you are sharing the links on social media or print QR codes.
+
+
+
+
+ Update withdraw link
+ Create withdraw link
- Cancel
-
-
-
-
+ formDialog.data.wait_time == null" type="submit">Create withdraw link
+ Cancel
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+ Create vouchers
- Cancel
-
-
-
-
+ simpleformDialog.data.uses == null" type="submit">Create vouchers
+ Cancel
+
+
+
+
-
-
-
-
-
- ID: {{ qrCodeDialog.data.id }}
- Unique: {{ qrCodeDialog.data.is_unique }}
+
+
+
+
+
+ ID: {{ qrCodeDialog.data.id }}
+ Unique: {{ qrCodeDialog.data.is_unique }}
(QR code will change after each withdrawal)
Max. withdrawable: {{
@@ -356,4 +259,4 @@
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/lnbits/extensions/withdraw/views.py b/lnbits/extensions/withdraw/views.py
index c409919a..1f059a4b 100644
--- a/lnbits/extensions/withdraw/views.py
+++ b/lnbits/extensions/withdraw/views.py
@@ -102,3 +102,38 @@ async def print_qr(request: Request, link_id):
return withdraw_renderer().TemplateResponse(
"withdraw/print_qr.html", {"request": request, "link": linked, "unique": True}
)
+
+
+@withdraw_ext.get("/csv/{link_id}", response_class=HTMLResponse)
+async def print_qr(request: Request, link_id):
+ link = await get_withdraw_link(link_id)
+ if not link:
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND, detail="Withdraw link does not exist."
+ )
+ # response.status_code = HTTPStatus.NOT_FOUND
+ # return "Withdraw link does not exist."
+
+ if link.uses == 0:
+
+ return withdraw_renderer().TemplateResponse(
+ "withdraw/csv.html",
+ {"request": request, "link": link.dict(), "unique": False},
+ )
+ links = []
+ count = 0
+
+ for x in link.usescsv.split(","):
+ linkk = await get_withdraw_link(link_id, count)
+ if not linkk:
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND, detail="Withdraw link does not exist."
+ )
+ links.append(str(linkk.lnurl(request)))
+ count = count + 1
+ page_link = list(chunks(links, 2))
+ linked = list(chunks(page_link, 5))
+
+ return withdraw_renderer().TemplateResponse(
+ "withdraw/csv.html", {"request": request, "link": linked, "unique": True}
+ )
diff --git a/lnbits/extensions/withdraw/views_api.py b/lnbits/extensions/withdraw/views_api.py
index e5c4c2d0..027b2925 100644
--- a/lnbits/extensions/withdraw/views_api.py
+++ b/lnbits/extensions/withdraw/views_api.py
@@ -71,6 +71,14 @@ async def api_link_create_or_update(
link_id: str = None,
wallet: WalletTypeInfo = Depends(require_admin_key),
):
+ if data.uses > 250:
+ raise HTTPException(detail="250 uses max.", status_code=HTTPStatus.BAD_REQUEST)
+
+ if data.min_withdrawable < 1:
+ raise HTTPException(
+ detail="Min must be more than 1.", status_code=HTTPStatus.BAD_REQUEST
+ )
+
if data.max_withdrawable < data.min_withdrawable:
raise HTTPException(
detail="`max_withdrawable` needs to be at least `min_withdrawable`.",
diff --git a/lnbits/helpers.py b/lnbits/helpers.py
index d2616375..c456d468 100644
--- a/lnbits/helpers.py
+++ b/lnbits/helpers.py
@@ -6,11 +6,10 @@ from typing import Any, List, NamedTuple, Optional
import jinja2
import shortuuid # type: ignore
+import lnbits.settings as settings
from lnbits.jinja2_templating import Jinja2Templates
from lnbits.requestvars import g
-import lnbits.settings as settings
-
class Extension(NamedTuple):
code: str
@@ -26,7 +25,9 @@ class Extension(NamedTuple):
class ExtensionManager:
def __init__(self):
self._disabled: List[str] = settings.LNBITS_DISABLED_EXTENSIONS
- self._admin_only: List[str] = [x.strip(' ') for x in settings.LNBITS_ADMIN_EXTENSIONS]
+ self._admin_only: List[str] = [
+ x.strip(" ") for x in settings.LNBITS_ADMIN_EXTENSIONS
+ ]
self._extension_folders: List[str] = [
x[1] for x in os.walk(os.path.join(settings.LNBITS_PATH, "extensions"))
][0]
@@ -160,6 +161,10 @@ def template_renderer(additional_folders: List = []) -> Jinja2Templates:
["lnbits/templates", "lnbits/core/templates", *additional_folders]
)
)
+
+ if settings.LNBITS_AD_SPACE:
+ t.env.globals["AD_SPACE"] = settings.LNBITS_AD_SPACE
+ t.env.globals["HIDE_API"] = settings.LNBITS_HIDE_API
t.env.globals["SITE_TITLE"] = settings.LNBITS_SITE_TITLE
t.env.globals["LNBITS_DENOMINATION"] = settings.LNBITS_DENOMINATION
t.env.globals["SITE_TAGLINE"] = settings.LNBITS_SITE_TAGLINE
@@ -167,6 +172,8 @@ def template_renderer(additional_folders: List = []) -> Jinja2Templates:
t.env.globals["LNBITS_THEME_OPTIONS"] = settings.LNBITS_THEME_OPTIONS
t.env.globals["LNBITS_VERSION"] = settings.LNBITS_COMMIT
t.env.globals["EXTENSIONS"] = get_valid_extensions()
+ if settings.LNBITS_CUSTOM_LOGO:
+ t.env.globals["USE_CUSTOM_LOGO"] = settings.LNBITS_CUSTOM_LOGO
if settings.DEBUG:
t.env.globals["VENDORED_JS"] = map(url_for_vendored, get_js_vendored())
diff --git a/lnbits/settings.py b/lnbits/settings.py
index 26699bc0..18537b84 100644
--- a/lnbits/settings.py
+++ b/lnbits/settings.py
@@ -1,10 +1,9 @@
-import subprocess
import importlib
-
-from environs import Env # type: ignore
+import subprocess
from os import path
from typing import List
+from environs import Env # type: ignore
env = Env()
env.read_env()
@@ -29,11 +28,15 @@ LNBITS_ALLOWED_USERS: List[str] = env.list(
"LNBITS_ALLOWED_USERS", default=[], subcast=str
)
LNBITS_ADMIN_USERS: List[str] = env.list("LNBITS_ADMIN_USERS", default=[], subcast=str)
-LNBITS_ADMIN_EXTENSIONS: List[str] = env.list("LNBITS_ADMIN_EXTENSIONS", default=[], subcast=str)
+LNBITS_ADMIN_EXTENSIONS: List[str] = env.list(
+ "LNBITS_ADMIN_EXTENSIONS", default=[], subcast=str
+)
LNBITS_DISABLED_EXTENSIONS: List[str] = env.list(
"LNBITS_DISABLED_EXTENSIONS", default=[], subcast=str
)
+LNBITS_AD_SPACE = env.list("LNBITS_AD_SPACE", default=[])
+LNBITS_HIDE_API = env.bool("LNBITS_HIDE_API", default=False)
LNBITS_SITE_TITLE = env.str("LNBITS_SITE_TITLE", default="LNbits")
LNBITS_DENOMINATION = env.str("LNBITS_DENOMINATION", default="sats")
LNBITS_SITE_TAGLINE = env.str(
@@ -45,6 +48,7 @@ LNBITS_THEME_OPTIONS: List[str] = env.list(
default="classic, flamingo, mint, salvador, monochrome, autumn",
subcast=str,
)
+LNBITS_CUSTOM_LOGO = env.str("LNBITS_CUSTOM_LOGO", default="")
WALLET = wallet_class()
DEFAULT_WALLET_NAME = env.str("LNBITS_DEFAULT_WALLET_NAME", default="LNbits wallet")
diff --git a/lnbits/static/images/templatead.png b/lnbits/static/images/templatead.png
new file mode 100644
index 00000000..c369b91a
Binary files /dev/null and b/lnbits/static/images/templatead.png differ
diff --git a/lnbits/static/scss/base.scss b/lnbits/static/scss/base.scss
index afafd50d..3668e773 100644
--- a/lnbits/static/scss/base.scss
+++ b/lnbits/static/scss/base.scss
@@ -1,186 +1,143 @@
-$themes: (
- 'classic': (
- primary: #673ab7,
- secondary: #9c27b0,
- dark: #1f2234,
- info: #333646,
- marginal-bg: #1f2234,
- marginal-text: #fff
- ),
- 'bitcoin': (
- primary: #ff9853,
- secondary: #ff7353,
- dark: #2d293b,
- info: #333646,
- marginal-bg: #2d293b,
- marginal-text: #fff
- ),
- 'mint': (
- primary: #3ab77d,
- secondary: #27b065,
- dark: #1f342b,
- info: #334642,
- marginal-bg: #1f342b,
- marginal-text: #fff
- ),
- 'autumn': (
- primary: #b7763a,
- secondary: #b07927,
- dark: #34291f,
- info: #463f33,
- marginal-bg: #342a1f,
- marginal-text: rgb(255, 255, 255)
- ),
- 'flamingo': (
- primary: #d11d53,
- secondary: #db3e6d,
- dark: #803a45,
- info: #ec7599,
- marginal-bg: #803a45,
- marginal-text: rgb(255, 255, 255)
- ),
- 'monochrome': (
- primary: #494949,
- secondary: #6b6b6b,
- dark: #000,
- info: rgb(39, 39, 39),
- marginal-bg: #000,
- marginal-text: rgb(255, 255, 255)
- )
-);
-
-@each $theme, $colors in $themes {
- @each $name, $color in $colors {
- @if $name == 'dark' {
- [data-theme='#{$theme}'] .q-drawer--dark,
- body[data-theme='#{$theme}'].body--dark,
- [data-theme='#{$theme}'] .q-menu--dark {
- background: $color !important;
- }
-
- /* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
+$themes: ( 'classic': ( primary: #673ab7, secondary: #9c27b0, dark: #1f2234, info: #333646, marginal-bg: #1f2234, marginal-text: #fff), 'bitcoin': ( primary: #ff9853, secondary: #ff7353, dark: #2d293b, info: #333646, marginal-bg: #2d293b, marginal-text: #fff), 'freedom': ( primary: #e22156, secondary: #b91a45, dark: #0a0a0a, info: #1b1b1b, marginal-bg: #2d293b, marginal-text: #fff), 'mint': ( primary: #3ab77d, secondary: #27b065, dark: #1f342b, info: #334642, marginal-bg: #1f342b, marginal-text: #fff), 'autumn': ( primary: #b7763a, secondary: #b07927, dark: #34291f, info: #463f33, marginal-bg: #342a1f, marginal-text: rgb(255, 255, 255)), 'flamingo': ( primary: #d11d53, secondary: #db3e6d, dark: #803a45, info: #ec7599, marginal-bg: #803a45, marginal-text: rgb(255, 255, 255)), 'monochrome': ( primary: #494949, secondary: #6b6b6b, dark: #000, info: rgb(39, 39, 39), marginal-bg: #000, marginal-text: rgb(255, 255, 255)));
+@each $theme,
+$colors in $themes {
+ @each $name,
+ $color in $colors {
+ @if $name=='dark' {
+ [data-theme='#{$theme}'] .q-drawer--dark,
+ body[data-theme='#{$theme}'].body--dark,
+ [data-theme='#{$theme}'] .q-menu--dark {
+ background: $color !important;
+ }
+ /* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
// set a darker body bg for all themes, when in "dark mode"
body[data-theme='#{$theme}'].body--dark {
background: scale-color($color, $lightness: -60%);
}
*/
+ }
+ @if $name=='info' {
+ [data-theme='#{$theme}'] .q-card--dark,
+ [data-theme='#{$theme}'] .q-stepper--dark {
+ background: $color !important;
+ }
+ }
}
- @if $name == 'info' {
- [data-theme='#{$theme}'] .q-card--dark,
- [data-theme='#{$theme}'] .q-stepper--dark {
- background: $color !important;
- }
+ [data-theme='#{$theme}'] {
+ @each $name,
+ $color in $colors {
+ .bg-#{$name} {
+ background: $color !important;
+ }
+ .text-#{$name} {
+ color: $color !important;
+ }
+ }
}
- }
- [data-theme='#{$theme}'] {
- @each $name, $color in $colors {
- .bg-#{$name} {
- background: $color !important;
- }
- .text-#{$name} {
- color: $color !important;
- }
- }
- }
}
+
+[data-theme='freedom'] .q-drawer--dark {
+ background: #0a0a0a !important;
+}
+
+[data-theme='freedom'] .q-header {
+ background: #0a0a0a !important;
+}
+
[data-theme='salvador'] .q-drawer--dark {
- background: #242424 !important;
+ background: #242424 !important;
}
[data-theme='salvador'] .q-header {
- background: #0f47af !important;
+ background: #0f47af !important;
}
[data-theme='flamingo'] .q-drawer--dark {
- background: #e75480 !important;
+ background: #e75480 !important;
}
[data-theme='flamingo'] .q-header {
- background: #e75480 !important;
+ background: #e75480 !important;
}
[v-cloak] {
- display: none;
+ display: none;
}
body.body--dark .q-table--dark {
- background: transparent;
+ background: transparent;
}
body.body--dark .q-field--error {
- .text-negative,
- .q-field__messages {
- color: yellow !important;
- }
+ .text-negative,
+ .q-field__messages {
+ color: yellow !important;
+ }
}
.lnbits-drawer__q-list .q-item {
- padding-top: 5px !important;
- padding-bottom: 5px !important;
- border-top-right-radius: 3px;
- border-bottom-right-radius: 3px;
-
- &.q-item--active {
- color: inherit;
- font-weight: bold;
- }
+ padding-top: 5px !important;
+ padding-bottom: 5px !important;
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
+ &.q-item--active {
+ color: inherit;
+ font-weight: bold;
+ }
}
.lnbits__dialog-card {
- width: 500px;
+ width: 500px;
}
.q-table--dense {
- th:first-child,
- td:first-child,
- .q-table__bottom {
- padding-left: 6px !important;
- }
-
- th:last-child,
- td:last-child,
- .q-table__bottom {
- padding-right: 6px !important;
- }
+ th:first-child,
+ td:first-child,
+ .q-table__bottom {
+ padding-left: 6px !important;
+ }
+ th:last-child,
+ td:last-child,
+ .q-table__bottom {
+ padding-right: 6px !important;
+ }
}
a.inherit {
- color: inherit;
- text-decoration: none;
+ color: inherit;
+ text-decoration: none;
}
// QR video
-
video {
- border-radius: 3px;
+ border-radius: 3px;
}
// Material icons font
-
@font-face {
- font-family: 'Material Icons';
- font-style: normal;
- font-weight: 400;
- src: url(../fonts/material-icons-v50.woff2) format('woff2');
+ font-family: 'Material Icons';
+ font-style: normal;
+ font-weight: 400;
+ src: url(../fonts/material-icons-v50.woff2) format('woff2');
}
.material-icons {
- font-family: 'Material Icons';
- font-weight: normal;
- font-style: normal;
- font-size: 24px;
- line-height: 1;
- letter-spacing: normal;
- text-transform: none;
- display: inline-block;
- white-space: nowrap;
- word-wrap: normal;
- direction: ltr;
- -moz-font-feature-settings: 'liga';
- -moz-osx-font-smoothing: grayscale;
+ font-family: 'Material Icons';
+ font-weight: normal;
+ font-style: normal;
+ font-size: 24px;
+ line-height: 1;
+ letter-spacing: normal;
+ text-transform: none;
+ display: inline-block;
+ white-space: nowrap;
+ word-wrap: normal;
+ direction: ltr;
+ -moz-font-feature-settings: 'liga';
+ -moz-osx-font-smoothing: grayscale;
}
// text-wrap
.text-wrap {
- word-break: break-word;
-}
+ word-break: break-word;
+}
\ No newline at end of file
diff --git a/lnbits/tasks.py b/lnbits/tasks.py
index 4e73a0af..34f37a39 100644
--- a/lnbits/tasks.py
+++ b/lnbits/tasks.py
@@ -114,7 +114,7 @@ async def perform_balance_checks():
async def invoice_callback_dispatcher(checking_id: str):
- payment = await get_standalone_payment(checking_id)
+ payment = await get_standalone_payment(checking_id, incoming=True)
if payment and payment.is_in:
await payment.set_pending(False)
for send_chan in invoice_listeners:
diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html
index 965d5336..758a746f 100644
--- a/lnbits/templates/base.html
+++ b/lnbits/templates/base.html
@@ -7,7 +7,6 @@
{% endfor %}
-
{% block styles %}{% endblock %}
{% block title %}{{ SITE_TITLE }}{% endblock %}
@@ -35,10 +34,12 @@
{% endblock %}
- {% block toolbar_title %} {% if SITE_TITLE != 'LNbits' %} {{
- SITE_TITLE }} {% else %} LNbits {% endif %} {%
- endblock %}
+ {% block toolbar_title %} {% if USE_CUSTOM_LOGO %}
+ 
+ {%else%} {% if SITE_TITLE != 'LNbits' %} {{ SITE_TITLE }} {% else
+ %}
+ LNbits {% endif %} {%endif%} {% endblock %}
+
{% block beta %}
@@ -118,6 +119,16 @@
size="md"
>elSalvador
+ Freedom
+
- {% if SITE_TITLE != 'LNbits' %} {{ SITE_TITLE }} {% else %}
- LNbits {% endif %}
+
+ {% if USE_CUSTOM_LOGO %}
+
+ {%else%} {% if SITE_TITLE != 'LNbits' %} {{ SITE_TITLE }} {% else %}
+ LNbits {% endif %} {% endif %}
{% endblock %}
diff --git a/lnbits/utils/exchange_rates.py b/lnbits/utils/exchange_rates.py
index 53a5a80b..4de1da8a 100644
--- a/lnbits/utils/exchange_rates.py
+++ b/lnbits/utils/exchange_rates.py
@@ -71,6 +71,7 @@ currencies = {
"IMP": "Isle of Man Pound",
"INR": "Indian Rupee",
"IQD": "Iraqi Dinar",
+ "IRT": "Iranian Toman",
"ISK": "Icelandic Króna",
"JEP": "Jersey Pound",
"JMD": "Jamaican Dollar",
@@ -179,6 +180,12 @@ class Provider(NamedTuple):
exchange_rate_providers = {
+ "exir": Provider(
+ "Exir",
+ "exir.io",
+ "https://api.exir.io/v1/ticker?symbol={from}-{to}",
+ lambda data, replacements: data["last"],
+ ),
"bitfinex": Provider(
"Bitfinex",
"bitfinex.com",
diff --git a/lnbits/wallets/__init__.py b/lnbits/wallets/__init__.py
index 4f0802c6..8a2ca1a5 100644
--- a/lnbits/wallets/__init__.py
+++ b/lnbits/wallets/__init__.py
@@ -1,12 +1,12 @@
# flake8: noqa
-from .void import VoidWallet
from .clightning import CLightningWallet
-from .lndgrpc import LndWallet
-from .lntxbot import LntxbotWallet
-from .opennode import OpenNodeWallet
-from .lnpay import LNPayWallet
+from .eclair import EclairWallet
+from .fake import FakeWallet
from .lnbits import LNbitsWallet
from .lndrest import LndRestWallet
+from .lnpay import LNPayWallet
+from .lntxbot import LntxbotWallet
+from .opennode import OpenNodeWallet
from .spark import SparkWallet
-from .fake import FakeWallet
+from .void import VoidWallet
diff --git a/lnbits/wallets/base.py b/lnbits/wallets/base.py
index 973c1808..39c68759 100644
--- a/lnbits/wallets/base.py
+++ b/lnbits/wallets/base.py
@@ -60,7 +60,9 @@ class Wallet(ABC):
pass
@abstractmethod
- def pay_invoice(self, bolt11: str) -> Coroutine[None, None, PaymentResponse]:
+ def pay_invoice(
+ self, bolt11: str, fee_limit_msat: int
+ ) -> Coroutine[None, None, PaymentResponse]:
pass
@abstractmethod
diff --git a/lnbits/wallets/clightning.py b/lnbits/wallets/clightning.py
index 639d0b38..f8c2b16c 100644
--- a/lnbits/wallets/clightning.py
+++ b/lnbits/wallets/clightning.py
@@ -18,6 +18,7 @@ from .base import (
Unsupported,
Wallet,
)
+from lnbits import bolt11 as lnbits_bolt11
def async_wrap(func):
@@ -31,8 +32,8 @@ def async_wrap(func):
return run
-def _pay_invoice(ln, bolt11):
- return ln.pay(bolt11)
+def _pay_invoice(ln, payload):
+ return ln.call("pay", payload)
def _paid_invoices_stream(ln, last_pay_index):
@@ -102,10 +103,18 @@ class CLightningWallet(Wallet):
error_message = f"lightningd '{exc.method}' failed with '{exc.error}'."
return InvoiceResponse(False, label, None, error_message)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
+ invoice = lnbits_bolt11.decode(bolt11)
+ fee_limit_percent = fee_limit_msat / invoice.amount_msat * 100
+
+ payload = {
+ "bolt11": bolt11,
+ "maxfeepercent": "{:.11}".format(fee_limit_percent),
+ "exemptfee": 0, # so fee_limit_percent is applied even on payments with fee under 5000 millisatoshi (which is default value of exemptfee)
+ }
try:
wrapped = async_wrap(_pay_invoice)
- r = await wrapped(self.ln, bolt11)
+ r = await wrapped(self.ln, payload)
except RpcError as exc:
return PaymentResponse(False, None, 0, None, str(exc))
diff --git a/lnbits/wallets/eclair.py b/lnbits/wallets/eclair.py
new file mode 100644
index 00000000..aa7ddc39
--- /dev/null
+++ b/lnbits/wallets/eclair.py
@@ -0,0 +1,200 @@
+import asyncio
+import base64
+import json
+import urllib.parse
+from os import getenv
+from typing import AsyncGenerator, Dict, Optional
+
+import httpx
+from websockets import connect
+from websockets.exceptions import (
+ ConnectionClosed,
+ ConnectionClosedError,
+ ConnectionClosedOK,
+)
+
+from .base import (
+ InvoiceResponse,
+ PaymentResponse,
+ PaymentStatus,
+ StatusResponse,
+ Wallet,
+)
+
+
+class EclairError(Exception):
+ pass
+
+
+class UnknownError(Exception):
+ pass
+
+
+class EclairWallet(Wallet):
+ def __init__(self):
+ url = getenv("ECLAIR_URL")
+ self.url = url[:-1] if url.endswith("/") else url
+
+ self.ws_url = f"ws://{urllib.parse.urlsplit(self.url).netloc}/ws"
+
+ passw = getenv("ECLAIR_PASS")
+ encodedAuth = base64.b64encode(f":{passw}".encode("utf-8"))
+ auth = str(encodedAuth, "utf-8")
+ self.auth = {"Authorization": f"Basic {auth}"}
+
+ async def status(self) -> StatusResponse:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.url}/usablebalances", headers=self.auth, timeout=40
+ )
+ try:
+ data = r.json()
+ except:
+ return StatusResponse(
+ f"Failed to connect to {self.url}, got: '{r.text[:200]}...'", 0
+ )
+
+ if r.is_error:
+ return StatusResponse(data["error"], 0)
+
+ return StatusResponse(None, data[0]["canSend"] * 1000)
+
+ async def create_invoice(
+ self,
+ amount: int,
+ memo: Optional[str] = None,
+ description_hash: Optional[bytes] = None,
+ ) -> InvoiceResponse:
+
+ data: Dict = {"amountMsat": amount * 1000}
+ if description_hash:
+ data["description_hash"] = description_hash.hex()
+ else:
+ data["description"] = memo or ""
+
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.url}/createinvoice", headers=self.auth, data=data, timeout=40
+ )
+
+ if r.is_error:
+ try:
+ data = r.json()
+ error_message = data["error"]
+ except:
+ error_message = r.text
+ pass
+
+ return InvoiceResponse(False, None, None, error_message)
+
+ data = r.json()
+ return InvoiceResponse(True, data["paymentHash"], data["serialized"], None)
+
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.url}/payinvoice",
+ headers=self.auth,
+ data={"invoice": bolt11, "blocking": True},
+ timeout=40,
+ )
+
+ if "error" in r.json():
+ try:
+ data = r.json()
+ error_message = data["error"]
+ except:
+ error_message = r.text
+ pass
+ return PaymentResponse(False, None, 0, None, error_message)
+
+ data = r.json()
+
+ checking_id = data["paymentHash"]
+ preimage = data["paymentPreimage"]
+
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.url}/getsentinfo",
+ headers=self.auth,
+ data={"paymentHash": checking_id},
+ timeout=40,
+ )
+
+ if "error" in r.json():
+ try:
+ data = r.json()
+ error_message = data["error"]
+ except:
+ error_message = r.text
+ pass
+ return PaymentResponse(
+ True, checking_id, 0, preimage, error_message
+ ) ## ?? is this ok ??
+
+ data = r.json()
+ fees = [i["status"] for i in data]
+ fee_msat = sum([i["feesPaid"] for i in fees])
+
+ return PaymentResponse(True, checking_id, fee_msat, preimage, None)
+
+ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.url}/getreceivedinfo",
+ headers=self.auth,
+ data={"paymentHash": checking_id},
+ )
+ data = r.json()
+
+ if r.is_error or "error" in data:
+ return PaymentStatus(None)
+
+ if data["status"]["type"] != "received":
+ return PaymentStatus(False)
+
+ return PaymentStatus(True)
+
+ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ url=f"{self.url}/getsentinfo",
+ headers=self.auth,
+ data={"paymentHash": checking_id},
+ )
+
+ data = r.json()[0]
+
+ if r.is_error:
+ return PaymentStatus(None)
+
+ if data["status"]["type"] != "sent":
+ return PaymentStatus(False)
+
+ return PaymentStatus(True)
+
+ async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
+
+ try:
+ async with connect(
+ self.ws_url,
+ extra_headers=[("Authorization", self.auth["Authorization"])],
+ ) as ws:
+ while True:
+ message = await ws.recv()
+ message = json.loads(message)
+
+ if message and message["type"] == "payment-received":
+ yield message["paymentHash"]
+
+ except (
+ OSError,
+ ConnectionClosedOK,
+ ConnectionClosedError,
+ ConnectionClosed,
+ ) as ose:
+ print("OSE", ose)
+ pass
+
+ print("lost connection to eclair's websocket, retrying in 5 seconds")
+ await asyncio.sleep(5)
diff --git a/lnbits/wallets/fake.py b/lnbits/wallets/fake.py
index 93e50abd..331d5285 100644
--- a/lnbits/wallets/fake.py
+++ b/lnbits/wallets/fake.py
@@ -36,7 +36,13 @@ class FakeWallet(Wallet):
"out": False,
"amount": amount,
"currency": "bc",
- "privkey": hashlib.pbkdf2_hmac('sha256', secret.encode("utf-8"), ("FakeWallet").encode("utf-8"), 2048, 32).hex(),
+ "privkey": hashlib.pbkdf2_hmac(
+ "sha256",
+ secret.encode("utf-8"),
+ ("FakeWallet").encode("utf-8"),
+ 2048,
+ 32,
+ ).hex(),
"memo": None,
"description_hash": None,
"description": "",
@@ -53,22 +59,29 @@ class FakeWallet(Wallet):
data["tags_set"] = ["d"]
data["memo"] = memo
data["description"] = memo
- randomHash = data["privkey"][:6] + hashlib.sha256(
- str(random.getrandbits(256)).encode("utf-8")
- ).hexdigest()[6:]
+ randomHash = (
+ data["privkey"][:6]
+ + hashlib.sha256(str(random.getrandbits(256)).encode("utf-8")).hexdigest()[
+ 6:
+ ]
+ )
data["paymenthash"] = randomHash
payment_request = encode(data)
checking_id = randomHash
return InvoiceResponse(True, checking_id, payment_request)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
- invoice = decode(bolt11)
- if hasattr(invoice, 'checking_id') and invoice.checking_id[6:] == data["privkey"][:6]:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
+ invoice = decode(bolt11)
+ if (
+ hasattr(invoice, "checking_id")
+ and invoice.checking_id[6:] == data["privkey"][:6]
+ ):
return PaymentResponse(True, invoice.payment_hash, 0)
else:
- return PaymentResponse(ok = False, error_message="Only internal invoices can be used!")
-
+ return PaymentResponse(
+ ok=False, error_message="Only internal invoices can be used!"
+ )
async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
return PaymentStatus(False)
diff --git a/lnbits/wallets/lnbits.py b/lnbits/wallets/lnbits.py
index 5e34a2d7..414e987b 100644
--- a/lnbits/wallets/lnbits.py
+++ b/lnbits/wallets/lnbits.py
@@ -80,7 +80,7 @@ class LNbitsWallet(Wallet):
return InvoiceResponse(ok, checking_id, payment_request, error_message)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
async with httpx.AsyncClient() as client:
r = await client.post(
url=f"{self.endpoint}/api/v1/payments",
diff --git a/lnbits/wallets/lndgrpc.py b/lnbits/wallets/lndgrpc.py
index 85c6dd09..f9a0496a 100644
--- a/lnbits/wallets/lndgrpc.py
+++ b/lnbits/wallets/lndgrpc.py
@@ -92,11 +92,12 @@ class LndWallet(Wallet):
or getenv("LND_GRPC_INVOICE_MACAROON")
or getenv("LND_INVOICE_MACAROON")
)
-
-
+
encrypted_macaroon = getenv("LND_GRPC_MACAROON_ENCRYPTED")
if encrypted_macaroon:
- macaroon = AESCipher(description="macaroon decryption").decrypt(encrypted_macaroon)
+ macaroon = AESCipher(description="macaroon decryption").decrypt(
+ encrypted_macaroon
+ )
self.macaroon = load_macaroon(macaroon)
cert = open(self.cert_path, "rb").read()
@@ -143,10 +144,10 @@ class LndWallet(Wallet):
payment_request = str(resp.payment_request)
return InvoiceResponse(True, checking_id, payment_request, None)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
- resp = await self.rpc.SendPayment(
- lnrpc.SendPaymentRequest(payment_request=bolt11)
- )
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
+ fee_limit_fixed = ln.FeeLimit(fixed=fee_limit_msat // 1000)
+ req = ln.SendRequest(payment_request=bolt11, fee_limit=fee_limit_fixed)
+ resp = await self.rpc.SendPaymentSync(req)
if resp.payment_error:
return PaymentResponse(False, "", 0, None, resp.payment_error)
diff --git a/lnbits/wallets/lndrest.py b/lnbits/wallets/lndrest.py
index 1c2a86a0..a107f749 100644
--- a/lnbits/wallets/lndrest.py
+++ b/lnbits/wallets/lndrest.py
@@ -39,11 +39,13 @@ class LndRestWallet(Wallet):
encrypted_macaroon = getenv("LND_REST_MACAROON_ENCRYPTED")
if encrypted_macaroon:
- macaroon = AESCipher(description="macaroon decryption").decrypt(encrypted_macaroon)
+ macaroon = AESCipher(description="macaroon decryption").decrypt(
+ encrypted_macaroon
+ )
self.macaroon = load_macaroon(macaroon)
-
+
self.auth = {"Grpc-Metadata-macaroon": self.macaroon}
- self.cert = getenv("LND_REST_CERT")
+ self.cert = getenv("LND_REST_CERT", True)
async def status(self) -> StatusResponse:
try:
@@ -97,15 +99,11 @@ class LndRestWallet(Wallet):
return InvoiceResponse(True, checking_id, payment_request, None)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
async with httpx.AsyncClient(verify=self.cert) as client:
# set the fee limit for the payment
- invoice = lnbits_bolt11.decode(bolt11)
lnrpcFeeLimit = dict()
- if invoice.amount_msat > 1000_000:
- lnrpcFeeLimit["percent"] = "1" # in percent
- else:
- lnrpcFeeLimit["fixed"] = "10" # in sat
+ lnrpcFeeLimit["fixed_msat"] = "{}".format(fee_limit_msat)
r = await client.post(
url=f"{self.endpoint}/v1/channels/transactions",
@@ -162,6 +160,7 @@ class LndRestWallet(Wallet):
# for some reason our checking_ids are in base64 but the payment hashes
# returned here are in hex, lnd is weird
+ checking_id = checking_id.replace("_", "/")
checking_id = base64.b64decode(checking_id).hex()
for p in r.json()["payments"]:
diff --git a/lnbits/wallets/lnpay.py b/lnbits/wallets/lnpay.py
index 98610a79..88e6a3a2 100644
--- a/lnbits/wallets/lnpay.py
+++ b/lnbits/wallets/lnpay.py
@@ -76,7 +76,7 @@ class LNPayWallet(Wallet):
return InvoiceResponse(ok, checking_id, payment_request, error_message)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
async with httpx.AsyncClient() as client:
r = await client.post(
f"{self.endpoint}/wallet/{self.wallet_key}/withdraw",
diff --git a/lnbits/wallets/lntxbot.py b/lnbits/wallets/lntxbot.py
index 6d706959..bbd87a73 100644
--- a/lnbits/wallets/lntxbot.py
+++ b/lnbits/wallets/lntxbot.py
@@ -74,7 +74,7 @@ class LntxbotWallet(Wallet):
data = r.json()
return InvoiceResponse(True, data["payment_hash"], data["pay_req"], None)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
async with httpx.AsyncClient() as client:
r = await client.post(
f"{self.endpoint}/payinvoice",
diff --git a/lnbits/wallets/macaroon/__init__.py b/lnbits/wallets/macaroon/__init__.py
index b7cadcfe..4967c100 100644
--- a/lnbits/wallets/macaroon/__init__.py
+++ b/lnbits/wallets/macaroon/__init__.py
@@ -1 +1 @@
-from .macaroon import load_macaroon, AESCipher
\ No newline at end of file
+from .macaroon import load_macaroon, AESCipher
diff --git a/lnbits/wallets/macaroon/macaroon.py b/lnbits/wallets/macaroon/macaroon.py
index dd6ff636..3548e9e2 100644
--- a/lnbits/wallets/macaroon/macaroon.py
+++ b/lnbits/wallets/macaroon/macaroon.py
@@ -5,10 +5,11 @@ from hashlib import md5
import getpass
BLOCK_SIZE = 16
-import getpass
+import getpass
+
def load_macaroon(macaroon: str) -> str:
- """Returns hex version of a macaroon encoded in base64 or the file path.
+ """Returns hex version of a macaroon encoded in base64 or the file path.
:param macaroon: Macaroon encoded in base64 or file path.
:type macaroon: str
@@ -29,6 +30,7 @@ def load_macaroon(macaroon: str) -> str:
pass
return macaroon
+
class AESCipher(object):
"""This class is compatible with crypto-js/aes.js
@@ -39,6 +41,7 @@ class AESCipher(object):
AES.decrypt(encrypted, password).toString(Utf8);
"""
+
def __init__(self, key=None, description=""):
self.key = key
self.description = description + " "
@@ -47,7 +50,6 @@ class AESCipher(object):
length = BLOCK_SIZE - (len(data) % BLOCK_SIZE)
return data + (chr(length) * length).encode()
-
def unpad(self, data):
return data[: -(data[-1] if type(data[-1]) == int else ord(data[-1]))]
@@ -70,8 +72,7 @@ class AESCipher(object):
return final_key[:output]
def decrypt(self, encrypted: str) -> str:
- """Decrypts a string using AES-256-CBC.
- """
+ """Decrypts a string using AES-256-CBC."""
passphrase = self.passphrase
encrypted = base64.b64decode(encrypted)
assert encrypted[0:8] == b"Salted__"
@@ -92,7 +93,10 @@ class AESCipher(object):
key = key_iv[:32]
iv = key_iv[32:]
aes = AES.new(key, AES.MODE_CBC, iv)
- return base64.b64encode(b"Salted__" + salt + aes.encrypt(self.pad(message))).decode()
+ return base64.b64encode(
+ b"Salted__" + salt + aes.encrypt(self.pad(message))
+ ).decode()
+
# if this file is executed directly, ask for a macaroon and encrypt it
if __name__ == "__main__":
diff --git a/lnbits/wallets/opennode.py b/lnbits/wallets/opennode.py
index 965b6d66..0ac205e2 100644
--- a/lnbits/wallets/opennode.py
+++ b/lnbits/wallets/opennode.py
@@ -77,7 +77,7 @@ class OpenNodeWallet(Wallet):
payment_request = data["lightning_invoice"]["payreq"]
return InvoiceResponse(True, checking_id, payment_request, None)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
async with httpx.AsyncClient() as client:
r = await client.post(
f"{self.endpoint}/v2/withdrawals",
diff --git a/lnbits/wallets/spark.py b/lnbits/wallets/spark.py
index 93f37cce..7b9a23e2 100644
--- a/lnbits/wallets/spark.py
+++ b/lnbits/wallets/spark.py
@@ -107,9 +107,12 @@ class SparkWallet(Wallet):
return InvoiceResponse(ok, checking_id, payment_request, error_message)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
try:
- r = await self.pay(bolt11)
+ r = await self.pay(
+ bolt11=bolt11,
+ maxfee=fee_limit_msat,
+ )
except (SparkError, UnknownError) as exc:
listpays = await self.listpays(bolt11)
if listpays:
@@ -129,7 +132,9 @@ class SparkWallet(Wallet):
if pay["status"] == "failed":
return PaymentResponse(False, None, 0, None, str(exc))
elif pay["status"] == "pending":
- return PaymentResponse(None, payment_hash, 0, None, None)
+ return PaymentResponse(
+ None, payment_hash, fee_limit_msat, None, None
+ )
elif pay["status"] == "complete":
r = pay
r["payment_preimage"] = pay["preimage"]
@@ -152,9 +157,11 @@ class SparkWallet(Wallet):
if not r or not r.get("invoices"):
return PaymentStatus(None)
- if r["invoices"][0]["status"] == "unpaid":
+
+ if r["invoices"][0]["status"] == "paid":
+ return PaymentStatus(True)
+ else:
return PaymentStatus(False)
- return PaymentStatus(True)
async def get_payment_status(self, checking_id: str) -> PaymentStatus:
# check if it's 32 bytes hex
diff --git a/lnbits/wallets/void.py b/lnbits/wallets/void.py
index 03b6db44..c5cc08b5 100644
--- a/lnbits/wallets/void.py
+++ b/lnbits/wallets/void.py
@@ -25,7 +25,7 @@ class VoidWallet(Wallet):
)
return StatusResponse(None, 0)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
raise Unsupported("")
async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
diff --git a/tests/conftest.py b/tests/conftest.py
index 127233c1..27ba9137 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -19,9 +19,10 @@ def app():
loop.run_until_complete(loop.shutdown_asyncgens())
loop.close()
+
@pytest.fixture
async def client(app):
- client = AsyncClient(app=app, base_url=f'http://{HOST}:{PORT}')
+ client = AsyncClient(app=app, base_url=f"http://{HOST}:{PORT}")
# yield and pass the client to the test
yield client
# close the async client after the test has finished
diff --git a/tests/core/views/test_generic.py b/tests/core/views/test_generic.py
index 4917cde4..5d3db0fb 100644
--- a/tests/core/views/test_generic.py
+++ b/tests/core/views/test_generic.py
@@ -1,6 +1,7 @@
import pytest
from tests.conftest import client
+
@pytest.mark.asyncio
async def test_core_views_generic(client):
response = await client.get("/")
diff --git a/tests/extensions/bleskomat/conftest.py b/tests/extensions/bleskomat/conftest.py
index 924998a7..265d3be0 100644
--- a/tests/extensions/bleskomat/conftest.py
+++ b/tests/extensions/bleskomat/conftest.py
@@ -4,16 +4,22 @@ import secrets
from lnbits.core.crud import create_account, create_wallet
from lnbits.extensions.bleskomat.crud import create_bleskomat, create_bleskomat_lnurl
from lnbits.extensions.bleskomat.models import CreateBleskomat
-from lnbits.extensions.bleskomat.helpers import generate_bleskomat_lnurl_secret, generate_bleskomat_lnurl_signature, prepare_lnurl_params, query_to_signing_payload
+from lnbits.extensions.bleskomat.helpers import (
+ generate_bleskomat_lnurl_secret,
+ generate_bleskomat_lnurl_signature,
+ prepare_lnurl_params,
+ query_to_signing_payload,
+)
from lnbits.extensions.bleskomat.exchange_rates import exchange_rate_providers
exchange_rate_providers["dummy"] = {
"name": "dummy",
"domain": None,
"api_url": None,
- "getter": lambda data, replacements: str(1e8),# 1 BTC = 100000000 sats
+ "getter": lambda data, replacements: str(1e8), # 1 BTC = 100000000 sats
}
+
@pytest.fixture
async def bleskomat():
user = await create_account()
@@ -22,11 +28,12 @@ async def bleskomat():
name="Test Bleskomat",
fiat_currency="EUR",
exchange_rate_provider="dummy",
- fee="0"
+ fee="0",
)
bleskomat = await create_bleskomat(data=data, wallet_id=wallet.id)
return bleskomat
+
@pytest.fixture
async def lnurl(bleskomat):
query = {
@@ -43,7 +50,7 @@ async def lnurl(bleskomat):
signature = generate_bleskomat_lnurl_signature(
payload=payload,
api_key_secret=bleskomat.api_key_secret,
- api_key_encoding=bleskomat.api_key_encoding
+ api_key_encoding=bleskomat.api_key_encoding,
)
secret = generate_bleskomat_lnurl_secret(bleskomat.api_key_id, signature)
params = json.JSONEncoder().encode(params)
diff --git a/tests/extensions/bleskomat/test_lnurl_api.py b/tests/extensions/bleskomat/test_lnurl_api.py
index 2ee59117..00358470 100644
--- a/tests/extensions/bleskomat/test_lnurl_api.py
+++ b/tests/extensions/bleskomat/test_lnurl_api.py
@@ -3,7 +3,10 @@ import secrets
from lnbits.core.crud import get_wallet
from lnbits.settings import HOST, PORT
from lnbits.extensions.bleskomat.crud import get_bleskomat_lnurl
-from lnbits.extensions.bleskomat.helpers import generate_bleskomat_lnurl_signature, query_to_signing_payload
+from lnbits.extensions.bleskomat.helpers import (
+ generate_bleskomat_lnurl_signature,
+ query_to_signing_payload,
+)
from tests.conftest import client
from tests.helpers import credit_wallet
from tests.extensions.bleskomat.conftest import bleskomat, lnurl
@@ -73,7 +76,9 @@ async def test_bleskomat_lnurl_api_valid_signature(client, bleskomat):
}
payload = query_to_signing_payload(query)
signature = generate_bleskomat_lnurl_signature(
- payload=payload, api_key_secret=bleskomat.api_key_secret, api_key_encoding=bleskomat.api_key_encoding
+ payload=payload,
+ api_key_secret=bleskomat.api_key_secret,
+ api_key_encoding=bleskomat.api_key_encoding,
)
response = await client.get(f"/bleskomat/u?{payload}&signature={signature}")
assert response.status_code == 200
@@ -97,7 +102,9 @@ async def test_bleskomat_lnurl_api_action_insufficient_balance(client, lnurl):
response = await client.get(f"/bleskomat/u?k1={secret}&pr={pr}")
assert response.status_code == 200
assert response.json()["status"] == "ERROR"
- assert ("Insufficient balance" in response.json()["reason"]) or ("fee" in response.json()["reason"])
+ assert ("Insufficient balance" in response.json()["reason"]) or (
+ "fee" in response.json()["reason"]
+ )
wallet = await get_wallet(bleskomat.wallet)
assert wallet.balance_msat == 0
bleskomat_lnurl = await get_bleskomat_lnurl(secret)
@@ -123,4 +130,4 @@ async def test_bleskomat_lnurl_api_action_success(client, lnurl):
assert wallet.balance_msat == 50000
bleskomat_lnurl = await get_bleskomat_lnurl(secret)
assert bleskomat_lnurl.has_uses_remaining() == False
- WALLET.pay_invoice.assert_called_once_with(pr)
+ WALLET.pay_invoice.assert_called_once_with(pr, 2000)
diff --git a/tests/helpers.py b/tests/helpers.py
index 1687e25d..3774f6fc 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -2,6 +2,7 @@ import hashlib
import secrets
from lnbits.core.crud import create_payment
+
async def credit_wallet(wallet_id: str, amount: int):
preimage = secrets.token_hex(32)
m = hashlib.sha256()
@@ -14,6 +15,6 @@ async def credit_wallet(wallet_id: str, amount: int):
checking_id=payment_hash,
preimage=preimage,
memo="",
- amount=amount,# msat
- pending=False,# not pending, so it will increase the wallet's balance
+ amount=amount, # msat
+ pending=False, # not pending, so it will increase the wallet's balance
)
diff --git a/tests/mocks.py b/tests/mocks.py
index 5b20824c..a3b5308d 100644
--- a/tests/mocks.py
+++ b/tests/mocks.py
@@ -9,28 +9,42 @@ from lnbits.wallets.base import (
)
from lnbits.settings import WALLET
-WALLET.status = AsyncMock(return_value=StatusResponse(
- "",# no error
- 1000000,# msats
-))
-WALLET.create_invoice = AsyncMock(return_value=InvoiceResponse(
- True,# ok
- "6621aafbdd7709ca6eea6203f362d64bd7cb2911baa91311a176b3ecaf2274bd",# checking_id (i.e. payment_hash)
- "lntb1u1psezhgspp5vcs6477awuyu5mh2vgplxckkf0tuk2g3h253xydpw6e7etezwj7sdqqcqzpgxqyz5vqsp5dxpw8zs77hw5pla4wz4mfujllyxtlpu443auur2uxqdrs8q2h56q9qyyssq65zk30ylmygvv5y4tuwalnf3ttnqjn57ef6rmcqg0s53akem560jh8ptemjcmytn3lrlatw4hv9smg88exv3v4f4lqnp96s0psdrhxsp6pp75q",# payment_request
- "",# no error
-))
-def pay_invoice_side_effect(payment_request: str):
+WALLET.status = AsyncMock(
+ return_value=StatusResponse(
+ "", # no error
+ 1000000, # msats
+ )
+)
+WALLET.create_invoice = AsyncMock(
+ return_value=InvoiceResponse(
+ True, # ok
+ "6621aafbdd7709ca6eea6203f362d64bd7cb2911baa91311a176b3ecaf2274bd", # checking_id (i.e. payment_hash)
+ "lntb1u1psezhgspp5vcs6477awuyu5mh2vgplxckkf0tuk2g3h253xydpw6e7etezwj7sdqqcqzpgxqyz5vqsp5dxpw8zs77hw5pla4wz4mfujllyxtlpu443auur2uxqdrs8q2h56q9qyyssq65zk30ylmygvv5y4tuwalnf3ttnqjn57ef6rmcqg0s53akem560jh8ptemjcmytn3lrlatw4hv9smg88exv3v4f4lqnp96s0psdrhxsp6pp75q", # payment_request
+ "", # no error
+ )
+)
+
+
+def pay_invoice_side_effect(
+ payment_request: str, fee_limit_msat: int
+) -> PaymentResponse:
invoice = bolt11.decode(payment_request)
return PaymentResponse(
- True,# ok
- invoice.payment_hash,# checking_id (i.e. payment_hash)
- 0,# fee_msat
- "",# no error
+ True, # ok
+ invoice.payment_hash, # checking_id (i.e. payment_hash)
+ 0, # fee_msat
+ "", # no error
)
+
+
WALLET.pay_invoice = AsyncMock(side_effect=pay_invoice_side_effect)
-WALLET.get_invoice_status = AsyncMock(return_value=PaymentStatus(
- True,# paid
-))
-WALLET.get_payment_status = AsyncMock(return_value=PaymentStatus(
- True,# paid
-))
+WALLET.get_invoice_status = AsyncMock(
+ return_value=PaymentStatus(
+ True, # paid
+ )
+)
+WALLET.get_payment_status = AsyncMock(
+ return_value=PaymentStatus(
+ True, # paid
+ )
+)
- {{ SITE_TITLE }} Wallet: {{ wallet.name }} -
-+ {{ SITE_TITLE }} Wallet: {{ wallet.name }} +
+- This is an LNURL-withdraw QR code for slurping everything from - this wallet. Do not share with anyone. -
- ++ This is an LNURL-withdraw QR code for slurping everything + from this wallet. Do not share with anyone. +
+ +
+ It is compatible with balanceCheck and
+ balanceNotify so your wallet may keep pulling
+ the funds continuously from here after the first withdraw.
+
+ This QR code contains your wallet URL with full access. You + can scan it from your phone to open your wallet from there. +
- It is compatible with balanceCheck and
- balanceNotify so your wallet may keep pulling the
- funds continuously from here after the first withdraw.
-
- This QR code contains your wallet URL with full access. You - can scan it from your phone to open your wallet from there. -
-- This whole wallet will be deleted, the funds will be - UNRECOVERABLE. -
-+ This whole wallet will be deleted, the funds will be + UNRECOVERABLE. +
+- {{receive.lnurl.domain}} is requesting an invoice: -
- {% endraw %} {% if LNBITS_DENOMINATION != 'sats' %} -- {% raw %} {{ parseFloat(String(parse.invoice.fsat).replaceAll(",", "")) - / 100 }} {% endraw %} {{LNBITS_DENOMINATION}} {% raw %} -
-- {{ parse.invoice.fsat }}{% endraw %} {{LNBITS_DENOMINATION}} {% raw %} -
-
- Description: {{ parse.invoice.description }}
- Expire date: {{ parse.invoice.expireDate }}
- Hash: {{ parse.invoice.hash }}
-
- Authenticate with {{ parse.lnurlauth.domain }}?
+
+ {{receive.lnurl.domain}} is requesting an invoice:
- For every website and for every LNbits wallet, a new keypair will be
- deterministically generated so your identity can't be tied to your
- LNbits wallet or linked across websites. No other data will be shared
- with {{ parse.lnurlauth.domain }}.
- Your public key for {{ parse.lnurlauth.domain }} is:
- {{ parse.lnurlauth.pubkey }}
-
- {{ parse.lnurlpay.domain }} is requesting {{
- parse.lnurlpay.maxSendable | msatoshiFormat }} {{LNBITS_DENOMINATION}}
-
-
- and a {{parse.lnurlpay.commentAllowed}}-char comment
-
-
- {{ parse.lnurlpay.targetUser || parse.lnurlpay.domain }} is
- requesting
- between {{ parse.lnurlpay.minSendable | msatoshiFormat }} and
- {{ parse.lnurlpay.maxSendable | msatoshiFormat }}
- {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
-
-
- and a {{parse.lnurlpay.commentAllowed}}-char comment
-
-
- {{ parse.lnurlpay.description }} -
-
-
+ {% raw %} {{ parseFloat(String(parse.invoice.fsat).replaceAll(",", + "")) / 100 }} {% endraw %} {{LNBITS_DENOMINATION}} {% raw %} +
++ {{ parse.invoice.fsat }}{% endraw %} {{LNBITS_DENOMINATION}} {% raw %} +
+
+ Description: {{ parse.invoice.description }}
+ Expire date: {{ parse.invoice.expireDate }}
+ Hash: {{ parse.invoice.hash }}
+
+ Authenticate with {{ parse.lnurlauth.domain }}? +
++ For every website and for every LNbits wallet, a new keypair will be + deterministically generated so your identity can't be tied to your + LNbits wallet or linked across websites. No other data will be + shared with {{ parse.lnurlauth.domain }}. +
+Your public key for {{ parse.lnurlauth.domain }} is:
+
+ {{ parse.lnurlauth.pubkey }}
+
+ {{ parse.lnurlpay.domain }} is requesting {{
+ parse.lnurlpay.maxSendable | msatoshiFormat }}
+ {{LNBITS_DENOMINATION}}
+
+
+ and a {{parse.lnurlpay.commentAllowed}}-char comment
+
+
+ {{ parse.lnurlpay.targetUser || parse.lnurlpay.domain }} is
+ requesting
+ between {{ parse.lnurlpay.minSendable | msatoshiFormat }} and
+ {{ parse.lnurlpay.maxSendable | msatoshiFormat }}
+ {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
+
+
+ and a {{parse.lnurlpay.commentAllowed}}-char comment
+
+
+ {{ parse.lnurlpay.description }} +
+
+
Warning
-- Login functionality to be released in v0.2, for now, - make sure you bookmark this page for future access to your - wallet! -
-- This service is in BETA, and we hold no responsibility for people losing - access to funds. To encourage you to run your own LNbits installation, any - balance on {% raw %}{{ disclaimerDialog.location.host }}{% endraw %} will - incur a charge of {{ service_fee }}% service fee per - week. -
-Warning
++ Login functionality to be released in v0.2, for now, + make sure you bookmark this page for future access to your + wallet! +
++ This service is in BETA, and we hold no responsibility for people losing + access to funds. {% if service_fee > 0 %} To encourage you to run your + own LNbits installation, any balance on {% raw %}{{ + disclaimerDialog.location.host }}{% endraw %} will incur a charge of + {{ service_fee }}% service fee per week. {% endif %} +
++ Discord Bot: Connect Discord users to LNbits. +
+
+ Connect your LNbits instance to a Discord Bot leveraging LNbits as a community based lightning node.
+
+ Created by, Chris Lennon
+
+ Based on User Manager, by Ben Arc
+
GET
+ /discordbot/api/v1/users
+ Body (application/json)
++ Returns 201 CREATED (application/json) +
+JSON list of users
+ Curl example
+curl -X GET {{ request.base_url }}discordbot/api/v1/users -H
+ "X-Api-Key: {{ user.wallets[0].inkey }}"
+
+ GET
+ /discordbot/api/v1/users/<user_id>
+ Body (application/json)
++ Returns 201 CREATED (application/json) +
+JSON list of users
+ Curl example
+curl -X GET {{ request.base_url
+ }}discordbot/api/v1/users/<user_id> -H "X-Api-Key: {{
+ user.wallets[0].inkey }}"
+
+ GET
+ /discordbot/api/v1/wallets/<user_id>
+ Headers
+{"X-Api-Key": <string>}
+ Body (application/json)
++ Returns 201 CREATED (application/json) +
+JSON wallet data
+ Curl example
+curl -X GET {{ request.base_url
+ }}discordbot/api/v1/wallets/<user_id> -H "X-Api-Key: {{
+ user.wallets[0].inkey }}"
+
+ GET
+ /discordbot/api/v1/wallets<wallet_id>
+ Headers
+{"X-Api-Key": <string>}
+ Body (application/json)
++ Returns 201 CREATED (application/json) +
+JSON a wallets transactions
+ Curl example
+curl -X GET {{ request.base_url
+ }}discordbot/api/v1/wallets<wallet_id> -H "X-Api-Key: {{
+ user.wallets[0].inkey }}"
+
+ POST
+ /discordbot/api/v1/users
+ Headers
+{"X-Api-Key": <string>, "Content-type":
+ "application/json"}
+ + Body (application/json) - "admin_id" is a YOUR user ID +
+{"admin_id": <string>, "user_name": <string>,
+ "wallet_name": <string>,"discord_id": <string>}
+ + Returns 201 CREATED (application/json) +
+{"id": <string>, "name": <string>, "admin":
+ <string>, "discord_id": <string>}
+ Curl example
+curl -X POST {{ request.base_url }}discordbot/api/v1/users -d
+ '{"admin_id": "{{ user.id }}", "wallet_name": <string>,
+ "user_name": <string>, "discord_id": <string>}' -H "X-Api-Key: {{
+ user.wallets[0].inkey }}" -H "Content-type: application/json"
+
+ POST
+ /discordbot/api/v1/wallets
+ Headers
+{"X-Api-Key": <string>, "Content-type":
+ "application/json"}
+ + Body (application/json) - "admin_id" is a YOUR user ID +
+{"user_id": <string>, "wallet_name": <string>,
+ "admin_id": <string>}
+ + Returns 201 CREATED (application/json) +
+{"id": <string>, "admin": <string>, "name":
+ <string>, "user": <string>, "adminkey": <string>,
+ "inkey": <string>}
+ Curl example
+curl -X POST {{ request.base_url }}discordbot/api/v1/wallets -d
+ '{"user_id": <string>, "wallet_name": <string>,
+ "admin_id": "{{ user.id }}"}' -H "X-Api-Key: {{ user.wallets[0].inkey
+ }}" -H "Content-type: application/json"
+
+ DELETE
+ /discordbot/api/v1/users/<user_id>
+ Headers
+{"X-Api-Key": <string>}
+ Curl example
+curl -X DELETE {{ request.base_url
+ }}discordbot/api/v1/users/<user_id> -H "X-Api-Key: {{
+ user.wallets[0].inkey }}"
+
+ DELETE
+ /discordbot/api/v1/wallets/<wallet_id>
+ Headers
+{"X-Api-Key": <string>}
+ Curl example
+curl -X DELETE {{ request.base_url
+ }}discordbot/api/v1/wallets/<wallet_id> -H "X-Api-Key: {{
+ user.wallets[0].inkey }}"
+
+ POST
+ /discordbot/api/v1/extensions
+ Headers
+{"X-Api-Key": <string>}
+ Curl example
+curl -X POST {{ request.base_url }}discordbot/api/v1/extensions -d
+ '{"userid": <string>, "extension": <string>, "active":
+ <integer>}' -H "X-Api-Key: {{ user.wallets[0].inkey }}" -H
+ "Content-type: application/json"
+
+ + + Soon™ there will be a much easier one-click install discord bot... +
Users
+Wallets
+LNbits Discord Bot Extension + +
+Example Extension
+*tagline*
+This is an example extension to help you organise and build you own. + +Try to include an image +
+
+
+If your extension has API endpoints, include useful ones here
+ +curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/YOUR-EXTENSION/api/v1/EXAMPLE -d '{"amount":"100","memo":"example"}' -H "X-Api-Key: YOUR_WALLET-ADMIN/INVOICE-KEY"
diff --git a/lnbits/extensions/example/__init__.py b/lnbits/extensions/example/__init__.py
new file mode 100644
index 00000000..96cc6428
--- /dev/null
+++ b/lnbits/extensions/example/__init__.py
@@ -0,0 +1,16 @@
+from fastapi import APIRouter
+
+from lnbits.db import Database
+from lnbits.helpers import template_renderer
+
+db = Database("ext_example")
+
+example_ext: APIRouter = APIRouter(prefix="/example", tags=["example"])
+
+
+def example_renderer():
+ return template_renderer(["lnbits/extensions/example/templates"])
+
+
+from .views import * # noqa
+from .views_api import * # noqa
diff --git a/lnbits/extensions/example/example.config.json b/lnbits/extensions/example/example.config.json
new file mode 100644
index 00000000..b8eec193
--- /dev/null
+++ b/lnbits/extensions/example/example.config.json
@@ -0,0 +1,6 @@
+{
+ "name": "Build your own!!",
+ "short_description": "Join us, make an extension",
+ "icon": "info",
+ "contributors": ["github_username"]
+}
diff --git a/lnbits/extensions/example/migrations.py b/lnbits/extensions/example/migrations.py
new file mode 100644
index 00000000..99d7c362
--- /dev/null
+++ b/lnbits/extensions/example/migrations.py
@@ -0,0 +1,10 @@
+# async def m001_initial(db):
+# await db.execute(
+# f"""
+# CREATE TABLE example.example (
+# id TEXT PRIMARY KEY,
+# wallet TEXT NOT NULL,
+# time TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
+# );
+# """
+# )
diff --git a/lnbits/extensions/example/models.py b/lnbits/extensions/example/models.py
new file mode 100644
index 00000000..bfeb7517
--- /dev/null
+++ b/lnbits/extensions/example/models.py
@@ -0,0 +1,5 @@
+# from pydantic import BaseModel
+
+# class Example(BaseModel):
+# id: str
+# wallet: str
diff --git a/lnbits/extensions/example/templates/example/index.html b/lnbits/extensions/example/templates/example/index.html
new file mode 100644
index 00000000..d732ef37
--- /dev/null
+++ b/lnbits/extensions/example/templates/example/index.html
@@ -0,0 +1,59 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %}
++ Frameworks used by {{SITE_TITLE}} +
++ A magical "g" is always available, with info about the user, wallets and + extensions: +
+{% raw %}{{ g }}{% endraw %}
+ + {{this.ticketDialog.data.name}} sent a ticket +
+{{this.ticketDialog.data.content}}
+Withdraw links
-Withdraw links
+- {{SITE_TITLE}} LNURL-withdraw extension -
-+ {{SITE_TITLE}} LNURL-withdraw extension +
+
- ID: {{ qrCodeDialog.data.id }}
+ ID: {{ qrCodeDialog.data.id }}
- Unique: {{ qrCodeDialog.data.is_unique }}
+
+ Unique: {{ qrCodeDialog.data.is_unique }}
(QR code will change after each withdrawal)
Max. withdrawable: {{
@@ -356,4 +259,4 @@
+ {%else%} {% if SITE_TITLE != 'LNbits' %} {{ SITE_TITLE }} {% else
+ %}
+ LNbits {% endif %} {%endif%} {% endblock %}
+
+ {%else%} {% if SITE_TITLE != 'LNbits' %} {{ SITE_TITLE }} {% else %}
+ LNbits {% endif %} {% endif %}
{% endblock %}
diff --git a/lnbits/utils/exchange_rates.py b/lnbits/utils/exchange_rates.py
index 53a5a80b..4de1da8a 100644
--- a/lnbits/utils/exchange_rates.py
+++ b/lnbits/utils/exchange_rates.py
@@ -71,6 +71,7 @@ currencies = {
"IMP": "Isle of Man Pound",
"INR": "Indian Rupee",
"IQD": "Iraqi Dinar",
+ "IRT": "Iranian Toman",
"ISK": "Icelandic Króna",
"JEP": "Jersey Pound",
"JMD": "Jamaican Dollar",
@@ -179,6 +180,12 @@ class Provider(NamedTuple):
exchange_rate_providers = {
+ "exir": Provider(
+ "Exir",
+ "exir.io",
+ "https://api.exir.io/v1/ticker?symbol={from}-{to}",
+ lambda data, replacements: data["last"],
+ ),
"bitfinex": Provider(
"Bitfinex",
"bitfinex.com",
diff --git a/lnbits/wallets/__init__.py b/lnbits/wallets/__init__.py
index 4f0802c6..8a2ca1a5 100644
--- a/lnbits/wallets/__init__.py
+++ b/lnbits/wallets/__init__.py
@@ -1,12 +1,12 @@
# flake8: noqa
-from .void import VoidWallet
from .clightning import CLightningWallet
-from .lndgrpc import LndWallet
-from .lntxbot import LntxbotWallet
-from .opennode import OpenNodeWallet
-from .lnpay import LNPayWallet
+from .eclair import EclairWallet
+from .fake import FakeWallet
from .lnbits import LNbitsWallet
from .lndrest import LndRestWallet
+from .lnpay import LNPayWallet
+from .lntxbot import LntxbotWallet
+from .opennode import OpenNodeWallet
from .spark import SparkWallet
-from .fake import FakeWallet
+from .void import VoidWallet
diff --git a/lnbits/wallets/base.py b/lnbits/wallets/base.py
index 973c1808..39c68759 100644
--- a/lnbits/wallets/base.py
+++ b/lnbits/wallets/base.py
@@ -60,7 +60,9 @@ class Wallet(ABC):
pass
@abstractmethod
- def pay_invoice(self, bolt11: str) -> Coroutine[None, None, PaymentResponse]:
+ def pay_invoice(
+ self, bolt11: str, fee_limit_msat: int
+ ) -> Coroutine[None, None, PaymentResponse]:
pass
@abstractmethod
diff --git a/lnbits/wallets/clightning.py b/lnbits/wallets/clightning.py
index 639d0b38..f8c2b16c 100644
--- a/lnbits/wallets/clightning.py
+++ b/lnbits/wallets/clightning.py
@@ -18,6 +18,7 @@ from .base import (
Unsupported,
Wallet,
)
+from lnbits import bolt11 as lnbits_bolt11
def async_wrap(func):
@@ -31,8 +32,8 @@ def async_wrap(func):
return run
-def _pay_invoice(ln, bolt11):
- return ln.pay(bolt11)
+def _pay_invoice(ln, payload):
+ return ln.call("pay", payload)
def _paid_invoices_stream(ln, last_pay_index):
@@ -102,10 +103,18 @@ class CLightningWallet(Wallet):
error_message = f"lightningd '{exc.method}' failed with '{exc.error}'."
return InvoiceResponse(False, label, None, error_message)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
+ invoice = lnbits_bolt11.decode(bolt11)
+ fee_limit_percent = fee_limit_msat / invoice.amount_msat * 100
+
+ payload = {
+ "bolt11": bolt11,
+ "maxfeepercent": "{:.11}".format(fee_limit_percent),
+ "exemptfee": 0, # so fee_limit_percent is applied even on payments with fee under 5000 millisatoshi (which is default value of exemptfee)
+ }
try:
wrapped = async_wrap(_pay_invoice)
- r = await wrapped(self.ln, bolt11)
+ r = await wrapped(self.ln, payload)
except RpcError as exc:
return PaymentResponse(False, None, 0, None, str(exc))
diff --git a/lnbits/wallets/eclair.py b/lnbits/wallets/eclair.py
new file mode 100644
index 00000000..aa7ddc39
--- /dev/null
+++ b/lnbits/wallets/eclair.py
@@ -0,0 +1,200 @@
+import asyncio
+import base64
+import json
+import urllib.parse
+from os import getenv
+from typing import AsyncGenerator, Dict, Optional
+
+import httpx
+from websockets import connect
+from websockets.exceptions import (
+ ConnectionClosed,
+ ConnectionClosedError,
+ ConnectionClosedOK,
+)
+
+from .base import (
+ InvoiceResponse,
+ PaymentResponse,
+ PaymentStatus,
+ StatusResponse,
+ Wallet,
+)
+
+
+class EclairError(Exception):
+ pass
+
+
+class UnknownError(Exception):
+ pass
+
+
+class EclairWallet(Wallet):
+ def __init__(self):
+ url = getenv("ECLAIR_URL")
+ self.url = url[:-1] if url.endswith("/") else url
+
+ self.ws_url = f"ws://{urllib.parse.urlsplit(self.url).netloc}/ws"
+
+ passw = getenv("ECLAIR_PASS")
+ encodedAuth = base64.b64encode(f":{passw}".encode("utf-8"))
+ auth = str(encodedAuth, "utf-8")
+ self.auth = {"Authorization": f"Basic {auth}"}
+
+ async def status(self) -> StatusResponse:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.url}/usablebalances", headers=self.auth, timeout=40
+ )
+ try:
+ data = r.json()
+ except:
+ return StatusResponse(
+ f"Failed to connect to {self.url}, got: '{r.text[:200]}...'", 0
+ )
+
+ if r.is_error:
+ return StatusResponse(data["error"], 0)
+
+ return StatusResponse(None, data[0]["canSend"] * 1000)
+
+ async def create_invoice(
+ self,
+ amount: int,
+ memo: Optional[str] = None,
+ description_hash: Optional[bytes] = None,
+ ) -> InvoiceResponse:
+
+ data: Dict = {"amountMsat": amount * 1000}
+ if description_hash:
+ data["description_hash"] = description_hash.hex()
+ else:
+ data["description"] = memo or ""
+
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.url}/createinvoice", headers=self.auth, data=data, timeout=40
+ )
+
+ if r.is_error:
+ try:
+ data = r.json()
+ error_message = data["error"]
+ except:
+ error_message = r.text
+ pass
+
+ return InvoiceResponse(False, None, None, error_message)
+
+ data = r.json()
+ return InvoiceResponse(True, data["paymentHash"], data["serialized"], None)
+
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.url}/payinvoice",
+ headers=self.auth,
+ data={"invoice": bolt11, "blocking": True},
+ timeout=40,
+ )
+
+ if "error" in r.json():
+ try:
+ data = r.json()
+ error_message = data["error"]
+ except:
+ error_message = r.text
+ pass
+ return PaymentResponse(False, None, 0, None, error_message)
+
+ data = r.json()
+
+ checking_id = data["paymentHash"]
+ preimage = data["paymentPreimage"]
+
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.url}/getsentinfo",
+ headers=self.auth,
+ data={"paymentHash": checking_id},
+ timeout=40,
+ )
+
+ if "error" in r.json():
+ try:
+ data = r.json()
+ error_message = data["error"]
+ except:
+ error_message = r.text
+ pass
+ return PaymentResponse(
+ True, checking_id, 0, preimage, error_message
+ ) ## ?? is this ok ??
+
+ data = r.json()
+ fees = [i["status"] for i in data]
+ fee_msat = sum([i["feesPaid"] for i in fees])
+
+ return PaymentResponse(True, checking_id, fee_msat, preimage, None)
+
+ async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ f"{self.url}/getreceivedinfo",
+ headers=self.auth,
+ data={"paymentHash": checking_id},
+ )
+ data = r.json()
+
+ if r.is_error or "error" in data:
+ return PaymentStatus(None)
+
+ if data["status"]["type"] != "received":
+ return PaymentStatus(False)
+
+ return PaymentStatus(True)
+
+ async def get_payment_status(self, checking_id: str) -> PaymentStatus:
+ async with httpx.AsyncClient() as client:
+ r = await client.post(
+ url=f"{self.url}/getsentinfo",
+ headers=self.auth,
+ data={"paymentHash": checking_id},
+ )
+
+ data = r.json()[0]
+
+ if r.is_error:
+ return PaymentStatus(None)
+
+ if data["status"]["type"] != "sent":
+ return PaymentStatus(False)
+
+ return PaymentStatus(True)
+
+ async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
+
+ try:
+ async with connect(
+ self.ws_url,
+ extra_headers=[("Authorization", self.auth["Authorization"])],
+ ) as ws:
+ while True:
+ message = await ws.recv()
+ message = json.loads(message)
+
+ if message and message["type"] == "payment-received":
+ yield message["paymentHash"]
+
+ except (
+ OSError,
+ ConnectionClosedOK,
+ ConnectionClosedError,
+ ConnectionClosed,
+ ) as ose:
+ print("OSE", ose)
+ pass
+
+ print("lost connection to eclair's websocket, retrying in 5 seconds")
+ await asyncio.sleep(5)
diff --git a/lnbits/wallets/fake.py b/lnbits/wallets/fake.py
index 93e50abd..331d5285 100644
--- a/lnbits/wallets/fake.py
+++ b/lnbits/wallets/fake.py
@@ -36,7 +36,13 @@ class FakeWallet(Wallet):
"out": False,
"amount": amount,
"currency": "bc",
- "privkey": hashlib.pbkdf2_hmac('sha256', secret.encode("utf-8"), ("FakeWallet").encode("utf-8"), 2048, 32).hex(),
+ "privkey": hashlib.pbkdf2_hmac(
+ "sha256",
+ secret.encode("utf-8"),
+ ("FakeWallet").encode("utf-8"),
+ 2048,
+ 32,
+ ).hex(),
"memo": None,
"description_hash": None,
"description": "",
@@ -53,22 +59,29 @@ class FakeWallet(Wallet):
data["tags_set"] = ["d"]
data["memo"] = memo
data["description"] = memo
- randomHash = data["privkey"][:6] + hashlib.sha256(
- str(random.getrandbits(256)).encode("utf-8")
- ).hexdigest()[6:]
+ randomHash = (
+ data["privkey"][:6]
+ + hashlib.sha256(str(random.getrandbits(256)).encode("utf-8")).hexdigest()[
+ 6:
+ ]
+ )
data["paymenthash"] = randomHash
payment_request = encode(data)
checking_id = randomHash
return InvoiceResponse(True, checking_id, payment_request)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
- invoice = decode(bolt11)
- if hasattr(invoice, 'checking_id') and invoice.checking_id[6:] == data["privkey"][:6]:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
+ invoice = decode(bolt11)
+ if (
+ hasattr(invoice, "checking_id")
+ and invoice.checking_id[6:] == data["privkey"][:6]
+ ):
return PaymentResponse(True, invoice.payment_hash, 0)
else:
- return PaymentResponse(ok = False, error_message="Only internal invoices can be used!")
-
+ return PaymentResponse(
+ ok=False, error_message="Only internal invoices can be used!"
+ )
async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
return PaymentStatus(False)
diff --git a/lnbits/wallets/lnbits.py b/lnbits/wallets/lnbits.py
index 5e34a2d7..414e987b 100644
--- a/lnbits/wallets/lnbits.py
+++ b/lnbits/wallets/lnbits.py
@@ -80,7 +80,7 @@ class LNbitsWallet(Wallet):
return InvoiceResponse(ok, checking_id, payment_request, error_message)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
async with httpx.AsyncClient() as client:
r = await client.post(
url=f"{self.endpoint}/api/v1/payments",
diff --git a/lnbits/wallets/lndgrpc.py b/lnbits/wallets/lndgrpc.py
index 85c6dd09..f9a0496a 100644
--- a/lnbits/wallets/lndgrpc.py
+++ b/lnbits/wallets/lndgrpc.py
@@ -92,11 +92,12 @@ class LndWallet(Wallet):
or getenv("LND_GRPC_INVOICE_MACAROON")
or getenv("LND_INVOICE_MACAROON")
)
-
-
+
encrypted_macaroon = getenv("LND_GRPC_MACAROON_ENCRYPTED")
if encrypted_macaroon:
- macaroon = AESCipher(description="macaroon decryption").decrypt(encrypted_macaroon)
+ macaroon = AESCipher(description="macaroon decryption").decrypt(
+ encrypted_macaroon
+ )
self.macaroon = load_macaroon(macaroon)
cert = open(self.cert_path, "rb").read()
@@ -143,10 +144,10 @@ class LndWallet(Wallet):
payment_request = str(resp.payment_request)
return InvoiceResponse(True, checking_id, payment_request, None)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
- resp = await self.rpc.SendPayment(
- lnrpc.SendPaymentRequest(payment_request=bolt11)
- )
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
+ fee_limit_fixed = ln.FeeLimit(fixed=fee_limit_msat // 1000)
+ req = ln.SendRequest(payment_request=bolt11, fee_limit=fee_limit_fixed)
+ resp = await self.rpc.SendPaymentSync(req)
if resp.payment_error:
return PaymentResponse(False, "", 0, None, resp.payment_error)
diff --git a/lnbits/wallets/lndrest.py b/lnbits/wallets/lndrest.py
index 1c2a86a0..a107f749 100644
--- a/lnbits/wallets/lndrest.py
+++ b/lnbits/wallets/lndrest.py
@@ -39,11 +39,13 @@ class LndRestWallet(Wallet):
encrypted_macaroon = getenv("LND_REST_MACAROON_ENCRYPTED")
if encrypted_macaroon:
- macaroon = AESCipher(description="macaroon decryption").decrypt(encrypted_macaroon)
+ macaroon = AESCipher(description="macaroon decryption").decrypt(
+ encrypted_macaroon
+ )
self.macaroon = load_macaroon(macaroon)
-
+
self.auth = {"Grpc-Metadata-macaroon": self.macaroon}
- self.cert = getenv("LND_REST_CERT")
+ self.cert = getenv("LND_REST_CERT", True)
async def status(self) -> StatusResponse:
try:
@@ -97,15 +99,11 @@ class LndRestWallet(Wallet):
return InvoiceResponse(True, checking_id, payment_request, None)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
async with httpx.AsyncClient(verify=self.cert) as client:
# set the fee limit for the payment
- invoice = lnbits_bolt11.decode(bolt11)
lnrpcFeeLimit = dict()
- if invoice.amount_msat > 1000_000:
- lnrpcFeeLimit["percent"] = "1" # in percent
- else:
- lnrpcFeeLimit["fixed"] = "10" # in sat
+ lnrpcFeeLimit["fixed_msat"] = "{}".format(fee_limit_msat)
r = await client.post(
url=f"{self.endpoint}/v1/channels/transactions",
@@ -162,6 +160,7 @@ class LndRestWallet(Wallet):
# for some reason our checking_ids are in base64 but the payment hashes
# returned here are in hex, lnd is weird
+ checking_id = checking_id.replace("_", "/")
checking_id = base64.b64decode(checking_id).hex()
for p in r.json()["payments"]:
diff --git a/lnbits/wallets/lnpay.py b/lnbits/wallets/lnpay.py
index 98610a79..88e6a3a2 100644
--- a/lnbits/wallets/lnpay.py
+++ b/lnbits/wallets/lnpay.py
@@ -76,7 +76,7 @@ class LNPayWallet(Wallet):
return InvoiceResponse(ok, checking_id, payment_request, error_message)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
async with httpx.AsyncClient() as client:
r = await client.post(
f"{self.endpoint}/wallet/{self.wallet_key}/withdraw",
diff --git a/lnbits/wallets/lntxbot.py b/lnbits/wallets/lntxbot.py
index 6d706959..bbd87a73 100644
--- a/lnbits/wallets/lntxbot.py
+++ b/lnbits/wallets/lntxbot.py
@@ -74,7 +74,7 @@ class LntxbotWallet(Wallet):
data = r.json()
return InvoiceResponse(True, data["payment_hash"], data["pay_req"], None)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
async with httpx.AsyncClient() as client:
r = await client.post(
f"{self.endpoint}/payinvoice",
diff --git a/lnbits/wallets/macaroon/__init__.py b/lnbits/wallets/macaroon/__init__.py
index b7cadcfe..4967c100 100644
--- a/lnbits/wallets/macaroon/__init__.py
+++ b/lnbits/wallets/macaroon/__init__.py
@@ -1 +1 @@
-from .macaroon import load_macaroon, AESCipher
\ No newline at end of file
+from .macaroon import load_macaroon, AESCipher
diff --git a/lnbits/wallets/macaroon/macaroon.py b/lnbits/wallets/macaroon/macaroon.py
index dd6ff636..3548e9e2 100644
--- a/lnbits/wallets/macaroon/macaroon.py
+++ b/lnbits/wallets/macaroon/macaroon.py
@@ -5,10 +5,11 @@ from hashlib import md5
import getpass
BLOCK_SIZE = 16
-import getpass
+import getpass
+
def load_macaroon(macaroon: str) -> str:
- """Returns hex version of a macaroon encoded in base64 or the file path.
+ """Returns hex version of a macaroon encoded in base64 or the file path.
:param macaroon: Macaroon encoded in base64 or file path.
:type macaroon: str
@@ -29,6 +30,7 @@ def load_macaroon(macaroon: str) -> str:
pass
return macaroon
+
class AESCipher(object):
"""This class is compatible with crypto-js/aes.js
@@ -39,6 +41,7 @@ class AESCipher(object):
AES.decrypt(encrypted, password).toString(Utf8);
"""
+
def __init__(self, key=None, description=""):
self.key = key
self.description = description + " "
@@ -47,7 +50,6 @@ class AESCipher(object):
length = BLOCK_SIZE - (len(data) % BLOCK_SIZE)
return data + (chr(length) * length).encode()
-
def unpad(self, data):
return data[: -(data[-1] if type(data[-1]) == int else ord(data[-1]))]
@@ -70,8 +72,7 @@ class AESCipher(object):
return final_key[:output]
def decrypt(self, encrypted: str) -> str:
- """Decrypts a string using AES-256-CBC.
- """
+ """Decrypts a string using AES-256-CBC."""
passphrase = self.passphrase
encrypted = base64.b64decode(encrypted)
assert encrypted[0:8] == b"Salted__"
@@ -92,7 +93,10 @@ class AESCipher(object):
key = key_iv[:32]
iv = key_iv[32:]
aes = AES.new(key, AES.MODE_CBC, iv)
- return base64.b64encode(b"Salted__" + salt + aes.encrypt(self.pad(message))).decode()
+ return base64.b64encode(
+ b"Salted__" + salt + aes.encrypt(self.pad(message))
+ ).decode()
+
# if this file is executed directly, ask for a macaroon and encrypt it
if __name__ == "__main__":
diff --git a/lnbits/wallets/opennode.py b/lnbits/wallets/opennode.py
index 965b6d66..0ac205e2 100644
--- a/lnbits/wallets/opennode.py
+++ b/lnbits/wallets/opennode.py
@@ -77,7 +77,7 @@ class OpenNodeWallet(Wallet):
payment_request = data["lightning_invoice"]["payreq"]
return InvoiceResponse(True, checking_id, payment_request, None)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
async with httpx.AsyncClient() as client:
r = await client.post(
f"{self.endpoint}/v2/withdrawals",
diff --git a/lnbits/wallets/spark.py b/lnbits/wallets/spark.py
index 93f37cce..7b9a23e2 100644
--- a/lnbits/wallets/spark.py
+++ b/lnbits/wallets/spark.py
@@ -107,9 +107,12 @@ class SparkWallet(Wallet):
return InvoiceResponse(ok, checking_id, payment_request, error_message)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
try:
- r = await self.pay(bolt11)
+ r = await self.pay(
+ bolt11=bolt11,
+ maxfee=fee_limit_msat,
+ )
except (SparkError, UnknownError) as exc:
listpays = await self.listpays(bolt11)
if listpays:
@@ -129,7 +132,9 @@ class SparkWallet(Wallet):
if pay["status"] == "failed":
return PaymentResponse(False, None, 0, None, str(exc))
elif pay["status"] == "pending":
- return PaymentResponse(None, payment_hash, 0, None, None)
+ return PaymentResponse(
+ None, payment_hash, fee_limit_msat, None, None
+ )
elif pay["status"] == "complete":
r = pay
r["payment_preimage"] = pay["preimage"]
@@ -152,9 +157,11 @@ class SparkWallet(Wallet):
if not r or not r.get("invoices"):
return PaymentStatus(None)
- if r["invoices"][0]["status"] == "unpaid":
+
+ if r["invoices"][0]["status"] == "paid":
+ return PaymentStatus(True)
+ else:
return PaymentStatus(False)
- return PaymentStatus(True)
async def get_payment_status(self, checking_id: str) -> PaymentStatus:
# check if it's 32 bytes hex
diff --git a/lnbits/wallets/void.py b/lnbits/wallets/void.py
index 03b6db44..c5cc08b5 100644
--- a/lnbits/wallets/void.py
+++ b/lnbits/wallets/void.py
@@ -25,7 +25,7 @@ class VoidWallet(Wallet):
)
return StatusResponse(None, 0)
- async def pay_invoice(self, bolt11: str) -> PaymentResponse:
+ async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
raise Unsupported("")
async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
diff --git a/tests/conftest.py b/tests/conftest.py
index 127233c1..27ba9137 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -19,9 +19,10 @@ def app():
loop.run_until_complete(loop.shutdown_asyncgens())
loop.close()
+
@pytest.fixture
async def client(app):
- client = AsyncClient(app=app, base_url=f'http://{HOST}:{PORT}')
+ client = AsyncClient(app=app, base_url=f"http://{HOST}:{PORT}")
# yield and pass the client to the test
yield client
# close the async client after the test has finished
diff --git a/tests/core/views/test_generic.py b/tests/core/views/test_generic.py
index 4917cde4..5d3db0fb 100644
--- a/tests/core/views/test_generic.py
+++ b/tests/core/views/test_generic.py
@@ -1,6 +1,7 @@
import pytest
from tests.conftest import client
+
@pytest.mark.asyncio
async def test_core_views_generic(client):
response = await client.get("/")
diff --git a/tests/extensions/bleskomat/conftest.py b/tests/extensions/bleskomat/conftest.py
index 924998a7..265d3be0 100644
--- a/tests/extensions/bleskomat/conftest.py
+++ b/tests/extensions/bleskomat/conftest.py
@@ -4,16 +4,22 @@ import secrets
from lnbits.core.crud import create_account, create_wallet
from lnbits.extensions.bleskomat.crud import create_bleskomat, create_bleskomat_lnurl
from lnbits.extensions.bleskomat.models import CreateBleskomat
-from lnbits.extensions.bleskomat.helpers import generate_bleskomat_lnurl_secret, generate_bleskomat_lnurl_signature, prepare_lnurl_params, query_to_signing_payload
+from lnbits.extensions.bleskomat.helpers import (
+ generate_bleskomat_lnurl_secret,
+ generate_bleskomat_lnurl_signature,
+ prepare_lnurl_params,
+ query_to_signing_payload,
+)
from lnbits.extensions.bleskomat.exchange_rates import exchange_rate_providers
exchange_rate_providers["dummy"] = {
"name": "dummy",
"domain": None,
"api_url": None,
- "getter": lambda data, replacements: str(1e8),# 1 BTC = 100000000 sats
+ "getter": lambda data, replacements: str(1e8), # 1 BTC = 100000000 sats
}
+
@pytest.fixture
async def bleskomat():
user = await create_account()
@@ -22,11 +28,12 @@ async def bleskomat():
name="Test Bleskomat",
fiat_currency="EUR",
exchange_rate_provider="dummy",
- fee="0"
+ fee="0",
)
bleskomat = await create_bleskomat(data=data, wallet_id=wallet.id)
return bleskomat
+
@pytest.fixture
async def lnurl(bleskomat):
query = {
@@ -43,7 +50,7 @@ async def lnurl(bleskomat):
signature = generate_bleskomat_lnurl_signature(
payload=payload,
api_key_secret=bleskomat.api_key_secret,
- api_key_encoding=bleskomat.api_key_encoding
+ api_key_encoding=bleskomat.api_key_encoding,
)
secret = generate_bleskomat_lnurl_secret(bleskomat.api_key_id, signature)
params = json.JSONEncoder().encode(params)
diff --git a/tests/extensions/bleskomat/test_lnurl_api.py b/tests/extensions/bleskomat/test_lnurl_api.py
index 2ee59117..00358470 100644
--- a/tests/extensions/bleskomat/test_lnurl_api.py
+++ b/tests/extensions/bleskomat/test_lnurl_api.py
@@ -3,7 +3,10 @@ import secrets
from lnbits.core.crud import get_wallet
from lnbits.settings import HOST, PORT
from lnbits.extensions.bleskomat.crud import get_bleskomat_lnurl
-from lnbits.extensions.bleskomat.helpers import generate_bleskomat_lnurl_signature, query_to_signing_payload
+from lnbits.extensions.bleskomat.helpers import (
+ generate_bleskomat_lnurl_signature,
+ query_to_signing_payload,
+)
from tests.conftest import client
from tests.helpers import credit_wallet
from tests.extensions.bleskomat.conftest import bleskomat, lnurl
@@ -73,7 +76,9 @@ async def test_bleskomat_lnurl_api_valid_signature(client, bleskomat):
}
payload = query_to_signing_payload(query)
signature = generate_bleskomat_lnurl_signature(
- payload=payload, api_key_secret=bleskomat.api_key_secret, api_key_encoding=bleskomat.api_key_encoding
+ payload=payload,
+ api_key_secret=bleskomat.api_key_secret,
+ api_key_encoding=bleskomat.api_key_encoding,
)
response = await client.get(f"/bleskomat/u?{payload}&signature={signature}")
assert response.status_code == 200
@@ -97,7 +102,9 @@ async def test_bleskomat_lnurl_api_action_insufficient_balance(client, lnurl):
response = await client.get(f"/bleskomat/u?k1={secret}&pr={pr}")
assert response.status_code == 200
assert response.json()["status"] == "ERROR"
- assert ("Insufficient balance" in response.json()["reason"]) or ("fee" in response.json()["reason"])
+ assert ("Insufficient balance" in response.json()["reason"]) or (
+ "fee" in response.json()["reason"]
+ )
wallet = await get_wallet(bleskomat.wallet)
assert wallet.balance_msat == 0
bleskomat_lnurl = await get_bleskomat_lnurl(secret)
@@ -123,4 +130,4 @@ async def test_bleskomat_lnurl_api_action_success(client, lnurl):
assert wallet.balance_msat == 50000
bleskomat_lnurl = await get_bleskomat_lnurl(secret)
assert bleskomat_lnurl.has_uses_remaining() == False
- WALLET.pay_invoice.assert_called_once_with(pr)
+ WALLET.pay_invoice.assert_called_once_with(pr, 2000)
diff --git a/tests/helpers.py b/tests/helpers.py
index 1687e25d..3774f6fc 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -2,6 +2,7 @@ import hashlib
import secrets
from lnbits.core.crud import create_payment
+
async def credit_wallet(wallet_id: str, amount: int):
preimage = secrets.token_hex(32)
m = hashlib.sha256()
@@ -14,6 +15,6 @@ async def credit_wallet(wallet_id: str, amount: int):
checking_id=payment_hash,
preimage=preimage,
memo="",
- amount=amount,# msat
- pending=False,# not pending, so it will increase the wallet's balance
+ amount=amount, # msat
+ pending=False, # not pending, so it will increase the wallet's balance
)
diff --git a/tests/mocks.py b/tests/mocks.py
index 5b20824c..a3b5308d 100644
--- a/tests/mocks.py
+++ b/tests/mocks.py
@@ -9,28 +9,42 @@ from lnbits.wallets.base import (
)
from lnbits.settings import WALLET
-WALLET.status = AsyncMock(return_value=StatusResponse(
- "",# no error
- 1000000,# msats
-))
-WALLET.create_invoice = AsyncMock(return_value=InvoiceResponse(
- True,# ok
- "6621aafbdd7709ca6eea6203f362d64bd7cb2911baa91311a176b3ecaf2274bd",# checking_id (i.e. payment_hash)
- "lntb1u1psezhgspp5vcs6477awuyu5mh2vgplxckkf0tuk2g3h253xydpw6e7etezwj7sdqqcqzpgxqyz5vqsp5dxpw8zs77hw5pla4wz4mfujllyxtlpu443auur2uxqdrs8q2h56q9qyyssq65zk30ylmygvv5y4tuwalnf3ttnqjn57ef6rmcqg0s53akem560jh8ptemjcmytn3lrlatw4hv9smg88exv3v4f4lqnp96s0psdrhxsp6pp75q",# payment_request
- "",# no error
-))
-def pay_invoice_side_effect(payment_request: str):
+WALLET.status = AsyncMock(
+ return_value=StatusResponse(
+ "", # no error
+ 1000000, # msats
+ )
+)
+WALLET.create_invoice = AsyncMock(
+ return_value=InvoiceResponse(
+ True, # ok
+ "6621aafbdd7709ca6eea6203f362d64bd7cb2911baa91311a176b3ecaf2274bd", # checking_id (i.e. payment_hash)
+ "lntb1u1psezhgspp5vcs6477awuyu5mh2vgplxckkf0tuk2g3h253xydpw6e7etezwj7sdqqcqzpgxqyz5vqsp5dxpw8zs77hw5pla4wz4mfujllyxtlpu443auur2uxqdrs8q2h56q9qyyssq65zk30ylmygvv5y4tuwalnf3ttnqjn57ef6rmcqg0s53akem560jh8ptemjcmytn3lrlatw4hv9smg88exv3v4f4lqnp96s0psdrhxsp6pp75q", # payment_request
+ "", # no error
+ )
+)
+
+
+def pay_invoice_side_effect(
+ payment_request: str, fee_limit_msat: int
+) -> PaymentResponse:
invoice = bolt11.decode(payment_request)
return PaymentResponse(
- True,# ok
- invoice.payment_hash,# checking_id (i.e. payment_hash)
- 0,# fee_msat
- "",# no error
+ True, # ok
+ invoice.payment_hash, # checking_id (i.e. payment_hash)
+ 0, # fee_msat
+ "", # no error
)
+
+
WALLET.pay_invoice = AsyncMock(side_effect=pay_invoice_side_effect)
-WALLET.get_invoice_status = AsyncMock(return_value=PaymentStatus(
- True,# paid
-))
-WALLET.get_payment_status = AsyncMock(return_value=PaymentStatus(
- True,# paid
-))
+WALLET.get_invoice_status = AsyncMock(
+ return_value=PaymentStatus(
+ True, # paid
+ )
+)
+WALLET.get_payment_status = AsyncMock(
+ return_value=PaymentStatus(
+ True, # paid
+ )
+)