Skip to content

Commit 40d4bd0

Browse files
alecchendevalecchendev
committed
Support receiving, validating, and claiming MPP keysend
1 parent e2ae7e0 commit 40d4bd0

3 files changed

Lines changed: 118 additions & 50 deletions

File tree

‎lightning/src/ln/channelmanager.rs‎

Lines changed: 55 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3492,9 +3492,13 @@ where
34923492
}
34933493

34943494
macro_rules! check_total_value {
3495-
($payment_data: expr, $payment_preimage: expr) => {{
3495+
($payment_data: expr, $payment_preimage: expr, $is_keysend: expr) => {{
34963496
let mut payment_claimable_generated = false;
3497-
let purpose = || {
3497+
let purpose = if $is_keysend {
3498+
events::PaymentPurpose::SpontaneousPayment(
3499+
$payment_preimage.expect("Should never call check_total_value with $is_keysend as true but no preimage")
3500+
)
3501+
} else {
34983502
events::PaymentPurpose::InvoicePayment {
34993503
payment_preimage: $payment_preimage,
35003504
payment_secret: $payment_data.payment_secret,
@@ -3510,7 +3514,7 @@ where
35103514
.or_insert_with(|| {
35113515
committed_to_claimable = true;
35123516
ClaimablePayment {
3513-
purpose: purpose(), htlcs: Vec::new(), onion_fields: None,
3517+
purpose: purpose.clone(), htlcs: Vec::new(), onion_fields: None,
35143518
}
35153519
});
35163520
if let Some(earlier_fields) = &mut claimable_payment.onion_fields {
@@ -3521,7 +3525,7 @@ where
35213525
claimable_payment.onion_fields = Some(onion_fields);
35223526
}
35233527
let ref mut htlcs = &mut claimable_payment.htlcs;
3524-
if htlcs.len() == 1 {
3528+
if !htlcs.is_empty() && !$is_keysend {
35253529
if let OnionPayload::Spontaneous(_) = htlcs[0].onion_payload {
35263530
log_trace!(self.logger, "Failing new HTLC with payment_hash {} as we already had an existing keysend HTLC with the same payment hash", log_bytes!(payment_hash.0));
35273531
fail_htlc!(claimable_htlc, payment_hash);
@@ -3532,17 +3536,12 @@ where
35323536
for htlc in htlcs.iter() {
35333537
total_value += htlc.sender_intended_value;
35343538
earliest_expiry = cmp::min(earliest_expiry, htlc.cltv_expiry);
3535-
match &htlc.onion_payload {
3536-
OnionPayload::Invoice { .. } => {
3537-
if htlc.total_msat != $payment_data.total_msat {
3538-
log_trace!(self.logger, "Failing HTLCs with payment_hash {} as the HTLCs had inconsistent total values (eg {} and {})",
3539-
log_bytes!(payment_hash.0), $payment_data.total_msat, htlc.total_msat);
3540-
total_value = msgs::MAX_VALUE_MSAT;
3541-
}
3542-
if total_value >= msgs::MAX_VALUE_MSAT { break; }
3543-
},
3544-
_ => unreachable!(),
3539+
if htlc.total_msat != $payment_data.total_msat {
3540+
log_trace!(self.logger, "Failing HTLCs with payment_hash {} as the HTLCs had inconsistent total values (eg {} and {})",
3541+
log_bytes!(payment_hash.0), $payment_data.total_msat, htlc.total_msat);
3542+
total_value = msgs::MAX_VALUE_MSAT;
35453543
}
3544+
if total_value >= msgs::MAX_VALUE_MSAT { break; }
35463545
}
35473546
// The condition determining whether an MPP is complete must
35483547
// match exactly the condition used in `timer_tick_occurred`
@@ -3563,7 +3562,7 @@ where
35633562
new_events.push(events::Event::PaymentClaimable {
35643563
receiver_node_id: Some(receiver_node_id),
35653564
payment_hash,
3566-
purpose: purpose(),
3565+
purpose,
35673566
amount_msat,
35683567
via_channel_id: Some(prev_channel_id),
35693568
via_user_channel_id: Some(prev_user_channel_id),
@@ -3611,40 +3610,44 @@ where
36113610
fail_htlc!(claimable_htlc, payment_hash);
36123611
}
36133612
}
3614-
check_total_value!(payment_data, payment_preimage);
3613+
check_total_value!(payment_data, payment_preimage, false);
36153614
},
36163615
OnionPayload::Spontaneous(preimage) => {
3617-
let mut claimable_payments = self.claimable_payments.lock().unwrap();
3618-
if claimable_payments.pending_claiming_payments.contains_key(&payment_hash) {
3619-
fail_htlc!(claimable_htlc, payment_hash);
3620-
}
3621-
match claimable_payments.claimable_payments.entry(payment_hash) {
3622-
hash_map::Entry::Vacant(e) => {
3623-
let amount_msat = claimable_htlc.value;
3624-
claimable_htlc.total_value_received = Some(amount_msat);
3625-
let claim_deadline = Some(claimable_htlc.cltv_expiry - HTLC_FAIL_BACK_BUFFER);
3626-
let purpose = events::PaymentPurpose::SpontaneousPayment(preimage);
3627-
e.insert(ClaimablePayment {
3628-
purpose: purpose.clone(),
3629-
onion_fields: Some(onion_fields.clone()),
3630-
htlcs: vec![claimable_htlc],
3631-
});
3632-
let prev_channel_id = prev_funding_outpoint.to_channel_id();
3633-
new_events.push(events::Event::PaymentClaimable {
3634-
receiver_node_id: Some(receiver_node_id),
3635-
payment_hash,
3636-
amount_msat,
3637-
purpose,
3638-
via_channel_id: Some(prev_channel_id),
3639-
via_user_channel_id: Some(prev_user_channel_id),
3640-
claim_deadline,
3641-
onion_fields: Some(onion_fields),
3642-
});
3643-
},
3644-
hash_map::Entry::Occupied(_) => {
3645-
log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} for a duplicative payment hash", log_bytes!(payment_hash.0));
3616+
if let Some(payment_data) = payment_data {
3617+
check_total_value!(payment_data, Some(preimage), true);
3618+
} else {
3619+
let mut claimable_payments = self.claimable_payments.lock().unwrap();
3620+
if claimable_payments.pending_claiming_payments.contains_key(&payment_hash) {
36463621
fail_htlc!(claimable_htlc, payment_hash);
36473622
}
3623+
match claimable_payments.claimable_payments.entry(payment_hash) {
3624+
hash_map::Entry::Vacant(e) => {
3625+
let amount_msat = claimable_htlc.value;
3626+
claimable_htlc.total_value_received = Some(amount_msat);
3627+
let claim_deadline = Some(claimable_htlc.cltv_expiry - HTLC_FAIL_BACK_BUFFER);
3628+
let purpose = events::PaymentPurpose::SpontaneousPayment(preimage);
3629+
e.insert(ClaimablePayment {
3630+
purpose: purpose.clone(),
3631+
onion_fields: Some(onion_fields.clone()),
3632+
htlcs: vec![claimable_htlc],
3633+
});
3634+
let prev_channel_id = prev_funding_outpoint.to_channel_id();
3635+
new_events.push(events::Event::PaymentClaimable {
3636+
receiver_node_id: Some(receiver_node_id),
3637+
payment_hash,
3638+
amount_msat,
3639+
purpose,
3640+
via_channel_id: Some(prev_channel_id),
3641+
via_user_channel_id: Some(prev_user_channel_id),
3642+
claim_deadline,
3643+
onion_fields: Some(onion_fields),
3644+
});
3645+
},
3646+
hash_map::Entry::Occupied(_) => {
3647+
log_trace!(self.logger, "Failing new keysend HTLC with payment_hash {} for a duplicative payment hash", log_bytes!(payment_hash.0));
3648+
fail_htlc!(claimable_htlc, payment_hash);
3649+
}
3650+
}
36483651
}
36493652
}
36503653
}
@@ -3663,7 +3666,7 @@ where
36633666
log_bytes!(payment_hash.0), payment_data.total_msat, inbound_payment.get().min_value_msat.unwrap());
36643667
fail_htlc!(claimable_htlc, payment_hash);
36653668
} else {
3666-
let payment_claimable_generated = check_total_value!(payment_data, inbound_payment.get().payment_preimage);
3669+
let payment_claimable_generated = check_total_value!(payment_data, inbound_payment.get().payment_preimage, false);
36673670
if payment_claimable_generated {
36683671
inbound_payment.remove_entry();
36693672
}
@@ -4138,12 +4141,16 @@ where
41384141
/// event matches your expectation. If you fail to do so and call this method, you may provide
41394142
/// the sender "proof-of-payment" when they did not fulfill the full expected payment.
41404143
///
4144+
/// To accept multi-part keysend payments you must set [`UserConfig::accept_mpp_keysend`] to
4145+
/// true.
4146+
///
41414147
/// [`Event::PaymentClaimable`]: crate::events::Event::PaymentClaimable
41424148
/// [`Event::PaymentClaimable::claim_deadline`]: crate::events::Event::PaymentClaimable::claim_deadline
41434149
/// [`Event::PaymentClaimed`]: crate::events::Event::PaymentClaimed
41444150
/// [`process_pending_events`]: EventsProvider::process_pending_events
41454151
/// [`create_inbound_payment`]: Self::create_inbound_payment
41464152
/// [`create_inbound_payment_for_hash`]: Self::create_inbound_payment_for_hash
4153+
/// [`UserConfig::accept_mpp_keysend`]: crate::util::config::UserConfig::accept_mpp_keysend
41474154
pub fn claim_funds(&self, payment_preimage: PaymentPreimage) {
41484155
let payment_hash = PaymentHash(Sha256::hash(&payment_preimage.0).into_inner());
41494156

@@ -4204,9 +4211,9 @@ where
42044211
expected_amt_msat = htlc.total_value_received;
42054212

42064213
if let OnionPayload::Spontaneous(_) = &htlc.onion_payload {
4207-
// We don't currently support MPP for spontaneous payments, so just check
4214+
// If the user chooses not to support MPP for spontaneous payments, just check
42084215
// that there's one payment here and move on.
4209-
if sources.len() != 1 {
4216+
if !self.default_configuration.accept_mpp_keysend && sources.len() != 1 {
42104217
log_error!(self.logger, "Somehow ended up with an MPP spontaneous payment - this should not be reachable!");
42114218
debug_assert!(false);
42124219
valid_mpp = false;

‎lightning/src/ln/functional_test_utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ pub fn do_pass_along_path<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_p
20742074
},
20752075
PaymentPurpose::SpontaneousPayment(payment_preimage) => {
20762076
assert_eq!(expected_preimage.unwrap(), *payment_preimage);
2077-
assert!(our_payment_secret.is_none());
2077+
assert_eq!(our_payment_secret, onion_fields.as_ref().unwrap().payment_secret);
20782078
},
20792079
}
20802080
assert_eq!(*amount_msat, recv_value);

‎lightning/src/ln/functional_tests.rs‎

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use crate::ln::{chan_utils, onion_utils};
2727
use crate::ln::chan_utils::{OFFERED_HTLC_SCRIPT_WEIGHT, htlc_success_tx_weight, htlc_timeout_tx_weight, HTLCOutputInCommitment};
2828
use crate::routing::gossip::{NetworkGraph, NetworkUpdate};
2929
use crate::routing::router::{Path, PaymentParameters, Route, RouteHop, RouteParameters, find_route, get_route};
30-
use crate::ln::features::{ChannelFeatures, NodeFeatures};
30+
use crate::ln::features::{ChannelFeatures, NodeFeatures, InvoiceFeatures};
3131
use crate::ln::msgs;
3232
use crate::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler, ErrorAction};
3333
use crate::util::enforcing_trait_impls::EnforcingSigner;
@@ -8215,6 +8215,67 @@ fn test_simple_mpp() {
82158215
claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[3]], &[&nodes[2], &nodes[3]]], false, payment_preimage);
82168216
}
82178217

8218+
fn do_test_mpp_keysend(accept_mpp_keysend: bool) {
8219+
let mut mpp_keysend_config = test_default_channel_config();
8220+
mpp_keysend_config.accept_mpp_keysend = accept_mpp_keysend;
8221+
let chanmon_cfgs = create_chanmon_cfgs(4);
8222+
let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);
8223+
let node_chanmgrs = create_node_chanmgrs(4, &node_cfgs, &[None, None, None, Some(mpp_keysend_config)]);
8224+
let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
8225+
8226+
create_announced_chan_between_nodes(&nodes, 0, 1).0.contents.short_channel_id;
8227+
create_announced_chan_between_nodes(&nodes, 0, 2).0.contents.short_channel_id;
8228+
create_announced_chan_between_nodes(&nodes, 1, 3).0.contents.short_channel_id;
8229+
create_announced_chan_between_nodes(&nodes, 2, 3).0.contents.short_channel_id;
8230+
let network_graph = nodes[0].network_graph.clone();
8231+
8232+
let payer_pubkey = nodes[0].node.get_our_node_id();
8233+
let payee_pubkey = nodes[3].node.get_our_node_id();
8234+
let recv_value = 15_000_000;
8235+
let mut invoice_features = InvoiceFeatures::for_keysend();
8236+
invoice_features.set_basic_mpp_optional();
8237+
let route_params = RouteParameters {
8238+
payment_params: PaymentParameters::from_node_id(payee_pubkey, 40).with_features(invoice_features),
8239+
// Approxiamating the amount to make the router use MPP is not reliable in
8240+
// case those thresholds change, but helpful to test where the router may
8241+
// block mpp keysend
8242+
final_value_msat: recv_value,
8243+
};
8244+
let scorer = test_utils::TestScorer::new();
8245+
let random_seed_bytes = chanmon_cfgs[0].keys_manager.get_secure_random_bytes();
8246+
let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger,
8247+
&scorer, &random_seed_bytes).unwrap();
8248+
8249+
let payment_preimage = PaymentPreimage([42; 32]);
8250+
let payment_secret = PaymentSecret(payment_preimage.0);
8251+
let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
8252+
RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
8253+
check_added_monitors!(nodes[0], 2);
8254+
8255+
let expected_route: &[&[&Node]] = &[&[&nodes[1], &nodes[3]], &[&nodes[2], &nodes[3]]];
8256+
let mut events = nodes[0].node.get_and_clear_pending_msg_events();
8257+
assert_eq!(events.len(), 2);
8258+
for (path_idx, expected_path) in expected_route.iter().enumerate() {
8259+
let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
8260+
let expect_payment = path_idx == expected_route.len() - 1;
8261+
pass_along_path(&nodes[0], *expected_path, recv_value, payment_hash.clone(),
8262+
Some(payment_secret), ev, expect_payment, Some(payment_preimage));
8263+
}
8264+
8265+
claim_payment_along_route(&nodes[0], expected_route, false, payment_preimage);
8266+
}
8267+
8268+
#[test]
8269+
fn test_mpp_keysend() {
8270+
do_test_mpp_keysend(true);
8271+
}
8272+
8273+
#[test]
8274+
#[should_panic]
8275+
fn test_mpp_keysend_fail() {
8276+
do_test_mpp_keysend(false);
8277+
}
8278+
82188279
#[test]
82198280
fn test_preimage_storage() {
82208281
// Simple test of payment preimage storage allowing no client-side storage to claim payments

0 commit comments

Comments
 (0)