From 994070a7a525133e62459e94037463e703873c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Mon, 23 Jan 2023 10:26:22 +0100 Subject: [PATCH 1/5] update boltz_client to 0.1.3 --- poetry.lock | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index 46dc503bf..db8d12517 100644 --- a/poetry.lock +++ b/poetry.lock @@ -177,14 +177,14 @@ uvloop = ["uvloop (>=0.15.2)"] [[package]] name = "boltz-client" -version = "0.1.2" +version = "0.1.3" 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"}, + {file = "boltz_client-0.1.3-py3-none-any.whl", hash = "sha256:67a231de6cc0876376e32aa177eb572ef14e869a645ef4565f307daa527f1e76"}, + {file = "boltz_client-0.1.3.tar.gz", hash = "sha256:1573be84ea547578591d78f5f1ea65ccda01edcca0aa6f077bcd5a497622cef5"}, ] [package.dependencies] diff --git a/requirements.txt b/requirements.txt index 1a0872db8..87526aecd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +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" +boltz-client==0.1.3 ; 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" From 302ed830515727320d78aab1dd2742c36f6ed404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Mon, 23 Jan 2023 10:43:31 +0100 Subject: [PATCH 2/5] add boltz fee dynamically --- lnbits/extensions/boltz/templates/boltz/_api_docs.html | 5 +++-- lnbits/extensions/boltz/views_api.py | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lnbits/extensions/boltz/templates/boltz/_api_docs.html b/lnbits/extensions/boltz/templates/boltz/_api_docs.html index f8474c576..04e0b98c2 100644 --- a/lnbits/extensions/boltz/templates/boltz/_api_docs.html +++ b/lnbits/extensions/boltz/templates/boltz/_api_docs.html @@ -39,8 +39,9 @@ Fee Information - Every swap consists of 2 onchain transactions, lockup and claim / refund, - routing fees and a Boltz fee of 0.5%. + {% raw %} Every swap consists of 2 onchain transactions, lockup and claim + / refund, routing fees and a Boltz fee of + {{ boltzConfig.fee_percentage }}%. {% endraw %} Date: Mon, 23 Jan 2023 11:22:50 +0100 Subject: [PATCH 3/5] change boltz fee in example --- lnbits/extensions/boltz/templates/boltz/_api_docs.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lnbits/extensions/boltz/templates/boltz/_api_docs.html b/lnbits/extensions/boltz/templates/boltz/_api_docs.html index 04e0b98c2..7a2aa1c80 100644 --- a/lnbits/extensions/boltz/templates/boltz/_api_docs.html +++ b/lnbits/extensions/boltz/templates/boltz/_api_docs.html @@ -79,7 +79,9 @@
  • Onchain lockup tx fee: whatever you choose when paying
  • Onchain claim tx fee: ~500 sats
  • Routing fees (paid by boltz): unknown
    • -
  • Boltz fees: 500 sats (0.5%)
    • + {% raw %} +
  • Boltz fees: 500 sats ({{ boltzConfig.fee_percentage }}%)
    • + {% endraw %}
  • Fees total: 1000 sats + lockup_fee
  • You pay onchain: 101.000 sats + lockup_fee
  • You receive lightning: 100.000 sats
    • From afe43b6bd40b0b06e7932f37e0b3b85f7b906d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Tue, 24 Jan 2023 11:22:48 +0100 Subject: [PATCH 4/5] dynamic fee calc --- .../boltz/templates/boltz/_api_docs.html | 48 ++++++++++++------- .../boltz/templates/boltz/index.html | 20 ++++++++ 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/lnbits/extensions/boltz/templates/boltz/_api_docs.html b/lnbits/extensions/boltz/templates/boltz/_api_docs.html index 7a2aa1c80..76bc0ae6a 100644 --- a/lnbits/extensions/boltz/templates/boltz/_api_docs.html +++ b/lnbits/extensions/boltz/templates/boltz/_api_docs.html @@ -51,20 +51,29 @@ :content-inset-level="0.5" > - You want to swap out 100.000 sats, Lightning to Onchain: + {% raw %} You want to swap out {{ boltzExample.amount }} sats, Lightning + to Onchain:
      -
    • Onchain lockup tx fee: ~500 sats
      • -
    • Onchain claim tx fee: 1000 sats (hardcoded)
      • +
    • Onchain lockup tx fee: ~{{ boltzExample.onchain_boltz }} sats
      • +
    • + Onchain claim tx fee: {{ boltzExample.onchain_lnbits }} sats + (hardcoded) +
    • Routing fees (paid by you): unknown
      • -
    • Boltz fees: 500 sats
      • -
    • Fees total: 2000 sats + routing fees
      • -
    • You receive: 98.000 sats
      • +
    • + Boltz fees: {{ boltzExample.boltz_fee }} sats ({{ + boltzConfig.fee_percentage }}%) +
      • +
    • + Fees total: {{ boltzExample.reverse_fee_total }} sats + routing fees +
      • +
    • You receive: {{ boltzExample.reverse_receive }} sats

    onchain_amount_received = amount - (amount * boltz_fee / 100) - lockup_fee - claim_fee

    -

    98.000 = 100.000 - 500 - 500 - 1000

    + {% endraw %}     - You want to swap in 100.000 sats, Onchain to Lightning: + {% raw %} You want to swap in {{ boltzExample.amount }} sats, Onchain to + Lightning:
    • Onchain lockup tx fee: whatever you choose when paying
      • -
    • Onchain claim tx fee: ~500 sats
      • +
    • Onchain claim tx fee: ~{{ boltzExample.onchain_boltz }} sats
    • Routing fees (paid by boltz): unknown
      • - {% raw %} -
    • Boltz fees: 500 sats ({{ boltzConfig.fee_percentage }}%)
      • - {% endraw %} -
    • Fees total: 1000 sats + lockup_fee
      • -
    • You pay onchain: 101.000 sats + lockup_fee
      • -
    • You receive lightning: 100.000 sats
      • +
    • + Boltz fees: {{ boltzExample.boltz_fee }} sats ({{ + boltzConfig.fee_percentage }}%) +
      • +
    • + Fees total: {{ boltzExample.normal_fee_total }} sats + lockup_fee +
      • +
    • + You pay onchain: {{ boltzExample.normal_expected_amount }} sats + + lockup_fee +
      • +
    • You receive lightning: {{ boltzExample.amount }} sats

    onchain_payment + lockup_fee = amount + (amount * boltz_fee / 100) + claim_fee + lockup_fee

    -

    101.000 + lockup_fee = 100.000 + 500 + 500 + lockup_fee

    + {% endraw %}     diff --git a/lnbits/extensions/boltz/templates/boltz/index.html b/lnbits/extensions/boltz/templates/boltz/index.html index 308c3a46e..d985a01f5 100644 --- a/lnbits/extensions/boltz/templates/boltz/index.html +++ b/lnbits/extensions/boltz/templates/boltz/index.html @@ -249,6 +249,26 @@ } } }, + computed: { + boltzExample() { + let amount = 100000 + let onchain_lnbits = 1000 + let onchain_boltz = 500 + let boltz_fee = (amount * this.boltzConfig.fee_percentage) / 100 + let normal_fee_total = onchain_boltz + boltz_fee + let reverse_fee_total = onchain_boltz + boltz_fee + onchain_lnbits + return { + amount: amount, + boltz_fee: boltz_fee, + reverse_fee_total: reverse_fee_total, + reverse_receive: amount - reverse_fee_total, + onchain_lnbits: onchain_lnbits, + onchain_boltz: onchain_boltz, + normal_fee_total: normal_fee_total, + normal_expected_amount: amount + normal_fee_total + } + } + }, methods: { getLimits() { if (this.boltzConfig) { From 1c3a9d188102a5a7f86eedaf89387bf29dba21f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Thu, 26 Jan 2023 14:08:24 +0100 Subject: [PATCH 5/5] remove lockup_tx from exmaple equation --- lnbits/extensions/boltz/templates/boltz/_api_docs.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lnbits/extensions/boltz/templates/boltz/_api_docs.html b/lnbits/extensions/boltz/templates/boltz/_api_docs.html index 76bc0ae6a..f1be62a7d 100644 --- a/lnbits/extensions/boltz/templates/boltz/_api_docs.html +++ b/lnbits/extensions/boltz/templates/boltz/_api_docs.html @@ -102,10 +102,7 @@
  • You receive lightning: {{ boltzExample.amount }} sats
    • -

    - onchain_payment + lockup_fee = amount + (amount * boltz_fee / 100) + - claim_fee + lockup_fee -

    +

    onchain_payment = amount + (amount * boltz_fee / 100) + claim_fee

    {% endraw %}