aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix: bump lnurl its not callback_url now, its just url (#3312)

Browse source
This commit is contained in:
dni ⚡ 2025-08-18 09:18:11 +02:00 • committed by GitHub
parent 0ba81ec719
commit c24d2f24cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lnbits/core/services/lnurl.py
View file

@ -12,7 +12,9 @@ from lnbits.settings import settings
from lnbits.utils.exchange_rates import fiat_amount_as_satoshis from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
async def get_pr_from_lnurl(lnurl: str, amount_msat: int) -> str: async def get_pr_from_lnurl(
lnurl: str, amount_msat: int, comment: str | None = None
) -> str:
res = await handle(lnurl, user_agent=settings.user_agent, timeout=10) res = await handle(lnurl, user_agent=settings.user_agent, timeout=10)
if isinstance(res, LnurlErrorResponse): if isinstance(res, LnurlErrorResponse):
raise LnurlResponseException(res.reason) raise LnurlResponseException(res.reason)
@ -22,7 +24,8 @@ async def get_pr_from_lnurl(lnurl: str, amount_msat: int) -> str:
) )
res2 = await execute_pay_request( res2 = await execute_pay_request(
res, res,
msat=str(amount_msat), msat=amount_msat,
comment=comment,
user_agent=settings.user_agent, user_agent=settings.user_agent,
timeout=10, timeout=10,
) )
@ -48,7 +51,8 @@ async def fetch_lnurl_pay_request(data: CreateLnurlPayment) -> LnurlPayActionRes
return await execute_pay_request( return await execute_pay_request(
data.res, data.res,
msat=str(amount_msat), msat=amount_msat,
comment=data.comment,
user_agent=settings.user_agent, user_agent=settings.user_agent,
timeout=10, timeout=10,
) )

8
lnbits/core/views/lnurl_api.py
View file

@ -134,12 +134,12 @@ async def api_payment_pay_with_nfc(
payment_request: str, payment_request: str,
lnurl_data: CreateLnurlWithdraw, lnurl_data: CreateLnurlWithdraw,
) -> LnurlErrorResponse | LnurlSuccessResponse: ) -> LnurlErrorResponse | LnurlSuccessResponse:
if not lnurl_data.lnurl_w.lud17:
return LnurlErrorResponse(reason="LNURL-withdraw lud17 not provided.")
try: try:
res = await lnurl_handle( url = lnurl_data.lnurl_w.lud17
lnurl_data.lnurl_w.callback_url, user_agent=settings.user_agent, timeout=10 res = await lnurl_handle(url, user_agent=settings.user_agent, timeout=10)
)
except (LnurlResponseException, Exception) as exc: except (LnurlResponseException, Exception) as exc:
logger.warning(exc)
return LnurlErrorResponse(reason=str(exc)) return LnurlErrorResponse(reason=str(exc))
if not isinstance(res, LnurlWithdrawResponse): if not isinstance(res, LnurlWithdrawResponse):

8
poetry.lock generated
View file

@ -2133,14 +2133,14 @@ valkey = ["valkey (>=6)"]
[[package]] [[package]]
name = "lnurl" name = "lnurl"
version = "0.6.8" version = "0.7.2"
description = "LNURL implementation for Python." description = "LNURL implementation for Python."
optional = false optional = false
python-versions = ">=3.10" python-versions = ">=3.10"
groups = ["main"] groups = ["main"]
files = [ files = [
{file = "lnurl-0.6.8-py3-none-any.whl", hash = "sha256:4fff53efcdd401cf4169676bd1ab85e9e241a762a9a5407ee11e6a6e120e8279"}, {file = "lnurl-0.7.2-py3-none-any.whl", hash = "sha256:4323ac398d49e5b883000c166b4c2448df2acad2eddca99f656c67f7b97cd80f"},
{file = "lnurl-0.6.8.tar.gz", hash = "sha256:de64a47179980a4b52cd6b89ad377cda14502f1998f53724490683f6f5c4ed90"}, {file = "lnurl-0.7.2.tar.gz", hash = "sha256:9f0881cb5909512cadb35d238c27347d6a8afcec10b2b7aadd560083fd210c0b"},
] ]
[package.dependencies] [package.dependencies]
@ -4573,4 +4573,4 @@ migration = ["psycopg2-binary"]
[metadata] [metadata]
lock-version = "2.1" lock-version = "2.1"
python-versions = "~3.12 | ~3.11 | ~3.10" python-versions = "~3.12 | ~3.11 | ~3.10"
content-hash = "c1714a4df0e8f7d8702fffe9c57b21fc39effb194631741b4718466c18b73d8f" content-hash = "7100b67d94f82cb53ceb8f4e47ae8a4aa426408feabeb0746c323d09f229c242"

2
pyproject.toml
View file

@ -20,7 +20,7 @@ fastapi = "0.116.1"
starlette = "0.47.1" starlette = "0.47.1"
httpx = "0.27.0" httpx = "0.27.0"
jinja2 = "3.1.6" jinja2 = "3.1.6"
lnurl = "0.6.8" lnurl = "0.7.2"
pydantic = "1.10.22" pydantic = "1.10.22"
pyqrcode = "1.2.1" pyqrcode = "1.2.1"
shortuuid = "1.0.13" shortuuid = "1.0.13"

1
tests/api/test_api.py
View file

@ -623,7 +623,6 @@ async def test_fiat_tracking(client, adminkey_headers_from, settings: Settings):
{ {
"tag": "payRequest", "tag": "payRequest",
"callback": "https://example.com/callback", "callback": "https://example.com/callback",
"k1": "randomk1value",
"minSendable": 1000, "minSendable": 1000,
"maxSendable": 1_500_000, "maxSendable": 1_500_000,
"metadata": '[["text/plain", "Payment to yo"]]', "metadata": '[["text/plain", "Payment to yo"]]',