Skip to content

Fix deadlock when closing an unavailable channel#2657

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
TheBlueMatt merged 1 commit into from
Oct 12, 2023
Merged

Fix deadlock when closing an unavailable channel #2657

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
46 changes: 44 additions & 2 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2616,6 +2616,8 @@ where
// it does not exist for this peer. Either way, we can attempt to force-close it.
//
// An appropriate error will be returned for non-existence of the channel if that's the case.
mem::drop(peer_state_lock);
mem::drop(per_peer_state);
return self.force_close_channel_with_peer(&channel_id, counterparty_node_id, None, false).map(|_| ())
},
}
Expand DownExpand Up@@ -4001,7 +4003,7 @@ where
for channel_id in channel_ids {
if !peer_state.has_channel(channel_id) {
return Err(APIError::ChannelUnavailable {
err: format!("Channel with ID {} was not found for the passed counterparty_node_id {}", channel_id, counterparty_node_id),
err: format!("Channel with id {} not found for the passed counterparty node_id {}", channel_id, counterparty_node_id),

@TheBlueMattTheBlueMattOct 11, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Not sure I understand this change.

@Fedeparma74Fedeparma74Oct 11, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

It is needed for the test to pass, as I'm checking the APIError::ChannelUnavailable with the same expected message in check_channel_unavailable_error()

@TheBlueMattTheBlueMattOct 12, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Ah, okay.

});
};
}
Expand DownExpand Up@@ -4112,7 +4114,7 @@ where
next_hop_channel_id, next_node_id)
}),
None => return Err(APIError::ChannelUnavailable {
err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
err: format!("Channel with id {} not found for the passed counterparty node_id {}",

@TheBlueMattTheBlueMattOct 11, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Or this one, we dont usually add periods.

next_hop_channel_id, next_node_id)
})
}
Expand DownExpand Up@@ -10750,6 +10752,16 @@ mod tests {
check_api_error_message(expected_message, res_err)
}

fn check_channel_unavailable_error<T>(res_err: Result<T, APIError>, expected_channel_id: ChannelId, peer_node_id: PublicKey) {
let expected_message = format!("Channel with id {} not found for the passed counterparty node_id {}", expected_channel_id, peer_node_id);
check_api_error_message(expected_message, res_err)
}

fn check_api_misuse_error<T>(res_err: Result<T, APIError>) {
let expected_message = "No such channel awaiting to be accepted.".to_string();
check_api_error_message(expected_message, res_err)
}

fn check_api_error_message<T>(expected_err_message: String, res_err: Result<T, APIError>) {
match res_err {
Err(APIError::APIMisuseError { err }) => {
Expand DownExpand Up@@ -10794,6 +10806,36 @@ mod tests {
check_unkown_peer_error(nodes[0].node.update_channel_config(&unkown_public_key, &[channel_id], &ChannelConfig::default()), unkown_public_key);
}

#[test]
fn test_api_calls_with_unavailable_channel() {
// Tests that our API functions that expects a `counterparty_node_id` and a `channel_id`
// as input, behaves as expected if the `counterparty_node_id` is a known peer in the
// `ChannelManager::per_peer_state` map, but the peer state doesn't contain a channel with
// the given `channel_id`.
let chanmon_cfg = create_chanmon_cfgs(2);
let node_cfg = create_node_cfgs(2, &chanmon_cfg);
let node_chanmgr = create_node_chanmgrs(2, &node_cfg, &[None, None]);
let nodes = create_network(2, &node_cfg, &node_chanmgr);

let counterparty_node_id = nodes[1].node.get_our_node_id();

// Dummy values
let channel_id = ChannelId::from_bytes([4; 32]);

// Test the API functions.
check_api_misuse_error(nodes[0].node.accept_inbound_channel(&channel_id, &counterparty_node_id, 42));

check_channel_unavailable_error(nodes[0].node.close_channel(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

check_channel_unavailable_error(nodes[0].node.force_close_broadcasting_latest_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

check_channel_unavailable_error(nodes[0].node.force_close_without_broadcasting_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

check_channel_unavailable_error(nodes[0].node.forward_intercepted_htlc(InterceptId([0; 32]), &channel_id, counterparty_node_id, 1_000_000), channel_id, counterparty_node_id);

check_channel_unavailable_error(nodes[0].node.update_channel_config(&counterparty_node_id, &[channel_id], &ChannelConfig::default()), channel_id, counterparty_node_id);
}

#[test]
fn test_connection_limiting() {
// Test that we limit un-channel'd peers and un-funded channels properly.
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/payment_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1906,7 +1906,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
// Check for unknown channel id error.
let unknown_chan_id_err = nodes[1].node.forward_intercepted_htlc(intercept_id, &ChannelId::from_bytes([42; 32]), nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap_err();
assert_eq!(unknown_chan_id_err , APIError::ChannelUnavailable {
err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
err: format!("Channel with id {} not found for the passed counterparty node_id {}",
log_bytes!([42; 32]), nodes[2].node.get_our_node_id()) });

if test == InterceptTest::Fail {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix deadlock when closing an unavailable channel by Fedeparma74 · Pull Request #2657 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix deadlock when closing an unavailable channel#2657

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

TheBlueMatt
merged 1 commit into

from

Oct 12, 2023
 Merged


Fix deadlock when closing an unavailable channel
#2657
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


46 changes: 44 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2616,6 +2616,8 @@ where
 // it does not exist for this peer. Either way, we can attempt to force-close it.
 //
 // An appropriate error will be returned for non-existence of the channel if that's the case.
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 return self.force_close_channel_with_peer(&channel_id, counterparty_node_id, None, false).map(|_| ())
 },
 }
Expand DownExpand Up@@ -4001,7 +4003,7 @@ where
 for channel_id in channel_ids {
 if !peer_state.has_channel(channel_id) {
 return Err(APIError::ChannelUnavailable {
 err: format!("Channel with ID {} was not found for the passed counterparty_node_id {}", channel_id, counterparty_node_id),
 err: format!("Channel with id {} not found for the passed counterparty node_id {}", channel_id, counterparty_node_id),
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Not sure I understand this change.
@Fedeparma74Fedeparma74Oct 11, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It is needed for the test to pass, as I'm checking the APIError::ChannelUnavailable with the same expected message in check_channel_unavailable_error()
@TheBlueMattTheBlueMattOct 12, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Ah, okay.
 });
 };
 }
Expand DownExpand Up@@ -4112,7 +4114,7 @@ where
 next_hop_channel_id, next_node_id)
 }),
 None => return Err(APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Or this one, we dont usually add periods.
 next_hop_channel_id, next_node_id)
 })
 }
Expand DownExpand Up@@ -10750,6 +10752,16 @@ mod tests {
 check_api_error_message(expected_message, res_err)
	}

	fn check_channel_unavailable_error<T>(res_err: Result<T, APIError>, expected_channel_id: ChannelId, peer_node_id: PublicKey) {
 let expected_message = format!("Channel with id {} not found for the passed counterparty node_id {}", expected_channel_id, peer_node_id);
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_misuse_error<T>(res_err: Result<T, APIError>) {
 let expected_message = "No such channel awaiting to be accepted.".to_string();
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_error_message<T>(expected_err_message: String, res_err: Result<T, APIError>) {
 match res_err {
 Err(APIError::APIMisuseError { err }) => {
Expand DownExpand Up@@ -10794,6 +10806,36 @@ mod tests {
 check_unkown_peer_error(nodes[0].node.update_channel_config(&unkown_public_key, &[channel_id], &ChannelConfig::default()), unkown_public_key);
	}

	#[test]
	fn test_api_calls_with_unavailable_channel() {
 // Tests that our API functions that expects a `counterparty_node_id` and a `channel_id`
 // as input, behaves as expected if the `counterparty_node_id` is a known peer in the
 // `ChannelManager::per_peer_state` map, but the peer state doesn't contain a channel with
 // the given `channel_id`.
 let chanmon_cfg = create_chanmon_cfgs(2);
 let node_cfg = create_node_cfgs(2, &chanmon_cfg);
 let node_chanmgr = create_node_chanmgrs(2, &node_cfg, &[None, None]);
 let nodes = create_network(2, &node_cfg, &node_chanmgr);

 let counterparty_node_id = nodes[1].node.get_our_node_id();

 // Dummy values
 let channel_id = ChannelId::from_bytes([4; 32]);

 // Test the API functions.
 check_api_misuse_error(nodes[0].node.accept_inbound_channel(&channel_id, &counterparty_node_id, 42));

 check_channel_unavailable_error(nodes[0].node.close_channel(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_broadcasting_latest_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_without_broadcasting_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.forward_intercepted_htlc(InterceptId([0; 32]), &channel_id, counterparty_node_id, 1_000_000), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.update_channel_config(&counterparty_node_id, &[channel_id], &ChannelConfig::default()), channel_id, counterparty_node_id);
	}

	#[test]
	fn test_connection_limiting() {
 // Test that we limit un-channel'd peers and un-funded channels properly.
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1906,7 +1906,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	// Check for unknown channel id error.
	let unknown_chan_id_err = nodes[1].node.forward_intercepted_htlc(intercept_id, &ChannelId::from_bytes([42; 32]), nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap_err();
	assert_eq!(unknown_chan_id_err , APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
 log_bytes!([42; 32]), nodes[2].node.get_our_node_id()) });

	if test == InterceptTest::Fail {
Expand Down

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

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

TheBlueMatt
merged 1 commit into

from

Oct 12, 2023
 Merged


Fix deadlock when closing an unavailable channel
#2657
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


46 changes: 44 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2616,6 +2616,8 @@ where
 // it does not exist for this peer. Either way, we can attempt to force-close it.
 //
 // An appropriate error will be returned for non-existence of the channel if that's the case.
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 return self.force_close_channel_with_peer(&channel_id, counterparty_node_id, None, false).map(|_| ())
 },
 }
Expand DownExpand Up@@ -4001,7 +4003,7 @@ where
 for channel_id in channel_ids {
 if !peer_state.has_channel(channel_id) {
 return Err(APIError::ChannelUnavailable {
 err: format!("Channel with ID {} was not found for the passed counterparty_node_id {}", channel_id, counterparty_node_id),
 err: format!("Channel with id {} not found for the passed counterparty node_id {}", channel_id, counterparty_node_id),
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Not sure I understand this change.
@Fedeparma74Fedeparma74Oct 11, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It is needed for the test to pass, as I'm checking the APIError::ChannelUnavailable with the same expected message in check_channel_unavailable_error()
@TheBlueMattTheBlueMattOct 12, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Ah, okay.
 });
 };
 }
Expand DownExpand Up@@ -4112,7 +4114,7 @@ where
 next_hop_channel_id, next_node_id)
 }),
 None => return Err(APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Or this one, we dont usually add periods.
 next_hop_channel_id, next_node_id)
 })
 }
Expand DownExpand Up@@ -10750,6 +10752,16 @@ mod tests {
 check_api_error_message(expected_message, res_err)
	}

	fn check_channel_unavailable_error<T>(res_err: Result<T, APIError>, expected_channel_id: ChannelId, peer_node_id: PublicKey) {
 let expected_message = format!("Channel with id {} not found for the passed counterparty node_id {}", expected_channel_id, peer_node_id);
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_misuse_error<T>(res_err: Result<T, APIError>) {
 let expected_message = "No such channel awaiting to be accepted.".to_string();
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_error_message<T>(expected_err_message: String, res_err: Result<T, APIError>) {
 match res_err {
 Err(APIError::APIMisuseError { err }) => {
Expand DownExpand Up@@ -10794,6 +10806,36 @@ mod tests {
 check_unkown_peer_error(nodes[0].node.update_channel_config(&unkown_public_key, &[channel_id], &ChannelConfig::default()), unkown_public_key);
	}

	#[test]
	fn test_api_calls_with_unavailable_channel() {
 // Tests that our API functions that expects a `counterparty_node_id` and a `channel_id`
 // as input, behaves as expected if the `counterparty_node_id` is a known peer in the
 // `ChannelManager::per_peer_state` map, but the peer state doesn't contain a channel with
 // the given `channel_id`.
 let chanmon_cfg = create_chanmon_cfgs(2);
 let node_cfg = create_node_cfgs(2, &chanmon_cfg);
 let node_chanmgr = create_node_chanmgrs(2, &node_cfg, &[None, None]);
 let nodes = create_network(2, &node_cfg, &node_chanmgr);

 let counterparty_node_id = nodes[1].node.get_our_node_id();

 // Dummy values
 let channel_id = ChannelId::from_bytes([4; 32]);

 // Test the API functions.
 check_api_misuse_error(nodes[0].node.accept_inbound_channel(&channel_id, &counterparty_node_id, 42));

 check_channel_unavailable_error(nodes[0].node.close_channel(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_broadcasting_latest_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_without_broadcasting_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.forward_intercepted_htlc(InterceptId([0; 32]), &channel_id, counterparty_node_id, 1_000_000), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.update_channel_config(&counterparty_node_id, &[channel_id], &ChannelConfig::default()), channel_id, counterparty_node_id);
	}

	#[test]
	fn test_connection_limiting() {
 // Test that we limit un-channel'd peers and un-funded channels properly.
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1906,7 +1906,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	// Check for unknown channel id error.
	let unknown_chan_id_err = nodes[1].node.forward_intercepted_htlc(intercept_id, &ChannelId::from_bytes([42; 32]), nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap_err();
	assert_eq!(unknown_chan_id_err , APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
 log_bytes!([42; 32]), nodes[2].node.get_our_node_id()) });

	if test == InterceptTest::Fail {
Expand Down

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

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

TheBlueMatt
merged 1 commit into

from

Oct 12, 2023
 Merged


Fix deadlock when closing an unavailable channel
#2657
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


46 changes: 44 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2616,6 +2616,8 @@ where
 // it does not exist for this peer. Either way, we can attempt to force-close it.
 //
 // An appropriate error will be returned for non-existence of the channel if that's the case.
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 return self.force_close_channel_with_peer(&channel_id, counterparty_node_id, None, false).map(|_| ())
 },
 }
Expand DownExpand Up@@ -4001,7 +4003,7 @@ where
 for channel_id in channel_ids {
 if !peer_state.has_channel(channel_id) {
 return Err(APIError::ChannelUnavailable {
 err: format!("Channel with ID {} was not found for the passed counterparty_node_id {}", channel_id, counterparty_node_id),
 err: format!("Channel with id {} not found for the passed counterparty node_id {}", channel_id, counterparty_node_id),
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Not sure I understand this change.
@Fedeparma74Fedeparma74Oct 11, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It is needed for the test to pass, as I'm checking the APIError::ChannelUnavailable with the same expected message in check_channel_unavailable_error()
@TheBlueMattTheBlueMattOct 12, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Ah, okay.
 });
 };
 }
Expand DownExpand Up@@ -4112,7 +4114,7 @@ where
 next_hop_channel_id, next_node_id)
 }),
 None => return Err(APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Or this one, we dont usually add periods.
 next_hop_channel_id, next_node_id)
 })
 }
Expand DownExpand Up@@ -10750,6 +10752,16 @@ mod tests {
 check_api_error_message(expected_message, res_err)
	}

	fn check_channel_unavailable_error<T>(res_err: Result<T, APIError>, expected_channel_id: ChannelId, peer_node_id: PublicKey) {
 let expected_message = format!("Channel with id {} not found for the passed counterparty node_id {}", expected_channel_id, peer_node_id);
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_misuse_error<T>(res_err: Result<T, APIError>) {
 let expected_message = "No such channel awaiting to be accepted.".to_string();
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_error_message<T>(expected_err_message: String, res_err: Result<T, APIError>) {
 match res_err {
 Err(APIError::APIMisuseError { err }) => {
Expand DownExpand Up@@ -10794,6 +10806,36 @@ mod tests {
 check_unkown_peer_error(nodes[0].node.update_channel_config(&unkown_public_key, &[channel_id], &ChannelConfig::default()), unkown_public_key);
	}

	#[test]
	fn test_api_calls_with_unavailable_channel() {
 // Tests that our API functions that expects a `counterparty_node_id` and a `channel_id`
 // as input, behaves as expected if the `counterparty_node_id` is a known peer in the
 // `ChannelManager::per_peer_state` map, but the peer state doesn't contain a channel with
 // the given `channel_id`.
 let chanmon_cfg = create_chanmon_cfgs(2);
 let node_cfg = create_node_cfgs(2, &chanmon_cfg);
 let node_chanmgr = create_node_chanmgrs(2, &node_cfg, &[None, None]);
 let nodes = create_network(2, &node_cfg, &node_chanmgr);

 let counterparty_node_id = nodes[1].node.get_our_node_id();

 // Dummy values
 let channel_id = ChannelId::from_bytes([4; 32]);

 // Test the API functions.
 check_api_misuse_error(nodes[0].node.accept_inbound_channel(&channel_id, &counterparty_node_id, 42));

 check_channel_unavailable_error(nodes[0].node.close_channel(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_broadcasting_latest_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_without_broadcasting_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.forward_intercepted_htlc(InterceptId([0; 32]), &channel_id, counterparty_node_id, 1_000_000), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.update_channel_config(&counterparty_node_id, &[channel_id], &ChannelConfig::default()), channel_id, counterparty_node_id);
	}

	#[test]
	fn test_connection_limiting() {
 // Test that we limit un-channel'd peers and un-funded channels properly.
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1906,7 +1906,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	// Check for unknown channel id error.
	let unknown_chan_id_err = nodes[1].node.forward_intercepted_htlc(intercept_id, &ChannelId::from_bytes([42; 32]), nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap_err();
	assert_eq!(unknown_chan_id_err , APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
 log_bytes!([42; 32]), nodes[2].node.get_our_node_id()) });

	if test == InterceptTest::Fail {
Expand Down

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

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

TheBlueMatt
merged 1 commit into

from

Oct 12, 2023
 Merged


Fix deadlock when closing an unavailable channel
#2657
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


46 changes: 44 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2616,6 +2616,8 @@ where
 // it does not exist for this peer. Either way, we can attempt to force-close it.
 //
 // An appropriate error will be returned for non-existence of the channel if that's the case.
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 return self.force_close_channel_with_peer(&channel_id, counterparty_node_id, None, false).map(|_| ())
 },
 }
Expand DownExpand Up@@ -4001,7 +4003,7 @@ where
 for channel_id in channel_ids {
 if !peer_state.has_channel(channel_id) {
 return Err(APIError::ChannelUnavailable {
 err: format!("Channel with ID {} was not found for the passed counterparty_node_id {}", channel_id, counterparty_node_id),
 err: format!("Channel with id {} not found for the passed counterparty node_id {}", channel_id, counterparty_node_id),
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Not sure I understand this change.
@Fedeparma74Fedeparma74Oct 11, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It is needed for the test to pass, as I'm checking the APIError::ChannelUnavailable with the same expected message in check_channel_unavailable_error()
@TheBlueMattTheBlueMattOct 12, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Ah, okay.
 });
 };
 }
Expand DownExpand Up@@ -4112,7 +4114,7 @@ where
 next_hop_channel_id, next_node_id)
 }),
 None => return Err(APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Or this one, we dont usually add periods.
 next_hop_channel_id, next_node_id)
 })
 }
Expand DownExpand Up@@ -10750,6 +10752,16 @@ mod tests {
 check_api_error_message(expected_message, res_err)
	}

	fn check_channel_unavailable_error<T>(res_err: Result<T, APIError>, expected_channel_id: ChannelId, peer_node_id: PublicKey) {
 let expected_message = format!("Channel with id {} not found for the passed counterparty node_id {}", expected_channel_id, peer_node_id);
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_misuse_error<T>(res_err: Result<T, APIError>) {
 let expected_message = "No such channel awaiting to be accepted.".to_string();
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_error_message<T>(expected_err_message: String, res_err: Result<T, APIError>) {
 match res_err {
 Err(APIError::APIMisuseError { err }) => {
Expand DownExpand Up@@ -10794,6 +10806,36 @@ mod tests {
 check_unkown_peer_error(nodes[0].node.update_channel_config(&unkown_public_key, &[channel_id], &ChannelConfig::default()), unkown_public_key);
	}

	#[test]
	fn test_api_calls_with_unavailable_channel() {
 // Tests that our API functions that expects a `counterparty_node_id` and a `channel_id`
 // as input, behaves as expected if the `counterparty_node_id` is a known peer in the
 // `ChannelManager::per_peer_state` map, but the peer state doesn't contain a channel with
 // the given `channel_id`.
 let chanmon_cfg = create_chanmon_cfgs(2);
 let node_cfg = create_node_cfgs(2, &chanmon_cfg);
 let node_chanmgr = create_node_chanmgrs(2, &node_cfg, &[None, None]);
 let nodes = create_network(2, &node_cfg, &node_chanmgr);

 let counterparty_node_id = nodes[1].node.get_our_node_id();

 // Dummy values
 let channel_id = ChannelId::from_bytes([4; 32]);

 // Test the API functions.
 check_api_misuse_error(nodes[0].node.accept_inbound_channel(&channel_id, &counterparty_node_id, 42));

 check_channel_unavailable_error(nodes[0].node.close_channel(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_broadcasting_latest_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_without_broadcasting_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.forward_intercepted_htlc(InterceptId([0; 32]), &channel_id, counterparty_node_id, 1_000_000), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.update_channel_config(&counterparty_node_id, &[channel_id], &ChannelConfig::default()), channel_id, counterparty_node_id);
	}

	#[test]
	fn test_connection_limiting() {
 // Test that we limit un-channel'd peers and un-funded channels properly.
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1906,7 +1906,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	// Check for unknown channel id error.
	let unknown_chan_id_err = nodes[1].node.forward_intercepted_htlc(intercept_id, &ChannelId::from_bytes([42; 32]), nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap_err();
	assert_eq!(unknown_chan_id_err , APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
 log_bytes!([42; 32]), nodes[2].node.get_our_node_id()) });

	if test == InterceptTest::Fail {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix deadlock when closing an unavailable channel by Fedeparma74 · Pull Request #2657 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix deadlock when closing an unavailable channel#2657

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

TheBlueMatt
merged 1 commit into

from

Oct 12, 2023
 Merged


Fix deadlock when closing an unavailable channel
#2657
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


46 changes: 44 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2616,6 +2616,8 @@ where
 // it does not exist for this peer. Either way, we can attempt to force-close it.
 //
 // An appropriate error will be returned for non-existence of the channel if that's the case.
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 return self.force_close_channel_with_peer(&channel_id, counterparty_node_id, None, false).map(|_| ())
 },
 }
Expand DownExpand Up@@ -4001,7 +4003,7 @@ where
 for channel_id in channel_ids {
 if !peer_state.has_channel(channel_id) {
 return Err(APIError::ChannelUnavailable {
 err: format!("Channel with ID {} was not found for the passed counterparty_node_id {}", channel_id, counterparty_node_id),
 err: format!("Channel with id {} not found for the passed counterparty node_id {}", channel_id, counterparty_node_id),
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Not sure I understand this change.
@Fedeparma74Fedeparma74Oct 11, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It is needed for the test to pass, as I'm checking the APIError::ChannelUnavailable with the same expected message in check_channel_unavailable_error()
@TheBlueMattTheBlueMattOct 12, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Ah, okay.
 });
 };
 }
Expand DownExpand Up@@ -4112,7 +4114,7 @@ where
 next_hop_channel_id, next_node_id)
 }),
 None => return Err(APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Or this one, we dont usually add periods.
 next_hop_channel_id, next_node_id)
 })
 }
Expand DownExpand Up@@ -10750,6 +10752,16 @@ mod tests {
 check_api_error_message(expected_message, res_err)
	}

	fn check_channel_unavailable_error<T>(res_err: Result<T, APIError>, expected_channel_id: ChannelId, peer_node_id: PublicKey) {
 let expected_message = format!("Channel with id {} not found for the passed counterparty node_id {}", expected_channel_id, peer_node_id);
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_misuse_error<T>(res_err: Result<T, APIError>) {
 let expected_message = "No such channel awaiting to be accepted.".to_string();
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_error_message<T>(expected_err_message: String, res_err: Result<T, APIError>) {
 match res_err {
 Err(APIError::APIMisuseError { err }) => {
Expand DownExpand Up@@ -10794,6 +10806,36 @@ mod tests {
 check_unkown_peer_error(nodes[0].node.update_channel_config(&unkown_public_key, &[channel_id], &ChannelConfig::default()), unkown_public_key);
	}

	#[test]
	fn test_api_calls_with_unavailable_channel() {
 // Tests that our API functions that expects a `counterparty_node_id` and a `channel_id`
 // as input, behaves as expected if the `counterparty_node_id` is a known peer in the
 // `ChannelManager::per_peer_state` map, but the peer state doesn't contain a channel with
 // the given `channel_id`.
 let chanmon_cfg = create_chanmon_cfgs(2);
 let node_cfg = create_node_cfgs(2, &chanmon_cfg);
 let node_chanmgr = create_node_chanmgrs(2, &node_cfg, &[None, None]);
 let nodes = create_network(2, &node_cfg, &node_chanmgr);

 let counterparty_node_id = nodes[1].node.get_our_node_id();

 // Dummy values
 let channel_id = ChannelId::from_bytes([4; 32]);

 // Test the API functions.
 check_api_misuse_error(nodes[0].node.accept_inbound_channel(&channel_id, &counterparty_node_id, 42));

 check_channel_unavailable_error(nodes[0].node.close_channel(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_broadcasting_latest_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_without_broadcasting_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.forward_intercepted_htlc(InterceptId([0; 32]), &channel_id, counterparty_node_id, 1_000_000), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.update_channel_config(&counterparty_node_id, &[channel_id], &ChannelConfig::default()), channel_id, counterparty_node_id);
	}

	#[test]
	fn test_connection_limiting() {
 // Test that we limit un-channel'd peers and un-funded channels properly.
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1906,7 +1906,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	// Check for unknown channel id error.
	let unknown_chan_id_err = nodes[1].node.forward_intercepted_htlc(intercept_id, &ChannelId::from_bytes([42; 32]), nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap_err();
	assert_eq!(unknown_chan_id_err , APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
 log_bytes!([42; 32]), nodes[2].node.get_our_node_id()) });

	if test == InterceptTest::Fail {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix deadlock when closing an unavailable channel by Fedeparma74 · Pull Request #2657 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix deadlock when closing an unavailable channel#2657

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

TheBlueMatt
merged 1 commit into

from

Oct 12, 2023
 Merged


Fix deadlock when closing an unavailable channel
#2657
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


46 changes: 44 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2616,6 +2616,8 @@ where
 // it does not exist for this peer. Either way, we can attempt to force-close it.
 //
 // An appropriate error will be returned for non-existence of the channel if that's the case.
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 return self.force_close_channel_with_peer(&channel_id, counterparty_node_id, None, false).map(|_| ())
 },
 }
Expand DownExpand Up@@ -4001,7 +4003,7 @@ where
 for channel_id in channel_ids {
 if !peer_state.has_channel(channel_id) {
 return Err(APIError::ChannelUnavailable {
 err: format!("Channel with ID {} was not found for the passed counterparty_node_id {}", channel_id, counterparty_node_id),
 err: format!("Channel with id {} not found for the passed counterparty node_id {}", channel_id, counterparty_node_id),
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Not sure I understand this change.
@Fedeparma74Fedeparma74Oct 11, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It is needed for the test to pass, as I'm checking the APIError::ChannelUnavailable with the same expected message in check_channel_unavailable_error()
@TheBlueMattTheBlueMattOct 12, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Ah, okay.
 });
 };
 }
Expand DownExpand Up@@ -4112,7 +4114,7 @@ where
 next_hop_channel_id, next_node_id)
 }),
 None => return Err(APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Or this one, we dont usually add periods.
 next_hop_channel_id, next_node_id)
 })
 }
Expand DownExpand Up@@ -10750,6 +10752,16 @@ mod tests {
 check_api_error_message(expected_message, res_err)
	}

	fn check_channel_unavailable_error<T>(res_err: Result<T, APIError>, expected_channel_id: ChannelId, peer_node_id: PublicKey) {
 let expected_message = format!("Channel with id {} not found for the passed counterparty node_id {}", expected_channel_id, peer_node_id);
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_misuse_error<T>(res_err: Result<T, APIError>) {
 let expected_message = "No such channel awaiting to be accepted.".to_string();
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_error_message<T>(expected_err_message: String, res_err: Result<T, APIError>) {
 match res_err {
 Err(APIError::APIMisuseError { err }) => {
Expand DownExpand Up@@ -10794,6 +10806,36 @@ mod tests {
 check_unkown_peer_error(nodes[0].node.update_channel_config(&unkown_public_key, &[channel_id], &ChannelConfig::default()), unkown_public_key);
	}

	#[test]
	fn test_api_calls_with_unavailable_channel() {
 // Tests that our API functions that expects a `counterparty_node_id` and a `channel_id`
 // as input, behaves as expected if the `counterparty_node_id` is a known peer in the
 // `ChannelManager::per_peer_state` map, but the peer state doesn't contain a channel with
 // the given `channel_id`.
 let chanmon_cfg = create_chanmon_cfgs(2);
 let node_cfg = create_node_cfgs(2, &chanmon_cfg);
 let node_chanmgr = create_node_chanmgrs(2, &node_cfg, &[None, None]);
 let nodes = create_network(2, &node_cfg, &node_chanmgr);

 let counterparty_node_id = nodes[1].node.get_our_node_id();

 // Dummy values
 let channel_id = ChannelId::from_bytes([4; 32]);

 // Test the API functions.
 check_api_misuse_error(nodes[0].node.accept_inbound_channel(&channel_id, &counterparty_node_id, 42));

 check_channel_unavailable_error(nodes[0].node.close_channel(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_broadcasting_latest_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_without_broadcasting_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.forward_intercepted_htlc(InterceptId([0; 32]), &channel_id, counterparty_node_id, 1_000_000), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.update_channel_config(&counterparty_node_id, &[channel_id], &ChannelConfig::default()), channel_id, counterparty_node_id);
	}

	#[test]
	fn test_connection_limiting() {
 // Test that we limit un-channel'd peers and un-funded channels properly.
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1906,7 +1906,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	// Check for unknown channel id error.
	let unknown_chan_id_err = nodes[1].node.forward_intercepted_htlc(intercept_id, &ChannelId::from_bytes([42; 32]), nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap_err();
	assert_eq!(unknown_chan_id_err , APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
 log_bytes!([42; 32]), nodes[2].node.get_our_node_id()) });

	if test == InterceptTest::Fail {
Expand Down

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

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

TheBlueMatt
merged 1 commit into

from

Oct 12, 2023
 Merged


Fix deadlock when closing an unavailable channel
#2657
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


46 changes: 44 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2616,6 +2616,8 @@ where
 // it does not exist for this peer. Either way, we can attempt to force-close it.
 //
 // An appropriate error will be returned for non-existence of the channel if that's the case.
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 return self.force_close_channel_with_peer(&channel_id, counterparty_node_id, None, false).map(|_| ())
 },
 }
Expand DownExpand Up@@ -4001,7 +4003,7 @@ where
 for channel_id in channel_ids {
 if !peer_state.has_channel(channel_id) {
 return Err(APIError::ChannelUnavailable {
 err: format!("Channel with ID {} was not found for the passed counterparty_node_id {}", channel_id, counterparty_node_id),
 err: format!("Channel with id {} not found for the passed counterparty node_id {}", channel_id, counterparty_node_id),
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Not sure I understand this change.
@Fedeparma74Fedeparma74Oct 11, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It is needed for the test to pass, as I'm checking the APIError::ChannelUnavailable with the same expected message in check_channel_unavailable_error()
@TheBlueMattTheBlueMattOct 12, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Ah, okay.
 });
 };
 }
Expand DownExpand Up@@ -4112,7 +4114,7 @@ where
 next_hop_channel_id, next_node_id)
 }),
 None => return Err(APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
@TheBlueMattTheBlueMattOct 11, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Or this one, we dont usually add periods.
 next_hop_channel_id, next_node_id)
 })
 }
Expand DownExpand Up@@ -10750,6 +10752,16 @@ mod tests {
 check_api_error_message(expected_message, res_err)
	}

	fn check_channel_unavailable_error<T>(res_err: Result<T, APIError>, expected_channel_id: ChannelId, peer_node_id: PublicKey) {
 let expected_message = format!("Channel with id {} not found for the passed counterparty node_id {}", expected_channel_id, peer_node_id);
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_misuse_error<T>(res_err: Result<T, APIError>) {
 let expected_message = "No such channel awaiting to be accepted.".to_string();
 check_api_error_message(expected_message, res_err)
	}

	fn check_api_error_message<T>(expected_err_message: String, res_err: Result<T, APIError>) {
 match res_err {
 Err(APIError::APIMisuseError { err }) => {
Expand DownExpand Up@@ -10794,6 +10806,36 @@ mod tests {
 check_unkown_peer_error(nodes[0].node.update_channel_config(&unkown_public_key, &[channel_id], &ChannelConfig::default()), unkown_public_key);
	}

	#[test]
	fn test_api_calls_with_unavailable_channel() {
 // Tests that our API functions that expects a `counterparty_node_id` and a `channel_id`
 // as input, behaves as expected if the `counterparty_node_id` is a known peer in the
 // `ChannelManager::per_peer_state` map, but the peer state doesn't contain a channel with
 // the given `channel_id`.
 let chanmon_cfg = create_chanmon_cfgs(2);
 let node_cfg = create_node_cfgs(2, &chanmon_cfg);
 let node_chanmgr = create_node_chanmgrs(2, &node_cfg, &[None, None]);
 let nodes = create_network(2, &node_cfg, &node_chanmgr);

 let counterparty_node_id = nodes[1].node.get_our_node_id();

 // Dummy values
 let channel_id = ChannelId::from_bytes([4; 32]);

 // Test the API functions.
 check_api_misuse_error(nodes[0].node.accept_inbound_channel(&channel_id, &counterparty_node_id, 42));

 check_channel_unavailable_error(nodes[0].node.close_channel(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_broadcasting_latest_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.force_close_without_broadcasting_txn(&channel_id, &counterparty_node_id), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.forward_intercepted_htlc(InterceptId([0; 32]), &channel_id, counterparty_node_id, 1_000_000), channel_id, counterparty_node_id);

 check_channel_unavailable_error(nodes[0].node.update_channel_config(&counterparty_node_id, &[channel_id], &ChannelConfig::default()), channel_id, counterparty_node_id);
	}

	#[test]
	fn test_connection_limiting() {
 // Test that we limit un-channel'd peers and un-funded channels properly.
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1906,7 +1906,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	// Check for unknown channel id error.
	let unknown_chan_id_err = nodes[1].node.forward_intercepted_htlc(intercept_id, &ChannelId::from_bytes([42; 32]), nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap_err();
	assert_eq!(unknown_chan_id_err , APIError::ChannelUnavailable {
 err: format!("Channel with id {} not found for the passed counterparty node_id {}.",
 err: format!("Channel with id {} not found for the passed counterparty node_id {}",
 log_bytes!([42; 32]), nodes[2].node.get_our_node_id()) });

	if test == InterceptTest::Fail {
Expand Down