Add zero-amount Receive Chain Swap #538

ok300 · 2024-10-25T17:04:16Z

Fixes #519

Open questions:

Proper way to show fees during prepare/pay: "X sat + Y% of the sent amount" ?
Include min/max in prepare_response? How else to communicate them to caller, as they are now essential?
- Also: it's important they exactly match the ones for the pair hash used in creating the swap
Should such a (refundable) swap require user interaction to "try to claim"?
- Or should the SDK try to claim automatically when a lockup is detected (or on lockupFailed event)?
How to reflect in DB: set payer_amount_sat to 0 for zero-amount swaps? Or NULL (DB migration)?

dangeross · 2024-11-04T07:05:00Z

Should such a (refundable) swap require user interaction to "try to claim"?

Or should the SDK try to claim automatically when a lockup is detected (or on lockupFailed event)?

The SDK user has to provide a fee rate for these refunds, so they need to be manually handled

# Conflicts: # lib/core/src/sdk.rs

ok300 · 2024-11-04T16:57:35Z

It's not about refunds per se. The zero-amount swaps get the TransactionLockupFailed event when the user locks up funds. At this point, it would be indistinguishable from a refundable.

However it will not become an actual refundable when the user locks up funds, because when the zero-amount swap gets this event, we are getting and confirming the so-called quote from Boltz. By confirming it, we tell Boltz they should proceed with this swap (e.g. create the server lockup tx, etc). My question above was about this "getting and confirming" the quote. However we clarified in an earlier call that no user interaction should be needed to claim, so therefore we get and auto-confirm the quote.

Hopefully this clarifies the confusion.

roeierez

Looks good. some comments about the interface.

lib/bindings/src/breez_sdk_liquid.udl

lib/core/src/chain_swap.rs

cli/src/commands.rs

lib/core/src/sdk.rs

lib/core/src/persist/chain.rs

lib/core/src/chain_swap.rs

# Conflicts: # cli/Cargo.lock # lib/Cargo.lock # lib/core/src/test_utils/swapper.rs

lib/core/src/model.rs

lib/core/src/persist/chain.rs

lib/core/src/chain_swap.rs

dangeross

Looking good, just a couple of comments

dangeross · 2024-12-07T07:15:51Z

lib/core/Cargo.toml

@@ -14,7 +14,8 @@ frb = ["dep:flutter_rust_bridge"]
 [dependencies]
 anyhow = { workspace = true }
 bip39 = "2.0.0"
-boltz-client = { git = "https://github.com/SatoshiPortal/boltz-rust", branch = "trunk" }
+#boltz-client = { git = "https://github.com/SatoshiPortal/boltz-rust", branch = "trunk" }
+boltz-client = { git = "https://github.com/ok300/boltz-rust", branch = "ok300-support-quote" }


Is your rust-boltz PR merged yet?

Done: e8ac979

dangeross · 2024-12-07T08:32:23Z

lib/core/src/model.rs

+    /// The percentage of the sent amount that will count towards the service fee.
+    ///
+    /// When the method is [PaymentMethod::LiquidAddress], this is empty.
+    pub service_feerate: Option<f64>,


Maybe to be consistent with the previous PR, this could be swapper_feerate?

Done: addde46

roeierez

Looking good.

lib/core/src/chain_swap.rs

roeierez

LGTM one comment regarding docs.

roeierez · 2024-12-09T13:53:03Z

cli/src/commands.rs

+                    let min = prepare_response.min_payer_amount_sat;
+                    let max = prepare_response.max_payer_amount_sat;
+                    let service_feerate = prepare_response.service_feerate;
+                    format!(


I guess we will need to document the fact that in amountless swap applications need to add the service fee on top of the fees_sat.

Done: 542dec7

ok300 force-pushed the ok300-fix-u32-conversion branch 2 times, most recently from 55937a5 to 9a82900 Compare October 28, 2024 13:51

Base automatically changed from ok300-fix-u32-conversion to main October 28, 2024 14:36

Add zero-amount Receive Chain Swap

89e20d4

ok300 force-pushed the ok300-amountless-chain-swaps branch from 9f41dab to 89e20d4 Compare October 29, 2024 10:24

ok300 added 2 commits October 29, 2024 12:41

prep-receive-payment: Add min/max fields for zero-amount swaps

bedc05d

prep-receive-payment: Add service feerate for zero-amount swaps

92c403b

ok300 added 2 commits November 4, 2024 15:48

Merge branch 'main' into ok300-amountless-chain-swaps

445418c

# Conflicts: # lib/core/src/sdk.rs

Get and accept quote to advance Zero-Amount Chain Swaps

c1a556b

Fix tests

333c5c5

ok300 marked this pull request as ready for review November 4, 2024 16:59

ok300 added 2 commits November 5, 2024 17:23

Re-generate flutter bindings

05483a5

Re-generate RN bindings

322972f

roeierez requested changes Nov 7, 2024

View reviewed changes

lib/bindings/src/breez_sdk_liquid.udl Outdated Show resolved Hide resolved

lib/core/src/chain_swap.rs Outdated Show resolved Hide resolved

Update swap payer_amount when we know the quote

35cb343

dangeross reviewed Nov 12, 2024

View reviewed changes

ok300 added 6 commits November 26, 2024 17:41

Merge branch 'main' into ok300-amountless-chain-swaps

f201d6c

# Conflicts: # cli/Cargo.lock # lib/Cargo.lock # lib/core/src/test_utils/swapper.rs

Rename receive_onchain arg

d3f4488

Rename PrepareReceiveResponse fields

1e18406

Fix cargo clippy

ab921c4

Improve error handling when accepting quote

5a44caf

Update zero-amount payer/receiver values in DB

c597ced

ok300 requested review from dangeross and roeierez November 27, 2024 15:55

dangeross reviewed Nov 27, 2024

View reviewed changes

lib/core/src/model.rs Outdated Show resolved Hide resolved

lib/core/src/persist/chain.rs Outdated Show resolved Hide resolved

Set min/max/feerate in prepare response for both LN and Chain swaps

98864c7

roeierez requested changes Nov 27, 2024

View reviewed changes

lib/core/src/chain_swap.rs Outdated Show resolved Hide resolved

Merge branch 'main' into ok300-amountless-chain-swaps

a8efee5

ok300 added 3 commits December 6, 2024 16:31

Validate fees amountless swaps before accepting quote

2bfd81c

Fix CLI fee arg handling

842df7a

Calculate, persist payer/receiver amounts when quote is accepted

183c828

ok300 force-pushed the ok300-amountless-chain-swaps branch from 0002af6 to 183c828 Compare December 6, 2024 18:59

Update log comment

618879d

ok300 requested review from dangeross and roeierez December 6, 2024 19:03

dangeross reviewed Dec 7, 2024

View reviewed changes

roeierez requested changes Dec 8, 2024

View reviewed changes

lib/core/src/chain_swap.rs Outdated Show resolved Hide resolved

ok300 added 3 commits December 9, 2024 13:33

Bump boltz-rust to latest trunk

e8ac979

PrepareReceiveResponse: rename service_feerate to swapper_feerate

addde46

Tweak amountless swap quote validation

4576ad9

ok300 requested review from roeierez and dangeross December 9, 2024 12:49

roeierez approved these changes Dec 9, 2024

View reviewed changes

Add docs for swapper_feerate handling in total fee

542dec7

ok300 requested a review from roeierez December 9, 2024 14:15

roeierez approved these changes Dec 9, 2024

View reviewed changes

ok300 merged commit cfc883a into main Dec 9, 2024
7 of 8 checks passed

ok300 deleted the ok300-amountless-chain-swaps branch December 9, 2024 16:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add zero-amount Receive Chain Swap #538

Add zero-amount Receive Chain Swap #538

ok300 commented Oct 25, 2024 •

edited

Loading

dangeross commented Nov 4, 2024

ok300 commented Nov 4, 2024

roeierez left a comment

dangeross left a comment

dangeross Dec 7, 2024

ok300 Dec 9, 2024

dangeross Dec 7, 2024

ok300 Dec 9, 2024

roeierez left a comment

roeierez left a comment

roeierez Dec 9, 2024

ok300 Dec 9, 2024

Add zero-amount Receive Chain Swap #538

Add zero-amount Receive Chain Swap #538

Conversation

ok300 commented Oct 25, 2024 • edited Loading

dangeross commented Nov 4, 2024

ok300 commented Nov 4, 2024

roeierez left a comment

Choose a reason for hiding this comment

dangeross left a comment

Choose a reason for hiding this comment

dangeross Dec 7, 2024

Choose a reason for hiding this comment

ok300 Dec 9, 2024

Choose a reason for hiding this comment

dangeross Dec 7, 2024

Choose a reason for hiding this comment

ok300 Dec 9, 2024

Choose a reason for hiding this comment

roeierez left a comment

Choose a reason for hiding this comment

roeierez left a comment

Choose a reason for hiding this comment

roeierez Dec 9, 2024

Choose a reason for hiding this comment

ok300 Dec 9, 2024

Choose a reason for hiding this comment

ok300 commented Oct 25, 2024 •

edited

Loading