Wipe empty entries from actions_blocking_raa_monitor_updates#4537

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

Merged
valentinewallace merged 1 commit into from
Apr 7, 2026
Merged

Wipe empty entries from actions_blocking_raa_monitor_updates#4537

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
21 changes: 13 additions & 8 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9818,12 +9818,12 @@ impl<
{
if let Some(peer_state_mtx) = per_peer_state.get(&node_id) {
let mut peer_state = peer_state_mtx.lock().unwrap();
if let Some(blockers) = peer_state
let entry = peer_state
.actions_blocking_raa_monitor_updates
.get_mut(&channel_id)
{
.entry(channel_id);
if let btree_map::Entry::Occupied(mut entry) = entry {
let mut found_blocker = false;
blockers.retain(|iter| {
entry.get_mut().retain(|iter| {
// Note that we could actually be blocked, in
// which case we need to only remove the one
// blocker which was added duplicatively.
Expand All@@ -9833,6 +9833,9 @@ impl<
}
*iter != blocker || !first_blocker
});
if entry.get().is_empty() {
entry.remove();
}
debug_assert!(found_blocker);
}
} else {
Expand DownExpand Up@@ -15251,10 +15254,12 @@ impl<
let peer_state = &mut *peer_state_lck;
if let Some(blocker) = completed_blocker.take() {
// Only do this on the first iteration of the loop.
if let Some(blockers) = peer_state.actions_blocking_raa_monitor_updates
.get_mut(&channel_id)
{
blockers.retain(|iter| iter != &blocker);
let entry = peer_state.actions_blocking_raa_monitor_updates.entry(channel_id);
if let btree_map::Entry::Occupied(mut entry) = entry {
entry.get_mut().retain(|iter| iter != &blocker);
if entry.get().is_empty() {
entry.remove();
}
}
}

Expand Down
66 changes: 66 additions & 0 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,3 +10168,69 @@ pub fn test_dust_exposure_holding_cell_assertion() {
// Now that everything has settled, make sure the channels still work with a simple claim.
claim_payment(&nodes[2], &[&nodes[1]], payment_preimage_cb);
}

#[test]
fn test_dup_htlc_claim_onchain_and_offchain() {

@valentinewallacevalentinewallaceApr 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this could go in a different test file

// Tests what happens if we receive a claim first offchain, then see a counterparty broadcast
// their commitment transaction and re-claim the same HTLC on-chain. This was never broken, but
// the very specific ordering in this test did hit a debug assertion failure.
let chanmon_cfgs = create_chanmon_cfgs(3);
let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
let legacy_cfg = test_legacy_channel_config();
let node_chanmgrs = create_node_chanmgrs(
3,
&node_cfgs,
&[Some(legacy_cfg.clone()), Some(legacy_cfg.clone()), Some(legacy_cfg)],
);
let nodes = create_network(3, &node_cfgs, &node_chanmgrs);

let node_b_id = nodes[1].node.get_our_node_id();
let node_c_id = nodes[2].node.get_our_node_id();

create_announced_chan_between_nodes(&nodes, 0, 1);
let chan_bc = create_announced_chan_between_nodes(&nodes, 1, 2);

// Route payment A -> B -> C.
let (payment_preimage, payment_hash, _, _) =
route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

// C claims the payment.
nodes[2].node.claim_funds(payment_preimage);
expect_payment_claimed!(nodes[2], payment_hash, 1_000_000);
check_added_monitors(&nodes[2], 1);

// Deliver only C's update_fulfill_htlc to B (NOT the commitment_signed). B learns
// the preimage and claims from A (adding an RAA blocker on B-C via
// internal_update_fulfill_htlc, then removing it when the A-B monitor update completes
// and the EmitEventOptionAndFreeOtherChannel action runs).
let cs_updates = get_htlc_update_msgs(&nodes[2], &node_b_id);
nodes[1].node.handle_update_fulfill_htlc(node_c_id, cs_updates.update_fulfill_htlcs[0].clone());
check_added_monitors(&nodes[1], 1);

// Ignore B's attempts to claim the HTLC from A.
nodes[1].node.get_and_clear_pending_msg_events();

// Get C's commitment transactions. C's commitment includes the HTLC and C has
// an HTLC-success transaction (claiming with preimage). Mine both on B.
let cs_txn = get_local_commitment_txn!(nodes[2], chan_bc.2);
assert!(cs_txn.len() >= 2, "Expected commitment + HTLC-success tx, got {}", cs_txn.len());

// Mine C's commitment on B. B sees the counterparty commitment on-chain.
mine_transaction(&nodes[1], &cs_txn[0]);
check_closed_broadcast(&nodes[1], 1, true);
check_added_monitors(&nodes[1], 1);
let events = nodes[1].node.get_and_clear_pending_events();
assert!(
events.iter().any(|e| matches!(e, Event::ChannelClosed { .. })),
"Expected ChannelClosed event"
);

// Mine C's HTLC-success transaction. B's monitor sees the preimage being used on-chain
// and generates an HTLCEvent with the preimage.
mine_transaction(&nodes[1], &cs_txn[1]);

// Advance past ANTI_REORG_DELAY so the on-chain HTLC resolution matures. This triggers
// the monitor to generate an HTLCEvent with the preimage via process_pending_monitor_events,
// which calls claim_funds_internal a second time.
connect_blocks(&nodes[1], ANTI_REORG_DELAY);
}
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
Wipe empty entries from actions_blocking_raa_monitor_updates#4537

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

 Merged

valentinewallace
merged 1 commit into

from

Apr 7, 2026
 Merged


Wipe empty entries from actions_blocking_raa_monitor_updates#4537
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


21 changes: 13 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9818,12 +9818,12 @@ impl<
 {
 if let Some(peer_state_mtx) = per_peer_state.get(&node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
if let Some(blockers) = peer_state
 let entry = peer_state
 .actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 .entry(channel_id);
if let btree_map::Entry::Occupied(mut entry) = entry {
 let mut found_blocker = false;
blockers.retain(|iter| {
entry.get_mut().retain(|iter| {
 // Note that we could actually be blocked, in
 // which case we need to only remove the one
 // blocker which was added duplicatively.
Expand All@@ -9833,6 +9833,9 @@ impl<
 }
 *iter != blocker || !first_blocker
 });
 if entry.get().is_empty() {
 entry.remove();
 }
 debug_assert!(found_blocker);
 }
 } else {
Expand DownExpand Up@@ -15251,10 +15254,12 @@ impl<
 let peer_state = &mut *peer_state_lck;
 if let Some(blocker) = completed_blocker.take() {
 // Only do this on the first iteration of the loop.
 if let Some(blockers) = peer_state.actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 blockers.retain(|iter| iter != &blocker);
 let entry = peer_state.actions_blocking_raa_monitor_updates.entry(channel_id);
 if let btree_map::Entry::Occupied(mut entry) = entry {
 entry.get_mut().retain(|iter| iter != &blocker);
 if entry.get().is_empty() {
 entry.remove();
 }
 }
 }

Expand Down

66 changes: 66 additions & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,3 +10168,69 @@ pub fn test_dust_exposure_holding_cell_assertion() {
	// Now that everything has settled, make sure the channels still work with a simple claim.
	claim_payment(&nodes[2], &[&nodes[1]], payment_preimage_cb);
}

#[test]
fn test_dup_htlc_claim_onchain_and_offchain() {
@valentinewallacevalentinewallaceApr 7, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this could go in a different test file
	// Tests what happens if we receive a claim first offchain, then see a counterparty broadcast
	// their commitment transaction and re-claim the same HTLC on-chain. This was never broken, but
	// the very specific ordering in this test did hit a debug assertion failure.
	let chanmon_cfgs = create_chanmon_cfgs(3);
	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	let legacy_cfg = test_legacy_channel_config();
	let node_chanmgrs = create_node_chanmgrs(
 3,
 &node_cfgs,
 &[Some(legacy_cfg.clone()), Some(legacy_cfg.clone()), Some(legacy_cfg)],
	);
	let nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	let node_b_id = nodes[1].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	create_announced_chan_between_nodes(&nodes, 0, 1);
	let chan_bc = create_announced_chan_between_nodes(&nodes, 1, 2);

	// Route payment A -> B -> C.
	let (payment_preimage, payment_hash, _, _) =
 route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	// C claims the payment.
	nodes[2].node.claim_funds(payment_preimage);
	expect_payment_claimed!(nodes[2], payment_hash, 1_000_000);
	check_added_monitors(&nodes[2], 1);

	// Deliver only C's update_fulfill_htlc to B (NOT the commitment_signed). B learns
	// the preimage and claims from A (adding an RAA blocker on B-C via
	// internal_update_fulfill_htlc, then removing it when the A-B monitor update completes
	// and the EmitEventOptionAndFreeOtherChannel action runs).
	let cs_updates = get_htlc_update_msgs(&nodes[2], &node_b_id);
	nodes[1].node.handle_update_fulfill_htlc(node_c_id, cs_updates.update_fulfill_htlcs[0].clone());
	check_added_monitors(&nodes[1], 1);

	// Ignore B's attempts to claim the HTLC from A.
	nodes[1].node.get_and_clear_pending_msg_events();

	// Get C's commitment transactions. C's commitment includes the HTLC and C has
	// an HTLC-success transaction (claiming with preimage). Mine both on B.
	let cs_txn = get_local_commitment_txn!(nodes[2], chan_bc.2);
	assert!(cs_txn.len() >= 2, "Expected commitment + HTLC-success tx, got {}", cs_txn.len());

	// Mine C's commitment on B. B sees the counterparty commitment on-chain.
	mine_transaction(&nodes[1], &cs_txn[0]);
	check_closed_broadcast(&nodes[1], 1, true);
	check_added_monitors(&nodes[1], 1);
	let events = nodes[1].node.get_and_clear_pending_events();
	assert!(
 events.iter().any(|e| matches!(e, Event::ChannelClosed { .. })),
 "Expected ChannelClosed event"
	);

	// Mine C's HTLC-success transaction. B's monitor sees the preimage being used on-chain
	// and generates an HTLCEvent with the preimage.
	mine_transaction(&nodes[1], &cs_txn[1]);

	// Advance past ANTI_REORG_DELAY so the on-chain HTLC resolution matures. This triggers
	// the monitor to generate an HTLCEvent with the preimage via process_pending_monitor_events,
	// which calls claim_funds_internal a second time.
	connect_blocks(&nodes[1], ANTI_REORG_DELAY);
}
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
Wipe empty entries from actions_blocking_raa_monitor_updates#4537

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

 Merged

valentinewallace
merged 1 commit into

from

Apr 7, 2026
 Merged


Wipe empty entries from actions_blocking_raa_monitor_updates#4537
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


21 changes: 13 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9818,12 +9818,12 @@ impl<
 {
 if let Some(peer_state_mtx) = per_peer_state.get(&node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
if let Some(blockers) = peer_state
 let entry = peer_state
 .actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 .entry(channel_id);
if let btree_map::Entry::Occupied(mut entry) = entry {
 let mut found_blocker = false;
blockers.retain(|iter| {
entry.get_mut().retain(|iter| {
 // Note that we could actually be blocked, in
 // which case we need to only remove the one
 // blocker which was added duplicatively.
Expand All@@ -9833,6 +9833,9 @@ impl<
 }
 *iter != blocker || !first_blocker
 });
 if entry.get().is_empty() {
 entry.remove();
 }
 debug_assert!(found_blocker);
 }
 } else {
Expand DownExpand Up@@ -15251,10 +15254,12 @@ impl<
 let peer_state = &mut *peer_state_lck;
 if let Some(blocker) = completed_blocker.take() {
 // Only do this on the first iteration of the loop.
 if let Some(blockers) = peer_state.actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 blockers.retain(|iter| iter != &blocker);
 let entry = peer_state.actions_blocking_raa_monitor_updates.entry(channel_id);
 if let btree_map::Entry::Occupied(mut entry) = entry {
 entry.get_mut().retain(|iter| iter != &blocker);
 if entry.get().is_empty() {
 entry.remove();
 }
 }
 }

Expand Down

66 changes: 66 additions & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,3 +10168,69 @@ pub fn test_dust_exposure_holding_cell_assertion() {
	// Now that everything has settled, make sure the channels still work with a simple claim.
	claim_payment(&nodes[2], &[&nodes[1]], payment_preimage_cb);
}

#[test]
fn test_dup_htlc_claim_onchain_and_offchain() {
@valentinewallacevalentinewallaceApr 7, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this could go in a different test file
	// Tests what happens if we receive a claim first offchain, then see a counterparty broadcast
	// their commitment transaction and re-claim the same HTLC on-chain. This was never broken, but
	// the very specific ordering in this test did hit a debug assertion failure.
	let chanmon_cfgs = create_chanmon_cfgs(3);
	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	let legacy_cfg = test_legacy_channel_config();
	let node_chanmgrs = create_node_chanmgrs(
 3,
 &node_cfgs,
 &[Some(legacy_cfg.clone()), Some(legacy_cfg.clone()), Some(legacy_cfg)],
	);
	let nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	let node_b_id = nodes[1].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	create_announced_chan_between_nodes(&nodes, 0, 1);
	let chan_bc = create_announced_chan_between_nodes(&nodes, 1, 2);

	// Route payment A -> B -> C.
	let (payment_preimage, payment_hash, _, _) =
 route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	// C claims the payment.
	nodes[2].node.claim_funds(payment_preimage);
	expect_payment_claimed!(nodes[2], payment_hash, 1_000_000);
	check_added_monitors(&nodes[2], 1);

	// Deliver only C's update_fulfill_htlc to B (NOT the commitment_signed). B learns
	// the preimage and claims from A (adding an RAA blocker on B-C via
	// internal_update_fulfill_htlc, then removing it when the A-B monitor update completes
	// and the EmitEventOptionAndFreeOtherChannel action runs).
	let cs_updates = get_htlc_update_msgs(&nodes[2], &node_b_id);
	nodes[1].node.handle_update_fulfill_htlc(node_c_id, cs_updates.update_fulfill_htlcs[0].clone());
	check_added_monitors(&nodes[1], 1);

	// Ignore B's attempts to claim the HTLC from A.
	nodes[1].node.get_and_clear_pending_msg_events();

	// Get C's commitment transactions. C's commitment includes the HTLC and C has
	// an HTLC-success transaction (claiming with preimage). Mine both on B.
	let cs_txn = get_local_commitment_txn!(nodes[2], chan_bc.2);
	assert!(cs_txn.len() >= 2, "Expected commitment + HTLC-success tx, got {}", cs_txn.len());

	// Mine C's commitment on B. B sees the counterparty commitment on-chain.
	mine_transaction(&nodes[1], &cs_txn[0]);
	check_closed_broadcast(&nodes[1], 1, true);
	check_added_monitors(&nodes[1], 1);
	let events = nodes[1].node.get_and_clear_pending_events();
	assert!(
 events.iter().any(|e| matches!(e, Event::ChannelClosed { .. })),
 "Expected ChannelClosed event"
	);

	// Mine C's HTLC-success transaction. B's monitor sees the preimage being used on-chain
	// and generates an HTLCEvent with the preimage.
	mine_transaction(&nodes[1], &cs_txn[1]);

	// Advance past ANTI_REORG_DELAY so the on-chain HTLC resolution matures. This triggers
	// the monitor to generate an HTLCEvent with the preimage via process_pending_monitor_events,
	// which calls claim_funds_internal a second time.
	connect_blocks(&nodes[1], ANTI_REORG_DELAY);
}
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
Wipe empty entries from actions_blocking_raa_monitor_updates#4537

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

 Merged

valentinewallace
merged 1 commit into

from

Apr 7, 2026
 Merged


Wipe empty entries from actions_blocking_raa_monitor_updates#4537
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


21 changes: 13 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9818,12 +9818,12 @@ impl<
 {
 if let Some(peer_state_mtx) = per_peer_state.get(&node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
if let Some(blockers) = peer_state
 let entry = peer_state
 .actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 .entry(channel_id);
if let btree_map::Entry::Occupied(mut entry) = entry {
 let mut found_blocker = false;
blockers.retain(|iter| {
entry.get_mut().retain(|iter| {
 // Note that we could actually be blocked, in
 // which case we need to only remove the one
 // blocker which was added duplicatively.
Expand All@@ -9833,6 +9833,9 @@ impl<
 }
 *iter != blocker || !first_blocker
 });
 if entry.get().is_empty() {
 entry.remove();
 }
 debug_assert!(found_blocker);
 }
 } else {
Expand DownExpand Up@@ -15251,10 +15254,12 @@ impl<
 let peer_state = &mut *peer_state_lck;
 if let Some(blocker) = completed_blocker.take() {
 // Only do this on the first iteration of the loop.
 if let Some(blockers) = peer_state.actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 blockers.retain(|iter| iter != &blocker);
 let entry = peer_state.actions_blocking_raa_monitor_updates.entry(channel_id);
 if let btree_map::Entry::Occupied(mut entry) = entry {
 entry.get_mut().retain(|iter| iter != &blocker);
 if entry.get().is_empty() {
 entry.remove();
 }
 }
 }

Expand Down

66 changes: 66 additions & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,3 +10168,69 @@ pub fn test_dust_exposure_holding_cell_assertion() {
	// Now that everything has settled, make sure the channels still work with a simple claim.
	claim_payment(&nodes[2], &[&nodes[1]], payment_preimage_cb);
}

#[test]
fn test_dup_htlc_claim_onchain_and_offchain() {
@valentinewallacevalentinewallaceApr 7, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this could go in a different test file
	// Tests what happens if we receive a claim first offchain, then see a counterparty broadcast
	// their commitment transaction and re-claim the same HTLC on-chain. This was never broken, but
	// the very specific ordering in this test did hit a debug assertion failure.
	let chanmon_cfgs = create_chanmon_cfgs(3);
	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	let legacy_cfg = test_legacy_channel_config();
	let node_chanmgrs = create_node_chanmgrs(
 3,
 &node_cfgs,
 &[Some(legacy_cfg.clone()), Some(legacy_cfg.clone()), Some(legacy_cfg)],
	);
	let nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	let node_b_id = nodes[1].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	create_announced_chan_between_nodes(&nodes, 0, 1);
	let chan_bc = create_announced_chan_between_nodes(&nodes, 1, 2);

	// Route payment A -> B -> C.
	let (payment_preimage, payment_hash, _, _) =
 route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	// C claims the payment.
	nodes[2].node.claim_funds(payment_preimage);
	expect_payment_claimed!(nodes[2], payment_hash, 1_000_000);
	check_added_monitors(&nodes[2], 1);

	// Deliver only C's update_fulfill_htlc to B (NOT the commitment_signed). B learns
	// the preimage and claims from A (adding an RAA blocker on B-C via
	// internal_update_fulfill_htlc, then removing it when the A-B monitor update completes
	// and the EmitEventOptionAndFreeOtherChannel action runs).
	let cs_updates = get_htlc_update_msgs(&nodes[2], &node_b_id);
	nodes[1].node.handle_update_fulfill_htlc(node_c_id, cs_updates.update_fulfill_htlcs[0].clone());
	check_added_monitors(&nodes[1], 1);

	// Ignore B's attempts to claim the HTLC from A.
	nodes[1].node.get_and_clear_pending_msg_events();

	// Get C's commitment transactions. C's commitment includes the HTLC and C has
	// an HTLC-success transaction (claiming with preimage). Mine both on B.
	let cs_txn = get_local_commitment_txn!(nodes[2], chan_bc.2);
	assert!(cs_txn.len() >= 2, "Expected commitment + HTLC-success tx, got {}", cs_txn.len());

	// Mine C's commitment on B. B sees the counterparty commitment on-chain.
	mine_transaction(&nodes[1], &cs_txn[0]);
	check_closed_broadcast(&nodes[1], 1, true);
	check_added_monitors(&nodes[1], 1);
	let events = nodes[1].node.get_and_clear_pending_events();
	assert!(
 events.iter().any(|e| matches!(e, Event::ChannelClosed { .. })),
 "Expected ChannelClosed event"
	);

	// Mine C's HTLC-success transaction. B's monitor sees the preimage being used on-chain
	// and generates an HTLCEvent with the preimage.
	mine_transaction(&nodes[1], &cs_txn[1]);

	// Advance past ANTI_REORG_DELAY so the on-chain HTLC resolution matures. This triggers
	// the monitor to generate an HTLCEvent with the preimage via process_pending_monitor_events,
	// which calls claim_funds_internal a second time.
	connect_blocks(&nodes[1], ANTI_REORG_DELAY);
}
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
Wipe empty entries from actions_blocking_raa_monitor_updates#4537

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

 Merged

valentinewallace
merged 1 commit into

from

Apr 7, 2026
 Merged


Wipe empty entries from actions_blocking_raa_monitor_updates#4537
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


21 changes: 13 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9818,12 +9818,12 @@ impl<
 {
 if let Some(peer_state_mtx) = per_peer_state.get(&node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
if let Some(blockers) = peer_state
 let entry = peer_state
 .actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 .entry(channel_id);
if let btree_map::Entry::Occupied(mut entry) = entry {
 let mut found_blocker = false;
blockers.retain(|iter| {
entry.get_mut().retain(|iter| {
 // Note that we could actually be blocked, in
 // which case we need to only remove the one
 // blocker which was added duplicatively.
Expand All@@ -9833,6 +9833,9 @@ impl<
 }
 *iter != blocker || !first_blocker
 });
 if entry.get().is_empty() {
 entry.remove();
 }
 debug_assert!(found_blocker);
 }
 } else {
Expand DownExpand Up@@ -15251,10 +15254,12 @@ impl<
 let peer_state = &mut *peer_state_lck;
 if let Some(blocker) = completed_blocker.take() {
 // Only do this on the first iteration of the loop.
 if let Some(blockers) = peer_state.actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 blockers.retain(|iter| iter != &blocker);
 let entry = peer_state.actions_blocking_raa_monitor_updates.entry(channel_id);
 if let btree_map::Entry::Occupied(mut entry) = entry {
 entry.get_mut().retain(|iter| iter != &blocker);
 if entry.get().is_empty() {
 entry.remove();
 }
 }
 }

Expand Down

66 changes: 66 additions & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,3 +10168,69 @@ pub fn test_dust_exposure_holding_cell_assertion() {
	// Now that everything has settled, make sure the channels still work with a simple claim.
	claim_payment(&nodes[2], &[&nodes[1]], payment_preimage_cb);
}

#[test]
fn test_dup_htlc_claim_onchain_and_offchain() {
@valentinewallacevalentinewallaceApr 7, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this could go in a different test file
	// Tests what happens if we receive a claim first offchain, then see a counterparty broadcast
	// their commitment transaction and re-claim the same HTLC on-chain. This was never broken, but
	// the very specific ordering in this test did hit a debug assertion failure.
	let chanmon_cfgs = create_chanmon_cfgs(3);
	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	let legacy_cfg = test_legacy_channel_config();
	let node_chanmgrs = create_node_chanmgrs(
 3,
 &node_cfgs,
 &[Some(legacy_cfg.clone()), Some(legacy_cfg.clone()), Some(legacy_cfg)],
	);
	let nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	let node_b_id = nodes[1].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	create_announced_chan_between_nodes(&nodes, 0, 1);
	let chan_bc = create_announced_chan_between_nodes(&nodes, 1, 2);

	// Route payment A -> B -> C.
	let (payment_preimage, payment_hash, _, _) =
 route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	// C claims the payment.
	nodes[2].node.claim_funds(payment_preimage);
	expect_payment_claimed!(nodes[2], payment_hash, 1_000_000);
	check_added_monitors(&nodes[2], 1);

	// Deliver only C's update_fulfill_htlc to B (NOT the commitment_signed). B learns
	// the preimage and claims from A (adding an RAA blocker on B-C via
	// internal_update_fulfill_htlc, then removing it when the A-B monitor update completes
	// and the EmitEventOptionAndFreeOtherChannel action runs).
	let cs_updates = get_htlc_update_msgs(&nodes[2], &node_b_id);
	nodes[1].node.handle_update_fulfill_htlc(node_c_id, cs_updates.update_fulfill_htlcs[0].clone());
	check_added_monitors(&nodes[1], 1);

	// Ignore B's attempts to claim the HTLC from A.
	nodes[1].node.get_and_clear_pending_msg_events();

	// Get C's commitment transactions. C's commitment includes the HTLC and C has
	// an HTLC-success transaction (claiming with preimage). Mine both on B.
	let cs_txn = get_local_commitment_txn!(nodes[2], chan_bc.2);
	assert!(cs_txn.len() >= 2, "Expected commitment + HTLC-success tx, got {}", cs_txn.len());

	// Mine C's commitment on B. B sees the counterparty commitment on-chain.
	mine_transaction(&nodes[1], &cs_txn[0]);
	check_closed_broadcast(&nodes[1], 1, true);
	check_added_monitors(&nodes[1], 1);
	let events = nodes[1].node.get_and_clear_pending_events();
	assert!(
 events.iter().any(|e| matches!(e, Event::ChannelClosed { .. })),
 "Expected ChannelClosed event"
	);

	// Mine C's HTLC-success transaction. B's monitor sees the preimage being used on-chain
	// and generates an HTLCEvent with the preimage.
	mine_transaction(&nodes[1], &cs_txn[1]);

	// Advance past ANTI_REORG_DELAY so the on-chain HTLC resolution matures. This triggers
	// the monitor to generate an HTLCEvent with the preimage via process_pending_monitor_events,
	// which calls claim_funds_internal a second time.
	connect_blocks(&nodes[1], ANTI_REORG_DELAY);
}
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
Wipe empty entries from actions_blocking_raa_monitor_updates#4537

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

 Merged

valentinewallace
merged 1 commit into

from

Apr 7, 2026
 Merged


Wipe empty entries from actions_blocking_raa_monitor_updates#4537
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


21 changes: 13 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9818,12 +9818,12 @@ impl<
 {
 if let Some(peer_state_mtx) = per_peer_state.get(&node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
if let Some(blockers) = peer_state
 let entry = peer_state
 .actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 .entry(channel_id);
if let btree_map::Entry::Occupied(mut entry) = entry {
 let mut found_blocker = false;
blockers.retain(|iter| {
entry.get_mut().retain(|iter| {
 // Note that we could actually be blocked, in
 // which case we need to only remove the one
 // blocker which was added duplicatively.
Expand All@@ -9833,6 +9833,9 @@ impl<
 }
 *iter != blocker || !first_blocker
 });
 if entry.get().is_empty() {
 entry.remove();
 }
 debug_assert!(found_blocker);
 }
 } else {
Expand DownExpand Up@@ -15251,10 +15254,12 @@ impl<
 let peer_state = &mut *peer_state_lck;
 if let Some(blocker) = completed_blocker.take() {
 // Only do this on the first iteration of the loop.
 if let Some(blockers) = peer_state.actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 blockers.retain(|iter| iter != &blocker);
 let entry = peer_state.actions_blocking_raa_monitor_updates.entry(channel_id);
 if let btree_map::Entry::Occupied(mut entry) = entry {
 entry.get_mut().retain(|iter| iter != &blocker);
 if entry.get().is_empty() {
 entry.remove();
 }
 }
 }

Expand Down

66 changes: 66 additions & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,3 +10168,69 @@ pub fn test_dust_exposure_holding_cell_assertion() {
	// Now that everything has settled, make sure the channels still work with a simple claim.
	claim_payment(&nodes[2], &[&nodes[1]], payment_preimage_cb);
}

#[test]
fn test_dup_htlc_claim_onchain_and_offchain() {
@valentinewallacevalentinewallaceApr 7, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this could go in a different test file
	// Tests what happens if we receive a claim first offchain, then see a counterparty broadcast
	// their commitment transaction and re-claim the same HTLC on-chain. This was never broken, but
	// the very specific ordering in this test did hit a debug assertion failure.
	let chanmon_cfgs = create_chanmon_cfgs(3);
	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	let legacy_cfg = test_legacy_channel_config();
	let node_chanmgrs = create_node_chanmgrs(
 3,
 &node_cfgs,
 &[Some(legacy_cfg.clone()), Some(legacy_cfg.clone()), Some(legacy_cfg)],
	);
	let nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	let node_b_id = nodes[1].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	create_announced_chan_between_nodes(&nodes, 0, 1);
	let chan_bc = create_announced_chan_between_nodes(&nodes, 1, 2);

	// Route payment A -> B -> C.
	let (payment_preimage, payment_hash, _, _) =
 route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	// C claims the payment.
	nodes[2].node.claim_funds(payment_preimage);
	expect_payment_claimed!(nodes[2], payment_hash, 1_000_000);
	check_added_monitors(&nodes[2], 1);

	// Deliver only C's update_fulfill_htlc to B (NOT the commitment_signed). B learns
	// the preimage and claims from A (adding an RAA blocker on B-C via
	// internal_update_fulfill_htlc, then removing it when the A-B monitor update completes
	// and the EmitEventOptionAndFreeOtherChannel action runs).
	let cs_updates = get_htlc_update_msgs(&nodes[2], &node_b_id);
	nodes[1].node.handle_update_fulfill_htlc(node_c_id, cs_updates.update_fulfill_htlcs[0].clone());
	check_added_monitors(&nodes[1], 1);

	// Ignore B's attempts to claim the HTLC from A.
	nodes[1].node.get_and_clear_pending_msg_events();

	// Get C's commitment transactions. C's commitment includes the HTLC and C has
	// an HTLC-success transaction (claiming with preimage). Mine both on B.
	let cs_txn = get_local_commitment_txn!(nodes[2], chan_bc.2);
	assert!(cs_txn.len() >= 2, "Expected commitment + HTLC-success tx, got {}", cs_txn.len());

	// Mine C's commitment on B. B sees the counterparty commitment on-chain.
	mine_transaction(&nodes[1], &cs_txn[0]);
	check_closed_broadcast(&nodes[1], 1, true);
	check_added_monitors(&nodes[1], 1);
	let events = nodes[1].node.get_and_clear_pending_events();
	assert!(
 events.iter().any(|e| matches!(e, Event::ChannelClosed { .. })),
 "Expected ChannelClosed event"
	);

	// Mine C's HTLC-success transaction. B's monitor sees the preimage being used on-chain
	// and generates an HTLCEvent with the preimage.
	mine_transaction(&nodes[1], &cs_txn[1]);

	// Advance past ANTI_REORG_DELAY so the on-chain HTLC resolution matures. This triggers
	// the monitor to generate an HTLCEvent with the preimage via process_pending_monitor_events,
	// which calls claim_funds_internal a second time.
	connect_blocks(&nodes[1], ANTI_REORG_DELAY);
}
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
Wipe empty entries from actions_blocking_raa_monitor_updates#4537

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

 Merged

valentinewallace
merged 1 commit into

from

Apr 7, 2026
 Merged


Wipe empty entries from actions_blocking_raa_monitor_updates#4537
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


21 changes: 13 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9818,12 +9818,12 @@ impl<
 {
 if let Some(peer_state_mtx) = per_peer_state.get(&node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
if let Some(blockers) = peer_state
 let entry = peer_state
 .actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 .entry(channel_id);
if let btree_map::Entry::Occupied(mut entry) = entry {
 let mut found_blocker = false;
blockers.retain(|iter| {
entry.get_mut().retain(|iter| {
 // Note that we could actually be blocked, in
 // which case we need to only remove the one
 // blocker which was added duplicatively.
Expand All@@ -9833,6 +9833,9 @@ impl<
 }
 *iter != blocker || !first_blocker
 });
 if entry.get().is_empty() {
 entry.remove();
 }
 debug_assert!(found_blocker);
 }
 } else {
Expand DownExpand Up@@ -15251,10 +15254,12 @@ impl<
 let peer_state = &mut *peer_state_lck;
 if let Some(blocker) = completed_blocker.take() {
 // Only do this on the first iteration of the loop.
 if let Some(blockers) = peer_state.actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 blockers.retain(|iter| iter != &blocker);
 let entry = peer_state.actions_blocking_raa_monitor_updates.entry(channel_id);
 if let btree_map::Entry::Occupied(mut entry) = entry {
 entry.get_mut().retain(|iter| iter != &blocker);
 if entry.get().is_empty() {
 entry.remove();
 }
 }
 }

Expand Down

66 changes: 66 additions & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,3 +10168,69 @@ pub fn test_dust_exposure_holding_cell_assertion() {
	// Now that everything has settled, make sure the channels still work with a simple claim.
	claim_payment(&nodes[2], &[&nodes[1]], payment_preimage_cb);
}

#[test]
fn test_dup_htlc_claim_onchain_and_offchain() {
@valentinewallacevalentinewallaceApr 7, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this could go in a different test file
	// Tests what happens if we receive a claim first offchain, then see a counterparty broadcast
	// their commitment transaction and re-claim the same HTLC on-chain. This was never broken, but
	// the very specific ordering in this test did hit a debug assertion failure.
	let chanmon_cfgs = create_chanmon_cfgs(3);
	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	let legacy_cfg = test_legacy_channel_config();
	let node_chanmgrs = create_node_chanmgrs(
 3,
 &node_cfgs,
 &[Some(legacy_cfg.clone()), Some(legacy_cfg.clone()), Some(legacy_cfg)],
	);
	let nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	let node_b_id = nodes[1].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	create_announced_chan_between_nodes(&nodes, 0, 1);
	let chan_bc = create_announced_chan_between_nodes(&nodes, 1, 2);

	// Route payment A -> B -> C.
	let (payment_preimage, payment_hash, _, _) =
 route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	// C claims the payment.
	nodes[2].node.claim_funds(payment_preimage);
	expect_payment_claimed!(nodes[2], payment_hash, 1_000_000);
	check_added_monitors(&nodes[2], 1);

	// Deliver only C's update_fulfill_htlc to B (NOT the commitment_signed). B learns
	// the preimage and claims from A (adding an RAA blocker on B-C via
	// internal_update_fulfill_htlc, then removing it when the A-B monitor update completes
	// and the EmitEventOptionAndFreeOtherChannel action runs).
	let cs_updates = get_htlc_update_msgs(&nodes[2], &node_b_id);
	nodes[1].node.handle_update_fulfill_htlc(node_c_id, cs_updates.update_fulfill_htlcs[0].clone());
	check_added_monitors(&nodes[1], 1);

	// Ignore B's attempts to claim the HTLC from A.
	nodes[1].node.get_and_clear_pending_msg_events();

	// Get C's commitment transactions. C's commitment includes the HTLC and C has
	// an HTLC-success transaction (claiming with preimage). Mine both on B.
	let cs_txn = get_local_commitment_txn!(nodes[2], chan_bc.2);
	assert!(cs_txn.len() >= 2, "Expected commitment + HTLC-success tx, got {}", cs_txn.len());

	// Mine C's commitment on B. B sees the counterparty commitment on-chain.
	mine_transaction(&nodes[1], &cs_txn[0]);
	check_closed_broadcast(&nodes[1], 1, true);
	check_added_monitors(&nodes[1], 1);
	let events = nodes[1].node.get_and_clear_pending_events();
	assert!(
 events.iter().any(|e| matches!(e, Event::ChannelClosed { .. })),
 "Expected ChannelClosed event"
	);

	// Mine C's HTLC-success transaction. B's monitor sees the preimage being used on-chain
	// and generates an HTLCEvent with the preimage.
	mine_transaction(&nodes[1], &cs_txn[1]);

	// Advance past ANTI_REORG_DELAY so the on-chain HTLC resolution matures. This triggers
	// the monitor to generate an HTLCEvent with the preimage via process_pending_monitor_events,
	// which calls claim_funds_internal a second time.
	connect_blocks(&nodes[1], ANTI_REORG_DELAY);
}
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
Wipe empty entries from actions_blocking_raa_monitor_updates#4537

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

 Merged

valentinewallace
merged 1 commit into

from

Apr 7, 2026
 Merged


Wipe empty entries from actions_blocking_raa_monitor_updates#4537
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


21 changes: 13 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9818,12 +9818,12 @@ impl<
 {
 if let Some(peer_state_mtx) = per_peer_state.get(&node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
if let Some(blockers) = peer_state
 let entry = peer_state
 .actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 .entry(channel_id);
if let btree_map::Entry::Occupied(mut entry) = entry {
 let mut found_blocker = false;
blockers.retain(|iter| {
entry.get_mut().retain(|iter| {
 // Note that we could actually be blocked, in
 // which case we need to only remove the one
 // blocker which was added duplicatively.
Expand All@@ -9833,6 +9833,9 @@ impl<
 }
 *iter != blocker || !first_blocker
 });
 if entry.get().is_empty() {
 entry.remove();
 }
 debug_assert!(found_blocker);
 }
 } else {
Expand DownExpand Up@@ -15251,10 +15254,12 @@ impl<
 let peer_state = &mut *peer_state_lck;
 if let Some(blocker) = completed_blocker.take() {
 // Only do this on the first iteration of the loop.
 if let Some(blockers) = peer_state.actions_blocking_raa_monitor_updates
 .get_mut(&channel_id)
 {
 blockers.retain(|iter| iter != &blocker);
 let entry = peer_state.actions_blocking_raa_monitor_updates.entry(channel_id);
 if let btree_map::Entry::Occupied(mut entry) = entry {
 entry.get_mut().retain(|iter| iter != &blocker);
 if entry.get().is_empty() {
 entry.remove();
 }
 }
 }

Expand Down

66 changes: 66 additions & 0 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,3 +10168,69 @@ pub fn test_dust_exposure_holding_cell_assertion() {
	// Now that everything has settled, make sure the channels still work with a simple claim.
	claim_payment(&nodes[2], &[&nodes[1]], payment_preimage_cb);
}

#[test]
fn test_dup_htlc_claim_onchain_and_offchain() {
@valentinewallacevalentinewallaceApr 7, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this could go in a different test file
	// Tests what happens if we receive a claim first offchain, then see a counterparty broadcast
	// their commitment transaction and re-claim the same HTLC on-chain. This was never broken, but
	// the very specific ordering in this test did hit a debug assertion failure.
	let chanmon_cfgs = create_chanmon_cfgs(3);
	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
	let legacy_cfg = test_legacy_channel_config();
	let node_chanmgrs = create_node_chanmgrs(
 3,
 &node_cfgs,
 &[Some(legacy_cfg.clone()), Some(legacy_cfg.clone()), Some(legacy_cfg)],
	);
	let nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	let node_b_id = nodes[1].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	create_announced_chan_between_nodes(&nodes, 0, 1);
	let chan_bc = create_announced_chan_between_nodes(&nodes, 1, 2);

	// Route payment A -> B -> C.
	let (payment_preimage, payment_hash, _, _) =
 route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	// C claims the payment.
	nodes[2].node.claim_funds(payment_preimage);
	expect_payment_claimed!(nodes[2], payment_hash, 1_000_000);
	check_added_monitors(&nodes[2], 1);

	// Deliver only C's update_fulfill_htlc to B (NOT the commitment_signed). B learns
	// the preimage and claims from A (adding an RAA blocker on B-C via
	// internal_update_fulfill_htlc, then removing it when the A-B monitor update completes
	// and the EmitEventOptionAndFreeOtherChannel action runs).
	let cs_updates = get_htlc_update_msgs(&nodes[2], &node_b_id);
	nodes[1].node.handle_update_fulfill_htlc(node_c_id, cs_updates.update_fulfill_htlcs[0].clone());
	check_added_monitors(&nodes[1], 1);

	// Ignore B's attempts to claim the HTLC from A.
	nodes[1].node.get_and_clear_pending_msg_events();

	// Get C's commitment transactions. C's commitment includes the HTLC and C has
	// an HTLC-success transaction (claiming with preimage). Mine both on B.
	let cs_txn = get_local_commitment_txn!(nodes[2], chan_bc.2);
	assert!(cs_txn.len() >= 2, "Expected commitment + HTLC-success tx, got {}", cs_txn.len());

	// Mine C's commitment on B. B sees the counterparty commitment on-chain.
	mine_transaction(&nodes[1], &cs_txn[0]);
	check_closed_broadcast(&nodes[1], 1, true);
	check_added_monitors(&nodes[1], 1);
	let events = nodes[1].node.get_and_clear_pending_events();
	assert!(
 events.iter().any(|e| matches!(e, Event::ChannelClosed { .. })),
 "Expected ChannelClosed event"
	);

	// Mine C's HTLC-success transaction. B's monitor sees the preimage being used on-chain
	// and generates an HTLCEvent with the preimage.
	mine_transaction(&nodes[1], &cs_txn[1]);

	// Advance past ANTI_REORG_DELAY so the on-chain HTLC resolution matures. This triggers
	// the monitor to generate an HTLCEvent with the preimage via process_pending_monitor_events,
	// which calls claim_funds_internal a second time.
	connect_blocks(&nodes[1], ANTI_REORG_DELAY);
}
Loading