Skip to content

Trampoline Payload Construction Method#3386

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 4 commits into from
Feb 7, 2025
Merged

Trampoline Payload Construction Method #3386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75cf8d2
Introduce TrampolineHop struct
arik-so Mar 19, 2024
03762ba
Add trampoline_hops field to BlindedTail
arik-so Mar 19, 2024
eba3f90
Trampoline payload construction method
arik-so Oct 28, 2024
7b56d51
Construct Trampoline component in create_payment_onion
arik-so Feb 7, 2025
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
99 changes: 94 additions & 5 deletions lightning/src/ln/blinded_payment_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
// licenses.

use bitcoin::hashes::hex::FromHex;
use bitcoin::hex::DisplayHex;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, schnorr};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
Expand All@@ -30,12 +31,14 @@ use crate::ln::outbound_payment::{Retry, IDEMPOTENCY_TIMEOUT_TICKS};
use crate::offers::invoice::UnsignedBolt12Invoice;
use crate::offers::nonce::Nonce;
use crate::prelude::*;
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters};
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters, TrampolineHop};
use crate::sign::{NodeSigner, Recipient};
use crate::util::config::UserConfig;
use crate::util::ser::WithoutLength;
use crate::util::ser::{WithoutLength, Writeable};
use crate::util::test_utils;
use lightning_invoice::RawBolt11Invoice;
use types::features::Features;
use crate::blinded_path::BlindedHop;

pub fn blinded_payment_path(
payment_secret: PaymentSecret, intro_node_min_htlc: u64, intro_node_max_htlc: u64,
Expand DownExpand Up@@ -362,15 +365,17 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
ForwardCheckFail::ForwardPayloadEncodedAsReceive => {
let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
let cur_height = nodes[0].best_block_info().1;
let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
&route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
&route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
// Remove the receive payload so the blinded forward payload is encoded as a final payload
// (i.e. next_hop_hmac == [0; 32])
onion_payloads.pop();
onion_keys.pop();
if $target_node_idx + 1 < nodes.len() {
onion_payloads.pop();
onion_keys.pop();
}
$update_add.onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
},
Expand DownExpand Up@@ -935,7 +940,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
let cur_height = nodes[0].best_block_info().1;
let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
&route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
&route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();

let update_add = &mut payment_event_1_2.msgs[0];
onion_payloads.last_mut().map(|p| {
Expand DownExpand Up@@ -1505,6 +1510,7 @@ fn route_blinding_spec_test_vector() {
maybe_announced_channel: false,
}],
blinded_tail: Some(BlindedTail {
trampoline_hops: vec![],
hops: blinded_hops,
blinding_point: bob_blinding_point,
excess_final_cltv_expiry_delta: 0,
Expand DownExpand Up@@ -1654,3 +1660,86 @@ fn route_blinding_spec_test_vector() {
_ => panic!("Unexpected error")
}
}

#[test]
fn test_combined_trampoline_onion_creation_vectors() {
// As per https://github.com/lightning/bolts/blob/fa0594ac2af3531d734f1d707a146d6e13679451/bolt04/trampoline-to-blinded-path-payment-onion-test.json#L251

let mut secp_ctx = Secp256k1::new();
let session_priv = secret_from_hex("a64feb81abd58e473df290e9e1c07dc3e56114495cadf33191f44ba5448ebe99");

let path = Path {
hops: vec![
// Bob
RouteHop {
pubkey: pubkey_from_hex("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c"),
node_features: NodeFeatures::empty(),
short_channel_id: 0,
channel_features: ChannelFeatures::empty(),
fee_msat: 3_000,
cltv_expiry_delta: 0,
maybe_announced_channel: false,
},

// Carol
RouteHop {
pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
node_features: NodeFeatures::empty(),
short_channel_id: (572330 << 40) + (42 << 16) + 2821,
channel_features: ChannelFeatures::empty(),
fee_msat: 153_000,
cltv_expiry_delta: 0,
maybe_announced_channel: false,
},
],
blinded_tail: Some(BlindedTail {
trampoline_hops: vec![
// Carol's pubkey
TrampolineHop {
pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
node_features: Features::empty(),
fee_msat: 2_500,
cltv_expiry_delta: 24,
},
// Dave's pubkey (the intro node needs to be duplicated)
TrampolineHop {
pubkey: pubkey_from_hex("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991"),
node_features: Features::empty(),
fee_msat: 150_500, // incorporate both base and proportional fee
cltv_expiry_delta: 36,
}
],
hops: vec![
// Dave's blinded node id
BlindedHop {
Comment thread
arik-so marked this conversation as resolved.
blinded_node_id: pubkey_from_hex("0295d40514096a8be54859e7dfe947b376eaafea8afe5cb4eb2c13ff857ed0b4be"),
encrypted_payload: bytes_from_hex("0ccf3c8a58deaa603f657ee2a5ed9d604eb5c8ca1e5f801989afa8f3ea6d789bbdde2c7e7a1ef9ca8c38d2c54760febad8446d3f273ddb537569ef56613846ccd3aba78a"),
},
// Eve's blinded node id
BlindedHop {
Comment thread
arik-so marked this conversation as resolved.
blinded_node_id: pubkey_from_hex("020e2dbadcc2005e859819ddebbe88a834ae8a6d2b049233c07335f15cd1dc5f22"),
encrypted_payload: bytes_from_hex("bcd747394fbd4d99588da075a623316e15a576df5bc785cccc7cd6ec7b398acce6faf520175f9ec920f2ef261cdb83dc28cc3a0eeb970107b3306489bf771ef5b1213bca811d345285405861d08a655b6c237fa247a8b4491beee20c878a60e9816492026d8feb9dafa84585b253978db6a0aa2945df5ef445c61e801fb82f43d5f00716baf9fc9b3de50bc22950a36bda8fc27bfb1242e5860c7e687438d4133e058770361a19b6c271a2a07788d34dccc27e39b9829b061a4d960eac4a2c2b0f4de506c24f9af3868c0aff6dda27281c"),
}
],
blinding_point: pubkey_from_hex("02988face71e92c345a068f740191fd8e53be14f0bb957ef730d3c5f76087b960e"),
excess_final_cltv_expiry_delta: 0,
final_value_msat: 150_000_000
}),
};

let associated_data_slice = secret_from_hex("e89bc505e84aaca09613833fc58c9069078fb43bfbea0488f34eec9db99b5f82");
let associated_data = PaymentHash(associated_data_slice.secret_bytes());
let payment_secret = PaymentSecret(secret_from_hex("7494b65bc092b48a75465e43e29be807eb2cc535ce8aaba31012b8ff1ceac5da").secret_bytes());
let outer_session_key = secret_from_hex("4f777e8dac16e6dfe333066d9efb014f7a51d11762ff76eca4d3a95ada99ba3e");
let outer_onion_prng_seed = onion_utils::gen_pad_from_shared_secret(&outer_session_key.secret_bytes());

let amt_msat = 150_000_000;
let cur_height = 800_000;
let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
let (bob_onion, htlc_msat, htlc_cltv) = onion_utils::create_payment_onion_internal(&secp_ctx, &path, &session_priv, amt_msat, &recipient_onion_fields, cur_height, &associated_data, &None, None, [0; 32], Some(outer_session_key), Some(outer_onion_prng_seed)).unwrap();

let outer_onion_packet_hex = bob_onion.encode().to_lower_hex_string();
assert_eq!(outer_onion_packet_hex, "00025fd60556c134ae97e4baedba220a644037754ee67c54fd05e93bf40c17cbb73362fb9dee96001ff229945595b6edb59437a6bc143406d3f90f749892a84d8d430c6890437d26d5bfc599d565316ef51347521075bbab87c59c57bcf20af7e63d7192b46cf171e4f73cb11f9f603915389105d91ad630224bea95d735e3988add1e24b5bf28f1d7128db64284d90a839ba340d088c74b1fb1bd21136b1809428ec5399c8649e9bdf92d2dcfc694deae5046fa5b2bdf646847aaad73f5e95275763091c90e71031cae1f9a770fdea559642c9c02f424a2a28163dd0957e3874bd28a97bec67d18c0321b0e68bc804aa8345b17cb626e2348ca06c8312a167c989521056b0f25c55559d446507d6c491d50605cb79fa87929ce64b0a9860926eeaec2c431d926a1cadb9a1186e4061cb01671a122fc1f57602cbef06d6c194ec4b715c2e3dd4120baca3172cd81900b49fef857fb6d6afd24c983b608108b0a5ac0c1c6c52011f23b8778059ffadd1bb7cd06e2525417365f485a7fd1d4a9ba3818ede7cdc9e71afee8532252d08e2531ca52538655b7e8d912f7ec6d37bbcce8d7ec690709dbf9321e92c565b78e7fe2c22edf23e0902153d1ca15a112ad32fb19695ec65ce11ddf670da7915f05ad4b86c154fb908cb567315d1124f303f75fa075ebde8ef7bb12e27737ad9e4924439097338ea6d7a6fc3721b88c9b830a34e8d55f4c582b74a3895cc848fe57f4fe29f115dabeb6b3175be15d94408ed6771109cfaf57067ae658201082eae7605d26b1449af4425ae8e8f58cdda5c6265f1fd7a386fc6cea3074e4f25b909b96175883676f7610a00fdf34df9eb6c7b9a4ae89b839c69fd1f285e38cdceb634d782cc6d81179759bc9fd47d7fd060470d0b048287764c6837963274e708314f017ac7dc26d0554d59bfcfd3136225798f65f0b0fea337c6b256ebbb63a90b994c0ab93fd8b1d6bd4c74aebe535d6110014cd3d525394027dfe8faa98b4e9b2bee7949eb1961f1b026791092f84deea63afab66603dbe9b6365a102a1fef2f6b9744bc1bb091a8da9130d34d4d39f25dbad191649cfb67e10246364b7ce0c6ec072f9690cabb459d9fda0c849e17535de4357e9907270c75953fca3c845bb613926ecf73205219c7057a4b6bb244c184362bb4e2f24279dc4e60b94a5b1ec11c34081a628428ba5646c995b9558821053ba9c84a05afbf00dabd60223723096516d2f5668f3ec7e11612b01eb7a3a0506189a2272b88e89807943adb34291a17f6cb5516ffd6f945a1c42a524b21f096d66f350b1dad4db455741ae3d0e023309fbda5ef55fb0dc74f3297041448b2be76c525141963934c6afc53d263fb7836626df502d7c2ee9e79cbbd87afd84bbb8dfbf45248af3cd61ad5fac827e7683ca4f91dfad507a8eb9c17b2c9ac5ec051fe645a4a6cb37136f6f19b611e0ea8da7960af2d779507e55f57305bc74b7568928c5dd5132990fe54c22117df91c257d8c7b61935a018a28c1c3b17bab8e4294fa699161ec21123c9fc4e71079df31f300c2822e1246561e04765d3aab333eafd026c7431ac7616debb0e022746f4538e1c6348b600c988eeb2d051fc60c468dca260a84c79ab3ab8342dc345a764672848ea234e17332bc124799daf7c5fcb2e2358514a7461357e1c19c802c5ee32deccf1776885dd825bedd5f781d459984370a6b7ae885d4483a76ddb19b30f47ed47cd56aa5a079a89793dbcad461c59f2e002067ac98dd5a534e525c9c46c2af730741bf1f8629357ec0bfc0bc9ecb31af96777e507648ff4260dc3673716e098d9111dfd245f1d7c55a6de340deb8bd7a053e5d62d760f184dc70ca8fa255b9023b9b9aedfb6e419a5b5951ba0f83b603793830ee68d442d7b88ee1bbf6bbd1bcd6f68cc1af");
assert_eq!(htlc_msat, 150_156_000);
assert_eq!(htlc_cltv, 800_060);
}
12 changes: 6 additions & 6 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1428,7 +1428,7 @@ fn test_fee_spike_violation_fails_htlc() {
let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
3460001, &recipient_onion_fields, cur_height, &None, None).unwrap();
3460001, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
let msg = msgs::UpdateAddHTLC {
channel_id: chan.2,
Expand DownExpand Up@@ -1623,7 +1623,7 @@ fn test_chan_reserve_violation_inbound_htlc_outbound_channel() {
let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
700_000, &recipient_onion_fields, cur_height, &None, None).unwrap();
700_000, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
let msg = msgs::UpdateAddHTLC {
channel_id: chan.2,
Expand DownExpand Up@@ -1803,7 +1803,7 @@ fn test_chan_reserve_violation_inbound_htlc_inbound_chan() {
let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route_2.paths[0], &session_priv).unwrap();
let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
&route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None).unwrap();
&route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash_1).unwrap();
let msg = msgs::UpdateAddHTLC {
channel_id: chan.2,
Expand DownExpand Up@@ -3856,7 +3856,7 @@ fn fail_backward_pending_htlc_upon_channel_failure() {
let current_height = nodes[1].node.best_block.read().unwrap().height + 1;
let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
let (onion_payloads, _amount_msat, cltv_expiry) = onion_utils::build_onion_payloads(
&route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None).unwrap();
&route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None, None).unwrap();
let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
let onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();

Expand DownExpand Up@@ -6852,7 +6852,7 @@ fn test_update_add_htlc_bolt2_receiver_check_max_htlc_limit() {
let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::signing_only(), &route.paths[0], &session_priv).unwrap();
let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
let (onion_payloads, _htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
&route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None).unwrap();
&route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash).unwrap();

let mut msg = msgs::UpdateAddHTLC {
Expand DownExpand Up@@ -8607,7 +8607,7 @@ fn test_onion_value_mpp_set_calculation() {
let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
let (mut onion_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], 100_000,
&recipient_onion_fields, height + 1, &None, None).unwrap();
&recipient_onion_fields, height + 1, &None, None, None).unwrap();
// Edit amt_to_forward to simulate the sender having set
// the final amount and the routing node taking less fee
if let msgs::OutboundOnionPayload::Receive {
Expand Down
3 changes: 2 additions & 1 deletion lightning/src/ln/max_payment_path_len_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,8 @@ fn blinded_path_with_custom_tlv() {
let reserved_packet_bytes_without_custom_tlv: usize = onion_utils::build_onion_payloads(
&route.paths[0], MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
&RecipientOnionFields::spontaneous_empty(),
nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None, None
nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None,
None, None
)
.unwrap()
.0
Expand Down
4 changes: 0 additions & 4 deletions lightning/src/ln/msgs.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1802,7 +1802,6 @@ mod fuzzy_internal_msgs {
amt_to_forward: u64,
outgoing_cltv_value: u32,
},
#[allow(unused)]
TrampolineEntrypoint {
amt_to_forward: u64,
outgoing_cltv_value: u32,
Expand DownExpand Up@@ -1834,7 +1833,6 @@ mod fuzzy_internal_msgs {
}

pub(crate) enum OutboundTrampolinePayload<'a> {
#[allow(unused)]
Forward {
/// The value, in msat, of the payment after this hop's fee is deducted.
amt_to_forward: u64,
Expand All@@ -1854,12 +1852,10 @@ mod fuzzy_internal_msgs {
/// If applicable, features of the BOLT12 invoice being paid.
invoice_features: Option<Bolt12InvoiceFeatures>,
},
#[allow(unused)]
BlindedForward {
encrypted_tlvs: &'a Vec<u8>,
intro_node_blinding_point: Option<PublicKey>,
},
#[allow(unused)]
BlindedReceive {
sender_intended_htlc_amt_msat: u64,
total_msat: u64,
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/onion_payment.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ mod tests {
let path = Path { hops, blinded_tail: None, };
let onion_keys = super::onion_utils::construct_onion_keys(&secp_ctx, &path, &session_priv).unwrap();
let (onion_payloads, ..) = super::onion_utils::build_onion_payloads(
&path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None
&path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None, None
).unwrap();

assert!(super::onion_utils::construct_onion_packet(
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" + '
Trampoline Payload Construction Method by arik-so · Pull Request #3386 · lightningdevkit/rust-lightning · GitHub
Skip to content
Trampoline Payload Construction Method#3386

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Feb 7, 2025
 Merged


Trampoline Payload Construction Method
#3386
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
75cf8d2

Introduce TrampolineHop struct


arik-so Mar 19, 2024
03762ba

Add trampoline_hops field to BlindedTail


arik-so Mar 19, 2024
eba3f90

Trampoline payload construction method


arik-so Oct 28, 2024
7b56d51

Construct Trampoline component in create_payment_onion


arik-so Feb 7, 2025

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


99 changes: 94 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
// licenses.

use bitcoin::hashes::hex::FromHex;
use bitcoin::hex::DisplayHex;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, schnorr};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
Expand All@@ -30,12 +31,14 @@ use crate::ln::outbound_payment::{Retry, IDEMPOTENCY_TIMEOUT_TICKS};
use crate::offers::invoice::UnsignedBolt12Invoice;
use crate::offers::nonce::Nonce;
use crate::prelude::*;
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters};
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters, TrampolineHop};
use crate::sign::{NodeSigner, Recipient};
use crate::util::config::UserConfig;
use crate::util::ser::WithoutLength;
use crate::util::ser::{WithoutLength, Writeable};
use crate::util::test_utils;
use lightning_invoice::RawBolt11Invoice;
use types::features::Features;
use crate::blinded_path::BlindedHop;

pub fn blinded_payment_path(
	payment_secret: PaymentSecret, intro_node_min_htlc: u64, intro_node_max_htlc: u64,
Expand DownExpand Up@@ -362,15 +365,17 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
 ForwardCheckFail::ForwardPayloadEncodedAsReceive => {
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let cur_height = nodes[0].best_block_info().1;
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
 // Remove the receive payload so the blinded forward payload is encoded as a final payload
 // (i.e. next_hop_hmac == [0; 32])
 onion_payloads.pop();
 onion_keys.pop();
 if $target_node_idx + 1 < nodes.len() {
 onion_payloads.pop();
 onion_keys.pop();
 }
 $update_add.onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
 },
Expand DownExpand Up@@ -935,7 +940,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
 let cur_height = nodes[0].best_block_info().1;
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();

 let update_add = &mut payment_event_1_2.msgs[0];
 onion_payloads.last_mut().map(|p| {
Expand DownExpand Up@@ -1505,6 +1510,7 @@ fn route_blinding_spec_test_vector() {
 maybe_announced_channel: false,
 }],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![],
 hops: blinded_hops,
 blinding_point: bob_blinding_point,
 excess_final_cltv_expiry_delta: 0,
Expand DownExpand Up@@ -1654,3 +1660,86 @@ fn route_blinding_spec_test_vector() {
 _ => panic!("Unexpected error")
	}
}

#[test]
fn test_combined_trampoline_onion_creation_vectors() {
	// As per https://github.com/lightning/bolts/blob/fa0594ac2af3531d734f1d707a146d6e13679451/bolt04/trampoline-to-blinded-path-payment-onion-test.json#L251

	let mut secp_ctx = Secp256k1::new();
	let session_priv = secret_from_hex("a64feb81abd58e473df290e9e1c07dc3e56114495cadf33191f44ba5448ebe99");

	let path = Path {
 hops: vec![
 // Bob
 RouteHop {
 pubkey: pubkey_from_hex("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c"),
 node_features: NodeFeatures::empty(),
 short_channel_id: 0,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 3_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },

 // Carol
 RouteHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: NodeFeatures::empty(),
 short_channel_id: (572330 << 40) + (42 << 16) + 2821,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 153_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },
 ],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![
 // Carol's pubkey
 TrampolineHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: Features::empty(),
 fee_msat: 2_500,
 cltv_expiry_delta: 24,
 },
 // Dave's pubkey (the intro node needs to be duplicated)
 TrampolineHop {
 pubkey: pubkey_from_hex("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991"),
 node_features: Features::empty(),
 fee_msat: 150_500, // incorporate both base and proportional fee
 cltv_expiry_delta: 36,
 }
 ],
 hops: vec![
 // Dave's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("0295d40514096a8be54859e7dfe947b376eaafea8afe5cb4eb2c13ff857ed0b4be"),
 encrypted_payload: bytes_from_hex("0ccf3c8a58deaa603f657ee2a5ed9d604eb5c8ca1e5f801989afa8f3ea6d789bbdde2c7e7a1ef9ca8c38d2c54760febad8446d3f273ddb537569ef56613846ccd3aba78a"),
 },
 // Eve's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("020e2dbadcc2005e859819ddebbe88a834ae8a6d2b049233c07335f15cd1dc5f22"),
 encrypted_payload: bytes_from_hex("bcd747394fbd4d99588da075a623316e15a576df5bc785cccc7cd6ec7b398acce6faf520175f9ec920f2ef261cdb83dc28cc3a0eeb970107b3306489bf771ef5b1213bca811d345285405861d08a655b6c237fa247a8b4491beee20c878a60e9816492026d8feb9dafa84585b253978db6a0aa2945df5ef445c61e801fb82f43d5f00716baf9fc9b3de50bc22950a36bda8fc27bfb1242e5860c7e687438d4133e058770361a19b6c271a2a07788d34dccc27e39b9829b061a4d960eac4a2c2b0f4de506c24f9af3868c0aff6dda27281c"),
 }
 ],
 blinding_point: pubkey_from_hex("02988face71e92c345a068f740191fd8e53be14f0bb957ef730d3c5f76087b960e"),
 excess_final_cltv_expiry_delta: 0,
 final_value_msat: 150_000_000
 }),
	};

	let associated_data_slice = secret_from_hex("e89bc505e84aaca09613833fc58c9069078fb43bfbea0488f34eec9db99b5f82");
	let associated_data = PaymentHash(associated_data_slice.secret_bytes());
	let payment_secret = PaymentSecret(secret_from_hex("7494b65bc092b48a75465e43e29be807eb2cc535ce8aaba31012b8ff1ceac5da").secret_bytes());
	let outer_session_key = secret_from_hex("4f777e8dac16e6dfe333066d9efb014f7a51d11762ff76eca4d3a95ada99ba3e");
	let outer_onion_prng_seed = onion_utils::gen_pad_from_shared_secret(&outer_session_key.secret_bytes());

	let amt_msat = 150_000_000;
	let cur_height = 800_000;
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (bob_onion, htlc_msat, htlc_cltv) = onion_utils::create_payment_onion_internal(&secp_ctx, &path, &session_priv, amt_msat, &recipient_onion_fields, cur_height, &associated_data, &None, None, [0; 32], Some(outer_session_key), Some(outer_onion_prng_seed)).unwrap();

	let outer_onion_packet_hex = bob_onion.encode().to_lower_hex_string();
	assert_eq!(outer_onion_packet_hex, "00025fd60556c134ae97e4baedba220a644037754ee67c54fd05e93bf40c17cbb73362fb9dee96001ff229945595b6edb59437a6bc143406d3f90f749892a84d8d430c6890437d26d5bfc599d565316ef51347521075bbab87c59c57bcf20af7e63d7192b46cf171e4f73cb11f9f603915389105d91ad630224bea95d735e3988add1e24b5bf28f1d7128db64284d90a839ba340d088c74b1fb1bd21136b1809428ec5399c8649e9bdf92d2dcfc694deae5046fa5b2bdf646847aaad73f5e95275763091c90e71031cae1f9a770fdea559642c9c02f424a2a28163dd0957e3874bd28a97bec67d18c0321b0e68bc804aa8345b17cb626e2348ca06c8312a167c989521056b0f25c55559d446507d6c491d50605cb79fa87929ce64b0a9860926eeaec2c431d926a1cadb9a1186e4061cb01671a122fc1f57602cbef06d6c194ec4b715c2e3dd4120baca3172cd81900b49fef857fb6d6afd24c983b608108b0a5ac0c1c6c52011f23b8778059ffadd1bb7cd06e2525417365f485a7fd1d4a9ba3818ede7cdc9e71afee8532252d08e2531ca52538655b7e8d912f7ec6d37bbcce8d7ec690709dbf9321e92c565b78e7fe2c22edf23e0902153d1ca15a112ad32fb19695ec65ce11ddf670da7915f05ad4b86c154fb908cb567315d1124f303f75fa075ebde8ef7bb12e27737ad9e4924439097338ea6d7a6fc3721b88c9b830a34e8d55f4c582b74a3895cc848fe57f4fe29f115dabeb6b3175be15d94408ed6771109cfaf57067ae658201082eae7605d26b1449af4425ae8e8f58cdda5c6265f1fd7a386fc6cea3074e4f25b909b96175883676f7610a00fdf34df9eb6c7b9a4ae89b839c69fd1f285e38cdceb634d782cc6d81179759bc9fd47d7fd060470d0b048287764c6837963274e708314f017ac7dc26d0554d59bfcfd3136225798f65f0b0fea337c6b256ebbb63a90b994c0ab93fd8b1d6bd4c74aebe535d6110014cd3d525394027dfe8faa98b4e9b2bee7949eb1961f1b026791092f84deea63afab66603dbe9b6365a102a1fef2f6b9744bc1bb091a8da9130d34d4d39f25dbad191649cfb67e10246364b7ce0c6ec072f9690cabb459d9fda0c849e17535de4357e9907270c75953fca3c845bb613926ecf73205219c7057a4b6bb244c184362bb4e2f24279dc4e60b94a5b1ec11c34081a628428ba5646c995b9558821053ba9c84a05afbf00dabd60223723096516d2f5668f3ec7e11612b01eb7a3a0506189a2272b88e89807943adb34291a17f6cb5516ffd6f945a1c42a524b21f096d66f350b1dad4db455741ae3d0e023309fbda5ef55fb0dc74f3297041448b2be76c525141963934c6afc53d263fb7836626df502d7c2ee9e79cbbd87afd84bbb8dfbf45248af3cd61ad5fac827e7683ca4f91dfad507a8eb9c17b2c9ac5ec051fe645a4a6cb37136f6f19b611e0ea8da7960af2d779507e55f57305bc74b7568928c5dd5132990fe54c22117df91c257d8c7b61935a018a28c1c3b17bab8e4294fa699161ec21123c9fc4e71079df31f300c2822e1246561e04765d3aab333eafd026c7431ac7616debb0e022746f4538e1c6348b600c988eeb2d051fc60c468dca260a84c79ab3ab8342dc345a764672848ea234e17332bc124799daf7c5fcb2e2358514a7461357e1c19c802c5ee32deccf1776885dd825bedd5f781d459984370a6b7ae885d4483a76ddb19b30f47ed47cd56aa5a079a89793dbcad461c59f2e002067ac98dd5a534e525c9c46c2af730741bf1f8629357ec0bfc0bc9ecb31af96777e507648ff4260dc3673716e098d9111dfd245f1d7c55a6de340deb8bd7a053e5d62d760f184dc70ca8fa255b9023b9b9aedfb6e419a5b5951ba0f83b603793830ee68d442d7b88ee1bbf6bbd1bcd6f68cc1af");
	assert_eq!(htlc_msat, 150_156_000);
	assert_eq!(htlc_cltv, 800_060);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1428,7 +1428,7 @@ fn test_fee_spike_violation_fails_htlc() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 3460001, &recipient_onion_fields, cur_height, &None, None).unwrap();
 3460001, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1623,7 +1623,7 @@ fn test_chan_reserve_violation_inbound_htlc_outbound_channel() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 700_000, &recipient_onion_fields, cur_height, &None, None).unwrap();
 700_000, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1803,7 +1803,7 @@ fn test_chan_reserve_violation_inbound_htlc_inbound_chan() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route_2.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash_1).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -3856,7 +3856,7 @@ fn fail_backward_pending_htlc_upon_channel_failure() {
 let current_height = nodes[1].node.best_block.read().unwrap().height + 1;
 let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
 let (onion_payloads, _amount_msat, cltv_expiry) = onion_utils::build_onion_payloads(
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None).unwrap();
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None, None).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
 let onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();

Expand DownExpand Up@@ -6852,7 +6852,7 @@ fn test_update_add_htlc_bolt2_receiver_check_max_htlc_limit() {
	let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::signing_only(), &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
	let (onion_payloads, _htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash).unwrap();

	let mut msg = msgs::UpdateAddHTLC {
Expand DownExpand Up@@ -8607,7 +8607,7 @@ fn test_onion_value_mpp_set_calculation() {
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
 let (mut onion_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], 100_000,
 &recipient_onion_fields, height + 1, &None, None).unwrap();
 &recipient_onion_fields, height + 1, &None, None, None).unwrap();
 // Edit amt_to_forward to simulate the sender having set
 // the final amount and the routing node taking less fee
 if let msgs::OutboundOnionPayload::Receive {
Expand Down

3 changes: 2 additions & 1 deletion
lightning/src/ln/max_payment_path_len_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,8 @@ fn blinded_path_with_custom_tlv() {
	let reserved_packet_bytes_without_custom_tlv: usize = onion_utils::build_onion_payloads(
 &route.paths[0], MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
 &RecipientOnionFields::spontaneous_empty(),
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None, None
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None,
 None, None
	)
 .unwrap()
 .0
Expand Down

4 changes: 0 additions & 4 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1802,7 +1802,6 @@ mod fuzzy_internal_msgs {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 },
 #[allow(unused)]
 TrampolineEntrypoint {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
Expand DownExpand Up@@ -1834,7 +1833,6 @@ mod fuzzy_internal_msgs {
	}

	pub(crate) enum OutboundTrampolinePayload<'a> {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
Expand All@@ -1854,12 +1852,10 @@ mod fuzzy_internal_msgs {
 /// If applicable, features of the BOLT12 invoice being paid.
 invoice_features: Option<Bolt12InvoiceFeatures>,
 },
 #[allow(unused)]
 BlindedForward {
 encrypted_tlvs: &'a Vec<u8>,
 intro_node_blinding_point: Option<PublicKey>,
 },
 #[allow(unused)]
 BlindedReceive {
 sender_intended_htlc_amt_msat: u64,
 total_msat: u64,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ mod tests {
 let path = Path { hops, blinded_tail: None, };
 let onion_keys = super::onion_utils::construct_onion_keys(&secp_ctx, &path, &session_priv).unwrap();
 let (onion_payloads, ..) = super::onion_utils::build_onion_payloads(
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None, None
 ).unwrap();

 assert!(super::onion_utils::construct_onion_packet(
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('^' + ".*" + '
Trampoline Payload Construction Method by arik-so · Pull Request #3386 · lightningdevkit/rust-lightning · GitHub
Skip to content
Trampoline Payload Construction Method#3386

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Feb 7, 2025
 Merged


Trampoline Payload Construction Method
#3386
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
75cf8d2

Introduce TrampolineHop struct


arik-so Mar 19, 2024
03762ba

Add trampoline_hops field to BlindedTail


arik-so Mar 19, 2024
eba3f90

Trampoline payload construction method


arik-so Oct 28, 2024
7b56d51

Construct Trampoline component in create_payment_onion


arik-so Feb 7, 2025

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


99 changes: 94 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
// licenses.

use bitcoin::hashes::hex::FromHex;
use bitcoin::hex::DisplayHex;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, schnorr};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
Expand All@@ -30,12 +31,14 @@ use crate::ln::outbound_payment::{Retry, IDEMPOTENCY_TIMEOUT_TICKS};
use crate::offers::invoice::UnsignedBolt12Invoice;
use crate::offers::nonce::Nonce;
use crate::prelude::*;
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters};
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters, TrampolineHop};
use crate::sign::{NodeSigner, Recipient};
use crate::util::config::UserConfig;
use crate::util::ser::WithoutLength;
use crate::util::ser::{WithoutLength, Writeable};
use crate::util::test_utils;
use lightning_invoice::RawBolt11Invoice;
use types::features::Features;
use crate::blinded_path::BlindedHop;

pub fn blinded_payment_path(
	payment_secret: PaymentSecret, intro_node_min_htlc: u64, intro_node_max_htlc: u64,
Expand DownExpand Up@@ -362,15 +365,17 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
 ForwardCheckFail::ForwardPayloadEncodedAsReceive => {
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let cur_height = nodes[0].best_block_info().1;
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
 // Remove the receive payload so the blinded forward payload is encoded as a final payload
 // (i.e. next_hop_hmac == [0; 32])
 onion_payloads.pop();
 onion_keys.pop();
 if $target_node_idx + 1 < nodes.len() {
 onion_payloads.pop();
 onion_keys.pop();
 }
 $update_add.onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
 },
Expand DownExpand Up@@ -935,7 +940,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
 let cur_height = nodes[0].best_block_info().1;
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();

 let update_add = &mut payment_event_1_2.msgs[0];
 onion_payloads.last_mut().map(|p| {
Expand DownExpand Up@@ -1505,6 +1510,7 @@ fn route_blinding_spec_test_vector() {
 maybe_announced_channel: false,
 }],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![],
 hops: blinded_hops,
 blinding_point: bob_blinding_point,
 excess_final_cltv_expiry_delta: 0,
Expand DownExpand Up@@ -1654,3 +1660,86 @@ fn route_blinding_spec_test_vector() {
 _ => panic!("Unexpected error")
	}
}

#[test]
fn test_combined_trampoline_onion_creation_vectors() {
	// As per https://github.com/lightning/bolts/blob/fa0594ac2af3531d734f1d707a146d6e13679451/bolt04/trampoline-to-blinded-path-payment-onion-test.json#L251

	let mut secp_ctx = Secp256k1::new();
	let session_priv = secret_from_hex("a64feb81abd58e473df290e9e1c07dc3e56114495cadf33191f44ba5448ebe99");

	let path = Path {
 hops: vec![
 // Bob
 RouteHop {
 pubkey: pubkey_from_hex("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c"),
 node_features: NodeFeatures::empty(),
 short_channel_id: 0,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 3_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },

 // Carol
 RouteHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: NodeFeatures::empty(),
 short_channel_id: (572330 << 40) + (42 << 16) + 2821,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 153_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },
 ],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![
 // Carol's pubkey
 TrampolineHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: Features::empty(),
 fee_msat: 2_500,
 cltv_expiry_delta: 24,
 },
 // Dave's pubkey (the intro node needs to be duplicated)
 TrampolineHop {
 pubkey: pubkey_from_hex("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991"),
 node_features: Features::empty(),
 fee_msat: 150_500, // incorporate both base and proportional fee
 cltv_expiry_delta: 36,
 }
 ],
 hops: vec![
 // Dave's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("0295d40514096a8be54859e7dfe947b376eaafea8afe5cb4eb2c13ff857ed0b4be"),
 encrypted_payload: bytes_from_hex("0ccf3c8a58deaa603f657ee2a5ed9d604eb5c8ca1e5f801989afa8f3ea6d789bbdde2c7e7a1ef9ca8c38d2c54760febad8446d3f273ddb537569ef56613846ccd3aba78a"),
 },
 // Eve's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("020e2dbadcc2005e859819ddebbe88a834ae8a6d2b049233c07335f15cd1dc5f22"),
 encrypted_payload: bytes_from_hex("bcd747394fbd4d99588da075a623316e15a576df5bc785cccc7cd6ec7b398acce6faf520175f9ec920f2ef261cdb83dc28cc3a0eeb970107b3306489bf771ef5b1213bca811d345285405861d08a655b6c237fa247a8b4491beee20c878a60e9816492026d8feb9dafa84585b253978db6a0aa2945df5ef445c61e801fb82f43d5f00716baf9fc9b3de50bc22950a36bda8fc27bfb1242e5860c7e687438d4133e058770361a19b6c271a2a07788d34dccc27e39b9829b061a4d960eac4a2c2b0f4de506c24f9af3868c0aff6dda27281c"),
 }
 ],
 blinding_point: pubkey_from_hex("02988face71e92c345a068f740191fd8e53be14f0bb957ef730d3c5f76087b960e"),
 excess_final_cltv_expiry_delta: 0,
 final_value_msat: 150_000_000
 }),
	};

	let associated_data_slice = secret_from_hex("e89bc505e84aaca09613833fc58c9069078fb43bfbea0488f34eec9db99b5f82");
	let associated_data = PaymentHash(associated_data_slice.secret_bytes());
	let payment_secret = PaymentSecret(secret_from_hex("7494b65bc092b48a75465e43e29be807eb2cc535ce8aaba31012b8ff1ceac5da").secret_bytes());
	let outer_session_key = secret_from_hex("4f777e8dac16e6dfe333066d9efb014f7a51d11762ff76eca4d3a95ada99ba3e");
	let outer_onion_prng_seed = onion_utils::gen_pad_from_shared_secret(&outer_session_key.secret_bytes());

	let amt_msat = 150_000_000;
	let cur_height = 800_000;
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (bob_onion, htlc_msat, htlc_cltv) = onion_utils::create_payment_onion_internal(&secp_ctx, &path, &session_priv, amt_msat, &recipient_onion_fields, cur_height, &associated_data, &None, None, [0; 32], Some(outer_session_key), Some(outer_onion_prng_seed)).unwrap();

	let outer_onion_packet_hex = bob_onion.encode().to_lower_hex_string();
	assert_eq!(outer_onion_packet_hex, "00025fd60556c134ae97e4baedba220a644037754ee67c54fd05e93bf40c17cbb73362fb9dee96001ff229945595b6edb59437a6bc143406d3f90f749892a84d8d430c6890437d26d5bfc599d565316ef51347521075bbab87c59c57bcf20af7e63d7192b46cf171e4f73cb11f9f603915389105d91ad630224bea95d735e3988add1e24b5bf28f1d7128db64284d90a839ba340d088c74b1fb1bd21136b1809428ec5399c8649e9bdf92d2dcfc694deae5046fa5b2bdf646847aaad73f5e95275763091c90e71031cae1f9a770fdea559642c9c02f424a2a28163dd0957e3874bd28a97bec67d18c0321b0e68bc804aa8345b17cb626e2348ca06c8312a167c989521056b0f25c55559d446507d6c491d50605cb79fa87929ce64b0a9860926eeaec2c431d926a1cadb9a1186e4061cb01671a122fc1f57602cbef06d6c194ec4b715c2e3dd4120baca3172cd81900b49fef857fb6d6afd24c983b608108b0a5ac0c1c6c52011f23b8778059ffadd1bb7cd06e2525417365f485a7fd1d4a9ba3818ede7cdc9e71afee8532252d08e2531ca52538655b7e8d912f7ec6d37bbcce8d7ec690709dbf9321e92c565b78e7fe2c22edf23e0902153d1ca15a112ad32fb19695ec65ce11ddf670da7915f05ad4b86c154fb908cb567315d1124f303f75fa075ebde8ef7bb12e27737ad9e4924439097338ea6d7a6fc3721b88c9b830a34e8d55f4c582b74a3895cc848fe57f4fe29f115dabeb6b3175be15d94408ed6771109cfaf57067ae658201082eae7605d26b1449af4425ae8e8f58cdda5c6265f1fd7a386fc6cea3074e4f25b909b96175883676f7610a00fdf34df9eb6c7b9a4ae89b839c69fd1f285e38cdceb634d782cc6d81179759bc9fd47d7fd060470d0b048287764c6837963274e708314f017ac7dc26d0554d59bfcfd3136225798f65f0b0fea337c6b256ebbb63a90b994c0ab93fd8b1d6bd4c74aebe535d6110014cd3d525394027dfe8faa98b4e9b2bee7949eb1961f1b026791092f84deea63afab66603dbe9b6365a102a1fef2f6b9744bc1bb091a8da9130d34d4d39f25dbad191649cfb67e10246364b7ce0c6ec072f9690cabb459d9fda0c849e17535de4357e9907270c75953fca3c845bb613926ecf73205219c7057a4b6bb244c184362bb4e2f24279dc4e60b94a5b1ec11c34081a628428ba5646c995b9558821053ba9c84a05afbf00dabd60223723096516d2f5668f3ec7e11612b01eb7a3a0506189a2272b88e89807943adb34291a17f6cb5516ffd6f945a1c42a524b21f096d66f350b1dad4db455741ae3d0e023309fbda5ef55fb0dc74f3297041448b2be76c525141963934c6afc53d263fb7836626df502d7c2ee9e79cbbd87afd84bbb8dfbf45248af3cd61ad5fac827e7683ca4f91dfad507a8eb9c17b2c9ac5ec051fe645a4a6cb37136f6f19b611e0ea8da7960af2d779507e55f57305bc74b7568928c5dd5132990fe54c22117df91c257d8c7b61935a018a28c1c3b17bab8e4294fa699161ec21123c9fc4e71079df31f300c2822e1246561e04765d3aab333eafd026c7431ac7616debb0e022746f4538e1c6348b600c988eeb2d051fc60c468dca260a84c79ab3ab8342dc345a764672848ea234e17332bc124799daf7c5fcb2e2358514a7461357e1c19c802c5ee32deccf1776885dd825bedd5f781d459984370a6b7ae885d4483a76ddb19b30f47ed47cd56aa5a079a89793dbcad461c59f2e002067ac98dd5a534e525c9c46c2af730741bf1f8629357ec0bfc0bc9ecb31af96777e507648ff4260dc3673716e098d9111dfd245f1d7c55a6de340deb8bd7a053e5d62d760f184dc70ca8fa255b9023b9b9aedfb6e419a5b5951ba0f83b603793830ee68d442d7b88ee1bbf6bbd1bcd6f68cc1af");
	assert_eq!(htlc_msat, 150_156_000);
	assert_eq!(htlc_cltv, 800_060);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1428,7 +1428,7 @@ fn test_fee_spike_violation_fails_htlc() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 3460001, &recipient_onion_fields, cur_height, &None, None).unwrap();
 3460001, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1623,7 +1623,7 @@ fn test_chan_reserve_violation_inbound_htlc_outbound_channel() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 700_000, &recipient_onion_fields, cur_height, &None, None).unwrap();
 700_000, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1803,7 +1803,7 @@ fn test_chan_reserve_violation_inbound_htlc_inbound_chan() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route_2.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash_1).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -3856,7 +3856,7 @@ fn fail_backward_pending_htlc_upon_channel_failure() {
 let current_height = nodes[1].node.best_block.read().unwrap().height + 1;
 let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
 let (onion_payloads, _amount_msat, cltv_expiry) = onion_utils::build_onion_payloads(
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None).unwrap();
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None, None).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
 let onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();

Expand DownExpand Up@@ -6852,7 +6852,7 @@ fn test_update_add_htlc_bolt2_receiver_check_max_htlc_limit() {
	let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::signing_only(), &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
	let (onion_payloads, _htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash).unwrap();

	let mut msg = msgs::UpdateAddHTLC {
Expand DownExpand Up@@ -8607,7 +8607,7 @@ fn test_onion_value_mpp_set_calculation() {
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
 let (mut onion_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], 100_000,
 &recipient_onion_fields, height + 1, &None, None).unwrap();
 &recipient_onion_fields, height + 1, &None, None, None).unwrap();
 // Edit amt_to_forward to simulate the sender having set
 // the final amount and the routing node taking less fee
 if let msgs::OutboundOnionPayload::Receive {
Expand Down

3 changes: 2 additions & 1 deletion
lightning/src/ln/max_payment_path_len_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,8 @@ fn blinded_path_with_custom_tlv() {
	let reserved_packet_bytes_without_custom_tlv: usize = onion_utils::build_onion_payloads(
 &route.paths[0], MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
 &RecipientOnionFields::spontaneous_empty(),
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None, None
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None,
 None, None
	)
 .unwrap()
 .0
Expand Down

4 changes: 0 additions & 4 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1802,7 +1802,6 @@ mod fuzzy_internal_msgs {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 },
 #[allow(unused)]
 TrampolineEntrypoint {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
Expand DownExpand Up@@ -1834,7 +1833,6 @@ mod fuzzy_internal_msgs {
	}

	pub(crate) enum OutboundTrampolinePayload<'a> {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
Expand All@@ -1854,12 +1852,10 @@ mod fuzzy_internal_msgs {
 /// If applicable, features of the BOLT12 invoice being paid.
 invoice_features: Option<Bolt12InvoiceFeatures>,
 },
 #[allow(unused)]
 BlindedForward {
 encrypted_tlvs: &'a Vec<u8>,
 intro_node_blinding_point: Option<PublicKey>,
 },
 #[allow(unused)]
 BlindedReceive {
 sender_intended_htlc_amt_msat: u64,
 total_msat: u64,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ mod tests {
 let path = Path { hops, blinded_tail: None, };
 let onion_keys = super::onion_utils::construct_onion_keys(&secp_ctx, &path, &session_priv).unwrap();
 let (onion_payloads, ..) = super::onion_utils::build_onion_payloads(
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None, None
 ).unwrap();

 assert!(super::onion_utils::construct_onion_packet(
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('^' + ".*" + '
Trampoline Payload Construction Method by arik-so · Pull Request #3386 · lightningdevkit/rust-lightning · GitHub
Skip to content
Trampoline Payload Construction Method#3386

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Feb 7, 2025
 Merged


Trampoline Payload Construction Method
#3386
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
75cf8d2

Introduce TrampolineHop struct


arik-so Mar 19, 2024
03762ba

Add trampoline_hops field to BlindedTail


arik-so Mar 19, 2024
eba3f90

Trampoline payload construction method


arik-so Oct 28, 2024
7b56d51

Construct Trampoline component in create_payment_onion


arik-so Feb 7, 2025

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


99 changes: 94 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
// licenses.

use bitcoin::hashes::hex::FromHex;
use bitcoin::hex::DisplayHex;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, schnorr};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
Expand All@@ -30,12 +31,14 @@ use crate::ln::outbound_payment::{Retry, IDEMPOTENCY_TIMEOUT_TICKS};
use crate::offers::invoice::UnsignedBolt12Invoice;
use crate::offers::nonce::Nonce;
use crate::prelude::*;
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters};
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters, TrampolineHop};
use crate::sign::{NodeSigner, Recipient};
use crate::util::config::UserConfig;
use crate::util::ser::WithoutLength;
use crate::util::ser::{WithoutLength, Writeable};
use crate::util::test_utils;
use lightning_invoice::RawBolt11Invoice;
use types::features::Features;
use crate::blinded_path::BlindedHop;

pub fn blinded_payment_path(
	payment_secret: PaymentSecret, intro_node_min_htlc: u64, intro_node_max_htlc: u64,
Expand DownExpand Up@@ -362,15 +365,17 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
 ForwardCheckFail::ForwardPayloadEncodedAsReceive => {
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let cur_height = nodes[0].best_block_info().1;
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
 // Remove the receive payload so the blinded forward payload is encoded as a final payload
 // (i.e. next_hop_hmac == [0; 32])
 onion_payloads.pop();
 onion_keys.pop();
 if $target_node_idx + 1 < nodes.len() {
 onion_payloads.pop();
 onion_keys.pop();
 }
 $update_add.onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
 },
Expand DownExpand Up@@ -935,7 +940,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
 let cur_height = nodes[0].best_block_info().1;
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();

 let update_add = &mut payment_event_1_2.msgs[0];
 onion_payloads.last_mut().map(|p| {
Expand DownExpand Up@@ -1505,6 +1510,7 @@ fn route_blinding_spec_test_vector() {
 maybe_announced_channel: false,
 }],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![],
 hops: blinded_hops,
 blinding_point: bob_blinding_point,
 excess_final_cltv_expiry_delta: 0,
Expand DownExpand Up@@ -1654,3 +1660,86 @@ fn route_blinding_spec_test_vector() {
 _ => panic!("Unexpected error")
	}
}

#[test]
fn test_combined_trampoline_onion_creation_vectors() {
	// As per https://github.com/lightning/bolts/blob/fa0594ac2af3531d734f1d707a146d6e13679451/bolt04/trampoline-to-blinded-path-payment-onion-test.json#L251

	let mut secp_ctx = Secp256k1::new();
	let session_priv = secret_from_hex("a64feb81abd58e473df290e9e1c07dc3e56114495cadf33191f44ba5448ebe99");

	let path = Path {
 hops: vec![
 // Bob
 RouteHop {
 pubkey: pubkey_from_hex("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c"),
 node_features: NodeFeatures::empty(),
 short_channel_id: 0,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 3_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },

 // Carol
 RouteHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: NodeFeatures::empty(),
 short_channel_id: (572330 << 40) + (42 << 16) + 2821,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 153_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },
 ],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![
 // Carol's pubkey
 TrampolineHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: Features::empty(),
 fee_msat: 2_500,
 cltv_expiry_delta: 24,
 },
 // Dave's pubkey (the intro node needs to be duplicated)
 TrampolineHop {
 pubkey: pubkey_from_hex("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991"),
 node_features: Features::empty(),
 fee_msat: 150_500, // incorporate both base and proportional fee
 cltv_expiry_delta: 36,
 }
 ],
 hops: vec![
 // Dave's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("0295d40514096a8be54859e7dfe947b376eaafea8afe5cb4eb2c13ff857ed0b4be"),
 encrypted_payload: bytes_from_hex("0ccf3c8a58deaa603f657ee2a5ed9d604eb5c8ca1e5f801989afa8f3ea6d789bbdde2c7e7a1ef9ca8c38d2c54760febad8446d3f273ddb537569ef56613846ccd3aba78a"),
 },
 // Eve's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("020e2dbadcc2005e859819ddebbe88a834ae8a6d2b049233c07335f15cd1dc5f22"),
 encrypted_payload: bytes_from_hex("bcd747394fbd4d99588da075a623316e15a576df5bc785cccc7cd6ec7b398acce6faf520175f9ec920f2ef261cdb83dc28cc3a0eeb970107b3306489bf771ef5b1213bca811d345285405861d08a655b6c237fa247a8b4491beee20c878a60e9816492026d8feb9dafa84585b253978db6a0aa2945df5ef445c61e801fb82f43d5f00716baf9fc9b3de50bc22950a36bda8fc27bfb1242e5860c7e687438d4133e058770361a19b6c271a2a07788d34dccc27e39b9829b061a4d960eac4a2c2b0f4de506c24f9af3868c0aff6dda27281c"),
 }
 ],
 blinding_point: pubkey_from_hex("02988face71e92c345a068f740191fd8e53be14f0bb957ef730d3c5f76087b960e"),
 excess_final_cltv_expiry_delta: 0,
 final_value_msat: 150_000_000
 }),
	};

	let associated_data_slice = secret_from_hex("e89bc505e84aaca09613833fc58c9069078fb43bfbea0488f34eec9db99b5f82");
	let associated_data = PaymentHash(associated_data_slice.secret_bytes());
	let payment_secret = PaymentSecret(secret_from_hex("7494b65bc092b48a75465e43e29be807eb2cc535ce8aaba31012b8ff1ceac5da").secret_bytes());
	let outer_session_key = secret_from_hex("4f777e8dac16e6dfe333066d9efb014f7a51d11762ff76eca4d3a95ada99ba3e");
	let outer_onion_prng_seed = onion_utils::gen_pad_from_shared_secret(&outer_session_key.secret_bytes());

	let amt_msat = 150_000_000;
	let cur_height = 800_000;
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (bob_onion, htlc_msat, htlc_cltv) = onion_utils::create_payment_onion_internal(&secp_ctx, &path, &session_priv, amt_msat, &recipient_onion_fields, cur_height, &associated_data, &None, None, [0; 32], Some(outer_session_key), Some(outer_onion_prng_seed)).unwrap();

	let outer_onion_packet_hex = bob_onion.encode().to_lower_hex_string();
	assert_eq!(outer_onion_packet_hex, "00025fd60556c134ae97e4baedba220a644037754ee67c54fd05e93bf40c17cbb73362fb9dee96001ff229945595b6edb59437a6bc143406d3f90f749892a84d8d430c6890437d26d5bfc599d565316ef51347521075bbab87c59c57bcf20af7e63d7192b46cf171e4f73cb11f9f603915389105d91ad630224bea95d735e3988add1e24b5bf28f1d7128db64284d90a839ba340d088c74b1fb1bd21136b1809428ec5399c8649e9bdf92d2dcfc694deae5046fa5b2bdf646847aaad73f5e95275763091c90e71031cae1f9a770fdea559642c9c02f424a2a28163dd0957e3874bd28a97bec67d18c0321b0e68bc804aa8345b17cb626e2348ca06c8312a167c989521056b0f25c55559d446507d6c491d50605cb79fa87929ce64b0a9860926eeaec2c431d926a1cadb9a1186e4061cb01671a122fc1f57602cbef06d6c194ec4b715c2e3dd4120baca3172cd81900b49fef857fb6d6afd24c983b608108b0a5ac0c1c6c52011f23b8778059ffadd1bb7cd06e2525417365f485a7fd1d4a9ba3818ede7cdc9e71afee8532252d08e2531ca52538655b7e8d912f7ec6d37bbcce8d7ec690709dbf9321e92c565b78e7fe2c22edf23e0902153d1ca15a112ad32fb19695ec65ce11ddf670da7915f05ad4b86c154fb908cb567315d1124f303f75fa075ebde8ef7bb12e27737ad9e4924439097338ea6d7a6fc3721b88c9b830a34e8d55f4c582b74a3895cc848fe57f4fe29f115dabeb6b3175be15d94408ed6771109cfaf57067ae658201082eae7605d26b1449af4425ae8e8f58cdda5c6265f1fd7a386fc6cea3074e4f25b909b96175883676f7610a00fdf34df9eb6c7b9a4ae89b839c69fd1f285e38cdceb634d782cc6d81179759bc9fd47d7fd060470d0b048287764c6837963274e708314f017ac7dc26d0554d59bfcfd3136225798f65f0b0fea337c6b256ebbb63a90b994c0ab93fd8b1d6bd4c74aebe535d6110014cd3d525394027dfe8faa98b4e9b2bee7949eb1961f1b026791092f84deea63afab66603dbe9b6365a102a1fef2f6b9744bc1bb091a8da9130d34d4d39f25dbad191649cfb67e10246364b7ce0c6ec072f9690cabb459d9fda0c849e17535de4357e9907270c75953fca3c845bb613926ecf73205219c7057a4b6bb244c184362bb4e2f24279dc4e60b94a5b1ec11c34081a628428ba5646c995b9558821053ba9c84a05afbf00dabd60223723096516d2f5668f3ec7e11612b01eb7a3a0506189a2272b88e89807943adb34291a17f6cb5516ffd6f945a1c42a524b21f096d66f350b1dad4db455741ae3d0e023309fbda5ef55fb0dc74f3297041448b2be76c525141963934c6afc53d263fb7836626df502d7c2ee9e79cbbd87afd84bbb8dfbf45248af3cd61ad5fac827e7683ca4f91dfad507a8eb9c17b2c9ac5ec051fe645a4a6cb37136f6f19b611e0ea8da7960af2d779507e55f57305bc74b7568928c5dd5132990fe54c22117df91c257d8c7b61935a018a28c1c3b17bab8e4294fa699161ec21123c9fc4e71079df31f300c2822e1246561e04765d3aab333eafd026c7431ac7616debb0e022746f4538e1c6348b600c988eeb2d051fc60c468dca260a84c79ab3ab8342dc345a764672848ea234e17332bc124799daf7c5fcb2e2358514a7461357e1c19c802c5ee32deccf1776885dd825bedd5f781d459984370a6b7ae885d4483a76ddb19b30f47ed47cd56aa5a079a89793dbcad461c59f2e002067ac98dd5a534e525c9c46c2af730741bf1f8629357ec0bfc0bc9ecb31af96777e507648ff4260dc3673716e098d9111dfd245f1d7c55a6de340deb8bd7a053e5d62d760f184dc70ca8fa255b9023b9b9aedfb6e419a5b5951ba0f83b603793830ee68d442d7b88ee1bbf6bbd1bcd6f68cc1af");
	assert_eq!(htlc_msat, 150_156_000);
	assert_eq!(htlc_cltv, 800_060);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1428,7 +1428,7 @@ fn test_fee_spike_violation_fails_htlc() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 3460001, &recipient_onion_fields, cur_height, &None, None).unwrap();
 3460001, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1623,7 +1623,7 @@ fn test_chan_reserve_violation_inbound_htlc_outbound_channel() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 700_000, &recipient_onion_fields, cur_height, &None, None).unwrap();
 700_000, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1803,7 +1803,7 @@ fn test_chan_reserve_violation_inbound_htlc_inbound_chan() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route_2.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash_1).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -3856,7 +3856,7 @@ fn fail_backward_pending_htlc_upon_channel_failure() {
 let current_height = nodes[1].node.best_block.read().unwrap().height + 1;
 let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
 let (onion_payloads, _amount_msat, cltv_expiry) = onion_utils::build_onion_payloads(
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None).unwrap();
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None, None).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
 let onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();

Expand DownExpand Up@@ -6852,7 +6852,7 @@ fn test_update_add_htlc_bolt2_receiver_check_max_htlc_limit() {
	let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::signing_only(), &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
	let (onion_payloads, _htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash).unwrap();

	let mut msg = msgs::UpdateAddHTLC {
Expand DownExpand Up@@ -8607,7 +8607,7 @@ fn test_onion_value_mpp_set_calculation() {
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
 let (mut onion_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], 100_000,
 &recipient_onion_fields, height + 1, &None, None).unwrap();
 &recipient_onion_fields, height + 1, &None, None, None).unwrap();
 // Edit amt_to_forward to simulate the sender having set
 // the final amount and the routing node taking less fee
 if let msgs::OutboundOnionPayload::Receive {
Expand Down

3 changes: 2 additions & 1 deletion
lightning/src/ln/max_payment_path_len_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,8 @@ fn blinded_path_with_custom_tlv() {
	let reserved_packet_bytes_without_custom_tlv: usize = onion_utils::build_onion_payloads(
 &route.paths[0], MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
 &RecipientOnionFields::spontaneous_empty(),
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None, None
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None,
 None, None
	)
 .unwrap()
 .0
Expand Down

4 changes: 0 additions & 4 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1802,7 +1802,6 @@ mod fuzzy_internal_msgs {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 },
 #[allow(unused)]
 TrampolineEntrypoint {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
Expand DownExpand Up@@ -1834,7 +1833,6 @@ mod fuzzy_internal_msgs {
	}

	pub(crate) enum OutboundTrampolinePayload<'a> {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
Expand All@@ -1854,12 +1852,10 @@ mod fuzzy_internal_msgs {
 /// If applicable, features of the BOLT12 invoice being paid.
 invoice_features: Option<Bolt12InvoiceFeatures>,
 },
 #[allow(unused)]
 BlindedForward {
 encrypted_tlvs: &'a Vec<u8>,
 intro_node_blinding_point: Option<PublicKey>,
 },
 #[allow(unused)]
 BlindedReceive {
 sender_intended_htlc_amt_msat: u64,
 total_msat: u64,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ mod tests {
 let path = Path { hops, blinded_tail: None, };
 let onion_keys = super::onion_utils::construct_onion_keys(&secp_ctx, &path, &session_priv).unwrap();
 let (onion_payloads, ..) = super::onion_utils::build_onion_payloads(
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None, None
 ).unwrap();

 assert!(super::onion_utils::construct_onion_packet(
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" + '
Trampoline Payload Construction Method by arik-so · Pull Request #3386 · lightningdevkit/rust-lightning · GitHub
Skip to content
Trampoline Payload Construction Method#3386

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Feb 7, 2025
 Merged


Trampoline Payload Construction Method
#3386
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
75cf8d2

Introduce TrampolineHop struct


arik-so Mar 19, 2024
03762ba

Add trampoline_hops field to BlindedTail


arik-so Mar 19, 2024
eba3f90

Trampoline payload construction method


arik-so Oct 28, 2024
7b56d51

Construct Trampoline component in create_payment_onion


arik-so Feb 7, 2025

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


99 changes: 94 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
// licenses.

use bitcoin::hashes::hex::FromHex;
use bitcoin::hex::DisplayHex;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, schnorr};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
Expand All@@ -30,12 +31,14 @@ use crate::ln::outbound_payment::{Retry, IDEMPOTENCY_TIMEOUT_TICKS};
use crate::offers::invoice::UnsignedBolt12Invoice;
use crate::offers::nonce::Nonce;
use crate::prelude::*;
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters};
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters, TrampolineHop};
use crate::sign::{NodeSigner, Recipient};
use crate::util::config::UserConfig;
use crate::util::ser::WithoutLength;
use crate::util::ser::{WithoutLength, Writeable};
use crate::util::test_utils;
use lightning_invoice::RawBolt11Invoice;
use types::features::Features;
use crate::blinded_path::BlindedHop;

pub fn blinded_payment_path(
	payment_secret: PaymentSecret, intro_node_min_htlc: u64, intro_node_max_htlc: u64,
Expand DownExpand Up@@ -362,15 +365,17 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
 ForwardCheckFail::ForwardPayloadEncodedAsReceive => {
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let cur_height = nodes[0].best_block_info().1;
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
 // Remove the receive payload so the blinded forward payload is encoded as a final payload
 // (i.e. next_hop_hmac == [0; 32])
 onion_payloads.pop();
 onion_keys.pop();
 if $target_node_idx + 1 < nodes.len() {
 onion_payloads.pop();
 onion_keys.pop();
 }
 $update_add.onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
 },
Expand DownExpand Up@@ -935,7 +940,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
 let cur_height = nodes[0].best_block_info().1;
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();

 let update_add = &mut payment_event_1_2.msgs[0];
 onion_payloads.last_mut().map(|p| {
Expand DownExpand Up@@ -1505,6 +1510,7 @@ fn route_blinding_spec_test_vector() {
 maybe_announced_channel: false,
 }],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![],
 hops: blinded_hops,
 blinding_point: bob_blinding_point,
 excess_final_cltv_expiry_delta: 0,
Expand DownExpand Up@@ -1654,3 +1660,86 @@ fn route_blinding_spec_test_vector() {
 _ => panic!("Unexpected error")
	}
}

#[test]
fn test_combined_trampoline_onion_creation_vectors() {
	// As per https://github.com/lightning/bolts/blob/fa0594ac2af3531d734f1d707a146d6e13679451/bolt04/trampoline-to-blinded-path-payment-onion-test.json#L251

	let mut secp_ctx = Secp256k1::new();
	let session_priv = secret_from_hex("a64feb81abd58e473df290e9e1c07dc3e56114495cadf33191f44ba5448ebe99");

	let path = Path {
 hops: vec![
 // Bob
 RouteHop {
 pubkey: pubkey_from_hex("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c"),
 node_features: NodeFeatures::empty(),
 short_channel_id: 0,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 3_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },

 // Carol
 RouteHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: NodeFeatures::empty(),
 short_channel_id: (572330 << 40) + (42 << 16) + 2821,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 153_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },
 ],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![
 // Carol's pubkey
 TrampolineHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: Features::empty(),
 fee_msat: 2_500,
 cltv_expiry_delta: 24,
 },
 // Dave's pubkey (the intro node needs to be duplicated)
 TrampolineHop {
 pubkey: pubkey_from_hex("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991"),
 node_features: Features::empty(),
 fee_msat: 150_500, // incorporate both base and proportional fee
 cltv_expiry_delta: 36,
 }
 ],
 hops: vec![
 // Dave's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("0295d40514096a8be54859e7dfe947b376eaafea8afe5cb4eb2c13ff857ed0b4be"),
 encrypted_payload: bytes_from_hex("0ccf3c8a58deaa603f657ee2a5ed9d604eb5c8ca1e5f801989afa8f3ea6d789bbdde2c7e7a1ef9ca8c38d2c54760febad8446d3f273ddb537569ef56613846ccd3aba78a"),
 },
 // Eve's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("020e2dbadcc2005e859819ddebbe88a834ae8a6d2b049233c07335f15cd1dc5f22"),
 encrypted_payload: bytes_from_hex("bcd747394fbd4d99588da075a623316e15a576df5bc785cccc7cd6ec7b398acce6faf520175f9ec920f2ef261cdb83dc28cc3a0eeb970107b3306489bf771ef5b1213bca811d345285405861d08a655b6c237fa247a8b4491beee20c878a60e9816492026d8feb9dafa84585b253978db6a0aa2945df5ef445c61e801fb82f43d5f00716baf9fc9b3de50bc22950a36bda8fc27bfb1242e5860c7e687438d4133e058770361a19b6c271a2a07788d34dccc27e39b9829b061a4d960eac4a2c2b0f4de506c24f9af3868c0aff6dda27281c"),
 }
 ],
 blinding_point: pubkey_from_hex("02988face71e92c345a068f740191fd8e53be14f0bb957ef730d3c5f76087b960e"),
 excess_final_cltv_expiry_delta: 0,
 final_value_msat: 150_000_000
 }),
	};

	let associated_data_slice = secret_from_hex("e89bc505e84aaca09613833fc58c9069078fb43bfbea0488f34eec9db99b5f82");
	let associated_data = PaymentHash(associated_data_slice.secret_bytes());
	let payment_secret = PaymentSecret(secret_from_hex("7494b65bc092b48a75465e43e29be807eb2cc535ce8aaba31012b8ff1ceac5da").secret_bytes());
	let outer_session_key = secret_from_hex("4f777e8dac16e6dfe333066d9efb014f7a51d11762ff76eca4d3a95ada99ba3e");
	let outer_onion_prng_seed = onion_utils::gen_pad_from_shared_secret(&outer_session_key.secret_bytes());

	let amt_msat = 150_000_000;
	let cur_height = 800_000;
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (bob_onion, htlc_msat, htlc_cltv) = onion_utils::create_payment_onion_internal(&secp_ctx, &path, &session_priv, amt_msat, &recipient_onion_fields, cur_height, &associated_data, &None, None, [0; 32], Some(outer_session_key), Some(outer_onion_prng_seed)).unwrap();

	let outer_onion_packet_hex = bob_onion.encode().to_lower_hex_string();
	assert_eq!(outer_onion_packet_hex, "00025fd60556c134ae97e4baedba220a644037754ee67c54fd05e93bf40c17cbb73362fb9dee96001ff229945595b6edb59437a6bc143406d3f90f749892a84d8d430c6890437d26d5bfc599d565316ef51347521075bbab87c59c57bcf20af7e63d7192b46cf171e4f73cb11f9f603915389105d91ad630224bea95d735e3988add1e24b5bf28f1d7128db64284d90a839ba340d088c74b1fb1bd21136b1809428ec5399c8649e9bdf92d2dcfc694deae5046fa5b2bdf646847aaad73f5e95275763091c90e71031cae1f9a770fdea559642c9c02f424a2a28163dd0957e3874bd28a97bec67d18c0321b0e68bc804aa8345b17cb626e2348ca06c8312a167c989521056b0f25c55559d446507d6c491d50605cb79fa87929ce64b0a9860926eeaec2c431d926a1cadb9a1186e4061cb01671a122fc1f57602cbef06d6c194ec4b715c2e3dd4120baca3172cd81900b49fef857fb6d6afd24c983b608108b0a5ac0c1c6c52011f23b8778059ffadd1bb7cd06e2525417365f485a7fd1d4a9ba3818ede7cdc9e71afee8532252d08e2531ca52538655b7e8d912f7ec6d37bbcce8d7ec690709dbf9321e92c565b78e7fe2c22edf23e0902153d1ca15a112ad32fb19695ec65ce11ddf670da7915f05ad4b86c154fb908cb567315d1124f303f75fa075ebde8ef7bb12e27737ad9e4924439097338ea6d7a6fc3721b88c9b830a34e8d55f4c582b74a3895cc848fe57f4fe29f115dabeb6b3175be15d94408ed6771109cfaf57067ae658201082eae7605d26b1449af4425ae8e8f58cdda5c6265f1fd7a386fc6cea3074e4f25b909b96175883676f7610a00fdf34df9eb6c7b9a4ae89b839c69fd1f285e38cdceb634d782cc6d81179759bc9fd47d7fd060470d0b048287764c6837963274e708314f017ac7dc26d0554d59bfcfd3136225798f65f0b0fea337c6b256ebbb63a90b994c0ab93fd8b1d6bd4c74aebe535d6110014cd3d525394027dfe8faa98b4e9b2bee7949eb1961f1b026791092f84deea63afab66603dbe9b6365a102a1fef2f6b9744bc1bb091a8da9130d34d4d39f25dbad191649cfb67e10246364b7ce0c6ec072f9690cabb459d9fda0c849e17535de4357e9907270c75953fca3c845bb613926ecf73205219c7057a4b6bb244c184362bb4e2f24279dc4e60b94a5b1ec11c34081a628428ba5646c995b9558821053ba9c84a05afbf00dabd60223723096516d2f5668f3ec7e11612b01eb7a3a0506189a2272b88e89807943adb34291a17f6cb5516ffd6f945a1c42a524b21f096d66f350b1dad4db455741ae3d0e023309fbda5ef55fb0dc74f3297041448b2be76c525141963934c6afc53d263fb7836626df502d7c2ee9e79cbbd87afd84bbb8dfbf45248af3cd61ad5fac827e7683ca4f91dfad507a8eb9c17b2c9ac5ec051fe645a4a6cb37136f6f19b611e0ea8da7960af2d779507e55f57305bc74b7568928c5dd5132990fe54c22117df91c257d8c7b61935a018a28c1c3b17bab8e4294fa699161ec21123c9fc4e71079df31f300c2822e1246561e04765d3aab333eafd026c7431ac7616debb0e022746f4538e1c6348b600c988eeb2d051fc60c468dca260a84c79ab3ab8342dc345a764672848ea234e17332bc124799daf7c5fcb2e2358514a7461357e1c19c802c5ee32deccf1776885dd825bedd5f781d459984370a6b7ae885d4483a76ddb19b30f47ed47cd56aa5a079a89793dbcad461c59f2e002067ac98dd5a534e525c9c46c2af730741bf1f8629357ec0bfc0bc9ecb31af96777e507648ff4260dc3673716e098d9111dfd245f1d7c55a6de340deb8bd7a053e5d62d760f184dc70ca8fa255b9023b9b9aedfb6e419a5b5951ba0f83b603793830ee68d442d7b88ee1bbf6bbd1bcd6f68cc1af");
	assert_eq!(htlc_msat, 150_156_000);
	assert_eq!(htlc_cltv, 800_060);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1428,7 +1428,7 @@ fn test_fee_spike_violation_fails_htlc() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 3460001, &recipient_onion_fields, cur_height, &None, None).unwrap();
 3460001, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1623,7 +1623,7 @@ fn test_chan_reserve_violation_inbound_htlc_outbound_channel() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 700_000, &recipient_onion_fields, cur_height, &None, None).unwrap();
 700_000, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1803,7 +1803,7 @@ fn test_chan_reserve_violation_inbound_htlc_inbound_chan() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route_2.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash_1).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -3856,7 +3856,7 @@ fn fail_backward_pending_htlc_upon_channel_failure() {
 let current_height = nodes[1].node.best_block.read().unwrap().height + 1;
 let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
 let (onion_payloads, _amount_msat, cltv_expiry) = onion_utils::build_onion_payloads(
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None).unwrap();
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None, None).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
 let onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();

Expand DownExpand Up@@ -6852,7 +6852,7 @@ fn test_update_add_htlc_bolt2_receiver_check_max_htlc_limit() {
	let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::signing_only(), &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
	let (onion_payloads, _htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash).unwrap();

	let mut msg = msgs::UpdateAddHTLC {
Expand DownExpand Up@@ -8607,7 +8607,7 @@ fn test_onion_value_mpp_set_calculation() {
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
 let (mut onion_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], 100_000,
 &recipient_onion_fields, height + 1, &None, None).unwrap();
 &recipient_onion_fields, height + 1, &None, None, None).unwrap();
 // Edit amt_to_forward to simulate the sender having set
 // the final amount and the routing node taking less fee
 if let msgs::OutboundOnionPayload::Receive {
Expand Down

3 changes: 2 additions & 1 deletion
lightning/src/ln/max_payment_path_len_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,8 @@ fn blinded_path_with_custom_tlv() {
	let reserved_packet_bytes_without_custom_tlv: usize = onion_utils::build_onion_payloads(
 &route.paths[0], MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
 &RecipientOnionFields::spontaneous_empty(),
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None, None
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None,
 None, None
	)
 .unwrap()
 .0
Expand Down

4 changes: 0 additions & 4 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1802,7 +1802,6 @@ mod fuzzy_internal_msgs {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 },
 #[allow(unused)]
 TrampolineEntrypoint {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
Expand DownExpand Up@@ -1834,7 +1833,6 @@ mod fuzzy_internal_msgs {
	}

	pub(crate) enum OutboundTrampolinePayload<'a> {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
Expand All@@ -1854,12 +1852,10 @@ mod fuzzy_internal_msgs {
 /// If applicable, features of the BOLT12 invoice being paid.
 invoice_features: Option<Bolt12InvoiceFeatures>,
 },
 #[allow(unused)]
 BlindedForward {
 encrypted_tlvs: &'a Vec<u8>,
 intro_node_blinding_point: Option<PublicKey>,
 },
 #[allow(unused)]
 BlindedReceive {
 sender_intended_htlc_amt_msat: u64,
 total_msat: u64,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ mod tests {
 let path = Path { hops, blinded_tail: None, };
 let onion_keys = super::onion_utils::construct_onion_keys(&secp_ctx, &path, &session_priv).unwrap();
 let (onion_payloads, ..) = super::onion_utils::build_onion_payloads(
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None, None
 ).unwrap();

 assert!(super::onion_utils::construct_onion_packet(
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('^' + ".*" + '
Trampoline Payload Construction Method by arik-so · Pull Request #3386 · lightningdevkit/rust-lightning · GitHub
Skip to content
Trampoline Payload Construction Method#3386

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Feb 7, 2025
 Merged


Trampoline Payload Construction Method
#3386
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
75cf8d2

Introduce TrampolineHop struct


arik-so Mar 19, 2024
03762ba

Add trampoline_hops field to BlindedTail


arik-so Mar 19, 2024
eba3f90

Trampoline payload construction method


arik-so Oct 28, 2024
7b56d51

Construct Trampoline component in create_payment_onion


arik-so Feb 7, 2025

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


99 changes: 94 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
// licenses.

use bitcoin::hashes::hex::FromHex;
use bitcoin::hex::DisplayHex;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, schnorr};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
Expand All@@ -30,12 +31,14 @@ use crate::ln::outbound_payment::{Retry, IDEMPOTENCY_TIMEOUT_TICKS};
use crate::offers::invoice::UnsignedBolt12Invoice;
use crate::offers::nonce::Nonce;
use crate::prelude::*;
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters};
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters, TrampolineHop};
use crate::sign::{NodeSigner, Recipient};
use crate::util::config::UserConfig;
use crate::util::ser::WithoutLength;
use crate::util::ser::{WithoutLength, Writeable};
use crate::util::test_utils;
use lightning_invoice::RawBolt11Invoice;
use types::features::Features;
use crate::blinded_path::BlindedHop;

pub fn blinded_payment_path(
	payment_secret: PaymentSecret, intro_node_min_htlc: u64, intro_node_max_htlc: u64,
Expand DownExpand Up@@ -362,15 +365,17 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
 ForwardCheckFail::ForwardPayloadEncodedAsReceive => {
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let cur_height = nodes[0].best_block_info().1;
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
 // Remove the receive payload so the blinded forward payload is encoded as a final payload
 // (i.e. next_hop_hmac == [0; 32])
 onion_payloads.pop();
 onion_keys.pop();
 if $target_node_idx + 1 < nodes.len() {
 onion_payloads.pop();
 onion_keys.pop();
 }
 $update_add.onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
 },
Expand DownExpand Up@@ -935,7 +940,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
 let cur_height = nodes[0].best_block_info().1;
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();

 let update_add = &mut payment_event_1_2.msgs[0];
 onion_payloads.last_mut().map(|p| {
Expand DownExpand Up@@ -1505,6 +1510,7 @@ fn route_blinding_spec_test_vector() {
 maybe_announced_channel: false,
 }],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![],
 hops: blinded_hops,
 blinding_point: bob_blinding_point,
 excess_final_cltv_expiry_delta: 0,
Expand DownExpand Up@@ -1654,3 +1660,86 @@ fn route_blinding_spec_test_vector() {
 _ => panic!("Unexpected error")
	}
}

#[test]
fn test_combined_trampoline_onion_creation_vectors() {
	// As per https://github.com/lightning/bolts/blob/fa0594ac2af3531d734f1d707a146d6e13679451/bolt04/trampoline-to-blinded-path-payment-onion-test.json#L251

	let mut secp_ctx = Secp256k1::new();
	let session_priv = secret_from_hex("a64feb81abd58e473df290e9e1c07dc3e56114495cadf33191f44ba5448ebe99");

	let path = Path {
 hops: vec![
 // Bob
 RouteHop {
 pubkey: pubkey_from_hex("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c"),
 node_features: NodeFeatures::empty(),
 short_channel_id: 0,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 3_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },

 // Carol
 RouteHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: NodeFeatures::empty(),
 short_channel_id: (572330 << 40) + (42 << 16) + 2821,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 153_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },
 ],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![
 // Carol's pubkey
 TrampolineHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: Features::empty(),
 fee_msat: 2_500,
 cltv_expiry_delta: 24,
 },
 // Dave's pubkey (the intro node needs to be duplicated)
 TrampolineHop {
 pubkey: pubkey_from_hex("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991"),
 node_features: Features::empty(),
 fee_msat: 150_500, // incorporate both base and proportional fee
 cltv_expiry_delta: 36,
 }
 ],
 hops: vec![
 // Dave's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("0295d40514096a8be54859e7dfe947b376eaafea8afe5cb4eb2c13ff857ed0b4be"),
 encrypted_payload: bytes_from_hex("0ccf3c8a58deaa603f657ee2a5ed9d604eb5c8ca1e5f801989afa8f3ea6d789bbdde2c7e7a1ef9ca8c38d2c54760febad8446d3f273ddb537569ef56613846ccd3aba78a"),
 },
 // Eve's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("020e2dbadcc2005e859819ddebbe88a834ae8a6d2b049233c07335f15cd1dc5f22"),
 encrypted_payload: bytes_from_hex("bcd747394fbd4d99588da075a623316e15a576df5bc785cccc7cd6ec7b398acce6faf520175f9ec920f2ef261cdb83dc28cc3a0eeb970107b3306489bf771ef5b1213bca811d345285405861d08a655b6c237fa247a8b4491beee20c878a60e9816492026d8feb9dafa84585b253978db6a0aa2945df5ef445c61e801fb82f43d5f00716baf9fc9b3de50bc22950a36bda8fc27bfb1242e5860c7e687438d4133e058770361a19b6c271a2a07788d34dccc27e39b9829b061a4d960eac4a2c2b0f4de506c24f9af3868c0aff6dda27281c"),
 }
 ],
 blinding_point: pubkey_from_hex("02988face71e92c345a068f740191fd8e53be14f0bb957ef730d3c5f76087b960e"),
 excess_final_cltv_expiry_delta: 0,
 final_value_msat: 150_000_000
 }),
	};

	let associated_data_slice = secret_from_hex("e89bc505e84aaca09613833fc58c9069078fb43bfbea0488f34eec9db99b5f82");
	let associated_data = PaymentHash(associated_data_slice.secret_bytes());
	let payment_secret = PaymentSecret(secret_from_hex("7494b65bc092b48a75465e43e29be807eb2cc535ce8aaba31012b8ff1ceac5da").secret_bytes());
	let outer_session_key = secret_from_hex("4f777e8dac16e6dfe333066d9efb014f7a51d11762ff76eca4d3a95ada99ba3e");
	let outer_onion_prng_seed = onion_utils::gen_pad_from_shared_secret(&outer_session_key.secret_bytes());

	let amt_msat = 150_000_000;
	let cur_height = 800_000;
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (bob_onion, htlc_msat, htlc_cltv) = onion_utils::create_payment_onion_internal(&secp_ctx, &path, &session_priv, amt_msat, &recipient_onion_fields, cur_height, &associated_data, &None, None, [0; 32], Some(outer_session_key), Some(outer_onion_prng_seed)).unwrap();

	let outer_onion_packet_hex = bob_onion.encode().to_lower_hex_string();
	assert_eq!(outer_onion_packet_hex, "00025fd60556c134ae97e4baedba220a644037754ee67c54fd05e93bf40c17cbb73362fb9dee96001ff229945595b6edb59437a6bc143406d3f90f749892a84d8d430c6890437d26d5bfc599d565316ef51347521075bbab87c59c57bcf20af7e63d7192b46cf171e4f73cb11f9f603915389105d91ad630224bea95d735e3988add1e24b5bf28f1d7128db64284d90a839ba340d088c74b1fb1bd21136b1809428ec5399c8649e9bdf92d2dcfc694deae5046fa5b2bdf646847aaad73f5e95275763091c90e71031cae1f9a770fdea559642c9c02f424a2a28163dd0957e3874bd28a97bec67d18c0321b0e68bc804aa8345b17cb626e2348ca06c8312a167c989521056b0f25c55559d446507d6c491d50605cb79fa87929ce64b0a9860926eeaec2c431d926a1cadb9a1186e4061cb01671a122fc1f57602cbef06d6c194ec4b715c2e3dd4120baca3172cd81900b49fef857fb6d6afd24c983b608108b0a5ac0c1c6c52011f23b8778059ffadd1bb7cd06e2525417365f485a7fd1d4a9ba3818ede7cdc9e71afee8532252d08e2531ca52538655b7e8d912f7ec6d37bbcce8d7ec690709dbf9321e92c565b78e7fe2c22edf23e0902153d1ca15a112ad32fb19695ec65ce11ddf670da7915f05ad4b86c154fb908cb567315d1124f303f75fa075ebde8ef7bb12e27737ad9e4924439097338ea6d7a6fc3721b88c9b830a34e8d55f4c582b74a3895cc848fe57f4fe29f115dabeb6b3175be15d94408ed6771109cfaf57067ae658201082eae7605d26b1449af4425ae8e8f58cdda5c6265f1fd7a386fc6cea3074e4f25b909b96175883676f7610a00fdf34df9eb6c7b9a4ae89b839c69fd1f285e38cdceb634d782cc6d81179759bc9fd47d7fd060470d0b048287764c6837963274e708314f017ac7dc26d0554d59bfcfd3136225798f65f0b0fea337c6b256ebbb63a90b994c0ab93fd8b1d6bd4c74aebe535d6110014cd3d525394027dfe8faa98b4e9b2bee7949eb1961f1b026791092f84deea63afab66603dbe9b6365a102a1fef2f6b9744bc1bb091a8da9130d34d4d39f25dbad191649cfb67e10246364b7ce0c6ec072f9690cabb459d9fda0c849e17535de4357e9907270c75953fca3c845bb613926ecf73205219c7057a4b6bb244c184362bb4e2f24279dc4e60b94a5b1ec11c34081a628428ba5646c995b9558821053ba9c84a05afbf00dabd60223723096516d2f5668f3ec7e11612b01eb7a3a0506189a2272b88e89807943adb34291a17f6cb5516ffd6f945a1c42a524b21f096d66f350b1dad4db455741ae3d0e023309fbda5ef55fb0dc74f3297041448b2be76c525141963934c6afc53d263fb7836626df502d7c2ee9e79cbbd87afd84bbb8dfbf45248af3cd61ad5fac827e7683ca4f91dfad507a8eb9c17b2c9ac5ec051fe645a4a6cb37136f6f19b611e0ea8da7960af2d779507e55f57305bc74b7568928c5dd5132990fe54c22117df91c257d8c7b61935a018a28c1c3b17bab8e4294fa699161ec21123c9fc4e71079df31f300c2822e1246561e04765d3aab333eafd026c7431ac7616debb0e022746f4538e1c6348b600c988eeb2d051fc60c468dca260a84c79ab3ab8342dc345a764672848ea234e17332bc124799daf7c5fcb2e2358514a7461357e1c19c802c5ee32deccf1776885dd825bedd5f781d459984370a6b7ae885d4483a76ddb19b30f47ed47cd56aa5a079a89793dbcad461c59f2e002067ac98dd5a534e525c9c46c2af730741bf1f8629357ec0bfc0bc9ecb31af96777e507648ff4260dc3673716e098d9111dfd245f1d7c55a6de340deb8bd7a053e5d62d760f184dc70ca8fa255b9023b9b9aedfb6e419a5b5951ba0f83b603793830ee68d442d7b88ee1bbf6bbd1bcd6f68cc1af");
	assert_eq!(htlc_msat, 150_156_000);
	assert_eq!(htlc_cltv, 800_060);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1428,7 +1428,7 @@ fn test_fee_spike_violation_fails_htlc() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 3460001, &recipient_onion_fields, cur_height, &None, None).unwrap();
 3460001, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1623,7 +1623,7 @@ fn test_chan_reserve_violation_inbound_htlc_outbound_channel() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 700_000, &recipient_onion_fields, cur_height, &None, None).unwrap();
 700_000, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1803,7 +1803,7 @@ fn test_chan_reserve_violation_inbound_htlc_inbound_chan() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route_2.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash_1).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -3856,7 +3856,7 @@ fn fail_backward_pending_htlc_upon_channel_failure() {
 let current_height = nodes[1].node.best_block.read().unwrap().height + 1;
 let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
 let (onion_payloads, _amount_msat, cltv_expiry) = onion_utils::build_onion_payloads(
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None).unwrap();
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None, None).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
 let onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();

Expand DownExpand Up@@ -6852,7 +6852,7 @@ fn test_update_add_htlc_bolt2_receiver_check_max_htlc_limit() {
	let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::signing_only(), &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
	let (onion_payloads, _htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash).unwrap();

	let mut msg = msgs::UpdateAddHTLC {
Expand DownExpand Up@@ -8607,7 +8607,7 @@ fn test_onion_value_mpp_set_calculation() {
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
 let (mut onion_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], 100_000,
 &recipient_onion_fields, height + 1, &None, None).unwrap();
 &recipient_onion_fields, height + 1, &None, None, None).unwrap();
 // Edit amt_to_forward to simulate the sender having set
 // the final amount and the routing node taking less fee
 if let msgs::OutboundOnionPayload::Receive {
Expand Down

3 changes: 2 additions & 1 deletion
lightning/src/ln/max_payment_path_len_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,8 @@ fn blinded_path_with_custom_tlv() {
	let reserved_packet_bytes_without_custom_tlv: usize = onion_utils::build_onion_payloads(
 &route.paths[0], MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
 &RecipientOnionFields::spontaneous_empty(),
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None, None
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None,
 None, None
	)
 .unwrap()
 .0
Expand Down

4 changes: 0 additions & 4 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1802,7 +1802,6 @@ mod fuzzy_internal_msgs {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 },
 #[allow(unused)]
 TrampolineEntrypoint {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
Expand DownExpand Up@@ -1834,7 +1833,6 @@ mod fuzzy_internal_msgs {
	}

	pub(crate) enum OutboundTrampolinePayload<'a> {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
Expand All@@ -1854,12 +1852,10 @@ mod fuzzy_internal_msgs {
 /// If applicable, features of the BOLT12 invoice being paid.
 invoice_features: Option<Bolt12InvoiceFeatures>,
 },
 #[allow(unused)]
 BlindedForward {
 encrypted_tlvs: &'a Vec<u8>,
 intro_node_blinding_point: Option<PublicKey>,
 },
 #[allow(unused)]
 BlindedReceive {
 sender_intended_htlc_amt_msat: u64,
 total_msat: u64,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ mod tests {
 let path = Path { hops, blinded_tail: None, };
 let onion_keys = super::onion_utils::construct_onion_keys(&secp_ctx, &path, &session_priv).unwrap();
 let (onion_payloads, ..) = super::onion_utils::build_onion_payloads(
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None, None
 ).unwrap();

 assert!(super::onion_utils::construct_onion_packet(
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('^' + ".*" + '
Trampoline Payload Construction Method by arik-so · Pull Request #3386 · lightningdevkit/rust-lightning · GitHub
Skip to content
Trampoline Payload Construction Method#3386

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Feb 7, 2025
 Merged


Trampoline Payload Construction Method
#3386
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
75cf8d2

Introduce TrampolineHop struct


arik-so Mar 19, 2024
03762ba

Add trampoline_hops field to BlindedTail


arik-so Mar 19, 2024
eba3f90

Trampoline payload construction method


arik-so Oct 28, 2024
7b56d51

Construct Trampoline component in create_payment_onion


arik-so Feb 7, 2025

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


99 changes: 94 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
// licenses.

use bitcoin::hashes::hex::FromHex;
use bitcoin::hex::DisplayHex;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, schnorr};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
Expand All@@ -30,12 +31,14 @@ use crate::ln::outbound_payment::{Retry, IDEMPOTENCY_TIMEOUT_TICKS};
use crate::offers::invoice::UnsignedBolt12Invoice;
use crate::offers::nonce::Nonce;
use crate::prelude::*;
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters};
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters, TrampolineHop};
use crate::sign::{NodeSigner, Recipient};
use crate::util::config::UserConfig;
use crate::util::ser::WithoutLength;
use crate::util::ser::{WithoutLength, Writeable};
use crate::util::test_utils;
use lightning_invoice::RawBolt11Invoice;
use types::features::Features;
use crate::blinded_path::BlindedHop;

pub fn blinded_payment_path(
	payment_secret: PaymentSecret, intro_node_min_htlc: u64, intro_node_max_htlc: u64,
Expand DownExpand Up@@ -362,15 +365,17 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
 ForwardCheckFail::ForwardPayloadEncodedAsReceive => {
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let cur_height = nodes[0].best_block_info().1;
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
 // Remove the receive payload so the blinded forward payload is encoded as a final payload
 // (i.e. next_hop_hmac == [0; 32])
 onion_payloads.pop();
 onion_keys.pop();
 if $target_node_idx + 1 < nodes.len() {
 onion_payloads.pop();
 onion_keys.pop();
 }
 $update_add.onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
 },
Expand DownExpand Up@@ -935,7 +940,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
 let cur_height = nodes[0].best_block_info().1;
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();

 let update_add = &mut payment_event_1_2.msgs[0];
 onion_payloads.last_mut().map(|p| {
Expand DownExpand Up@@ -1505,6 +1510,7 @@ fn route_blinding_spec_test_vector() {
 maybe_announced_channel: false,
 }],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![],
 hops: blinded_hops,
 blinding_point: bob_blinding_point,
 excess_final_cltv_expiry_delta: 0,
Expand DownExpand Up@@ -1654,3 +1660,86 @@ fn route_blinding_spec_test_vector() {
 _ => panic!("Unexpected error")
	}
}

#[test]
fn test_combined_trampoline_onion_creation_vectors() {
	// As per https://github.com/lightning/bolts/blob/fa0594ac2af3531d734f1d707a146d6e13679451/bolt04/trampoline-to-blinded-path-payment-onion-test.json#L251

	let mut secp_ctx = Secp256k1::new();
	let session_priv = secret_from_hex("a64feb81abd58e473df290e9e1c07dc3e56114495cadf33191f44ba5448ebe99");

	let path = Path {
 hops: vec![
 // Bob
 RouteHop {
 pubkey: pubkey_from_hex("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c"),
 node_features: NodeFeatures::empty(),
 short_channel_id: 0,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 3_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },

 // Carol
 RouteHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: NodeFeatures::empty(),
 short_channel_id: (572330 << 40) + (42 << 16) + 2821,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 153_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },
 ],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![
 // Carol's pubkey
 TrampolineHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: Features::empty(),
 fee_msat: 2_500,
 cltv_expiry_delta: 24,
 },
 // Dave's pubkey (the intro node needs to be duplicated)
 TrampolineHop {
 pubkey: pubkey_from_hex("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991"),
 node_features: Features::empty(),
 fee_msat: 150_500, // incorporate both base and proportional fee
 cltv_expiry_delta: 36,
 }
 ],
 hops: vec![
 // Dave's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("0295d40514096a8be54859e7dfe947b376eaafea8afe5cb4eb2c13ff857ed0b4be"),
 encrypted_payload: bytes_from_hex("0ccf3c8a58deaa603f657ee2a5ed9d604eb5c8ca1e5f801989afa8f3ea6d789bbdde2c7e7a1ef9ca8c38d2c54760febad8446d3f273ddb537569ef56613846ccd3aba78a"),
 },
 // Eve's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("020e2dbadcc2005e859819ddebbe88a834ae8a6d2b049233c07335f15cd1dc5f22"),
 encrypted_payload: bytes_from_hex("bcd747394fbd4d99588da075a623316e15a576df5bc785cccc7cd6ec7b398acce6faf520175f9ec920f2ef261cdb83dc28cc3a0eeb970107b3306489bf771ef5b1213bca811d345285405861d08a655b6c237fa247a8b4491beee20c878a60e9816492026d8feb9dafa84585b253978db6a0aa2945df5ef445c61e801fb82f43d5f00716baf9fc9b3de50bc22950a36bda8fc27bfb1242e5860c7e687438d4133e058770361a19b6c271a2a07788d34dccc27e39b9829b061a4d960eac4a2c2b0f4de506c24f9af3868c0aff6dda27281c"),
 }
 ],
 blinding_point: pubkey_from_hex("02988face71e92c345a068f740191fd8e53be14f0bb957ef730d3c5f76087b960e"),
 excess_final_cltv_expiry_delta: 0,
 final_value_msat: 150_000_000
 }),
	};

	let associated_data_slice = secret_from_hex("e89bc505e84aaca09613833fc58c9069078fb43bfbea0488f34eec9db99b5f82");
	let associated_data = PaymentHash(associated_data_slice.secret_bytes());
	let payment_secret = PaymentSecret(secret_from_hex("7494b65bc092b48a75465e43e29be807eb2cc535ce8aaba31012b8ff1ceac5da").secret_bytes());
	let outer_session_key = secret_from_hex("4f777e8dac16e6dfe333066d9efb014f7a51d11762ff76eca4d3a95ada99ba3e");
	let outer_onion_prng_seed = onion_utils::gen_pad_from_shared_secret(&outer_session_key.secret_bytes());

	let amt_msat = 150_000_000;
	let cur_height = 800_000;
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (bob_onion, htlc_msat, htlc_cltv) = onion_utils::create_payment_onion_internal(&secp_ctx, &path, &session_priv, amt_msat, &recipient_onion_fields, cur_height, &associated_data, &None, None, [0; 32], Some(outer_session_key), Some(outer_onion_prng_seed)).unwrap();

	let outer_onion_packet_hex = bob_onion.encode().to_lower_hex_string();
	assert_eq!(outer_onion_packet_hex, "00025fd60556c134ae97e4baedba220a644037754ee67c54fd05e93bf40c17cbb73362fb9dee96001ff229945595b6edb59437a6bc143406d3f90f749892a84d8d430c6890437d26d5bfc599d565316ef51347521075bbab87c59c57bcf20af7e63d7192b46cf171e4f73cb11f9f603915389105d91ad630224bea95d735e3988add1e24b5bf28f1d7128db64284d90a839ba340d088c74b1fb1bd21136b1809428ec5399c8649e9bdf92d2dcfc694deae5046fa5b2bdf646847aaad73f5e95275763091c90e71031cae1f9a770fdea559642c9c02f424a2a28163dd0957e3874bd28a97bec67d18c0321b0e68bc804aa8345b17cb626e2348ca06c8312a167c989521056b0f25c55559d446507d6c491d50605cb79fa87929ce64b0a9860926eeaec2c431d926a1cadb9a1186e4061cb01671a122fc1f57602cbef06d6c194ec4b715c2e3dd4120baca3172cd81900b49fef857fb6d6afd24c983b608108b0a5ac0c1c6c52011f23b8778059ffadd1bb7cd06e2525417365f485a7fd1d4a9ba3818ede7cdc9e71afee8532252d08e2531ca52538655b7e8d912f7ec6d37bbcce8d7ec690709dbf9321e92c565b78e7fe2c22edf23e0902153d1ca15a112ad32fb19695ec65ce11ddf670da7915f05ad4b86c154fb908cb567315d1124f303f75fa075ebde8ef7bb12e27737ad9e4924439097338ea6d7a6fc3721b88c9b830a34e8d55f4c582b74a3895cc848fe57f4fe29f115dabeb6b3175be15d94408ed6771109cfaf57067ae658201082eae7605d26b1449af4425ae8e8f58cdda5c6265f1fd7a386fc6cea3074e4f25b909b96175883676f7610a00fdf34df9eb6c7b9a4ae89b839c69fd1f285e38cdceb634d782cc6d81179759bc9fd47d7fd060470d0b048287764c6837963274e708314f017ac7dc26d0554d59bfcfd3136225798f65f0b0fea337c6b256ebbb63a90b994c0ab93fd8b1d6bd4c74aebe535d6110014cd3d525394027dfe8faa98b4e9b2bee7949eb1961f1b026791092f84deea63afab66603dbe9b6365a102a1fef2f6b9744bc1bb091a8da9130d34d4d39f25dbad191649cfb67e10246364b7ce0c6ec072f9690cabb459d9fda0c849e17535de4357e9907270c75953fca3c845bb613926ecf73205219c7057a4b6bb244c184362bb4e2f24279dc4e60b94a5b1ec11c34081a628428ba5646c995b9558821053ba9c84a05afbf00dabd60223723096516d2f5668f3ec7e11612b01eb7a3a0506189a2272b88e89807943adb34291a17f6cb5516ffd6f945a1c42a524b21f096d66f350b1dad4db455741ae3d0e023309fbda5ef55fb0dc74f3297041448b2be76c525141963934c6afc53d263fb7836626df502d7c2ee9e79cbbd87afd84bbb8dfbf45248af3cd61ad5fac827e7683ca4f91dfad507a8eb9c17b2c9ac5ec051fe645a4a6cb37136f6f19b611e0ea8da7960af2d779507e55f57305bc74b7568928c5dd5132990fe54c22117df91c257d8c7b61935a018a28c1c3b17bab8e4294fa699161ec21123c9fc4e71079df31f300c2822e1246561e04765d3aab333eafd026c7431ac7616debb0e022746f4538e1c6348b600c988eeb2d051fc60c468dca260a84c79ab3ab8342dc345a764672848ea234e17332bc124799daf7c5fcb2e2358514a7461357e1c19c802c5ee32deccf1776885dd825bedd5f781d459984370a6b7ae885d4483a76ddb19b30f47ed47cd56aa5a079a89793dbcad461c59f2e002067ac98dd5a534e525c9c46c2af730741bf1f8629357ec0bfc0bc9ecb31af96777e507648ff4260dc3673716e098d9111dfd245f1d7c55a6de340deb8bd7a053e5d62d760f184dc70ca8fa255b9023b9b9aedfb6e419a5b5951ba0f83b603793830ee68d442d7b88ee1bbf6bbd1bcd6f68cc1af");
	assert_eq!(htlc_msat, 150_156_000);
	assert_eq!(htlc_cltv, 800_060);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1428,7 +1428,7 @@ fn test_fee_spike_violation_fails_htlc() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 3460001, &recipient_onion_fields, cur_height, &None, None).unwrap();
 3460001, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1623,7 +1623,7 @@ fn test_chan_reserve_violation_inbound_htlc_outbound_channel() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 700_000, &recipient_onion_fields, cur_height, &None, None).unwrap();
 700_000, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1803,7 +1803,7 @@ fn test_chan_reserve_violation_inbound_htlc_inbound_chan() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route_2.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash_1).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -3856,7 +3856,7 @@ fn fail_backward_pending_htlc_upon_channel_failure() {
 let current_height = nodes[1].node.best_block.read().unwrap().height + 1;
 let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
 let (onion_payloads, _amount_msat, cltv_expiry) = onion_utils::build_onion_payloads(
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None).unwrap();
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None, None).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
 let onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();

Expand DownExpand Up@@ -6852,7 +6852,7 @@ fn test_update_add_htlc_bolt2_receiver_check_max_htlc_limit() {
	let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::signing_only(), &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
	let (onion_payloads, _htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash).unwrap();

	let mut msg = msgs::UpdateAddHTLC {
Expand DownExpand Up@@ -8607,7 +8607,7 @@ fn test_onion_value_mpp_set_calculation() {
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
 let (mut onion_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], 100_000,
 &recipient_onion_fields, height + 1, &None, None).unwrap();
 &recipient_onion_fields, height + 1, &None, None, None).unwrap();
 // Edit amt_to_forward to simulate the sender having set
 // the final amount and the routing node taking less fee
 if let msgs::OutboundOnionPayload::Receive {
Expand Down

3 changes: 2 additions & 1 deletion
lightning/src/ln/max_payment_path_len_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,8 @@ fn blinded_path_with_custom_tlv() {
	let reserved_packet_bytes_without_custom_tlv: usize = onion_utils::build_onion_payloads(
 &route.paths[0], MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
 &RecipientOnionFields::spontaneous_empty(),
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None, None
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None,
 None, None
	)
 .unwrap()
 .0
Expand Down

4 changes: 0 additions & 4 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1802,7 +1802,6 @@ mod fuzzy_internal_msgs {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 },
 #[allow(unused)]
 TrampolineEntrypoint {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
Expand DownExpand Up@@ -1834,7 +1833,6 @@ mod fuzzy_internal_msgs {
	}

	pub(crate) enum OutboundTrampolinePayload<'a> {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
Expand All@@ -1854,12 +1852,10 @@ mod fuzzy_internal_msgs {
 /// If applicable, features of the BOLT12 invoice being paid.
 invoice_features: Option<Bolt12InvoiceFeatures>,
 },
 #[allow(unused)]
 BlindedForward {
 encrypted_tlvs: &'a Vec<u8>,
 intro_node_blinding_point: Option<PublicKey>,
 },
 #[allow(unused)]
 BlindedReceive {
 sender_intended_htlc_amt_msat: u64,
 total_msat: u64,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ mod tests {
 let path = Path { hops, blinded_tail: None, };
 let onion_keys = super::onion_utils::construct_onion_keys(&secp_ctx, &path, &session_priv).unwrap();
 let (onion_payloads, ..) = super::onion_utils::build_onion_payloads(
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None, None
 ).unwrap();

 assert!(super::onion_utils::construct_onion_packet(
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); }
})();
})();
Trampoline Payload Construction Method by arik-so · Pull Request #3386 · lightningdevkit/rust-lightning · GitHub
Skip to content
Trampoline Payload Construction Method#3386

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Feb 7, 2025
 Merged


Trampoline Payload Construction Method
#3386
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
75cf8d2

Introduce TrampolineHop struct


arik-so Mar 19, 2024
03762ba

Add trampoline_hops field to BlindedTail


arik-so Mar 19, 2024
eba3f90

Trampoline payload construction method


arik-so Oct 28, 2024
7b56d51

Construct Trampoline component in create_payment_onion


arik-so Feb 7, 2025

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


99 changes: 94 additions & 5 deletions
lightning/src/ln/blinded_payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
// licenses.

use bitcoin::hashes::hex::FromHex;
use bitcoin::hex::DisplayHex;
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, schnorr};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
Expand All@@ -30,12 +31,14 @@ use crate::ln::outbound_payment::{Retry, IDEMPOTENCY_TIMEOUT_TICKS};
use crate::offers::invoice::UnsignedBolt12Invoice;
use crate::offers::nonce::Nonce;
use crate::prelude::*;
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters};
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters, TrampolineHop};
use crate::sign::{NodeSigner, Recipient};
use crate::util::config::UserConfig;
use crate::util::ser::WithoutLength;
use crate::util::ser::{WithoutLength, Writeable};
use crate::util::test_utils;
use lightning_invoice::RawBolt11Invoice;
use types::features::Features;
use crate::blinded_path::BlindedHop;

pub fn blinded_payment_path(
	payment_secret: PaymentSecret, intro_node_min_htlc: u64, intro_node_max_htlc: u64,
Expand DownExpand Up@@ -362,15 +365,17 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
 ForwardCheckFail::ForwardPayloadEncodedAsReceive => {
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let cur_height = nodes[0].best_block_info().1;
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
 // Remove the receive payload so the blinded forward payload is encoded as a final payload
 // (i.e. next_hop_hmac == [0; 32])
 onion_payloads.pop();
 onion_keys.pop();
 if $target_node_idx + 1 < nodes.len() {
 onion_payloads.pop();
 onion_keys.pop();
 }
 $update_add.onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
 },
Expand DownExpand Up@@ -935,7 +940,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
 let cur_height = nodes[0].best_block_info().1;
 let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
 let (mut onion_payloads, ..) = onion_utils::build_onion_payloads(
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], amt_msat, &recipient_onion_fields, cur_height, &None, None, None).unwrap();

 let update_add = &mut payment_event_1_2.msgs[0];
 onion_payloads.last_mut().map(|p| {
Expand DownExpand Up@@ -1505,6 +1510,7 @@ fn route_blinding_spec_test_vector() {
 maybe_announced_channel: false,
 }],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![],
 hops: blinded_hops,
 blinding_point: bob_blinding_point,
 excess_final_cltv_expiry_delta: 0,
Expand DownExpand Up@@ -1654,3 +1660,86 @@ fn route_blinding_spec_test_vector() {
 _ => panic!("Unexpected error")
	}
}

#[test]
fn test_combined_trampoline_onion_creation_vectors() {
	// As per https://github.com/lightning/bolts/blob/fa0594ac2af3531d734f1d707a146d6e13679451/bolt04/trampoline-to-blinded-path-payment-onion-test.json#L251

	let mut secp_ctx = Secp256k1::new();
	let session_priv = secret_from_hex("a64feb81abd58e473df290e9e1c07dc3e56114495cadf33191f44ba5448ebe99");

	let path = Path {
 hops: vec![
 // Bob
 RouteHop {
 pubkey: pubkey_from_hex("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c"),
 node_features: NodeFeatures::empty(),
 short_channel_id: 0,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 3_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },

 // Carol
 RouteHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: NodeFeatures::empty(),
 short_channel_id: (572330 << 40) + (42 << 16) + 2821,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 153_000,
 cltv_expiry_delta: 0,
 maybe_announced_channel: false,
 },
 ],
 blinded_tail: Some(BlindedTail {
 trampoline_hops: vec![
 // Carol's pubkey
 TrampolineHop {
 pubkey: pubkey_from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007"),
 node_features: Features::empty(),
 fee_msat: 2_500,
 cltv_expiry_delta: 24,
 },
 // Dave's pubkey (the intro node needs to be duplicated)
 TrampolineHop {
 pubkey: pubkey_from_hex("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991"),
 node_features: Features::empty(),
 fee_msat: 150_500, // incorporate both base and proportional fee
 cltv_expiry_delta: 36,
 }
 ],
 hops: vec![
 // Dave's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("0295d40514096a8be54859e7dfe947b376eaafea8afe5cb4eb2c13ff857ed0b4be"),
 encrypted_payload: bytes_from_hex("0ccf3c8a58deaa603f657ee2a5ed9d604eb5c8ca1e5f801989afa8f3ea6d789bbdde2c7e7a1ef9ca8c38d2c54760febad8446d3f273ddb537569ef56613846ccd3aba78a"),
 },
 // Eve's blinded node id
 BlindedHop {
Comment thread
arik-so marked this conversation as resolved.

 blinded_node_id: pubkey_from_hex("020e2dbadcc2005e859819ddebbe88a834ae8a6d2b049233c07335f15cd1dc5f22"),
 encrypted_payload: bytes_from_hex("bcd747394fbd4d99588da075a623316e15a576df5bc785cccc7cd6ec7b398acce6faf520175f9ec920f2ef261cdb83dc28cc3a0eeb970107b3306489bf771ef5b1213bca811d345285405861d08a655b6c237fa247a8b4491beee20c878a60e9816492026d8feb9dafa84585b253978db6a0aa2945df5ef445c61e801fb82f43d5f00716baf9fc9b3de50bc22950a36bda8fc27bfb1242e5860c7e687438d4133e058770361a19b6c271a2a07788d34dccc27e39b9829b061a4d960eac4a2c2b0f4de506c24f9af3868c0aff6dda27281c"),
 }
 ],
 blinding_point: pubkey_from_hex("02988face71e92c345a068f740191fd8e53be14f0bb957ef730d3c5f76087b960e"),
 excess_final_cltv_expiry_delta: 0,
 final_value_msat: 150_000_000
 }),
	};

	let associated_data_slice = secret_from_hex("e89bc505e84aaca09613833fc58c9069078fb43bfbea0488f34eec9db99b5f82");
	let associated_data = PaymentHash(associated_data_slice.secret_bytes());
	let payment_secret = PaymentSecret(secret_from_hex("7494b65bc092b48a75465e43e29be807eb2cc535ce8aaba31012b8ff1ceac5da").secret_bytes());
	let outer_session_key = secret_from_hex("4f777e8dac16e6dfe333066d9efb014f7a51d11762ff76eca4d3a95ada99ba3e");
	let outer_onion_prng_seed = onion_utils::gen_pad_from_shared_secret(&outer_session_key.secret_bytes());

	let amt_msat = 150_000_000;
	let cur_height = 800_000;
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (bob_onion, htlc_msat, htlc_cltv) = onion_utils::create_payment_onion_internal(&secp_ctx, &path, &session_priv, amt_msat, &recipient_onion_fields, cur_height, &associated_data, &None, None, [0; 32], Some(outer_session_key), Some(outer_onion_prng_seed)).unwrap();

	let outer_onion_packet_hex = bob_onion.encode().to_lower_hex_string();
	assert_eq!(outer_onion_packet_hex, "00025fd60556c134ae97e4baedba220a644037754ee67c54fd05e93bf40c17cbb73362fb9dee96001ff229945595b6edb59437a6bc143406d3f90f749892a84d8d430c6890437d26d5bfc599d565316ef51347521075bbab87c59c57bcf20af7e63d7192b46cf171e4f73cb11f9f603915389105d91ad630224bea95d735e3988add1e24b5bf28f1d7128db64284d90a839ba340d088c74b1fb1bd21136b1809428ec5399c8649e9bdf92d2dcfc694deae5046fa5b2bdf646847aaad73f5e95275763091c90e71031cae1f9a770fdea559642c9c02f424a2a28163dd0957e3874bd28a97bec67d18c0321b0e68bc804aa8345b17cb626e2348ca06c8312a167c989521056b0f25c55559d446507d6c491d50605cb79fa87929ce64b0a9860926eeaec2c431d926a1cadb9a1186e4061cb01671a122fc1f57602cbef06d6c194ec4b715c2e3dd4120baca3172cd81900b49fef857fb6d6afd24c983b608108b0a5ac0c1c6c52011f23b8778059ffadd1bb7cd06e2525417365f485a7fd1d4a9ba3818ede7cdc9e71afee8532252d08e2531ca52538655b7e8d912f7ec6d37bbcce8d7ec690709dbf9321e92c565b78e7fe2c22edf23e0902153d1ca15a112ad32fb19695ec65ce11ddf670da7915f05ad4b86c154fb908cb567315d1124f303f75fa075ebde8ef7bb12e27737ad9e4924439097338ea6d7a6fc3721b88c9b830a34e8d55f4c582b74a3895cc848fe57f4fe29f115dabeb6b3175be15d94408ed6771109cfaf57067ae658201082eae7605d26b1449af4425ae8e8f58cdda5c6265f1fd7a386fc6cea3074e4f25b909b96175883676f7610a00fdf34df9eb6c7b9a4ae89b839c69fd1f285e38cdceb634d782cc6d81179759bc9fd47d7fd060470d0b048287764c6837963274e708314f017ac7dc26d0554d59bfcfd3136225798f65f0b0fea337c6b256ebbb63a90b994c0ab93fd8b1d6bd4c74aebe535d6110014cd3d525394027dfe8faa98b4e9b2bee7949eb1961f1b026791092f84deea63afab66603dbe9b6365a102a1fef2f6b9744bc1bb091a8da9130d34d4d39f25dbad191649cfb67e10246364b7ce0c6ec072f9690cabb459d9fda0c849e17535de4357e9907270c75953fca3c845bb613926ecf73205219c7057a4b6bb244c184362bb4e2f24279dc4e60b94a5b1ec11c34081a628428ba5646c995b9558821053ba9c84a05afbf00dabd60223723096516d2f5668f3ec7e11612b01eb7a3a0506189a2272b88e89807943adb34291a17f6cb5516ffd6f945a1c42a524b21f096d66f350b1dad4db455741ae3d0e023309fbda5ef55fb0dc74f3297041448b2be76c525141963934c6afc53d263fb7836626df502d7c2ee9e79cbbd87afd84bbb8dfbf45248af3cd61ad5fac827e7683ca4f91dfad507a8eb9c17b2c9ac5ec051fe645a4a6cb37136f6f19b611e0ea8da7960af2d779507e55f57305bc74b7568928c5dd5132990fe54c22117df91c257d8c7b61935a018a28c1c3b17bab8e4294fa699161ec21123c9fc4e71079df31f300c2822e1246561e04765d3aab333eafd026c7431ac7616debb0e022746f4538e1c6348b600c988eeb2d051fc60c468dca260a84c79ab3ab8342dc345a764672848ea234e17332bc124799daf7c5fcb2e2358514a7461357e1c19c802c5ee32deccf1776885dd825bedd5f781d459984370a6b7ae885d4483a76ddb19b30f47ed47cd56aa5a079a89793dbcad461c59f2e002067ac98dd5a534e525c9c46c2af730741bf1f8629357ec0bfc0bc9ecb31af96777e507648ff4260dc3673716e098d9111dfd245f1d7c55a6de340deb8bd7a053e5d62d760f184dc70ca8fa255b9023b9b9aedfb6e419a5b5951ba0f83b603793830ee68d442d7b88ee1bbf6bbd1bcd6f68cc1af");
	assert_eq!(htlc_msat, 150_156_000);
	assert_eq!(htlc_cltv, 800_060);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1428,7 +1428,7 @@ fn test_fee_spike_violation_fails_htlc() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 3460001, &recipient_onion_fields, cur_height, &None, None).unwrap();
 3460001, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1623,7 +1623,7 @@ fn test_chan_reserve_violation_inbound_htlc_outbound_channel() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0],
 700_000, &recipient_onion_fields, cur_height, &None, None).unwrap();
 700_000, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -1803,7 +1803,7 @@ fn test_chan_reserve_violation_inbound_htlc_inbound_chan() {
	let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route_2.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::spontaneous_empty();
	let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route_2.paths[0], recv_value_2, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash_1).unwrap();
	let msg = msgs::UpdateAddHTLC {
 channel_id: chan.2,
Expand DownExpand Up@@ -3856,7 +3856,7 @@ fn fail_backward_pending_htlc_upon_channel_failure() {
 let current_height = nodes[1].node.best_block.read().unwrap().height + 1;
 let recipient_onion_fields = RecipientOnionFields::secret_only(payment_secret);
 let (onion_payloads, _amount_msat, cltv_expiry) = onion_utils::build_onion_payloads(
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None).unwrap();
 &route.paths[0], 50_000, &recipient_onion_fields, current_height, &None, None, None).unwrap();
 let onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.paths[0], &session_priv).unwrap();
 let onion_routing_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &payment_hash).unwrap();

Expand DownExpand Up@@ -6852,7 +6852,7 @@ fn test_update_add_htlc_bolt2_receiver_check_max_htlc_limit() {
	let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::signing_only(), &route.paths[0], &session_priv).unwrap();
	let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
	let (onion_payloads, _htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None).unwrap();
 &route.paths[0], send_amt, &recipient_onion_fields, cur_height, &None, None, None).unwrap();
	let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash).unwrap();

	let mut msg = msgs::UpdateAddHTLC {
Expand DownExpand Up@@ -8607,7 +8607,7 @@ fn test_onion_value_mpp_set_calculation() {
 let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
 let recipient_onion_fields = RecipientOnionFields::secret_only(our_payment_secret);
 let (mut onion_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], 100_000,
 &recipient_onion_fields, height + 1, &None, None).unwrap();
 &recipient_onion_fields, height + 1, &None, None, None).unwrap();
 // Edit amt_to_forward to simulate the sender having set
 // the final amount and the routing node taking less fee
 if let msgs::OutboundOnionPayload::Receive {
Expand Down

3 changes: 2 additions & 1 deletion
lightning/src/ln/max_payment_path_len_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,8 @@ fn blinded_path_with_custom_tlv() {
	let reserved_packet_bytes_without_custom_tlv: usize = onion_utils::build_onion_payloads(
 &route.paths[0], MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
 &RecipientOnionFields::spontaneous_empty(),
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None, None
 nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None,
 None, None
	)
 .unwrap()
 .0
Expand Down

4 changes: 0 additions & 4 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1802,7 +1802,6 @@ mod fuzzy_internal_msgs {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
 },
 #[allow(unused)]
 TrampolineEntrypoint {
 amt_to_forward: u64,
 outgoing_cltv_value: u32,
Expand DownExpand Up@@ -1834,7 +1833,6 @@ mod fuzzy_internal_msgs {
	}

	pub(crate) enum OutboundTrampolinePayload<'a> {
 #[allow(unused)]
 Forward {
 /// The value, in msat, of the payment after this hop's fee is deducted.
 amt_to_forward: u64,
Expand All@@ -1854,12 +1852,10 @@ mod fuzzy_internal_msgs {
 /// If applicable, features of the BOLT12 invoice being paid.
 invoice_features: Option<Bolt12InvoiceFeatures>,
 },
 #[allow(unused)]
 BlindedForward {
 encrypted_tlvs: &'a Vec<u8>,
 intro_node_blinding_point: Option<PublicKey>,
 },
 #[allow(unused)]
 BlindedReceive {
 sender_intended_htlc_amt_msat: u64,
 total_msat: u64,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ mod tests {
 let path = Path { hops, blinded_tail: None, };
 let onion_keys = super::onion_utils::construct_onion_keys(&secp_ctx, &path, &session_priv).unwrap();
 let (onion_payloads, ..) = super::onion_utils::build_onion_payloads(
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None
 &path, total_amt_msat, &recipient_onion, cur_height + 1, &Some(keysend_preimage), None, None
 ).unwrap();

 assert!(super::onion_utils::construct_onion_packet(
Expand Down
Loading