Rename PendingHTLCInfo fields to include msat suffix#1844

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
valentinewallace merged 1 commit into from
Nov 10, 2022
Merged

Rename PendingHTLCInfo fields to include msat suffix #1844

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,8 +112,8 @@ pub(super) struct PendingHTLCInfo {
pub(super) routing: PendingHTLCRouting,
pub(super) incoming_shared_secret: [u8; 32],
payment_hash: PaymentHash,
pub(super) amt_to_forward: u64,
pub(super) amt_incoming: Option<u64>, // Added in 0.0.113
pub(super) incoming_amt_msat: Option<u64>, // Added in 0.0.113
pub(super) outgoing_amt_msat: u64,
pub(super) outgoing_cltv_value: u32,
}

Expand DownExpand Up@@ -2197,8 +2197,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
routing,
payment_hash,
incoming_shared_secret: shared_secret,
amt_incoming: Some(amt_msat),
amt_to_forward: amt_msat,
incoming_amt_msat: Some(amt_msat),
outgoing_amt_msat: amt_msat,
outgoing_cltv_value: hop_data.outgoing_cltv_value,
})
}
Expand DownExpand Up@@ -2294,14 +2294,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
},
payment_hash: msg.payment_hash.clone(),
incoming_shared_secret: shared_secret,
amt_incoming: Some(msg.amount_msat),
amt_to_forward: next_hop_data.amt_to_forward,
incoming_amt_msat: Some(msg.amount_msat),
outgoing_amt_msat: next_hop_data.amt_to_forward,
outgoing_cltv_value: next_hop_data.outgoing_cltv_value,
})
}
};

if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref amt_to_forward, ref outgoing_cltv_value, .. }) = &pending_forward_info {
if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref outgoing_amt_msat, ref outgoing_cltv_value, .. }) = &pending_forward_info {
// If short_channel_id is 0 here, we'll reject the HTLC as there cannot be a channel
// with a short_channel_id of 0. This is important as various things later assume
// short_channel_id is non-0 in any ::Forward.
Expand DownExpand Up@@ -2352,10 +2352,10 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
if !chan.is_live() { // channel_disabled
break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
}
if *amt_to_forward < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
}
if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *amt_to_forward, *outgoing_cltv_value) {
if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *outgoing_amt_msat, *outgoing_cltv_value) {
break Some((err, code, chan_update_opt));
}
chan_update_opt
Expand DownExpand Up@@ -3157,8 +3157,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
forward_info: PendingHTLCInfo {
routing, incoming_shared_secret, payment_hash, amt_to_forward,
outgoing_cltv_value, amt_incoming: _
routing, incoming_shared_secret, payment_hash, outgoing_amt_msat,
outgoing_cltv_value, incoming_amt_msat: _
}
}) => {
macro_rules! failure_handler {
Expand DownExpand Up@@ -3220,7 +3220,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
};
match next_hop {
onion_utils::Hop::Receive(hop_data) => {
match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value, Some(phantom_shared_secret)) {
match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value, Some(phantom_shared_secret)) {
Ok(info) => phantom_receives.push((prev_short_channel_id, prev_funding_outpoint, vec![(info, prev_htlc_id)])),
Err(ReceiveError { err_code, err_data, msg }) => failed_payment!(msg, err_code, err_data, Some(phantom_shared_secret))
}
Expand DownExpand Up@@ -3264,8 +3264,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
prev_short_channel_id, prev_htlc_id, prev_funding_outpoint ,
forward_info: PendingHTLCInfo {
incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value,
routing: PendingHTLCRouting::Forward { onion_packet, .. }, amt_incoming: _,
incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value,
routing: PendingHTLCRouting::Forward { onion_packet, .. }, incoming_amt_msat: _,
},
}) => {
log_trace!(self.logger, "Adding HTLC from short id {} with payment_hash {} to channel with short id {} after delay", prev_short_channel_id, log_bytes!(payment_hash.0), short_chan_id);
Expand All@@ -3277,7 +3277,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
// Phantom payments are only PendingHTLCRouting::Receive.
phantom_shared_secret: None,
});
match chan.get_mut().send_htlc(amt_to_forward, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
match chan.get_mut().send_htlc(outgoing_amt_msat, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
Err(e) => {
if let ChannelError::Ignore(msg) = e {
log_trace!(self.logger, "Failed to forward HTLC with payment_hash {}: {}", log_bytes!(payment_hash.0), msg);
Expand DownExpand Up@@ -3391,7 +3391,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
forward_info: PendingHTLCInfo {
routing, incoming_shared_secret, payment_hash, amt_to_forward, ..
routing, incoming_shared_secret, payment_hash, outgoing_amt_msat, ..
}
}) => {
let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret) = match routing {
Expand All@@ -3413,9 +3413,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
incoming_packet_shared_secret: incoming_shared_secret,
phantom_shared_secret,
},
value: amt_to_forward,
value: outgoing_amt_msat,
timer_ticks: 0,
total_msat: if let Some(data) = &payment_data { data.total_msat } else { amt_to_forward },
total_msat: if let Some(data) = &payment_data { data.total_msat } else { outgoing_amt_msat },
cltv_expiry,
onion_payload,
};
Expand DownExpand Up@@ -3522,7 +3522,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
e.insert((purpose.clone(), vec![claimable_htlc]));
new_events.push(events::Event::PaymentReceived {
payment_hash,
amount_msat: amt_to_forward,
amount_msat: outgoing_amt_msat,
purpose,
});
},
Expand DownExpand Up@@ -6472,9 +6472,9 @@ impl_writeable_tlv_based!(PendingHTLCInfo, {
(0, routing, required),
(2, incoming_shared_secret, required),
(4, payment_hash, required),
(6, amt_to_forward, required),
(6, outgoing_amt_msat, required),
(8, outgoing_cltv_value, required),
(9, amt_incoming, option),
(9, incoming_amt_msat, option),
});


Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/onion_route_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -568,7 +568,7 @@ fn test_onion_failure() {
for f in pending_forwards.iter_mut() {
match f {
&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo { ref mut forward_info, .. }) =>
forward_info.amt_to_forward -= 1,
forward_info.outgoing_amt_msat -= 1,
_ => {},
}
}
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
Rename PendingHTLCInfo fields to include msat suffix#1844

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 1 commit into

from

Nov 10, 2022
 Merged


Rename PendingHTLCInfo fields to include msat suffix
#1844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,8 +112,8 @@ pub(super) struct PendingHTLCInfo {
	pub(super) routing: PendingHTLCRouting,
	pub(super) incoming_shared_secret: [u8; 32],
	payment_hash: PaymentHash,
	pub(super) amt_to_forward: u64,
	pub(super) amt_incoming: Option<u64>, // Added in 0.0.113
	pub(super) incoming_amt_msat: Option<u64>, // Added in 0.0.113
	pub(super) outgoing_amt_msat: u64,
	pub(super) outgoing_cltv_value: u32,
}

Expand DownExpand Up@@ -2197,8 +2197,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 routing,
 payment_hash,
 incoming_shared_secret: shared_secret,
amt_incoming: Some(amt_msat),
amt_to_forward: amt_msat,
incoming_amt_msat: Some(amt_msat),
outgoing_amt_msat: amt_msat,
 outgoing_cltv_value: hop_data.outgoing_cltv_value,
 })
	}
Expand DownExpand Up@@ -2294,14 +2294,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 },
 payment_hash: msg.payment_hash.clone(),
 incoming_shared_secret: shared_secret,
amt_incoming: Some(msg.amount_msat),
amt_to_forward: next_hop_data.amt_to_forward,
incoming_amt_msat: Some(msg.amount_msat),
outgoing_amt_msat: next_hop_data.amt_to_forward,
 outgoing_cltv_value: next_hop_data.outgoing_cltv_value,
 })
 }
 };

 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref amt_to_forward, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref outgoing_amt_msat, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 // If short_channel_id is 0 here, we'll reject the HTLC as there cannot be a channel
 // with a short_channel_id of 0. This is important as various things later assume
 // short_channel_id is non-0 in any ::Forward.
Expand DownExpand Up@@ -2352,10 +2352,10 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 }
 if *amt_to_forward < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
 }
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *amt_to_forward, *outgoing_cltv_value) {
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *outgoing_amt_msat, *outgoing_cltv_value) {
 break Some((err, code, chan_update_opt));
 }
 chan_update_opt
Expand DownExpand Up@@ -3157,8 +3157,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward,
 outgoing_cltv_value, amt_incoming: _
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat,
 outgoing_cltv_value, incoming_amt_msat: _
 }
 }) => {
 macro_rules! failure_handler {
Expand DownExpand Up@@ -3220,7 +3220,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 };
 match next_hop {
 onion_utils::Hop::Receive(hop_data) => {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value, Some(phantom_shared_secret)) {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value, Some(phantom_shared_secret)) {
 Ok(info) => phantom_receives.push((prev_short_channel_id, prev_funding_outpoint, vec![(info, prev_htlc_id)])),
 Err(ReceiveError { err_code, err_data, msg }) => failed_payment!(msg, err_code, err_data, Some(phantom_shared_secret))
 }
Expand DownExpand Up@@ -3264,8 +3264,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint ,
 forward_info: PendingHTLCInfo {
 incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, amt_incoming: _,
 incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, incoming_amt_msat: _,
 },
 }) => {
 log_trace!(self.logger, "Adding HTLC from short id {} with payment_hash {} to channel with short id {} after delay", prev_short_channel_id, log_bytes!(payment_hash.0), short_chan_id);
Expand All@@ -3277,7 +3277,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 // Phantom payments are only PendingHTLCRouting::Receive.
 phantom_shared_secret: None,
 });
 match chan.get_mut().send_htlc(amt_to_forward, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 match chan.get_mut().send_htlc(outgoing_amt_msat, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 Err(e) => {
 if let ChannelError::Ignore(msg) = e {
 log_trace!(self.logger, "Failed to forward HTLC with payment_hash {}: {}", log_bytes!(payment_hash.0), msg);
Expand DownExpand Up@@ -3391,7 +3391,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward, ..
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat, ..
 }
 }) => {
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret) = match routing {
Expand All@@ -3413,9 +3413,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 incoming_packet_shared_secret: incoming_shared_secret,
 phantom_shared_secret,
 },
 value: amt_to_forward,
 value: outgoing_amt_msat,
 timer_ticks: 0,
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { amt_to_forward },
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { outgoing_amt_msat },
 cltv_expiry,
 onion_payload,
 };
Expand DownExpand Up@@ -3522,7 +3522,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 e.insert((purpose.clone(), vec![claimable_htlc]));
 new_events.push(events::Event::PaymentReceived {
 payment_hash,
 amount_msat: amt_to_forward,
 amount_msat: outgoing_amt_msat,
 purpose,
 });
 },
Expand DownExpand Up@@ -6472,9 +6472,9 @@ impl_writeable_tlv_based!(PendingHTLCInfo, {
	(0, routing, required),
	(2, incoming_shared_secret, required),
	(4, payment_hash, required),
	(6, amt_to_forward, required),
	(6, outgoing_amt_msat, required),
	(8, outgoing_cltv_value, required),
	(9, amt_incoming, option),
	(9, incoming_amt_msat, option),
});


Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -568,7 +568,7 @@ fn test_onion_failure() {
 for f in pending_forwards.iter_mut() {
 match f {
 &mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo { ref mut forward_info, .. }) =>
 forward_info.amt_to_forward -= 1,
 forward_info.outgoing_amt_msat -= 1,
 _ => {},
 }
 }
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
Rename PendingHTLCInfo fields to include msat suffix#1844

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 1 commit into

from

Nov 10, 2022
 Merged


Rename PendingHTLCInfo fields to include msat suffix
#1844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,8 +112,8 @@ pub(super) struct PendingHTLCInfo {
	pub(super) routing: PendingHTLCRouting,
	pub(super) incoming_shared_secret: [u8; 32],
	payment_hash: PaymentHash,
	pub(super) amt_to_forward: u64,
	pub(super) amt_incoming: Option<u64>, // Added in 0.0.113
	pub(super) incoming_amt_msat: Option<u64>, // Added in 0.0.113
	pub(super) outgoing_amt_msat: u64,
	pub(super) outgoing_cltv_value: u32,
}

Expand DownExpand Up@@ -2197,8 +2197,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 routing,
 payment_hash,
 incoming_shared_secret: shared_secret,
amt_incoming: Some(amt_msat),
amt_to_forward: amt_msat,
incoming_amt_msat: Some(amt_msat),
outgoing_amt_msat: amt_msat,
 outgoing_cltv_value: hop_data.outgoing_cltv_value,
 })
	}
Expand DownExpand Up@@ -2294,14 +2294,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 },
 payment_hash: msg.payment_hash.clone(),
 incoming_shared_secret: shared_secret,
amt_incoming: Some(msg.amount_msat),
amt_to_forward: next_hop_data.amt_to_forward,
incoming_amt_msat: Some(msg.amount_msat),
outgoing_amt_msat: next_hop_data.amt_to_forward,
 outgoing_cltv_value: next_hop_data.outgoing_cltv_value,
 })
 }
 };

 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref amt_to_forward, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref outgoing_amt_msat, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 // If short_channel_id is 0 here, we'll reject the HTLC as there cannot be a channel
 // with a short_channel_id of 0. This is important as various things later assume
 // short_channel_id is non-0 in any ::Forward.
Expand DownExpand Up@@ -2352,10 +2352,10 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 }
 if *amt_to_forward < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
 }
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *amt_to_forward, *outgoing_cltv_value) {
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *outgoing_amt_msat, *outgoing_cltv_value) {
 break Some((err, code, chan_update_opt));
 }
 chan_update_opt
Expand DownExpand Up@@ -3157,8 +3157,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward,
 outgoing_cltv_value, amt_incoming: _
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat,
 outgoing_cltv_value, incoming_amt_msat: _
 }
 }) => {
 macro_rules! failure_handler {
Expand DownExpand Up@@ -3220,7 +3220,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 };
 match next_hop {
 onion_utils::Hop::Receive(hop_data) => {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value, Some(phantom_shared_secret)) {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value, Some(phantom_shared_secret)) {
 Ok(info) => phantom_receives.push((prev_short_channel_id, prev_funding_outpoint, vec![(info, prev_htlc_id)])),
 Err(ReceiveError { err_code, err_data, msg }) => failed_payment!(msg, err_code, err_data, Some(phantom_shared_secret))
 }
Expand DownExpand Up@@ -3264,8 +3264,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint ,
 forward_info: PendingHTLCInfo {
 incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, amt_incoming: _,
 incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, incoming_amt_msat: _,
 },
 }) => {
 log_trace!(self.logger, "Adding HTLC from short id {} with payment_hash {} to channel with short id {} after delay", prev_short_channel_id, log_bytes!(payment_hash.0), short_chan_id);
Expand All@@ -3277,7 +3277,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 // Phantom payments are only PendingHTLCRouting::Receive.
 phantom_shared_secret: None,
 });
 match chan.get_mut().send_htlc(amt_to_forward, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 match chan.get_mut().send_htlc(outgoing_amt_msat, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 Err(e) => {
 if let ChannelError::Ignore(msg) = e {
 log_trace!(self.logger, "Failed to forward HTLC with payment_hash {}: {}", log_bytes!(payment_hash.0), msg);
Expand DownExpand Up@@ -3391,7 +3391,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward, ..
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat, ..
 }
 }) => {
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret) = match routing {
Expand All@@ -3413,9 +3413,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 incoming_packet_shared_secret: incoming_shared_secret,
 phantom_shared_secret,
 },
 value: amt_to_forward,
 value: outgoing_amt_msat,
 timer_ticks: 0,
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { amt_to_forward },
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { outgoing_amt_msat },
 cltv_expiry,
 onion_payload,
 };
Expand DownExpand Up@@ -3522,7 +3522,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 e.insert((purpose.clone(), vec![claimable_htlc]));
 new_events.push(events::Event::PaymentReceived {
 payment_hash,
 amount_msat: amt_to_forward,
 amount_msat: outgoing_amt_msat,
 purpose,
 });
 },
Expand DownExpand Up@@ -6472,9 +6472,9 @@ impl_writeable_tlv_based!(PendingHTLCInfo, {
	(0, routing, required),
	(2, incoming_shared_secret, required),
	(4, payment_hash, required),
	(6, amt_to_forward, required),
	(6, outgoing_amt_msat, required),
	(8, outgoing_cltv_value, required),
	(9, amt_incoming, option),
	(9, incoming_amt_msat, option),
});


Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -568,7 +568,7 @@ fn test_onion_failure() {
 for f in pending_forwards.iter_mut() {
 match f {
 &mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo { ref mut forward_info, .. }) =>
 forward_info.amt_to_forward -= 1,
 forward_info.outgoing_amt_msat -= 1,
 _ => {},
 }
 }
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
Rename PendingHTLCInfo fields to include msat suffix#1844

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 1 commit into

from

Nov 10, 2022
 Merged


Rename PendingHTLCInfo fields to include msat suffix
#1844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,8 +112,8 @@ pub(super) struct PendingHTLCInfo {
	pub(super) routing: PendingHTLCRouting,
	pub(super) incoming_shared_secret: [u8; 32],
	payment_hash: PaymentHash,
	pub(super) amt_to_forward: u64,
	pub(super) amt_incoming: Option<u64>, // Added in 0.0.113
	pub(super) incoming_amt_msat: Option<u64>, // Added in 0.0.113
	pub(super) outgoing_amt_msat: u64,
	pub(super) outgoing_cltv_value: u32,
}

Expand DownExpand Up@@ -2197,8 +2197,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 routing,
 payment_hash,
 incoming_shared_secret: shared_secret,
amt_incoming: Some(amt_msat),
amt_to_forward: amt_msat,
incoming_amt_msat: Some(amt_msat),
outgoing_amt_msat: amt_msat,
 outgoing_cltv_value: hop_data.outgoing_cltv_value,
 })
	}
Expand DownExpand Up@@ -2294,14 +2294,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 },
 payment_hash: msg.payment_hash.clone(),
 incoming_shared_secret: shared_secret,
amt_incoming: Some(msg.amount_msat),
amt_to_forward: next_hop_data.amt_to_forward,
incoming_amt_msat: Some(msg.amount_msat),
outgoing_amt_msat: next_hop_data.amt_to_forward,
 outgoing_cltv_value: next_hop_data.outgoing_cltv_value,
 })
 }
 };

 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref amt_to_forward, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref outgoing_amt_msat, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 // If short_channel_id is 0 here, we'll reject the HTLC as there cannot be a channel
 // with a short_channel_id of 0. This is important as various things later assume
 // short_channel_id is non-0 in any ::Forward.
Expand DownExpand Up@@ -2352,10 +2352,10 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 }
 if *amt_to_forward < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
 }
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *amt_to_forward, *outgoing_cltv_value) {
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *outgoing_amt_msat, *outgoing_cltv_value) {
 break Some((err, code, chan_update_opt));
 }
 chan_update_opt
Expand DownExpand Up@@ -3157,8 +3157,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward,
 outgoing_cltv_value, amt_incoming: _
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat,
 outgoing_cltv_value, incoming_amt_msat: _
 }
 }) => {
 macro_rules! failure_handler {
Expand DownExpand Up@@ -3220,7 +3220,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 };
 match next_hop {
 onion_utils::Hop::Receive(hop_data) => {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value, Some(phantom_shared_secret)) {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value, Some(phantom_shared_secret)) {
 Ok(info) => phantom_receives.push((prev_short_channel_id, prev_funding_outpoint, vec![(info, prev_htlc_id)])),
 Err(ReceiveError { err_code, err_data, msg }) => failed_payment!(msg, err_code, err_data, Some(phantom_shared_secret))
 }
Expand DownExpand Up@@ -3264,8 +3264,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint ,
 forward_info: PendingHTLCInfo {
 incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, amt_incoming: _,
 incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, incoming_amt_msat: _,
 },
 }) => {
 log_trace!(self.logger, "Adding HTLC from short id {} with payment_hash {} to channel with short id {} after delay", prev_short_channel_id, log_bytes!(payment_hash.0), short_chan_id);
Expand All@@ -3277,7 +3277,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 // Phantom payments are only PendingHTLCRouting::Receive.
 phantom_shared_secret: None,
 });
 match chan.get_mut().send_htlc(amt_to_forward, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 match chan.get_mut().send_htlc(outgoing_amt_msat, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 Err(e) => {
 if let ChannelError::Ignore(msg) = e {
 log_trace!(self.logger, "Failed to forward HTLC with payment_hash {}: {}", log_bytes!(payment_hash.0), msg);
Expand DownExpand Up@@ -3391,7 +3391,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward, ..
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat, ..
 }
 }) => {
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret) = match routing {
Expand All@@ -3413,9 +3413,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 incoming_packet_shared_secret: incoming_shared_secret,
 phantom_shared_secret,
 },
 value: amt_to_forward,
 value: outgoing_amt_msat,
 timer_ticks: 0,
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { amt_to_forward },
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { outgoing_amt_msat },
 cltv_expiry,
 onion_payload,
 };
Expand DownExpand Up@@ -3522,7 +3522,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 e.insert((purpose.clone(), vec![claimable_htlc]));
 new_events.push(events::Event::PaymentReceived {
 payment_hash,
 amount_msat: amt_to_forward,
 amount_msat: outgoing_amt_msat,
 purpose,
 });
 },
Expand DownExpand Up@@ -6472,9 +6472,9 @@ impl_writeable_tlv_based!(PendingHTLCInfo, {
	(0, routing, required),
	(2, incoming_shared_secret, required),
	(4, payment_hash, required),
	(6, amt_to_forward, required),
	(6, outgoing_amt_msat, required),
	(8, outgoing_cltv_value, required),
	(9, amt_incoming, option),
	(9, incoming_amt_msat, option),
});


Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -568,7 +568,7 @@ fn test_onion_failure() {
 for f in pending_forwards.iter_mut() {
 match f {
 &mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo { ref mut forward_info, .. }) =>
 forward_info.amt_to_forward -= 1,
 forward_info.outgoing_amt_msat -= 1,
 _ => {},
 }
 }
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
Rename PendingHTLCInfo fields to include msat suffix#1844

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 1 commit into

from

Nov 10, 2022
 Merged


Rename PendingHTLCInfo fields to include msat suffix
#1844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,8 +112,8 @@ pub(super) struct PendingHTLCInfo {
	pub(super) routing: PendingHTLCRouting,
	pub(super) incoming_shared_secret: [u8; 32],
	payment_hash: PaymentHash,
	pub(super) amt_to_forward: u64,
	pub(super) amt_incoming: Option<u64>, // Added in 0.0.113
	pub(super) incoming_amt_msat: Option<u64>, // Added in 0.0.113
	pub(super) outgoing_amt_msat: u64,
	pub(super) outgoing_cltv_value: u32,
}

Expand DownExpand Up@@ -2197,8 +2197,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 routing,
 payment_hash,
 incoming_shared_secret: shared_secret,
amt_incoming: Some(amt_msat),
amt_to_forward: amt_msat,
incoming_amt_msat: Some(amt_msat),
outgoing_amt_msat: amt_msat,
 outgoing_cltv_value: hop_data.outgoing_cltv_value,
 })
	}
Expand DownExpand Up@@ -2294,14 +2294,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 },
 payment_hash: msg.payment_hash.clone(),
 incoming_shared_secret: shared_secret,
amt_incoming: Some(msg.amount_msat),
amt_to_forward: next_hop_data.amt_to_forward,
incoming_amt_msat: Some(msg.amount_msat),
outgoing_amt_msat: next_hop_data.amt_to_forward,
 outgoing_cltv_value: next_hop_data.outgoing_cltv_value,
 })
 }
 };

 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref amt_to_forward, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref outgoing_amt_msat, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 // If short_channel_id is 0 here, we'll reject the HTLC as there cannot be a channel
 // with a short_channel_id of 0. This is important as various things later assume
 // short_channel_id is non-0 in any ::Forward.
Expand DownExpand Up@@ -2352,10 +2352,10 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 }
 if *amt_to_forward < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
 }
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *amt_to_forward, *outgoing_cltv_value) {
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *outgoing_amt_msat, *outgoing_cltv_value) {
 break Some((err, code, chan_update_opt));
 }
 chan_update_opt
Expand DownExpand Up@@ -3157,8 +3157,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward,
 outgoing_cltv_value, amt_incoming: _
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat,
 outgoing_cltv_value, incoming_amt_msat: _
 }
 }) => {
 macro_rules! failure_handler {
Expand DownExpand Up@@ -3220,7 +3220,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 };
 match next_hop {
 onion_utils::Hop::Receive(hop_data) => {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value, Some(phantom_shared_secret)) {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value, Some(phantom_shared_secret)) {
 Ok(info) => phantom_receives.push((prev_short_channel_id, prev_funding_outpoint, vec![(info, prev_htlc_id)])),
 Err(ReceiveError { err_code, err_data, msg }) => failed_payment!(msg, err_code, err_data, Some(phantom_shared_secret))
 }
Expand DownExpand Up@@ -3264,8 +3264,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint ,
 forward_info: PendingHTLCInfo {
 incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, amt_incoming: _,
 incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, incoming_amt_msat: _,
 },
 }) => {
 log_trace!(self.logger, "Adding HTLC from short id {} with payment_hash {} to channel with short id {} after delay", prev_short_channel_id, log_bytes!(payment_hash.0), short_chan_id);
Expand All@@ -3277,7 +3277,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 // Phantom payments are only PendingHTLCRouting::Receive.
 phantom_shared_secret: None,
 });
 match chan.get_mut().send_htlc(amt_to_forward, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 match chan.get_mut().send_htlc(outgoing_amt_msat, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 Err(e) => {
 if let ChannelError::Ignore(msg) = e {
 log_trace!(self.logger, "Failed to forward HTLC with payment_hash {}: {}", log_bytes!(payment_hash.0), msg);
Expand DownExpand Up@@ -3391,7 +3391,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward, ..
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat, ..
 }
 }) => {
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret) = match routing {
Expand All@@ -3413,9 +3413,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 incoming_packet_shared_secret: incoming_shared_secret,
 phantom_shared_secret,
 },
 value: amt_to_forward,
 value: outgoing_amt_msat,
 timer_ticks: 0,
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { amt_to_forward },
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { outgoing_amt_msat },
 cltv_expiry,
 onion_payload,
 };
Expand DownExpand Up@@ -3522,7 +3522,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 e.insert((purpose.clone(), vec![claimable_htlc]));
 new_events.push(events::Event::PaymentReceived {
 payment_hash,
 amount_msat: amt_to_forward,
 amount_msat: outgoing_amt_msat,
 purpose,
 });
 },
Expand DownExpand Up@@ -6472,9 +6472,9 @@ impl_writeable_tlv_based!(PendingHTLCInfo, {
	(0, routing, required),
	(2, incoming_shared_secret, required),
	(4, payment_hash, required),
	(6, amt_to_forward, required),
	(6, outgoing_amt_msat, required),
	(8, outgoing_cltv_value, required),
	(9, amt_incoming, option),
	(9, incoming_amt_msat, option),
});


Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -568,7 +568,7 @@ fn test_onion_failure() {
 for f in pending_forwards.iter_mut() {
 match f {
 &mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo { ref mut forward_info, .. }) =>
 forward_info.amt_to_forward -= 1,
 forward_info.outgoing_amt_msat -= 1,
 _ => {},
 }
 }
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
Rename PendingHTLCInfo fields to include msat suffix#1844

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 1 commit into

from

Nov 10, 2022
 Merged


Rename PendingHTLCInfo fields to include msat suffix
#1844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,8 +112,8 @@ pub(super) struct PendingHTLCInfo {
	pub(super) routing: PendingHTLCRouting,
	pub(super) incoming_shared_secret: [u8; 32],
	payment_hash: PaymentHash,
	pub(super) amt_to_forward: u64,
	pub(super) amt_incoming: Option<u64>, // Added in 0.0.113
	pub(super) incoming_amt_msat: Option<u64>, // Added in 0.0.113
	pub(super) outgoing_amt_msat: u64,
	pub(super) outgoing_cltv_value: u32,
}

Expand DownExpand Up@@ -2197,8 +2197,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 routing,
 payment_hash,
 incoming_shared_secret: shared_secret,
amt_incoming: Some(amt_msat),
amt_to_forward: amt_msat,
incoming_amt_msat: Some(amt_msat),
outgoing_amt_msat: amt_msat,
 outgoing_cltv_value: hop_data.outgoing_cltv_value,
 })
	}
Expand DownExpand Up@@ -2294,14 +2294,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 },
 payment_hash: msg.payment_hash.clone(),
 incoming_shared_secret: shared_secret,
amt_incoming: Some(msg.amount_msat),
amt_to_forward: next_hop_data.amt_to_forward,
incoming_amt_msat: Some(msg.amount_msat),
outgoing_amt_msat: next_hop_data.amt_to_forward,
 outgoing_cltv_value: next_hop_data.outgoing_cltv_value,
 })
 }
 };

 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref amt_to_forward, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref outgoing_amt_msat, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 // If short_channel_id is 0 here, we'll reject the HTLC as there cannot be a channel
 // with a short_channel_id of 0. This is important as various things later assume
 // short_channel_id is non-0 in any ::Forward.
Expand DownExpand Up@@ -2352,10 +2352,10 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 }
 if *amt_to_forward < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
 }
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *amt_to_forward, *outgoing_cltv_value) {
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *outgoing_amt_msat, *outgoing_cltv_value) {
 break Some((err, code, chan_update_opt));
 }
 chan_update_opt
Expand DownExpand Up@@ -3157,8 +3157,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward,
 outgoing_cltv_value, amt_incoming: _
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat,
 outgoing_cltv_value, incoming_amt_msat: _
 }
 }) => {
 macro_rules! failure_handler {
Expand DownExpand Up@@ -3220,7 +3220,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 };
 match next_hop {
 onion_utils::Hop::Receive(hop_data) => {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value, Some(phantom_shared_secret)) {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value, Some(phantom_shared_secret)) {
 Ok(info) => phantom_receives.push((prev_short_channel_id, prev_funding_outpoint, vec![(info, prev_htlc_id)])),
 Err(ReceiveError { err_code, err_data, msg }) => failed_payment!(msg, err_code, err_data, Some(phantom_shared_secret))
 }
Expand DownExpand Up@@ -3264,8 +3264,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint ,
 forward_info: PendingHTLCInfo {
 incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, amt_incoming: _,
 incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, incoming_amt_msat: _,
 },
 }) => {
 log_trace!(self.logger, "Adding HTLC from short id {} with payment_hash {} to channel with short id {} after delay", prev_short_channel_id, log_bytes!(payment_hash.0), short_chan_id);
Expand All@@ -3277,7 +3277,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 // Phantom payments are only PendingHTLCRouting::Receive.
 phantom_shared_secret: None,
 });
 match chan.get_mut().send_htlc(amt_to_forward, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 match chan.get_mut().send_htlc(outgoing_amt_msat, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 Err(e) => {
 if let ChannelError::Ignore(msg) = e {
 log_trace!(self.logger, "Failed to forward HTLC with payment_hash {}: {}", log_bytes!(payment_hash.0), msg);
Expand DownExpand Up@@ -3391,7 +3391,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward, ..
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat, ..
 }
 }) => {
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret) = match routing {
Expand All@@ -3413,9 +3413,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 incoming_packet_shared_secret: incoming_shared_secret,
 phantom_shared_secret,
 },
 value: amt_to_forward,
 value: outgoing_amt_msat,
 timer_ticks: 0,
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { amt_to_forward },
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { outgoing_amt_msat },
 cltv_expiry,
 onion_payload,
 };
Expand DownExpand Up@@ -3522,7 +3522,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 e.insert((purpose.clone(), vec![claimable_htlc]));
 new_events.push(events::Event::PaymentReceived {
 payment_hash,
 amount_msat: amt_to_forward,
 amount_msat: outgoing_amt_msat,
 purpose,
 });
 },
Expand DownExpand Up@@ -6472,9 +6472,9 @@ impl_writeable_tlv_based!(PendingHTLCInfo, {
	(0, routing, required),
	(2, incoming_shared_secret, required),
	(4, payment_hash, required),
	(6, amt_to_forward, required),
	(6, outgoing_amt_msat, required),
	(8, outgoing_cltv_value, required),
	(9, amt_incoming, option),
	(9, incoming_amt_msat, option),
});


Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -568,7 +568,7 @@ fn test_onion_failure() {
 for f in pending_forwards.iter_mut() {
 match f {
 &mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo { ref mut forward_info, .. }) =>
 forward_info.amt_to_forward -= 1,
 forward_info.outgoing_amt_msat -= 1,
 _ => {},
 }
 }
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
Rename PendingHTLCInfo fields to include msat suffix#1844

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 1 commit into

from

Nov 10, 2022
 Merged


Rename PendingHTLCInfo fields to include msat suffix
#1844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,8 +112,8 @@ pub(super) struct PendingHTLCInfo {
	pub(super) routing: PendingHTLCRouting,
	pub(super) incoming_shared_secret: [u8; 32],
	payment_hash: PaymentHash,
	pub(super) amt_to_forward: u64,
	pub(super) amt_incoming: Option<u64>, // Added in 0.0.113
	pub(super) incoming_amt_msat: Option<u64>, // Added in 0.0.113
	pub(super) outgoing_amt_msat: u64,
	pub(super) outgoing_cltv_value: u32,
}

Expand DownExpand Up@@ -2197,8 +2197,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 routing,
 payment_hash,
 incoming_shared_secret: shared_secret,
amt_incoming: Some(amt_msat),
amt_to_forward: amt_msat,
incoming_amt_msat: Some(amt_msat),
outgoing_amt_msat: amt_msat,
 outgoing_cltv_value: hop_data.outgoing_cltv_value,
 })
	}
Expand DownExpand Up@@ -2294,14 +2294,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 },
 payment_hash: msg.payment_hash.clone(),
 incoming_shared_secret: shared_secret,
amt_incoming: Some(msg.amount_msat),
amt_to_forward: next_hop_data.amt_to_forward,
incoming_amt_msat: Some(msg.amount_msat),
outgoing_amt_msat: next_hop_data.amt_to_forward,
 outgoing_cltv_value: next_hop_data.outgoing_cltv_value,
 })
 }
 };

 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref amt_to_forward, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref outgoing_amt_msat, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 // If short_channel_id is 0 here, we'll reject the HTLC as there cannot be a channel
 // with a short_channel_id of 0. This is important as various things later assume
 // short_channel_id is non-0 in any ::Forward.
Expand DownExpand Up@@ -2352,10 +2352,10 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 }
 if *amt_to_forward < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
 }
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *amt_to_forward, *outgoing_cltv_value) {
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *outgoing_amt_msat, *outgoing_cltv_value) {
 break Some((err, code, chan_update_opt));
 }
 chan_update_opt
Expand DownExpand Up@@ -3157,8 +3157,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward,
 outgoing_cltv_value, amt_incoming: _
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat,
 outgoing_cltv_value, incoming_amt_msat: _
 }
 }) => {
 macro_rules! failure_handler {
Expand DownExpand Up@@ -3220,7 +3220,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 };
 match next_hop {
 onion_utils::Hop::Receive(hop_data) => {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value, Some(phantom_shared_secret)) {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value, Some(phantom_shared_secret)) {
 Ok(info) => phantom_receives.push((prev_short_channel_id, prev_funding_outpoint, vec![(info, prev_htlc_id)])),
 Err(ReceiveError { err_code, err_data, msg }) => failed_payment!(msg, err_code, err_data, Some(phantom_shared_secret))
 }
Expand DownExpand Up@@ -3264,8 +3264,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint ,
 forward_info: PendingHTLCInfo {
 incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, amt_incoming: _,
 incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, incoming_amt_msat: _,
 },
 }) => {
 log_trace!(self.logger, "Adding HTLC from short id {} with payment_hash {} to channel with short id {} after delay", prev_short_channel_id, log_bytes!(payment_hash.0), short_chan_id);
Expand All@@ -3277,7 +3277,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 // Phantom payments are only PendingHTLCRouting::Receive.
 phantom_shared_secret: None,
 });
 match chan.get_mut().send_htlc(amt_to_forward, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 match chan.get_mut().send_htlc(outgoing_amt_msat, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 Err(e) => {
 if let ChannelError::Ignore(msg) = e {
 log_trace!(self.logger, "Failed to forward HTLC with payment_hash {}: {}", log_bytes!(payment_hash.0), msg);
Expand DownExpand Up@@ -3391,7 +3391,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward, ..
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat, ..
 }
 }) => {
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret) = match routing {
Expand All@@ -3413,9 +3413,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 incoming_packet_shared_secret: incoming_shared_secret,
 phantom_shared_secret,
 },
 value: amt_to_forward,
 value: outgoing_amt_msat,
 timer_ticks: 0,
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { amt_to_forward },
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { outgoing_amt_msat },
 cltv_expiry,
 onion_payload,
 };
Expand DownExpand Up@@ -3522,7 +3522,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 e.insert((purpose.clone(), vec![claimable_htlc]));
 new_events.push(events::Event::PaymentReceived {
 payment_hash,
 amount_msat: amt_to_forward,
 amount_msat: outgoing_amt_msat,
 purpose,
 });
 },
Expand DownExpand Up@@ -6472,9 +6472,9 @@ impl_writeable_tlv_based!(PendingHTLCInfo, {
	(0, routing, required),
	(2, incoming_shared_secret, required),
	(4, payment_hash, required),
	(6, amt_to_forward, required),
	(6, outgoing_amt_msat, required),
	(8, outgoing_cltv_value, required),
	(9, amt_incoming, option),
	(9, incoming_amt_msat, option),
});


Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -568,7 +568,7 @@ fn test_onion_failure() {
 for f in pending_forwards.iter_mut() {
 match f {
 &mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo { ref mut forward_info, .. }) =>
 forward_info.amt_to_forward -= 1,
 forward_info.outgoing_amt_msat -= 1,
 _ => {},
 }
 }
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
Rename PendingHTLCInfo fields to include msat suffix#1844

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 1 commit into

from

Nov 10, 2022
 Merged


Rename PendingHTLCInfo fields to include msat suffix
#1844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,8 +112,8 @@ pub(super) struct PendingHTLCInfo {
	pub(super) routing: PendingHTLCRouting,
	pub(super) incoming_shared_secret: [u8; 32],
	payment_hash: PaymentHash,
	pub(super) amt_to_forward: u64,
	pub(super) amt_incoming: Option<u64>, // Added in 0.0.113
	pub(super) incoming_amt_msat: Option<u64>, // Added in 0.0.113
	pub(super) outgoing_amt_msat: u64,
	pub(super) outgoing_cltv_value: u32,
}

Expand DownExpand Up@@ -2197,8 +2197,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 routing,
 payment_hash,
 incoming_shared_secret: shared_secret,
amt_incoming: Some(amt_msat),
amt_to_forward: amt_msat,
incoming_amt_msat: Some(amt_msat),
outgoing_amt_msat: amt_msat,
 outgoing_cltv_value: hop_data.outgoing_cltv_value,
 })
	}
Expand DownExpand Up@@ -2294,14 +2294,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 },
 payment_hash: msg.payment_hash.clone(),
 incoming_shared_secret: shared_secret,
amt_incoming: Some(msg.amount_msat),
amt_to_forward: next_hop_data.amt_to_forward,
incoming_amt_msat: Some(msg.amount_msat),
outgoing_amt_msat: next_hop_data.amt_to_forward,
 outgoing_cltv_value: next_hop_data.outgoing_cltv_value,
 })
 }
 };

 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref amt_to_forward, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 if let &PendingHTLCStatus::Forward(PendingHTLCInfo { ref routing, ref outgoing_amt_msat, ref outgoing_cltv_value, .. }) = &pending_forward_info {
 // If short_channel_id is 0 here, we'll reject the HTLC as there cannot be a channel
 // with a short_channel_id of 0. This is important as various things later assume
 // short_channel_id is non-0 in any ::Forward.
Expand DownExpand Up@@ -2352,10 +2352,10 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 if !chan.is_live() { // channel_disabled
 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, chan_update_opt));
 }
 if *amt_to_forward < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 if *outgoing_amt_msat < chan.get_counterparty_htlc_minimum_msat() { // amount_below_minimum
 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, chan_update_opt));
 }
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *amt_to_forward, *outgoing_cltv_value) {
 if let Err((err, code)) = chan.htlc_satisfies_config(&msg, *outgoing_amt_msat, *outgoing_cltv_value) {
 break Some((err, code, chan_update_opt));
 }
 chan_update_opt
Expand DownExpand Up@@ -3157,8 +3157,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward,
 outgoing_cltv_value, amt_incoming: _
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat,
 outgoing_cltv_value, incoming_amt_msat: _
 }
 }) => {
 macro_rules! failure_handler {
Expand DownExpand Up@@ -3220,7 +3220,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 };
 match next_hop {
 onion_utils::Hop::Receive(hop_data) => {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value, Some(phantom_shared_secret)) {
 match self.construct_recv_pending_htlc_info(hop_data, incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value, Some(phantom_shared_secret)) {
 Ok(info) => phantom_receives.push((prev_short_channel_id, prev_funding_outpoint, vec![(info, prev_htlc_id)])),
 Err(ReceiveError { err_code, err_data, msg }) => failed_payment!(msg, err_code, err_data, Some(phantom_shared_secret))
 }
Expand DownExpand Up@@ -3264,8 +3264,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint ,
 forward_info: PendingHTLCInfo {
 incoming_shared_secret, payment_hash, amt_to_forward, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, amt_incoming: _,
 incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value,
 routing: PendingHTLCRouting::Forward { onion_packet, .. }, incoming_amt_msat: _,
 },
 }) => {
 log_trace!(self.logger, "Adding HTLC from short id {} with payment_hash {} to channel with short id {} after delay", prev_short_channel_id, log_bytes!(payment_hash.0), short_chan_id);
Expand All@@ -3277,7 +3277,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 // Phantom payments are only PendingHTLCRouting::Receive.
 phantom_shared_secret: None,
 });
 match chan.get_mut().send_htlc(amt_to_forward, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 match chan.get_mut().send_htlc(outgoing_amt_msat, payment_hash, outgoing_cltv_value, htlc_source.clone(), onion_packet, &self.logger) {
 Err(e) => {
 if let ChannelError::Ignore(msg) = e {
 log_trace!(self.logger, "Failed to forward HTLC with payment_hash {}: {}", log_bytes!(payment_hash.0), msg);
Expand DownExpand Up@@ -3391,7 +3391,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 prev_short_channel_id, prev_htlc_id, prev_funding_outpoint,
 forward_info: PendingHTLCInfo {
 routing, incoming_shared_secret, payment_hash, amt_to_forward, ..
 routing, incoming_shared_secret, payment_hash, outgoing_amt_msat, ..
 }
 }) => {
 let (cltv_expiry, onion_payload, payment_data, phantom_shared_secret) = match routing {
Expand All@@ -3413,9 +3413,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 incoming_packet_shared_secret: incoming_shared_secret,
 phantom_shared_secret,
 },
 value: amt_to_forward,
 value: outgoing_amt_msat,
 timer_ticks: 0,
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { amt_to_forward },
 total_msat: if let Some(data) = &payment_data { data.total_msat } else { outgoing_amt_msat },
 cltv_expiry,
 onion_payload,
 };
Expand DownExpand Up@@ -3522,7 +3522,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 e.insert((purpose.clone(), vec![claimable_htlc]));
 new_events.push(events::Event::PaymentReceived {
 payment_hash,
 amount_msat: amt_to_forward,
 amount_msat: outgoing_amt_msat,
 purpose,
 });
 },
Expand DownExpand Up@@ -6472,9 +6472,9 @@ impl_writeable_tlv_based!(PendingHTLCInfo, {
	(0, routing, required),
	(2, incoming_shared_secret, required),
	(4, payment_hash, required),
	(6, amt_to_forward, required),
	(6, outgoing_amt_msat, required),
	(8, outgoing_cltv_value, required),
	(9, amt_incoming, option),
	(9, incoming_amt_msat, option),
});


Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -568,7 +568,7 @@ fn test_onion_failure() {
 for f in pending_forwards.iter_mut() {
 match f {
 &mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo { ref mut forward_info, .. }) =>
 forward_info.amt_to_forward -= 1,
 forward_info.outgoing_amt_msat -= 1,
 _ => {},
 }
 }
Expand Down