Skip to content

Include short channel id in PaymentPathFailed#1077

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 4 commits into from
Oct 13, 2021
Merged

Include short channel id in PaymentPathFailed #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42bb0af
Remove special case for onion error expiry_too_far
jkczyz Sep 20, 2021
f5abc93
Pass hop index in construct_onion_keys_callback
jkczyz Sep 14, 2021
1e2ca52
Clean up fee_insufficient computation
jkczyz Oct 11, 2021
202acd9
Add failing short channel id to PaymentPathFailed
jkczyz Sep 16, 2021
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
7 changes: 5 additions & 2 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2888,6 +2888,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
network_update: None,
all_paths_failed: sessions.get().len() == 0,
path: path.clone(),
short_channel_id: None,
#[cfg(test)]
error_code: None,
#[cfg(test)]
Expand DownExpand Up@@ -2945,9 +2946,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
match &onion_error {
&HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
let (network_update, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
#[cfg(not(test))]
let (network_update, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
let (network_update, short_channel_id, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
// TODO: If we decided to blame ourselves (or one of our channels) in
// process_onion_failure we should close that channel as it implies our
// next-hop is needlessly blaming us!
Expand All@@ -2958,6 +2959,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
network_update,
all_paths_failed,
path: path.clone(),
short_channel_id,
#[cfg(test)]
error_code: onion_error_code,
#[cfg(test)]
Expand DownExpand Up@@ -2985,6 +2987,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
network_update: None,
all_paths_failed,
path: path.clone(),
short_channel_id: Some(path.first().unwrap().short_channel_id),

@TheBlueMattTheBlueMattOct 12, 2021

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.

I'm not really a huge fan of "punishing" our own channels - on one hand its nice that the payment goes through, but on the other hand it seems like we're addressing the problem in the wrong way - we have a peer who isn't able to read our HTLC-add messages, we shouldn't just stop sending payments their way, we should close the channel with them and disconnect.

@jkczyzjkczyzOct 12, 2021

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.

Punishment only occurs during event handling, so this is just signaling which is the responsible channel. The event handler could check if short_channel_id is the same as the first hop in the path and act accordingly. For instance, InvoicePayer could not pass the hop to the scorer in this case. And another event handler (perhaps in BackgroundProcessor?) could close the channel. Thoughts?

@TheBlueMattTheBlueMattOct 12, 2021

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.

That would make sense, I suppose.

@valentinewallacevalentinewallaceOct 12, 2021

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.

Could make it an enum

OurChannel(u64)
NetworkChannel(u64)
NotRetryable

Just some inspo, I'm fine with it as is

#[cfg(test)]
error_code: Some(*failure_code),
#[cfg(test)]
Expand Down
6 changes: 4 additions & 2 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6068,11 +6068,12 @@ fn test_fail_holding_cell_htlc_upon_free() {
let events = nodes[0].node.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
match &events[0] {
&Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
&Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
assert_eq!(our_payment_hash.clone(), *payment_hash);
assert_eq!(*rejected_by_dest, false);
assert_eq!(*all_paths_failed, true);
assert_eq!(*network_update, None);
assert_eq!(*short_channel_id, None);
assert_eq!(*error_code, None);
assert_eq!(*error_data, None);
},
Expand DownExpand Up@@ -6155,11 +6156,12 @@ fn test_free_and_fail_holding_cell_htlcs() {
let events = nodes[0].node.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
match &events[0] {
&Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
&Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
assert_eq!(payment_hash_2.clone(), *payment_hash);
assert_eq!(*rejected_by_dest, false);
assert_eq!(*all_paths_failed, true);
assert_eq!(*network_update, None);
assert_eq!(*short_channel_id, None);
assert_eq!(*error_code, None);
assert_eq!(*error_data, None);
},
Expand Down
Loading
, '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" + '
Include short channel id in PaymentPathFailed by jkczyz · Pull Request #1077 · lightningdevkit/rust-lightning · GitHub
Skip to content
Include short channel id in PaymentPathFailed#1077

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 4 commits into

from

Oct 13, 2021
 Merged


Include short channel id in PaymentPathFailed
#1077
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
42bb0af

Remove special case for onion error expiry_too_far


jkczyz Sep 20, 2021
f5abc93

Pass hop index in construct_onion_keys_callback


jkczyz Sep 14, 2021
1e2ca52

Clean up fee_insufficient computation


jkczyz Oct 11, 2021
202acd9

Add failing short channel id to PaymentPathFailed


jkczyz Sep 16, 2021

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


7 changes: 5 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2888,6 +2888,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed: sessions.get().len() == 0,
 path: path.clone(),
 short_channel_id: None,
 #[cfg(test)]
 error_code: None,
 #[cfg(test)]
Expand DownExpand Up@@ -2945,9 +2946,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (network_update, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
#[cfg(not(test))]
 let (network_update, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 // TODO: If we decided to blame ourselves (or one of our channels) in
 // process_onion_failure we should close that channel as it implies our
 // next-hop is needlessly blaming us!
Expand All@@ -2958,6 +2959,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update,
 all_paths_failed,
 path: path.clone(),
 short_channel_id,
#[cfg(test)]
 error_code: onion_error_code,
#[cfg(test)]
Expand DownExpand Up@@ -2985,6 +2987,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed,
 path: path.clone(),
 short_channel_id: Some(path.first().unwrap().short_channel_id),
@TheBlueMattTheBlueMattOct 12, 2021

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.

I'm not really a huge fan of "punishing" our own channels - on one hand its nice that the payment goes through, but on the other hand it seems like we're addressing the problem in the wrong way - we have a peer who isn't able to read our HTLC-add messages, we shouldn't just stop sending payments their way, we should close the channel with them and disconnect.
@jkczyzjkczyzOct 12, 2021

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.

Punishment only occurs during event handling, so this is just signaling which is the responsible channel. The event handler could check if short_channel_id is the same as the first hop in the path and act accordingly. For instance, InvoicePayer could not pass the hop to the scorer in this case. And another event handler (perhaps in BackgroundProcessor?) could close the channel. Thoughts?
@TheBlueMattTheBlueMattOct 12, 2021

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.

That would make sense, I suppose.
@valentinewallacevalentinewallaceOct 12, 2021

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.

Could make it an enum
OurChannel(u64)
NetworkChannel(u64)
NotRetryable

Just some inspo, I'm fine with it as is
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
Expand Down

6 changes: 4 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6068,11 +6068,12 @@ fn test_fail_holding_cell_htlc_upon_free() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(our_payment_hash.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand DownExpand Up@@ -6155,11 +6156,12 @@ fn test_free_and_fail_holding_cell_htlcs() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(payment_hash_2.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand Down
Loading

, '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('^' + ".*" + '
Include short channel id in PaymentPathFailed by jkczyz · Pull Request #1077 · lightningdevkit/rust-lightning · GitHub
Skip to content
Include short channel id in PaymentPathFailed#1077

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 4 commits into

from

Oct 13, 2021
 Merged


Include short channel id in PaymentPathFailed
#1077
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
42bb0af

Remove special case for onion error expiry_too_far


jkczyz Sep 20, 2021
f5abc93

Pass hop index in construct_onion_keys_callback


jkczyz Sep 14, 2021
1e2ca52

Clean up fee_insufficient computation


jkczyz Oct 11, 2021
202acd9

Add failing short channel id to PaymentPathFailed


jkczyz Sep 16, 2021

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


7 changes: 5 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2888,6 +2888,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed: sessions.get().len() == 0,
 path: path.clone(),
 short_channel_id: None,
 #[cfg(test)]
 error_code: None,
 #[cfg(test)]
Expand DownExpand Up@@ -2945,9 +2946,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (network_update, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
#[cfg(not(test))]
 let (network_update, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 // TODO: If we decided to blame ourselves (or one of our channels) in
 // process_onion_failure we should close that channel as it implies our
 // next-hop is needlessly blaming us!
Expand All@@ -2958,6 +2959,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update,
 all_paths_failed,
 path: path.clone(),
 short_channel_id,
#[cfg(test)]
 error_code: onion_error_code,
#[cfg(test)]
Expand DownExpand Up@@ -2985,6 +2987,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed,
 path: path.clone(),
 short_channel_id: Some(path.first().unwrap().short_channel_id),
@TheBlueMattTheBlueMattOct 12, 2021

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.

I'm not really a huge fan of "punishing" our own channels - on one hand its nice that the payment goes through, but on the other hand it seems like we're addressing the problem in the wrong way - we have a peer who isn't able to read our HTLC-add messages, we shouldn't just stop sending payments their way, we should close the channel with them and disconnect.
@jkczyzjkczyzOct 12, 2021

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.

Punishment only occurs during event handling, so this is just signaling which is the responsible channel. The event handler could check if short_channel_id is the same as the first hop in the path and act accordingly. For instance, InvoicePayer could not pass the hop to the scorer in this case. And another event handler (perhaps in BackgroundProcessor?) could close the channel. Thoughts?
@TheBlueMattTheBlueMattOct 12, 2021

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.

That would make sense, I suppose.
@valentinewallacevalentinewallaceOct 12, 2021

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.

Could make it an enum
OurChannel(u64)
NetworkChannel(u64)
NotRetryable

Just some inspo, I'm fine with it as is
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
Expand Down

6 changes: 4 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6068,11 +6068,12 @@ fn test_fail_holding_cell_htlc_upon_free() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(our_payment_hash.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand DownExpand Up@@ -6155,11 +6156,12 @@ fn test_free_and_fail_holding_cell_htlcs() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(payment_hash_2.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand Down
Loading

, '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('^' + ".*" + '
Include short channel id in PaymentPathFailed by jkczyz · Pull Request #1077 · lightningdevkit/rust-lightning · GitHub
Skip to content
Include short channel id in PaymentPathFailed#1077

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 4 commits into

from

Oct 13, 2021
 Merged


Include short channel id in PaymentPathFailed
#1077
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
42bb0af

Remove special case for onion error expiry_too_far


jkczyz Sep 20, 2021
f5abc93

Pass hop index in construct_onion_keys_callback


jkczyz Sep 14, 2021
1e2ca52

Clean up fee_insufficient computation


jkczyz Oct 11, 2021
202acd9

Add failing short channel id to PaymentPathFailed


jkczyz Sep 16, 2021

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


7 changes: 5 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2888,6 +2888,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed: sessions.get().len() == 0,
 path: path.clone(),
 short_channel_id: None,
 #[cfg(test)]
 error_code: None,
 #[cfg(test)]
Expand DownExpand Up@@ -2945,9 +2946,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (network_update, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
#[cfg(not(test))]
 let (network_update, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 // TODO: If we decided to blame ourselves (or one of our channels) in
 // process_onion_failure we should close that channel as it implies our
 // next-hop is needlessly blaming us!
Expand All@@ -2958,6 +2959,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update,
 all_paths_failed,
 path: path.clone(),
 short_channel_id,
#[cfg(test)]
 error_code: onion_error_code,
#[cfg(test)]
Expand DownExpand Up@@ -2985,6 +2987,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed,
 path: path.clone(),
 short_channel_id: Some(path.first().unwrap().short_channel_id),
@TheBlueMattTheBlueMattOct 12, 2021

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.

I'm not really a huge fan of "punishing" our own channels - on one hand its nice that the payment goes through, but on the other hand it seems like we're addressing the problem in the wrong way - we have a peer who isn't able to read our HTLC-add messages, we shouldn't just stop sending payments their way, we should close the channel with them and disconnect.
@jkczyzjkczyzOct 12, 2021

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.

Punishment only occurs during event handling, so this is just signaling which is the responsible channel. The event handler could check if short_channel_id is the same as the first hop in the path and act accordingly. For instance, InvoicePayer could not pass the hop to the scorer in this case. And another event handler (perhaps in BackgroundProcessor?) could close the channel. Thoughts?
@TheBlueMattTheBlueMattOct 12, 2021

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.

That would make sense, I suppose.
@valentinewallacevalentinewallaceOct 12, 2021

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.

Could make it an enum
OurChannel(u64)
NetworkChannel(u64)
NotRetryable

Just some inspo, I'm fine with it as is
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
Expand Down

6 changes: 4 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6068,11 +6068,12 @@ fn test_fail_holding_cell_htlc_upon_free() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(our_payment_hash.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand DownExpand Up@@ -6155,11 +6156,12 @@ fn test_free_and_fail_holding_cell_htlcs() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(payment_hash_2.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand Down
Loading

, '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" + '
Include short channel id in PaymentPathFailed by jkczyz · Pull Request #1077 · lightningdevkit/rust-lightning · GitHub
Skip to content
Include short channel id in PaymentPathFailed#1077

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 4 commits into

from

Oct 13, 2021
 Merged


Include short channel id in PaymentPathFailed
#1077
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
42bb0af

Remove special case for onion error expiry_too_far


jkczyz Sep 20, 2021
f5abc93

Pass hop index in construct_onion_keys_callback


jkczyz Sep 14, 2021
1e2ca52

Clean up fee_insufficient computation


jkczyz Oct 11, 2021
202acd9

Add failing short channel id to PaymentPathFailed


jkczyz Sep 16, 2021

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


7 changes: 5 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2888,6 +2888,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed: sessions.get().len() == 0,
 path: path.clone(),
 short_channel_id: None,
 #[cfg(test)]
 error_code: None,
 #[cfg(test)]
Expand DownExpand Up@@ -2945,9 +2946,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (network_update, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
#[cfg(not(test))]
 let (network_update, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 // TODO: If we decided to blame ourselves (or one of our channels) in
 // process_onion_failure we should close that channel as it implies our
 // next-hop is needlessly blaming us!
Expand All@@ -2958,6 +2959,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update,
 all_paths_failed,
 path: path.clone(),
 short_channel_id,
#[cfg(test)]
 error_code: onion_error_code,
#[cfg(test)]
Expand DownExpand Up@@ -2985,6 +2987,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed,
 path: path.clone(),
 short_channel_id: Some(path.first().unwrap().short_channel_id),
@TheBlueMattTheBlueMattOct 12, 2021

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.

I'm not really a huge fan of "punishing" our own channels - on one hand its nice that the payment goes through, but on the other hand it seems like we're addressing the problem in the wrong way - we have a peer who isn't able to read our HTLC-add messages, we shouldn't just stop sending payments their way, we should close the channel with them and disconnect.
@jkczyzjkczyzOct 12, 2021

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.

Punishment only occurs during event handling, so this is just signaling which is the responsible channel. The event handler could check if short_channel_id is the same as the first hop in the path and act accordingly. For instance, InvoicePayer could not pass the hop to the scorer in this case. And another event handler (perhaps in BackgroundProcessor?) could close the channel. Thoughts?
@TheBlueMattTheBlueMattOct 12, 2021

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.

That would make sense, I suppose.
@valentinewallacevalentinewallaceOct 12, 2021

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.

Could make it an enum
OurChannel(u64)
NetworkChannel(u64)
NotRetryable

Just some inspo, I'm fine with it as is
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
Expand Down

6 changes: 4 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6068,11 +6068,12 @@ fn test_fail_holding_cell_htlc_upon_free() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(our_payment_hash.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand DownExpand Up@@ -6155,11 +6156,12 @@ fn test_free_and_fail_holding_cell_htlcs() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(payment_hash_2.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand Down
Loading

, '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('^' + ".*" + '
Include short channel id in PaymentPathFailed by jkczyz · Pull Request #1077 · lightningdevkit/rust-lightning · GitHub
Skip to content
Include short channel id in PaymentPathFailed#1077

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 4 commits into

from

Oct 13, 2021
 Merged


Include short channel id in PaymentPathFailed
#1077
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
42bb0af

Remove special case for onion error expiry_too_far


jkczyz Sep 20, 2021
f5abc93

Pass hop index in construct_onion_keys_callback


jkczyz Sep 14, 2021
1e2ca52

Clean up fee_insufficient computation


jkczyz Oct 11, 2021
202acd9

Add failing short channel id to PaymentPathFailed


jkczyz Sep 16, 2021

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


7 changes: 5 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2888,6 +2888,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed: sessions.get().len() == 0,
 path: path.clone(),
 short_channel_id: None,
 #[cfg(test)]
 error_code: None,
 #[cfg(test)]
Expand DownExpand Up@@ -2945,9 +2946,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (network_update, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
#[cfg(not(test))]
 let (network_update, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 // TODO: If we decided to blame ourselves (or one of our channels) in
 // process_onion_failure we should close that channel as it implies our
 // next-hop is needlessly blaming us!
Expand All@@ -2958,6 +2959,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update,
 all_paths_failed,
 path: path.clone(),
 short_channel_id,
#[cfg(test)]
 error_code: onion_error_code,
#[cfg(test)]
Expand DownExpand Up@@ -2985,6 +2987,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed,
 path: path.clone(),
 short_channel_id: Some(path.first().unwrap().short_channel_id),
@TheBlueMattTheBlueMattOct 12, 2021

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.

I'm not really a huge fan of "punishing" our own channels - on one hand its nice that the payment goes through, but on the other hand it seems like we're addressing the problem in the wrong way - we have a peer who isn't able to read our HTLC-add messages, we shouldn't just stop sending payments their way, we should close the channel with them and disconnect.
@jkczyzjkczyzOct 12, 2021

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.

Punishment only occurs during event handling, so this is just signaling which is the responsible channel. The event handler could check if short_channel_id is the same as the first hop in the path and act accordingly. For instance, InvoicePayer could not pass the hop to the scorer in this case. And another event handler (perhaps in BackgroundProcessor?) could close the channel. Thoughts?
@TheBlueMattTheBlueMattOct 12, 2021

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.

That would make sense, I suppose.
@valentinewallacevalentinewallaceOct 12, 2021

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.

Could make it an enum
OurChannel(u64)
NetworkChannel(u64)
NotRetryable

Just some inspo, I'm fine with it as is
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
Expand Down

6 changes: 4 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6068,11 +6068,12 @@ fn test_fail_holding_cell_htlc_upon_free() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(our_payment_hash.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand DownExpand Up@@ -6155,11 +6156,12 @@ fn test_free_and_fail_holding_cell_htlcs() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(payment_hash_2.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand Down
Loading

, '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('^' + ".*" + '
Include short channel id in PaymentPathFailed by jkczyz · Pull Request #1077 · lightningdevkit/rust-lightning · GitHub
Skip to content
Include short channel id in PaymentPathFailed#1077

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 4 commits into

from

Oct 13, 2021
 Merged


Include short channel id in PaymentPathFailed
#1077
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
42bb0af

Remove special case for onion error expiry_too_far


jkczyz Sep 20, 2021
f5abc93

Pass hop index in construct_onion_keys_callback


jkczyz Sep 14, 2021
1e2ca52

Clean up fee_insufficient computation


jkczyz Oct 11, 2021
202acd9

Add failing short channel id to PaymentPathFailed


jkczyz Sep 16, 2021

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


7 changes: 5 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2888,6 +2888,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed: sessions.get().len() == 0,
 path: path.clone(),
 short_channel_id: None,
 #[cfg(test)]
 error_code: None,
 #[cfg(test)]
Expand DownExpand Up@@ -2945,9 +2946,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (network_update, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
#[cfg(not(test))]
 let (network_update, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 // TODO: If we decided to blame ourselves (or one of our channels) in
 // process_onion_failure we should close that channel as it implies our
 // next-hop is needlessly blaming us!
Expand All@@ -2958,6 +2959,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update,
 all_paths_failed,
 path: path.clone(),
 short_channel_id,
#[cfg(test)]
 error_code: onion_error_code,
#[cfg(test)]
Expand DownExpand Up@@ -2985,6 +2987,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed,
 path: path.clone(),
 short_channel_id: Some(path.first().unwrap().short_channel_id),
@TheBlueMattTheBlueMattOct 12, 2021

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.

I'm not really a huge fan of "punishing" our own channels - on one hand its nice that the payment goes through, but on the other hand it seems like we're addressing the problem in the wrong way - we have a peer who isn't able to read our HTLC-add messages, we shouldn't just stop sending payments their way, we should close the channel with them and disconnect.
@jkczyzjkczyzOct 12, 2021

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.

Punishment only occurs during event handling, so this is just signaling which is the responsible channel. The event handler could check if short_channel_id is the same as the first hop in the path and act accordingly. For instance, InvoicePayer could not pass the hop to the scorer in this case. And another event handler (perhaps in BackgroundProcessor?) could close the channel. Thoughts?
@TheBlueMattTheBlueMattOct 12, 2021

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.

That would make sense, I suppose.
@valentinewallacevalentinewallaceOct 12, 2021

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.

Could make it an enum
OurChannel(u64)
NetworkChannel(u64)
NotRetryable

Just some inspo, I'm fine with it as is
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
Expand Down

6 changes: 4 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6068,11 +6068,12 @@ fn test_fail_holding_cell_htlc_upon_free() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(our_payment_hash.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand DownExpand Up@@ -6155,11 +6156,12 @@ fn test_free_and_fail_holding_cell_htlcs() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(payment_hash_2.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand Down
Loading

, '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); }
})();
})();
Include short channel id in PaymentPathFailed by jkczyz · Pull Request #1077 · lightningdevkit/rust-lightning · GitHub
Skip to content
Include short channel id in PaymentPathFailed#1077

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 4 commits into

from

Oct 13, 2021
 Merged


Include short channel id in PaymentPathFailed
#1077
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
42bb0af

Remove special case for onion error expiry_too_far


jkczyz Sep 20, 2021
f5abc93

Pass hop index in construct_onion_keys_callback


jkczyz Sep 14, 2021
1e2ca52

Clean up fee_insufficient computation


jkczyz Oct 11, 2021
202acd9

Add failing short channel id to PaymentPathFailed


jkczyz Sep 16, 2021

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


7 changes: 5 additions & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2888,6 +2888,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed: sessions.get().len() == 0,
 path: path.clone(),
 short_channel_id: None,
 #[cfg(test)]
 error_code: None,
 #[cfg(test)]
Expand DownExpand Up@@ -2945,9 +2946,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (network_update, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
#[cfg(not(test))]
 let (network_update, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (network_update, short_channel_id, payment_retryable, _, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 // TODO: If we decided to blame ourselves (or one of our channels) in
 // process_onion_failure we should close that channel as it implies our
 // next-hop is needlessly blaming us!
Expand All@@ -2958,6 +2959,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update,
 all_paths_failed,
 path: path.clone(),
 short_channel_id,
#[cfg(test)]
 error_code: onion_error_code,
#[cfg(test)]
Expand DownExpand Up@@ -2985,6 +2987,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 network_update: None,
 all_paths_failed,
 path: path.clone(),
 short_channel_id: Some(path.first().unwrap().short_channel_id),
@TheBlueMattTheBlueMattOct 12, 2021

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.

I'm not really a huge fan of "punishing" our own channels - on one hand its nice that the payment goes through, but on the other hand it seems like we're addressing the problem in the wrong way - we have a peer who isn't able to read our HTLC-add messages, we shouldn't just stop sending payments their way, we should close the channel with them and disconnect.
@jkczyzjkczyzOct 12, 2021

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.

Punishment only occurs during event handling, so this is just signaling which is the responsible channel. The event handler could check if short_channel_id is the same as the first hop in the path and act accordingly. For instance, InvoicePayer could not pass the hop to the scorer in this case. And another event handler (perhaps in BackgroundProcessor?) could close the channel. Thoughts?
@TheBlueMattTheBlueMattOct 12, 2021

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.

That would make sense, I suppose.
@valentinewallacevalentinewallaceOct 12, 2021

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.

Could make it an enum
OurChannel(u64)
NetworkChannel(u64)
NotRetryable

Just some inspo, I'm fine with it as is
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
Expand Down

6 changes: 4 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6068,11 +6068,12 @@ fn test_fail_holding_cell_htlc_upon_free() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(our_payment_hash.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand DownExpand Up@@ -6155,11 +6156,12 @@ fn test_free_and_fail_holding_cell_htlcs() {
	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	match &events[0] {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref error_code, ref error_data, ref all_paths_failed, path: _ } => {
 &Event::PaymentPathFailed { ref payment_hash, ref rejected_by_dest, ref network_update, ref all_paths_failed, path: _, ref short_channel_id, ref error_code, ref error_data } => {
 assert_eq!(payment_hash_2.clone(), *payment_hash);
 assert_eq!(*rejected_by_dest, false);
 assert_eq!(*all_paths_failed, true);
 assert_eq!(*network_update, None);
 assert_eq!(*short_channel_id, None);
 assert_eq!(*error_code, None);
 assert_eq!(*error_data, None);
 },
Expand Down
Loading