Skip to content

Support decoding HTLC onions once fully committed#2845

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 15 commits into from
Mar 28, 2024
Merged

Support decoding HTLC onions once fully committed #2845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3c24a13
Don't consume readers with FixedLengthReader
wpaulino Mar 7, 2024
c096a24
Support Vec serialization that include element length prefix
wpaulino Mar 11, 2024
4ad00f4
Track incoming UpdateAddHTLC until HTLC resolution
wpaulino Jan 22, 2024
60ddd5d
Remove unreachable handling of htlc_forwards upon channel_reestablish
wpaulino Jan 22, 2024
0b38b39
Track pending update_add_htlcs in ChannelManager for later processing
wpaulino Mar 8, 2024
e255b23
Add new HTLCDestination variant for invalid onion
wpaulino Jan 23, 2024
3f940d3
Add is_intro_node_blinded_forward helper for onion_utils::Hop
wpaulino Mar 8, 2024
0073e49
Refactor HTLCFailureMsg generation out from decode_update_add_htlc_onion
wpaulino Jan 24, 2024
cc1651b
Refactor outgoing HTLC checks out from decode_update_add_htlc_onion
wpaulino Jan 24, 2024
b9ca578
Refactor outgoing channel lookup out from decode_update_add_htlc_onion
wpaulino Jan 24, 2024
cc7faa3
Only include channel_update in failure if needed by error code
wpaulino Mar 8, 2024
2edc5b2
Refactor incoming HTLC accept checks out from Channel::update_add_htlc
wpaulino Mar 8, 2024
7fe2582
Consider pending decode_update_add_htlcs when pushing forward event
wpaulino Mar 8, 2024
a6c9128
Refactor forward_htlcs to return whether to push a forward event
wpaulino Mar 8, 2024
fe65648
Decode update_add_htlc onions before forwarding HTLCs
wpaulino Mar 9, 2024
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
2 changes: 1 addition & 1 deletion lightning/src/crypto/streams.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,7 +151,7 @@ mod tests {
let writeable_len = $obj.serialized_length() as u64 + 16;
let write_adapter = ChaChaPolyWriteAdapter::new(rho, &$obj);
let encrypted_writeable_bytes = write_adapter.encode();
let encrypted_writeable = &encrypted_writeable_bytes[..];
let encrypted_writeable = &mut &encrypted_writeable_bytes[..];

// Now deserialize the object back and make sure it matches the original.
let mut rd = FixedLengthReader::new(encrypted_writeable, writeable_len);
Expand Down
35 changes: 19 additions & 16 deletions lightning/src/events/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ pub enum HTLCDestination {
/// Short channel id we are requesting to forward an HTLC to.
requested_forward_scid: u64
},
/// We couldn't decode the incoming onion to obtain the forwarding details.
InvalidOnion,

@valentinewallacevalentinewallaceJan 24, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

HTLCDestination sounds pretty innaccurate to me now. Would be nice to rename it, maybe in follow-up.

/// Failure scenario where an HTLC may have been forwarded to be intended for us,
/// but is invalid for some reason, so we reject it.
///
Expand DownExpand Up@@ -329,6 +331,7 @@ impl_writeable_tlv_based_enum_upgradable!(HTLCDestination,
(2, UnknownNextHop) => {
(0, requested_forward_scid, required),
},
(3, InvalidOnion) => {},
(4, FailedPayment) => {
(0, payment_hash, required),
},
Expand DownExpand Up@@ -1294,7 +1297,7 @@ impl MaybeReadable for Event {
// Note that we do not write a length-prefixed TLV for FundingGenerationReady events.
0u8 => Ok(None),
1u8 => {
let f = || {
let mut f = || {
let mut payment_hash = PaymentHash([0; 32]);
let mut payment_preimage = None;
let mut payment_secret = None;
Expand DownExpand Up@@ -1342,7 +1345,7 @@ impl MaybeReadable for Event {
f()
},
2u8 => {
let f = || {
let mut f = || {
let mut payment_preimage = PaymentPreimage([0; 32]);
let mut payment_hash = None;
let mut payment_id = None;
Expand All@@ -1366,7 +1369,7 @@ impl MaybeReadable for Event {
f()
},
3u8 => {
let f = || {
let mut f = || {
#[cfg(test)]
let error_code = Readable::read(reader)?;
#[cfg(test)]
Expand DownExpand Up@@ -1409,7 +1412,7 @@ impl MaybeReadable for Event {
},
4u8 => Ok(None),
5u8 => {
let f = || {
let mut f = || {
let mut outputs = WithoutLength(Vec::new());
let mut channel_id: Option<ChannelId> = None;
read_tlv_fields!(reader, {
Expand DownExpand Up@@ -1445,7 +1448,7 @@ impl MaybeReadable for Event {
}))
},
7u8 => {
let f = || {
let mut f = || {
let mut prev_channel_id = None;
let mut next_channel_id = None;
let mut prev_user_channel_id = None;
Expand DownExpand Up@@ -1473,7 +1476,7 @@ impl MaybeReadable for Event {
f()
},
9u8 => {
let f = || {
let mut f = || {
let mut channel_id = ChannelId::new_zero();
let mut reason = UpgradableRequired(None);
let mut user_channel_id_low_opt: Option<u64> = None;
Expand DownExpand Up@@ -1503,7 +1506,7 @@ impl MaybeReadable for Event {
f()
},
11u8 => {
let f = || {
let mut f = || {
let mut channel_id = ChannelId::new_zero();
let mut transaction = Transaction{ version: 2, lock_time: LockTime::ZERO, input: Vec::new(), output: Vec::new() };
read_tlv_fields!(reader, {
Expand All@@ -1515,7 +1518,7 @@ impl MaybeReadable for Event {
f()
},
13u8 => {
let f = || {
let mut f = || {
_init_and_read_len_prefixed_tlv_fields!(reader, {
(0, payment_id, required),
(2, payment_hash, option),
Expand All@@ -1531,7 +1534,7 @@ impl MaybeReadable for Event {
f()
},
15u8 => {
let f = || {
let mut f = || {
let mut payment_hash = PaymentHash([0; 32]);
let mut payment_id = PaymentId([0; 32]);
let mut reason = None;
Expand All@@ -1553,7 +1556,7 @@ impl MaybeReadable for Event {
Ok(None)
},
19u8 => {
let f = || {
let mut f = || {
let mut payment_hash = PaymentHash([0; 32]);
let mut purpose = UpgradableRequired(None);
let mut amount_msat = 0;
Expand All@@ -1580,7 +1583,7 @@ impl MaybeReadable for Event {
f()
},
21u8 => {
let f = || {
let mut f = || {
_init_and_read_len_prefixed_tlv_fields!(reader, {
(0, payment_id, required),
(2, payment_hash, required),
Expand All@@ -1596,7 +1599,7 @@ impl MaybeReadable for Event {
f()
},
23u8 => {
let f = || {
let mut f = || {
_init_and_read_len_prefixed_tlv_fields!(reader, {
(0, payment_id, required),
(2, payment_hash, required),
Expand All@@ -1614,7 +1617,7 @@ impl MaybeReadable for Event {
f()
},
25u8 => {
let f = || {
let mut f = || {
let mut prev_channel_id = ChannelId::new_zero();
let mut failed_next_destination_opt = UpgradableRequired(None);
read_tlv_fields!(reader, {
Expand All@@ -1630,7 +1633,7 @@ impl MaybeReadable for Event {
},
27u8 => Ok(None),
29u8 => {
let f = || {
let mut f = || {
let mut channel_id = ChannelId::new_zero();
let mut user_channel_id: u128 = 0;
let mut counterparty_node_id = RequiredWrapper(None);
Expand All@@ -1652,7 +1655,7 @@ impl MaybeReadable for Event {
f()
},
31u8 => {
let f = || {
let mut f = || {
let mut channel_id = ChannelId::new_zero();
let mut user_channel_id: u128 = 0;
let mut former_temporary_channel_id = None;
Expand DownExpand Up@@ -1680,7 +1683,7 @@ impl MaybeReadable for Event {
f()
},
33u8 => {
let f = || {
let mut f = || {
_init_and_read_len_prefixed_tlv_fields!(reader, {
(0, payment_id, required),
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Support decoding HTLC onions once fully committed by wpaulino · Pull Request #2845 · lightningdevkit/rust-lightning · GitHub
Skip to content
Support decoding HTLC onions once fully committed#2845

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

from

Mar 28, 2024
 Merged


Support decoding HTLC onions once fully committed
#2845
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3c24a13

Don't consume readers with FixedLengthReader


wpaulino Mar 7, 2024
c096a24

Support Vec serialization that include element length prefix


wpaulino Mar 11, 2024
4ad00f4

Track incoming UpdateAddHTLC until HTLC resolution


wpaulino Jan 22, 2024
60ddd5d

Remove unreachable handling of htlc_forwards upon channel_reestablish


wpaulino Jan 22, 2024
0b38b39

Track pending update_add_htlcs in ChannelManager for later processing


wpaulino Mar 8, 2024
e255b23

Add new HTLCDestination variant for invalid onion


wpaulino Jan 23, 2024
3f940d3

Add is_intro_node_blinded_forward helper for onion_utils::Hop


wpaulino Mar 8, 2024
0073e49

Refactor HTLCFailureMsg generation out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc1651b

Refactor outgoing HTLC checks out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
b9ca578

Refactor outgoing channel lookup out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc7faa3

Only include channel_update in failure if needed by error code


wpaulino Mar 8, 2024
2edc5b2

Refactor incoming HTLC accept checks out from Channel::update_add_htlc


wpaulino Mar 8, 2024
7fe2582

Consider pending decode_update_add_htlcs when pushing forward event


wpaulino Mar 8, 2024
a6c9128

Refactor forward_htlcs to return whether to push a forward event


wpaulino Mar 8, 2024
fe65648

Decode update_add_htlc onions before forwarding HTLCs


wpaulino Mar 9, 2024

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


2 changes: 1 addition & 1 deletion
lightning/src/crypto/streams.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,7 +151,7 @@ mod tests {
 let writeable_len = $obj.serialized_length() as u64 + 16;
 let write_adapter = ChaChaPolyWriteAdapter::new(rho, &$obj);
 let encrypted_writeable_bytes = write_adapter.encode();
 let encrypted_writeable = &encrypted_writeable_bytes[..];
 let encrypted_writeable = &mut &encrypted_writeable_bytes[..];

 // Now deserialize the object back and make sure it matches the original.
 let mut rd = FixedLengthReader::new(encrypted_writeable, writeable_len);
Expand Down

35 changes: 19 additions & 16 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ pub enum HTLCDestination {
 /// Short channel id we are requesting to forward an HTLC to.
 requested_forward_scid: u64
	},
	/// We couldn't decode the incoming onion to obtain the forwarding details.
	InvalidOnion,
@valentinewallacevalentinewallaceJan 24, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

HTLCDestination sounds pretty innaccurate to me now. Would be nice to rename it, maybe in follow-up.
	/// Failure scenario where an HTLC may have been forwarded to be intended for us,
	/// but is invalid for some reason, so we reject it.
	///
Expand DownExpand Up@@ -329,6 +331,7 @@ impl_writeable_tlv_based_enum_upgradable!(HTLCDestination,
	(2, UnknownNextHop) => {
 (0, requested_forward_scid, required),
	},
	(3, InvalidOnion) => {},
	(4, FailedPayment) => {
 (0, payment_hash, required),
	},
Expand DownExpand Up@@ -1294,7 +1297,7 @@ impl MaybeReadable for Event {
 // Note that we do not write a length-prefixed TLV for FundingGenerationReady events.
 0u8 => Ok(None),
 1u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_preimage = None;
 let mut payment_secret = None;
Expand DownExpand Up@@ -1342,7 +1345,7 @@ impl MaybeReadable for Event {
 f()
 },
 2u8 => {
 let f = || {
 let mut f = || {
 let mut payment_preimage = PaymentPreimage([0; 32]);
 let mut payment_hash = None;
 let mut payment_id = None;
Expand All@@ -1366,7 +1369,7 @@ impl MaybeReadable for Event {
 f()
 },
 3u8 => {
 let f = || {
 let mut f = || {
 #[cfg(test)]
 let error_code = Readable::read(reader)?;
 #[cfg(test)]
Expand DownExpand Up@@ -1409,7 +1412,7 @@ impl MaybeReadable for Event {
 },
 4u8 => Ok(None),
 5u8 => {
 let f = || {
 let mut f = || {
 let mut outputs = WithoutLength(Vec::new());
 let mut channel_id: Option<ChannelId> = None;
 read_tlv_fields!(reader, {
Expand DownExpand Up@@ -1445,7 +1448,7 @@ impl MaybeReadable for Event {
 }))
 },
 7u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = None;
 let mut next_channel_id = None;
 let mut prev_user_channel_id = None;
Expand DownExpand Up@@ -1473,7 +1476,7 @@ impl MaybeReadable for Event {
 f()
 },
 9u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut reason = UpgradableRequired(None);
 let mut user_channel_id_low_opt: Option<u64> = None;
Expand DownExpand Up@@ -1503,7 +1506,7 @@ impl MaybeReadable for Event {
 f()
 },
 11u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut transaction = Transaction{ version: 2, lock_time: LockTime::ZERO, input: Vec::new(), output: Vec::new() };
 read_tlv_fields!(reader, {
Expand All@@ -1515,7 +1518,7 @@ impl MaybeReadable for Event {
 f()
 },
 13u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, option),
Expand All@@ -1531,7 +1534,7 @@ impl MaybeReadable for Event {
 f()
 },
 15u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_id = PaymentId([0; 32]);
 let mut reason = None;
Expand All@@ -1553,7 +1556,7 @@ impl MaybeReadable for Event {
 Ok(None)
 },
 19u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut purpose = UpgradableRequired(None);
 let mut amount_msat = 0;
Expand All@@ -1580,7 +1583,7 @@ impl MaybeReadable for Event {
 f()
 },
 21u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1596,7 +1599,7 @@ impl MaybeReadable for Event {
 f()
 },
 23u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1614,7 +1617,7 @@ impl MaybeReadable for Event {
 f()
 },
 25u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = ChannelId::new_zero();
 let mut failed_next_destination_opt = UpgradableRequired(None);
 read_tlv_fields!(reader, {
Expand All@@ -1630,7 +1633,7 @@ impl MaybeReadable for Event {
 },
 27u8 => Ok(None),
 29u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
Expand All@@ -1652,7 +1655,7 @@ impl MaybeReadable for Event {
 f()
 },
 31u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut former_temporary_channel_id = None;
Expand DownExpand Up@@ -1680,7 +1683,7 @@ impl MaybeReadable for Event {
 f()
 },
 33u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 });
Expand Down
Loading

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

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

from

Mar 28, 2024
 Merged


Support decoding HTLC onions once fully committed
#2845
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3c24a13

Don't consume readers with FixedLengthReader


wpaulino Mar 7, 2024
c096a24

Support Vec serialization that include element length prefix


wpaulino Mar 11, 2024
4ad00f4

Track incoming UpdateAddHTLC until HTLC resolution


wpaulino Jan 22, 2024
60ddd5d

Remove unreachable handling of htlc_forwards upon channel_reestablish


wpaulino Jan 22, 2024
0b38b39

Track pending update_add_htlcs in ChannelManager for later processing


wpaulino Mar 8, 2024
e255b23

Add new HTLCDestination variant for invalid onion


wpaulino Jan 23, 2024
3f940d3

Add is_intro_node_blinded_forward helper for onion_utils::Hop


wpaulino Mar 8, 2024
0073e49

Refactor HTLCFailureMsg generation out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc1651b

Refactor outgoing HTLC checks out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
b9ca578

Refactor outgoing channel lookup out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc7faa3

Only include channel_update in failure if needed by error code


wpaulino Mar 8, 2024
2edc5b2

Refactor incoming HTLC accept checks out from Channel::update_add_htlc


wpaulino Mar 8, 2024
7fe2582

Consider pending decode_update_add_htlcs when pushing forward event


wpaulino Mar 8, 2024
a6c9128

Refactor forward_htlcs to return whether to push a forward event


wpaulino Mar 8, 2024
fe65648

Decode update_add_htlc onions before forwarding HTLCs


wpaulino Mar 9, 2024

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


2 changes: 1 addition & 1 deletion
lightning/src/crypto/streams.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,7 +151,7 @@ mod tests {
 let writeable_len = $obj.serialized_length() as u64 + 16;
 let write_adapter = ChaChaPolyWriteAdapter::new(rho, &$obj);
 let encrypted_writeable_bytes = write_adapter.encode();
 let encrypted_writeable = &encrypted_writeable_bytes[..];
 let encrypted_writeable = &mut &encrypted_writeable_bytes[..];

 // Now deserialize the object back and make sure it matches the original.
 let mut rd = FixedLengthReader::new(encrypted_writeable, writeable_len);
Expand Down

35 changes: 19 additions & 16 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ pub enum HTLCDestination {
 /// Short channel id we are requesting to forward an HTLC to.
 requested_forward_scid: u64
	},
	/// We couldn't decode the incoming onion to obtain the forwarding details.
	InvalidOnion,
@valentinewallacevalentinewallaceJan 24, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

HTLCDestination sounds pretty innaccurate to me now. Would be nice to rename it, maybe in follow-up.
	/// Failure scenario where an HTLC may have been forwarded to be intended for us,
	/// but is invalid for some reason, so we reject it.
	///
Expand DownExpand Up@@ -329,6 +331,7 @@ impl_writeable_tlv_based_enum_upgradable!(HTLCDestination,
	(2, UnknownNextHop) => {
 (0, requested_forward_scid, required),
	},
	(3, InvalidOnion) => {},
	(4, FailedPayment) => {
 (0, payment_hash, required),
	},
Expand DownExpand Up@@ -1294,7 +1297,7 @@ impl MaybeReadable for Event {
 // Note that we do not write a length-prefixed TLV for FundingGenerationReady events.
 0u8 => Ok(None),
 1u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_preimage = None;
 let mut payment_secret = None;
Expand DownExpand Up@@ -1342,7 +1345,7 @@ impl MaybeReadable for Event {
 f()
 },
 2u8 => {
 let f = || {
 let mut f = || {
 let mut payment_preimage = PaymentPreimage([0; 32]);
 let mut payment_hash = None;
 let mut payment_id = None;
Expand All@@ -1366,7 +1369,7 @@ impl MaybeReadable for Event {
 f()
 },
 3u8 => {
 let f = || {
 let mut f = || {
 #[cfg(test)]
 let error_code = Readable::read(reader)?;
 #[cfg(test)]
Expand DownExpand Up@@ -1409,7 +1412,7 @@ impl MaybeReadable for Event {
 },
 4u8 => Ok(None),
 5u8 => {
 let f = || {
 let mut f = || {
 let mut outputs = WithoutLength(Vec::new());
 let mut channel_id: Option<ChannelId> = None;
 read_tlv_fields!(reader, {
Expand DownExpand Up@@ -1445,7 +1448,7 @@ impl MaybeReadable for Event {
 }))
 },
 7u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = None;
 let mut next_channel_id = None;
 let mut prev_user_channel_id = None;
Expand DownExpand Up@@ -1473,7 +1476,7 @@ impl MaybeReadable for Event {
 f()
 },
 9u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut reason = UpgradableRequired(None);
 let mut user_channel_id_low_opt: Option<u64> = None;
Expand DownExpand Up@@ -1503,7 +1506,7 @@ impl MaybeReadable for Event {
 f()
 },
 11u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut transaction = Transaction{ version: 2, lock_time: LockTime::ZERO, input: Vec::new(), output: Vec::new() };
 read_tlv_fields!(reader, {
Expand All@@ -1515,7 +1518,7 @@ impl MaybeReadable for Event {
 f()
 },
 13u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, option),
Expand All@@ -1531,7 +1534,7 @@ impl MaybeReadable for Event {
 f()
 },
 15u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_id = PaymentId([0; 32]);
 let mut reason = None;
Expand All@@ -1553,7 +1556,7 @@ impl MaybeReadable for Event {
 Ok(None)
 },
 19u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut purpose = UpgradableRequired(None);
 let mut amount_msat = 0;
Expand All@@ -1580,7 +1583,7 @@ impl MaybeReadable for Event {
 f()
 },
 21u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1596,7 +1599,7 @@ impl MaybeReadable for Event {
 f()
 },
 23u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1614,7 +1617,7 @@ impl MaybeReadable for Event {
 f()
 },
 25u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = ChannelId::new_zero();
 let mut failed_next_destination_opt = UpgradableRequired(None);
 read_tlv_fields!(reader, {
Expand All@@ -1630,7 +1633,7 @@ impl MaybeReadable for Event {
 },
 27u8 => Ok(None),
 29u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
Expand All@@ -1652,7 +1655,7 @@ impl MaybeReadable for Event {
 f()
 },
 31u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut former_temporary_channel_id = None;
Expand DownExpand Up@@ -1680,7 +1683,7 @@ impl MaybeReadable for Event {
 f()
 },
 33u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 });
Expand Down
Loading

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

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

from

Mar 28, 2024
 Merged


Support decoding HTLC onions once fully committed
#2845
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3c24a13

Don't consume readers with FixedLengthReader


wpaulino Mar 7, 2024
c096a24

Support Vec serialization that include element length prefix


wpaulino Mar 11, 2024
4ad00f4

Track incoming UpdateAddHTLC until HTLC resolution


wpaulino Jan 22, 2024
60ddd5d

Remove unreachable handling of htlc_forwards upon channel_reestablish


wpaulino Jan 22, 2024
0b38b39

Track pending update_add_htlcs in ChannelManager for later processing


wpaulino Mar 8, 2024
e255b23

Add new HTLCDestination variant for invalid onion


wpaulino Jan 23, 2024
3f940d3

Add is_intro_node_blinded_forward helper for onion_utils::Hop


wpaulino Mar 8, 2024
0073e49

Refactor HTLCFailureMsg generation out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc1651b

Refactor outgoing HTLC checks out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
b9ca578

Refactor outgoing channel lookup out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc7faa3

Only include channel_update in failure if needed by error code


wpaulino Mar 8, 2024
2edc5b2

Refactor incoming HTLC accept checks out from Channel::update_add_htlc


wpaulino Mar 8, 2024
7fe2582

Consider pending decode_update_add_htlcs when pushing forward event


wpaulino Mar 8, 2024
a6c9128

Refactor forward_htlcs to return whether to push a forward event


wpaulino Mar 8, 2024
fe65648

Decode update_add_htlc onions before forwarding HTLCs


wpaulino Mar 9, 2024

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


2 changes: 1 addition & 1 deletion
lightning/src/crypto/streams.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,7 +151,7 @@ mod tests {
 let writeable_len = $obj.serialized_length() as u64 + 16;
 let write_adapter = ChaChaPolyWriteAdapter::new(rho, &$obj);
 let encrypted_writeable_bytes = write_adapter.encode();
 let encrypted_writeable = &encrypted_writeable_bytes[..];
 let encrypted_writeable = &mut &encrypted_writeable_bytes[..];

 // Now deserialize the object back and make sure it matches the original.
 let mut rd = FixedLengthReader::new(encrypted_writeable, writeable_len);
Expand Down

35 changes: 19 additions & 16 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ pub enum HTLCDestination {
 /// Short channel id we are requesting to forward an HTLC to.
 requested_forward_scid: u64
	},
	/// We couldn't decode the incoming onion to obtain the forwarding details.
	InvalidOnion,
@valentinewallacevalentinewallaceJan 24, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

HTLCDestination sounds pretty innaccurate to me now. Would be nice to rename it, maybe in follow-up.
	/// Failure scenario where an HTLC may have been forwarded to be intended for us,
	/// but is invalid for some reason, so we reject it.
	///
Expand DownExpand Up@@ -329,6 +331,7 @@ impl_writeable_tlv_based_enum_upgradable!(HTLCDestination,
	(2, UnknownNextHop) => {
 (0, requested_forward_scid, required),
	},
	(3, InvalidOnion) => {},
	(4, FailedPayment) => {
 (0, payment_hash, required),
	},
Expand DownExpand Up@@ -1294,7 +1297,7 @@ impl MaybeReadable for Event {
 // Note that we do not write a length-prefixed TLV for FundingGenerationReady events.
 0u8 => Ok(None),
 1u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_preimage = None;
 let mut payment_secret = None;
Expand DownExpand Up@@ -1342,7 +1345,7 @@ impl MaybeReadable for Event {
 f()
 },
 2u8 => {
 let f = || {
 let mut f = || {
 let mut payment_preimage = PaymentPreimage([0; 32]);
 let mut payment_hash = None;
 let mut payment_id = None;
Expand All@@ -1366,7 +1369,7 @@ impl MaybeReadable for Event {
 f()
 },
 3u8 => {
 let f = || {
 let mut f = || {
 #[cfg(test)]
 let error_code = Readable::read(reader)?;
 #[cfg(test)]
Expand DownExpand Up@@ -1409,7 +1412,7 @@ impl MaybeReadable for Event {
 },
 4u8 => Ok(None),
 5u8 => {
 let f = || {
 let mut f = || {
 let mut outputs = WithoutLength(Vec::new());
 let mut channel_id: Option<ChannelId> = None;
 read_tlv_fields!(reader, {
Expand DownExpand Up@@ -1445,7 +1448,7 @@ impl MaybeReadable for Event {
 }))
 },
 7u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = None;
 let mut next_channel_id = None;
 let mut prev_user_channel_id = None;
Expand DownExpand Up@@ -1473,7 +1476,7 @@ impl MaybeReadable for Event {
 f()
 },
 9u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut reason = UpgradableRequired(None);
 let mut user_channel_id_low_opt: Option<u64> = None;
Expand DownExpand Up@@ -1503,7 +1506,7 @@ impl MaybeReadable for Event {
 f()
 },
 11u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut transaction = Transaction{ version: 2, lock_time: LockTime::ZERO, input: Vec::new(), output: Vec::new() };
 read_tlv_fields!(reader, {
Expand All@@ -1515,7 +1518,7 @@ impl MaybeReadable for Event {
 f()
 },
 13u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, option),
Expand All@@ -1531,7 +1534,7 @@ impl MaybeReadable for Event {
 f()
 },
 15u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_id = PaymentId([0; 32]);
 let mut reason = None;
Expand All@@ -1553,7 +1556,7 @@ impl MaybeReadable for Event {
 Ok(None)
 },
 19u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut purpose = UpgradableRequired(None);
 let mut amount_msat = 0;
Expand All@@ -1580,7 +1583,7 @@ impl MaybeReadable for Event {
 f()
 },
 21u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1596,7 +1599,7 @@ impl MaybeReadable for Event {
 f()
 },
 23u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1614,7 +1617,7 @@ impl MaybeReadable for Event {
 f()
 },
 25u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = ChannelId::new_zero();
 let mut failed_next_destination_opt = UpgradableRequired(None);
 read_tlv_fields!(reader, {
Expand All@@ -1630,7 +1633,7 @@ impl MaybeReadable for Event {
 },
 27u8 => Ok(None),
 29u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
Expand All@@ -1652,7 +1655,7 @@ impl MaybeReadable for Event {
 f()
 },
 31u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut former_temporary_channel_id = None;
Expand DownExpand Up@@ -1680,7 +1683,7 @@ impl MaybeReadable for Event {
 f()
 },
 33u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 });
Expand Down
Loading

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

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

from

Mar 28, 2024
 Merged


Support decoding HTLC onions once fully committed
#2845
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3c24a13

Don't consume readers with FixedLengthReader


wpaulino Mar 7, 2024
c096a24

Support Vec serialization that include element length prefix


wpaulino Mar 11, 2024
4ad00f4

Track incoming UpdateAddHTLC until HTLC resolution


wpaulino Jan 22, 2024
60ddd5d

Remove unreachable handling of htlc_forwards upon channel_reestablish


wpaulino Jan 22, 2024
0b38b39

Track pending update_add_htlcs in ChannelManager for later processing


wpaulino Mar 8, 2024
e255b23

Add new HTLCDestination variant for invalid onion


wpaulino Jan 23, 2024
3f940d3

Add is_intro_node_blinded_forward helper for onion_utils::Hop


wpaulino Mar 8, 2024
0073e49

Refactor HTLCFailureMsg generation out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc1651b

Refactor outgoing HTLC checks out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
b9ca578

Refactor outgoing channel lookup out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc7faa3

Only include channel_update in failure if needed by error code


wpaulino Mar 8, 2024
2edc5b2

Refactor incoming HTLC accept checks out from Channel::update_add_htlc


wpaulino Mar 8, 2024
7fe2582

Consider pending decode_update_add_htlcs when pushing forward event


wpaulino Mar 8, 2024
a6c9128

Refactor forward_htlcs to return whether to push a forward event


wpaulino Mar 8, 2024
fe65648

Decode update_add_htlc onions before forwarding HTLCs


wpaulino Mar 9, 2024

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


2 changes: 1 addition & 1 deletion
lightning/src/crypto/streams.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,7 +151,7 @@ mod tests {
 let writeable_len = $obj.serialized_length() as u64 + 16;
 let write_adapter = ChaChaPolyWriteAdapter::new(rho, &$obj);
 let encrypted_writeable_bytes = write_adapter.encode();
 let encrypted_writeable = &encrypted_writeable_bytes[..];
 let encrypted_writeable = &mut &encrypted_writeable_bytes[..];

 // Now deserialize the object back and make sure it matches the original.
 let mut rd = FixedLengthReader::new(encrypted_writeable, writeable_len);
Expand Down

35 changes: 19 additions & 16 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ pub enum HTLCDestination {
 /// Short channel id we are requesting to forward an HTLC to.
 requested_forward_scid: u64
	},
	/// We couldn't decode the incoming onion to obtain the forwarding details.
	InvalidOnion,
@valentinewallacevalentinewallaceJan 24, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

HTLCDestination sounds pretty innaccurate to me now. Would be nice to rename it, maybe in follow-up.
	/// Failure scenario where an HTLC may have been forwarded to be intended for us,
	/// but is invalid for some reason, so we reject it.
	///
Expand DownExpand Up@@ -329,6 +331,7 @@ impl_writeable_tlv_based_enum_upgradable!(HTLCDestination,
	(2, UnknownNextHop) => {
 (0, requested_forward_scid, required),
	},
	(3, InvalidOnion) => {},
	(4, FailedPayment) => {
 (0, payment_hash, required),
	},
Expand DownExpand Up@@ -1294,7 +1297,7 @@ impl MaybeReadable for Event {
 // Note that we do not write a length-prefixed TLV for FundingGenerationReady events.
 0u8 => Ok(None),
 1u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_preimage = None;
 let mut payment_secret = None;
Expand DownExpand Up@@ -1342,7 +1345,7 @@ impl MaybeReadable for Event {
 f()
 },
 2u8 => {
 let f = || {
 let mut f = || {
 let mut payment_preimage = PaymentPreimage([0; 32]);
 let mut payment_hash = None;
 let mut payment_id = None;
Expand All@@ -1366,7 +1369,7 @@ impl MaybeReadable for Event {
 f()
 },
 3u8 => {
 let f = || {
 let mut f = || {
 #[cfg(test)]
 let error_code = Readable::read(reader)?;
 #[cfg(test)]
Expand DownExpand Up@@ -1409,7 +1412,7 @@ impl MaybeReadable for Event {
 },
 4u8 => Ok(None),
 5u8 => {
 let f = || {
 let mut f = || {
 let mut outputs = WithoutLength(Vec::new());
 let mut channel_id: Option<ChannelId> = None;
 read_tlv_fields!(reader, {
Expand DownExpand Up@@ -1445,7 +1448,7 @@ impl MaybeReadable for Event {
 }))
 },
 7u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = None;
 let mut next_channel_id = None;
 let mut prev_user_channel_id = None;
Expand DownExpand Up@@ -1473,7 +1476,7 @@ impl MaybeReadable for Event {
 f()
 },
 9u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut reason = UpgradableRequired(None);
 let mut user_channel_id_low_opt: Option<u64> = None;
Expand DownExpand Up@@ -1503,7 +1506,7 @@ impl MaybeReadable for Event {
 f()
 },
 11u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut transaction = Transaction{ version: 2, lock_time: LockTime::ZERO, input: Vec::new(), output: Vec::new() };
 read_tlv_fields!(reader, {
Expand All@@ -1515,7 +1518,7 @@ impl MaybeReadable for Event {
 f()
 },
 13u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, option),
Expand All@@ -1531,7 +1534,7 @@ impl MaybeReadable for Event {
 f()
 },
 15u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_id = PaymentId([0; 32]);
 let mut reason = None;
Expand All@@ -1553,7 +1556,7 @@ impl MaybeReadable for Event {
 Ok(None)
 },
 19u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut purpose = UpgradableRequired(None);
 let mut amount_msat = 0;
Expand All@@ -1580,7 +1583,7 @@ impl MaybeReadable for Event {
 f()
 },
 21u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1596,7 +1599,7 @@ impl MaybeReadable for Event {
 f()
 },
 23u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1614,7 +1617,7 @@ impl MaybeReadable for Event {
 f()
 },
 25u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = ChannelId::new_zero();
 let mut failed_next_destination_opt = UpgradableRequired(None);
 read_tlv_fields!(reader, {
Expand All@@ -1630,7 +1633,7 @@ impl MaybeReadable for Event {
 },
 27u8 => Ok(None),
 29u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
Expand All@@ -1652,7 +1655,7 @@ impl MaybeReadable for Event {
 f()
 },
 31u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut former_temporary_channel_id = None;
Expand DownExpand Up@@ -1680,7 +1683,7 @@ impl MaybeReadable for Event {
 f()
 },
 33u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 });
Expand Down
Loading

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

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

from

Mar 28, 2024
 Merged


Support decoding HTLC onions once fully committed
#2845
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3c24a13

Don't consume readers with FixedLengthReader


wpaulino Mar 7, 2024
c096a24

Support Vec serialization that include element length prefix


wpaulino Mar 11, 2024
4ad00f4

Track incoming UpdateAddHTLC until HTLC resolution


wpaulino Jan 22, 2024
60ddd5d

Remove unreachable handling of htlc_forwards upon channel_reestablish


wpaulino Jan 22, 2024
0b38b39

Track pending update_add_htlcs in ChannelManager for later processing


wpaulino Mar 8, 2024
e255b23

Add new HTLCDestination variant for invalid onion


wpaulino Jan 23, 2024
3f940d3

Add is_intro_node_blinded_forward helper for onion_utils::Hop


wpaulino Mar 8, 2024
0073e49

Refactor HTLCFailureMsg generation out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc1651b

Refactor outgoing HTLC checks out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
b9ca578

Refactor outgoing channel lookup out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc7faa3

Only include channel_update in failure if needed by error code


wpaulino Mar 8, 2024
2edc5b2

Refactor incoming HTLC accept checks out from Channel::update_add_htlc


wpaulino Mar 8, 2024
7fe2582

Consider pending decode_update_add_htlcs when pushing forward event


wpaulino Mar 8, 2024
a6c9128

Refactor forward_htlcs to return whether to push a forward event


wpaulino Mar 8, 2024
fe65648

Decode update_add_htlc onions before forwarding HTLCs


wpaulino Mar 9, 2024

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


2 changes: 1 addition & 1 deletion
lightning/src/crypto/streams.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,7 +151,7 @@ mod tests {
 let writeable_len = $obj.serialized_length() as u64 + 16;
 let write_adapter = ChaChaPolyWriteAdapter::new(rho, &$obj);
 let encrypted_writeable_bytes = write_adapter.encode();
 let encrypted_writeable = &encrypted_writeable_bytes[..];
 let encrypted_writeable = &mut &encrypted_writeable_bytes[..];

 // Now deserialize the object back and make sure it matches the original.
 let mut rd = FixedLengthReader::new(encrypted_writeable, writeable_len);
Expand Down

35 changes: 19 additions & 16 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ pub enum HTLCDestination {
 /// Short channel id we are requesting to forward an HTLC to.
 requested_forward_scid: u64
	},
	/// We couldn't decode the incoming onion to obtain the forwarding details.
	InvalidOnion,
@valentinewallacevalentinewallaceJan 24, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

HTLCDestination sounds pretty innaccurate to me now. Would be nice to rename it, maybe in follow-up.
	/// Failure scenario where an HTLC may have been forwarded to be intended for us,
	/// but is invalid for some reason, so we reject it.
	///
Expand DownExpand Up@@ -329,6 +331,7 @@ impl_writeable_tlv_based_enum_upgradable!(HTLCDestination,
	(2, UnknownNextHop) => {
 (0, requested_forward_scid, required),
	},
	(3, InvalidOnion) => {},
	(4, FailedPayment) => {
 (0, payment_hash, required),
	},
Expand DownExpand Up@@ -1294,7 +1297,7 @@ impl MaybeReadable for Event {
 // Note that we do not write a length-prefixed TLV for FundingGenerationReady events.
 0u8 => Ok(None),
 1u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_preimage = None;
 let mut payment_secret = None;
Expand DownExpand Up@@ -1342,7 +1345,7 @@ impl MaybeReadable for Event {
 f()
 },
 2u8 => {
 let f = || {
 let mut f = || {
 let mut payment_preimage = PaymentPreimage([0; 32]);
 let mut payment_hash = None;
 let mut payment_id = None;
Expand All@@ -1366,7 +1369,7 @@ impl MaybeReadable for Event {
 f()
 },
 3u8 => {
 let f = || {
 let mut f = || {
 #[cfg(test)]
 let error_code = Readable::read(reader)?;
 #[cfg(test)]
Expand DownExpand Up@@ -1409,7 +1412,7 @@ impl MaybeReadable for Event {
 },
 4u8 => Ok(None),
 5u8 => {
 let f = || {
 let mut f = || {
 let mut outputs = WithoutLength(Vec::new());
 let mut channel_id: Option<ChannelId> = None;
 read_tlv_fields!(reader, {
Expand DownExpand Up@@ -1445,7 +1448,7 @@ impl MaybeReadable for Event {
 }))
 },
 7u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = None;
 let mut next_channel_id = None;
 let mut prev_user_channel_id = None;
Expand DownExpand Up@@ -1473,7 +1476,7 @@ impl MaybeReadable for Event {
 f()
 },
 9u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut reason = UpgradableRequired(None);
 let mut user_channel_id_low_opt: Option<u64> = None;
Expand DownExpand Up@@ -1503,7 +1506,7 @@ impl MaybeReadable for Event {
 f()
 },
 11u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut transaction = Transaction{ version: 2, lock_time: LockTime::ZERO, input: Vec::new(), output: Vec::new() };
 read_tlv_fields!(reader, {
Expand All@@ -1515,7 +1518,7 @@ impl MaybeReadable for Event {
 f()
 },
 13u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, option),
Expand All@@ -1531,7 +1534,7 @@ impl MaybeReadable for Event {
 f()
 },
 15u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_id = PaymentId([0; 32]);
 let mut reason = None;
Expand All@@ -1553,7 +1556,7 @@ impl MaybeReadable for Event {
 Ok(None)
 },
 19u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut purpose = UpgradableRequired(None);
 let mut amount_msat = 0;
Expand All@@ -1580,7 +1583,7 @@ impl MaybeReadable for Event {
 f()
 },
 21u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1596,7 +1599,7 @@ impl MaybeReadable for Event {
 f()
 },
 23u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1614,7 +1617,7 @@ impl MaybeReadable for Event {
 f()
 },
 25u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = ChannelId::new_zero();
 let mut failed_next_destination_opt = UpgradableRequired(None);
 read_tlv_fields!(reader, {
Expand All@@ -1630,7 +1633,7 @@ impl MaybeReadable for Event {
 },
 27u8 => Ok(None),
 29u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
Expand All@@ -1652,7 +1655,7 @@ impl MaybeReadable for Event {
 f()
 },
 31u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut former_temporary_channel_id = None;
Expand DownExpand Up@@ -1680,7 +1683,7 @@ impl MaybeReadable for Event {
 f()
 },
 33u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 });
Expand Down
Loading

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

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

from

Mar 28, 2024
 Merged


Support decoding HTLC onions once fully committed
#2845
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3c24a13

Don't consume readers with FixedLengthReader


wpaulino Mar 7, 2024
c096a24

Support Vec serialization that include element length prefix


wpaulino Mar 11, 2024
4ad00f4

Track incoming UpdateAddHTLC until HTLC resolution


wpaulino Jan 22, 2024
60ddd5d

Remove unreachable handling of htlc_forwards upon channel_reestablish


wpaulino Jan 22, 2024
0b38b39

Track pending update_add_htlcs in ChannelManager for later processing


wpaulino Mar 8, 2024
e255b23

Add new HTLCDestination variant for invalid onion


wpaulino Jan 23, 2024
3f940d3

Add is_intro_node_blinded_forward helper for onion_utils::Hop


wpaulino Mar 8, 2024
0073e49

Refactor HTLCFailureMsg generation out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc1651b

Refactor outgoing HTLC checks out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
b9ca578

Refactor outgoing channel lookup out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc7faa3

Only include channel_update in failure if needed by error code


wpaulino Mar 8, 2024
2edc5b2

Refactor incoming HTLC accept checks out from Channel::update_add_htlc


wpaulino Mar 8, 2024
7fe2582

Consider pending decode_update_add_htlcs when pushing forward event


wpaulino Mar 8, 2024
a6c9128

Refactor forward_htlcs to return whether to push a forward event


wpaulino Mar 8, 2024
fe65648

Decode update_add_htlc onions before forwarding HTLCs


wpaulino Mar 9, 2024

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


2 changes: 1 addition & 1 deletion
lightning/src/crypto/streams.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,7 +151,7 @@ mod tests {
 let writeable_len = $obj.serialized_length() as u64 + 16;
 let write_adapter = ChaChaPolyWriteAdapter::new(rho, &$obj);
 let encrypted_writeable_bytes = write_adapter.encode();
 let encrypted_writeable = &encrypted_writeable_bytes[..];
 let encrypted_writeable = &mut &encrypted_writeable_bytes[..];

 // Now deserialize the object back and make sure it matches the original.
 let mut rd = FixedLengthReader::new(encrypted_writeable, writeable_len);
Expand Down

35 changes: 19 additions & 16 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ pub enum HTLCDestination {
 /// Short channel id we are requesting to forward an HTLC to.
 requested_forward_scid: u64
	},
	/// We couldn't decode the incoming onion to obtain the forwarding details.
	InvalidOnion,
@valentinewallacevalentinewallaceJan 24, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

HTLCDestination sounds pretty innaccurate to me now. Would be nice to rename it, maybe in follow-up.
	/// Failure scenario where an HTLC may have been forwarded to be intended for us,
	/// but is invalid for some reason, so we reject it.
	///
Expand DownExpand Up@@ -329,6 +331,7 @@ impl_writeable_tlv_based_enum_upgradable!(HTLCDestination,
	(2, UnknownNextHop) => {
 (0, requested_forward_scid, required),
	},
	(3, InvalidOnion) => {},
	(4, FailedPayment) => {
 (0, payment_hash, required),
	},
Expand DownExpand Up@@ -1294,7 +1297,7 @@ impl MaybeReadable for Event {
 // Note that we do not write a length-prefixed TLV for FundingGenerationReady events.
 0u8 => Ok(None),
 1u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_preimage = None;
 let mut payment_secret = None;
Expand DownExpand Up@@ -1342,7 +1345,7 @@ impl MaybeReadable for Event {
 f()
 },
 2u8 => {
 let f = || {
 let mut f = || {
 let mut payment_preimage = PaymentPreimage([0; 32]);
 let mut payment_hash = None;
 let mut payment_id = None;
Expand All@@ -1366,7 +1369,7 @@ impl MaybeReadable for Event {
 f()
 },
 3u8 => {
 let f = || {
 let mut f = || {
 #[cfg(test)]
 let error_code = Readable::read(reader)?;
 #[cfg(test)]
Expand DownExpand Up@@ -1409,7 +1412,7 @@ impl MaybeReadable for Event {
 },
 4u8 => Ok(None),
 5u8 => {
 let f = || {
 let mut f = || {
 let mut outputs = WithoutLength(Vec::new());
 let mut channel_id: Option<ChannelId> = None;
 read_tlv_fields!(reader, {
Expand DownExpand Up@@ -1445,7 +1448,7 @@ impl MaybeReadable for Event {
 }))
 },
 7u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = None;
 let mut next_channel_id = None;
 let mut prev_user_channel_id = None;
Expand DownExpand Up@@ -1473,7 +1476,7 @@ impl MaybeReadable for Event {
 f()
 },
 9u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut reason = UpgradableRequired(None);
 let mut user_channel_id_low_opt: Option<u64> = None;
Expand DownExpand Up@@ -1503,7 +1506,7 @@ impl MaybeReadable for Event {
 f()
 },
 11u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut transaction = Transaction{ version: 2, lock_time: LockTime::ZERO, input: Vec::new(), output: Vec::new() };
 read_tlv_fields!(reader, {
Expand All@@ -1515,7 +1518,7 @@ impl MaybeReadable for Event {
 f()
 },
 13u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, option),
Expand All@@ -1531,7 +1534,7 @@ impl MaybeReadable for Event {
 f()
 },
 15u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_id = PaymentId([0; 32]);
 let mut reason = None;
Expand All@@ -1553,7 +1556,7 @@ impl MaybeReadable for Event {
 Ok(None)
 },
 19u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut purpose = UpgradableRequired(None);
 let mut amount_msat = 0;
Expand All@@ -1580,7 +1583,7 @@ impl MaybeReadable for Event {
 f()
 },
 21u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1596,7 +1599,7 @@ impl MaybeReadable for Event {
 f()
 },
 23u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1614,7 +1617,7 @@ impl MaybeReadable for Event {
 f()
 },
 25u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = ChannelId::new_zero();
 let mut failed_next_destination_opt = UpgradableRequired(None);
 read_tlv_fields!(reader, {
Expand All@@ -1630,7 +1633,7 @@ impl MaybeReadable for Event {
 },
 27u8 => Ok(None),
 29u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
Expand All@@ -1652,7 +1655,7 @@ impl MaybeReadable for Event {
 f()
 },
 31u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut former_temporary_channel_id = None;
Expand DownExpand Up@@ -1680,7 +1683,7 @@ impl MaybeReadable for Event {
 f()
 },
 33u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 });
Expand Down
Loading

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

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

from

Mar 28, 2024
 Merged


Support decoding HTLC onions once fully committed
#2845
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3c24a13

Don't consume readers with FixedLengthReader


wpaulino Mar 7, 2024
c096a24

Support Vec serialization that include element length prefix


wpaulino Mar 11, 2024
4ad00f4

Track incoming UpdateAddHTLC until HTLC resolution


wpaulino Jan 22, 2024
60ddd5d

Remove unreachable handling of htlc_forwards upon channel_reestablish


wpaulino Jan 22, 2024
0b38b39

Track pending update_add_htlcs in ChannelManager for later processing


wpaulino Mar 8, 2024
e255b23

Add new HTLCDestination variant for invalid onion


wpaulino Jan 23, 2024
3f940d3

Add is_intro_node_blinded_forward helper for onion_utils::Hop


wpaulino Mar 8, 2024
0073e49

Refactor HTLCFailureMsg generation out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc1651b

Refactor outgoing HTLC checks out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
b9ca578

Refactor outgoing channel lookup out from decode_update_add_htlc_onion


wpaulino Jan 24, 2024
cc7faa3

Only include channel_update in failure if needed by error code


wpaulino Mar 8, 2024
2edc5b2

Refactor incoming HTLC accept checks out from Channel::update_add_htlc


wpaulino Mar 8, 2024
7fe2582

Consider pending decode_update_add_htlcs when pushing forward event


wpaulino Mar 8, 2024
a6c9128

Refactor forward_htlcs to return whether to push a forward event


wpaulino Mar 8, 2024
fe65648

Decode update_add_htlc onions before forwarding HTLCs


wpaulino Mar 9, 2024

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


2 changes: 1 addition & 1 deletion
lightning/src/crypto/streams.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,7 +151,7 @@ mod tests {
 let writeable_len = $obj.serialized_length() as u64 + 16;
 let write_adapter = ChaChaPolyWriteAdapter::new(rho, &$obj);
 let encrypted_writeable_bytes = write_adapter.encode();
 let encrypted_writeable = &encrypted_writeable_bytes[..];
 let encrypted_writeable = &mut &encrypted_writeable_bytes[..];

 // Now deserialize the object back and make sure it matches the original.
 let mut rd = FixedLengthReader::new(encrypted_writeable, writeable_len);
Expand Down

35 changes: 19 additions & 16 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ pub enum HTLCDestination {
 /// Short channel id we are requesting to forward an HTLC to.
 requested_forward_scid: u64
	},
	/// We couldn't decode the incoming onion to obtain the forwarding details.
	InvalidOnion,
@valentinewallacevalentinewallaceJan 24, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

HTLCDestination sounds pretty innaccurate to me now. Would be nice to rename it, maybe in follow-up.
	/// Failure scenario where an HTLC may have been forwarded to be intended for us,
	/// but is invalid for some reason, so we reject it.
	///
Expand DownExpand Up@@ -329,6 +331,7 @@ impl_writeable_tlv_based_enum_upgradable!(HTLCDestination,
	(2, UnknownNextHop) => {
 (0, requested_forward_scid, required),
	},
	(3, InvalidOnion) => {},
	(4, FailedPayment) => {
 (0, payment_hash, required),
	},
Expand DownExpand Up@@ -1294,7 +1297,7 @@ impl MaybeReadable for Event {
 // Note that we do not write a length-prefixed TLV for FundingGenerationReady events.
 0u8 => Ok(None),
 1u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_preimage = None;
 let mut payment_secret = None;
Expand DownExpand Up@@ -1342,7 +1345,7 @@ impl MaybeReadable for Event {
 f()
 },
 2u8 => {
 let f = || {
 let mut f = || {
 let mut payment_preimage = PaymentPreimage([0; 32]);
 let mut payment_hash = None;
 let mut payment_id = None;
Expand All@@ -1366,7 +1369,7 @@ impl MaybeReadable for Event {
 f()
 },
 3u8 => {
 let f = || {
 let mut f = || {
 #[cfg(test)]
 let error_code = Readable::read(reader)?;
 #[cfg(test)]
Expand DownExpand Up@@ -1409,7 +1412,7 @@ impl MaybeReadable for Event {
 },
 4u8 => Ok(None),
 5u8 => {
 let f = || {
 let mut f = || {
 let mut outputs = WithoutLength(Vec::new());
 let mut channel_id: Option<ChannelId> = None;
 read_tlv_fields!(reader, {
Expand DownExpand Up@@ -1445,7 +1448,7 @@ impl MaybeReadable for Event {
 }))
 },
 7u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = None;
 let mut next_channel_id = None;
 let mut prev_user_channel_id = None;
Expand DownExpand Up@@ -1473,7 +1476,7 @@ impl MaybeReadable for Event {
 f()
 },
 9u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut reason = UpgradableRequired(None);
 let mut user_channel_id_low_opt: Option<u64> = None;
Expand DownExpand Up@@ -1503,7 +1506,7 @@ impl MaybeReadable for Event {
 f()
 },
 11u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut transaction = Transaction{ version: 2, lock_time: LockTime::ZERO, input: Vec::new(), output: Vec::new() };
 read_tlv_fields!(reader, {
Expand All@@ -1515,7 +1518,7 @@ impl MaybeReadable for Event {
 f()
 },
 13u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, option),
Expand All@@ -1531,7 +1534,7 @@ impl MaybeReadable for Event {
 f()
 },
 15u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut payment_id = PaymentId([0; 32]);
 let mut reason = None;
Expand All@@ -1553,7 +1556,7 @@ impl MaybeReadable for Event {
 Ok(None)
 },
 19u8 => {
 let f = || {
 let mut f = || {
 let mut payment_hash = PaymentHash([0; 32]);
 let mut purpose = UpgradableRequired(None);
 let mut amount_msat = 0;
Expand All@@ -1580,7 +1583,7 @@ impl MaybeReadable for Event {
 f()
 },
 21u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1596,7 +1599,7 @@ impl MaybeReadable for Event {
 f()
 },
 23u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 (2, payment_hash, required),
Expand All@@ -1614,7 +1617,7 @@ impl MaybeReadable for Event {
 f()
 },
 25u8 => {
 let f = || {
 let mut f = || {
 let mut prev_channel_id = ChannelId::new_zero();
 let mut failed_next_destination_opt = UpgradableRequired(None);
 read_tlv_fields!(reader, {
Expand All@@ -1630,7 +1633,7 @@ impl MaybeReadable for Event {
 },
 27u8 => Ok(None),
 29u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
Expand All@@ -1652,7 +1655,7 @@ impl MaybeReadable for Event {
 f()
 },
 31u8 => {
 let f = || {
 let mut f = || {
 let mut channel_id = ChannelId::new_zero();
 let mut user_channel_id: u128 = 0;
 let mut former_temporary_channel_id = None;
Expand DownExpand Up@@ -1680,7 +1683,7 @@ impl MaybeReadable for Event {
 f()
 },
 33u8 => {
 let f = || {
 let mut f = || {
 _init_and_read_len_prefixed_tlv_fields!(reader, {
 (0, payment_id, required),
 });
Expand Down
Loading