Fix async release before HTLC decode#4542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tnull wants to merge 1 commit into from
Closed

Fix async release before HTLC decode #4542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 162 additions & 0 deletions lightning/src/ln/async_payments_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2879,6 +2879,7 @@ fn async_payment_e2e() {
.unwrap();
let (peer_node_id, static_invoice_om, static_invoice) =
extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

let payment_hash =
lock_in_htlc_for_static_invoice(&static_invoice_om, peer_node_id, sender, sender_lsp);

Expand DownExpand Up@@ -2965,6 +2966,167 @@ fn async_payment_e2e() {
assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn async_payment_e2e_release_before_hold_registered() {
let chanmon_cfgs = create_chanmon_cfgs(4);
let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);

let (sender_cfg, recipient_cfg) = (often_offline_node_cfg(), often_offline_node_cfg());
let mut sender_lsp_cfg = test_default_channel_config();
sender_lsp_cfg.enable_htlc_hold = true;
let mut invoice_server_cfg = test_default_channel_config();
invoice_server_cfg.accept_forwards_to_priv_channels = true;

let node_chanmgrs = create_node_chanmgrs(
4,
&node_cfgs,
&[Some(sender_cfg), Some(sender_lsp_cfg), Some(invoice_server_cfg), Some(recipient_cfg)],
);
let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
create_unannounced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0);
create_unannounced_chan_between_nodes_with_value(&nodes, 2, 3, 1_000_000, 0);
unify_blockheight_across_nodes(&nodes);
let sender = &nodes[0];
let sender_lsp = &nodes[1];
let invoice_server = &nodes[2];
let recipient = &nodes[3];

let recipient_id = vec![42; 32];
let inv_server_paths =
invoice_server.node.blinded_paths_for_async_recipient(recipient_id.clone(), None).unwrap();
recipient.node.set_paths_to_static_invoice_server(inv_server_paths).unwrap();
expect_offer_paths_requests(recipient, &[invoice_server, sender_lsp]);
let invoice_flow_res =
pass_static_invoice_server_messages(invoice_server, recipient, recipient_id.clone());
let invoice = invoice_flow_res.invoice;
let invreq_path = invoice_flow_res.invoice_request_path;

let offer = recipient.node.get_async_receive_offer().unwrap();
recipient.node.peer_disconnected(invoice_server.node.get_our_node_id());
recipient.onion_messenger.peer_disconnected(invoice_server.node.get_our_node_id());
invoice_server.node.peer_disconnected(recipient.node.get_our_node_id());
invoice_server.onion_messenger.peer_disconnected(recipient.node.get_our_node_id());

let amt_msat = 5000;
let payment_id = PaymentId([1; 32]);
sender.node.pay_for_offer(&offer, Some(amt_msat), payment_id, Default::default()).unwrap();

let (peer_id, invreq_om) = extract_invoice_request_om(sender, &[sender_lsp, invoice_server]);
invoice_server.onion_messenger.handle_onion_message(peer_id, &invreq_om);

let mut events = invoice_server.node.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
let (reply_path, invreq) = match events.pop().unwrap() {
Event::StaticInvoiceRequested {
recipient_id: ev_id, reply_path, invoice_request, ..
} => {
assert_eq!(recipient_id, ev_id);
(reply_path, invoice_request)
},
_ => panic!(),
};

invoice_server
.node
.respond_to_static_invoice_request(invoice, reply_path, invreq, invreq_path)
.unwrap();
let (peer_node_id, static_invoice_om, static_invoice) =
extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

// Lock the HTLC in with the sender LSP, but stop before the sender's revoke_and_ack is handed
// back to the sender LSP. This reproduces the real LSPS2 timing where ReleaseHeldHtlc can
// arrive before the held HTLC is queued for decode on the sender LSP.
sender.onion_messenger.handle_onion_message(peer_node_id, &static_invoice_om);
check_added_monitors(sender, 1);
let commitment_update = get_htlc_update_msgs(&sender, &sender_lsp.node.get_our_node_id());
let update_add = commitment_update.update_add_htlcs[0].clone();
let payment_hash = update_add.payment_hash;
assert!(update_add.hold_htlc.is_some());
sender_lsp.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
sender_lsp.node.handle_commitment_signed_batch_test(
sender.node.get_our_node_id(),
&commitment_update.commitment_signed,
);
check_added_monitors(sender_lsp, 1);
let (_extra_msg_option, sender_raa, sender_holding_cell_htlcs) =
do_main_commitment_signed_dance(sender_lsp, sender, false);
assert!(sender_holding_cell_htlcs.is_empty());

let held_htlc_om_to_inv_server = sender
.onion_messenger
.next_onion_message_for_peer(invoice_server.node.get_our_node_id())
.unwrap();
invoice_server
.onion_messenger
.handle_onion_message(sender_lsp.node.get_our_node_id(), &held_htlc_om_to_inv_server);

let mut events_rc = core::cell::RefCell::new(Vec::new());
invoice_server.onion_messenger.process_pending_events(&|e| Ok(events_rc.borrow_mut().push(e)));
let events = events_rc.into_inner();
let held_htlc_om = events
.into_iter()
.find_map(|ev| {
if let Event::OnionMessageIntercepted { message, .. } = ev {
let peeled_onion = recipient.onion_messenger.peel_onion_message(&message).unwrap();
if matches!(
peeled_onion,
PeeledOnion::Offers(OffersMessage::InvoiceRequest { .. }, _, _)
) {
return None;
}

assert!(matches!(
peeled_onion,
PeeledOnion::AsyncPayments(AsyncPaymentsMessage::HeldHtlcAvailable(_), _, _)
));
Some(message)
} else {
None
}
})
.unwrap();

let mut reconnect_args = ReconnectArgs::new(invoice_server, recipient);
reconnect_args.send_channel_ready = (true, true);
reconnect_nodes(reconnect_args);

let events = core::cell::RefCell::new(Vec::new());
invoice_server.onion_messenger.process_pending_events(&|e| Ok(events.borrow_mut().push(e)));
assert_eq!(events.borrow().len(), 1);
assert!(matches!(events.into_inner().pop().unwrap(), Event::OnionMessagePeerConnected { .. }));
expect_offer_paths_requests(recipient, &[invoice_server]);

recipient
.onion_messenger
.handle_onion_message(invoice_server.node.get_our_node_id(), &held_htlc_om);
let (peer_id, release_htlc_om) =
extract_release_htlc_oms(recipient, &[sender, sender_lsp, invoice_server]).pop().unwrap();
sender_lsp.onion_messenger.handle_onion_message(peer_id, &release_htlc_om);

// Now let the sender LSP receive the sender's revoke_and_ack and continue processing the held
// HTLC. Old code drops the release request above; fixed code remembers it and forwards the HTLC.
sender_lsp.node.handle_revoke_and_ack(sender.node.get_our_node_id(), &sender_raa);
check_added_monitors(sender_lsp, 1);
assert!(sender_lsp.node.get_and_clear_pending_msg_events().is_empty());
sender_lsp.node.process_pending_htlc_forwards();
let mut events = sender_lsp.node.get_and_clear_pending_msg_events();
assert_eq!(events.len(), 1);
let ev = remove_first_msg_event_to_node(&invoice_server.node.get_our_node_id(), &mut events);
check_added_monitors(&sender_lsp, 1);

let path: &[&Node] = &[invoice_server, recipient];
let args = PassAlongPathArgs::new(sender_lsp, path, amt_msat, payment_hash, ev)
.with_dummy_tlvs(&[DummyTlvs::default(); DEFAULT_PAYMENT_DUMMY_HOPS]);
let claimable_ev = do_pass_along_path(args).unwrap();

let route: &[&[&Node]] = &[&[sender_lsp, invoice_server, recipient]];
let keysend_preimage = extract_payment_preimage(&claimable_ev);
let (res, _) =
claim_payment_along_route(ClaimAlongRouteArgs::new(sender, route, keysend_preimage));
assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn held_htlc_timeout() {
// Test that if a held HTLC doesn't get released for a long time, it will eventually time out and
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix async release before HTLC decode#4542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Fix async release before HTLC decode
#4542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


162 changes: 162 additions & 0 deletions
lightning/src/ln/async_payments_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2879,6 +2879,7 @@ fn async_payment_e2e() {
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	let payment_hash =
 lock_in_htlc_for_static_invoice(&static_invoice_om, peer_node_id, sender, sender_lsp);

Expand DownExpand Up@@ -2965,6 +2966,167 @@ fn async_payment_e2e() {
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn async_payment_e2e_release_before_hold_registered() {
	let chanmon_cfgs = create_chanmon_cfgs(4);
	let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);

	let (sender_cfg, recipient_cfg) = (often_offline_node_cfg(), often_offline_node_cfg());
	let mut sender_lsp_cfg = test_default_channel_config();
	sender_lsp_cfg.enable_htlc_hold = true;
	let mut invoice_server_cfg = test_default_channel_config();
	invoice_server_cfg.accept_forwards_to_priv_channels = true;

	let node_chanmgrs = create_node_chanmgrs(
 4,
 &node_cfgs,
 &[Some(sender_cfg), Some(sender_lsp_cfg), Some(invoice_server_cfg), Some(recipient_cfg)],
	);
	let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
	create_unannounced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
	create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0);
	create_unannounced_chan_between_nodes_with_value(&nodes, 2, 3, 1_000_000, 0);
	unify_blockheight_across_nodes(&nodes);
	let sender = &nodes[0];
	let sender_lsp = &nodes[1];
	let invoice_server = &nodes[2];
	let recipient = &nodes[3];

	let recipient_id = vec![42; 32];
	let inv_server_paths =
 invoice_server.node.blinded_paths_for_async_recipient(recipient_id.clone(), None).unwrap();
	recipient.node.set_paths_to_static_invoice_server(inv_server_paths).unwrap();
	expect_offer_paths_requests(recipient, &[invoice_server, sender_lsp]);
	let invoice_flow_res =
 pass_static_invoice_server_messages(invoice_server, recipient, recipient_id.clone());
	let invoice = invoice_flow_res.invoice;
	let invreq_path = invoice_flow_res.invoice_request_path;

	let offer = recipient.node.get_async_receive_offer().unwrap();
	recipient.node.peer_disconnected(invoice_server.node.get_our_node_id());
	recipient.onion_messenger.peer_disconnected(invoice_server.node.get_our_node_id());
	invoice_server.node.peer_disconnected(recipient.node.get_our_node_id());
	invoice_server.onion_messenger.peer_disconnected(recipient.node.get_our_node_id());

	let amt_msat = 5000;
	let payment_id = PaymentId([1; 32]);
	sender.node.pay_for_offer(&offer, Some(amt_msat), payment_id, Default::default()).unwrap();

	let (peer_id, invreq_om) = extract_invoice_request_om(sender, &[sender_lsp, invoice_server]);
	invoice_server.onion_messenger.handle_onion_message(peer_id, &invreq_om);

	let mut events = invoice_server.node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	let (reply_path, invreq) = match events.pop().unwrap() {
 Event::StaticInvoiceRequested {
 recipient_id: ev_id, reply_path, invoice_request, ..
 } => {
 assert_eq!(recipient_id, ev_id);
 (reply_path, invoice_request)
 },
 _ => panic!(),
	};

	invoice_server
 .node
 .respond_to_static_invoice_request(invoice, reply_path, invreq, invreq_path)
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	// Lock the HTLC in with the sender LSP, but stop before the sender's revoke_and_ack is handed
	// back to the sender LSP. This reproduces the real LSPS2 timing where ReleaseHeldHtlc can
	// arrive before the held HTLC is queued for decode on the sender LSP.
	sender.onion_messenger.handle_onion_message(peer_node_id, &static_invoice_om);
	check_added_monitors(sender, 1);
	let commitment_update = get_htlc_update_msgs(&sender, &sender_lsp.node.get_our_node_id());
	let update_add = commitment_update.update_add_htlcs[0].clone();
	let payment_hash = update_add.payment_hash;
	assert!(update_add.hold_htlc.is_some());
	sender_lsp.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
	sender_lsp.node.handle_commitment_signed_batch_test(
 sender.node.get_our_node_id(),
 &commitment_update.commitment_signed,
	);
	check_added_monitors(sender_lsp, 1);
	let (_extra_msg_option, sender_raa, sender_holding_cell_htlcs) =
 do_main_commitment_signed_dance(sender_lsp, sender, false);
	assert!(sender_holding_cell_htlcs.is_empty());

	let held_htlc_om_to_inv_server = sender
 .onion_messenger
 .next_onion_message_for_peer(invoice_server.node.get_our_node_id())
 .unwrap();
	invoice_server
 .onion_messenger
 .handle_onion_message(sender_lsp.node.get_our_node_id(), &held_htlc_om_to_inv_server);

	let mut events_rc = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events_rc.borrow_mut().push(e)));
	let events = events_rc.into_inner();
	let held_htlc_om = events
 .into_iter()
 .find_map(|ev| {
 if let Event::OnionMessageIntercepted { message, .. } = ev {
 let peeled_onion = recipient.onion_messenger.peel_onion_message(&message).unwrap();
 if matches!(
 peeled_onion,
 PeeledOnion::Offers(OffersMessage::InvoiceRequest { .. }, _, _)
 ) {
 return None;
 }

 assert!(matches!(
 peeled_onion,
 PeeledOnion::AsyncPayments(AsyncPaymentsMessage::HeldHtlcAvailable(_), _, _)
 ));
 Some(message)
 } else {
 None
 }
 })
 .unwrap();

	let mut reconnect_args = ReconnectArgs::new(invoice_server, recipient);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let events = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events.borrow_mut().push(e)));
	assert_eq!(events.borrow().len(), 1);
	assert!(matches!(events.into_inner().pop().unwrap(), Event::OnionMessagePeerConnected { .. }));
	expect_offer_paths_requests(recipient, &[invoice_server]);

	recipient
 .onion_messenger
 .handle_onion_message(invoice_server.node.get_our_node_id(), &held_htlc_om);
	let (peer_id, release_htlc_om) =
 extract_release_htlc_oms(recipient, &[sender, sender_lsp, invoice_server]).pop().unwrap();
	sender_lsp.onion_messenger.handle_onion_message(peer_id, &release_htlc_om);

	// Now let the sender LSP receive the sender's revoke_and_ack and continue processing the held
	// HTLC. Old code drops the release request above; fixed code remembers it and forwards the HTLC.
	sender_lsp.node.handle_revoke_and_ack(sender.node.get_our_node_id(), &sender_raa);
	check_added_monitors(sender_lsp, 1);
	assert!(sender_lsp.node.get_and_clear_pending_msg_events().is_empty());
	sender_lsp.node.process_pending_htlc_forwards();
	let mut events = sender_lsp.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 1);
	let ev = remove_first_msg_event_to_node(&invoice_server.node.get_our_node_id(), &mut events);
	check_added_monitors(&sender_lsp, 1);

	let path: &[&Node] = &[invoice_server, recipient];
	let args = PassAlongPathArgs::new(sender_lsp, path, amt_msat, payment_hash, ev)
 .with_dummy_tlvs(&[DummyTlvs::default(); DEFAULT_PAYMENT_DUMMY_HOPS]);
	let claimable_ev = do_pass_along_path(args).unwrap();

	let route: &[&[&Node]] = &[&[sender_lsp, invoice_server, recipient]];
	let keysend_preimage = extract_payment_preimage(&claimable_ev);
	let (res, _) =
 claim_payment_along_route(ClaimAlongRouteArgs::new(sender, route, keysend_preimage));
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn held_htlc_timeout() {
	// Test that if a held HTLC doesn't get released for a long time, it will eventually time out and
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix async release before HTLC decode#4542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Fix async release before HTLC decode
#4542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


162 changes: 162 additions & 0 deletions
lightning/src/ln/async_payments_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2879,6 +2879,7 @@ fn async_payment_e2e() {
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	let payment_hash =
 lock_in_htlc_for_static_invoice(&static_invoice_om, peer_node_id, sender, sender_lsp);

Expand DownExpand Up@@ -2965,6 +2966,167 @@ fn async_payment_e2e() {
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn async_payment_e2e_release_before_hold_registered() {
	let chanmon_cfgs = create_chanmon_cfgs(4);
	let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);

	let (sender_cfg, recipient_cfg) = (often_offline_node_cfg(), often_offline_node_cfg());
	let mut sender_lsp_cfg = test_default_channel_config();
	sender_lsp_cfg.enable_htlc_hold = true;
	let mut invoice_server_cfg = test_default_channel_config();
	invoice_server_cfg.accept_forwards_to_priv_channels = true;

	let node_chanmgrs = create_node_chanmgrs(
 4,
 &node_cfgs,
 &[Some(sender_cfg), Some(sender_lsp_cfg), Some(invoice_server_cfg), Some(recipient_cfg)],
	);
	let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
	create_unannounced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
	create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0);
	create_unannounced_chan_between_nodes_with_value(&nodes, 2, 3, 1_000_000, 0);
	unify_blockheight_across_nodes(&nodes);
	let sender = &nodes[0];
	let sender_lsp = &nodes[1];
	let invoice_server = &nodes[2];
	let recipient = &nodes[3];

	let recipient_id = vec![42; 32];
	let inv_server_paths =
 invoice_server.node.blinded_paths_for_async_recipient(recipient_id.clone(), None).unwrap();
	recipient.node.set_paths_to_static_invoice_server(inv_server_paths).unwrap();
	expect_offer_paths_requests(recipient, &[invoice_server, sender_lsp]);
	let invoice_flow_res =
 pass_static_invoice_server_messages(invoice_server, recipient, recipient_id.clone());
	let invoice = invoice_flow_res.invoice;
	let invreq_path = invoice_flow_res.invoice_request_path;

	let offer = recipient.node.get_async_receive_offer().unwrap();
	recipient.node.peer_disconnected(invoice_server.node.get_our_node_id());
	recipient.onion_messenger.peer_disconnected(invoice_server.node.get_our_node_id());
	invoice_server.node.peer_disconnected(recipient.node.get_our_node_id());
	invoice_server.onion_messenger.peer_disconnected(recipient.node.get_our_node_id());

	let amt_msat = 5000;
	let payment_id = PaymentId([1; 32]);
	sender.node.pay_for_offer(&offer, Some(amt_msat), payment_id, Default::default()).unwrap();

	let (peer_id, invreq_om) = extract_invoice_request_om(sender, &[sender_lsp, invoice_server]);
	invoice_server.onion_messenger.handle_onion_message(peer_id, &invreq_om);

	let mut events = invoice_server.node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	let (reply_path, invreq) = match events.pop().unwrap() {
 Event::StaticInvoiceRequested {
 recipient_id: ev_id, reply_path, invoice_request, ..
 } => {
 assert_eq!(recipient_id, ev_id);
 (reply_path, invoice_request)
 },
 _ => panic!(),
	};

	invoice_server
 .node
 .respond_to_static_invoice_request(invoice, reply_path, invreq, invreq_path)
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	// Lock the HTLC in with the sender LSP, but stop before the sender's revoke_and_ack is handed
	// back to the sender LSP. This reproduces the real LSPS2 timing where ReleaseHeldHtlc can
	// arrive before the held HTLC is queued for decode on the sender LSP.
	sender.onion_messenger.handle_onion_message(peer_node_id, &static_invoice_om);
	check_added_monitors(sender, 1);
	let commitment_update = get_htlc_update_msgs(&sender, &sender_lsp.node.get_our_node_id());
	let update_add = commitment_update.update_add_htlcs[0].clone();
	let payment_hash = update_add.payment_hash;
	assert!(update_add.hold_htlc.is_some());
	sender_lsp.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
	sender_lsp.node.handle_commitment_signed_batch_test(
 sender.node.get_our_node_id(),
 &commitment_update.commitment_signed,
	);
	check_added_monitors(sender_lsp, 1);
	let (_extra_msg_option, sender_raa, sender_holding_cell_htlcs) =
 do_main_commitment_signed_dance(sender_lsp, sender, false);
	assert!(sender_holding_cell_htlcs.is_empty());

	let held_htlc_om_to_inv_server = sender
 .onion_messenger
 .next_onion_message_for_peer(invoice_server.node.get_our_node_id())
 .unwrap();
	invoice_server
 .onion_messenger
 .handle_onion_message(sender_lsp.node.get_our_node_id(), &held_htlc_om_to_inv_server);

	let mut events_rc = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events_rc.borrow_mut().push(e)));
	let events = events_rc.into_inner();
	let held_htlc_om = events
 .into_iter()
 .find_map(|ev| {
 if let Event::OnionMessageIntercepted { message, .. } = ev {
 let peeled_onion = recipient.onion_messenger.peel_onion_message(&message).unwrap();
 if matches!(
 peeled_onion,
 PeeledOnion::Offers(OffersMessage::InvoiceRequest { .. }, _, _)
 ) {
 return None;
 }

 assert!(matches!(
 peeled_onion,
 PeeledOnion::AsyncPayments(AsyncPaymentsMessage::HeldHtlcAvailable(_), _, _)
 ));
 Some(message)
 } else {
 None
 }
 })
 .unwrap();

	let mut reconnect_args = ReconnectArgs::new(invoice_server, recipient);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let events = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events.borrow_mut().push(e)));
	assert_eq!(events.borrow().len(), 1);
	assert!(matches!(events.into_inner().pop().unwrap(), Event::OnionMessagePeerConnected { .. }));
	expect_offer_paths_requests(recipient, &[invoice_server]);

	recipient
 .onion_messenger
 .handle_onion_message(invoice_server.node.get_our_node_id(), &held_htlc_om);
	let (peer_id, release_htlc_om) =
 extract_release_htlc_oms(recipient, &[sender, sender_lsp, invoice_server]).pop().unwrap();
	sender_lsp.onion_messenger.handle_onion_message(peer_id, &release_htlc_om);

	// Now let the sender LSP receive the sender's revoke_and_ack and continue processing the held
	// HTLC. Old code drops the release request above; fixed code remembers it and forwards the HTLC.
	sender_lsp.node.handle_revoke_and_ack(sender.node.get_our_node_id(), &sender_raa);
	check_added_monitors(sender_lsp, 1);
	assert!(sender_lsp.node.get_and_clear_pending_msg_events().is_empty());
	sender_lsp.node.process_pending_htlc_forwards();
	let mut events = sender_lsp.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 1);
	let ev = remove_first_msg_event_to_node(&invoice_server.node.get_our_node_id(), &mut events);
	check_added_monitors(&sender_lsp, 1);

	let path: &[&Node] = &[invoice_server, recipient];
	let args = PassAlongPathArgs::new(sender_lsp, path, amt_msat, payment_hash, ev)
 .with_dummy_tlvs(&[DummyTlvs::default(); DEFAULT_PAYMENT_DUMMY_HOPS]);
	let claimable_ev = do_pass_along_path(args).unwrap();

	let route: &[&[&Node]] = &[&[sender_lsp, invoice_server, recipient]];
	let keysend_preimage = extract_payment_preimage(&claimable_ev);
	let (res, _) =
 claim_payment_along_route(ClaimAlongRouteArgs::new(sender, route, keysend_preimage));
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn held_htlc_timeout() {
	// Test that if a held HTLC doesn't get released for a long time, it will eventually time out and
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix async release before HTLC decode#4542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Fix async release before HTLC decode
#4542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


162 changes: 162 additions & 0 deletions
lightning/src/ln/async_payments_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2879,6 +2879,7 @@ fn async_payment_e2e() {
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	let payment_hash =
 lock_in_htlc_for_static_invoice(&static_invoice_om, peer_node_id, sender, sender_lsp);

Expand DownExpand Up@@ -2965,6 +2966,167 @@ fn async_payment_e2e() {
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn async_payment_e2e_release_before_hold_registered() {
	let chanmon_cfgs = create_chanmon_cfgs(4);
	let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);

	let (sender_cfg, recipient_cfg) = (often_offline_node_cfg(), often_offline_node_cfg());
	let mut sender_lsp_cfg = test_default_channel_config();
	sender_lsp_cfg.enable_htlc_hold = true;
	let mut invoice_server_cfg = test_default_channel_config();
	invoice_server_cfg.accept_forwards_to_priv_channels = true;

	let node_chanmgrs = create_node_chanmgrs(
 4,
 &node_cfgs,
 &[Some(sender_cfg), Some(sender_lsp_cfg), Some(invoice_server_cfg), Some(recipient_cfg)],
	);
	let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
	create_unannounced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
	create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0);
	create_unannounced_chan_between_nodes_with_value(&nodes, 2, 3, 1_000_000, 0);
	unify_blockheight_across_nodes(&nodes);
	let sender = &nodes[0];
	let sender_lsp = &nodes[1];
	let invoice_server = &nodes[2];
	let recipient = &nodes[3];

	let recipient_id = vec![42; 32];
	let inv_server_paths =
 invoice_server.node.blinded_paths_for_async_recipient(recipient_id.clone(), None).unwrap();
	recipient.node.set_paths_to_static_invoice_server(inv_server_paths).unwrap();
	expect_offer_paths_requests(recipient, &[invoice_server, sender_lsp]);
	let invoice_flow_res =
 pass_static_invoice_server_messages(invoice_server, recipient, recipient_id.clone());
	let invoice = invoice_flow_res.invoice;
	let invreq_path = invoice_flow_res.invoice_request_path;

	let offer = recipient.node.get_async_receive_offer().unwrap();
	recipient.node.peer_disconnected(invoice_server.node.get_our_node_id());
	recipient.onion_messenger.peer_disconnected(invoice_server.node.get_our_node_id());
	invoice_server.node.peer_disconnected(recipient.node.get_our_node_id());
	invoice_server.onion_messenger.peer_disconnected(recipient.node.get_our_node_id());

	let amt_msat = 5000;
	let payment_id = PaymentId([1; 32]);
	sender.node.pay_for_offer(&offer, Some(amt_msat), payment_id, Default::default()).unwrap();

	let (peer_id, invreq_om) = extract_invoice_request_om(sender, &[sender_lsp, invoice_server]);
	invoice_server.onion_messenger.handle_onion_message(peer_id, &invreq_om);

	let mut events = invoice_server.node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	let (reply_path, invreq) = match events.pop().unwrap() {
 Event::StaticInvoiceRequested {
 recipient_id: ev_id, reply_path, invoice_request, ..
 } => {
 assert_eq!(recipient_id, ev_id);
 (reply_path, invoice_request)
 },
 _ => panic!(),
	};

	invoice_server
 .node
 .respond_to_static_invoice_request(invoice, reply_path, invreq, invreq_path)
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	// Lock the HTLC in with the sender LSP, but stop before the sender's revoke_and_ack is handed
	// back to the sender LSP. This reproduces the real LSPS2 timing where ReleaseHeldHtlc can
	// arrive before the held HTLC is queued for decode on the sender LSP.
	sender.onion_messenger.handle_onion_message(peer_node_id, &static_invoice_om);
	check_added_monitors(sender, 1);
	let commitment_update = get_htlc_update_msgs(&sender, &sender_lsp.node.get_our_node_id());
	let update_add = commitment_update.update_add_htlcs[0].clone();
	let payment_hash = update_add.payment_hash;
	assert!(update_add.hold_htlc.is_some());
	sender_lsp.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
	sender_lsp.node.handle_commitment_signed_batch_test(
 sender.node.get_our_node_id(),
 &commitment_update.commitment_signed,
	);
	check_added_monitors(sender_lsp, 1);
	let (_extra_msg_option, sender_raa, sender_holding_cell_htlcs) =
 do_main_commitment_signed_dance(sender_lsp, sender, false);
	assert!(sender_holding_cell_htlcs.is_empty());

	let held_htlc_om_to_inv_server = sender
 .onion_messenger
 .next_onion_message_for_peer(invoice_server.node.get_our_node_id())
 .unwrap();
	invoice_server
 .onion_messenger
 .handle_onion_message(sender_lsp.node.get_our_node_id(), &held_htlc_om_to_inv_server);

	let mut events_rc = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events_rc.borrow_mut().push(e)));
	let events = events_rc.into_inner();
	let held_htlc_om = events
 .into_iter()
 .find_map(|ev| {
 if let Event::OnionMessageIntercepted { message, .. } = ev {
 let peeled_onion = recipient.onion_messenger.peel_onion_message(&message).unwrap();
 if matches!(
 peeled_onion,
 PeeledOnion::Offers(OffersMessage::InvoiceRequest { .. }, _, _)
 ) {
 return None;
 }

 assert!(matches!(
 peeled_onion,
 PeeledOnion::AsyncPayments(AsyncPaymentsMessage::HeldHtlcAvailable(_), _, _)
 ));
 Some(message)
 } else {
 None
 }
 })
 .unwrap();

	let mut reconnect_args = ReconnectArgs::new(invoice_server, recipient);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let events = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events.borrow_mut().push(e)));
	assert_eq!(events.borrow().len(), 1);
	assert!(matches!(events.into_inner().pop().unwrap(), Event::OnionMessagePeerConnected { .. }));
	expect_offer_paths_requests(recipient, &[invoice_server]);

	recipient
 .onion_messenger
 .handle_onion_message(invoice_server.node.get_our_node_id(), &held_htlc_om);
	let (peer_id, release_htlc_om) =
 extract_release_htlc_oms(recipient, &[sender, sender_lsp, invoice_server]).pop().unwrap();
	sender_lsp.onion_messenger.handle_onion_message(peer_id, &release_htlc_om);

	// Now let the sender LSP receive the sender's revoke_and_ack and continue processing the held
	// HTLC. Old code drops the release request above; fixed code remembers it and forwards the HTLC.
	sender_lsp.node.handle_revoke_and_ack(sender.node.get_our_node_id(), &sender_raa);
	check_added_monitors(sender_lsp, 1);
	assert!(sender_lsp.node.get_and_clear_pending_msg_events().is_empty());
	sender_lsp.node.process_pending_htlc_forwards();
	let mut events = sender_lsp.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 1);
	let ev = remove_first_msg_event_to_node(&invoice_server.node.get_our_node_id(), &mut events);
	check_added_monitors(&sender_lsp, 1);

	let path: &[&Node] = &[invoice_server, recipient];
	let args = PassAlongPathArgs::new(sender_lsp, path, amt_msat, payment_hash, ev)
 .with_dummy_tlvs(&[DummyTlvs::default(); DEFAULT_PAYMENT_DUMMY_HOPS]);
	let claimable_ev = do_pass_along_path(args).unwrap();

	let route: &[&[&Node]] = &[&[sender_lsp, invoice_server, recipient]];
	let keysend_preimage = extract_payment_preimage(&claimable_ev);
	let (res, _) =
 claim_payment_along_route(ClaimAlongRouteArgs::new(sender, route, keysend_preimage));
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn held_htlc_timeout() {
	// Test that if a held HTLC doesn't get released for a long time, it will eventually time out and
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix async release before HTLC decode#4542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Fix async release before HTLC decode
#4542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


162 changes: 162 additions & 0 deletions
lightning/src/ln/async_payments_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2879,6 +2879,7 @@ fn async_payment_e2e() {
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	let payment_hash =
 lock_in_htlc_for_static_invoice(&static_invoice_om, peer_node_id, sender, sender_lsp);

Expand DownExpand Up@@ -2965,6 +2966,167 @@ fn async_payment_e2e() {
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn async_payment_e2e_release_before_hold_registered() {
	let chanmon_cfgs = create_chanmon_cfgs(4);
	let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);

	let (sender_cfg, recipient_cfg) = (often_offline_node_cfg(), often_offline_node_cfg());
	let mut sender_lsp_cfg = test_default_channel_config();
	sender_lsp_cfg.enable_htlc_hold = true;
	let mut invoice_server_cfg = test_default_channel_config();
	invoice_server_cfg.accept_forwards_to_priv_channels = true;

	let node_chanmgrs = create_node_chanmgrs(
 4,
 &node_cfgs,
 &[Some(sender_cfg), Some(sender_lsp_cfg), Some(invoice_server_cfg), Some(recipient_cfg)],
	);
	let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
	create_unannounced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
	create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0);
	create_unannounced_chan_between_nodes_with_value(&nodes, 2, 3, 1_000_000, 0);
	unify_blockheight_across_nodes(&nodes);
	let sender = &nodes[0];
	let sender_lsp = &nodes[1];
	let invoice_server = &nodes[2];
	let recipient = &nodes[3];

	let recipient_id = vec![42; 32];
	let inv_server_paths =
 invoice_server.node.blinded_paths_for_async_recipient(recipient_id.clone(), None).unwrap();
	recipient.node.set_paths_to_static_invoice_server(inv_server_paths).unwrap();
	expect_offer_paths_requests(recipient, &[invoice_server, sender_lsp]);
	let invoice_flow_res =
 pass_static_invoice_server_messages(invoice_server, recipient, recipient_id.clone());
	let invoice = invoice_flow_res.invoice;
	let invreq_path = invoice_flow_res.invoice_request_path;

	let offer = recipient.node.get_async_receive_offer().unwrap();
	recipient.node.peer_disconnected(invoice_server.node.get_our_node_id());
	recipient.onion_messenger.peer_disconnected(invoice_server.node.get_our_node_id());
	invoice_server.node.peer_disconnected(recipient.node.get_our_node_id());
	invoice_server.onion_messenger.peer_disconnected(recipient.node.get_our_node_id());

	let amt_msat = 5000;
	let payment_id = PaymentId([1; 32]);
	sender.node.pay_for_offer(&offer, Some(amt_msat), payment_id, Default::default()).unwrap();

	let (peer_id, invreq_om) = extract_invoice_request_om(sender, &[sender_lsp, invoice_server]);
	invoice_server.onion_messenger.handle_onion_message(peer_id, &invreq_om);

	let mut events = invoice_server.node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	let (reply_path, invreq) = match events.pop().unwrap() {
 Event::StaticInvoiceRequested {
 recipient_id: ev_id, reply_path, invoice_request, ..
 } => {
 assert_eq!(recipient_id, ev_id);
 (reply_path, invoice_request)
 },
 _ => panic!(),
	};

	invoice_server
 .node
 .respond_to_static_invoice_request(invoice, reply_path, invreq, invreq_path)
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	// Lock the HTLC in with the sender LSP, but stop before the sender's revoke_and_ack is handed
	// back to the sender LSP. This reproduces the real LSPS2 timing where ReleaseHeldHtlc can
	// arrive before the held HTLC is queued for decode on the sender LSP.
	sender.onion_messenger.handle_onion_message(peer_node_id, &static_invoice_om);
	check_added_monitors(sender, 1);
	let commitment_update = get_htlc_update_msgs(&sender, &sender_lsp.node.get_our_node_id());
	let update_add = commitment_update.update_add_htlcs[0].clone();
	let payment_hash = update_add.payment_hash;
	assert!(update_add.hold_htlc.is_some());
	sender_lsp.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
	sender_lsp.node.handle_commitment_signed_batch_test(
 sender.node.get_our_node_id(),
 &commitment_update.commitment_signed,
	);
	check_added_monitors(sender_lsp, 1);
	let (_extra_msg_option, sender_raa, sender_holding_cell_htlcs) =
 do_main_commitment_signed_dance(sender_lsp, sender, false);
	assert!(sender_holding_cell_htlcs.is_empty());

	let held_htlc_om_to_inv_server = sender
 .onion_messenger
 .next_onion_message_for_peer(invoice_server.node.get_our_node_id())
 .unwrap();
	invoice_server
 .onion_messenger
 .handle_onion_message(sender_lsp.node.get_our_node_id(), &held_htlc_om_to_inv_server);

	let mut events_rc = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events_rc.borrow_mut().push(e)));
	let events = events_rc.into_inner();
	let held_htlc_om = events
 .into_iter()
 .find_map(|ev| {
 if let Event::OnionMessageIntercepted { message, .. } = ev {
 let peeled_onion = recipient.onion_messenger.peel_onion_message(&message).unwrap();
 if matches!(
 peeled_onion,
 PeeledOnion::Offers(OffersMessage::InvoiceRequest { .. }, _, _)
 ) {
 return None;
 }

 assert!(matches!(
 peeled_onion,
 PeeledOnion::AsyncPayments(AsyncPaymentsMessage::HeldHtlcAvailable(_), _, _)
 ));
 Some(message)
 } else {
 None
 }
 })
 .unwrap();

	let mut reconnect_args = ReconnectArgs::new(invoice_server, recipient);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let events = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events.borrow_mut().push(e)));
	assert_eq!(events.borrow().len(), 1);
	assert!(matches!(events.into_inner().pop().unwrap(), Event::OnionMessagePeerConnected { .. }));
	expect_offer_paths_requests(recipient, &[invoice_server]);

	recipient
 .onion_messenger
 .handle_onion_message(invoice_server.node.get_our_node_id(), &held_htlc_om);
	let (peer_id, release_htlc_om) =
 extract_release_htlc_oms(recipient, &[sender, sender_lsp, invoice_server]).pop().unwrap();
	sender_lsp.onion_messenger.handle_onion_message(peer_id, &release_htlc_om);

	// Now let the sender LSP receive the sender's revoke_and_ack and continue processing the held
	// HTLC. Old code drops the release request above; fixed code remembers it and forwards the HTLC.
	sender_lsp.node.handle_revoke_and_ack(sender.node.get_our_node_id(), &sender_raa);
	check_added_monitors(sender_lsp, 1);
	assert!(sender_lsp.node.get_and_clear_pending_msg_events().is_empty());
	sender_lsp.node.process_pending_htlc_forwards();
	let mut events = sender_lsp.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 1);
	let ev = remove_first_msg_event_to_node(&invoice_server.node.get_our_node_id(), &mut events);
	check_added_monitors(&sender_lsp, 1);

	let path: &[&Node] = &[invoice_server, recipient];
	let args = PassAlongPathArgs::new(sender_lsp, path, amt_msat, payment_hash, ev)
 .with_dummy_tlvs(&[DummyTlvs::default(); DEFAULT_PAYMENT_DUMMY_HOPS]);
	let claimable_ev = do_pass_along_path(args).unwrap();

	let route: &[&[&Node]] = &[&[sender_lsp, invoice_server, recipient]];
	let keysend_preimage = extract_payment_preimage(&claimable_ev);
	let (res, _) =
 claim_payment_along_route(ClaimAlongRouteArgs::new(sender, route, keysend_preimage));
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn held_htlc_timeout() {
	// Test that if a held HTLC doesn't get released for a long time, it will eventually time out and
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix async release before HTLC decode#4542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Fix async release before HTLC decode
#4542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


162 changes: 162 additions & 0 deletions
lightning/src/ln/async_payments_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2879,6 +2879,7 @@ fn async_payment_e2e() {
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	let payment_hash =
 lock_in_htlc_for_static_invoice(&static_invoice_om, peer_node_id, sender, sender_lsp);

Expand DownExpand Up@@ -2965,6 +2966,167 @@ fn async_payment_e2e() {
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn async_payment_e2e_release_before_hold_registered() {
	let chanmon_cfgs = create_chanmon_cfgs(4);
	let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);

	let (sender_cfg, recipient_cfg) = (often_offline_node_cfg(), often_offline_node_cfg());
	let mut sender_lsp_cfg = test_default_channel_config();
	sender_lsp_cfg.enable_htlc_hold = true;
	let mut invoice_server_cfg = test_default_channel_config();
	invoice_server_cfg.accept_forwards_to_priv_channels = true;

	let node_chanmgrs = create_node_chanmgrs(
 4,
 &node_cfgs,
 &[Some(sender_cfg), Some(sender_lsp_cfg), Some(invoice_server_cfg), Some(recipient_cfg)],
	);
	let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
	create_unannounced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
	create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0);
	create_unannounced_chan_between_nodes_with_value(&nodes, 2, 3, 1_000_000, 0);
	unify_blockheight_across_nodes(&nodes);
	let sender = &nodes[0];
	let sender_lsp = &nodes[1];
	let invoice_server = &nodes[2];
	let recipient = &nodes[3];

	let recipient_id = vec![42; 32];
	let inv_server_paths =
 invoice_server.node.blinded_paths_for_async_recipient(recipient_id.clone(), None).unwrap();
	recipient.node.set_paths_to_static_invoice_server(inv_server_paths).unwrap();
	expect_offer_paths_requests(recipient, &[invoice_server, sender_lsp]);
	let invoice_flow_res =
 pass_static_invoice_server_messages(invoice_server, recipient, recipient_id.clone());
	let invoice = invoice_flow_res.invoice;
	let invreq_path = invoice_flow_res.invoice_request_path;

	let offer = recipient.node.get_async_receive_offer().unwrap();
	recipient.node.peer_disconnected(invoice_server.node.get_our_node_id());
	recipient.onion_messenger.peer_disconnected(invoice_server.node.get_our_node_id());
	invoice_server.node.peer_disconnected(recipient.node.get_our_node_id());
	invoice_server.onion_messenger.peer_disconnected(recipient.node.get_our_node_id());

	let amt_msat = 5000;
	let payment_id = PaymentId([1; 32]);
	sender.node.pay_for_offer(&offer, Some(amt_msat), payment_id, Default::default()).unwrap();

	let (peer_id, invreq_om) = extract_invoice_request_om(sender, &[sender_lsp, invoice_server]);
	invoice_server.onion_messenger.handle_onion_message(peer_id, &invreq_om);

	let mut events = invoice_server.node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	let (reply_path, invreq) = match events.pop().unwrap() {
 Event::StaticInvoiceRequested {
 recipient_id: ev_id, reply_path, invoice_request, ..
 } => {
 assert_eq!(recipient_id, ev_id);
 (reply_path, invoice_request)
 },
 _ => panic!(),
	};

	invoice_server
 .node
 .respond_to_static_invoice_request(invoice, reply_path, invreq, invreq_path)
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	// Lock the HTLC in with the sender LSP, but stop before the sender's revoke_and_ack is handed
	// back to the sender LSP. This reproduces the real LSPS2 timing where ReleaseHeldHtlc can
	// arrive before the held HTLC is queued for decode on the sender LSP.
	sender.onion_messenger.handle_onion_message(peer_node_id, &static_invoice_om);
	check_added_monitors(sender, 1);
	let commitment_update = get_htlc_update_msgs(&sender, &sender_lsp.node.get_our_node_id());
	let update_add = commitment_update.update_add_htlcs[0].clone();
	let payment_hash = update_add.payment_hash;
	assert!(update_add.hold_htlc.is_some());
	sender_lsp.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
	sender_lsp.node.handle_commitment_signed_batch_test(
 sender.node.get_our_node_id(),
 &commitment_update.commitment_signed,
	);
	check_added_monitors(sender_lsp, 1);
	let (_extra_msg_option, sender_raa, sender_holding_cell_htlcs) =
 do_main_commitment_signed_dance(sender_lsp, sender, false);
	assert!(sender_holding_cell_htlcs.is_empty());

	let held_htlc_om_to_inv_server = sender
 .onion_messenger
 .next_onion_message_for_peer(invoice_server.node.get_our_node_id())
 .unwrap();
	invoice_server
 .onion_messenger
 .handle_onion_message(sender_lsp.node.get_our_node_id(), &held_htlc_om_to_inv_server);

	let mut events_rc = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events_rc.borrow_mut().push(e)));
	let events = events_rc.into_inner();
	let held_htlc_om = events
 .into_iter()
 .find_map(|ev| {
 if let Event::OnionMessageIntercepted { message, .. } = ev {
 let peeled_onion = recipient.onion_messenger.peel_onion_message(&message).unwrap();
 if matches!(
 peeled_onion,
 PeeledOnion::Offers(OffersMessage::InvoiceRequest { .. }, _, _)
 ) {
 return None;
 }

 assert!(matches!(
 peeled_onion,
 PeeledOnion::AsyncPayments(AsyncPaymentsMessage::HeldHtlcAvailable(_), _, _)
 ));
 Some(message)
 } else {
 None
 }
 })
 .unwrap();

	let mut reconnect_args = ReconnectArgs::new(invoice_server, recipient);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let events = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events.borrow_mut().push(e)));
	assert_eq!(events.borrow().len(), 1);
	assert!(matches!(events.into_inner().pop().unwrap(), Event::OnionMessagePeerConnected { .. }));
	expect_offer_paths_requests(recipient, &[invoice_server]);

	recipient
 .onion_messenger
 .handle_onion_message(invoice_server.node.get_our_node_id(), &held_htlc_om);
	let (peer_id, release_htlc_om) =
 extract_release_htlc_oms(recipient, &[sender, sender_lsp, invoice_server]).pop().unwrap();
	sender_lsp.onion_messenger.handle_onion_message(peer_id, &release_htlc_om);

	// Now let the sender LSP receive the sender's revoke_and_ack and continue processing the held
	// HTLC. Old code drops the release request above; fixed code remembers it and forwards the HTLC.
	sender_lsp.node.handle_revoke_and_ack(sender.node.get_our_node_id(), &sender_raa);
	check_added_monitors(sender_lsp, 1);
	assert!(sender_lsp.node.get_and_clear_pending_msg_events().is_empty());
	sender_lsp.node.process_pending_htlc_forwards();
	let mut events = sender_lsp.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 1);
	let ev = remove_first_msg_event_to_node(&invoice_server.node.get_our_node_id(), &mut events);
	check_added_monitors(&sender_lsp, 1);

	let path: &[&Node] = &[invoice_server, recipient];
	let args = PassAlongPathArgs::new(sender_lsp, path, amt_msat, payment_hash, ev)
 .with_dummy_tlvs(&[DummyTlvs::default(); DEFAULT_PAYMENT_DUMMY_HOPS]);
	let claimable_ev = do_pass_along_path(args).unwrap();

	let route: &[&[&Node]] = &[&[sender_lsp, invoice_server, recipient]];
	let keysend_preimage = extract_payment_preimage(&claimable_ev);
	let (res, _) =
 claim_payment_along_route(ClaimAlongRouteArgs::new(sender, route, keysend_preimage));
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn held_htlc_timeout() {
	// Test that if a held HTLC doesn't get released for a long time, it will eventually time out and
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix async release before HTLC decode#4542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Fix async release before HTLC decode
#4542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


162 changes: 162 additions & 0 deletions
lightning/src/ln/async_payments_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2879,6 +2879,7 @@ fn async_payment_e2e() {
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	let payment_hash =
 lock_in_htlc_for_static_invoice(&static_invoice_om, peer_node_id, sender, sender_lsp);

Expand DownExpand Up@@ -2965,6 +2966,167 @@ fn async_payment_e2e() {
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn async_payment_e2e_release_before_hold_registered() {
	let chanmon_cfgs = create_chanmon_cfgs(4);
	let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);

	let (sender_cfg, recipient_cfg) = (often_offline_node_cfg(), often_offline_node_cfg());
	let mut sender_lsp_cfg = test_default_channel_config();
	sender_lsp_cfg.enable_htlc_hold = true;
	let mut invoice_server_cfg = test_default_channel_config();
	invoice_server_cfg.accept_forwards_to_priv_channels = true;

	let node_chanmgrs = create_node_chanmgrs(
 4,
 &node_cfgs,
 &[Some(sender_cfg), Some(sender_lsp_cfg), Some(invoice_server_cfg), Some(recipient_cfg)],
	);
	let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
	create_unannounced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
	create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0);
	create_unannounced_chan_between_nodes_with_value(&nodes, 2, 3, 1_000_000, 0);
	unify_blockheight_across_nodes(&nodes);
	let sender = &nodes[0];
	let sender_lsp = &nodes[1];
	let invoice_server = &nodes[2];
	let recipient = &nodes[3];

	let recipient_id = vec![42; 32];
	let inv_server_paths =
 invoice_server.node.blinded_paths_for_async_recipient(recipient_id.clone(), None).unwrap();
	recipient.node.set_paths_to_static_invoice_server(inv_server_paths).unwrap();
	expect_offer_paths_requests(recipient, &[invoice_server, sender_lsp]);
	let invoice_flow_res =
 pass_static_invoice_server_messages(invoice_server, recipient, recipient_id.clone());
	let invoice = invoice_flow_res.invoice;
	let invreq_path = invoice_flow_res.invoice_request_path;

	let offer = recipient.node.get_async_receive_offer().unwrap();
	recipient.node.peer_disconnected(invoice_server.node.get_our_node_id());
	recipient.onion_messenger.peer_disconnected(invoice_server.node.get_our_node_id());
	invoice_server.node.peer_disconnected(recipient.node.get_our_node_id());
	invoice_server.onion_messenger.peer_disconnected(recipient.node.get_our_node_id());

	let amt_msat = 5000;
	let payment_id = PaymentId([1; 32]);
	sender.node.pay_for_offer(&offer, Some(amt_msat), payment_id, Default::default()).unwrap();

	let (peer_id, invreq_om) = extract_invoice_request_om(sender, &[sender_lsp, invoice_server]);
	invoice_server.onion_messenger.handle_onion_message(peer_id, &invreq_om);

	let mut events = invoice_server.node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	let (reply_path, invreq) = match events.pop().unwrap() {
 Event::StaticInvoiceRequested {
 recipient_id: ev_id, reply_path, invoice_request, ..
 } => {
 assert_eq!(recipient_id, ev_id);
 (reply_path, invoice_request)
 },
 _ => panic!(),
	};

	invoice_server
 .node
 .respond_to_static_invoice_request(invoice, reply_path, invreq, invreq_path)
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	// Lock the HTLC in with the sender LSP, but stop before the sender's revoke_and_ack is handed
	// back to the sender LSP. This reproduces the real LSPS2 timing where ReleaseHeldHtlc can
	// arrive before the held HTLC is queued for decode on the sender LSP.
	sender.onion_messenger.handle_onion_message(peer_node_id, &static_invoice_om);
	check_added_monitors(sender, 1);
	let commitment_update = get_htlc_update_msgs(&sender, &sender_lsp.node.get_our_node_id());
	let update_add = commitment_update.update_add_htlcs[0].clone();
	let payment_hash = update_add.payment_hash;
	assert!(update_add.hold_htlc.is_some());
	sender_lsp.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
	sender_lsp.node.handle_commitment_signed_batch_test(
 sender.node.get_our_node_id(),
 &commitment_update.commitment_signed,
	);
	check_added_monitors(sender_lsp, 1);
	let (_extra_msg_option, sender_raa, sender_holding_cell_htlcs) =
 do_main_commitment_signed_dance(sender_lsp, sender, false);
	assert!(sender_holding_cell_htlcs.is_empty());

	let held_htlc_om_to_inv_server = sender
 .onion_messenger
 .next_onion_message_for_peer(invoice_server.node.get_our_node_id())
 .unwrap();
	invoice_server
 .onion_messenger
 .handle_onion_message(sender_lsp.node.get_our_node_id(), &held_htlc_om_to_inv_server);

	let mut events_rc = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events_rc.borrow_mut().push(e)));
	let events = events_rc.into_inner();
	let held_htlc_om = events
 .into_iter()
 .find_map(|ev| {
 if let Event::OnionMessageIntercepted { message, .. } = ev {
 let peeled_onion = recipient.onion_messenger.peel_onion_message(&message).unwrap();
 if matches!(
 peeled_onion,
 PeeledOnion::Offers(OffersMessage::InvoiceRequest { .. }, _, _)
 ) {
 return None;
 }

 assert!(matches!(
 peeled_onion,
 PeeledOnion::AsyncPayments(AsyncPaymentsMessage::HeldHtlcAvailable(_), _, _)
 ));
 Some(message)
 } else {
 None
 }
 })
 .unwrap();

	let mut reconnect_args = ReconnectArgs::new(invoice_server, recipient);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let events = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events.borrow_mut().push(e)));
	assert_eq!(events.borrow().len(), 1);
	assert!(matches!(events.into_inner().pop().unwrap(), Event::OnionMessagePeerConnected { .. }));
	expect_offer_paths_requests(recipient, &[invoice_server]);

	recipient
 .onion_messenger
 .handle_onion_message(invoice_server.node.get_our_node_id(), &held_htlc_om);
	let (peer_id, release_htlc_om) =
 extract_release_htlc_oms(recipient, &[sender, sender_lsp, invoice_server]).pop().unwrap();
	sender_lsp.onion_messenger.handle_onion_message(peer_id, &release_htlc_om);

	// Now let the sender LSP receive the sender's revoke_and_ack and continue processing the held
	// HTLC. Old code drops the release request above; fixed code remembers it and forwards the HTLC.
	sender_lsp.node.handle_revoke_and_ack(sender.node.get_our_node_id(), &sender_raa);
	check_added_monitors(sender_lsp, 1);
	assert!(sender_lsp.node.get_and_clear_pending_msg_events().is_empty());
	sender_lsp.node.process_pending_htlc_forwards();
	let mut events = sender_lsp.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 1);
	let ev = remove_first_msg_event_to_node(&invoice_server.node.get_our_node_id(), &mut events);
	check_added_monitors(&sender_lsp, 1);

	let path: &[&Node] = &[invoice_server, recipient];
	let args = PassAlongPathArgs::new(sender_lsp, path, amt_msat, payment_hash, ev)
 .with_dummy_tlvs(&[DummyTlvs::default(); DEFAULT_PAYMENT_DUMMY_HOPS]);
	let claimable_ev = do_pass_along_path(args).unwrap();

	let route: &[&[&Node]] = &[&[sender_lsp, invoice_server, recipient]];
	let keysend_preimage = extract_payment_preimage(&claimable_ev);
	let (res, _) =
 claim_payment_along_route(ClaimAlongRouteArgs::new(sender, route, keysend_preimage));
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn held_htlc_timeout() {
	// Test that if a held HTLC doesn't get released for a long time, it will eventually time out and
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix async release before HTLC decode#4542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

tnull
wants to merge
1
commit into

from

 Closed


Fix async release before HTLC decode
#4542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


162 changes: 162 additions & 0 deletions
lightning/src/ln/async_payments_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2879,6 +2879,7 @@ fn async_payment_e2e() {
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	let payment_hash =
 lock_in_htlc_for_static_invoice(&static_invoice_om, peer_node_id, sender, sender_lsp);

Expand DownExpand Up@@ -2965,6 +2966,167 @@ fn async_payment_e2e() {
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn async_payment_e2e_release_before_hold_registered() {
	let chanmon_cfgs = create_chanmon_cfgs(4);
	let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);

	let (sender_cfg, recipient_cfg) = (often_offline_node_cfg(), often_offline_node_cfg());
	let mut sender_lsp_cfg = test_default_channel_config();
	sender_lsp_cfg.enable_htlc_hold = true;
	let mut invoice_server_cfg = test_default_channel_config();
	invoice_server_cfg.accept_forwards_to_priv_channels = true;

	let node_chanmgrs = create_node_chanmgrs(
 4,
 &node_cfgs,
 &[Some(sender_cfg), Some(sender_lsp_cfg), Some(invoice_server_cfg), Some(recipient_cfg)],
	);
	let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
	create_unannounced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0);
	create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1_000_000, 0);
	create_unannounced_chan_between_nodes_with_value(&nodes, 2, 3, 1_000_000, 0);
	unify_blockheight_across_nodes(&nodes);
	let sender = &nodes[0];
	let sender_lsp = &nodes[1];
	let invoice_server = &nodes[2];
	let recipient = &nodes[3];

	let recipient_id = vec![42; 32];
	let inv_server_paths =
 invoice_server.node.blinded_paths_for_async_recipient(recipient_id.clone(), None).unwrap();
	recipient.node.set_paths_to_static_invoice_server(inv_server_paths).unwrap();
	expect_offer_paths_requests(recipient, &[invoice_server, sender_lsp]);
	let invoice_flow_res =
 pass_static_invoice_server_messages(invoice_server, recipient, recipient_id.clone());
	let invoice = invoice_flow_res.invoice;
	let invreq_path = invoice_flow_res.invoice_request_path;

	let offer = recipient.node.get_async_receive_offer().unwrap();
	recipient.node.peer_disconnected(invoice_server.node.get_our_node_id());
	recipient.onion_messenger.peer_disconnected(invoice_server.node.get_our_node_id());
	invoice_server.node.peer_disconnected(recipient.node.get_our_node_id());
	invoice_server.onion_messenger.peer_disconnected(recipient.node.get_our_node_id());

	let amt_msat = 5000;
	let payment_id = PaymentId([1; 32]);
	sender.node.pay_for_offer(&offer, Some(amt_msat), payment_id, Default::default()).unwrap();

	let (peer_id, invreq_om) = extract_invoice_request_om(sender, &[sender_lsp, invoice_server]);
	invoice_server.onion_messenger.handle_onion_message(peer_id, &invreq_om);

	let mut events = invoice_server.node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	let (reply_path, invreq) = match events.pop().unwrap() {
 Event::StaticInvoiceRequested {
 recipient_id: ev_id, reply_path, invoice_request, ..
 } => {
 assert_eq!(recipient_id, ev_id);
 (reply_path, invoice_request)
 },
 _ => panic!(),
	};

	invoice_server
 .node
 .respond_to_static_invoice_request(invoice, reply_path, invreq, invreq_path)
 .unwrap();
	let (peer_node_id, static_invoice_om, static_invoice) =
 extract_static_invoice_om(invoice_server, &[sender_lsp, sender]);

	// Lock the HTLC in with the sender LSP, but stop before the sender's revoke_and_ack is handed
	// back to the sender LSP. This reproduces the real LSPS2 timing where ReleaseHeldHtlc can
	// arrive before the held HTLC is queued for decode on the sender LSP.
	sender.onion_messenger.handle_onion_message(peer_node_id, &static_invoice_om);
	check_added_monitors(sender, 1);
	let commitment_update = get_htlc_update_msgs(&sender, &sender_lsp.node.get_our_node_id());
	let update_add = commitment_update.update_add_htlcs[0].clone();
	let payment_hash = update_add.payment_hash;
	assert!(update_add.hold_htlc.is_some());
	sender_lsp.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
	sender_lsp.node.handle_commitment_signed_batch_test(
 sender.node.get_our_node_id(),
 &commitment_update.commitment_signed,
	);
	check_added_monitors(sender_lsp, 1);
	let (_extra_msg_option, sender_raa, sender_holding_cell_htlcs) =
 do_main_commitment_signed_dance(sender_lsp, sender, false);
	assert!(sender_holding_cell_htlcs.is_empty());

	let held_htlc_om_to_inv_server = sender
 .onion_messenger
 .next_onion_message_for_peer(invoice_server.node.get_our_node_id())
 .unwrap();
	invoice_server
 .onion_messenger
 .handle_onion_message(sender_lsp.node.get_our_node_id(), &held_htlc_om_to_inv_server);

	let mut events_rc = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events_rc.borrow_mut().push(e)));
	let events = events_rc.into_inner();
	let held_htlc_om = events
 .into_iter()
 .find_map(|ev| {
 if let Event::OnionMessageIntercepted { message, .. } = ev {
 let peeled_onion = recipient.onion_messenger.peel_onion_message(&message).unwrap();
 if matches!(
 peeled_onion,
 PeeledOnion::Offers(OffersMessage::InvoiceRequest { .. }, _, _)
 ) {
 return None;
 }

 assert!(matches!(
 peeled_onion,
 PeeledOnion::AsyncPayments(AsyncPaymentsMessage::HeldHtlcAvailable(_), _, _)
 ));
 Some(message)
 } else {
 None
 }
 })
 .unwrap();

	let mut reconnect_args = ReconnectArgs::new(invoice_server, recipient);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let events = core::cell::RefCell::new(Vec::new());
	invoice_server.onion_messenger.process_pending_events(&|e| Ok(events.borrow_mut().push(e)));
	assert_eq!(events.borrow().len(), 1);
	assert!(matches!(events.into_inner().pop().unwrap(), Event::OnionMessagePeerConnected { .. }));
	expect_offer_paths_requests(recipient, &[invoice_server]);

	recipient
 .onion_messenger
 .handle_onion_message(invoice_server.node.get_our_node_id(), &held_htlc_om);
	let (peer_id, release_htlc_om) =
 extract_release_htlc_oms(recipient, &[sender, sender_lsp, invoice_server]).pop().unwrap();
	sender_lsp.onion_messenger.handle_onion_message(peer_id, &release_htlc_om);

	// Now let the sender LSP receive the sender's revoke_and_ack and continue processing the held
	// HTLC. Old code drops the release request above; fixed code remembers it and forwards the HTLC.
	sender_lsp.node.handle_revoke_and_ack(sender.node.get_our_node_id(), &sender_raa);
	check_added_monitors(sender_lsp, 1);
	assert!(sender_lsp.node.get_and_clear_pending_msg_events().is_empty());
	sender_lsp.node.process_pending_htlc_forwards();
	let mut events = sender_lsp.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 1);
	let ev = remove_first_msg_event_to_node(&invoice_server.node.get_our_node_id(), &mut events);
	check_added_monitors(&sender_lsp, 1);

	let path: &[&Node] = &[invoice_server, recipient];
	let args = PassAlongPathArgs::new(sender_lsp, path, amt_msat, payment_hash, ev)
 .with_dummy_tlvs(&[DummyTlvs::default(); DEFAULT_PAYMENT_DUMMY_HOPS]);
	let claimable_ev = do_pass_along_path(args).unwrap();

	let route: &[&[&Node]] = &[&[sender_lsp, invoice_server, recipient]];
	let keysend_preimage = extract_payment_preimage(&claimable_ev);
	let (res, _) =
 claim_payment_along_route(ClaimAlongRouteArgs::new(sender, route, keysend_preimage));
	assert_eq!(res, Some(PaidBolt12Invoice::StaticInvoice(static_invoice)));
}

#[test]
fn held_htlc_timeout() {
	// Test that if a held HTLC doesn't get released for a long time, it will eventually time out and
Expand Down
Loading
Loading