-
-
-
-
- Send onchain funds offchain (BTC -> LN)
-
-
-
-
- Send offchain funds to onchain address (LN -> BTC)
-
-
-
-
- Check all pending swaps if they can be refunded.
-
-
-
-
-
-
-
-
-
Swaps (In)
-
-
- Export to CSV
-
-
-
-
-
-
-
Reverse Swaps (Out)
-
-
- Export to CSV
-
-
+
+ {% include "boltz/_buttons.html" %} {% include
+ "boltz/_submarineSwapList.html" %} {% include
+ "boltz/_reverseSubmarineSwapList.html" %} {% include
+ "boltz/_autoReverseSwapList.html" %}
-
-
-
- {{SITE_TITLE}} Boltz extension
-
-
-
- {% include "boltz/_api_docs.html" %}
-
-
+
+ {% include "boltz/_api_docs.html" %}
-
-
-
-
-
-
-
-
-
-
-
- Cancel
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Create Onchain TX when transaction is in mempool, but not
- confirmed yet.
-
-
-
-
-
-
- Cancel
-
-
-
-
-
-
-
-
-
-
- {% raw %}
- Bitcoin On-Chain TX
- Expected amount (sats): {{ qrCodeDialog.data.expected_amount }}
-
- Expected amount (btc): {{ qrCodeDialog.data.expected_amount_btc
- }}
- Onchain Address: {{ qrCodeDialog.data.address }}
- {% endraw %}
-
-
- Copy On-Chain Address
- Close
-
-
-
-
-
-
- {% raw %}
- Wallet: {{ statusDialog.data.wallet }}
- Boltz Status: {{ statusDialog.data.boltz }}
- Mempool Status: {{ statusDialog.data.mempool }}
- Blockheight timeout: {{ statusDialog.data.timeout_block_height
- }}
- {% endraw %}
-
-
- Refund
-
- Download refundfile
- Close
-
-
-
-
-
- pending swaps
-
- {% raw %}
-
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
- refund swap
-
-
- dowload refund file
-
-
- open tx on mempool.space
-
-
-
- {{ col.value }}
-
-
-
- {% endraw %}
-
- pending reverse swaps
-
- {% raw %}
-
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
- open tx on mempool.space
-
-
-
- {{ col.value }}
-
-
-
- {% endraw %}
-
-
- Close
-
-
-
+ {% include "boltz/_submarineSwapDialog.html" %} {% include
+ "boltz/_reverseSubmarineSwapDialog.html" %} {% include
+ "boltz/_autoReverseSwapDialog.html" %} {% include "boltz/_qrDialog.html" %} {%
+ include "boltz/_statusDialog.html" %}
{% endblock %} {% block scripts %} {{ window_vars(user) }}
diff --git a/lnbits/extensions/boltz/utils.py b/lnbits/extensions/boltz/utils.py
index 4fb2edda2..7623fb6f6 100644
--- a/lnbits/extensions/boltz/utils.py
+++ b/lnbits/extensions/boltz/utils.py
@@ -1,10 +1,25 @@
+import asyncio
import calendar
import datetime
+from typing import Awaitable
-import httpx
-from loguru import logger
+from boltz_client.boltz import BoltzClient, BoltzConfig
-from lnbits.core.services import fee_reserve, get_wallet
+from lnbits.core.services import fee_reserve, get_wallet, pay_invoice
+from lnbits.settings import settings
+
+from .models import ReverseSubmarineSwap
+
+
+def create_boltz_client() -> BoltzClient:
+ config = BoltzConfig(
+ network=settings.boltz_network,
+ api_url=settings.boltz_url,
+ mempool_url=f"{settings.boltz_mempool_space_url}/api",
+ mempool_ws_url=f"{settings.boltz_mempool_space_url_ws}/api/v1/ws",
+ referral_id="lnbits",
+ )
+ return BoltzClient(config)
async def check_balance(data) -> bool:
@@ -23,22 +38,50 @@ def get_timestamp():
return calendar.timegm(date.utctimetuple())
-def req_wrap(funcname, *args, **kwargs):
- try:
+async def execute_reverse_swap(client, swap: ReverseSubmarineSwap):
+ # claim_task is watching onchain address for the lockup transaction to arrive / confirm
+ # and if the lockup is there, claim the onchain revealing preimage for hold invoice
+ claim_task = asyncio.create_task(
+ client.claim_reverse_swap(
+ privkey_wif=swap.claim_privkey,
+ preimage_hex=swap.preimage,
+ lockup_address=swap.lockup_address,
+ receive_address=swap.onchain_address,
+ redeem_script_hex=swap.redeem_script,
+ )
+ )
+ # pay_task is paying the hold invoice which gets held until you reveal your preimage when claiming your onchain funds
+ pay_task = pay_invoice_and_update_status(
+ swap.id,
+ claim_task,
+ pay_invoice(
+ wallet_id=swap.wallet,
+ payment_request=swap.invoice,
+ description=f"reverse swap for {swap.onchain_amount} sats on boltz.exchange",
+ extra={"tag": "boltz", "swap_id": swap.id, "reverse": True},
+ ),
+ )
+
+ # they need to run be concurrently, because else pay_task will lock the eventloop and claim_task will not be executed.
+ # the lockup transaction can only happen after you pay the invoice, which cannot be redeemed immediatly -> hold invoice
+ # after getting the lockup transaction, you can claim the onchain funds revealing the preimage for boltz to redeem the hold invoice
+ asyncio.gather(claim_task, pay_task)
+
+
+def pay_invoice_and_update_status(
+ swap_id: str, wstask: asyncio.Task, awaitable: Awaitable
+) -> asyncio.Task:
+ async def _pay_invoice(awaitable):
+ from .crud import update_swap_status
+
try:
- func = getattr(httpx, funcname)
- except AttributeError:
- logger.error('httpx function not found "%s"' % funcname)
- else:
- res = func(*args, timeout=30, **kwargs)
- res.raise_for_status()
- return res
- except httpx.RequestError as exc:
- msg = f"Unreachable: {exc.request.url!r}."
- logger.error(msg)
- raise
- except httpx.HTTPStatusError as exc:
- msg = f"HTTP Status Error: {exc.response.status_code} while requesting {exc.request.url!r}."
- logger.error(msg)
- logger.error(exc.response.json()["error"])
- raise
+ awaited = await awaitable
+ await update_swap_status(swap_id, "complete")
+ return awaited
+ except asyncio.exceptions.CancelledError:
+ """lnbits process was exited, do nothing and handle it in startup script"""
+ except:
+ wstask.cancel()
+ await update_swap_status(swap_id, "failed")
+
+ return asyncio.create_task(_pay_invoice(awaitable))
diff --git a/lnbits/extensions/boltz/views.py b/lnbits/extensions/boltz/views.py
index b6864113c..4b0e6d535 100644
--- a/lnbits/extensions/boltz/views.py
+++ b/lnbits/extensions/boltz/views.py
@@ -1,11 +1,10 @@
from urllib.parse import urlparse
-from fastapi import Request
-from fastapi.params import Depends
+from fastapi import Depends, Request
from fastapi.templating import Jinja2Templates
from starlette.responses import HTMLResponse
-from lnbits.core.models import Payment, User
+from lnbits.core.models import User
from lnbits.decorators import check_user_exists
from . import boltz_ext, boltz_renderer
@@ -16,7 +15,6 @@ templates = Jinja2Templates(directory="templates")
@boltz_ext.get("/", response_class=HTMLResponse)
async def index(request: Request, user: User = Depends(check_user_exists)):
root_url = urlparse(str(request.url)).netloc
- wallet_ids = [wallet.id for wallet in user.wallets]
return boltz_renderer().TemplateResponse(
"boltz/index.html",
{"request": request, "user": user.dict(), "root_url": root_url},
diff --git a/lnbits/extensions/boltz/views_api.py b/lnbits/extensions/boltz/views_api.py
index 34f4033e8..ab32fac9a 100644
--- a/lnbits/extensions/boltz/views_api.py
+++ b/lnbits/extensions/boltz/views_api.py
@@ -1,34 +1,23 @@
-from datetime import datetime
from http import HTTPStatus
from typing import List
-import httpx
-from fastapi import status
-from fastapi.encoders import jsonable_encoder
-from fastapi.param_functions import Body
-from fastapi.params import Depends, Query
-from loguru import logger
-from pydantic import BaseModel
+from fastapi import Depends, Query, status
from starlette.exceptions import HTTPException
-from starlette.requests import Request
from lnbits.core.crud import get_user
+from lnbits.core.services import create_invoice
from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
+from lnbits.helpers import urlsafe_short_hash
from lnbits.settings import settings
from . import boltz_ext
-from .boltz import (
- create_refund_tx,
- create_reverse_swap,
- create_swap,
- get_boltz_pairs,
- get_swap_status,
-)
from .crud import (
+ create_auto_reverse_submarine_swap,
create_reverse_submarine_swap,
create_submarine_swap,
- get_pending_reverse_submarine_swaps,
- get_pending_submarine_swaps,
+ delete_auto_reverse_submarine_swap,
+ get_auto_reverse_submarine_swap_by_wallet,
+ get_auto_reverse_submarine_swaps,
get_reverse_submarine_swap,
get_reverse_submarine_swaps,
get_submarine_swap,
@@ -36,12 +25,14 @@ from .crud import (
update_swap_status,
)
from .models import (
+ AutoReverseSubmarineSwap,
+ CreateAutoReverseSubmarineSwap,
CreateReverseSubmarineSwap,
CreateSubmarineSwap,
ReverseSubmarineSwap,
SubmarineSwap,
)
-from .utils import check_balance
+from .utils import check_balance, create_boltz_client, execute_reverse_swap
@boltz_ext.get(
@@ -76,17 +67,8 @@ async def api_submarineswap(
):
wallet_ids = [g.wallet.id]
if all_wallets:
- wallet_ids = (await get_user(g.wallet.user)).wallet_ids
-
- for swap in await get_pending_submarine_swaps(wallet_ids):
- swap_status = get_swap_status(swap)
- if swap_status.hit_timeout:
- if not swap_status.has_lockup:
- logger.warning(
- f"Boltz - swap: {swap.id} hit timeout, but no lockup tx..."
- )
- await update_swap_status(swap.id, "timeout")
-
+ user = await get_user(g.wallet.user)
+ wallet_ids = user.wallet_ids if user else []
return [swap.dict() for swap in await get_submarine_swaps(wallet_ids)]
@@ -109,35 +91,29 @@ async def api_submarineswap(
},
},
)
-async def api_submarineswap_refund(
- swap_id: str,
- g: WalletTypeInfo = Depends(require_admin_key),
-):
- if swap_id == None:
+async def api_submarineswap_refund(swap_id: str):
+ if not swap_id:
raise HTTPException(
status_code=HTTPStatus.BAD_REQUEST, detail="swap_id missing"
)
-
swap = await get_submarine_swap(swap_id)
- if swap == None:
+ if not swap:
raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="swap does not exist."
)
-
if swap.status != "pending":
raise HTTPException(
status_code=HTTPStatus.METHOD_NOT_ALLOWED, detail="swap is not pending."
)
- try:
- await create_refund_tx(swap)
- except httpx.RequestError as exc:
- raise HTTPException(
- status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
- detail=f"Unreachable: {exc.request.url!r}.",
- )
- except Exception as exc:
- raise HTTPException(status_code=HTTPStatus.METHOD_NOT_ALLOWED, detail=str(exc))
+ client = create_boltz_client()
+ await client.refund_swap(
+ privkey_wif=swap.refund_privkey,
+ lockup_address=swap.address,
+ receive_address=swap.refund_address,
+ redeem_script_hex=swap.redeem_script,
+ timeout_block_height=swap.timeout_block_height,
+ )
await update_swap_status(swap.id, "refunded")
return swap
@@ -153,37 +129,43 @@ async def api_submarineswap_refund(
""",
response_description="create swap",
response_model=SubmarineSwap,
+ dependencies=[Depends(require_admin_key)],
responses={
- 405: {"description": "not allowed method, insufficient balance"},
+ 405: {
+ "description": "auto reverse swap is active, a swap would immediatly be swapped out again."
+ },
500: {"description": "boltz error"},
},
)
-async def api_submarineswap_create(
- data: CreateSubmarineSwap,
- wallet: WalletTypeInfo = Depends(require_admin_key),
-):
- try:
- swap_data = await create_swap(data)
- except httpx.RequestError as exc:
+async def api_submarineswap_create(data: CreateSubmarineSwap):
+
+ auto_swap = await get_auto_reverse_submarine_swap_by_wallet(data.wallet)
+ if auto_swap:
raise HTTPException(
- status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
- detail=f"Unreachable: {exc.request.url!r}.",
+ status_code=HTTPStatus.METHOD_NOT_ALLOWED,
+ detail="auto reverse swap is active, a swap would immediatly be swapped out again.",
)
- except Exception as exc:
- raise HTTPException(status_code=HTTPStatus.METHOD_NOT_ALLOWED, detail=str(exc))
- except httpx.HTTPStatusError as exc:
- raise HTTPException(
- status_code=exc.response.status_code, detail=exc.response.json()["error"]
- )
- swap = await create_submarine_swap(swap_data)
- return swap.dict()
+
+ client = create_boltz_client()
+ swap_id = urlsafe_short_hash()
+ payment_hash, payment_request = await create_invoice(
+ wallet_id=data.wallet,
+ amount=data.amount,
+ memo=f"swap of {data.amount} sats on boltz.exchange",
+ extra={"tag": "boltz", "swap_id": swap_id},
+ )
+ refund_privkey_wif, swap = client.create_swap(payment_request)
+ new_swap = await create_submarine_swap(
+ data, swap, swap_id, refund_privkey_wif, payment_hash
+ )
+ return new_swap.dict() if new_swap else None
# REVERSE SWAP
@boltz_ext.get(
"/api/v1/swap/reverse",
name=f"boltz.get /swap/reverse",
- summary="get a list of reverse swaps a swap",
+ summary="get a list of reverse swaps",
description="""
This endpoint gets a list of reverse swaps.
""",
@@ -192,13 +174,14 @@ async def api_submarineswap_create(
response_model=List[ReverseSubmarineSwap],
)
async def api_reverse_submarineswap(
- g: WalletTypeInfo = Depends(get_key_type), # type:ignore
+ g: WalletTypeInfo = Depends(get_key_type),
all_wallets: bool = Query(False),
):
wallet_ids = [g.wallet.id]
if all_wallets:
- wallet_ids = (await get_user(g.wallet.user)).wallet_ids
- return [swap.dict() for swap in await get_reverse_submarine_swaps(wallet_ids)]
+ user = await get_user(g.wallet.user)
+ wallet_ids = user.wallet_ids if user else []
+ return [swap for swap in await get_reverse_submarine_swaps(wallet_ids)]
@boltz_ext.post(
@@ -211,6 +194,7 @@ async def api_reverse_submarineswap(
""",
response_description="create reverse swap",
response_model=ReverseSubmarineSwap,
+ dependencies=[Depends(require_admin_key)],
responses={
405: {"description": "not allowed method, insufficient balance"},
500: {"description": "boltz error"},
@@ -218,30 +202,88 @@ async def api_reverse_submarineswap(
)
async def api_reverse_submarineswap_create(
data: CreateReverseSubmarineSwap,
- wallet: WalletTypeInfo = Depends(require_admin_key),
-):
+) -> ReverseSubmarineSwap:
if not await check_balance(data):
raise HTTPException(
status_code=HTTPStatus.METHOD_NOT_ALLOWED, detail="Insufficient balance."
)
+ client = create_boltz_client()
+ claim_privkey_wif, preimage_hex, swap = client.create_reverse_swap(
+ amount=data.amount
+ )
+ new_swap = await create_reverse_submarine_swap(
+ data, claim_privkey_wif, preimage_hex, swap
+ )
+ await execute_reverse_swap(client, new_swap)
+ return new_swap
- try:
- swap_data, task = await create_reverse_swap(data)
- except httpx.RequestError as exc:
- raise HTTPException(
- status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
- detail=f"Unreachable: {exc.request.url!r}.",
- )
- except httpx.HTTPStatusError as exc:
- raise HTTPException(
- status_code=exc.response.status_code, detail=exc.response.json()["error"]
- )
- except Exception as exc:
- raise HTTPException(status_code=HTTPStatus.METHOD_NOT_ALLOWED, detail=str(exc))
- swap = await create_reverse_submarine_swap(swap_data)
- return swap.dict()
+@boltz_ext.get(
+ "/api/v1/swap/reverse/auto",
+ name=f"boltz.get /swap/reverse/auto",
+ summary="get a list of auto reverse swaps",
+ description="""
+ This endpoint gets a list of auto reverse swaps.
+ """,
+ response_description="list of auto reverse swaps",
+ dependencies=[Depends(get_key_type)],
+ response_model=List[AutoReverseSubmarineSwap],
+)
+async def api_auto_reverse_submarineswap(
+ g: WalletTypeInfo = Depends(get_key_type),
+ all_wallets: bool = Query(False),
+):
+ wallet_ids = [g.wallet.id]
+ if all_wallets:
+ user = await get_user(g.wallet.user)
+ wallet_ids = user.wallet_ids if user else []
+ return [swap.dict() for swap in await get_auto_reverse_submarine_swaps(wallet_ids)]
+
+
+@boltz_ext.post(
+ "/api/v1/swap/reverse/auto",
+ status_code=status.HTTP_201_CREATED,
+ name=f"boltz.post /swap/reverse/auto",
+ summary="create a auto reverse submarine swap",
+ description="""
+ This endpoint creates a auto reverse submarine swap
+ """,
+ response_description="create auto reverse swap",
+ response_model=AutoReverseSubmarineSwap,
+ dependencies=[Depends(require_admin_key)],
+ responses={
+ 405: {
+ "description": "auto reverse swap is active, only 1 swap per wallet possible."
+ },
+ },
+)
+async def api_auto_reverse_submarineswap_create(data: CreateAutoReverseSubmarineSwap):
+
+ auto_swap = await get_auto_reverse_submarine_swap_by_wallet(data.wallet)
+ if auto_swap:
+ raise HTTPException(
+ status_code=HTTPStatus.METHOD_NOT_ALLOWED,
+ detail="auto reverse swap is active, only 1 swap per wallet possible.",
+ )
+
+ swap = await create_auto_reverse_submarine_swap(data)
+ return swap.dict() if swap else None
+
+
+@boltz_ext.delete(
+ "/api/v1/swap/reverse/auto/{swap_id}",
+ name=f"boltz.delete /swap/reverse/auto",
+ summary="delete a auto reverse submarine swap",
+ description="""
+ This endpoint deletes a auto reverse submarine swap
+ """,
+ response_description="delete auto reverse swap",
+ dependencies=[Depends(require_admin_key)],
+)
+async def api_auto_reverse_submarineswap_delete(swap_id: str):
+ await delete_auto_reverse_submarine_swap(swap_id)
+ return "OK"
@boltz_ext.post(
@@ -252,65 +294,22 @@ async def api_reverse_submarineswap_create(
This endpoint attempts to get the status of the swap.
""",
response_description="status of swap json",
+ dependencies=[Depends(require_admin_key)],
responses={
404: {"description": "when swap_id is not found"},
},
)
-async def api_swap_status(
- swap_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
-):
+async def api_swap_status(swap_id: str):
swap = await get_submarine_swap(swap_id) or await get_reverse_submarine_swap(
swap_id
)
- if swap == None:
+ if not swap:
raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="swap does not exist."
)
- try:
- status = get_swap_status(swap)
- except httpx.RequestError as exc:
- raise HTTPException(
- status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
- detail=f"Unreachable: {exc.request.url!r}.",
- )
- except Exception as exc:
- raise HTTPException(
- status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(exc)
- )
- return status
-
-@boltz_ext.post(
- "/api/v1/swap/check",
- name=f"boltz.swap_check",
- summary="list all pending swaps",
- description="""
- This endpoint gives you 2 lists of pending swaps and reverse swaps.
- """,
- response_description="list of pending swaps",
-)
-async def api_check_swaps(
- g: WalletTypeInfo = Depends(require_admin_key),
- all_wallets: bool = Query(False),
-):
- wallet_ids = [g.wallet.id]
- if all_wallets:
- wallet_ids = (await get_user(g.wallet.user)).wallet_ids
- status = []
- try:
- for swap in await get_pending_submarine_swaps(wallet_ids):
- status.append(get_swap_status(swap))
- for reverseswap in await get_pending_reverse_submarine_swaps(wallet_ids):
- status.append(get_swap_status(reverseswap))
- except httpx.RequestError as exc:
- raise HTTPException(
- status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
- detail=f"Unreachable: {exc.request.url!r}.",
- )
- except Exception as exc:
- raise HTTPException(
- status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(exc)
- )
+ client = create_boltz_client()
+ status = client.swap_status(swap.boltz_id)
return status
@@ -325,14 +324,5 @@ async def api_check_swaps(
response_model=dict,
)
async def api_boltz_config():
- try:
- res = get_boltz_pairs()
- except httpx.RequestError as exc:
- raise HTTPException(
- status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
- detail=f"Unreachable: {exc.request.url!r}.",
- )
- except Exception as e:
- raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))
-
- return res["pairs"]["BTC/BTC"]
+ client = create_boltz_client()
+ return {"minimal": client.limit_minimal, "maximal": client.limit_maximal}
diff --git a/lnbits/extensions/deezy/templates/deezy/index.html b/lnbits/extensions/deezy/templates/deezy/index.html
index 858d32550..9d112ef13 100644
--- a/lnbits/extensions/deezy/templates/deezy/index.html
+++ b/lnbits/extensions/deezy/templates/deezy/index.html
@@ -224,7 +224,7 @@
- {{SITE_TITLE}} Boltz extension
+ {{SITE_TITLE}} Deezy extension
diff --git a/poetry.lock b/poetry.lock
index 5a99e198f..46dc503bf 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -175,6 +175,24 @@ d = ["aiohttp (>=3.7.4)"]
jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
uvloop = ["uvloop (>=0.15.2)"]
+[[package]]
+name = "boltz-client"
+version = "0.1.2"
+description = "python boltz client"
+category = "main"
+optional = false
+python-versions = ">=3.7,<4.0"
+files = [
+ {file = "boltz_client-0.1.2-py3-none-any.whl", hash = "sha256:2fb0814c7c3ea88d039e71088648df27db0c036b777b0618bd30638dd76ebe90"},
+ {file = "boltz_client-0.1.2.tar.gz", hash = "sha256:b360c0ff26f2dea62af6457de4d8c46e434cd24b607ed3aa71494409b57e082b"},
+]
+
+[package.dependencies]
+click = ">=8"
+embit = ">=0.4"
+httpx = ">=0.23"
+websockets = ">=10"
+
[[package]]
name = "cashu"
version = "0.8.2"
@@ -532,10 +550,10 @@ files = [
cffi = ">=1.12"
[package.extras]
-docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
+docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx_rtd_theme"]
docstest = ["pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"]
pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
-sdist = ["setuptools-rust (>=0.11.4)"]
+sdist = ["setuptools_rust (>=0.11.4)"]
ssh = ["bcrypt (>=3.1.5)"]
test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.2.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pytz"]
@@ -1784,7 +1802,7 @@ mssql = ["pyodbc"]
mssql-pymssql = ["pymssql"]
mssql-pyodbc = ["pyodbc"]
mysql = ["mysqlclient"]
-oracle = ["cx-oracle"]
+oracle = ["cx_oracle"]
postgresql = ["psycopg2"]
postgresql-pg8000 = ["pg8000 (<1.16.6)"]
postgresql-psycopg2binary = ["psycopg2-binary"]
@@ -2094,4 +2112,4 @@ testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools"
[metadata]
lock-version = "2.0"
python-versions = "^3.10 | ^3.9 | ^3.8 | ^3.7"
-content-hash = "9daf94dd600a7e23dcefcc8752fae1694e0084e56553dc578a63272776a8fe53"
+content-hash = "b2d22a2a33b4c0a4491b5519b28772435c15747b407a150ffa591bcf6ccb56a6"
diff --git a/pyproject.toml b/pyproject.toml
index 68e06db5e..23fe0dae1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,7 +62,8 @@ protobuf = "^4.21.6"
Cerberus = "^1.3.4"
async-timeout = "^4.0.2"
pyln-client = "0.11.1"
-cashu = "0.8.2"
+cashu = "^0.8.2"
+boltz-client = "^0.1.2"
[tool.poetry.dev-dependencies]
@@ -88,8 +89,7 @@ profile = "black"
[tool.mypy]
files = "lnbits"
exclude = """(?x)(
- ^lnbits/extensions/boltz.
- | ^lnbits/wallets/lnd_grpc_files.
+ ^lnbits/wallets/lnd_grpc_files.
)"""
[[tool.mypy.overrides]]
diff --git a/requirements.txt b/requirements.txt
index c5332811a..1a0872db8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,6 +7,7 @@ attrs==22.2.0 ; python_version >= "3.7" and python_version < "4.0"
base58==2.1.1 ; python_version >= "3.7" and python_version < "4.0"
bech32==1.2.0 ; python_version >= "3.7" and python_version < "4.0"
bitstring==3.1.9 ; python_version >= "3.7" and python_version < "4.0"
+boltz-client==0.1.2 ; python_version >= "3.7" and python_version < "4.0"
cashu==0.8.2 ; python_version >= "3.7" and python_version < "4.0"
cerberus==1.3.4 ; python_version >= "3.7" and python_version < "4.0"
certifi==2022.12.7 ; python_version >= "3.7" and python_version < "4.0"
diff --git a/tests/extensions/boltz/conftest.py b/tests/extensions/boltz/conftest.py
index b9ef78875..1eba452a9 100644
--- a/tests/extensions/boltz/conftest.py
+++ b/tests/extensions/boltz/conftest.py
@@ -1,17 +1,6 @@
-import asyncio
-import json
-import secrets
-
-import pytest
import pytest_asyncio
-from lnbits.core.crud import create_account, create_wallet, get_wallet
-from lnbits.extensions.boltz.boltz import create_reverse_swap, create_swap
-from lnbits.extensions.boltz.models import (
- CreateReverseSubmarineSwap,
- CreateSubmarineSwap,
-)
-from tests.mocks import WALLET
+from lnbits.extensions.boltz.models import CreateReverseSubmarineSwap
@pytest_asyncio.fixture(scope="session")
@@ -22,4 +11,4 @@ async def reverse_swap(from_wallet):
onchain_address="bcrt1q4vfyszl4p8cuvqh07fyhtxve5fxq8e2ux5gx43",
amount=20_000,
)
- return await create_reverse_swap(data)
+ return data
diff --git a/tests/extensions/boltz/test_api.py b/tests/extensions/boltz/test_api.py
index 0266f9400..057bdab5c 100644
--- a/tests/extensions/boltz/test_api.py
+++ b/tests/extensions/boltz/test_api.py
@@ -1,7 +1,6 @@
import pytest
-import pytest_asyncio
-from tests.helpers import is_fake, is_regtest
+from tests.helpers import is_fake
@pytest.mark.asyncio
diff --git a/tests/extensions/boltz/test_swap.py b/tests/extensions/boltz/test_swap.py
deleted file mode 100644
index ab5954acb..000000000
--- a/tests/extensions/boltz/test_swap.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import asyncio
-
-import pytest
-import pytest_asyncio
-
-from lnbits.extensions.boltz.boltz import create_reverse_swap, create_swap
-from lnbits.extensions.boltz.crud import (
- create_reverse_submarine_swap,
- create_submarine_swap,
- get_reverse_submarine_swap,
- get_submarine_swap,
-)
-from tests.extensions.boltz.conftest import reverse_swap
-from tests.helpers import is_fake, is_regtest
-
-
-@pytest.mark.asyncio
-@pytest.mark.skipif(is_fake, reason="this test is only passes in regtest")
-async def test_create_reverse_swap(client, reverse_swap):
- swap, wait_for_onchain = reverse_swap
- assert swap.status == "pending"
- assert swap.id is not None
- assert swap.boltz_id is not None
- assert swap.claim_privkey is not None
- assert swap.onchain_address is not None
- assert swap.lockup_address is not None
- newswap = await create_reverse_submarine_swap(swap)
- await wait_for_onchain
- newswap = await get_reverse_submarine_swap(swap.id)
- assert newswap is not None
- assert newswap.status == "complete"
- 
-