Skip to content

Commit 8effdab

Browse files
valentinewallacevalentinewallace
committed
Move blinded keysend tests into new async_payments_tests.rs
Blinded keysend is only planned to be supported in the async payments context.
1 parent e6c4abf commit 8effdab

File tree

2 files changed

+153
-151
lines changed

2 files changed

+153
-151
lines changed

‎lightning/src/ln/async_payments_tests.rs

+152-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,16 @@
99

1010
use bitcoin::secp256k1::Secp256k1;
1111
use crate::blinded_path::message::{MessageContext, OffersContext};
12-
use crate::events::{Event, MessageSendEventsProvider, PaymentFailureReason};
13-
use crate::ln::channelmanager::PaymentId;
12+
use crate::events::{Event, HTLCDestination, MessageSendEventsProvider, PaymentFailureReason};
13+
use crate::ln::blinded_payment_tests::{blinded_payment_path, get_blinded_route_parameters};
14+
use crate::ln::channelmanager;
15+
use crate::ln::channelmanager::{PaymentId, RecipientOnionFields};
1416
use crate::ln::functional_test_utils::*;
17+
use crate::ln::inbound_payment;
18+
use crate::ln::msgs::ChannelMessageHandler;
1519
use crate::ln::msgs::OnionMessageHandler;
1620
use crate::ln::offers_tests;
21+
use crate::ln::onion_utils::INVALID_ONION_BLINDING;
1722
use crate::ln::outbound_payment::Retry;
1823
use crate::offers::nonce::Nonce;
1924
use crate::onion_message::async_payments::{
@@ -23,12 +28,156 @@ use crate::onion_message::messenger::{Destination, MessageRouter, MessageSendIns
2328
use crate::onion_message::offers::OffersMessage;
2429
use crate::onion_message::packet::ParsedOnionMessageContents;
2530
use crate::prelude::*;
31+
use crate::routing::router::{PaymentParameters, RouteParameters};
32+
use crate::sign::NodeSigner;
2633
use crate::types::features::Bolt12InvoiceFeatures;
34+
use crate::types::payment::{PaymentPreimage, PaymentSecret};
35+
use crate::util::config::UserConfig;
2736

2837
use core::convert::Infallible;
2938

3039
#[test]
31-
#[cfg(async_payments)]
40+
fn blinded_keysend() {
41+
let chanmon_cfgs = create_chanmon_cfgs(3);
42+
let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
43+
let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
44+
let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
45+
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
46+
let chan_upd_1_2 = create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0).0.contents;
47+
48+
let inbound_payment_key = nodes[2].keys_manager.get_inbound_payment_key();
49+
let payment_secret = inbound_payment::create_for_spontaneous_payment(
50+
&inbound_payment_key, None, u32::MAX, nodes[2].node.duration_since_epoch().as_secs(), None
51+
).unwrap();
52+
53+
let amt_msat = 5000;
54+
let keysend_preimage = PaymentPreimage([42; 32]);
55+
let route_params = get_blinded_route_parameters(amt_msat, payment_secret, 1,
56+
1_0000_0000,
57+
nodes.iter().skip(1).map(|n| n.node.get_our_node_id()).collect(),
58+
&[&chan_upd_1_2], &chanmon_cfgs[2].keys_manager);
59+
60+
let payment_hash = nodes[0].node.send_spontaneous_payment(Some(keysend_preimage), RecipientOnionFields::spontaneous_empty(), PaymentId(keysend_preimage.0), route_params, Retry::Attempts(0)).unwrap();
61+
check_added_monitors(&nodes[0], 1);
62+
63+
let expected_route: &[&[&Node]] = &[&[&nodes[1], &nodes[2]]];
64+
let mut events = nodes[0].node.get_and_clear_pending_msg_events();
65+
assert_eq!(events.len(), 1);
66+
67+
let ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
68+
pass_along_path(&nodes[0], expected_route[0], amt_msat, payment_hash, Some(payment_secret), ev.clone(), true, Some(keysend_preimage));
69+
claim_payment_along_route(
70+
ClaimAlongRouteArgs::new(&nodes[0], expected_route, keysend_preimage)
71+
);
72+
}
73+
74+
#[test]
75+
fn blinded_mpp_keysend() {
76+
let chanmon_cfgs = create_chanmon_cfgs(4);
77+
let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);
78+
let node_chanmgrs = create_node_chanmgrs(4, &node_cfgs, &[None, None, None, None]);
79+
let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
80+
81+
create_announced_chan_between_nodes(&nodes, 0, 1);
82+
create_announced_chan_between_nodes(&nodes, 0, 2);
83+
let chan_1_3 = create_announced_chan_between_nodes(&nodes, 1, 3);
84+
let chan_2_3 = create_announced_chan_between_nodes(&nodes, 2, 3);
85+
86+
let inbound_payment_key = nodes[3].keys_manager.get_inbound_payment_key();
87+
let payment_secret = inbound_payment::create_for_spontaneous_payment(
88+
&inbound_payment_key, None, u32::MAX, nodes[3].node.duration_since_epoch().as_secs(), None
89+
).unwrap();
90+
91+
let amt_msat = 15_000_000;
92+
let keysend_preimage = PaymentPreimage([42; 32]);
93+
let route_params = {
94+
let pay_params = PaymentParameters::blinded(
95+
vec![
96+
blinded_payment_path(payment_secret, 1, 1_0000_0000,
97+
vec![nodes[1].node.get_our_node_id(), nodes[3].node.get_our_node_id()], &[&chan_1_3.0.contents],
98+
&chanmon_cfgs[3].keys_manager
99+
),
100+
blinded_payment_path(payment_secret, 1, 1_0000_0000,
101+
vec![nodes[2].node.get_our_node_id(), nodes[3].node.get_our_node_id()], &[&chan_2_3.0.contents],
102+
&chanmon_cfgs[3].keys_manager
103+
),
104+
]
105+
)
106+
.with_bolt12_features(channelmanager::provided_bolt12_invoice_features(&UserConfig::default()))
107+
.unwrap();
108+
RouteParameters::from_payment_params_and_value(pay_params, amt_msat)
109+
};
110+
111+
let payment_hash = nodes[0].node.send_spontaneous_payment(Some(keysend_preimage), RecipientOnionFields::spontaneous_empty(), PaymentId(keysend_preimage.0), route_params, Retry::Attempts(0)).unwrap();
112+
check_added_monitors!(nodes[0], 2);
113+
114+
let expected_route: &[&[&Node]] = &[&[&nodes[1], &nodes[3]], &[&nodes[2], &nodes[3]]];
115+
let mut events = nodes[0].node.get_and_clear_pending_msg_events();
116+
assert_eq!(events.len(), 2);
117+
118+
let ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
119+
pass_along_path(&nodes[0], expected_route[0], amt_msat, payment_hash.clone(),
120+
Some(payment_secret), ev.clone(), false, Some(keysend_preimage));
121+
122+
let ev = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
123+
pass_along_path(&nodes[0], expected_route[1], amt_msat, payment_hash.clone(),
124+
Some(payment_secret), ev.clone(), true, Some(keysend_preimage));
125+
claim_payment_along_route(
126+
ClaimAlongRouteArgs::new(&nodes[0], expected_route, keysend_preimage)
127+
);
128+
}
129+
130+
#[test]
131+
fn invalid_keysend_payment_secret() {
132+
let chanmon_cfgs = create_chanmon_cfgs(3);
133+
let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
134+
let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
135+
let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
136+
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
137+
let chan_upd_1_2 = create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0).0.contents;
138+
139+
let invalid_payment_secret = PaymentSecret([42; 32]);
140+
let amt_msat = 5000;
141+
let keysend_preimage = PaymentPreimage([42; 32]);
142+
let route_params = get_blinded_route_parameters(
143+
amt_msat, invalid_payment_secret, 1, 1_0000_0000,
144+
nodes.iter().skip(1).map(|n| n.node.get_our_node_id()).collect(), &[&chan_upd_1_2],
145+
&chanmon_cfgs[2].keys_manager
146+
);
147+
148+
let payment_hash = nodes[0].node.send_spontaneous_payment(Some(keysend_preimage), RecipientOnionFields::spontaneous_empty(), PaymentId(keysend_preimage.0), route_params, Retry::Attempts(0)).unwrap();
149+
check_added_monitors(&nodes[0], 1);
150+
151+
let expected_route: &[&[&Node]] = &[&[&nodes[1], &nodes[2]]];
152+
let mut events = nodes[0].node.get_and_clear_pending_msg_events();
153+
assert_eq!(events.len(), 1);
154+
155+
let ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
156+
let args = PassAlongPathArgs::new(
157+
&nodes[0], &expected_route[0], amt_msat, payment_hash, ev.clone()
158+
)
159+
.with_payment_secret(invalid_payment_secret)
160+
.with_payment_preimage(keysend_preimage)
161+
.expect_failure(HTLCDestination::FailedPayment { payment_hash });
162+
do_pass_along_path(args);
163+
164+
let updates_2_1 = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
165+
assert_eq!(updates_2_1.update_fail_malformed_htlcs.len(), 1);
166+
let update_malformed = &updates_2_1.update_fail_malformed_htlcs[0];
167+
assert_eq!(update_malformed.sha256_of_onion, [0; 32]);
168+
assert_eq!(update_malformed.failure_code, INVALID_ONION_BLINDING);
169+
nodes[1].node.handle_update_fail_malformed_htlc(nodes[2].node.get_our_node_id(), update_malformed);
170+
do_commitment_signed_dance(&nodes[1], &nodes[2], &updates_2_1.commitment_signed, true, false);
171+
172+
let updates_1_0 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
173+
assert_eq!(updates_1_0.update_fail_htlcs.len(), 1);
174+
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates_1_0.update_fail_htlcs[0]);
175+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates_1_0.commitment_signed, false, false);
176+
expect_payment_failed_conditions(&nodes[0], payment_hash, false,
177+
PaymentFailedConditions::new().expected_htlc_error_data(INVALID_ONION_BLINDING, &[0; 32]));
178+
}
179+
180+
#[test]
32181
fn static_invoice_unknown_required_features() {
33182
// Test that we will fail to pay a static invoice with unsupported required features.
34183
let secp_ctx = Secp256k1::new();

‎lightning/src/ln/blinded_payment_tests.rs

+1-148
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,8 @@ use crate::util::config::UserConfig;
3636
use crate::util::ser::WithoutLength;
3737
use crate::util::test_utils;
3838
use lightning_invoice::RawBolt11Invoice;
39-
#[cfg(async_payments)] use {
40-
crate::ln::inbound_payment,
41-
crate::types::payment::PaymentPreimage,
42-
};
4339

44-
fn blinded_payment_path(
40+
pub fn blinded_payment_path(
4541
payment_secret: PaymentSecret, intro_node_min_htlc: u64, intro_node_max_htlc: u64,
4642
node_ids: Vec<PublicKey>, channel_upds: &[&msgs::UnsignedChannelUpdate],
4743
keys_manager: &test_utils::TestKeysInterface
@@ -1226,149 +1222,6 @@ fn conditionally_round_fwd_amt() {
12261222
expect_payment_sent(&nodes[0], payment_preimage, Some(Some(expected_fee)), true, true);
12271223
}
12281224

1229-
#[test]
1230-
#[cfg(async_payments)]
1231-
fn blinded_keysend() {
1232-
let chanmon_cfgs = create_chanmon_cfgs(3);
1233-
let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
1234-
let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
1235-
let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
1236-
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
1237-
let chan_upd_1_2 = create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0).0.contents;
1238-
1239-
let inbound_payment_key = nodes[2].keys_manager.get_inbound_payment_key();
1240-
let payment_secret = inbound_payment::create_for_spontaneous_payment(
1241-
&inbound_payment_key, None, u32::MAX, nodes[2].node.duration_since_epoch().as_secs(), None
1242-
).unwrap();
1243-
1244-
let amt_msat = 5000;
1245-
let keysend_preimage = PaymentPreimage([42; 32]);
1246-
let route_params = get_blinded_route_parameters(amt_msat, payment_secret, 1,
1247-
1_0000_0000,
1248-
nodes.iter().skip(1).map(|n| n.node.get_our_node_id()).collect(),
1249-
&[&chan_upd_1_2], &chanmon_cfgs[2].keys_manager);
1250-
1251-
let payment_hash = nodes[0].node.send_spontaneous_payment(Some(keysend_preimage), RecipientOnionFields::spontaneous_empty(), PaymentId(keysend_preimage.0), route_params, Retry::Attempts(0)).unwrap();
1252-
check_added_monitors(&nodes[0], 1);
1253-
1254-
let expected_route: &[&[&Node]] = &[&[&nodes[1], &nodes[2]]];
1255-
let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1256-
assert_eq!(events.len(), 1);
1257-
1258-
let ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
1259-
pass_along_path(&nodes[0], expected_route[0], amt_msat, payment_hash, Some(payment_secret), ev.clone(), true, Some(keysend_preimage));
1260-
claim_payment_along_route(
1261-
ClaimAlongRouteArgs::new(&nodes[0], expected_route, keysend_preimage)
1262-
);
1263-
}
1264-
1265-
#[test]
1266-
#[cfg(async_payments)]
1267-
fn blinded_mpp_keysend() {
1268-
let chanmon_cfgs = create_chanmon_cfgs(4);
1269-
let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);
1270-
let node_chanmgrs = create_node_chanmgrs(4, &node_cfgs, &[None, None, None, None]);
1271-
let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
1272-
1273-
create_announced_chan_between_nodes(&nodes, 0, 1);
1274-
create_announced_chan_between_nodes(&nodes, 0, 2);
1275-
let chan_1_3 = create_announced_chan_between_nodes(&nodes, 1, 3);
1276-
let chan_2_3 = create_announced_chan_between_nodes(&nodes, 2, 3);
1277-
1278-
let inbound_payment_key = nodes[3].keys_manager.get_inbound_payment_key();
1279-
let payment_secret = inbound_payment::create_for_spontaneous_payment(
1280-
&inbound_payment_key, None, u32::MAX, nodes[3].node.duration_since_epoch().as_secs(), None
1281-
).unwrap();
1282-
1283-
let amt_msat = 15_000_000;
1284-
let keysend_preimage = PaymentPreimage([42; 32]);
1285-
let route_params = {
1286-
let pay_params = PaymentParameters::blinded(
1287-
vec![
1288-
blinded_payment_path(payment_secret, 1, 1_0000_0000,
1289-
vec![nodes[1].node.get_our_node_id(), nodes[3].node.get_our_node_id()], &[&chan_1_3.0.contents],
1290-
&chanmon_cfgs[3].keys_manager
1291-
),
1292-
blinded_payment_path(payment_secret, 1, 1_0000_0000,
1293-
vec![nodes[2].node.get_our_node_id(), nodes[3].node.get_our_node_id()], &[&chan_2_3.0.contents],
1294-
&chanmon_cfgs[3].keys_manager
1295-
),
1296-
]
1297-
)
1298-
.with_bolt12_features(channelmanager::provided_bolt12_invoice_features(&UserConfig::default()))
1299-
.unwrap();
1300-
RouteParameters::from_payment_params_and_value(pay_params, amt_msat)
1301-
};
1302-
1303-
let payment_hash = nodes[0].node.send_spontaneous_payment(Some(keysend_preimage), RecipientOnionFields::spontaneous_empty(), PaymentId(keysend_preimage.0), route_params, Retry::Attempts(0)).unwrap();
1304-
check_added_monitors!(nodes[0], 2);
1305-
1306-
let expected_route: &[&[&Node]] = &[&[&nodes[1], &nodes[3]], &[&nodes[2], &nodes[3]]];
1307-
let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1308-
assert_eq!(events.len(), 2);
1309-
1310-
let ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
1311-
pass_along_path(&nodes[0], expected_route[0], amt_msat, payment_hash.clone(),
1312-
Some(payment_secret), ev.clone(), false, Some(keysend_preimage));
1313-
1314-
let ev = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
1315-
pass_along_path(&nodes[0], expected_route[1], amt_msat, payment_hash.clone(),
1316-
Some(payment_secret), ev.clone(), true, Some(keysend_preimage));
1317-
claim_payment_along_route(
1318-
ClaimAlongRouteArgs::new(&nodes[0], expected_route, keysend_preimage)
1319-
);
1320-
}
1321-
1322-
#[test]
1323-
#[cfg(async_payments)]
1324-
fn invalid_keysend_payment_secret() {
1325-
let chanmon_cfgs = create_chanmon_cfgs(3);
1326-
let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
1327-
let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
1328-
let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
1329-
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
1330-
let chan_upd_1_2 = create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0).0.contents;
1331-
1332-
let invalid_payment_secret = PaymentSecret([42; 32]);
1333-
let amt_msat = 5000;
1334-
let keysend_preimage = PaymentPreimage([42; 32]);
1335-
let route_params = get_blinded_route_parameters(
1336-
amt_msat, invalid_payment_secret, 1, 1_0000_0000,
1337-
nodes.iter().skip(1).map(|n| n.node.get_our_node_id()).collect(), &[&chan_upd_1_2],
1338-
&chanmon_cfgs[2].keys_manager
1339-
);
1340-
1341-
let payment_hash = nodes[0].node.send_spontaneous_payment(Some(keysend_preimage), RecipientOnionFields::spontaneous_empty(), PaymentId(keysend_preimage.0), route_params, Retry::Attempts(0)).unwrap();
1342-
check_added_monitors(&nodes[0], 1);
1343-
1344-
let expected_route: &[&[&Node]] = &[&[&nodes[1], &nodes[2]]];
1345-
let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1346-
assert_eq!(events.len(), 1);
1347-
1348-
let ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
1349-
let args = PassAlongPathArgs::new(
1350-
&nodes[0], &expected_route[0], amt_msat, payment_hash, ev.clone()
1351-
)
1352-
.with_payment_secret(invalid_payment_secret)
1353-
.with_payment_preimage(keysend_preimage)
1354-
.expect_failure(HTLCDestination::FailedPayment { payment_hash });
1355-
do_pass_along_path(args);
1356-
1357-
let updates_2_1 = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
1358-
assert_eq!(updates_2_1.update_fail_malformed_htlcs.len(), 1);
1359-
let update_malformed = &updates_2_1.update_fail_malformed_htlcs[0];
1360-
assert_eq!(update_malformed.sha256_of_onion, [0; 32]);
1361-
assert_eq!(update_malformed.failure_code, INVALID_ONION_BLINDING);
1362-
nodes[1].node.handle_update_fail_malformed_htlc(nodes[2].node.get_our_node_id(), update_malformed);
1363-
do_commitment_signed_dance(&nodes[1], &nodes[2], &updates_2_1.commitment_signed, true, false);
1364-
1365-
let updates_1_0 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1366-
assert_eq!(updates_1_0.update_fail_htlcs.len(), 1);
1367-
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates_1_0.update_fail_htlcs[0]);
1368-
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates_1_0.commitment_signed, false, false);
1369-
expect_payment_failed_conditions(&nodes[0], payment_hash, false,
1370-
PaymentFailedConditions::new().expected_htlc_error_data(INVALID_ONION_BLINDING, &[0; 32]));
1371-
}
13721225

13731226
#[test]
13741227
fn custom_tlvs_to_blinded_path() {

0 commit comments

Comments
 (0)