Route blinding MVP #2413

valentinewallace · 2023-07-13T19:32:56Z

Support sending to blinded payment paths and receiving to 1-hop paths. Partially addresses #1970. Error handling, forwarding and receiving to multi-hop blinded paths will be completed in follow-up.

finish tests

~~Based on #2411, #2412, #2128, #2459, #2514, #2503~~

codecov-commenter · 2023-08-26T21:33:27Z

Codecov Report

Patch coverage: 93.42% and project coverage change: +0.15% 🎉

Comparison is base (448b191) 90.45% compared to head (ebdc4ae) 90.61%.
Report is 15 commits behind head on main.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2413      +/-   ##
==========================================
+ Coverage   90.45%   90.61%   +0.15%     
==========================================
  Files         112      113       +1     
  Lines       58564    59002     +438     
  Branches    58564    59002     +438     
==========================================
+ Hits        52976    53466     +490     
+ Misses       5588     5536      -52

Files Changed	Coverage Δ
lightning/src/ln/mod.rs	`96.15% <ø> (ø)`
lightning/src/ln/onion_utils.rs	`90.97% <76.00%> (-0.82%)`	⬇️
lightning/src/ln/msgs.rs	`86.20% <92.30%> (-0.01%)`	⬇️
lightning/src/blinded_path/mod.rs	`95.91% <100.00%> (-4.09%)`	⬇️
lightning/src/blinded_path/payment.rs	`84.21% <100.00%> (+7.23%)`	⬆️
lightning/src/ln/blinded_payment_tests.rs	`100.00% <100.00%> (ø)`
lightning/src/ln/channelmanager.rs	`87.93% <100.00%> (+1.22%)`	⬆️
lightning/src/ln/outbound_payment.rs	`90.79% <100.00%> (+0.09%)`	⬆️

... and 10 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

TheBlueMatt

Rather than splitting the pr into handle-it-all-then-add-error-handling, can we split it into "handle sending, with all error handling, handle receiving, with all error handling, and then handle forwarding, with all error handling"?

lightning/src/ln/outbound_payment.rs

valentinewallace · 2023-08-30T20:21:37Z

Rather than splitting the pr into handle-it-all-then-add-error-handling, can we split it into "handle sending, with all error handling, handle receiving, with all error handling, and then handle forwarding, with all error handling"?

I'm still looking into this but we can't materially test any error handling until we have forwarding, because 1-hop blinded paths are supposed to error the same as unblinded payments, i.e. not wipe the error or return malformed. Another option would be to split forwarding+error handling off into its own PR and land sending/1-hop receiving first.

valentinewallace · 2023-08-31T21:39:09Z

Removed forwarding support for now, so all forwarding + error handling will be done in #2540 (should be updated tomorrow).

valentinewallace · 2023-09-11T15:00:57Z

Rebased and removed support for receiving to multi-hop blinded paths. This way we can ship an MVP BOLT 12 in 117 and complete route blinding support in 118, to avoid holding up the current release.

lightning/src/ln/onion_utils.rs

lightning/src/blinded_path/payment.rs

lightning/src/ln/msgs.rs

lightning/src/blinded_path/mod.rs

jkczyz

Looks good to squash!

lightning/src/ln/onion_utils.rs

This will be used in the next commit to deserialize encrypted TLVs for receiving to 1-hop blinded paths.

Useful until forwarding and receiving to multi-hop blinded paths is supported.

jkczyz · 2023-09-13T18:36:14Z

lightning/src/ln/blinded_payment_tests.rs

+	let ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
+	pass_along_path(&nodes[0], expected_route[0], amt_msat, payment_hash.clone(),
+		Some(payment_secret), ev.clone(), false, None);
+
+	let ev = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
+	pass_along_path(&nodes[0], expected_route[1], amt_msat, payment_hash.clone(),
+		Some(payment_secret), ev.clone(), true, None);
+	claim_payment_along_route(&nodes[0], expected_route, false, payment_preimage);


nit: ev clones not needed

TheBlueMatt · 2023-09-13T20:17:02Z

lightning/src/ln/msgs.rs

+			amt_msat: u64,
+			total_msat: u64,


Heh, can we get away from the legacy names and use more descriptive names since we're adding new code here? Something about mpp_part_amt_msat and total_payment_msat?

TheBlueMatt · 2023-09-13T20:21:31Z

lightning/src/ln/outbound_payment.rs

@@ -1234,7 +1234,9 @@ impl OutboundPayments {
 		if route.paths.len() < 1 {
 			return Err(PaymentSendFailure::ParameterError(APIError::InvalidRoute{err: "There must be at least one path to send over".to_owned()}));
 		}
-		if recipient_onion.payment_secret.is_none() && route.paths.len() > 1 {
+		if recipient_onion.payment_secret.is_none() && route.paths.len() > 1
+			&& !route.paths.iter().any(|p| p.blinded_tail.is_some())


Shouldnt this be all?

TheBlueMatt · 2023-09-13T20:42:18Z

lightning/src/ln/msgs.rs

+				return Err(DecodeError::InvalidValue)
+			}
+			let enc_tlvs = encrypted_tlvs_opt.ok_or(DecodeError::InvalidValue)?.0;
+			let enc_tlvs_ss = node_signer.ecdh(Recipient::Node, &blinding_point, None)


I feel like we should do blinded paths to a random key and not reuse the node id. That wouldn't avoid the new trait pass cause we need it for forwards, but for nodes with the node id on a separate hardware device/VLS we'd avoid the need to call out to the hardware device here for receives, which I think would be very nice.

valentinewallace mentioned this pull request Jul 13, 2023

BOLT12 Offers Tracking Issue #1970

Open

59 tasks

valentinewallace added this to the 0.0.117 milestone Jul 13, 2023

This was referenced Jul 13, 2023

Add API for constructing blinded payment paths #2412

Merged

Support constructing blinded path onion keys #2411

Merged

valentinewallace added the blocked on dependent pr label Jul 27, 2023

valentinewallace mentioned this pull request Aug 25, 2023

Aggregate BlindedPayInfo for blinded routes #2514

Merged

valentinewallace force-pushed the 2023-07-route-blinding branch 2 times, most recently from f4dc1aa to 8ed2025 Compare August 26, 2023 20:28

valentinewallace force-pushed the 2023-07-route-blinding branch from 8ed2025 to 223e2de Compare August 29, 2023 18:07

valentinewallace marked this pull request as ready for review August 29, 2023 18:28

TheBlueMatt reviewed Aug 30, 2023

View reviewed changes

lightning/src/ln/outbound_payment.rs Show resolved Hide resolved

jkczyz self-requested a review August 31, 2023 17:45

valentinewallace force-pushed the 2023-07-route-blinding branch from 223e2de to 952e537 Compare August 31, 2023 21:36

valentinewallace mentioned this pull request Aug 30, 2023

Route blinding: support forwarding as the intro node #2540

Merged

valentinewallace force-pushed the 2023-07-route-blinding branch 3 times, most recently from c2715bf to 80405b4 Compare September 8, 2023 18:12

valentinewallace changed the title ~~Route blinding~~ Route blinding sending and receiving Sep 8, 2023

valentinewallace force-pushed the 2023-07-route-blinding branch from 80405b4 to 43a54c4 Compare September 11, 2023 14:46

valentinewallace changed the title ~~Route blinding sending and receiving~~ Route blinding MVP Sep 11, 2023

valentinewallace removed the blocked on dependent pr label Sep 11, 2023

jkczyz reviewed Sep 12, 2023

View reviewed changes

valentinewallace force-pushed the 2023-07-route-blinding branch from 43a54c4 to 4b39220 Compare September 12, 2023 20:52

jkczyz reviewed Sep 12, 2023

View reviewed changes

lightning/src/ln/onion_utils.rs Show resolved Hide resolved

lightning/src/ln/onion_utils.rs Show resolved Hide resolved

valentinewallace added 2 commits September 12, 2023 18:11

Support paying blinded paths.

7b1e091

Parameterize InboundPayload reads with NodeSigner

154841b

This will be used in the next commit to deserialize encrypted TLVs for receiving to 1-hop blinded paths.

valentinewallace added 3 commits September 12, 2023 18:11

Support receiving to 1-hop blinded payment paths.

070f7e0

Test sending and receiving to 1-hop blinded paths

3e377a1

Only allow creating 1-hop blinded paths.

ebdc4ae

Useful until forwarding and receiving to multi-hop blinded paths is supported.

valentinewallace force-pushed the 2023-07-route-blinding branch from 4b39220 to ebdc4ae Compare September 12, 2023 22:12

jkczyz approved these changes Sep 13, 2023

View reviewed changes

TheBlueMatt approved these changes Sep 13, 2023

View reviewed changes

TheBlueMatt merged commit daf79f5 into lightningdevkit:main Sep 13, 2023
12 of 14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Route blinding MVP #2413

Route blinding MVP #2413

valentinewallace commented Jul 13, 2023 •

edited

Loading

codecov-commenter commented Aug 26, 2023 •

edited

Loading

TheBlueMatt left a comment

valentinewallace commented Aug 30, 2023

valentinewallace commented Aug 31, 2023

valentinewallace commented Sep 11, 2023 •

edited

Loading

jkczyz left a comment

jkczyz Sep 13, 2023

TheBlueMatt Sep 13, 2023

TheBlueMatt Sep 13, 2023

TheBlueMatt Sep 13, 2023

Route blinding MVP #2413

Route blinding MVP #2413

Conversation

valentinewallace commented Jul 13, 2023 • edited Loading

codecov-commenter commented Aug 26, 2023 • edited Loading

Codecov Report

TheBlueMatt left a comment

Choose a reason for hiding this comment

valentinewallace commented Aug 30, 2023

valentinewallace commented Aug 31, 2023

valentinewallace commented Sep 11, 2023 • edited Loading

jkczyz left a comment

Choose a reason for hiding this comment

jkczyz Sep 13, 2023

Choose a reason for hiding this comment

TheBlueMatt Sep 13, 2023

Choose a reason for hiding this comment

TheBlueMatt Sep 13, 2023

Choose a reason for hiding this comment

TheBlueMatt Sep 13, 2023

Choose a reason for hiding this comment

valentinewallace commented Jul 13, 2023 •

edited

Loading

codecov-commenter commented Aug 26, 2023 •

edited

Loading

valentinewallace commented Sep 11, 2023 •

edited

Loading