Include height to incorrect_or_unknown_payment_details failure#596

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 2 commits into from
Apr 20, 2020
Merged

Include height to incorrect_or_unknown_payment_details failure #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fae46a0
Include `height` to `incorrect_or_unknown_payment_details` failure
D4nte Apr 19, 2020
236887d
Test that `height` is included for incorrect payment details
D4nte Apr 19, 2020
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
36 changes: 27 additions & 9 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1733,12 +1733,19 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
}
if total_value >= msgs::MAX_VALUE_MSAT || total_value > data.total_msat {
for htlc in htlcs.iter() {
let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
htlc_msat_height_data.extend_from_slice(
&byte_utils::be32_to_array(
self.latest_block_height.load(Ordering::Acquire)
as u32,
Comment thread
D4nte marked this conversation as resolved.
),
);
failed_forwards.push((HTLCSource::PreviousHopData(HTLCPreviousHopData {
short_channel_id: htlc.prev_hop.short_channel_id,
htlc_id: htlc.prev_hop.htlc_id,
incoming_packet_shared_secret: htlc.prev_hop.incoming_packet_shared_secret,
}), payment_hash,
HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() }
HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data }
));
}
} else if total_value == data.total_msat {
Expand DownExpand Up@@ -1819,9 +1826,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
if let Some(mut sources) = removed_source {
for htlc in sources.drain(..) {
if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
self.latest_block_height.load(Ordering::Acquire) as u32,
));
self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
HTLCSource::PreviousHopData(htlc.prev_hop), payment_hash,
HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() });
HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data });
}
true
} else { false }
Expand All@@ -1845,9 +1856,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
match &onion_error {
&HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
let (channel_update, payment_retryable, onion_error_code) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
let (channel_update, 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 (channel_update, payment_retryable, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
let (channel_update, 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@@ -1863,13 +1874,17 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
payment_hash: payment_hash.clone(),
rejected_by_dest: !payment_retryable,
#[cfg(test)]
error_code: onion_error_code
error_code: onion_error_code,
#[cfg(test)]
error_data: onion_error_data
}
);
},
&HTLCFailReason::Reason {
#[cfg(test)]
ref failure_code,
#[cfg(test)]
ref data,
.. } => {
// we get a fail_malformed_htlc from the first hop
// TODO: We'd like to generate a PaymentFailureNetworkUpdate for temporary
Expand All@@ -1884,6 +1899,8 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
rejected_by_dest: path.len() == 1,
#[cfg(test)]
error_code: Some(*failure_code),
#[cfg(test)]
error_data: Some(data.clone()),
}
);
}
Expand DownExpand Up@@ -1982,12 +1999,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
for htlc in sources.drain(..) {
if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
if (is_mpp && !valid_mpp) || (!is_mpp && (htlc.value < expected_amount || htlc.value > expected_amount * 2)) {
let mut htlc_msat_data = byte_utils::be64_to_array(htlc.value).to_vec();
let mut height_data = byte_utils::be32_to_array(self.latest_block_height.load(Ordering::Acquire) as u32).to_vec();
htlc_msat_data.append(&mut height_data);
let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
self.latest_block_height.load(Ordering::Acquire) as u32,
));
self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
HTLCSource::PreviousHopData(htlc.prev_hop), &payment_hash,
HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_data });
HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_height_data });
} else {
match self.claim_funds_from_hop(channel_state.as_mut().unwrap(), htlc.prev_hop, payment_preimage) {
Err(Some(e)) => {
Expand Down
15 changes: 13 additions & 2 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5326,7 +5326,7 @@ fn run_onion_failure_test_with_fail_intercept<F1,F2,F3>(_name: &str, test_case:

let events = nodes[0].node.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, error_data: _ } = &events[0] {
assert_eq!(*rejected_by_dest, !expected_retryable);
assert_eq!(*error_code, expected_error_code);
} else {
Expand DownExpand Up@@ -6914,9 +6914,20 @@ fn test_check_htlc_underpaying() {

let events = nodes[0].node.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, ref error_data } = &events[0] {
assert_eq!(*rejected_by_dest, true);
assert_eq!(error_code.unwrap(), 0x4000|15);
// 10_000 msat as u64, followed by a height of 99 as u32
assert_eq!(&error_data.as_ref().unwrap()[..], &[
((10_000u64 >> 7*8) & 0xff) as u8,
((10_000u64 >> 6*8) & 0xff) as u8,
((10_000u64 >> 5*8) & 0xff) as u8,
((10_000u64 >> 4*8) & 0xff) as u8,
((10_000u64 >> 3*8) & 0xff) as u8,
((10_000u64 >> 2*8) & 0xff) as u8,
((10_000u64 >> 1*8) & 0xff) as u8,
((10_000u64 >> 0*8) & 0xff) as u8,
0, 0, 0, 99]);
} else {
panic!("Unexpected event");
}
Expand Down
9 changes: 6 additions & 3 deletions lightning/src/ln/onion_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,11 +317,13 @@ pub(super) fn build_first_hop_failure_packet(shared_secret: &[u8], failure_type:
/// Process failure we got back from upstream on a payment we sent (implying htlc_source is an
/// OutboundRoute).
/// Returns update, a boolean indicating that the payment itself failed, and the error code.
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>) {
#[inline]
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>, Option<Vec<u8>>) {
if let &HTLCSource::OutboundRoute { ref path, ref session_priv, ref first_hop_htlc_msat } = htlc_source {
let mut res = None;
let mut htlc_msat = *first_hop_htlc_msat;
let mut error_code_ret = None;
let mut error_packet_ret = None;
let mut next_route_hop_ix = 0;
let mut is_from_final_node = false;

Expand DownExpand Up@@ -356,6 +358,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<

let error_code = byte_utils::slice_to_be16(&error_code_slice);
error_code_ret = Some(error_code);
error_packet_ret = Some(err_packet.failuremsg[2..].to_vec());

let (debug_field, debug_field_size) = errors::get_onion_debug_field(error_code);

Expand DownExpand Up@@ -456,11 +459,11 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<
}
}).expect("Route that we sent via spontaneously grew invalid keys in the middle of it?");
if let Some((channel_update, payment_retryable)) = res {
(channel_update, payment_retryable, error_code_ret)
(channel_update, payment_retryable, error_code_ret, error_packet_ret)
} else {
// only not set either packet unparseable or hmac does not match with any
// payment not retryable only when garbage is from the final node
(None, !is_from_final_node, None)
(None, !is_from_final_node, None, None)
}
} else { unreachable!(); }
}
Expand Down
8 changes: 8 additions & 0 deletions lightning/src/util/events.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,8 @@ pub enum Event {
rejected_by_dest: bool,
#[cfg(test)]
error_code: Option<u16>,
#[cfg(test)]
error_data: Option<Vec<u8>>,
},
/// Used to indicate that ChannelManager::process_pending_htlc_forwards should be called at a
/// time in the future.
Expand DownExpand Up@@ -142,12 +144,16 @@ impl Writeable for Event {
&Event::PaymentFailed { ref payment_hash, ref rejected_by_dest,
#[cfg(test)]
ref error_code,
#[cfg(test)]
ref error_data,
} => {
4u8.write(writer)?;
payment_hash.write(writer)?;
rejected_by_dest.write(writer)?;
#[cfg(test)]
error_code.write(writer)?;
#[cfg(test)]
error_data.write(writer)?;
},
&Event::PendingHTLCsForwardable { time_forwardable: _ } => {
5u8.write(writer)?;
Expand DownExpand Up@@ -186,6 +192,8 @@ impl MaybeReadable for Event {
rejected_by_dest: Readable::read(reader)?,
#[cfg(test)]
error_code: Readable::read(reader)?,
#[cfg(test)]
error_data: Readable::read(reader)?,
})),
5u8 => Ok(Some(Event::PendingHTLCsForwardable {
time_forwardable: Duration::from_secs(0)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Include height to incorrect_or_unknown_payment_details failure#596

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

from

Apr 20, 2020
 Merged


Include height to incorrect_or_unknown_payment_details failure
#596
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fae46a0

Include `height` to `incorrect_or_unknown_payment_details` failure


D4nte Apr 19, 2020
236887d

Test that `height` is included for incorrect payment details


D4nte Apr 19, 2020

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


36 changes: 27 additions & 9 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1733,12 +1733,19 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 }
 if total_value >= msgs::MAX_VALUE_MSAT || total_value > data.total_msat {
 for htlc in htlcs.iter() {
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(
 &byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire)
 as u32,
Comment thread
D4nte marked this conversation as resolved.

 ),
 );
 failed_forwards.push((HTLCSource::PreviousHopData(HTLCPreviousHopData {
 short_channel_id: htlc.prev_hop.short_channel_id,
 htlc_id: htlc.prev_hop.htlc_id,
 incoming_packet_shared_secret: htlc.prev_hop.incoming_packet_shared_secret,
 }), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() }
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data }
 ));
 }
 } else if total_value == data.total_msat {
Expand DownExpand Up@@ -1819,9 +1826,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 if let Some(mut sources) = removed_source {
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() });
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data });
 }
 true
 } else { false }
Expand All@@ -1845,9 +1856,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (channel_update, payment_retryable, onion_error_code) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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 (channel_update, payment_retryable, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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@@ -1863,13 +1874,17 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 payment_hash: payment_hash.clone(),
 rejected_by_dest: !payment_retryable,
#[cfg(test)]
 error_code: onion_error_code
 error_code: onion_error_code,
#[cfg(test)]
 error_data: onion_error_data
 }
 );
 },
 &HTLCFailReason::Reason {
#[cfg(test)]
 ref failure_code,
#[cfg(test)]
 ref data,
 .. } => {
 // we get a fail_malformed_htlc from the first hop
 // TODO: We'd like to generate a PaymentFailureNetworkUpdate for temporary
Expand All@@ -1884,6 +1899,8 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 rejected_by_dest: path.len() == 1,
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
 error_data: Some(data.clone()),
 }
 );
 }
Expand DownExpand Up@@ -1982,12 +1999,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 if (is_mpp && !valid_mpp) || (!is_mpp && (htlc.value < expected_amount || htlc.value > expected_amount * 2)) {
 let mut htlc_msat_data = byte_utils::be64_to_array(htlc.value).to_vec();
 let mut height_data = byte_utils::be32_to_array(self.latest_block_height.load(Ordering::Acquire) as u32).to_vec();
 htlc_msat_data.append(&mut height_data);
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), &payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_data });
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_height_data });
 } else {
 match self.claim_funds_from_hop(channel_state.as_mut().unwrap(), htlc.prev_hop, payment_preimage) {
 Err(Some(e)) => {
Expand Down

15 changes: 13 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5326,7 +5326,7 @@ fn run_onion_failure_test_with_fail_intercept<F1,F2,F3>(_name: &str, test_case:

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, error_data: _ } = &events[0] {
 assert_eq!(*rejected_by_dest, !expected_retryable);
 assert_eq!(*error_code, expected_error_code);
	} else {
Expand DownExpand Up@@ -6914,9 +6914,20 @@ fn test_check_htlc_underpaying() {

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, ref error_data } = &events[0] {
 assert_eq!(*rejected_by_dest, true);
 assert_eq!(error_code.unwrap(), 0x4000|15);
 // 10_000 msat as u64, followed by a height of 99 as u32
 assert_eq!(&error_data.as_ref().unwrap()[..], &[
 ((10_000u64 >> 7*8) & 0xff) as u8,
 ((10_000u64 >> 6*8) & 0xff) as u8,
 ((10_000u64 >> 5*8) & 0xff) as u8,
 ((10_000u64 >> 4*8) & 0xff) as u8,
 ((10_000u64 >> 3*8) & 0xff) as u8,
 ((10_000u64 >> 2*8) & 0xff) as u8,
 ((10_000u64 >> 1*8) & 0xff) as u8,
 ((10_000u64 >> 0*8) & 0xff) as u8,
 0, 0, 0, 99]);
	} else {
 panic!("Unexpected event");
	}
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,11 +317,13 @@ pub(super) fn build_first_hop_failure_packet(shared_secret: &[u8], failure_type:
/// Process failure we got back from upstream on a payment we sent (implying htlc_source is an
/// OutboundRoute).
/// Returns update, a boolean indicating that the payment itself failed, and the error code.
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>) {
#[inline]
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>, Option<Vec<u8>>) {
	if let &HTLCSource::OutboundRoute { ref path, ref session_priv, ref first_hop_htlc_msat } = htlc_source {
 let mut res = None;
 let mut htlc_msat = *first_hop_htlc_msat;
 let mut error_code_ret = None;
 let mut error_packet_ret = None;
 let mut next_route_hop_ix = 0;
 let mut is_from_final_node = false;

Expand DownExpand Up@@ -356,6 +358,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<

 let error_code = byte_utils::slice_to_be16(&error_code_slice);
 error_code_ret = Some(error_code);
 error_packet_ret = Some(err_packet.failuremsg[2..].to_vec());

 let (debug_field, debug_field_size) = errors::get_onion_debug_field(error_code);

Expand DownExpand Up@@ -456,11 +459,11 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<
 }
 }).expect("Route that we sent via spontaneously grew invalid keys in the middle of it?");
 if let Some((channel_update, payment_retryable)) = res {
 (channel_update, payment_retryable, error_code_ret)
 (channel_update, payment_retryable, error_code_ret, error_packet_ret)
 } else {
 // only not set either packet unparseable or hmac does not match with any
 // payment not retryable only when garbage is from the final node
 (None, !is_from_final_node, None)
 (None, !is_from_final_node, None, None)
 }
	} else { unreachable!(); }
}
Expand Down

8 changes: 8 additions & 0 deletions
lightning/src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,8 @@ pub enum Event {
 rejected_by_dest: bool,
#[cfg(test)]
 error_code: Option<u16>,
#[cfg(test)]
 error_data: Option<Vec<u8>>,
	},
	/// Used to indicate that ChannelManager::process_pending_htlc_forwards should be called at a
	/// time in the future.
Expand DownExpand Up@@ -142,12 +144,16 @@ impl Writeable for Event {
 &Event::PaymentFailed { ref payment_hash, ref rejected_by_dest,
 #[cfg(test)]
 ref error_code,
 #[cfg(test)]
 ref error_data,
 } => {
 4u8.write(writer)?;
 payment_hash.write(writer)?;
 rejected_by_dest.write(writer)?;
 #[cfg(test)]
 error_code.write(writer)?;
 #[cfg(test)]
 error_data.write(writer)?;
 },
 &Event::PendingHTLCsForwardable { time_forwardable: _ } => {
 5u8.write(writer)?;
Expand DownExpand Up@@ -186,6 +192,8 @@ impl MaybeReadable for Event {
 rejected_by_dest: Readable::read(reader)?,
 #[cfg(test)]
 error_code: Readable::read(reader)?,
 #[cfg(test)]
 error_data: Readable::read(reader)?,
 })),
 5u8 => Ok(Some(Event::PendingHTLCsForwardable {
 time_forwardable: Duration::from_secs(0)
Expand Down

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

Skip to content
Include height to incorrect_or_unknown_payment_details failure#596

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

from

Apr 20, 2020
 Merged


Include height to incorrect_or_unknown_payment_details failure
#596
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fae46a0

Include `height` to `incorrect_or_unknown_payment_details` failure


D4nte Apr 19, 2020
236887d

Test that `height` is included for incorrect payment details


D4nte Apr 19, 2020

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


36 changes: 27 additions & 9 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1733,12 +1733,19 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 }
 if total_value >= msgs::MAX_VALUE_MSAT || total_value > data.total_msat {
 for htlc in htlcs.iter() {
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(
 &byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire)
 as u32,
Comment thread
D4nte marked this conversation as resolved.

 ),
 );
 failed_forwards.push((HTLCSource::PreviousHopData(HTLCPreviousHopData {
 short_channel_id: htlc.prev_hop.short_channel_id,
 htlc_id: htlc.prev_hop.htlc_id,
 incoming_packet_shared_secret: htlc.prev_hop.incoming_packet_shared_secret,
 }), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() }
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data }
 ));
 }
 } else if total_value == data.total_msat {
Expand DownExpand Up@@ -1819,9 +1826,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 if let Some(mut sources) = removed_source {
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() });
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data });
 }
 true
 } else { false }
Expand All@@ -1845,9 +1856,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (channel_update, payment_retryable, onion_error_code) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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 (channel_update, payment_retryable, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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@@ -1863,13 +1874,17 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 payment_hash: payment_hash.clone(),
 rejected_by_dest: !payment_retryable,
#[cfg(test)]
 error_code: onion_error_code
 error_code: onion_error_code,
#[cfg(test)]
 error_data: onion_error_data
 }
 );
 },
 &HTLCFailReason::Reason {
#[cfg(test)]
 ref failure_code,
#[cfg(test)]
 ref data,
 .. } => {
 // we get a fail_malformed_htlc from the first hop
 // TODO: We'd like to generate a PaymentFailureNetworkUpdate for temporary
Expand All@@ -1884,6 +1899,8 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 rejected_by_dest: path.len() == 1,
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
 error_data: Some(data.clone()),
 }
 );
 }
Expand DownExpand Up@@ -1982,12 +1999,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 if (is_mpp && !valid_mpp) || (!is_mpp && (htlc.value < expected_amount || htlc.value > expected_amount * 2)) {
 let mut htlc_msat_data = byte_utils::be64_to_array(htlc.value).to_vec();
 let mut height_data = byte_utils::be32_to_array(self.latest_block_height.load(Ordering::Acquire) as u32).to_vec();
 htlc_msat_data.append(&mut height_data);
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), &payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_data });
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_height_data });
 } else {
 match self.claim_funds_from_hop(channel_state.as_mut().unwrap(), htlc.prev_hop, payment_preimage) {
 Err(Some(e)) => {
Expand Down

15 changes: 13 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5326,7 +5326,7 @@ fn run_onion_failure_test_with_fail_intercept<F1,F2,F3>(_name: &str, test_case:

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, error_data: _ } = &events[0] {
 assert_eq!(*rejected_by_dest, !expected_retryable);
 assert_eq!(*error_code, expected_error_code);
	} else {
Expand DownExpand Up@@ -6914,9 +6914,20 @@ fn test_check_htlc_underpaying() {

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, ref error_data } = &events[0] {
 assert_eq!(*rejected_by_dest, true);
 assert_eq!(error_code.unwrap(), 0x4000|15);
 // 10_000 msat as u64, followed by a height of 99 as u32
 assert_eq!(&error_data.as_ref().unwrap()[..], &[
 ((10_000u64 >> 7*8) & 0xff) as u8,
 ((10_000u64 >> 6*8) & 0xff) as u8,
 ((10_000u64 >> 5*8) & 0xff) as u8,
 ((10_000u64 >> 4*8) & 0xff) as u8,
 ((10_000u64 >> 3*8) & 0xff) as u8,
 ((10_000u64 >> 2*8) & 0xff) as u8,
 ((10_000u64 >> 1*8) & 0xff) as u8,
 ((10_000u64 >> 0*8) & 0xff) as u8,
 0, 0, 0, 99]);
	} else {
 panic!("Unexpected event");
	}
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,11 +317,13 @@ pub(super) fn build_first_hop_failure_packet(shared_secret: &[u8], failure_type:
/// Process failure we got back from upstream on a payment we sent (implying htlc_source is an
/// OutboundRoute).
/// Returns update, a boolean indicating that the payment itself failed, and the error code.
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>) {
#[inline]
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>, Option<Vec<u8>>) {
	if let &HTLCSource::OutboundRoute { ref path, ref session_priv, ref first_hop_htlc_msat } = htlc_source {
 let mut res = None;
 let mut htlc_msat = *first_hop_htlc_msat;
 let mut error_code_ret = None;
 let mut error_packet_ret = None;
 let mut next_route_hop_ix = 0;
 let mut is_from_final_node = false;

Expand DownExpand Up@@ -356,6 +358,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<

 let error_code = byte_utils::slice_to_be16(&error_code_slice);
 error_code_ret = Some(error_code);
 error_packet_ret = Some(err_packet.failuremsg[2..].to_vec());

 let (debug_field, debug_field_size) = errors::get_onion_debug_field(error_code);

Expand DownExpand Up@@ -456,11 +459,11 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<
 }
 }).expect("Route that we sent via spontaneously grew invalid keys in the middle of it?");
 if let Some((channel_update, payment_retryable)) = res {
 (channel_update, payment_retryable, error_code_ret)
 (channel_update, payment_retryable, error_code_ret, error_packet_ret)
 } else {
 // only not set either packet unparseable or hmac does not match with any
 // payment not retryable only when garbage is from the final node
 (None, !is_from_final_node, None)
 (None, !is_from_final_node, None, None)
 }
	} else { unreachable!(); }
}
Expand Down

8 changes: 8 additions & 0 deletions
lightning/src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,8 @@ pub enum Event {
 rejected_by_dest: bool,
#[cfg(test)]
 error_code: Option<u16>,
#[cfg(test)]
 error_data: Option<Vec<u8>>,
	},
	/// Used to indicate that ChannelManager::process_pending_htlc_forwards should be called at a
	/// time in the future.
Expand DownExpand Up@@ -142,12 +144,16 @@ impl Writeable for Event {
 &Event::PaymentFailed { ref payment_hash, ref rejected_by_dest,
 #[cfg(test)]
 ref error_code,
 #[cfg(test)]
 ref error_data,
 } => {
 4u8.write(writer)?;
 payment_hash.write(writer)?;
 rejected_by_dest.write(writer)?;
 #[cfg(test)]
 error_code.write(writer)?;
 #[cfg(test)]
 error_data.write(writer)?;
 },
 &Event::PendingHTLCsForwardable { time_forwardable: _ } => {
 5u8.write(writer)?;
Expand DownExpand Up@@ -186,6 +192,8 @@ impl MaybeReadable for Event {
 rejected_by_dest: Readable::read(reader)?,
 #[cfg(test)]
 error_code: Readable::read(reader)?,
 #[cfg(test)]
 error_data: Readable::read(reader)?,
 })),
 5u8 => Ok(Some(Event::PendingHTLCsForwardable {
 time_forwardable: Duration::from_secs(0)
Expand Down

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

Skip to content
Include height to incorrect_or_unknown_payment_details failure#596

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

from

Apr 20, 2020
 Merged


Include height to incorrect_or_unknown_payment_details failure
#596
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fae46a0

Include `height` to `incorrect_or_unknown_payment_details` failure


D4nte Apr 19, 2020
236887d

Test that `height` is included for incorrect payment details


D4nte Apr 19, 2020

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


36 changes: 27 additions & 9 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1733,12 +1733,19 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 }
 if total_value >= msgs::MAX_VALUE_MSAT || total_value > data.total_msat {
 for htlc in htlcs.iter() {
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(
 &byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire)
 as u32,
Comment thread
D4nte marked this conversation as resolved.

 ),
 );
 failed_forwards.push((HTLCSource::PreviousHopData(HTLCPreviousHopData {
 short_channel_id: htlc.prev_hop.short_channel_id,
 htlc_id: htlc.prev_hop.htlc_id,
 incoming_packet_shared_secret: htlc.prev_hop.incoming_packet_shared_secret,
 }), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() }
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data }
 ));
 }
 } else if total_value == data.total_msat {
Expand DownExpand Up@@ -1819,9 +1826,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 if let Some(mut sources) = removed_source {
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() });
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data });
 }
 true
 } else { false }
Expand All@@ -1845,9 +1856,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (channel_update, payment_retryable, onion_error_code) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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 (channel_update, payment_retryable, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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@@ -1863,13 +1874,17 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 payment_hash: payment_hash.clone(),
 rejected_by_dest: !payment_retryable,
#[cfg(test)]
 error_code: onion_error_code
 error_code: onion_error_code,
#[cfg(test)]
 error_data: onion_error_data
 }
 );
 },
 &HTLCFailReason::Reason {
#[cfg(test)]
 ref failure_code,
#[cfg(test)]
 ref data,
 .. } => {
 // we get a fail_malformed_htlc from the first hop
 // TODO: We'd like to generate a PaymentFailureNetworkUpdate for temporary
Expand All@@ -1884,6 +1899,8 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 rejected_by_dest: path.len() == 1,
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
 error_data: Some(data.clone()),
 }
 );
 }
Expand DownExpand Up@@ -1982,12 +1999,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 if (is_mpp && !valid_mpp) || (!is_mpp && (htlc.value < expected_amount || htlc.value > expected_amount * 2)) {
 let mut htlc_msat_data = byte_utils::be64_to_array(htlc.value).to_vec();
 let mut height_data = byte_utils::be32_to_array(self.latest_block_height.load(Ordering::Acquire) as u32).to_vec();
 htlc_msat_data.append(&mut height_data);
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), &payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_data });
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_height_data });
 } else {
 match self.claim_funds_from_hop(channel_state.as_mut().unwrap(), htlc.prev_hop, payment_preimage) {
 Err(Some(e)) => {
Expand Down

15 changes: 13 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5326,7 +5326,7 @@ fn run_onion_failure_test_with_fail_intercept<F1,F2,F3>(_name: &str, test_case:

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, error_data: _ } = &events[0] {
 assert_eq!(*rejected_by_dest, !expected_retryable);
 assert_eq!(*error_code, expected_error_code);
	} else {
Expand DownExpand Up@@ -6914,9 +6914,20 @@ fn test_check_htlc_underpaying() {

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, ref error_data } = &events[0] {
 assert_eq!(*rejected_by_dest, true);
 assert_eq!(error_code.unwrap(), 0x4000|15);
 // 10_000 msat as u64, followed by a height of 99 as u32
 assert_eq!(&error_data.as_ref().unwrap()[..], &[
 ((10_000u64 >> 7*8) & 0xff) as u8,
 ((10_000u64 >> 6*8) & 0xff) as u8,
 ((10_000u64 >> 5*8) & 0xff) as u8,
 ((10_000u64 >> 4*8) & 0xff) as u8,
 ((10_000u64 >> 3*8) & 0xff) as u8,
 ((10_000u64 >> 2*8) & 0xff) as u8,
 ((10_000u64 >> 1*8) & 0xff) as u8,
 ((10_000u64 >> 0*8) & 0xff) as u8,
 0, 0, 0, 99]);
	} else {
 panic!("Unexpected event");
	}
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,11 +317,13 @@ pub(super) fn build_first_hop_failure_packet(shared_secret: &[u8], failure_type:
/// Process failure we got back from upstream on a payment we sent (implying htlc_source is an
/// OutboundRoute).
/// Returns update, a boolean indicating that the payment itself failed, and the error code.
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>) {
#[inline]
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>, Option<Vec<u8>>) {
	if let &HTLCSource::OutboundRoute { ref path, ref session_priv, ref first_hop_htlc_msat } = htlc_source {
 let mut res = None;
 let mut htlc_msat = *first_hop_htlc_msat;
 let mut error_code_ret = None;
 let mut error_packet_ret = None;
 let mut next_route_hop_ix = 0;
 let mut is_from_final_node = false;

Expand DownExpand Up@@ -356,6 +358,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<

 let error_code = byte_utils::slice_to_be16(&error_code_slice);
 error_code_ret = Some(error_code);
 error_packet_ret = Some(err_packet.failuremsg[2..].to_vec());

 let (debug_field, debug_field_size) = errors::get_onion_debug_field(error_code);

Expand DownExpand Up@@ -456,11 +459,11 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<
 }
 }).expect("Route that we sent via spontaneously grew invalid keys in the middle of it?");
 if let Some((channel_update, payment_retryable)) = res {
 (channel_update, payment_retryable, error_code_ret)
 (channel_update, payment_retryable, error_code_ret, error_packet_ret)
 } else {
 // only not set either packet unparseable or hmac does not match with any
 // payment not retryable only when garbage is from the final node
 (None, !is_from_final_node, None)
 (None, !is_from_final_node, None, None)
 }
	} else { unreachable!(); }
}
Expand Down

8 changes: 8 additions & 0 deletions
lightning/src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,8 @@ pub enum Event {
 rejected_by_dest: bool,
#[cfg(test)]
 error_code: Option<u16>,
#[cfg(test)]
 error_data: Option<Vec<u8>>,
	},
	/// Used to indicate that ChannelManager::process_pending_htlc_forwards should be called at a
	/// time in the future.
Expand DownExpand Up@@ -142,12 +144,16 @@ impl Writeable for Event {
 &Event::PaymentFailed { ref payment_hash, ref rejected_by_dest,
 #[cfg(test)]
 ref error_code,
 #[cfg(test)]
 ref error_data,
 } => {
 4u8.write(writer)?;
 payment_hash.write(writer)?;
 rejected_by_dest.write(writer)?;
 #[cfg(test)]
 error_code.write(writer)?;
 #[cfg(test)]
 error_data.write(writer)?;
 },
 &Event::PendingHTLCsForwardable { time_forwardable: _ } => {
 5u8.write(writer)?;
Expand DownExpand Up@@ -186,6 +192,8 @@ impl MaybeReadable for Event {
 rejected_by_dest: Readable::read(reader)?,
 #[cfg(test)]
 error_code: Readable::read(reader)?,
 #[cfg(test)]
 error_data: Readable::read(reader)?,
 })),
 5u8 => Ok(Some(Event::PendingHTLCsForwardable {
 time_forwardable: Duration::from_secs(0)
Expand Down

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

Skip to content
Include height to incorrect_or_unknown_payment_details failure#596

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

from

Apr 20, 2020
 Merged


Include height to incorrect_or_unknown_payment_details failure
#596
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fae46a0

Include `height` to `incorrect_or_unknown_payment_details` failure


D4nte Apr 19, 2020
236887d

Test that `height` is included for incorrect payment details


D4nte Apr 19, 2020

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


36 changes: 27 additions & 9 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1733,12 +1733,19 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 }
 if total_value >= msgs::MAX_VALUE_MSAT || total_value > data.total_msat {
 for htlc in htlcs.iter() {
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(
 &byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire)
 as u32,
Comment thread
D4nte marked this conversation as resolved.

 ),
 );
 failed_forwards.push((HTLCSource::PreviousHopData(HTLCPreviousHopData {
 short_channel_id: htlc.prev_hop.short_channel_id,
 htlc_id: htlc.prev_hop.htlc_id,
 incoming_packet_shared_secret: htlc.prev_hop.incoming_packet_shared_secret,
 }), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() }
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data }
 ));
 }
 } else if total_value == data.total_msat {
Expand DownExpand Up@@ -1819,9 +1826,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 if let Some(mut sources) = removed_source {
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() });
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data });
 }
 true
 } else { false }
Expand All@@ -1845,9 +1856,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (channel_update, payment_retryable, onion_error_code) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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 (channel_update, payment_retryable, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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@@ -1863,13 +1874,17 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 payment_hash: payment_hash.clone(),
 rejected_by_dest: !payment_retryable,
#[cfg(test)]
 error_code: onion_error_code
 error_code: onion_error_code,
#[cfg(test)]
 error_data: onion_error_data
 }
 );
 },
 &HTLCFailReason::Reason {
#[cfg(test)]
 ref failure_code,
#[cfg(test)]
 ref data,
 .. } => {
 // we get a fail_malformed_htlc from the first hop
 // TODO: We'd like to generate a PaymentFailureNetworkUpdate for temporary
Expand All@@ -1884,6 +1899,8 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 rejected_by_dest: path.len() == 1,
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
 error_data: Some(data.clone()),
 }
 );
 }
Expand DownExpand Up@@ -1982,12 +1999,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 if (is_mpp && !valid_mpp) || (!is_mpp && (htlc.value < expected_amount || htlc.value > expected_amount * 2)) {
 let mut htlc_msat_data = byte_utils::be64_to_array(htlc.value).to_vec();
 let mut height_data = byte_utils::be32_to_array(self.latest_block_height.load(Ordering::Acquire) as u32).to_vec();
 htlc_msat_data.append(&mut height_data);
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), &payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_data });
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_height_data });
 } else {
 match self.claim_funds_from_hop(channel_state.as_mut().unwrap(), htlc.prev_hop, payment_preimage) {
 Err(Some(e)) => {
Expand Down

15 changes: 13 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5326,7 +5326,7 @@ fn run_onion_failure_test_with_fail_intercept<F1,F2,F3>(_name: &str, test_case:

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, error_data: _ } = &events[0] {
 assert_eq!(*rejected_by_dest, !expected_retryable);
 assert_eq!(*error_code, expected_error_code);
	} else {
Expand DownExpand Up@@ -6914,9 +6914,20 @@ fn test_check_htlc_underpaying() {

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, ref error_data } = &events[0] {
 assert_eq!(*rejected_by_dest, true);
 assert_eq!(error_code.unwrap(), 0x4000|15);
 // 10_000 msat as u64, followed by a height of 99 as u32
 assert_eq!(&error_data.as_ref().unwrap()[..], &[
 ((10_000u64 >> 7*8) & 0xff) as u8,
 ((10_000u64 >> 6*8) & 0xff) as u8,
 ((10_000u64 >> 5*8) & 0xff) as u8,
 ((10_000u64 >> 4*8) & 0xff) as u8,
 ((10_000u64 >> 3*8) & 0xff) as u8,
 ((10_000u64 >> 2*8) & 0xff) as u8,
 ((10_000u64 >> 1*8) & 0xff) as u8,
 ((10_000u64 >> 0*8) & 0xff) as u8,
 0, 0, 0, 99]);
	} else {
 panic!("Unexpected event");
	}
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,11 +317,13 @@ pub(super) fn build_first_hop_failure_packet(shared_secret: &[u8], failure_type:
/// Process failure we got back from upstream on a payment we sent (implying htlc_source is an
/// OutboundRoute).
/// Returns update, a boolean indicating that the payment itself failed, and the error code.
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>) {
#[inline]
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>, Option<Vec<u8>>) {
	if let &HTLCSource::OutboundRoute { ref path, ref session_priv, ref first_hop_htlc_msat } = htlc_source {
 let mut res = None;
 let mut htlc_msat = *first_hop_htlc_msat;
 let mut error_code_ret = None;
 let mut error_packet_ret = None;
 let mut next_route_hop_ix = 0;
 let mut is_from_final_node = false;

Expand DownExpand Up@@ -356,6 +358,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<

 let error_code = byte_utils::slice_to_be16(&error_code_slice);
 error_code_ret = Some(error_code);
 error_packet_ret = Some(err_packet.failuremsg[2..].to_vec());

 let (debug_field, debug_field_size) = errors::get_onion_debug_field(error_code);

Expand DownExpand Up@@ -456,11 +459,11 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<
 }
 }).expect("Route that we sent via spontaneously grew invalid keys in the middle of it?");
 if let Some((channel_update, payment_retryable)) = res {
 (channel_update, payment_retryable, error_code_ret)
 (channel_update, payment_retryable, error_code_ret, error_packet_ret)
 } else {
 // only not set either packet unparseable or hmac does not match with any
 // payment not retryable only when garbage is from the final node
 (None, !is_from_final_node, None)
 (None, !is_from_final_node, None, None)
 }
	} else { unreachable!(); }
}
Expand Down

8 changes: 8 additions & 0 deletions
lightning/src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,8 @@ pub enum Event {
 rejected_by_dest: bool,
#[cfg(test)]
 error_code: Option<u16>,
#[cfg(test)]
 error_data: Option<Vec<u8>>,
	},
	/// Used to indicate that ChannelManager::process_pending_htlc_forwards should be called at a
	/// time in the future.
Expand DownExpand Up@@ -142,12 +144,16 @@ impl Writeable for Event {
 &Event::PaymentFailed { ref payment_hash, ref rejected_by_dest,
 #[cfg(test)]
 ref error_code,
 #[cfg(test)]
 ref error_data,
 } => {
 4u8.write(writer)?;
 payment_hash.write(writer)?;
 rejected_by_dest.write(writer)?;
 #[cfg(test)]
 error_code.write(writer)?;
 #[cfg(test)]
 error_data.write(writer)?;
 },
 &Event::PendingHTLCsForwardable { time_forwardable: _ } => {
 5u8.write(writer)?;
Expand DownExpand Up@@ -186,6 +192,8 @@ impl MaybeReadable for Event {
 rejected_by_dest: Readable::read(reader)?,
 #[cfg(test)]
 error_code: Readable::read(reader)?,
 #[cfg(test)]
 error_data: Readable::read(reader)?,
 })),
 5u8 => Ok(Some(Event::PendingHTLCsForwardable {
 time_forwardable: Duration::from_secs(0)
Expand Down

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

Skip to content
Include height to incorrect_or_unknown_payment_details failure#596

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

from

Apr 20, 2020
 Merged


Include height to incorrect_or_unknown_payment_details failure
#596
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fae46a0

Include `height` to `incorrect_or_unknown_payment_details` failure


D4nte Apr 19, 2020
236887d

Test that `height` is included for incorrect payment details


D4nte Apr 19, 2020

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


36 changes: 27 additions & 9 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1733,12 +1733,19 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 }
 if total_value >= msgs::MAX_VALUE_MSAT || total_value > data.total_msat {
 for htlc in htlcs.iter() {
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(
 &byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire)
 as u32,
Comment thread
D4nte marked this conversation as resolved.

 ),
 );
 failed_forwards.push((HTLCSource::PreviousHopData(HTLCPreviousHopData {
 short_channel_id: htlc.prev_hop.short_channel_id,
 htlc_id: htlc.prev_hop.htlc_id,
 incoming_packet_shared_secret: htlc.prev_hop.incoming_packet_shared_secret,
 }), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() }
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data }
 ));
 }
 } else if total_value == data.total_msat {
Expand DownExpand Up@@ -1819,9 +1826,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 if let Some(mut sources) = removed_source {
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() });
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data });
 }
 true
 } else { false }
Expand All@@ -1845,9 +1856,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (channel_update, payment_retryable, onion_error_code) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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 (channel_update, payment_retryable, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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@@ -1863,13 +1874,17 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 payment_hash: payment_hash.clone(),
 rejected_by_dest: !payment_retryable,
#[cfg(test)]
 error_code: onion_error_code
 error_code: onion_error_code,
#[cfg(test)]
 error_data: onion_error_data
 }
 );
 },
 &HTLCFailReason::Reason {
#[cfg(test)]
 ref failure_code,
#[cfg(test)]
 ref data,
 .. } => {
 // we get a fail_malformed_htlc from the first hop
 // TODO: We'd like to generate a PaymentFailureNetworkUpdate for temporary
Expand All@@ -1884,6 +1899,8 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 rejected_by_dest: path.len() == 1,
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
 error_data: Some(data.clone()),
 }
 );
 }
Expand DownExpand Up@@ -1982,12 +1999,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 if (is_mpp && !valid_mpp) || (!is_mpp && (htlc.value < expected_amount || htlc.value > expected_amount * 2)) {
 let mut htlc_msat_data = byte_utils::be64_to_array(htlc.value).to_vec();
 let mut height_data = byte_utils::be32_to_array(self.latest_block_height.load(Ordering::Acquire) as u32).to_vec();
 htlc_msat_data.append(&mut height_data);
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), &payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_data });
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_height_data });
 } else {
 match self.claim_funds_from_hop(channel_state.as_mut().unwrap(), htlc.prev_hop, payment_preimage) {
 Err(Some(e)) => {
Expand Down

15 changes: 13 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5326,7 +5326,7 @@ fn run_onion_failure_test_with_fail_intercept<F1,F2,F3>(_name: &str, test_case:

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, error_data: _ } = &events[0] {
 assert_eq!(*rejected_by_dest, !expected_retryable);
 assert_eq!(*error_code, expected_error_code);
	} else {
Expand DownExpand Up@@ -6914,9 +6914,20 @@ fn test_check_htlc_underpaying() {

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, ref error_data } = &events[0] {
 assert_eq!(*rejected_by_dest, true);
 assert_eq!(error_code.unwrap(), 0x4000|15);
 // 10_000 msat as u64, followed by a height of 99 as u32
 assert_eq!(&error_data.as_ref().unwrap()[..], &[
 ((10_000u64 >> 7*8) & 0xff) as u8,
 ((10_000u64 >> 6*8) & 0xff) as u8,
 ((10_000u64 >> 5*8) & 0xff) as u8,
 ((10_000u64 >> 4*8) & 0xff) as u8,
 ((10_000u64 >> 3*8) & 0xff) as u8,
 ((10_000u64 >> 2*8) & 0xff) as u8,
 ((10_000u64 >> 1*8) & 0xff) as u8,
 ((10_000u64 >> 0*8) & 0xff) as u8,
 0, 0, 0, 99]);
	} else {
 panic!("Unexpected event");
	}
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,11 +317,13 @@ pub(super) fn build_first_hop_failure_packet(shared_secret: &[u8], failure_type:
/// Process failure we got back from upstream on a payment we sent (implying htlc_source is an
/// OutboundRoute).
/// Returns update, a boolean indicating that the payment itself failed, and the error code.
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>) {
#[inline]
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>, Option<Vec<u8>>) {
	if let &HTLCSource::OutboundRoute { ref path, ref session_priv, ref first_hop_htlc_msat } = htlc_source {
 let mut res = None;
 let mut htlc_msat = *first_hop_htlc_msat;
 let mut error_code_ret = None;
 let mut error_packet_ret = None;
 let mut next_route_hop_ix = 0;
 let mut is_from_final_node = false;

Expand DownExpand Up@@ -356,6 +358,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<

 let error_code = byte_utils::slice_to_be16(&error_code_slice);
 error_code_ret = Some(error_code);
 error_packet_ret = Some(err_packet.failuremsg[2..].to_vec());

 let (debug_field, debug_field_size) = errors::get_onion_debug_field(error_code);

Expand DownExpand Up@@ -456,11 +459,11 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<
 }
 }).expect("Route that we sent via spontaneously grew invalid keys in the middle of it?");
 if let Some((channel_update, payment_retryable)) = res {
 (channel_update, payment_retryable, error_code_ret)
 (channel_update, payment_retryable, error_code_ret, error_packet_ret)
 } else {
 // only not set either packet unparseable or hmac does not match with any
 // payment not retryable only when garbage is from the final node
 (None, !is_from_final_node, None)
 (None, !is_from_final_node, None, None)
 }
	} else { unreachable!(); }
}
Expand Down

8 changes: 8 additions & 0 deletions
lightning/src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,8 @@ pub enum Event {
 rejected_by_dest: bool,
#[cfg(test)]
 error_code: Option<u16>,
#[cfg(test)]
 error_data: Option<Vec<u8>>,
	},
	/// Used to indicate that ChannelManager::process_pending_htlc_forwards should be called at a
	/// time in the future.
Expand DownExpand Up@@ -142,12 +144,16 @@ impl Writeable for Event {
 &Event::PaymentFailed { ref payment_hash, ref rejected_by_dest,
 #[cfg(test)]
 ref error_code,
 #[cfg(test)]
 ref error_data,
 } => {
 4u8.write(writer)?;
 payment_hash.write(writer)?;
 rejected_by_dest.write(writer)?;
 #[cfg(test)]
 error_code.write(writer)?;
 #[cfg(test)]
 error_data.write(writer)?;
 },
 &Event::PendingHTLCsForwardable { time_forwardable: _ } => {
 5u8.write(writer)?;
Expand DownExpand Up@@ -186,6 +192,8 @@ impl MaybeReadable for Event {
 rejected_by_dest: Readable::read(reader)?,
 #[cfg(test)]
 error_code: Readable::read(reader)?,
 #[cfg(test)]
 error_data: Readable::read(reader)?,
 })),
 5u8 => Ok(Some(Event::PendingHTLCsForwardable {
 time_forwardable: Duration::from_secs(0)
Expand Down

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

Skip to content
Include height to incorrect_or_unknown_payment_details failure#596

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

from

Apr 20, 2020
 Merged


Include height to incorrect_or_unknown_payment_details failure
#596
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fae46a0

Include `height` to `incorrect_or_unknown_payment_details` failure


D4nte Apr 19, 2020
236887d

Test that `height` is included for incorrect payment details


D4nte Apr 19, 2020

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


36 changes: 27 additions & 9 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1733,12 +1733,19 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 }
 if total_value >= msgs::MAX_VALUE_MSAT || total_value > data.total_msat {
 for htlc in htlcs.iter() {
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(
 &byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire)
 as u32,
Comment thread
D4nte marked this conversation as resolved.

 ),
 );
 failed_forwards.push((HTLCSource::PreviousHopData(HTLCPreviousHopData {
 short_channel_id: htlc.prev_hop.short_channel_id,
 htlc_id: htlc.prev_hop.htlc_id,
 incoming_packet_shared_secret: htlc.prev_hop.incoming_packet_shared_secret,
 }), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() }
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data }
 ));
 }
 } else if total_value == data.total_msat {
Expand DownExpand Up@@ -1819,9 +1826,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 if let Some(mut sources) = removed_source {
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() });
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data });
 }
 true
 } else { false }
Expand All@@ -1845,9 +1856,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (channel_update, payment_retryable, onion_error_code) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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 (channel_update, payment_retryable, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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@@ -1863,13 +1874,17 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 payment_hash: payment_hash.clone(),
 rejected_by_dest: !payment_retryable,
#[cfg(test)]
 error_code: onion_error_code
 error_code: onion_error_code,
#[cfg(test)]
 error_data: onion_error_data
 }
 );
 },
 &HTLCFailReason::Reason {
#[cfg(test)]
 ref failure_code,
#[cfg(test)]
 ref data,
 .. } => {
 // we get a fail_malformed_htlc from the first hop
 // TODO: We'd like to generate a PaymentFailureNetworkUpdate for temporary
Expand All@@ -1884,6 +1899,8 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 rejected_by_dest: path.len() == 1,
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
 error_data: Some(data.clone()),
 }
 );
 }
Expand DownExpand Up@@ -1982,12 +1999,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 if (is_mpp && !valid_mpp) || (!is_mpp && (htlc.value < expected_amount || htlc.value > expected_amount * 2)) {
 let mut htlc_msat_data = byte_utils::be64_to_array(htlc.value).to_vec();
 let mut height_data = byte_utils::be32_to_array(self.latest_block_height.load(Ordering::Acquire) as u32).to_vec();
 htlc_msat_data.append(&mut height_data);
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), &payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_data });
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_height_data });
 } else {
 match self.claim_funds_from_hop(channel_state.as_mut().unwrap(), htlc.prev_hop, payment_preimage) {
 Err(Some(e)) => {
Expand Down

15 changes: 13 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5326,7 +5326,7 @@ fn run_onion_failure_test_with_fail_intercept<F1,F2,F3>(_name: &str, test_case:

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, error_data: _ } = &events[0] {
 assert_eq!(*rejected_by_dest, !expected_retryable);
 assert_eq!(*error_code, expected_error_code);
	} else {
Expand DownExpand Up@@ -6914,9 +6914,20 @@ fn test_check_htlc_underpaying() {

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, ref error_data } = &events[0] {
 assert_eq!(*rejected_by_dest, true);
 assert_eq!(error_code.unwrap(), 0x4000|15);
 // 10_000 msat as u64, followed by a height of 99 as u32
 assert_eq!(&error_data.as_ref().unwrap()[..], &[
 ((10_000u64 >> 7*8) & 0xff) as u8,
 ((10_000u64 >> 6*8) & 0xff) as u8,
 ((10_000u64 >> 5*8) & 0xff) as u8,
 ((10_000u64 >> 4*8) & 0xff) as u8,
 ((10_000u64 >> 3*8) & 0xff) as u8,
 ((10_000u64 >> 2*8) & 0xff) as u8,
 ((10_000u64 >> 1*8) & 0xff) as u8,
 ((10_000u64 >> 0*8) & 0xff) as u8,
 0, 0, 0, 99]);
	} else {
 panic!("Unexpected event");
	}
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,11 +317,13 @@ pub(super) fn build_first_hop_failure_packet(shared_secret: &[u8], failure_type:
/// Process failure we got back from upstream on a payment we sent (implying htlc_source is an
/// OutboundRoute).
/// Returns update, a boolean indicating that the payment itself failed, and the error code.
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>) {
#[inline]
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>, Option<Vec<u8>>) {
	if let &HTLCSource::OutboundRoute { ref path, ref session_priv, ref first_hop_htlc_msat } = htlc_source {
 let mut res = None;
 let mut htlc_msat = *first_hop_htlc_msat;
 let mut error_code_ret = None;
 let mut error_packet_ret = None;
 let mut next_route_hop_ix = 0;
 let mut is_from_final_node = false;

Expand DownExpand Up@@ -356,6 +358,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<

 let error_code = byte_utils::slice_to_be16(&error_code_slice);
 error_code_ret = Some(error_code);
 error_packet_ret = Some(err_packet.failuremsg[2..].to_vec());

 let (debug_field, debug_field_size) = errors::get_onion_debug_field(error_code);

Expand DownExpand Up@@ -456,11 +459,11 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<
 }
 }).expect("Route that we sent via spontaneously grew invalid keys in the middle of it?");
 if let Some((channel_update, payment_retryable)) = res {
 (channel_update, payment_retryable, error_code_ret)
 (channel_update, payment_retryable, error_code_ret, error_packet_ret)
 } else {
 // only not set either packet unparseable or hmac does not match with any
 // payment not retryable only when garbage is from the final node
 (None, !is_from_final_node, None)
 (None, !is_from_final_node, None, None)
 }
	} else { unreachable!(); }
}
Expand Down

8 changes: 8 additions & 0 deletions
lightning/src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,8 @@ pub enum Event {
 rejected_by_dest: bool,
#[cfg(test)]
 error_code: Option<u16>,
#[cfg(test)]
 error_data: Option<Vec<u8>>,
	},
	/// Used to indicate that ChannelManager::process_pending_htlc_forwards should be called at a
	/// time in the future.
Expand DownExpand Up@@ -142,12 +144,16 @@ impl Writeable for Event {
 &Event::PaymentFailed { ref payment_hash, ref rejected_by_dest,
 #[cfg(test)]
 ref error_code,
 #[cfg(test)]
 ref error_data,
 } => {
 4u8.write(writer)?;
 payment_hash.write(writer)?;
 rejected_by_dest.write(writer)?;
 #[cfg(test)]
 error_code.write(writer)?;
 #[cfg(test)]
 error_data.write(writer)?;
 },
 &Event::PendingHTLCsForwardable { time_forwardable: _ } => {
 5u8.write(writer)?;
Expand DownExpand Up@@ -186,6 +192,8 @@ impl MaybeReadable for Event {
 rejected_by_dest: Readable::read(reader)?,
 #[cfg(test)]
 error_code: Readable::read(reader)?,
 #[cfg(test)]
 error_data: Readable::read(reader)?,
 })),
 5u8 => Ok(Some(Event::PendingHTLCsForwardable {
 time_forwardable: Duration::from_secs(0)
Expand Down

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

Skip to content
Include height to incorrect_or_unknown_payment_details failure#596

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

from

Apr 20, 2020
 Merged


Include height to incorrect_or_unknown_payment_details failure
#596
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fae46a0

Include `height` to `incorrect_or_unknown_payment_details` failure


D4nte Apr 19, 2020
236887d

Test that `height` is included for incorrect payment details


D4nte Apr 19, 2020

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


36 changes: 27 additions & 9 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1733,12 +1733,19 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 }
 if total_value >= msgs::MAX_VALUE_MSAT || total_value > data.total_msat {
 for htlc in htlcs.iter() {
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(
 &byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire)
 as u32,
Comment thread
D4nte marked this conversation as resolved.

 ),
 );
 failed_forwards.push((HTLCSource::PreviousHopData(HTLCPreviousHopData {
 short_channel_id: htlc.prev_hop.short_channel_id,
 htlc_id: htlc.prev_hop.htlc_id,
 incoming_packet_shared_secret: htlc.prev_hop.incoming_packet_shared_secret,
 }), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() }
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data }
 ));
 }
 } else if total_value == data.total_msat {
Expand DownExpand Up@@ -1819,9 +1826,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 if let Some(mut sources) = removed_source {
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: byte_utils::be64_to_array(htlc.value).to_vec() });
 HTLCFailReason::Reason { failure_code: 0x4000 | 15, data: htlc_msat_height_data });
 }
 true
 } else { false }
Expand All@@ -1845,9 +1856,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 match &onion_error {
 &HTLCFailReason::LightningError { ref err } => {
#[cfg(test)]
 let (channel_update, payment_retryable, onion_error_code) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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 (channel_update, payment_retryable, _) = onion_utils::process_onion_failure(&self.secp_ctx, &self.logger, &source, err.data.clone());
 let (channel_update, 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@@ -1863,13 +1874,17 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 payment_hash: payment_hash.clone(),
 rejected_by_dest: !payment_retryable,
#[cfg(test)]
 error_code: onion_error_code
 error_code: onion_error_code,
#[cfg(test)]
 error_data: onion_error_data
 }
 );
 },
 &HTLCFailReason::Reason {
#[cfg(test)]
 ref failure_code,
#[cfg(test)]
 ref data,
 .. } => {
 // we get a fail_malformed_htlc from the first hop
 // TODO: We'd like to generate a PaymentFailureNetworkUpdate for temporary
Expand All@@ -1884,6 +1899,8 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 rejected_by_dest: path.len() == 1,
#[cfg(test)]
 error_code: Some(*failure_code),
#[cfg(test)]
 error_data: Some(data.clone()),
 }
 );
 }
Expand DownExpand Up@@ -1982,12 +1999,13 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 for htlc in sources.drain(..) {
 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
 if (is_mpp && !valid_mpp) || (!is_mpp && (htlc.value < expected_amount || htlc.value > expected_amount * 2)) {
 let mut htlc_msat_data = byte_utils::be64_to_array(htlc.value).to_vec();
 let mut height_data = byte_utils::be32_to_array(self.latest_block_height.load(Ordering::Acquire) as u32).to_vec();
 htlc_msat_data.append(&mut height_data);
 let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
 htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
 self.latest_block_height.load(Ordering::Acquire) as u32,
 ));
 self.fail_htlc_backwards_internal(channel_state.take().unwrap(),
 HTLCSource::PreviousHopData(htlc.prev_hop), &payment_hash,
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_data });
 HTLCFailReason::Reason { failure_code: 0x4000|15, data: htlc_msat_height_data });
 } else {
 match self.claim_funds_from_hop(channel_state.as_mut().unwrap(), htlc.prev_hop, payment_preimage) {
 Err(Some(e)) => {
Expand Down

15 changes: 13 additions & 2 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5326,7 +5326,7 @@ fn run_onion_failure_test_with_fail_intercept<F1,F2,F3>(_name: &str, test_case:

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, error_data: _ } = &events[0] {
 assert_eq!(*rejected_by_dest, !expected_retryable);
 assert_eq!(*error_code, expected_error_code);
	} else {
Expand DownExpand Up@@ -6914,9 +6914,20 @@ fn test_check_htlc_underpaying() {

	let events = nodes[0].node.get_and_clear_pending_events();
	assert_eq!(events.len(), 1);
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code } = &events[0] {
	if let &Event::PaymentFailed { payment_hash:_, ref rejected_by_dest, ref error_code, ref error_data } = &events[0] {
 assert_eq!(*rejected_by_dest, true);
 assert_eq!(error_code.unwrap(), 0x4000|15);
 // 10_000 msat as u64, followed by a height of 99 as u32
 assert_eq!(&error_data.as_ref().unwrap()[..], &[
 ((10_000u64 >> 7*8) & 0xff) as u8,
 ((10_000u64 >> 6*8) & 0xff) as u8,
 ((10_000u64 >> 5*8) & 0xff) as u8,
 ((10_000u64 >> 4*8) & 0xff) as u8,
 ((10_000u64 >> 3*8) & 0xff) as u8,
 ((10_000u64 >> 2*8) & 0xff) as u8,
 ((10_000u64 >> 1*8) & 0xff) as u8,
 ((10_000u64 >> 0*8) & 0xff) as u8,
 0, 0, 0, 99]);
	} else {
 panic!("Unexpected event");
	}
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,11 +317,13 @@ pub(super) fn build_first_hop_failure_packet(shared_secret: &[u8], failure_type:
/// Process failure we got back from upstream on a payment we sent (implying htlc_source is an
/// OutboundRoute).
/// Returns update, a boolean indicating that the payment itself failed, and the error code.
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>) {
#[inline]
pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, logger: &Arc<Logger>, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool, Option<u16>, Option<Vec<u8>>) {
	if let &HTLCSource::OutboundRoute { ref path, ref session_priv, ref first_hop_htlc_msat } = htlc_source {
 let mut res = None;
 let mut htlc_msat = *first_hop_htlc_msat;
 let mut error_code_ret = None;
 let mut error_packet_ret = None;
 let mut next_route_hop_ix = 0;
 let mut is_from_final_node = false;

Expand DownExpand Up@@ -356,6 +358,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<

 let error_code = byte_utils::slice_to_be16(&error_code_slice);
 error_code_ret = Some(error_code);
 error_packet_ret = Some(err_packet.failuremsg[2..].to_vec());

 let (debug_field, debug_field_size) = errors::get_onion_debug_field(error_code);

Expand DownExpand Up@@ -456,11 +459,11 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<
 }
 }).expect("Route that we sent via spontaneously grew invalid keys in the middle of it?");
 if let Some((channel_update, payment_retryable)) = res {
 (channel_update, payment_retryable, error_code_ret)
 (channel_update, payment_retryable, error_code_ret, error_packet_ret)
 } else {
 // only not set either packet unparseable or hmac does not match with any
 // payment not retryable only when garbage is from the final node
 (None, !is_from_final_node, None)
 (None, !is_from_final_node, None, None)
 }
	} else { unreachable!(); }
}
Expand Down

8 changes: 8 additions & 0 deletions
lightning/src/util/events.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,8 @@ pub enum Event {
 rejected_by_dest: bool,
#[cfg(test)]
 error_code: Option<u16>,
#[cfg(test)]
 error_data: Option<Vec<u8>>,
	},
	/// Used to indicate that ChannelManager::process_pending_htlc_forwards should be called at a
	/// time in the future.
Expand DownExpand Up@@ -142,12 +144,16 @@ impl Writeable for Event {
 &Event::PaymentFailed { ref payment_hash, ref rejected_by_dest,
 #[cfg(test)]
 ref error_code,
 #[cfg(test)]
 ref error_data,
 } => {
 4u8.write(writer)?;
 payment_hash.write(writer)?;
 rejected_by_dest.write(writer)?;
 #[cfg(test)]
 error_code.write(writer)?;
 #[cfg(test)]
 error_data.write(writer)?;
 },
 &Event::PendingHTLCsForwardable { time_forwardable: _ } => {
 5u8.write(writer)?;
Expand DownExpand Up@@ -186,6 +192,8 @@ impl MaybeReadable for Event {
 rejected_by_dest: Readable::read(reader)?,
 #[cfg(test)]
 error_code: Readable::read(reader)?,
 #[cfg(test)]
 error_data: Readable::read(reader)?,
 })),
 5u8 => Ok(Some(Event::PendingHTLCsForwardable {
 time_forwardable: Duration::from_secs(0)
Expand Down