Skip to content

Trampoline onion construction vectors#2906

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 3 commits into from
Mar 27, 2024
Merged

Trampoline onion construction vectors #2906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4baa8a7
Rename TrampolineOnionPacket enum comment.
arik-so Mar 22, 2024
e7e1afa
Trampoline onion construction.
arik-so Mar 27, 2024
52039a2
Test Trampoline payload serialization.
arik-so Mar 27, 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
29 changes: 28 additions & 1 deletion lightning/src/ln/msgs.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1740,6 +1740,17 @@ mod fuzzy_internal_msgs {
}
}

pub(crate) enum OutboundTrampolinePayload {
#[allow(unused)]
Forward {
/// The value, in msat, of the payment after this hop's fee is deducted.
amt_to_forward: u64,
outgoing_cltv_value: u32,
/// The node id to which the trampoline node must find a route
outgoing_node_id: PublicKey,
}
}

pub struct DecodedOnionErrorPacket {
pub(crate) hmac: [u8; 32],
pub(crate) failuremsg: Vec<u8>,
Expand DownExpand Up@@ -1798,7 +1809,7 @@ pub struct TrampolineOnionPacket {
// Unlike the onion packets used for payments, Trampoline onion packets have to be shorter than
// 1300 bytes. The expected default is 650 bytes.
// TODO: if 650 ends up being the most common size, optimize this to be:
// enum { ThirteenHundred([u8; 650]), VarLen(Vec<u8>) }
// enum { SixFifty([u8; 650]), VarLen(Vec<u8>) }
pub hop_data: Vec<u8>,
/// HMAC to verify the integrity of hop_data
pub hmac: [u8; 32],
Expand DownExpand Up@@ -2597,6 +2608,22 @@ impl Writeable for OutboundOnionPayload {
}
}

impl Writeable for OutboundTrampolinePayload {
fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
match self {
Self::Forward { amt_to_forward, outgoing_cltv_value, outgoing_node_id } => {
_encode_varint_length_prefixed_tlv!(w, {
(2, HighZeroBytesDroppedBigSize(*amt_to_forward), required),
(4, HighZeroBytesDroppedBigSize(*outgoing_cltv_value), required),
(14, outgoing_node_id, required)
});
}
}
Ok(())
}
}


impl<NS: Deref> ReadableArgs<(Option<PublicKey>, &NS)> for InboundOnionPayload where NS::Target: NodeSigner {
fn read<R: Read>(r: &mut R, args: (Option<PublicKey>, &NS)) -> Result<Self, DecodeError> {
let (update_add_blinding_point, node_signer) = args;
Expand Down
24 changes: 22 additions & 2 deletions lightning/src/ln/onion_route_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteParameters, RouteHint, RouteHintHop};
use crate::ln::features::{InitFeatures, Bolt11InvoiceFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate};
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate, OutboundTrampolinePayload};
use crate::ln::wire::Encode;
use crate::util::ser::{Writeable, Writer, BigSize};
use crate::util::test_utils;
Expand All@@ -35,11 +35,12 @@ use bitcoin::hashes::hmac::{Hmac, HmacEngine};
use bitcoin::hashes::sha256::Hash as Sha256;

use bitcoin::secp256k1;
use bitcoin::secp256k1::{Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};

use crate::io;
use crate::prelude::*;
use core::default::Default;
use bitcoin::hashes::hex::FromHex;

@valentinewallacevalentinewallaceMar 27, 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.

nit: import out of order


use crate::ln::functional_test_utils::*;

Expand DownExpand Up@@ -966,6 +967,25 @@ fn test_always_create_tlv_format_onion_payloads() {
}
}

#[test]
fn test_trampoline_onion_payload_serialization() {
// As per https://github.com/lightning/bolts/blob/c01d2e6267d4a8d1095f0f1188970055a9a22d29/bolt04/trampoline-payment-onion-test.json#L3
let trampoline_payload = OutboundTrampolinePayload::Forward {
amt_to_forward: 100000000,
outgoing_cltv_value: 800000,
outgoing_node_id: PublicKey::from_slice(&<Vec<u8>>::from_hex("02edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145").unwrap()).unwrap(),
};

let slice_to_hex = |slice: &[u8]| {
slice.iter()
.map(|b| format!("{:02x}", b).to_string())
.collect::<String>()
};

let carol_payload_hex = slice_to_hex(&trampoline_payload.encode());
assert_eq!(carol_payload_hex, "2e020405f5e10004030c35000e2102edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145");
}

fn do_test_fail_htlc_backwards_with_reason(failure_code: FailureCode) {

let chanmon_cfgs = create_chanmon_cfgs(2);
Expand Down
18 changes: 18 additions & 0 deletions lightning/src/ln/onion_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,24 @@ pub(super) fn construct_onion_packet(
)
}

#[allow(unused)]
pub(super) fn construct_trampoline_onion_packet(
payloads: Vec<msgs::OutboundTrampolinePayload>, onion_keys: Vec<OnionKeys>,
prng_seed: [u8; 32], associated_data: &PaymentHash, length: u16,
) -> Result<msgs::TrampolineOnionPacket, ()> {
let mut packet_data = vec![0u8; length as usize];

let mut chacha = ChaCha20::new(&prng_seed, &[0; 8]);
chacha.process(&vec![0u8; length as usize], &mut packet_data);

construct_onion_packet_with_init_noise::<_, _>(
payloads,
onion_keys,
packet_data,
Some(associated_data),
)
}

#[cfg(test)]
/// Used in testing to write bogus `BogusOnionHopData` as well as `RawOnionHopData`, which is
/// otherwise not representable in `msgs::OnionHopData`.
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Trampoline onion construction vectors by arik-so · Pull Request #2906 · lightningdevkit/rust-lightning · GitHub
Skip to content
Trampoline onion construction vectors#2906

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

from

Mar 27, 2024
 Merged


Trampoline onion construction vectors
#2906
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4baa8a7

Rename TrampolineOnionPacket enum comment.


arik-so Mar 22, 2024
e7e1afa

Trampoline onion construction.


arik-so Mar 27, 2024
52039a2

Test Trampoline payload serialization.


arik-so Mar 27, 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


29 changes: 28 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1740,6 +1740,17 @@ mod fuzzy_internal_msgs {
 }
	}

	pub(crate) enum OutboundTrampolinePayload {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 /// The node id to which the trampoline node must find a route
 outgoing_node_id: PublicKey,
 }
	}

	pub struct DecodedOnionErrorPacket {
 pub(crate) hmac: [u8; 32],
 pub(crate) failuremsg: Vec<u8>,
Expand DownExpand Up@@ -1798,7 +1809,7 @@ pub struct TrampolineOnionPacket {
	// Unlike the onion packets used for payments, Trampoline onion packets have to be shorter than
	// 1300 bytes. The expected default is 650 bytes.
	// TODO: if 650 ends up being the most common size, optimize this to be:
	// enum { ThirteenHundred([u8; 650]), VarLen(Vec<u8>) }
	// enum { SixFifty([u8; 650]), VarLen(Vec<u8>) }
	pub hop_data: Vec<u8>,
	/// HMAC to verify the integrity of hop_data
	pub hmac: [u8; 32],
Expand DownExpand Up@@ -2597,6 +2608,22 @@ impl Writeable for OutboundOnionPayload {
	}
}

impl Writeable for OutboundTrampolinePayload {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 match self {
 Self::Forward { amt_to_forward, outgoing_cltv_value, outgoing_node_id } => {
 _encode_varint_length_prefixed_tlv!(w, {
 (2, HighZeroBytesDroppedBigSize(*amt_to_forward), required),
 (4, HighZeroBytesDroppedBigSize(*outgoing_cltv_value), required),
 (14, outgoing_node_id, required)
 });
 }
 }
 Ok(())
	}
}


impl<NS: Deref> ReadableArgs<(Option<PublicKey>, &NS)> for InboundOnionPayload where NS::Target: NodeSigner {
	fn read<R: Read>(r: &mut R, args: (Option<PublicKey>, &NS)) -> Result<Self, DecodeError> {
 let (update_add_blinding_point, node_signer) = args;
Expand Down

24 changes: 22 additions & 2 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteParameters, RouteHint, RouteHintHop};
use crate::ln::features::{InitFeatures, Bolt11InvoiceFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate};
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate, OutboundTrampolinePayload};
use crate::ln::wire::Encode;
use crate::util::ser::{Writeable, Writer, BigSize};
use crate::util::test_utils;
Expand All@@ -35,11 +35,12 @@ use bitcoin::hashes::hmac::{Hmac, HmacEngine};
use bitcoin::hashes::sha256::Hash as Sha256;

use bitcoin::secp256k1;
use bitcoin::secp256k1::{Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};

use crate::io;
use crate::prelude::*;
use core::default::Default;
use bitcoin::hashes::hex::FromHex;
@valentinewallacevalentinewallaceMar 27, 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.

nit: import out of order

use crate::ln::functional_test_utils::*;

Expand DownExpand Up@@ -966,6 +967,25 @@ fn test_always_create_tlv_format_onion_payloads() {
	}
}

#[test]
fn test_trampoline_onion_payload_serialization() {
	// As per https://github.com/lightning/bolts/blob/c01d2e6267d4a8d1095f0f1188970055a9a22d29/bolt04/trampoline-payment-onion-test.json#L3
	let trampoline_payload = OutboundTrampolinePayload::Forward {
 amt_to_forward: 100000000,
 outgoing_cltv_value: 800000,
 outgoing_node_id: PublicKey::from_slice(&<Vec<u8>>::from_hex("02edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145").unwrap()).unwrap(),
	};

	let slice_to_hex = |slice: &[u8]| {
 slice.iter()
 .map(|b| format!("{:02x}", b).to_string())
 .collect::<String>()
	};

	let carol_payload_hex = slice_to_hex(&trampoline_payload.encode());
	assert_eq!(carol_payload_hex, "2e020405f5e10004030c35000e2102edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145");
}

fn do_test_fail_htlc_backwards_with_reason(failure_code: FailureCode) {

	let chanmon_cfgs = create_chanmon_cfgs(2);
Expand Down

18 changes: 18 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,24 @@ pub(super) fn construct_onion_packet(
	)
}

#[allow(unused)]
pub(super) fn construct_trampoline_onion_packet(
	payloads: Vec<msgs::OutboundTrampolinePayload>, onion_keys: Vec<OnionKeys>,
	prng_seed: [u8; 32], associated_data: &PaymentHash, length: u16,
) -> Result<msgs::TrampolineOnionPacket, ()> {
	let mut packet_data = vec![0u8; length as usize];

	let mut chacha = ChaCha20::new(&prng_seed, &[0; 8]);
	chacha.process(&vec![0u8; length as usize], &mut packet_data);

	construct_onion_packet_with_init_noise::<_, _>(
 payloads,
 onion_keys,
 packet_data,
 Some(associated_data),
	)
}

#[cfg(test)]
/// Used in testing to write bogus `BogusOnionHopData` as well as `RawOnionHopData`, which is
/// otherwise not representable in `msgs::OnionHopData`.
Expand Down

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

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

from

Mar 27, 2024
 Merged


Trampoline onion construction vectors
#2906
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4baa8a7

Rename TrampolineOnionPacket enum comment.


arik-so Mar 22, 2024
e7e1afa

Trampoline onion construction.


arik-so Mar 27, 2024
52039a2

Test Trampoline payload serialization.


arik-so Mar 27, 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


29 changes: 28 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1740,6 +1740,17 @@ mod fuzzy_internal_msgs {
 }
	}

	pub(crate) enum OutboundTrampolinePayload {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 /// The node id to which the trampoline node must find a route
 outgoing_node_id: PublicKey,
 }
	}

	pub struct DecodedOnionErrorPacket {
 pub(crate) hmac: [u8; 32],
 pub(crate) failuremsg: Vec<u8>,
Expand DownExpand Up@@ -1798,7 +1809,7 @@ pub struct TrampolineOnionPacket {
	// Unlike the onion packets used for payments, Trampoline onion packets have to be shorter than
	// 1300 bytes. The expected default is 650 bytes.
	// TODO: if 650 ends up being the most common size, optimize this to be:
	// enum { ThirteenHundred([u8; 650]), VarLen(Vec<u8>) }
	// enum { SixFifty([u8; 650]), VarLen(Vec<u8>) }
	pub hop_data: Vec<u8>,
	/// HMAC to verify the integrity of hop_data
	pub hmac: [u8; 32],
Expand DownExpand Up@@ -2597,6 +2608,22 @@ impl Writeable for OutboundOnionPayload {
	}
}

impl Writeable for OutboundTrampolinePayload {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 match self {
 Self::Forward { amt_to_forward, outgoing_cltv_value, outgoing_node_id } => {
 _encode_varint_length_prefixed_tlv!(w, {
 (2, HighZeroBytesDroppedBigSize(*amt_to_forward), required),
 (4, HighZeroBytesDroppedBigSize(*outgoing_cltv_value), required),
 (14, outgoing_node_id, required)
 });
 }
 }
 Ok(())
	}
}


impl<NS: Deref> ReadableArgs<(Option<PublicKey>, &NS)> for InboundOnionPayload where NS::Target: NodeSigner {
	fn read<R: Read>(r: &mut R, args: (Option<PublicKey>, &NS)) -> Result<Self, DecodeError> {
 let (update_add_blinding_point, node_signer) = args;
Expand Down

24 changes: 22 additions & 2 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteParameters, RouteHint, RouteHintHop};
use crate::ln::features::{InitFeatures, Bolt11InvoiceFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate};
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate, OutboundTrampolinePayload};
use crate::ln::wire::Encode;
use crate::util::ser::{Writeable, Writer, BigSize};
use crate::util::test_utils;
Expand All@@ -35,11 +35,12 @@ use bitcoin::hashes::hmac::{Hmac, HmacEngine};
use bitcoin::hashes::sha256::Hash as Sha256;

use bitcoin::secp256k1;
use bitcoin::secp256k1::{Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};

use crate::io;
use crate::prelude::*;
use core::default::Default;
use bitcoin::hashes::hex::FromHex;
@valentinewallacevalentinewallaceMar 27, 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.

nit: import out of order

use crate::ln::functional_test_utils::*;

Expand DownExpand Up@@ -966,6 +967,25 @@ fn test_always_create_tlv_format_onion_payloads() {
	}
}

#[test]
fn test_trampoline_onion_payload_serialization() {
	// As per https://github.com/lightning/bolts/blob/c01d2e6267d4a8d1095f0f1188970055a9a22d29/bolt04/trampoline-payment-onion-test.json#L3
	let trampoline_payload = OutboundTrampolinePayload::Forward {
 amt_to_forward: 100000000,
 outgoing_cltv_value: 800000,
 outgoing_node_id: PublicKey::from_slice(&<Vec<u8>>::from_hex("02edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145").unwrap()).unwrap(),
	};

	let slice_to_hex = |slice: &[u8]| {
 slice.iter()
 .map(|b| format!("{:02x}", b).to_string())
 .collect::<String>()
	};

	let carol_payload_hex = slice_to_hex(&trampoline_payload.encode());
	assert_eq!(carol_payload_hex, "2e020405f5e10004030c35000e2102edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145");
}

fn do_test_fail_htlc_backwards_with_reason(failure_code: FailureCode) {

	let chanmon_cfgs = create_chanmon_cfgs(2);
Expand Down

18 changes: 18 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,24 @@ pub(super) fn construct_onion_packet(
	)
}

#[allow(unused)]
pub(super) fn construct_trampoline_onion_packet(
	payloads: Vec<msgs::OutboundTrampolinePayload>, onion_keys: Vec<OnionKeys>,
	prng_seed: [u8; 32], associated_data: &PaymentHash, length: u16,
) -> Result<msgs::TrampolineOnionPacket, ()> {
	let mut packet_data = vec![0u8; length as usize];

	let mut chacha = ChaCha20::new(&prng_seed, &[0; 8]);
	chacha.process(&vec![0u8; length as usize], &mut packet_data);

	construct_onion_packet_with_init_noise::<_, _>(
 payloads,
 onion_keys,
 packet_data,
 Some(associated_data),
	)
}

#[cfg(test)]
/// Used in testing to write bogus `BogusOnionHopData` as well as `RawOnionHopData`, which is
/// otherwise not representable in `msgs::OnionHopData`.
Expand Down

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

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

from

Mar 27, 2024
 Merged


Trampoline onion construction vectors
#2906
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4baa8a7

Rename TrampolineOnionPacket enum comment.


arik-so Mar 22, 2024
e7e1afa

Trampoline onion construction.


arik-so Mar 27, 2024
52039a2

Test Trampoline payload serialization.


arik-so Mar 27, 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


29 changes: 28 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1740,6 +1740,17 @@ mod fuzzy_internal_msgs {
 }
	}

	pub(crate) enum OutboundTrampolinePayload {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 /// The node id to which the trampoline node must find a route
 outgoing_node_id: PublicKey,
 }
	}

	pub struct DecodedOnionErrorPacket {
 pub(crate) hmac: [u8; 32],
 pub(crate) failuremsg: Vec<u8>,
Expand DownExpand Up@@ -1798,7 +1809,7 @@ pub struct TrampolineOnionPacket {
	// Unlike the onion packets used for payments, Trampoline onion packets have to be shorter than
	// 1300 bytes. The expected default is 650 bytes.
	// TODO: if 650 ends up being the most common size, optimize this to be:
	// enum { ThirteenHundred([u8; 650]), VarLen(Vec<u8>) }
	// enum { SixFifty([u8; 650]), VarLen(Vec<u8>) }
	pub hop_data: Vec<u8>,
	/// HMAC to verify the integrity of hop_data
	pub hmac: [u8; 32],
Expand DownExpand Up@@ -2597,6 +2608,22 @@ impl Writeable for OutboundOnionPayload {
	}
}

impl Writeable for OutboundTrampolinePayload {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 match self {
 Self::Forward { amt_to_forward, outgoing_cltv_value, outgoing_node_id } => {
 _encode_varint_length_prefixed_tlv!(w, {
 (2, HighZeroBytesDroppedBigSize(*amt_to_forward), required),
 (4, HighZeroBytesDroppedBigSize(*outgoing_cltv_value), required),
 (14, outgoing_node_id, required)
 });
 }
 }
 Ok(())
	}
}


impl<NS: Deref> ReadableArgs<(Option<PublicKey>, &NS)> for InboundOnionPayload where NS::Target: NodeSigner {
	fn read<R: Read>(r: &mut R, args: (Option<PublicKey>, &NS)) -> Result<Self, DecodeError> {
 let (update_add_blinding_point, node_signer) = args;
Expand Down

24 changes: 22 additions & 2 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteParameters, RouteHint, RouteHintHop};
use crate::ln::features::{InitFeatures, Bolt11InvoiceFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate};
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate, OutboundTrampolinePayload};
use crate::ln::wire::Encode;
use crate::util::ser::{Writeable, Writer, BigSize};
use crate::util::test_utils;
Expand All@@ -35,11 +35,12 @@ use bitcoin::hashes::hmac::{Hmac, HmacEngine};
use bitcoin::hashes::sha256::Hash as Sha256;

use bitcoin::secp256k1;
use bitcoin::secp256k1::{Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};

use crate::io;
use crate::prelude::*;
use core::default::Default;
use bitcoin::hashes::hex::FromHex;
@valentinewallacevalentinewallaceMar 27, 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.

nit: import out of order

use crate::ln::functional_test_utils::*;

Expand DownExpand Up@@ -966,6 +967,25 @@ fn test_always_create_tlv_format_onion_payloads() {
	}
}

#[test]
fn test_trampoline_onion_payload_serialization() {
	// As per https://github.com/lightning/bolts/blob/c01d2e6267d4a8d1095f0f1188970055a9a22d29/bolt04/trampoline-payment-onion-test.json#L3
	let trampoline_payload = OutboundTrampolinePayload::Forward {
 amt_to_forward: 100000000,
 outgoing_cltv_value: 800000,
 outgoing_node_id: PublicKey::from_slice(&<Vec<u8>>::from_hex("02edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145").unwrap()).unwrap(),
	};

	let slice_to_hex = |slice: &[u8]| {
 slice.iter()
 .map(|b| format!("{:02x}", b).to_string())
 .collect::<String>()
	};

	let carol_payload_hex = slice_to_hex(&trampoline_payload.encode());
	assert_eq!(carol_payload_hex, "2e020405f5e10004030c35000e2102edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145");
}

fn do_test_fail_htlc_backwards_with_reason(failure_code: FailureCode) {

	let chanmon_cfgs = create_chanmon_cfgs(2);
Expand Down

18 changes: 18 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,24 @@ pub(super) fn construct_onion_packet(
	)
}

#[allow(unused)]
pub(super) fn construct_trampoline_onion_packet(
	payloads: Vec<msgs::OutboundTrampolinePayload>, onion_keys: Vec<OnionKeys>,
	prng_seed: [u8; 32], associated_data: &PaymentHash, length: u16,
) -> Result<msgs::TrampolineOnionPacket, ()> {
	let mut packet_data = vec![0u8; length as usize];

	let mut chacha = ChaCha20::new(&prng_seed, &[0; 8]);
	chacha.process(&vec![0u8; length as usize], &mut packet_data);

	construct_onion_packet_with_init_noise::<_, _>(
 payloads,
 onion_keys,
 packet_data,
 Some(associated_data),
	)
}

#[cfg(test)]
/// Used in testing to write bogus `BogusOnionHopData` as well as `RawOnionHopData`, which is
/// otherwise not representable in `msgs::OnionHopData`.
Expand Down

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

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

from

Mar 27, 2024
 Merged


Trampoline onion construction vectors
#2906
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4baa8a7

Rename TrampolineOnionPacket enum comment.


arik-so Mar 22, 2024
e7e1afa

Trampoline onion construction.


arik-so Mar 27, 2024
52039a2

Test Trampoline payload serialization.


arik-so Mar 27, 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


29 changes: 28 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1740,6 +1740,17 @@ mod fuzzy_internal_msgs {
 }
	}

	pub(crate) enum OutboundTrampolinePayload {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 /// The node id to which the trampoline node must find a route
 outgoing_node_id: PublicKey,
 }
	}

	pub struct DecodedOnionErrorPacket {
 pub(crate) hmac: [u8; 32],
 pub(crate) failuremsg: Vec<u8>,
Expand DownExpand Up@@ -1798,7 +1809,7 @@ pub struct TrampolineOnionPacket {
	// Unlike the onion packets used for payments, Trampoline onion packets have to be shorter than
	// 1300 bytes. The expected default is 650 bytes.
	// TODO: if 650 ends up being the most common size, optimize this to be:
	// enum { ThirteenHundred([u8; 650]), VarLen(Vec<u8>) }
	// enum { SixFifty([u8; 650]), VarLen(Vec<u8>) }
	pub hop_data: Vec<u8>,
	/// HMAC to verify the integrity of hop_data
	pub hmac: [u8; 32],
Expand DownExpand Up@@ -2597,6 +2608,22 @@ impl Writeable for OutboundOnionPayload {
	}
}

impl Writeable for OutboundTrampolinePayload {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 match self {
 Self::Forward { amt_to_forward, outgoing_cltv_value, outgoing_node_id } => {
 _encode_varint_length_prefixed_tlv!(w, {
 (2, HighZeroBytesDroppedBigSize(*amt_to_forward), required),
 (4, HighZeroBytesDroppedBigSize(*outgoing_cltv_value), required),
 (14, outgoing_node_id, required)
 });
 }
 }
 Ok(())
	}
}


impl<NS: Deref> ReadableArgs<(Option<PublicKey>, &NS)> for InboundOnionPayload where NS::Target: NodeSigner {
	fn read<R: Read>(r: &mut R, args: (Option<PublicKey>, &NS)) -> Result<Self, DecodeError> {
 let (update_add_blinding_point, node_signer) = args;
Expand Down

24 changes: 22 additions & 2 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteParameters, RouteHint, RouteHintHop};
use crate::ln::features::{InitFeatures, Bolt11InvoiceFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate};
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate, OutboundTrampolinePayload};
use crate::ln::wire::Encode;
use crate::util::ser::{Writeable, Writer, BigSize};
use crate::util::test_utils;
Expand All@@ -35,11 +35,12 @@ use bitcoin::hashes::hmac::{Hmac, HmacEngine};
use bitcoin::hashes::sha256::Hash as Sha256;

use bitcoin::secp256k1;
use bitcoin::secp256k1::{Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};

use crate::io;
use crate::prelude::*;
use core::default::Default;
use bitcoin::hashes::hex::FromHex;
@valentinewallacevalentinewallaceMar 27, 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.

nit: import out of order

use crate::ln::functional_test_utils::*;

Expand DownExpand Up@@ -966,6 +967,25 @@ fn test_always_create_tlv_format_onion_payloads() {
	}
}

#[test]
fn test_trampoline_onion_payload_serialization() {
	// As per https://github.com/lightning/bolts/blob/c01d2e6267d4a8d1095f0f1188970055a9a22d29/bolt04/trampoline-payment-onion-test.json#L3
	let trampoline_payload = OutboundTrampolinePayload::Forward {
 amt_to_forward: 100000000,
 outgoing_cltv_value: 800000,
 outgoing_node_id: PublicKey::from_slice(&<Vec<u8>>::from_hex("02edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145").unwrap()).unwrap(),
	};

	let slice_to_hex = |slice: &[u8]| {
 slice.iter()
 .map(|b| format!("{:02x}", b).to_string())
 .collect::<String>()
	};

	let carol_payload_hex = slice_to_hex(&trampoline_payload.encode());
	assert_eq!(carol_payload_hex, "2e020405f5e10004030c35000e2102edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145");
}

fn do_test_fail_htlc_backwards_with_reason(failure_code: FailureCode) {

	let chanmon_cfgs = create_chanmon_cfgs(2);
Expand Down

18 changes: 18 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,24 @@ pub(super) fn construct_onion_packet(
	)
}

#[allow(unused)]
pub(super) fn construct_trampoline_onion_packet(
	payloads: Vec<msgs::OutboundTrampolinePayload>, onion_keys: Vec<OnionKeys>,
	prng_seed: [u8; 32], associated_data: &PaymentHash, length: u16,
) -> Result<msgs::TrampolineOnionPacket, ()> {
	let mut packet_data = vec![0u8; length as usize];

	let mut chacha = ChaCha20::new(&prng_seed, &[0; 8]);
	chacha.process(&vec![0u8; length as usize], &mut packet_data);

	construct_onion_packet_with_init_noise::<_, _>(
 payloads,
 onion_keys,
 packet_data,
 Some(associated_data),
	)
}

#[cfg(test)]
/// Used in testing to write bogus `BogusOnionHopData` as well as `RawOnionHopData`, which is
/// otherwise not representable in `msgs::OnionHopData`.
Expand Down

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

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

from

Mar 27, 2024
 Merged


Trampoline onion construction vectors
#2906
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4baa8a7

Rename TrampolineOnionPacket enum comment.


arik-so Mar 22, 2024
e7e1afa

Trampoline onion construction.


arik-so Mar 27, 2024
52039a2

Test Trampoline payload serialization.


arik-so Mar 27, 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


29 changes: 28 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1740,6 +1740,17 @@ mod fuzzy_internal_msgs {
 }
	}

	pub(crate) enum OutboundTrampolinePayload {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 /// The node id to which the trampoline node must find a route
 outgoing_node_id: PublicKey,
 }
	}

	pub struct DecodedOnionErrorPacket {
 pub(crate) hmac: [u8; 32],
 pub(crate) failuremsg: Vec<u8>,
Expand DownExpand Up@@ -1798,7 +1809,7 @@ pub struct TrampolineOnionPacket {
	// Unlike the onion packets used for payments, Trampoline onion packets have to be shorter than
	// 1300 bytes. The expected default is 650 bytes.
	// TODO: if 650 ends up being the most common size, optimize this to be:
	// enum { ThirteenHundred([u8; 650]), VarLen(Vec<u8>) }
	// enum { SixFifty([u8; 650]), VarLen(Vec<u8>) }
	pub hop_data: Vec<u8>,
	/// HMAC to verify the integrity of hop_data
	pub hmac: [u8; 32],
Expand DownExpand Up@@ -2597,6 +2608,22 @@ impl Writeable for OutboundOnionPayload {
	}
}

impl Writeable for OutboundTrampolinePayload {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 match self {
 Self::Forward { amt_to_forward, outgoing_cltv_value, outgoing_node_id } => {
 _encode_varint_length_prefixed_tlv!(w, {
 (2, HighZeroBytesDroppedBigSize(*amt_to_forward), required),
 (4, HighZeroBytesDroppedBigSize(*outgoing_cltv_value), required),
 (14, outgoing_node_id, required)
 });
 }
 }
 Ok(())
	}
}


impl<NS: Deref> ReadableArgs<(Option<PublicKey>, &NS)> for InboundOnionPayload where NS::Target: NodeSigner {
	fn read<R: Read>(r: &mut R, args: (Option<PublicKey>, &NS)) -> Result<Self, DecodeError> {
 let (update_add_blinding_point, node_signer) = args;
Expand Down

24 changes: 22 additions & 2 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteParameters, RouteHint, RouteHintHop};
use crate::ln::features::{InitFeatures, Bolt11InvoiceFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate};
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate, OutboundTrampolinePayload};
use crate::ln::wire::Encode;
use crate::util::ser::{Writeable, Writer, BigSize};
use crate::util::test_utils;
Expand All@@ -35,11 +35,12 @@ use bitcoin::hashes::hmac::{Hmac, HmacEngine};
use bitcoin::hashes::sha256::Hash as Sha256;

use bitcoin::secp256k1;
use bitcoin::secp256k1::{Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};

use crate::io;
use crate::prelude::*;
use core::default::Default;
use bitcoin::hashes::hex::FromHex;
@valentinewallacevalentinewallaceMar 27, 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.

nit: import out of order

use crate::ln::functional_test_utils::*;

Expand DownExpand Up@@ -966,6 +967,25 @@ fn test_always_create_tlv_format_onion_payloads() {
	}
}

#[test]
fn test_trampoline_onion_payload_serialization() {
	// As per https://github.com/lightning/bolts/blob/c01d2e6267d4a8d1095f0f1188970055a9a22d29/bolt04/trampoline-payment-onion-test.json#L3
	let trampoline_payload = OutboundTrampolinePayload::Forward {
 amt_to_forward: 100000000,
 outgoing_cltv_value: 800000,
 outgoing_node_id: PublicKey::from_slice(&<Vec<u8>>::from_hex("02edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145").unwrap()).unwrap(),
	};

	let slice_to_hex = |slice: &[u8]| {
 slice.iter()
 .map(|b| format!("{:02x}", b).to_string())
 .collect::<String>()
	};

	let carol_payload_hex = slice_to_hex(&trampoline_payload.encode());
	assert_eq!(carol_payload_hex, "2e020405f5e10004030c35000e2102edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145");
}

fn do_test_fail_htlc_backwards_with_reason(failure_code: FailureCode) {

	let chanmon_cfgs = create_chanmon_cfgs(2);
Expand Down

18 changes: 18 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,24 @@ pub(super) fn construct_onion_packet(
	)
}

#[allow(unused)]
pub(super) fn construct_trampoline_onion_packet(
	payloads: Vec<msgs::OutboundTrampolinePayload>, onion_keys: Vec<OnionKeys>,
	prng_seed: [u8; 32], associated_data: &PaymentHash, length: u16,
) -> Result<msgs::TrampolineOnionPacket, ()> {
	let mut packet_data = vec![0u8; length as usize];

	let mut chacha = ChaCha20::new(&prng_seed, &[0; 8]);
	chacha.process(&vec![0u8; length as usize], &mut packet_data);

	construct_onion_packet_with_init_noise::<_, _>(
 payloads,
 onion_keys,
 packet_data,
 Some(associated_data),
	)
}

#[cfg(test)]
/// Used in testing to write bogus `BogusOnionHopData` as well as `RawOnionHopData`, which is
/// otherwise not representable in `msgs::OnionHopData`.
Expand Down

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

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

from

Mar 27, 2024
 Merged


Trampoline onion construction vectors
#2906
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4baa8a7

Rename TrampolineOnionPacket enum comment.


arik-so Mar 22, 2024
e7e1afa

Trampoline onion construction.


arik-so Mar 27, 2024
52039a2

Test Trampoline payload serialization.


arik-so Mar 27, 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


29 changes: 28 additions & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1740,6 +1740,17 @@ mod fuzzy_internal_msgs {
 }
	}

	pub(crate) enum OutboundTrampolinePayload {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 /// The node id to which the trampoline node must find a route
 outgoing_node_id: PublicKey,
 }
	}

	pub struct DecodedOnionErrorPacket {
 pub(crate) hmac: [u8; 32],
 pub(crate) failuremsg: Vec<u8>,
Expand DownExpand Up@@ -1798,7 +1809,7 @@ pub struct TrampolineOnionPacket {
	// Unlike the onion packets used for payments, Trampoline onion packets have to be shorter than
	// 1300 bytes. The expected default is 650 bytes.
	// TODO: if 650 ends up being the most common size, optimize this to be:
	// enum { ThirteenHundred([u8; 650]), VarLen(Vec<u8>) }
	// enum { SixFifty([u8; 650]), VarLen(Vec<u8>) }
	pub hop_data: Vec<u8>,
	/// HMAC to verify the integrity of hop_data
	pub hmac: [u8; 32],
Expand DownExpand Up@@ -2597,6 +2608,22 @@ impl Writeable for OutboundOnionPayload {
	}
}

impl Writeable for OutboundTrampolinePayload {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 match self {
 Self::Forward { amt_to_forward, outgoing_cltv_value, outgoing_node_id } => {
 _encode_varint_length_prefixed_tlv!(w, {
 (2, HighZeroBytesDroppedBigSize(*amt_to_forward), required),
 (4, HighZeroBytesDroppedBigSize(*outgoing_cltv_value), required),
 (14, outgoing_node_id, required)
 });
 }
 }
 Ok(())
	}
}


impl<NS: Deref> ReadableArgs<(Option<PublicKey>, &NS)> for InboundOnionPayload where NS::Target: NodeSigner {
	fn read<R: Read>(r: &mut R, args: (Option<PublicKey>, &NS)) -> Result<Self, DecodeError> {
 let (update_add_blinding_point, node_signer) = args;
Expand Down

24 changes: 22 additions & 2 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use crate::routing::gossip::{NetworkUpdate, RoutingFees};
use crate::routing::router::{get_route, PaymentParameters, Route, RouteParameters, RouteHint, RouteHintHop};
use crate::ln::features::{InitFeatures, Bolt11InvoiceFeatures};
use crate::ln::msgs;
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate};
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate, OutboundTrampolinePayload};
use crate::ln::wire::Encode;
use crate::util::ser::{Writeable, Writer, BigSize};
use crate::util::test_utils;
Expand All@@ -35,11 +35,12 @@ use bitcoin::hashes::hmac::{Hmac, HmacEngine};
use bitcoin::hashes::sha256::Hash as Sha256;

use bitcoin::secp256k1;
use bitcoin::secp256k1::{Secp256k1, SecretKey};
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};

use crate::io;
use crate::prelude::*;
use core::default::Default;
use bitcoin::hashes::hex::FromHex;
@valentinewallacevalentinewallaceMar 27, 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.

nit: import out of order

use crate::ln::functional_test_utils::*;

Expand DownExpand Up@@ -966,6 +967,25 @@ fn test_always_create_tlv_format_onion_payloads() {
	}
}

#[test]
fn test_trampoline_onion_payload_serialization() {
	// As per https://github.com/lightning/bolts/blob/c01d2e6267d4a8d1095f0f1188970055a9a22d29/bolt04/trampoline-payment-onion-test.json#L3
	let trampoline_payload = OutboundTrampolinePayload::Forward {
 amt_to_forward: 100000000,
 outgoing_cltv_value: 800000,
 outgoing_node_id: PublicKey::from_slice(&<Vec<u8>>::from_hex("02edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145").unwrap()).unwrap(),
	};

	let slice_to_hex = |slice: &[u8]| {
 slice.iter()
 .map(|b| format!("{:02x}", b).to_string())
 .collect::<String>()
	};

	let carol_payload_hex = slice_to_hex(&trampoline_payload.encode());
	assert_eq!(carol_payload_hex, "2e020405f5e10004030c35000e2102edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145");
}

fn do_test_fail_htlc_backwards_with_reason(failure_code: FailureCode) {

	let chanmon_cfgs = create_chanmon_cfgs(2);
Expand Down

18 changes: 18 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,24 @@ pub(super) fn construct_onion_packet(
	)
}

#[allow(unused)]
pub(super) fn construct_trampoline_onion_packet(
	payloads: Vec<msgs::OutboundTrampolinePayload>, onion_keys: Vec<OnionKeys>,
	prng_seed: [u8; 32], associated_data: &PaymentHash, length: u16,
) -> Result<msgs::TrampolineOnionPacket, ()> {
	let mut packet_data = vec![0u8; length as usize];

	let mut chacha = ChaCha20::new(&prng_seed, &[0; 8]);
	chacha.process(&vec![0u8; length as usize], &mut packet_data);

	construct_onion_packet_with_init_noise::<_, _>(
 payloads,
 onion_keys,
 packet_data,
 Some(associated_data),
	)
}

#[cfg(test)]
/// Used in testing to write bogus `BogusOnionHopData` as well as `RawOnionHopData`, which is
/// otherwise not representable in `msgs::OnionHopData`.
Expand Down